diff options
author | Mickael ADAM | 2014-10-28 16:10:33 +0000 |
---|---|---|
committer | Mickael ADAM | 2014-10-28 16:23:41 +0000 |
commit | bcf1f71ba6721572bc9b026010519daa0f037f04 (patch) | |
tree | 6ff5c1d2895e5b7b7bb003998da2a0fa36b1a117 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java | |
parent | 8085759196a9c1544a08d75c211b821307591c96 (diff) | |
parent | 971bab65f2d9b629c915e90e4cd88417958937c4 (diff) | |
download | org.eclipse.papyrus-bcf1f71ba6721572bc9b026010519daa0f037f04.tar.gz org.eclipse.papyrus-bcf1f71ba6721572bc9b026010519daa0f037f04.tar.xz org.eclipse.papyrus-bcf1f71ba6721572bc9b026010519daa0f037f04.zip |
Merge remote-tracking branch 'origin/bugs/440230_440226' into
1.0_Maintenance
Change-Id: I5cf48cc197da2eb83cc275e3173374c84f2caf48
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java')
-rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java index 73ad8af0c69..11437a0a4f5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java @@ -138,6 +138,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { * @generated
*/
public UMLPaletteFactory() {
+
}
/**
@@ -217,6 +218,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */
@Override
public Object getTemplate(String templateId) {
+
// default return: null
return null;
}
|