Skip to content

Commit b911538

Browse files
author
Simon Gwerder
committed
Refactor
1 parent 374af4f commit b911538

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎src/ch/hsr/ogv/controller/ObjectGraph.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,25 +94,25 @@ public void setup() {
9494
}
9595
}
9696

97-
private int buildReferenceNames(PaneBox paneBox, ObjectGraphWrapper ogWrapper) {
97+
private int buildReferenceNames(PaneBox paneBox, ObjectGraphCollector ogCollector) {
9898
int origSize = paneBox.getCenterLabels().size();
99-
for (int i = 0; i < ogWrapper.getClassFriendEndpoints().size(); i++) {
99+
for (int i = 0; i < ogCollector.getClassFriendEndpoints().size(); i++) {
100100
int centerLabelIndex = origSize + i;
101-
Endpoint friendEndpoint = ogWrapper.getClassFriendEndpoints().get(i);
101+
Endpoint friendEndpoint = ogCollector.getClassFriendEndpoints().get(i);
102102
Relation relation = friendEndpoint.getRelation();
103-
String roleName = ogWrapper.getReferenceNames().get(relation);
103+
String roleName = ogCollector.getReferenceNames().get(relation);
104104
paneBox.setCenterText(centerLabelIndex, roleName + " " + MultiplicityParser.ASTERISK, "");
105105
}
106106
return origSize;
107107
}
108108

109-
private void buildReferences(PaneBox paneBox, int origSize, ObjectGraphWrapper ogWrapper) {
110-
for (int i = 0; i < ogWrapper.getClassFriendEndpoints().size(); i++) {
109+
private void buildReferences(PaneBox paneBox, int origSize, ObjectGraphCollector ogCollector) {
110+
for (int i = 0; i < ogCollector.getClassFriendEndpoints().size(); i++) {
111111
int centerLabelIndex = origSize + i;
112-
Endpoint friendEndpoint = ogWrapper.getClassFriendEndpoints().get(i);
112+
Endpoint friendEndpoint = ogCollector.getClassFriendEndpoints().get(i);
113113
Relation relation = friendEndpoint.getRelation();
114-
ArrayList<ModelObject> modelObjects = ogWrapper.getAssociatedObjects(relation);
115-
String upperBoundStr = ogWrapper.getAllocates().get(relation);
114+
ArrayList<ModelObject> modelObjects = ogCollector.getAssociatedObjects(relation);
115+
String upperBoundStr = ogCollector.getAllocates().get(relation);
116116
if (!modelObjects.isEmpty() && upperBoundStr != null && !upperBoundStr.isEmpty() && upperBoundStr.equals("1")) { // direct reference
117117
ModelObject firstRefObject = modelObjects.get(0);
118118
PaneBox firstRefBox = this.mvConnector.getPaneBox(firstRefObject);
@@ -124,10 +124,10 @@ else if (!modelObjects.isEmpty()) { // create array object in between
124124
if (upperBoundStr == null) {
125125
upperBoundStr = MultiplicityParser.ASTERISK;
126126
}
127-
PaneBox arrayBox = createArrayBox(ogWrapper.getModelObject(), (ModelClass) friendEndpoint.getAppendant(), relation, upperBoundStr);
127+
PaneBox arrayBox = createArrayBox(ogCollector.getModelObject(), (ModelClass) friendEndpoint.getAppendant(), relation, upperBoundStr);
128128
createBoxArrow(paneBox, arrayBox, centerLabelIndex, relation);
129-
createArrayBoxAttributes(arrayBox, relation, ogWrapper);
130-
createArrayBoxArrows(arrayBox, relation, ogWrapper);
129+
createArrayBoxAttributes(arrayBox, relation, ogCollector);
130+
createArrayBoxArrows(arrayBox, relation, ogCollector);
131131
}
132132
}
133133
}
@@ -142,11 +142,11 @@ private PaneBox createBox(ModelObject modelObject) {
142142
createBoxAttributes(paneBox, modelObject);
143143
paneBox.setWidth(modelObject.getWidth());
144144
if (!modelObject.isSuperObject()) {
145-
ObjectGraphWrapper ogWrapper = new ObjectGraphWrapper(modelObject);
146-
int origSize = buildReferenceNames(paneBox, ogWrapper);
145+
ObjectGraphCollector ogCollector = new ObjectGraphCollector(modelObject);
146+
int origSize = buildReferenceNames(paneBox, ogCollector);
147147
double newHeight = modelObject.getHeight() > paneBox.calcMinHeight() ? modelObject.getHeight() : paneBox.calcMinHeight();
148148
paneBox.setHeight(newHeight);
149-
buildReferences(paneBox, origSize, ogWrapper);
149+
buildReferences(paneBox, origSize, ogCollector);
150150
paneBox.setMinHeight(modelObject.getHeight());
151151
paneBox.recalcHasCenterGrid();
152152
}
@@ -202,9 +202,9 @@ private PaneBox createArrayBox(ModelObject modelObject, ModelClass modelClass, R
202202
return paneBox;
203203
}
204204

205-
private void createArrayBoxAttributes(PaneBox arrayBox, Relation relation, ObjectGraphWrapper ogWrapper) {
206-
ArrayList<ModelObject> modelObjects = ogWrapper.getAssociatedObjects(relation);
207-
Integer upperBound = MultiplicityParser.toInteger(ogWrapper.getAllocates().get(relation));
205+
private void createArrayBoxAttributes(PaneBox arrayBox, Relation relation, ObjectGraphCollector ogCollector) {
206+
ArrayList<ModelObject> modelObjects = ogCollector.getAssociatedObjects(relation);
207+
Integer upperBound = MultiplicityParser.toInteger(ogCollector.getAllocates().get(relation));
208208
if (upperBound == null) {
209209
upperBound = modelObjects.size();
210210
}
@@ -216,8 +216,8 @@ private void createArrayBoxAttributes(PaneBox arrayBox, Relation relation, Objec
216216
arrayBox.recalcHasCenterGrid();
217217
}
218218

219-
private void createArrayBoxArrows(PaneBox arrayBox, Relation relation, ObjectGraphWrapper ogWrapper) {
220-
ArrayList<ModelObject> modelObjects = ogWrapper.getAssociatedObjects(relation);
219+
private void createArrayBoxArrows(PaneBox arrayBox, Relation relation, ObjectGraphCollector ogCollector) {
220+
ArrayList<ModelObject> modelObjects = ogCollector.getAssociatedObjects(relation);
221221
for (int i = 0; i < arrayBox.getCenterLabels().size(); i++) {
222222
if (i < modelObjects.size()) {
223223
ModelObject modelObject = modelObjects.get(i);

src/ch/hsr/ogv/controller/ObjectGraphWrapper.java renamed to src/ch/hsr/ogv/controller/ObjectGraphCollector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @author Simon Gwerder
1919
*
2020
*/
21-
public class ObjectGraphWrapper {
21+
public class ObjectGraphCollector {
2222

2323
private ModelObject modelObject; // the model object we gather all info for
2424
private ArrayList<Relation> classRelations = new ArrayList<Relation>(); // helper list with all class relations
@@ -64,7 +64,7 @@ public ArrayList<ModelObject> getAssociatedObjects(Relation classRelation) {
6464
return retList;
6565
}
6666

67-
public ObjectGraphWrapper(ModelObject modelObject) {
67+
public ObjectGraphCollector(ModelObject modelObject) {
6868
this.modelObject = modelObject;
6969
perpareHelpers();
7070
setAllocates();

0 commit comments

Comments
 (0)