diff options
Diffstat (limited to 'plugins')
6 files changed, 15 insertions, 27 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/util/DawngenmodelSwitch.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/util/DawngenmodelSwitch.java index e8976aee53..bc38c0d9cb 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/util/DawngenmodelSwitch.java +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/util/DawngenmodelSwitch.java @@ -81,11 +81,8 @@ public class DawngenmodelSwitch<T> { return doSwitch(theEClass.getClassifierID(), theEObject); } - else - { - List<EClass> eSuperTypes = theEClass.getESuperTypes(); - return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); - } + List<EClass> eSuperTypes = theEClass.getESuperTypes(); + return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); } /** diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF index 8bdbdcbc2d..25cb9c3dd6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF @@ -32,8 +32,11 @@ Require-Bundle: com.ibm.icu;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.dawn.codegen.dawngenmodel;bundle-version="[0.2.0,1.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.dawn.codegen;version="0.2.0", +Export-Package: metamodel;version="0.2.0";x-internal:=true, + org.eclipse.emf.cdo.dawn.codegen;version="0.2.0", org.eclipse.emf.cdo.dawn.codegen.actions;version="0.2.0", org.eclipse.emf.cdo.dawn.codegen.creators;version="0.2.0", org.eclipse.emf.cdo.dawn.codegen.creators.impl;version="0.2.0", - org.eclipse.emf.cdo.dawn.codegen.util;version="0.2.0" + org.eclipse.emf.cdo.dawn.codegen.util;version="0.2.0", + template;version="0.2.0";x-internal:=true, + workflow;version="0.2.0";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/GMFFragmentCreator.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/GMFFragmentCreator.java index c481c5ccf2..a7908d3e85 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/GMFFragmentCreator.java +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/GMFFragmentCreator.java @@ -32,7 +32,6 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.pde.internal.core.natures.PDE; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -47,6 +46,10 @@ public class GMFFragmentCreator implements Creator { private final IResource selectedElement; + private final String PLUGIN_NATURE = "org.eclipse.pde.PluginNature"; + + private final String JAVA_NATURE = JavaCore.NATURE_ID; + public GMFFragmentCreator(IResource selectedElement) { this.selectedElement = selectedElement; @@ -67,7 +70,9 @@ public class GMFFragmentCreator implements Creator monitor.subTask("Create client fragment's basic structure"); - String[] natures = new String[] { JavaCore.NATURE_ID, PDE.PLUGIN_NATURE }; + // String[] natures = new String[] { JavaCore.NATURE_ID, PDE.PLUGIN_NATURE }; + String[] natures = new String[] { JAVA_NATURE, PLUGIN_NATURE }; + ProjectCreationHelper projectCreationHelper = new ProjectCreationHelper(); projectCreationHelper.setName(dawnGMFGenerator.getFragmentName()); projectCreationHelper.setNatures(natures); diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java index 1d248f36f4..a7a05843ef 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java @@ -10,7 +10,6 @@ */ package org.eclipse.emf.cdo.dawn.codegen.util; -import org.eclipse.core.internal.resources.ResourceException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -331,7 +330,7 @@ public class ProjectCreationHelper javaProject.setOutputLocation(binFolder.getFullPath(), null); } } - catch (ResourceException e) + catch (Exception e) { e.printStackTrace(); } diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/build.properties b/plugins/org.eclipse.emf.cdo.dawn.util/build.properties index 980657235d..aa92976178 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.util/build.properties +++ b/plugins/org.eclipse.emf.cdo.dawn.util/build.properties @@ -12,7 +12,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml,\ plugin.properties,\ about.html,\ copyright.txt,\ diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/plugin.xml b/plugins/org.eclipse.emf.cdo.dawn.util/plugin.xml deleted file mode 100644 index 12f13c401c..0000000000 --- a/plugins/org.eclipse.emf.cdo.dawn.util/plugin.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.4"?> -<!-- - Copyright (c) 2010 Martin Fluegge (Berlin, Germany) 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: - Martin Fluegge - initial API and implementation ---> -<plugin> - -</plugin> |