342653: [Hyperlink] Hyperlink dialogs too small. Editability of textfields is wrong. Tooltip incorrect.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=342653

3 files changed, 50 insertions, 33 deletions

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/DefaultHyperLinkTab.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/DefaultHyperLinkTab.java
index 751527b5241..7d735e4a69b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/DefaultHyperLinkTab.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/DefaultHyperLinkTab.java
@@ -60,12 +60,12 @@ public class DefaultHyperLinkTab extends AbstractHyperLinkTab {
 	/**

 	 * 

 	 * Constructor.

-	 *

+	 * 

 	 * @param tabId

 	 * @param helper

 	 */

 	public DefaultHyperLinkTab(final String tabId, final AbstractHyperLinkHelper helper) {

-		super(tabId,helper);

+		super(tabId, helper);

 	}

 

 	protected TableViewer availableHyperLinkViewer;

@@ -155,6 +155,7 @@ public class DefaultHyperLinkTab extends AbstractHyperLinkTab {
 

 			}

 		});

+		defaultHRight.setToolTipText("Set default hyperlink");

 

 		defaultHleft = new Button(defaultHyperlinkComposite, SWT.NONE);

 		defaultHleft.setBounds(availableHyperLink.getBounds().x + availableHyperLink.getBounds().width + 20, availableHyperLink.getBounds().y + availableHyperLink.getBounds().height / 2, 30, 23);

@@ -183,6 +184,7 @@ public class DefaultHyperLinkTab extends AbstractHyperLinkTab {
 

 			}

 		});

+		defaultHleft.setToolTipText("Remove default hyperlink");

 

 

 		Table defaultHyperLink = new Table(defaultHyperlinkComposite, SWT.BORDER | SWT.FULL_SELECTION);

@@ -191,6 +193,7 @@ public class DefaultHyperLinkTab extends AbstractHyperLinkTab {
 

 		defaultHup = new Button(defaultHyperlinkComposite, SWT.NONE);

 		defaultHup.setBounds(defaultHyperLink.getBounds().x + defaultHyperLink.getBounds().width + 20, defaultHyperLink.getBounds().y + (defaultHyperLink.getBounds().height / 2) - 30, 34, 23);

+		defaultHup.setToolTipText("Move default hyperlink up");

 

 		defaultHup.addMouseListener(new MouseListener() {

 

@@ -222,6 +225,7 @@ public class DefaultHyperLinkTab extends AbstractHyperLinkTab {
 

 		defaultHdown = new Button(defaultHyperlinkComposite, SWT.NONE);

 		defaultHdown.setBounds(defaultHyperLink.getBounds().x + defaultHyperLink.getBounds().width + 20, defaultHyperLink.getBounds().y + defaultHyperLink.getBounds().height / 2, 34, 23);

+		defaultHdown.setToolTipText("Move default hyperlink down");

 

 		defaultHdown.addMouseListener(new MouseListener() {

 

@@ -310,6 +314,7 @@ public class DefaultHyperLinkTab extends AbstractHyperLinkTab {
 	 * @param hyperLinkObjectList

 	 *        the list of hyperlinks

 	 */

+	@Override

 	public void setInput(List<HyperLinkObject> hyperLinkObjectList) {

 		defaultHyperLinkObject.clear();

 		availableHyperLinkObject.clear();

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkTab.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkTab.java
index db2f2eee66a..1b61350f203 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkTab.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkTab.java
@@ -87,7 +87,7 @@ public class HyperLinkTab extends AbstractHyperLinkTab {
 	/**

 	 * 

 	 * Constructor.

-	 *

+	 * 

 	 * @param tabId

 	 * @param helper

 	 */

@@ -108,6 +108,7 @@ public class HyperLinkTab extends AbstractHyperLinkTab {
 	 * 

 	 * @return the list of hyperlink displayed in the tab

 	 */

+	@Override

 	public List<HyperLinkObject> getHyperlinkObjects() {

 		return hyperlinkObjects;

 	}

@@ -164,7 +165,7 @@ public class HyperLinkTab extends AbstractHyperLinkTab {
 		listLabel.setText(Messages.HyperLinkTab_Listof + hyperLinkHelper.getNameofManagedHyperLink() + Messages.HyperLinkTab_Hyperlink);

 		listLabel.setEnabled(false);

 		listLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));

-		

+

 		new Label(diagramComposite, SWT.NONE);

 		hyperLinkListTable = new Table(diagramComposite, SWT.BORDER | SWT.MULTI);

 		tableViewer = new TableViewer(hyperLinkListTable);

@@ -173,23 +174,29 @@ public class HyperLinkTab extends AbstractHyperLinkTab {
 		newHyperLinkbutton.setText(""); //$NON-NLS-1$

 		newHyperLinkbutton.setImage(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.papyrus.uml.diagram.common", "/icons/obj16/Add_16x16.gif").createImage()); //$NON-NLS-1$ //$NON-NLS-2$

 		newHyperLinkbutton.setLayoutData(gridData4);

+		newHyperLinkbutton.setToolTipText("New hyperlink");

+

 		hyperLinkListTable.setHeaderVisible(false);

 		hyperLinkListTable.setToolTipText(Messages.HyperLinkTab_SetOf + hyperLinkHelper.getNameofManagedHyperLink() + Messages.HyperLinkTab_Hyperlinks);

 		hyperLinkListTable.setLayoutData(gridData1);

 		hyperLinkListTable.setLinesVisible(false);

 		modifyHyperLinkButton = new Button(diagramComposite, SWT.NONE);

 		modifyHyperLinkButton.setImage(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.papyrus.uml.diagram.common", "/icons/obj16/Modify.gif").createImage()); //$NON-NLS-1$ //$NON-NLS-2$

+		modifyHyperLinkButton.setToolTipText("Edit hyperlink");

 

 		removeHyperLinkButton = new Button(diagramComposite, SWT.NONE);

 		removeHyperLinkButton.setText(""); //$NON-NLS-1$

 		removeHyperLinkButton.setImage(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.papyrus.uml.diagram.common", "/icons/obj16/Delete_16x16.gif").createImage()); //$NON-NLS-1$ //$NON-NLS-2$

+		removeHyperLinkButton.setToolTipText("Remove hyperlink");

 

 		upHyperLinkButton = new Button(diagramComposite, SWT.NONE);

 		upHyperLinkButton.setImage(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.papyrus.uml.diagram.common", "/icons/obj16/ArrowUp_16x16.gif").createImage()); //$NON-NLS-1$ //$NON-NLS-2$

+		upHyperLinkButton.setToolTipText("Move hyperlink up");

 

 		upHyperLinkButton.setLayoutData(gridData2);

 		downHyperLinkButton = new Button(diagramComposite, SWT.NONE);

 		downHyperLinkButton.setImage(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.papyrus.uml.diagram.common", "/icons/obj16/ArrowDown_16x16.gif").createImage()); //$NON-NLS-1$ //$NON-NLS-2$

+		downHyperLinkButton.setToolTipText("Move hyperlink down");

 

 		downHyperLinkButton.setLayoutData(gridData3);

 		addListeners();

@@ -357,9 +364,13 @@ public class HyperLinkTab extends AbstractHyperLinkTab {
 	 * @param hyperlinkObjects

 	 *        the lis of hyperlinkobjects

 	 */

+	@Override

 	public void setInput(List<HyperLinkObject> hyperlinkObjects) {

-		this.hyperlinkObjects = this.hyperLinkHelper.getFilteredObject(hyperlinkObjects);

-		getTableViewer().setInput(this.hyperlinkObjects);

-

+		if(!getTableViewer().getControl().isDisposed()) {

+			this.hyperlinkObjects = this.hyperLinkHelper.getFilteredObject(hyperlinkObjects);

+			getTableViewer().setInput(this.hyperlinkObjects);

+		} else {

+			Activator.log.warn("This hyperlink tab has been disposed");

+		}

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/HyperLinkPopupBarEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/HyperLinkPopupBarEditPolicy.java
index d24251912dd..75334c4360d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/HyperLinkPopupBarEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/HyperLinkPopupBarEditPolicy.java
@@ -284,7 +284,7 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 			if(1 == me.button) // context menu, hide the popup bar

 			{

 				if(me.getSource() instanceof PopupBarLabelPlusHandle) {

-					hyperLinkManagerShell = new AdvancedHLManager(getEditorRegistry(), ((GraphicalEditPart)getHost()).getEditingDomain(), (Element)((GraphicalEditPart)getHost()).getNotationView().getElement(), ((GraphicalEditPart)getHost()).getNotationView(), topPackage((Element)((GraphicalEditPart)getHost()).getNotationView().getElement()),hyperlinkHelperFactory);

+					hyperLinkManagerShell = new AdvancedHLManager(getEditorRegistry(), ((GraphicalEditPart)getHost()).getEditingDomain(), (Element)((GraphicalEditPart)getHost()).getNotationView().getElement(), ((GraphicalEditPart)getHost()).getNotationView(), topPackage((Element)((GraphicalEditPart)getHost()).getNotationView().getElement()), hyperlinkHelperFactory);

 					hyperLinkManagerShell.setInput(hyperLinkObjectList);

 					hyperLinkManagerShell.open();

 

@@ -370,25 +370,25 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	/** The POPUPBA r_ mov e_ figure. */

 	// @unused

 	static private int POPUPBAR_MOVE_FIGURE = 0x02; /*

-	 * Ignore the first

-	 * figureMoved event when

-	 * creating elements inside

-	 * a shape via a popup bar

-	 */

+													 * Ignore the first

+													 * figureMoved event when

+													 * creating elements inside

+													 * a shape via a popup bar

+													 */

 

 	/** The POPUPBA r_ ondiagramactivated. */

 	// @unused

 	static private int POPUPBAR_ONDIAGRAMACTIVATED = 0x10; /*

-	 * For popup bars on

-	 * diagram and

-	 * machine edit

-	 * parts, where we

-	 * POPUPBAR_DISPLAYATMOUSEHOVERLOCATION

-	 * , don't display

-	 * popup bar until

-	 * user clicks on

-	 * surface

-	 */

+															 * For popup bars on

+															 * diagram and

+															 * machine edit

+															 * parts, where we

+															 * POPUPBAR_DISPLAYATMOUSEHOVERLOCATION

+															 * , don't display

+															 * popup bar until

+															 * user clicks on

+															 * surface

+															 */

 

 	/** The editor registry. */

 	private IPageIconsRegistry editorRegistry;

@@ -406,6 +406,7 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	private final PopupBarMouseListener myMouseKeyListener = new PopupBarMouseListener();

 

 	protected ArrayList<HyperLinkObject> hyperLinkObjectList;

+

 	protected HyperLinkHelperFactory hyperlinkHelperFactory;

 

 	/**

@@ -418,15 +419,15 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 

 	public HyperLinkPopupBarEditPolicy() {

 		super();

-		ArrayList<AbstractHyperLinkHelper>  hyperLinkHelpers= new ArrayList<AbstractHyperLinkHelper>();

+		ArrayList<AbstractHyperLinkHelper> hyperLinkHelpers = new ArrayList<AbstractHyperLinkHelper>();

 		//TODO 

-//		hyperLinkHelpers.add(new DiagramHyperLinkHelper());

-//		hyperLinkHelpers.add(new DocumentHyperLinkHelper());

-//		hyperLinkHelpers.add(new WebHyperLinkHelper());

+		//		hyperLinkHelpers.add(new DiagramHyperLinkHelper());

+		//		hyperLinkHelpers.add(new DocumentHyperLinkHelper());

+		//		hyperLinkHelpers.add(new WebHyperLinkHelper());

 		hyperLinkHelpers.addAll(HyperLinkHelpersRegistrationUtil.INSTANCE.getAllRegisteredHyperLinkHelper());

-		hyperlinkHelperFactory= new HyperLinkHelperFactory(hyperLinkHelpers);

+		hyperlinkHelperFactory = new HyperLinkHelperFactory(hyperLinkHelpers);

 	}

-	

+

 	/**

 	 * Adds the object list in the popup bar.

 	 * 

@@ -441,9 +442,9 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 */

 	public int addObjectList(int positonwidth, List<?> objectList) {

 		for(int i = 0; i < objectList.size(); i++) {

-			PopupBarLabelHandle handle=null;

-			HyperLinkLabelProvider hyperLinkLabelProvider= new HyperLinkLabelProvider(getEditorRegistry());

-			handle= new PopupBarLabelHandle(hyperLinkObjectList.get(i), hyperLinkLabelProvider.getImage(objectList.get(i)));

+			PopupBarLabelHandle handle = null;

+			HyperLinkLabelProvider hyperLinkLabelProvider = new HyperLinkLabelProvider(getEditorRegistry());

+			handle = new PopupBarLabelHandle(hyperLinkObjectList.get(i), hyperLinkLabelProvider.getImage(objectList.get(i)));

 

 			Rectangle r1 = new Rectangle();

 			r1.setLocation(positonwidth, 5);

@@ -626,7 +627,7 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 			r1.setSize(16, 16);

 

 			Label l = new Label();

-			l.setText("Add Diagram");

+			l.setText("Add hyperlink");

 

 			handle.setToolTip(l);

 			handle.setPreferredSize(16, 16);