Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Davis2012-09-14 15:08:23 +0000
committerMatthew Davis2012-09-14 15:08:23 +0000
commit108ca548cab2842ffc325f279d28d59cd3f21b16 (patch)
tree8061a2aed6f26e2cb0a94cf5f702bda0a2ae9be4
parent7237f9ffe3c9513fcf8d6780ad1847e84124d49b (diff)
downloadorg.eclipse.stem-108ca548cab2842ffc325f279d28d59cd3f21b16.tar.gz
org.eclipse.stem-108ca548cab2842ffc325f279d28d59cd3f21b16.tar.xz
org.eclipse.stem-108ca548cab2842ffc325f279d28d59cd3f21b16.zip
Fixes to copying icon image for model type
git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk@3379 92a21009-5b66-0410-b83a-dc787c41c6e9
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/build.properties3
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/BuildProperties_.java96
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/ManifestMF_.java113
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PluginXML_.java421
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor.java (renamed from developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor_.java)12
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter.java (renamed from developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter_.java)6
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory.java (renamed from developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory_.java)6
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory.java (renamed from developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory_.java)6
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory.java (renamed from developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory_.java)6
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages.java (renamed from developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages_.java)6
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties.java (renamed from developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties_.java)6
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/BuildProperties_.java8
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/BuildProperties_.java7
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ManifestMF_.java7
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ModelTestSuite_.java7
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageExample_.java6
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageTestSuite_.java8
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PluginProperties_.java3
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase_.java11
-rw-r--r--developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorAdapter.java3
20 files changed, 72 insertions, 669 deletions
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/build.properties b/developer_tools/modelgen/org.eclipse.stem.model.codegen/build.properties
index ab12c828a..3a9d30142 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/build.properties
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/build.properties
@@ -15,4 +15,5 @@ bin.includes = META-INF/,\
templates/,\
plugin.xml,\
plugin.properties,\
- schema/
+ schema/,\
+ icons/
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/BuildProperties_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/BuildProperties_.java
deleted file mode 100644
index e51bacf65..000000000
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/BuildProperties_.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.emf.codegen.ecore.templates.editor;
-
-import org.eclipse.emf.codegen.ecore.genmodel.*;
-import java.util.*;
-
-public class BuildProperties_
-{
- protected static String nl;
- public static synchronized BuildProperties_ create(String lineSeparator)
- {
- nl = lineSeparator;
- BuildProperties_ result = new BuildProperties_();
- nl = null;
- return result;
- }
-
- public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
- protected final String TEXT_1 = "# ";
- protected final String TEXT_2 = NL + "# <copyright>" + NL + "# </copyright>" + NL + "#" + NL + "# ";
- protected final String TEXT_3 = "Id";
- protected final String TEXT_4 = NL + NL + "bin.includes = ";
- protected final String TEXT_5 = ",\\" + NL + " icons/,\\";
- protected final String TEXT_6 = NL + " META-INF/,\\";
- protected final String TEXT_7 = NL + " plugin.xml,\\";
- protected final String TEXT_8 = NL + " plugin.properties" + NL + "jars.compile.order = ";
- protected final String TEXT_9 = NL + "source.";
- protected final String TEXT_10 = " = ";
- protected final String TEXT_11 = NL + "output.";
- protected final String TEXT_12 = " = ";
- protected final String TEXT_13 = "bin";
- protected final String TEXT_14 = "war/WEB-INF/classes";
- protected final String TEXT_15 = NL;
-
- public String generate(Object argument)
- {
- final StringBuffer stringBuffer = new StringBuffer();
-
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *
- * </copyright>
- */
-
- GenModel genModel = (GenModel)argument;
- String pluginClassesLocation = genModel.isRuntimeJar() ? genModel.getEditorPluginID()+".jar" : ".";
- List<String> sourceFolders = genModel.getEditorSourceFolders();
- {GenBase copyrightHolder = argument instanceof GenBase ? (GenBase)argument : argument instanceof Object[] && ((Object[])argument)[0] instanceof GenBase ? (GenBase)((Object[])argument)[0] : null;
- if (copyrightHolder != null && copyrightHolder.hasCopyright()) {
- stringBuffer.append(TEXT_1);
- stringBuffer.append(copyrightHolder.getCopyright(copyrightHolder.getGenModel().getIndentation(stringBuffer)));
- } else {
- stringBuffer.append(TEXT_2);
- stringBuffer.append("$");
- stringBuffer.append(TEXT_3);
- stringBuffer.append("$");
- }}
- stringBuffer.append(TEXT_4);
- stringBuffer.append(pluginClassesLocation);
- stringBuffer.append(TEXT_5);
- if (genModel.isBundleManifest()) {
- stringBuffer.append(TEXT_6);
- }
- if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {
- stringBuffer.append(TEXT_7);
- }
- stringBuffer.append(TEXT_8);
- stringBuffer.append(pluginClassesLocation);
- boolean first=true; for (Iterator<String> i = sourceFolders.iterator(); i.hasNext();) { String sourceFolder = i.next(); if (i.hasNext()){sourceFolder +=",\\";} if (first) {
- stringBuffer.append(TEXT_9);
- stringBuffer.append(pluginClassesLocation);
- stringBuffer.append(TEXT_10);
- stringBuffer.append(sourceFolder);
- first=false;} else {
- stringBuffer.append(sourceFolder);
- }}
- stringBuffer.append(TEXT_11);
- stringBuffer.append(pluginClassesLocation);
- stringBuffer.append(TEXT_12);
- if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {
- stringBuffer.append(TEXT_13);
- } else {
- stringBuffer.append(TEXT_14);
- }
- stringBuffer.append(TEXT_15);
- return stringBuffer.toString();
- }
-}
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/ManifestMF_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/ManifestMF_.java
deleted file mode 100644
index 5453d7540..000000000
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/ManifestMF_.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.eclipse.emf.codegen.ecore.templates.editor;
-
-import java.util.*;
-import org.eclipse.stem.model.codegen.*;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
-
-public class ManifestMF_
-{
- protected static String nl;
- public static synchronized ManifestMF_ create(String lineSeparator)
- {
- nl = lineSeparator;
- ManifestMF_ result = new ManifestMF_();
- nl = null;
- return result;
- }
-
- public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
- protected final String TEXT_1 = "Manifest-Version: 1.0" + NL + "Bundle-ManifestVersion: 2" + NL + "Bundle-Name: %pluginName" + NL + "Bundle-SymbolicName: ";
- protected final String TEXT_2 = ";singleton:=true" + NL + "Bundle-Version: 1.0.0.qualifier" + NL + "Bundle-ClassPath: ";
- protected final String TEXT_3 = ".jar";
- protected final String TEXT_4 = ".";
- protected final String TEXT_5 = NL + "Bundle-Activator: ";
- protected final String TEXT_6 = "$Implementation";
- protected final String TEXT_7 = NL + "Bundle-Vendor: %providerName" + NL + "Bundle-Localization: plugin";
- protected final String TEXT_8 = NL + "Bundle-RequiredExecutionEnvironment: J2SE-1.5";
- protected final String TEXT_9 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.6";
- protected final String TEXT_10 = NL + "Export-Package: ";
- protected final String TEXT_11 = ",";
- protected final String TEXT_12 = NL + " ";
- protected final String TEXT_13 = NL + "Require-Bundle: ";
- protected final String TEXT_14 = ";visibility:=reexport";
- protected final String TEXT_15 = ",";
- protected final String TEXT_16 = NL + " ";
- protected final String TEXT_17 = ";visibility:=reexport";
- protected final String TEXT_18 = NL + "Import-Package: org.eclipse.emf.common.ui," + NL + " org.eclipse.emf.common.ui.action," + NL + " org.eclipse.emf.common.ui.dialogs," + NL + " org.eclipse.emf.common.ui.editor," + NL + " org.eclipse.emf.common.ui.viewer," + NL + " org.eclipse.emf.edit.ui," + NL + " org.eclipse.emf.edit.ui.action," + NL + " org.eclipse.emf.edit.ui.celleditor," + NL + " org.eclipse.emf.edit.ui.dnd," + NL + " org.eclipse.emf.edit.ui.provider," + NL + " org.eclipse.emf.edit.ui.util," + NL + " org.eclipse.emf.edit.ui.view," + NL + " org.eclipse.jface.action," + NL + " org.eclipse.jface.dialogs," + NL + " org.eclipse.jface.operation," + NL + " org.eclipse.jface.viewers," + NL + " org.eclipse.jface.window," + NL + " org.eclipse.jface.wizard," + NL + " org.eclipse.swt," + NL + " org.eclipse.swt.custom," + NL + " org.eclipse.swt.dnd," + NL + " org.eclipse.swt.events," + NL + " org.eclipse.swt.graphics," + NL + " org.eclipse.swt.layout," + NL + " org.eclipse.swt.widgets," + NL + " org.eclipse.ui;ui.workbench=\"split\"," + NL + " org.eclipse.ui.actions;ui.workbench=\"split\"," + NL + " org.eclipse.ui.application," + NL + " org.eclipse.ui.part;ui.workbench=\"split\"," + NL + " org.eclipse.ui.views," + NL + " org.eclipse.ui.views.contentoutline," + NL + " org.eclipse.ui.views.properties;ui.views=\"split\"";
- protected final String TEXT_19 = NL + "Eclipse-LazyStart: true";
- protected final String TEXT_20 = NL + "Bundle-ActivationPolicy: lazy";
- protected final String TEXT_21 = NL;
-
- public String generate(Object argument)
- {
- final StringBuffer stringBuffer = new StringBuffer();
-
-/**
- * <copyright>
- *
- * Copyright (c) 2005-2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *
- * </copyright>
- */
-
- GenModel genModel = (GenModel)argument; STEMGenModel stemGenModel = STEMGenModel.get(genModel);
- stringBuffer.append(TEXT_1);
- stringBuffer.append(genModel.getEditorPluginID());
- stringBuffer.append(TEXT_2);
- if (genModel.isRuntimeJar()) {
- stringBuffer.append(genModel.getEditorPluginID());
- stringBuffer.append(TEXT_3);
- }else{
- stringBuffer.append(TEXT_4);
- }
- if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {
- stringBuffer.append(TEXT_5);
- stringBuffer.append(genModel.getQualifiedEditorPluginClassName());
- stringBuffer.append(TEXT_6);
- }
- stringBuffer.append(TEXT_7);
- if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {
- stringBuffer.append(TEXT_8);
- } else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {
- stringBuffer.append(TEXT_9);
- }
- Iterator<String> packagesIterator = genModel.getEditorQualifiedPackageNames().iterator(); if (packagesIterator.hasNext()) { String pack = packagesIterator.next();
- stringBuffer.append(TEXT_10);
- stringBuffer.append(pack);
- while(packagesIterator.hasNext()) { pack = packagesIterator.next();
- stringBuffer.append(TEXT_11);
- stringBuffer.append(TEXT_12);
- stringBuffer.append(pack);
- }
- }
- Iterator<String> requiredPluginIterator = stemGenModel.getEditorRequiredPlugins().iterator(); if (requiredPluginIterator.hasNext()) { String pluginID = requiredPluginIterator.next();
- stringBuffer.append(TEXT_13);
- stringBuffer.append(pluginID);
- if (!pluginID.startsWith("org.eclipse.core.runtime")){
- stringBuffer.append(TEXT_14);
- } while(requiredPluginIterator.hasNext()) { pluginID = requiredPluginIterator.next();
- stringBuffer.append(TEXT_15);
- stringBuffer.append(TEXT_16);
- stringBuffer.append(pluginID);
- if (!pluginID.startsWith("org.eclipse.core.runtime")){
- stringBuffer.append(TEXT_17);
- }}
- }
- if (genModel.isRichAjaxPlatform()) {
- stringBuffer.append(TEXT_18);
- }
- if (genModel.getRuntimeVersion() == GenRuntimeVersion.EMF22 || genModel.getRuntimeVersion() == GenRuntimeVersion.EMF23) {
- stringBuffer.append(TEXT_19);
- }
- stringBuffer.append(TEXT_20);
- stringBuffer.append(TEXT_21);
- return stringBuffer.toString();
- }
-}
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PluginXML_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PluginXML_.java
deleted file mode 100644
index 9375ec928..000000000
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PluginXML_.java
+++ /dev/null
@@ -1,421 +0,0 @@
-package org.eclipse.emf.codegen.ecore.templates.editor;
-
-import java.util.*;
-import org.eclipse.stem.model.codegen.*;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
-
-public class PluginXML_
-{
- protected static String nl;
- public static synchronized PluginXML_ create(String lineSeparator)
- {
- nl = lineSeparator;
- PluginXML_ result = new PluginXML_();
- nl = null;
- return result;
- }
-
- public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
- protected final String TEXT_1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + NL + "<?eclipse version=\"3.0\"?>" + NL;
- protected final String TEXT_2 = NL;
- protected final String TEXT_3 = "<!--";
- protected final String TEXT_4 = NL + " ";
- protected final String TEXT_5 = NL + " <copyright>" + NL + " </copyright>" + NL;
- protected final String TEXT_6 = NL + " ";
- protected final String TEXT_7 = "Id";
- protected final String TEXT_8 = NL + "-->" + NL;
- protected final String TEXT_9 = NL + "<plugin>";
- protected final String TEXT_10 = NL + "<plugin" + NL + " name=\"%pluginName\"" + NL + " id=\"";
- protected final String TEXT_11 = "\"" + NL + " version=\"1.0.0\"" + NL + " provider-name=\"%providerName\"" + NL + " class=\"";
- protected final String TEXT_12 = "$Implementation\">" + NL + "" + NL + " <requires>";
- protected final String TEXT_13 = NL + " <import plugin=\"";
- protected final String TEXT_14 = "\"";
- protected final String TEXT_15 = " export=\"true\"";
- protected final String TEXT_16 = "/>";
- protected final String TEXT_17 = NL + " </requires>" + NL + "" + NL + " <runtime>";
- protected final String TEXT_18 = NL + " <library name=\"";
- protected final String TEXT_19 = ".jar\">";
- protected final String TEXT_20 = NL + " <library name=\".\">";
- protected final String TEXT_21 = NL + " <export name=\"*\"/>" + NL + " </library>" + NL + " </runtime>";
- protected final String TEXT_22 = NL + NL + " <extension point=\"org.eclipse.emf.edit.itemProviderAdapterFactories\">" + NL + " <factory" + NL + " uri=\"";
- protected final String TEXT_23 = "\"" + NL + " class=\"";
- protected final String TEXT_24 = "\"" + NL + " supportedTypes=";
- protected final String TEXT_25 = NL + " ";
- protected final String TEXT_26 = "\"/>";
- protected final String TEXT_27 = NL + " </extension>";
- protected final String TEXT_28 = NL + NL + " <extension point=\"org.eclipse.emf.edit.childCreationExtenders\">";
- protected final String TEXT_29 = NL + " <extender" + NL + " uri=\"";
- protected final String TEXT_30 = "\"" + NL + " class=\"";
- protected final String TEXT_31 = "$";
- protected final String TEXT_32 = "\"/>";
- protected final String TEXT_33 = NL + " </extension>";
- protected final String TEXT_34 = NL + NL + " <extension point=\"org.eclipse.emf.ecore.generated_package\">" + NL + " <package" + NL + " uri=\"";
- protected final String TEXT_35 = "\"";
- protected final String TEXT_36 = NL + " class=\"";
- protected final String TEXT_37 = "\"" + NL + " genModel=\"";
- protected final String TEXT_38 = "\"/>";
- protected final String TEXT_39 = NL + " class=\"";
- protected final String TEXT_40 = "\"/>";
- protected final String TEXT_41 = NL + " </extension>";
- protected final String TEXT_42 = NL + NL + " <extension point=\"org.eclipse.emf.ecore.content_parser\">" + NL + " <parser" + NL + " contentTypeIdentifier=\"";
- protected final String TEXT_43 = "\"" + NL + " class=\"";
- protected final String TEXT_44 = "\"/>" + NL + " </extension>" + NL + "" + NL + " <extension point=\"org.eclipse.core.contenttype.contentTypes\">" + NL + " <content-type" + NL + " base-type=\"";
- protected final String TEXT_45 = "\"" + NL + " file-extensions=\"";
- protected final String TEXT_46 = "\"" + NL + " id=\"";
- protected final String TEXT_47 = "\"" + NL + " name=\"%_UI_";
- protected final String TEXT_48 = "_content_type\"" + NL + " priority=\"normal\">" + NL + " <describer class=\"org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer\">";
- protected final String TEXT_49 = NL + " <parameter name=\"namespace\" value=\"";
- protected final String TEXT_50 = "\"/>";
- protected final String TEXT_51 = NL + " <parameter name=\"kind\" value=\"xmi\"/>";
- protected final String TEXT_52 = NL + " </describer>" + NL + " </content-type>" + NL + " </extension>";
- protected final String TEXT_53 = NL + NL + " <extension point=\"org.eclipse.emf.ecore.extension_parser\">" + NL + " <parser" + NL + " type=\"";
- protected final String TEXT_54 = "\"" + NL + " class=\"";
- protected final String TEXT_55 = "\"/>" + NL + " </extension>";
- protected final String TEXT_56 = NL + NL + " <extension" + NL + " point=\"org.eclipse.core.runtime.applications\"" + NL + " id=\"";
- protected final String TEXT_57 = "Application\">" + NL + " <application>" + NL + " <run class=\"";
- protected final String TEXT_58 = "$Application\"/>" + NL + " </application>" + NL + " </extension>" + NL + "" + NL + " <extension point=\"org.eclipse.ui.perspectives\">" + NL + " <perspective" + NL + " name=\"%_UI_Perspective_label\"" + NL + " class=\"";
- protected final String TEXT_59 = "$Perspective\"" + NL + " id=\"";
- protected final String TEXT_60 = "Perspective\">" + NL + " </perspective>" + NL + " </extension>" + NL + "" + NL + " <extension point=\"org.eclipse.ui.commands\">" + NL + " <command" + NL + " name=\"%_UI_Menu_OpenURI_label\"" + NL + " description=\"%_UI_Menu_OpenURI_description\"" + NL + " categoryId=\"org.eclipse.ui.category.file\"" + NL + " id=\"";
- protected final String TEXT_61 = "OpenURICommand\"/>";
- protected final String TEXT_62 = NL + " <command" + NL + " name=\"%_UI_Menu_Open_label\"" + NL + " description=\"%_UI_Menu_Open_description\"" + NL + " categoryId=\"org.eclipse.ui.category.file\"" + NL + " id=\"";
- protected final String TEXT_63 = "OpenCommand\"/>";
- protected final String TEXT_64 = NL + " </extension>" + NL;
- protected final String TEXT_65 = NL + " <extension point=\"org.eclipse.ui.bindings\">" + NL + " <key" + NL + " commandId=\"";
- protected final String TEXT_66 = "OpenURICommand\"" + NL + " sequence=\"M1+U\"" + NL + " schemeId=\"org.eclipse.ui.defaultAcceleratorConfiguration\"/>" + NL + " <key" + NL + " commandId=\"";
- protected final String TEXT_67 = "OpenCommand\"" + NL + " sequence=\"M1+O\"" + NL + " schemeId=\"org.eclipse.ui.defaultAcceleratorConfiguration\"/>" + NL + " </extension>";
- protected final String TEXT_68 = NL + NL + " <extension point=\"org.eclipse.ui.actionSets\">" + NL + " <actionSet" + NL + " label=\"%_UI_";
- protected final String TEXT_69 = "_ActionSet_label\"" + NL + " visible=\"true\"" + NL + " id=\"";
- protected final String TEXT_70 = "ActionSet\">" + NL + " <action" + NL + " label=\"%_UI_Menu_About_label\"" + NL + " class=\"";
- protected final String TEXT_71 = "$AboutAction\"" + NL + " menubarPath=\"help/additions\"" + NL + " id=\"";
- protected final String TEXT_72 = "AboutAction\"/>" + NL + " <action" + NL + " label=\"%_UI_Menu_OpenURI_label\"" + NL + " definitionId=\"";
- protected final String TEXT_73 = "OpenURICommand\"" + NL + " class=\"";
- protected final String TEXT_74 = "$OpenURIAction\"" + NL + " menubarPath=\"file/additions\"" + NL + " id=\"";
- protected final String TEXT_75 = "OpenURIAction\"/>";
- protected final String TEXT_76 = NL + " <action" + NL + " label=\"%_UI_Menu_Open_label\"" + NL + " definitionId=\"";
- protected final String TEXT_77 = "OpenCommand\"" + NL + " class=\"";
- protected final String TEXT_78 = "$OpenAction\"" + NL + " menubarPath=\"file/additions\"" + NL + " id=\"";
- protected final String TEXT_79 = "OpenAction\"/>";
- protected final String TEXT_80 = NL + " </actionSet>" + NL + " </extension>";
- protected final String TEXT_81 = NL + NL + " <extension point=\"org.eclipse.ui.actionSets\">" + NL + " <actionSet" + NL + " label=\"%_UI_";
- protected final String TEXT_82 = "_ActionSet_label\"" + NL + " visible=\"true\"" + NL + " id=\"";
- protected final String TEXT_83 = "ActionSet\">" + NL + " <action" + NL + " label=\"%_UI_";
- protected final String TEXT_84 = "_label\"" + NL + " class=\"";
- protected final String TEXT_85 = "$NewAction\"" + NL + " menubarPath=\"file/new/additions\"" + NL + " id=\"";
- protected final String TEXT_86 = "NewAction\"/>" + NL + " </actionSet>" + NL + " </extension>";
- protected final String TEXT_87 = NL + NL + " <extension point=\"org.eclipse.ui.newWizards\">" + NL + " <category" + NL + " id=\"org.eclipse.emf.ecore.Wizard.category.ID\"" + NL + " name=\"%_UI_Wizard_category\"/>" + NL + " <wizard" + NL + " id=\"";
- protected final String TEXT_88 = "ID\"" + NL + " name=\"%_UI_";
- protected final String TEXT_89 = "_label\"" + NL + " class=\"";
- protected final String TEXT_90 = "\"" + NL + " category=\"org.eclipse.emf.ecore.Wizard.category.ID\"" + NL + " icon=\"icons/full/obj16/";
- protected final String TEXT_91 = "ModelFile.gif\">" + NL + " <description>%_UI_";
- protected final String TEXT_92 = "_description</description>" + NL + " <selection class=\"org.eclipse.core.resources.IResource\"/>" + NL + " </wizard>" + NL + " </extension>";
- protected final String TEXT_93 = NL + NL + " <extension point=\"org.eclipse.ui.editors\">" + NL + " <editor" + NL + " id=\"";
- protected final String TEXT_94 = "ID\"" + NL + " name=\"%_UI_";
- protected final String TEXT_95 = "_label\"" + NL + " icon=\"icons/full/obj16/";
- protected final String TEXT_96 = "ModelFile.gif\"";
- protected final String TEXT_97 = NL + " extensions=\"";
- protected final String TEXT_98 = "\"";
- protected final String TEXT_99 = NL + " class=\"";
- protected final String TEXT_100 = "\"" + NL + " contributorClass=\"";
- protected final String TEXT_101 = "\">";
- protected final String TEXT_102 = NL + " <contentTypeBinding contentTypeId=\"";
- protected final String TEXT_103 = "\"/>";
- protected final String TEXT_104 = NL + " </editor>" + NL + " </extension>";
- protected final String TEXT_105 = NL;
- protected final String TEXT_106 = NL + "\t<extension point=\"";
- protected final String TEXT_107 = "\">" + NL + "\t\t<classdef class=\"";
- protected final String TEXT_108 = "\"></classdef>" + NL + "\t\t<dublin_core" + NL + "\t\t\tcreator=\"\"" + NL + "\t\t\tdescription=\"\"" + NL + "\t\t\tidentifier=\"\"" + NL + "\t\t\tsource=\"\"" + NL + "\t\t\ttitle=\"";
- protected final String TEXT_109 = "\"" + NL + "\t\t\tlicense=\"\"" + NL + "\t\t\tpublisher=\"\">" + NL + "\t\t</dublin_core>" + NL + "\t</extension>" + NL;
- protected final String TEXT_110 = NL + NL + " <extension" + NL + " point=\"org.eclipse.ui.startup\">";
- protected final String TEXT_111 = " " + NL + " <startup" + NL + " class=\"";
- protected final String TEXT_112 = ".";
- protected final String TEXT_113 = "PropertyEditorAdapterFactory\">" + NL + " </startup>" + NL + " <startup" + NL + " class=\"";
- protected final String TEXT_114 = ".";
- protected final String TEXT_115 = "RelativeValueProviderAdapterFactory\">" + NL + " </startup> ";
- protected final String TEXT_116 = NL + " </extension>" + NL + "" + NL + "" + NL + "</plugin>";
- protected final String TEXT_117 = NL;
-
- public String generate(Object argument)
- {
- final StringBuffer stringBuffer = new StringBuffer();
-
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *
- * </copyright>
- */
-
- GenModel genModel = (GenModel)argument;
- stringBuffer.append(TEXT_1);
- stringBuffer.append(TEXT_2);
- stringBuffer.append(TEXT_3);
- {GenBase copyrightHolder = argument instanceof GenBase ? (GenBase)argument : argument instanceof Object[] && ((Object[])argument)[0] instanceof GenBase ? (GenBase)((Object[])argument)[0] : null;
- if (copyrightHolder != null && copyrightHolder.hasCopyright()) {
- stringBuffer.append(TEXT_4);
- stringBuffer.append(copyrightHolder.getCopyright(copyrightHolder.getGenModel().getIndentation(stringBuffer)));
- } else {
- stringBuffer.append(TEXT_5);
- stringBuffer.append(TEXT_6);
- stringBuffer.append("$");
- stringBuffer.append(TEXT_7);
- stringBuffer.append("$");
- }}
- stringBuffer.append(TEXT_8);
- if (genModel.isBundleManifest()) {
- stringBuffer.append(TEXT_9);
- } else {
- stringBuffer.append(TEXT_10);
- stringBuffer.append(genModel.getEditorPluginID());
- stringBuffer.append(TEXT_11);
- stringBuffer.append(genModel.getQualifiedEditorPluginClassName());
- stringBuffer.append(TEXT_12);
- for (String pluginID : genModel.getEditorRequiredPlugins()) {
- stringBuffer.append(TEXT_13);
- stringBuffer.append(pluginID);
- stringBuffer.append(TEXT_14);
- if (!pluginID.startsWith("org.eclipse.core.runtime")) {
- stringBuffer.append(TEXT_15);
- }
- stringBuffer.append(TEXT_16);
- }
- stringBuffer.append(TEXT_17);
- if (genModel.isRuntimeJar()) {
- stringBuffer.append(TEXT_18);
- stringBuffer.append(genModel.getEditorPluginID());
- stringBuffer.append(TEXT_19);
- } else {
- stringBuffer.append(TEXT_20);
- }
- stringBuffer.append(TEXT_21);
- }
- if (genModel.sameEditEditorProject()) {
- for (GenPackage genPackage : genModel.getAllGenPackagesWithClassifiers()) {
- if (!genPackage.getGenClasses().isEmpty()) {
- stringBuffer.append(TEXT_22);
- stringBuffer.append(genPackage.getNSURI());
- stringBuffer.append(TEXT_23);
- stringBuffer.append(genPackage.getQualifiedItemProviderAdapterFactoryClassName());
- stringBuffer.append(TEXT_24);
- for (ListIterator<?> j = genPackage.getProviderSupportedTypes().listIterator(); j.hasNext(); ) {
- stringBuffer.append(TEXT_25);
- stringBuffer.append(j.hasPrevious() ? " " : "\"");
- stringBuffer.append(j.next());
- if (!j.hasNext()) {
- stringBuffer.append(TEXT_26);
- }
- }
- stringBuffer.append(TEXT_27);
- if (genPackage.isChildCreationExtenders()) { Map<GenPackage, Map<GenClass, List<GenClass.ChildCreationData>>> extendedChildCreationData = genPackage.getExtendedChildCreationData();
- if (!extendedChildCreationData.isEmpty()) {
- stringBuffer.append(TEXT_28);
- for (Map.Entry<GenPackage, Map<GenClass, List<GenClass.ChildCreationData>>> entry : extendedChildCreationData.entrySet()) {
- stringBuffer.append(TEXT_29);
- stringBuffer.append(entry.getKey().getNSURI());
- stringBuffer.append(TEXT_30);
- stringBuffer.append(genPackage.getQualifiedItemProviderAdapterFactoryClassName());
- stringBuffer.append(TEXT_31);
- stringBuffer.append(genPackage.getChildCreationExtenderName(entry.getKey()));
- stringBuffer.append(TEXT_32);
- }
- stringBuffer.append(TEXT_33);
- }
- }
- }
- }
- }
- if (genModel.sameModelEditorProject()) {
- for (GenPackage genPackage : genModel.getAllGenPackagesWithClassifiers()) {
- stringBuffer.append(TEXT_34);
- stringBuffer.append(genPackage.getNSURI());
- stringBuffer.append(TEXT_35);
- if (genModel.hasLocalGenModel()) {
- stringBuffer.append(TEXT_36);
- stringBuffer.append(genPackage.getQualifiedPackageInterfaceName());
- stringBuffer.append(TEXT_37);
- stringBuffer.append(genModel.getRelativeGenModelLocation());
- stringBuffer.append(TEXT_38);
- } else {
- stringBuffer.append(TEXT_39);
- stringBuffer.append(genPackage.getQualifiedPackageInterfaceName());
- stringBuffer.append(TEXT_40);
- }
- stringBuffer.append(TEXT_41);
- if (genPackage.isContentType()) {
- stringBuffer.append(TEXT_42);
- stringBuffer.append(genPackage.getContentTypeIdentifier());
- stringBuffer.append(TEXT_43);
- stringBuffer.append(genPackage.getQualifiedEffectiveResourceFactoryClassName());
- stringBuffer.append(TEXT_44);
- stringBuffer.append(genPackage.isXMIResource() ? "org.eclipse.emf.ecore.xmi" : "org.eclipse.core.runtime.xml");
- stringBuffer.append(TEXT_45);
- stringBuffer.append(genPackage.getFileExtensions());
- stringBuffer.append(TEXT_46);
- stringBuffer.append(genPackage.getContentTypeIdentifier());
- stringBuffer.append(TEXT_47);
- stringBuffer.append(genPackage.getPrefix());
- stringBuffer.append(TEXT_48);
- if (genPackage.hasTargetNamespace()) {
- stringBuffer.append(TEXT_49);
- stringBuffer.append(genPackage.getNSURI());
- stringBuffer.append(TEXT_50);
- }
- if (genPackage.isXMIResource()) {
- stringBuffer.append(TEXT_51);
- }
- stringBuffer.append(TEXT_52);
- } else if (genPackage.getResource() != GenResourceKind.NONE_LITERAL) {
- stringBuffer.append(TEXT_53);
- stringBuffer.append(genPackage.getFileExtension());
- stringBuffer.append(TEXT_54);
- stringBuffer.append(genPackage.getQualifiedResourceFactoryClassName());
- stringBuffer.append(TEXT_55);
- }
- }
- }
- if (genModel.isRichClientPlatform()) {
- stringBuffer.append(TEXT_56);
- stringBuffer.append(genModel.getEditorAdvisorClassName());
- stringBuffer.append(TEXT_57);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_58);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_59);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_60);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_61);
- if (!genModel.isRichAjaxPlatform()) {
- stringBuffer.append(TEXT_62);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_63);
- }
- stringBuffer.append(TEXT_64);
- if (!genModel.isRichAjaxPlatform()) {
- stringBuffer.append(TEXT_65);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_66);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_67);
- }
- stringBuffer.append(TEXT_68);
- stringBuffer.append(genModel.getEditorAdvisorClassName());
- stringBuffer.append(TEXT_69);
- stringBuffer.append(genModel.getEditorAdvisorClassName());
- stringBuffer.append(TEXT_70);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_71);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_72);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_73);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_74);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_75);
- if (!genModel.isRichAjaxPlatform()) {
- stringBuffer.append(TEXT_76);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_77);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_78);
- stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());
- stringBuffer.append(TEXT_79);
- }
- stringBuffer.append(TEXT_80);
- }
- for (GenPackage genPackage : genModel.getAllGenPackagesWithClassifiers()) {
- if (genPackage.hasConcreteClasses()){
- if (genPackage.isGenerateModelWizard()) {
- if (genModel.isRichClientPlatform()) {
- stringBuffer.append(TEXT_81);
- stringBuffer.append(genPackage.getModelWizardClassName());
- stringBuffer.append(TEXT_82);
- stringBuffer.append(genPackage.getQualifiedActionBarContributorClassName());
- stringBuffer.append(TEXT_83);
- stringBuffer.append(genPackage.getModelWizardClassName());
- stringBuffer.append(TEXT_84);
- stringBuffer.append(genPackage.getQualifiedActionBarContributorClassName());
- stringBuffer.append(TEXT_85);
- stringBuffer.append(genPackage.getQualifiedActionBarContributorClassName());
- stringBuffer.append(TEXT_86);
- } else {
- stringBuffer.append(TEXT_87);
- stringBuffer.append(genPackage.getQualifiedModelWizardClassName());
- stringBuffer.append(TEXT_88);
- stringBuffer.append(genPackage.getModelWizardClassName());
- stringBuffer.append(TEXT_89);
- stringBuffer.append(genPackage.getQualifiedModelWizardClassName());
- stringBuffer.append(TEXT_90);
- stringBuffer.append(genPackage.getPrefix());
- stringBuffer.append(TEXT_91);
- stringBuffer.append(genPackage.getModelWizardClassName());
- stringBuffer.append(TEXT_92);
- }
- }
- stringBuffer.append(TEXT_93);
- stringBuffer.append(genPackage.getQualifiedEditorClassName());
- stringBuffer.append(TEXT_94);
- stringBuffer.append(genPackage.getEditorClassName());
- stringBuffer.append(TEXT_95);
- stringBuffer.append(genPackage.getPrefix());
- stringBuffer.append(TEXT_96);
- if (!genPackage.isContentType()) {
- stringBuffer.append(TEXT_97);
- stringBuffer.append(genPackage.getFileExtension());
- stringBuffer.append(TEXT_98);
- }
- stringBuffer.append(TEXT_99);
- stringBuffer.append(genPackage.getQualifiedEditorClassName());
- stringBuffer.append(TEXT_100);
- stringBuffer.append(genPackage.getQualifiedActionBarContributorClassName());
- stringBuffer.append(TEXT_101);
- if (genPackage.isContentType()) {
- stringBuffer.append(TEXT_102);
- stringBuffer.append(genPackage.getQualifiedContentTypeIdentifier());
- stringBuffer.append(TEXT_103);
- }
- stringBuffer.append(TEXT_104);
- }
- }
- stringBuffer.append(TEXT_105);
- if (genModel.sameEditEditorProject()) {
- for(GenPackage genPackage : genModel.getAllGenPackagesWithClassifiers()) {
- STEMGenPackage stemPkg = STEMGenPackage.get(genPackage);
- for(STEMGenClass stemGenClass : stemPkg.getComputationalModelClasses()) {
- GenClass genClass = stemGenClass.getGenClass();
- if (genClass.isAbstract() || genClass.isInterface()) { continue; }
- stringBuffer.append(TEXT_106);
- stringBuffer.append(stemGenClass.getExtensionPointName());
- stringBuffer.append(TEXT_107);
- stringBuffer.append(genClass.getQualifiedClassName());
- stringBuffer.append(TEXT_108);
- stringBuffer.append( genClass.getFormattedName() );
- stringBuffer.append(TEXT_109);
- }//endforcompmodels
- }//endforgenpackages
- }//endifsameproject
- stringBuffer.append(TEXT_110);
- for(GenPackage genPackage : genModel.getAllGenPackagesWithClassifiers()) {
- stringBuffer.append(TEXT_111);
- stringBuffer.append(genPackage.getPresentationPackageName() );
- stringBuffer.append(TEXT_112);
- stringBuffer.append(genPackage.getPrefix());
- stringBuffer.append(TEXT_113);
- stringBuffer.append(genPackage.getPresentationPackageName() );
- stringBuffer.append(TEXT_114);
- stringBuffer.append(genPackage.getPrefix());
- stringBuffer.append(TEXT_115);
- }
- stringBuffer.append(TEXT_116);
- stringBuffer.append(TEXT_117);
- return stringBuffer.toString();
- }
-}
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor.java
index 94f3e96aa..475a2bfff 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor.java
@@ -3,13 +3,13 @@ package org.eclipse.emf.codegen.ecore.templates.editor;
import org.eclipse.stem.model.codegen.*;
import org.eclipse.emf.codegen.ecore.genmodel.*;
-public class PropertyEditor_
+public class PropertyEditor
{
protected static String nl;
- public static synchronized PropertyEditor_ create(String lineSeparator)
+ public static synchronized PropertyEditor create(String lineSeparator)
{
nl = lineSeparator;
- PropertyEditor_ result = new PropertyEditor_();
+ PropertyEditor result = new PropertyEditor();
nl = null;
return result;
}
@@ -138,10 +138,12 @@ String importedModelClassName = genModel.getImportedName(stemGenClass.getModelTy
stringBuffer.append(importedModelClassName);
stringBuffer.append(TEXT_13);
if (genClass.getImplementedGenFeatures().size() > 0) {
+String importedClassName = genModel.getImportedName(genPackage.getInterfacePackageName() + "." + genClass.getName());
+
stringBuffer.append(TEXT_14);
- stringBuffer.append(genClass.getName());
+ stringBuffer.append(importedClassName);
stringBuffer.append(TEXT_15);
- stringBuffer.append(genClass.getName());
+ stringBuffer.append(importedClassName);
stringBuffer.append(TEXT_16);
}else{
stringBuffer.append(TEXT_17);
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter.java
index 16310f684..68d7309c8 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter.java
@@ -3,13 +3,13 @@ package org.eclipse.emf.codegen.ecore.templates.editor;
import org.eclipse.stem.model.codegen.*;
import org.eclipse.emf.codegen.ecore.genmodel.*;
-public class PropertyEditorAdapter_
+public class PropertyEditorAdapter
{
protected static String nl;
- public static synchronized PropertyEditorAdapter_ create(String lineSeparator)
+ public static synchronized PropertyEditorAdapter create(String lineSeparator)
{
nl = lineSeparator;
- PropertyEditorAdapter_ result = new PropertyEditorAdapter_();
+ PropertyEditorAdapter result = new PropertyEditorAdapter();
nl = null;
return result;
}
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory.java
index 6c5b0e3e5..d282a5a58 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory.java
@@ -3,13 +3,13 @@ package org.eclipse.emf.codegen.ecore.templates.editor;
import org.eclipse.stem.model.codegen.*;
import org.eclipse.emf.codegen.ecore.genmodel.*;
-public class PropertyEditorAdapterFactory_
+public class PropertyEditorAdapterFactory
{
protected static String nl;
- public static synchronized PropertyEditorAdapterFactory_ create(String lineSeparator)
+ public static synchronized PropertyEditorAdapterFactory create(String lineSeparator)
{
nl = lineSeparator;
- PropertyEditorAdapterFactory_ result = new PropertyEditorAdapterFactory_();
+ PropertyEditorAdapterFactory result = new PropertyEditorAdapterFactory();
nl = null;
return result;
}
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory.java
index 5fca60a9b..551a2ceb1 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory.java
@@ -3,13 +3,13 @@ package org.eclipse.emf.codegen.ecore.templates.editor;
import org.eclipse.stem.model.codegen.*;
import org.eclipse.emf.codegen.ecore.genmodel.*;
-public class PropertyStringProviderAdapterFactory_
+public class PropertyStringProviderAdapterFactory
{
protected static String nl;
- public static synchronized PropertyStringProviderAdapterFactory_ create(String lineSeparator)
+ public static synchronized PropertyStringProviderAdapterFactory create(String lineSeparator)
{
nl = lineSeparator;
- PropertyStringProviderAdapterFactory_ result = new PropertyStringProviderAdapterFactory_();
+ PropertyStringProviderAdapterFactory result = new PropertyStringProviderAdapterFactory();
nl = null;
return result;
}
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory.java
index 2941d6277..26ba62832 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory.java
@@ -3,13 +3,13 @@ package org.eclipse.emf.codegen.ecore.templates.editor;
import org.eclipse.stem.model.codegen.*;
import org.eclipse.emf.codegen.ecore.genmodel.*;
-public class RelativeValueProviderAdapterFactory_
+public class RelativeValueProviderAdapterFactory
{
protected static String nl;
- public static synchronized RelativeValueProviderAdapterFactory_ create(String lineSeparator)
+ public static synchronized RelativeValueProviderAdapterFactory create(String lineSeparator)
{
nl = lineSeparator;
- RelativeValueProviderAdapterFactory_ result = new RelativeValueProviderAdapterFactory_();
+ RelativeValueProviderAdapterFactory result = new RelativeValueProviderAdapterFactory();
nl = null;
return result;
}
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages.java
index 30304b1f3..d64260811 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages.java
@@ -3,13 +3,13 @@ package org.eclipse.emf.codegen.ecore.templates.editor;
import org.eclipse.stem.model.codegen.*;
import org.eclipse.emf.codegen.ecore.genmodel.*;
-public class WizardMessages_
+public class WizardMessages
{
protected static String nl;
- public static synchronized WizardMessages_ create(String lineSeparator)
+ public static synchronized WizardMessages create(String lineSeparator)
{
nl = lineSeparator;
- WizardMessages_ result = new WizardMessages_();
+ WizardMessages result = new WizardMessages();
nl = null;
return result;
}
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties.java
index 9fda41fd0..1af9a36a0 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties.java
@@ -3,13 +3,13 @@ package org.eclipse.emf.codegen.ecore.templates.editor;
import org.eclipse.stem.model.codegen.*;
import org.eclipse.emf.codegen.ecore.genmodel.*;
-public class WizardMessagesProperties_
+public class WizardMessagesProperties
{
protected static String nl;
- public static synchronized WizardMessagesProperties_ create(String lineSeparator)
+ public static synchronized WizardMessagesProperties create(String lineSeparator)
{
nl = lineSeparator;
- WizardMessagesProperties_ result = new WizardMessagesProperties_();
+ WizardMessagesProperties result = new WizardMessagesProperties();
nl = null;
return result;
}
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/BuildProperties_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/BuildProperties_.java
index 782253db5..bc1142a69 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/BuildProperties_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/BuildProperties_.java
@@ -1,7 +1,11 @@
package org.eclipse.emf.codegen.ecore.templates.model;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenRuntimePlatform;
public class BuildProperties_
{
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/BuildProperties_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/BuildProperties_.java
index d1b4b7739..a8484406e 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/BuildProperties_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/BuildProperties_.java
@@ -1,7 +1,10 @@
package org.eclipse.emf.codegen.ecore.templates.model.tests;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
public class BuildProperties_
{
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ManifestMF_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ManifestMF_.java
index 61ea40049..8ad511a59 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ManifestMF_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ManifestMF_.java
@@ -1,7 +1,10 @@
package org.eclipse.emf.codegen.ecore.templates.model.tests;
-import java.util.*;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
+import java.util.Iterator;
+
+import org.eclipse.emf.codegen.ecore.genmodel.GenJDKLevel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenRuntimeVersion;
public class ManifestMF_
{
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ModelTestSuite_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ModelTestSuite_.java
index a45a8ba12..05593de92 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ModelTestSuite_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ModelTestSuite_.java
@@ -1,7 +1,10 @@
package org.eclipse.emf.codegen.ecore.templates.model.tests;
-import java.util.*;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
+import java.util.Iterator;
+
+import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
public class ModelTestSuite_
{
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageExample_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageExample_.java
index 5a87654af..fab7cfd3a 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageExample_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageExample_.java
@@ -1,6 +1,10 @@
package org.eclipse.emf.codegen.ecore.templates.model.tests;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
+import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
+import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
+import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
public class PackageExample_
{
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageTestSuite_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageTestSuite_.java
index 286eb128e..160bb7635 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageTestSuite_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageTestSuite_.java
@@ -1,7 +1,11 @@
package org.eclipse.emf.codegen.ecore.templates.model.tests;
-import java.util.*;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
+import java.util.Iterator;
+
+import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
+import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
public class PackageTestSuite_
{
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PluginProperties_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PluginProperties_.java
index 38b8312a2..974a811a4 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PluginProperties_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PluginProperties_.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.codegen.ecore.templates.model.tests;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
+import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
public class PluginProperties_
{
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase_.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase_.java
index e9eb44126..15d517653 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase_.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase_.java
@@ -1,7 +1,14 @@
package org.eclipse.emf.codegen.ecore.templates.model.tests;
-import java.util.*;
-import org.eclipse.emf.codegen.ecore.genmodel.*;
+import java.util.Iterator;
+
+import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
+import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
+import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;
+import org.eclipse.emf.codegen.ecore.genmodel.GenJDKLevel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenOperation;
+import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
public class TestCase_
{
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorAdapter.java b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorAdapter.java
index 9a76e5b97..ba1e10562 100644
--- a/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorAdapter.java
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorAdapter.java
@@ -271,7 +271,8 @@ public class ModelGeneratorAdapter extends AbstractGeneratorAdapter
ByteArrayOutputStream baos = new ByteArrayOutputStream();
InputStream is = null;
try {
- is = (new URL(stemGenClass.getIcon().toString())).openStream();
+ URL u = new URL(stemGenClass.getIcon().toString());
+ is = u.openStream();
byte[] data = new byte[1024];
int bytes;

Back to the top