From 5b5615f51f149e0bec7d484e087029c4da99f2f5 Mon Sep 17 00:00:00 2001
From: Benoit Maggi
Date: Tue, 26 Sep 2017 13:47:38 +0200
Subject: [Quality] Improve example for comment editor

 - no bug since bugzilla down
 - extract Bundle Vendor and Bundle Name
 - replace deprecated api
 - remove unused import

Change-Id: Ic9b8371b166484c29c4b9522fc673d96d2711661
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
---
 .../META-INF/MANIFEST.MF                                           | 7 ++++---
 .../build.properties                                               | 3 ++-
 .../plugin.properties                                              | 5 ++++-
 .../comment/editor/newresource/handler/CommentEditorHandler.java   | 2 +-
 .../newresource/modelresource/TextEditorModelCommentResource.java  | 4 ----
 .../META-INF/MANIFEST.MF                                           | 7 ++++---
 .../build.properties                                               | 3 ++-
 .../plugin.properties                                              | 4 +++-
 .../comment/editor/sharedresource/editor/PapyrusCommentEditor.java | 3 +--
 .../editor/sharedresource/handler/CommentEditorHandler.java        | 5 ++---
 10 files changed, 23 insertions(+), 20 deletions(-)

(limited to 'examples')

diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF
index ba8423aaa3f..a4f7e4855f0 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF
@@ -16,14 +16,15 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.type.core,
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="3.10.0"
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier
-Bundle-Name: Papyrus Comment Editor Example (Incubation)
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.example.uml.comment.editor.newre
  source.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.example.uml.comment.editor.ne
  wresource;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Description: %pluginDescription
+Bundle-Description: %Bundle-Description
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties
index 274b1327ea1..d5b16c20732 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties
@@ -5,5 +5,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                build.properties,\
-               about.html
+               about.html,\
+               plugin.properties
 src.includes = about.html
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
index 0bf1dafb010..3c206cb810b 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
@@ -9,4 +9,7 @@
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
 ##################################################################################)
 
-pluginDescription=This plugin provides a editor for uml.Comment. The informations are stored in a new file : .comment
\ No newline at end of file
+Bundle-Description=This plugin provides a editor for uml.Comment. The informations are stored in a new file : .comment
+Bundle-Name=Papyrus Comment New Resource Editor Example (Incubation)
+Bundle-Vendor=Eclipse Modeling Project
+
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java
index 9c568b671eb..43609dd2c13 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.workspace.AbstractEMFOperation;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
+import org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory;
 import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
 import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrustextinstanceFactory;
 import org.eclipse.papyrus.example.uml.comment.editor.newresource.Activator;
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java
index 4ca8c4beb3a..f1264f6a55f 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java
@@ -15,7 +15,6 @@ package org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
 import org.eclipse.papyrus.infra.core.resource.AbstractDynamicModel;
 import org.eclipse.papyrus.infra.core.resource.IModel;
@@ -103,13 +102,10 @@ public class TextEditorModelCommentResource extends AbstractDynamicModel<Papyrus
 	}
 
 	public boolean canPersist(EObject object) {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	public void persist(EObject object) {
-		// TODO Auto-generated method stub
-
 	}
 
 }
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF
index d62afec137b..343708ab012 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF
@@ -16,14 +16,15 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.type.core,
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="3.10.0"
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier
-Bundle-Name: Papyrus Comment Editor Example (Incubation)
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.example.uml.comment.editor.share
  dresource.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.example.uml.comment.editor.sh
  aredresource;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Description: %pluginDescription
+Bundle-Description: %Bundle-Description
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties
index 1bf7b240421..c0047a76a41 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties
@@ -5,4 +5,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                build.properties,\
-               icons/
+               icons/,\
+               plugin.properties
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
index 239f4eed2c8..4fd9cd404f6 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
@@ -9,4 +9,6 @@
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
 ##################################################################################)
 
-pluginDescription=This plugin provides a editor for uml.Comment. The informations are stored in the .notation
\ No newline at end of file
+Bundle-Description=This plugin provides a editor for uml.Comment. The informations are stored in the .notation
+Bundle-Name=Papyrus Comment Shared Resource Editor Example (Incubation)
+Bundle-Vendor=Eclipse Modeling Project
\ No newline at end of file
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java
index 90faad4d747..c90ee854435 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java
@@ -21,7 +21,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -29,12 +28,12 @@ import org.eclipse.jface.text.ITextListener;
 import org.eclipse.jface.text.TextEvent;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
 import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.Activator;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.swt.widgets.Composite;
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java
index b34859ca5eb..3860fa94dbd 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.workspace.AbstractEMFOperation;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
+import org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory;
 import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
 import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrustextinstanceFactory;
 import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.Activator;
@@ -74,7 +74,7 @@ public class CommentEditorHandler  extends AbstractHandler {
 		while(iter.hasNext()) {
 			Object current = iter.next();
 			if(current instanceof IAdaptable){
-				EObject tmp = (EObject)((IAdaptable)current).getAdapter(EObject.class);
+				EObject tmp = ((IAdaptable)current).getAdapter(EObject.class);
 				if(tmp!=null){
 					if(tmp instanceof Comment){
 						currentSelection.add(tmp);
@@ -94,7 +94,6 @@ public class CommentEditorHandler  extends AbstractHandler {
 	 */
 	public Object execute(final ExecutionEvent event) throws ExecutionException {
 		try {
-
 			runAsTransaction();
 		} catch (ServiceException e) {
 			throw new ExecutionException("I can't create CompareEditor", e); //$NON-NLS-1$
-- 
cgit v1.2.3