Fix for HTML Description, Change method visibility in DiagramViewer,
move PopUpMenuLinkAdapter from internal to api package
Change-Id: Ibb0acf03cf294e445f81b838aaec4ae42d7ceae5
Signed-off-by: Guillaume Gebhart <guillaume.gebhart@thalesgroup.com>
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/actions/AbstractActivityExplorerAction.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/actions/AbstractActivityExplorerAction.java
index f713070..b1d6cbc 100644
--- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/actions/AbstractActivityExplorerAction.java
+++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/actions/AbstractActivityExplorerAction.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.amalgam.explorer.activity.ui.api.actions;
-import org.eclipse.amalgam.explorer.activity.ui.internal.actions.util.PopupMenuLinkAdapter;
+import org.eclipse.amalgam.explorer.activity.ui.api.hyperlinkadapter.PopupMenuLinkAdapter;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/helper/HTMLHelper.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/helper/HTMLHelper.java
index 201982b..f70327b 100644
--- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/helper/HTMLHelper.java
+++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/helper/HTMLHelper.java
@@ -59,10 +59,7 @@
public static String formWrapper2(String txt) {
StringBuffer buffer = new StringBuffer();
buffer.append("<form>"); //$NON-NLS-1$
- //buffer.append("<p>"); //$NON-NLS-1
-
buffer.append(txt);
- //buffer.append("</p>"); //$NON-NLS-1$
buffer.append("</form>"); //$NON-NLS-1$
return buffer.toString();
}
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/viewers/DiagramViewer.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/viewers/DiagramViewer.java
index 4f73279..245a605 100644
--- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/viewers/DiagramViewer.java
+++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/viewers/DiagramViewer.java
@@ -268,7 +268,7 @@
* @return
*/
@SuppressWarnings("unchecked")
- boolean containsOnlyRepresentations(IStructuredSelection selection_p) {
+ protected boolean containsOnlyRepresentations(final IStructuredSelection selection_p) {
boolean result = true;
Iterator<Object> iterator = selection_p.toList().iterator();
while (iterator.hasNext() && result) {
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/sections/ActivityExplorerSection.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/sections/ActivityExplorerSection.java
index 1cd0ca2..071496c 100644
--- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/sections/ActivityExplorerSection.java
+++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/sections/ActivityExplorerSection.java
@@ -15,6 +15,7 @@
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+import java.util.regex.Pattern;
import org.eclipse.amalgam.explorer.activity.ui.ActivityExplorerActivator;
import org.eclipse.amalgam.explorer.activity.ui.api.editor.activities.ExplorerActivity;
@@ -43,6 +44,8 @@
*/
public class ActivityExplorerSection implements IVisibility, IOrdered, IPropertyChangeListener {
+ private static final String P_PATTERN = "<p>.*</p>"; //$NON-NLS-1$
+
/**
* Constructor.
*
@@ -53,8 +56,11 @@
this.name = ActivityExplorerExtensionManager.getName(contributor_p);
this.isExpanded = ActivityExplorerExtensionManager.getIsExpanded(contributor_p);
String desc = ActivityExplorerExtensionManager.getDescription(contributor_p);
- if (null != desc)
- this.description = HTMLHelper.formWrapper(desc);
+ if (null != desc){
+ Pattern pPattern = Pattern.compile(P_PATTERN);
+ boolean isInParagraph = pPattern.matcher(desc).find();
+ this.description = isInParagraph ? HTMLHelper.formWrapper2(desc) : HTMLHelper.formWrapper(desc);
+ }
this.index = Integer.parseInt(ActivityExplorerExtensionManager.getIndex(contributor_p));
this.isFiltering = ActivityExplorerExtensionManager.getIsFiltering(contributor_p);
createActivities(contributor_p);
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/internal/actions/util/PopupMenuLinkAdapter.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/hyperlinkadapter/PopupMenuLinkAdapter.java
similarity index 95%
rename from plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/internal/actions/util/PopupMenuLinkAdapter.java
rename to plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/hyperlinkadapter/PopupMenuLinkAdapter.java
index 1d6ec50..b6254b2 100644
--- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/internal/actions/util/PopupMenuLinkAdapter.java
+++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/hyperlinkadapter/PopupMenuLinkAdapter.java
@@ -8,7 +8,7 @@
* Contributors:
* Thales - initial API and implementation
*******************************************************************************/
-package org.eclipse.amalgam.explorer.activity.ui.internal.actions.util;
+package org.eclipse.amalgam.explorer.activity.ui.api.hyperlinkadapter;
import org.eclipse.amalgam.explorer.activity.ui.internal.QuickMenuCreator;
import org.eclipse.jface.action.IMenuManager;
