Minor fixes on plug-in metadata

8 files changed, 7 insertions, 16 deletions

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
index 8b08ab9afd7..a2c74097601 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
@@ -21,8 +21,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.dsml.validation.generation.wizard.CreateEMFValidationProject;

 import org.eclipse.papyrus.dsml.validation.model.elements.impl.ConstraintManagerImpl;

 import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;

 import org.eclipse.ui.PlatformUI;

 import org.eclipse.uml2.uml.Profile;

 

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java
index 75f212be669..a54b15313e6 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java
@@ -22,7 +22,6 @@ import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category;
 import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IValidationRule;

 import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Mode;

 import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Severity;

-import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/build.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/build.properties
index 8665ac2ffec..30e2cedf44d 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/build.properties
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/build.properties
@@ -3,4 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\

                .,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               about.html

+src.includes = about.html

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/plugin.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/plugin.xml
deleted file mode 100644
index b60f62ae57e..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-

-</plugin>

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/generation/wizard/ClassesGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/generation/wizard/ClassesGenerator.java
index d64c4416abc..d333e9f0b22 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/generation/wizard/ClassesGenerator.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/generation/wizard/ClassesGenerator.java
@@ -15,9 +15,9 @@ import java.io.IOException;
 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.emf.common.util.BasicMonitor;

 import org.eclipse.core.resources.IContainer;

 import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.common.util.BasicMonitor;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.papyrus.dsml.validation.generator.main.Generate;

 

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/generation/wizard/ValidationPluginGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/generation/wizard/ValidationPluginGenerator.java
index 7a42cb86a9b..d0ebd62ede3 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/generation/wizard/ValidationPluginGenerator.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/generation/wizard/ValidationPluginGenerator.java
@@ -23,7 +23,6 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.papyrus.customization.plugin.PluginEditor;

-import org.eclipse.papyrus.dsml.validation.model.elements.impl.ValidationRuleImpl;

 import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category;

 import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintProvider;

 import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory;

diff --git a/incoming/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
index 78e009643c3..059a6481e12 100644
--- a/incoming/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="0.9.1",

  org.eclipse.core.resources,

  org.eclipse.jdt.core,

- org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.1",

  org.eclipse.emf.facet.infra.facet,

  org.eclipse.pde.ui;bundle-version="3.6.100"

 Export-Package: org.eclipse.papyrus.eclipse.project.editors.file,

diff --git a/incoming/org.eclipse.papyrus.eclipse.project.editors/build.properties b/incoming/org.eclipse.papyrus.eclipse.project.editors/build.properties
index 3fbd2f3c6c5..1b08f841b5e 100644
--- a/incoming/org.eclipse.papyrus.eclipse.project.editors/build.properties
+++ b/incoming/org.eclipse.papyrus.eclipse.project.editors/build.properties
@@ -4,6 +4,4 @@ bin.includes = META-INF/,\
                .,\

                about.html,\

                plugin.properties

-src.includes = about.html,\

-               plugin.properties,\

-               META-INF/

+src.includes = about.html