Skip to content

Commit 4dde377

Browse files
zahidesadzahidesad
committed
Vehicle object name changed as a Car
1 parent e016415 commit 4dde377

29 files changed

+407
-407
lines changed

‎build/classes/CarSalesSystem/AdminControlPanel.form

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<StringArray count="4">
123123
<StringItem index="0" value="Customer"/>
124124
<StringItem index="1" value="Dealer"/>
125-
<StringItem index="2" value="Vehicle"/>
125+
<StringItem index="2" value="Car"/>
126126
<StringItem index="3" value=""/>
127127
</StringArray>
128128
</Property>

‎build/classes/CarSalesSystem/CustomerVehicleListPanel.form renamed to ‎build/classes/CarSalesSystem/CustomerCarListPanel.form

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Color blue="0" green="0" red="0" type="rgb"/>
3939
</Property>
4040
<Property name="horizontalAlignment" type="int" value="0"/>
41-
<Property name="text" type="java.lang.String" value="VEHICLE LIST"/>
41+
<Property name="text" type="java.lang.String" value="CAR LIST"/>
4242
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
4343
<Border info="org.netbeans.modules.form.compat2.border.BevelBorderInfo">
4444
<BevelBorder/>
@@ -302,21 +302,21 @@
302302
</Constraint>
303303
</Constraints>
304304
</Component>
305-
<Component class="SwingComponents.Button" name="buyVehicleButton">
305+
<Component class="SwingComponents.Button" name="buyCarButton">
306306
<Properties>
307307
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
308308
<Color blue="0" green="0" red="0" type="rgb"/>
309309
</Property>
310310
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
311311
<Color blue="ff" green="ff" red="ff" type="rgb"/>
312312
</Property>
313-
<Property name="text" type="java.lang.String" value="Buy Vehicle "/>
313+
<Property name="text" type="java.lang.String" value="Buy Car"/>
314314
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
315315
<Font name="SansSerif" size="18" style="1"/>
316316
</Property>
317317
</Properties>
318318
<Events>
319-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buyVehicleButtonActionPerformed"/>
319+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buyCarButtonActionPerformed"/>
320320
</Events>
321321
<Constraints>
322322
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">

‎build/classes/CarSalesSystem/CustomerControlPanel.form

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,21 @@
6767
</Constraint>
6868
</Constraints>
6969
</Component>
70-
<Component class="SwingComponents.Button" name="viewVehiclesButton">
70+
<Component class="SwingComponents.Button" name="viewCarsButton">
7171
<Properties>
7272
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
7373
<Color blue="cc" green="cc" red="cc" type="rgb"/>
7474
</Property>
7575
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
7676
<Color blue="0" green="0" red="0" type="rgb"/>
7777
</Property>
78-
<Property name="text" type="java.lang.String" value="VIEW VEHICLES"/>
78+
<Property name="text" type="java.lang.String" value="VIEW CARS"/>
7979
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
8080
<Font name="Stencil" size="24" style="2"/>
8181
</Property>
8282
</Properties>
8383
<Events>
84-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="viewVehiclesButtonActionPerformed"/>
84+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="viewCarsButtonActionPerformed"/>
8585
</Events>
8686
<Constraints>
8787
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">

‎build/classes/CarSalesSystem/DealerAddVehiclePanel.form renamed to ‎build/classes/CarSalesSystem/DealerAddCarPanel.form

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<Property name="useNullLayout" type="boolean" value="false"/>
3030
</Layout>
3131
<SubComponents>
32-
<Component class="javax.swing.JLabel" name="addVehicleLabel">
32+
<Component class="javax.swing.JLabel" name="addCarPanelLabel">
3333
<Properties>
3434
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
3535
<Color blue="66" green="66" red="66" type="rgb"/>
@@ -41,7 +41,7 @@
4141
<Color blue="0" green="0" red="0" type="rgb"/>
4242
</Property>
4343
<Property name="horizontalAlignment" type="int" value="0"/>
44-
<Property name="text" type="java.lang.String" value="ADD VEHICLE"/>
44+
<Property name="text" type="java.lang.String" value="ADD CAR PANEL"/>
4545
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
4646
<Border info="org.netbeans.modules.form.compat2.border.BevelBorderInfo">
4747
<BevelBorder/>
@@ -366,21 +366,21 @@
366366
</Constraint>
367367
</Constraints>
368368
</Component>
369-
<Component class="SwingComponents.Button" name="addVehicleButton">
369+
<Component class="SwingComponents.Button" name="addCarButton">
370370
<Properties>
371371
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
372372
<Color blue="0" green="0" red="0" type="rgb"/>
373373
</Property>
374374
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
375375
<Color blue="ff" green="ff" red="ff" type="rgb"/>
376376
</Property>
377-
<Property name="text" type="java.lang.String" value="Add Vehicle"/>
377+
<Property name="text" type="java.lang.String" value="Add Car"/>
378378
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
379379
<Font name="SansSerif" size="18" style="1"/>
380380
</Property>
381381
</Properties>
382382
<Events>
383-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="addVehicleButtonActionPerformed"/>
383+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="addCarButtonActionPerformed"/>
384384
</Events>
385385
<Constraints>
386386
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">

‎build/classes/CarSalesSystem/DealerControlPanel.form

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,21 @@
7272
</Constraint>
7373
</Constraints>
7474
</Component>
75-
<Component class="SwingComponents.Button" name="manageVehiclesButton">
75+
<Component class="SwingComponents.Button" name="manageCarsButton">
7676
<Properties>
7777
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
7878
<Color blue="cc" green="cc" red="cc" type="rgb"/>
7979
</Property>
8080
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
8181
<Color blue="0" green="0" red="0" type="rgb"/>
8282
</Property>
83-
<Property name="text" type="java.lang.String" value="MANAGE VEHICLES"/>
83+
<Property name="text" type="java.lang.String" value="MANAGE CARS"/>
8484
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
8585
<Font name="Stencil" size="24" style="2"/>
8686
</Property>
8787
</Properties>
8888
<Events>
89-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="manageVehiclesButtonActionPerformed"/>
89+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="manageCarsButtonActionPerformed"/>
9090
</Events>
9191
<Constraints>
9292
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">

‎build/classes/CarSalesSystem/DealerCustomerRequestsPanel.form

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
<Table columnCount="7" rowCount="9">
7373
<Column editable="true" title="Customer ID" type="java.lang.Object"/>
7474
<Column editable="true" title="Customer Username" type="java.lang.Object"/>
75-
<Column editable="true" title="Vehicle ID" type="java.lang.Object"/>
76-
<Column editable="true" title="Vehicle Brand" type="java.lang.Object"/>
77-
<Column editable="true" title="Vehicle Model" type="java.lang.Object"/>
75+
<Column editable="true" title="Car ID" type="java.lang.Object"/>
76+
<Column editable="true" title="Car Brand" type="java.lang.Object"/>
77+
<Column editable="true" title="Car Model" type="java.lang.Object"/>
7878
<Column editable="true" title="Price " type="java.lang.Object"/>
7979
<Column editable="true" title="Status" type="java.lang.Object"/>
8080
</Table>

‎src/CarSalesSystem/DealerManageVehiclePanel.form renamed to ‎build/classes/CarSalesSystem/DealerManageCarPanel.form

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<Property name="useNullLayout" type="boolean" value="false"/>
3030
</Layout>
3131
<SubComponents>
32-
<Component class="javax.swing.JLabel" name="myVehiclesLabel">
32+
<Component class="javax.swing.JLabel" name="myCarsLabel">
3333
<Properties>
3434
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
3535
<Color blue="66" green="66" red="66" type="rgb"/>
@@ -41,7 +41,7 @@
4141
<Color blue="0" green="0" red="0" type="rgb"/>
4242
</Property>
4343
<Property name="horizontalAlignment" type="int" value="0"/>
44-
<Property name="text" type="java.lang.String" value="MY VEHICLES"/>
44+
<Property name="text" type="java.lang.String" value="MY CARS"/>
4545
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
4646
<Border info="org.netbeans.modules.form.compat2.border.BevelBorderInfo">
4747
<BevelBorder/>
@@ -107,43 +107,43 @@
107107
</Component>
108108
</SubComponents>
109109
</Container>
110-
<Component class="SwingComponents.Button" name="addVehicleButton">
110+
<Component class="SwingComponents.Button" name="addCarButton">
111111
<Properties>
112112
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
113113
<Color blue="0" green="0" red="0" type="rgb"/>
114114
</Property>
115115
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
116116
<Color blue="ff" green="ff" red="ff" type="rgb"/>
117117
</Property>
118-
<Property name="text" type="java.lang.String" value="Add Vehicle"/>
118+
<Property name="text" type="java.lang.String" value="Add Car"/>
119119
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
120120
<Font name="SansSerif" size="18" style="1"/>
121121
</Property>
122122
</Properties>
123123
<Events>
124-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="addVehicleButtonActionPerformed"/>
124+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="addCarButtonActionPerformed"/>
125125
</Events>
126126
<Constraints>
127127
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
128128
<AbsoluteConstraints x="210" y="460" width="180" height="-1"/>
129129
</Constraint>
130130
</Constraints>
131131
</Component>
132-
<Component class="SwingComponents.Button" name="deleteVehicleButton">
132+
<Component class="SwingComponents.Button" name="deleteCarButton">
133133
<Properties>
134134
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
135135
<Color blue="0" green="0" red="0" type="rgb"/>
136136
</Property>
137137
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
138138
<Color blue="ff" green="ff" red="ff" type="rgb"/>
139139
</Property>
140-
<Property name="text" type="java.lang.String" value="Delete Vehicle"/>
140+
<Property name="text" type="java.lang.String" value="Delete Car"/>
141141
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
142142
<Font name="SansSerif" size="18" style="1"/>
143143
</Property>
144144
</Properties>
145145
<Events>
146-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="deleteVehicleButtonActionPerformed"/>
146+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="deleteCarButtonActionPerformed"/>
147147
</Events>
148148
<Constraints>
149149
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">

‎nbproject/private/private.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
44
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
55
<group>
6-
<file>file:/C:/Users/zahid/OneDrive/Belgeler/NetBeansProjects/EndOfTermProjectWithJavaSwing/src/CarSalesSystem/CustomerMyOrdersPanel.java</file>
6+
<file>file:/C:/Users/zahid/OneDrive/Belgeler/NetBeansProjects/EndOfTermProjectWithJavaSwing/src/CarSalesSystem/DealerCustomerRequestsPanel.java</file>
77
</group>
88
</open-files>
99
</project-private>

‎src/CarSalesSystem/AdminControlPanel.form

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<StringArray count="4">
123123
<StringItem index="0" value="Customer"/>
124124
<StringItem index="1" value="Dealer"/>
125-
<StringItem index="2" value="Vehicle"/>
125+
<StringItem index="2" value="Car"/>
126126
<StringItem index="3" value=""/>
127127
</StringArray>
128128
</Property>

‎src/CarSalesSystem/AdminControlPanel.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class AdminControlPanel extends javax.swing.JPanel implements ITriggerer
1414

1515
DefaultTableModel tableModel = new DefaultTableModel();
1616
String[] columNames = {"ID", "Name", "Username", "E-mail", "Phone"};
17-
String[] columNamesVehicles = {"ID", "Dealer", "Brand", "Model", "Type", "Color", "Year", "Price", "Status"};
17+
String[] columNamesCars = {"ID", "Dealer", "Brand", "Model", "Type", "Color", "Year", "Price", "Status"};
1818

1919
public AdminControlPanel() {
2020
initComponents();
@@ -59,21 +59,21 @@ public void refreshTable() {
5959
}
6060
}
6161

62-
} else if (jComboBox1.getSelectedItem().equals("Vehicle")) {
62+
} else if (jComboBox1.getSelectedItem().equals("Car")) {
6363
tableModel.setRowCount(0);
64-
tableModel.setColumnIdentifiers(columNamesVehicles);
65-
deleteButton.setText("Delete Vehicle");
66-
for (Vehicle vehicle : Database.getVehicles()) {
64+
tableModel.setColumnIdentifiers(columNamesCars);
65+
deleteButton.setText("Delete Car");
66+
for (Car car : Database.getCars()) {
6767
Vector rowData = new Vector();
68-
rowData.add(vehicle.getId());
69-
rowData.add(vehicle.getDealer().getName());
70-
rowData.add(vehicle.getBrand());
71-
rowData.add(vehicle.getModel());
72-
rowData.add(vehicle.getType());
73-
rowData.add(vehicle.getColor());
74-
rowData.add(vehicle.getYear());
75-
rowData.add(vehicle.getPrice());
76-
rowData.add(vehicle.getRegister());
68+
rowData.add(car.getId());
69+
rowData.add(car.getDealer().getName());
70+
rowData.add(car.getBrand());
71+
rowData.add(car.getModel());
72+
rowData.add(car.getType());
73+
rowData.add(car.getColor());
74+
rowData.add(car.getYear());
75+
rowData.add(car.getPrice());
76+
rowData.add(car.getRegister());
7777

7878
tableModel.addRow(rowData);
7979

@@ -130,7 +130,7 @@ private void initComponents() {
130130

131131
jComboBox1.setFont(new java.awt.Font("SansSerif", 1, 14)); // NOI18N
132132
jComboBox1.setForeground(new java.awt.Color(255, 255, 255));
133-
jComboBox1.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Customer", "Dealer", "Vehicle", "" }));
133+
jComboBox1.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Customer", "Dealer", "Car", "" }));
134134
jComboBox1.addActionListener(new java.awt.event.ActionListener() {
135135
public void actionPerformed(java.awt.event.ActionEvent evt) {
136136
jComboBox1ActionPerformed(evt);
@@ -198,20 +198,20 @@ private void deleteButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
198198

199199
}
200200

201-
if (jComboBox1.getSelectedItem().equals("Vehicle")) {
202-
for (Vehicle vehicle : Database.getVehicles()) {
203-
if (tableModel.getValueAt(tableDark1.getSelectedRow(), 8).equals(Vehicle.accepted)) {
201+
if (jComboBox1.getSelectedItem().equals("Car")) {
202+
for (Car car : Database.getCars()) {
203+
if (tableModel.getValueAt(tableDark1.getSelectedRow(), 8).equals(Car.accepted)) {
204204
JOptionPane.showMessageDialog(this, "This car cannot be deleted because it has been sold. ",
205205
" Incorrect Operation", JOptionPane.ERROR_MESSAGE);
206206
return;
207-
} else if ((Integer) tableModel.getValueAt(tableDark1.getSelectedRow(), 0) == vehicle.getId()) {
208-
if (vehicle.getRegister().equals(Vehicle.pending)) {
209-
vehicle.setRegister(Vehicle.available);
207+
} else if ((Integer) tableModel.getValueAt(tableDark1.getSelectedRow(), 0) == car.getId()) {
208+
if (car.getRegister().equals(Car.pending)) {
209+
car.setRegister(Car.available);
210210
}
211-
if ((JOptionPane.showConfirmDialog(this, "Do you really want to delete this vehicle? "
211+
if ((JOptionPane.showConfirmDialog(this, "Do you really want to delete this car? "
212212
+ "This action cannot be undone!", "WARNING",
213213
JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)) {
214-
vehicle.removeVehicle();
214+
car.removeCar();
215215
refreshTable();
216216
break;
217217
} else {

0 commit comments

Comments
 (0)