summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael ADAM2014-05-27 10:41:43 (EDT)
committerMickael ADAM2014-05-27 10:41:43 (EDT)
commite9001c849eb5dc6692ef9a2b69428eeb7ca97565 (patch)
tree9dcad5fa4d0131e9c8d4239c4c6659bbc5f89f22
parenta558e1e89ffcaad4ead52967b18fb7e5c86e6c97 (diff)
downloadorg.eclipse.papyrus-e9001c849eb5dc6692ef9a2b69428eeb7ca97565.zip
org.eclipse.papyrus-e9001c849eb5dc6692ef9a2b69428eeb7ca97565.tar.gz
org.eclipse.papyrus-e9001c849eb5dc6692ef9a2b69428eeb7ca97565.tar.bz2
435929: [EMF Facet] update facet referencesrefs/changes/77/27377/1
https://bugs.eclipse.org/bugs/show_bug.cgi?id=435929 - update facet references to oep.emf.facet instead of org.eclipse.emf.facet Change-Id: I81fbc58398a3579aedb216a2c83810a25d9c997b Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
-rw-r--r--plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF1
-rw-r--r--sandbox/org.eclipse.papyrus.emf.commandstack/META-INF/MANIFEST.MF4
-rw-r--r--sandbox/org.eclipse.papyrus.emf.commandstack/src/org/eclipse/papyrus/emf/commandstack/view/CommandStackView.java7
3 files changed, 3 insertions, 9 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
index 137ad11..0b7dd9d 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Export-Package: org.eclipse.papyrus.gmf.editpartview,
org.eclipse.papyrus.gmf.editpartview.view
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.emf.facet.common.ui,
org.eclipse.gmf.runtime.diagram.ui,
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.papyrus.editor;bundle-version="1.0.0",
diff --git a/sandbox/org.eclipse.papyrus.emf.commandstack/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.emf.commandstack/META-INF/MANIFEST.MF
index a84aa40..aee1e3a 100644
--- a/sandbox/org.eclipse.papyrus.emf.commandstack/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.emf.commandstack/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.emf.facet.common.ui,
org.eclipse.emf.edit;bundle-version="2.7.1",
org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
org.eclipse.emf.workspace;bundle-version="1.4.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0"
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
+ org.eclipse.papyrus.emf.facet.common.ui
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.10.0.qualifier
diff --git a/sandbox/org.eclipse.papyrus.emf.commandstack/src/org/eclipse/papyrus/emf/commandstack/view/CommandStackView.java b/sandbox/org.eclipse.papyrus.emf.commandstack/src/org/eclipse/papyrus/emf/commandstack/view/CommandStackView.java
index 5f76761..752cd73 100644
--- a/sandbox/org.eclipse.papyrus.emf.commandstack/src/org/eclipse/papyrus/emf/commandstack/view/CommandStackView.java
+++ b/sandbox/org.eclipse.papyrus.emf.commandstack/src/org/eclipse/papyrus/emf/commandstack/view/CommandStackView.java
@@ -33,7 +33,6 @@ import org.eclipse.core.commands.operations.OperationHistoryFactory;
import org.eclipse.emf.common.command.AbstractCommand;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.facet.common.ui.internal.views.AbstractTreeView;
import org.eclipse.emf.workspace.EMFCommandOperation;
import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
@@ -46,6 +45,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.emf.facet.common.ui.internal.views.AbstractTreeView;
public class CommandStackView extends AbstractTreeView {
@@ -69,7 +69,6 @@ public class CommandStackView extends AbstractTreeView {
IUndoableOperation removedOperation = CommandStackView.this.commandList.remove(CommandStackView.this.maxSize - 1);
dates.remove(removedOperation);
}
-
CommandStackView.this.commandList.add(0, event.getOperation());
final DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
final Calendar cal = Calendar.getInstance();
@@ -124,7 +123,6 @@ public class CommandStackView extends AbstractTreeView {
public String getText() {
return "Clear the view";
}
-
});
}
@@ -210,7 +208,6 @@ public class CommandStackView extends AbstractTreeView {
return ((Collection<?>)inputElement).toArray();
}
return new Object[0];
-
}
public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {
@@ -260,7 +257,6 @@ public class CommandStackView extends AbstractTreeView {
@Override
protected void openElement(final Object element) {
// TODO Auto-generated method stub
-
}
@Override
@@ -286,5 +282,4 @@ public class CommandStackView extends AbstractTreeView {
this.commandList.clear();
this.dates.clear();
}
-
}