Bug 579560 - [PapyGame] PapyGame blocks after game submission
- Correct paths to html in flow-style game views.
- Use NON-NLS tags on paths
- Remove TODOs related to auto-generated methods
(as the content is effectively not auto-generated)
- Minor white-space changes
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
Change-Id: I5e0ca3eb511cc338aecd87ea17c93b521def2f4c
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlOperation.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlOperation.java
index 477dd74..999fea7 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlOperation.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlOperation.java
@@ -48,7 +48,7 @@
+ ", numberOfParameters=" + numberOfParameters
+ ", parameters=" + parameters
+ ", getNumberOfParameters()=" + getNumberOfParameters()
- + ",\n getAppliedStereotypes()=" + getAppliedStereotypes()
- + "]";
+ + ", getAppliedStereotypes()=" + getAppliedStereotypes()
+ + "\n]";
}
}
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlParameter.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlParameter.java
index ef6e223..a92dba9 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlParameter.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlParameter.java
@@ -58,7 +58,7 @@
+ ", type=" + type
+ ", lowerMultiplicity=" + lowerMultiplicity
+ ", upperMultiplicity=" + upperMultiplicity
- + ",\n getAppliedStereotypes()=" + getAppliedStereotypes()
- + "]";
+ + ", getAppliedStereotypes()=" + getAppliedStereotypes()
+ + "\n]";
}
}
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlProperty.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlProperty.java
index 202a4f0..8334635 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlProperty.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/jsonmapper/UmlProperty.java
@@ -47,7 +47,7 @@
+ ", upperMultiplicity=" + upperMultiplicity
+ ", lowerMultiplicity=" + lowerMultiplicity
+ ", type=" + type
- + ",\n getAppliedStereotypes()=" + getAppliedStereotypes()
- + "]";
+ + ", getAppliedStereotypes()=" + getAppliedStereotypes()
+ + "\n]";
}
}
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowGameOverView.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowGameOverView.java
index 4947bd7..64cbd01 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowGameOverView.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowGameOverView.java
@@ -35,14 +35,12 @@
@Override
public void registerJavaScriptFunctions(BrowserWrapper browser) {
- // TODO Auto-generated method stub
super.registerJavaScriptFunctions(browser);
}
@Override
public String getHtmlPath() {
- // TODO Auto-generated method stub
- return "/html/games/flow/html/gameover.html";
+ return "/html/gameover.html"; //$NON-NLS-1$
}
@Override
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowGameSuccessView.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowGameSuccessView.java
index 55865b9..35bf0de 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowGameSuccessView.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowGameSuccessView.java
@@ -35,14 +35,12 @@
@Override
public void registerJavaScriptFunctions(BrowserWrapper browser) {
- // TODO Auto-generated method stub
super.registerJavaScriptFunctions(browser);
}
@Override
public String getHtmlPath() {
- // TODO Auto-generated method stub
- return "/html/games/flow/html/gamesuccess.html";
+ return "/html/gamesuccess.html"; //$NON-NLS-1$
}
@Override
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowIntroductionView.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowIntroductionView.java
index 4e9b132..fef6eaa 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowIntroductionView.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowIntroductionView.java
@@ -38,7 +38,6 @@
@Override
public String getHtmlPath() {
- return "/html/games/flow/html/intro.html";
+ return "/html/games/flow/html/intro.html"; //$NON-NLS-1$
}
-
}
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowPlayView.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowPlayView.java
index dec198d..556cbfe 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowPlayView.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/games/flow/view/FlowPlayView.java
@@ -60,7 +60,7 @@
@Override
public String getHtmlPath() {
- return "/html/games/flow/html/game.html";
+ return "/html/games/flow/html/game.html"; //$NON-NLS-1$
}
public void onGameEnded(boolean success, int goodMoves, int badMoves) {
@@ -108,7 +108,6 @@
userUmlClassDiagram = UMLToJSONMapper.map(m);
getSpentTime();
}
-
}
@@ -129,7 +128,4 @@
endGame(umlDiagramSolution);
}
-
-
-
}
