Skip to content

Commit 975ed26

Browse files
CesarCoelhoCesarCoelho
committed
Updates naming to follow proper Java convention
1 parent c9391b7 commit 975ed26

File tree

8 files changed

+34
-34
lines changed

8 files changed

+34
-34
lines changed

‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/MOattribute.java renamed to ‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/AttributeEntry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
*
3333
* @author Cesar Coelho
3434
*/
35-
public class MOattribute extends MOelement {
35+
public class AttributeEntry extends Entry {
3636

3737
private final javax.swing.JTextField fieldValue;
3838

39-
public MOattribute(String fieldName, Object obj, boolean editable, boolean objIsNull) {
39+
public AttributeEntry(String fieldName, Object obj, boolean editable, boolean objIsNull) {
4040
super(fieldName, obj, editable, objIsNull);
4141

4242
fieldValue = new javax.swing.JTextField();
@@ -65,7 +65,7 @@ public Object getObject() {
6565
try {
6666
super.object = (Element) MALContextFactory.getElementsRegistry().createElement(shortForm);
6767
} catch (Exception ex) {
68-
Logger.getLogger(MOattribute.class.getName()).log(Level.SEVERE, null, ex);
68+
Logger.getLogger(AttributeEntry.class.getName()).log(Level.SEVERE, null, ex);
6969
}
7070
}
7171

‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/MOelementListBlank.java renamed to ‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/BlankListEntry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
*
2525
* @author Cesar Coelho
2626
*/
27-
public class MOelementListBlank extends MOelement {
27+
public class BlankListEntry extends Entry {
2828

2929
private final javax.swing.JToggleButton buttonAdd;
3030

31-
public MOelementListBlank(java.awt.event.ActionListener actionListener, boolean editable) {
31+
public BlankListEntry(java.awt.event.ActionListener actionListener, boolean editable) {
3232
super("", null, editable, false);
3333

3434
this.editable = editable;

‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/MOcomposite.java renamed to ‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/CompositeEntry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
*
2828
* @author Cesar Coelho
2929
*/
30-
public class MOcomposite extends MOelement {
30+
public class CompositeEntry extends Entry {
3131

3232
private final javax.swing.JToggleButton button;
3333

34-
public MOcomposite(String fieldNameIn, Element obj, boolean editable, boolean objIsNull) {
34+
public CompositeEntry(String fieldNameIn, Element obj, boolean editable, boolean objIsNull) {
3535
super(fieldNameIn, obj, editable, objIsNull);
3636

3737
// Make a button and put it in the middle Panel

‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/MOelement.form renamed to ‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/Entry.form

File renamed without changes.

‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/MOelement.java renamed to ‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/Entry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
*
3131
* @author Cesar Coelho
3232
*/
33-
public abstract class MOelement extends javax.swing.JPanel {
33+
public abstract class Entry extends javax.swing.JPanel {
3434

3535
Object object = null;
3636
boolean editable;
3737

3838
@SuppressWarnings("unchecked")
39-
public MOelement(String fieldName, Object obj, boolean editable, boolean objIsNull) {
39+
public Entry(String fieldName, Object obj, boolean editable, boolean objIsNull) {
4040
initComponents();
4141

4242
this.fieldName.setText(fieldName);
@@ -65,7 +65,7 @@ public MOelement(String fieldName, Object obj, boolean editable, boolean objIsNu
6565
className = HelperAttributes.typeShortForm2attributeName(typeShortForm);
6666

6767
} catch (IllegalArgumentException | SecurityException | NoSuchFieldException | IllegalAccessException ex) {
68-
Logger.getLogger(MOelement.class.getName()).log(Level.SEVERE, null, ex);
68+
Logger.getLogger(Entry.class.getName()).log(Level.SEVERE, null, ex);
6969
}
7070
}
7171

‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/MOenumeration.java renamed to ‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/EnumerationEntry.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
*
3131
* @author Cesar Coelho
3232
*/
33-
public class MOenumeration extends MOelement {
33+
public class EnumerationEntry extends Entry {
3434

3535
private javax.swing.JComboBox comboBox;
3636

37-
public MOenumeration(String fieldNameIn, Element obj, boolean editable, boolean objIsNull) {
37+
public EnumerationEntry(String fieldNameIn, Element obj, boolean editable, boolean objIsNull) {
3838
super(fieldNameIn, obj, editable, objIsNull);
3939

4040
comboBox = new javax.swing.JComboBox();
@@ -58,7 +58,7 @@ public MOenumeration(String fieldNameIn, Element obj, boolean editable, boolean
5858
this.comboBox.setSelectedItem(enumeration.toString());
5959

6060
} catch (IllegalArgumentException | IllegalAccessException ex) {
61-
Logger.getLogger(MOenumeration.class.getName()).log(Level.SEVERE, null, ex);
61+
Logger.getLogger(EnumerationEntry.class.getName()).log(Level.SEVERE, null, ex);
6262
}
6363

6464
if (objIsNull) {
@@ -85,7 +85,7 @@ public Object getObject() {
8585
try {
8686
return field.get(object);
8787
} catch (IllegalArgumentException | IllegalAccessException ex) {
88-
Logger.getLogger(MOenumeration.class.getName()).log(Level.SEVERE, null, ex);
88+
Logger.getLogger(EnumerationEntry.class.getName()).log(Level.SEVERE, null, ex);
8989
}
9090

9191
return null;

‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/MOelementList.java renamed to ‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/ListEntry.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
*
3030
* @author Cesar Coelho
3131
*/
32-
public class MOelementList extends MOelement {
32+
public class ListEntry extends Entry {
3333

3434
private javax.swing.JToggleButton buttonEdit;
3535
private final javax.swing.JToggleButton buttonRemove;
3636
private javax.swing.JTextField fieldValue;
3737

38-
public MOelementList(final MOWindow previousWindow, String fieldNameIn,
38+
public ListEntry(final MOWindow previousWindow, String fieldNameIn,
3939
Object obj, boolean editable, boolean objIsNull) {
4040
super(fieldNameIn, obj, true, objIsNull);
4141

@@ -44,14 +44,14 @@ public MOelementList(final MOWindow previousWindow, String fieldNameIn,
4444
// Make the remove button
4545
buttonRemove = new javax.swing.JToggleButton();
4646
buttonRemove.setText("Remove");
47-
final MOelementList temp = this;
47+
final ListEntry temp = this;
4848
java.awt.event.ActionListener actionListenerRemove = evt -> {
4949
JPanel panel = previousWindow.getComponentsPanel();
5050
panel.remove(temp);
5151

5252
// Fix the indexes
5353
for (int i = 0; i < panel.getComponentCount() - 1; i++) {
54-
MOelement component = (MOelement) panel.getComponent(i);
54+
Entry component = (Entry) panel.getComponent(i);
5555
component.getFieldNameLabel().setText(String.valueOf(i));
5656
}
5757

‎sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/MOWindow.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -131,22 +131,22 @@ private void interpretReceivedObj(Object obj, boolean editable) {
131131
if (list.get(i) == null) {
132132
try {
133133
Element something = MALElementsRegistry.elementToElementList(list);
134-
MOelementList moElementList = new MOelementList(this,
134+
ListEntry moElementList = new ListEntry(this,
135135
fieldName, something, editable, true);
136136
componentsPanel.add(moElementList);
137137
} catch (Exception ex) {
138138
Logger.getLogger(MOWindow.class.getName()).log(Level.SEVERE, null, ex);
139139
}
140140

141141
} else {
142-
MOelementList moElementList = new MOelementList(this,
142+
ListEntry moElementList = new ListEntry(this,
143143
fieldName,
144144
FieldsHandler.filterRawObject(list.get(i)), editable,
145145
(list.get(i) == null));
146146
componentsPanel.add(moElementList);
147147
}
148148
} else {
149-
MOelementList moElementList = new MOelementList(this,
149+
ListEntry moElementList = new ListEntry(this,
150150
fieldName,
151151
list.get(i), editable, (list.get(i) == null));
152152
componentsPanel.add(moElementList);
@@ -156,7 +156,7 @@ private void interpretReceivedObj(Object obj, boolean editable) {
156156

157157
java.awt.event.ActionListener actionListener = this::buttonAddActionPerformed;
158158

159-
MOelementListBlank moElementListBlank = new MOelementListBlank(actionListener, editable);
159+
BlankListEntry moElementListBlank = new BlankListEntry(actionListener, editable);
160160
componentsPanel.add(moElementListBlank);
161161
return;
162162

@@ -177,42 +177,42 @@ private void interpretReceivedObj(Object obj, boolean editable) {
177177

178178
// If another Composite add a button to create another MOWindow
179179
if (fieldObject instanceof Composite) {
180-
MOcomposite moComposite = new MOcomposite(name,
180+
CompositeEntry moComposite = new CompositeEntry(name,
181181
(Element) fieldObject, editable, fieldObjectIsNull);
182182
componentsPanel.add(moComposite);
183183
continue;
184184
}
185185

186186
if (fieldObject instanceof Attribute) {
187-
MOattribute moField = new MOattribute(name,
187+
AttributeEntry moField = new AttributeEntry(name,
188188
fieldObject, editable, fieldObjectIsNull);
189189
componentsPanel.add(moField);
190190
continue;
191191
}
192192

193193
if (fieldObject instanceof Enumeration) {
194-
MOenumeration moField = new MOenumeration(name,
194+
EnumerationEntry moField = new EnumerationEntry(name,
195195
(Element) fieldObject, editable, fieldObjectIsNull);
196196
componentsPanel.add(moField);
197197
continue;
198198
}
199199

200200
if (fieldObject instanceof List) {
201-
MOelementList moField = new MOelementList(this, name,
201+
ListEntry moField = new ListEntry(this, name,
202202
fieldObject, editable, fieldObjectIsNull);
203203
componentsPanel.add(moField);
204204
continue;
205205
}
206206

207207
if (fieldObject == null) { // It is unknown or type "Attribute"
208-
MOattribute moField = new MOattribute(name,
208+
AttributeEntry moField = new AttributeEntry(name,
209209
fieldObject, editable, fieldObjectIsNull);
210210
componentsPanel.add(moField);
211211
continue;
212212
}
213213

214214
if (!(fieldObject instanceof Element)) {
215-
MOattribute moField = new MOattribute(name,
215+
AttributeEntry moField = new AttributeEntry(name,
216216
FieldsHandler.filterRawObject(fieldObject),
217217
editable, fieldObjectIsNull);
218218
componentsPanel.add(moField);
@@ -223,7 +223,7 @@ private void interpretReceivedObj(Object obj, boolean editable) {
223223
return;
224224
}
225225

226-
MOattribute field = new MOattribute("value", obj, editable, false);
226+
AttributeEntry field = new AttributeEntry("value", obj, editable, false);
227227
componentsPanel.add(field);
228228

229229
}
@@ -240,7 +240,7 @@ public void refreshVerticalSize() {
240240

241241
public void refreshHorizontalSize() {
242242
for (int i = 0; i < componentsPanel.getComponentCount(); i++) {
243-
String paramType = ((MOelement) componentsPanel.getComponent(i)).getFieldTypeString();
243+
String paramType = ((Entry) componentsPanel.getComponent(i)).getFieldTypeString();
244244

245245
// Calculate the size we want...
246246
int horizontalSize = paramType.length() * 8 + 450;
@@ -373,7 +373,7 @@ private void formWindowDeactivated(java.awt.event.WindowEvent evt) {//GEN-FIRST:
373373
private void buttonAddActionPerformed(java.awt.event.ActionEvent evt) {
374374
try {
375375
Element element = MALElementsRegistry.elementToElementList((ElementList) this.receivedObj);
376-
MOelementList moElementList = new MOelementList(this,
376+
ListEntry moElementList = new ListEntry(this,
377377
String.valueOf(componentsPanel.getComponentCount() - 1),
378378
element, this.editable, (this.receivedObj == null));
379379
componentsPanel.add(moElementList, componentsPanel.getComponentCount() - 1);
@@ -397,7 +397,7 @@ public Object getObject() throws InterruptedIOException {
397397
ElementList list = (ElementList) ((ElementList) this.receivedObj).createElement();
398398

399399
for (int i = 0; i < componentsPanel.getComponentCount() - 1; i++) {
400-
MOelementList lst = (MOelementList) componentsPanel.getComponent(i);
400+
ListEntry lst = (ListEntry) componentsPanel.getComponent(i);
401401
list.add(lst.getObject());
402402
}
403403

@@ -415,7 +415,7 @@ public Object getObject() throws InterruptedIOException {
415415
for (int i = 0; i < componentsPanel.getComponentCount(); i++) {
416416
Field field = fields[i + START_INDEX];
417417
field.setAccessible(true);
418-
MOelement element = ((MOelement) componentsPanel.getComponent(i));
418+
Entry element = ((Entry) componentsPanel.getComponent(i));
419419
Object object = element.getObject();
420420

421421
if (object instanceof Union) {
@@ -446,7 +446,7 @@ public Object getObject() throws InterruptedIOException {
446446
return this.receivedObj;
447447
}
448448

449-
MOattribute moAttribute = (MOattribute) componentsPanel.getComponent(0);
449+
AttributeEntry moAttribute = (AttributeEntry) componentsPanel.getComponent(0);
450450

451451
if (this.receivedObj instanceof Attribute && !(this.receivedObj instanceof ElementList)) {
452452
return moAttribute.getObject();

0 commit comments

Comments
 (0)