open link menu removed instead of disabled if there is no link #743

umlet · Nov 30, 2023 · e4a736f · e4a736f
1 parent 60a909d
commit e4a736f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 33 deletions.
diff --git a/umlet-elements/src/main/java/com/baselet/control/constants/MenuConstants.java b/umlet-elements/src/main/java/com/baselet/control/constants/MenuConstants.java
@@ -58,7 +58,7 @@ public class MenuConstants {
 	public static final String LAYER = "Layer";
 	public static final String LAYER_UP = "to front (layer +1)";
 	public static final String LAYER_DOWN = "to back (layer -1)";
-	public static final String OPEN_LINK = "Open Link";
+	public static final String OPEN_LINK = "Open Link"; // currently only supported in standalone Umlet
 
 	// OTHERS
 	public static final String SEARCH = "Search";

diff --git a/umlet-elements/src/main/java/com/baselet/element/facet/common/LinkFacet.java b/umlet-elements/src/main/java/com/baselet/element/facet/common/LinkFacet.java
@@ -4,18 +4,19 @@
 import com.baselet.element.facet.PropertiesParserState;
 
 public class LinkFacet extends FirstRunKeyValueFacet {
+	public static final String LINK = "link";
 
 	public static final LinkFacet INSTANCE = new LinkFacet();
 
 	private LinkFacet() {}
 
 	@Override
 	public KeyValue getKeyValue() {
-		return new KeyValue("link", false, "../../dummyLink.uxf", "path to a uxf file relative to the path of current file.");
+		return new KeyValue(LINK, false, "../diagram.uxf", "path to another uxf file (absolute or relative)");
 	}
 
 	@Override
 	public void handleValue(String value, PropertiesParserState state) {
-            /* Empty at first. */
+		// only a marker facet to add a context menu entry to open the linked diagram
 	}
 }
diff --git a/umlet-swing/src/main/java/com/baselet/control/util/Utils.java b/umlet-swing/src/main/java/com/baselet/control/util/Utils.java
@@ -15,6 +15,7 @@
 import com.baselet.control.constants.FacetConstants;
 import com.baselet.control.enums.LineType;
 import com.baselet.diagram.draw.DoubleStroke;
+import com.baselet.element.facet.common.LinkFacet;
 
 public abstract class Utils {
 
@@ -54,7 +55,7 @@ private static Vector<String> decomposeStringsWFilter(String fullString, String
 		String compatibleFullString = fullString.replaceAll("\r\n", delimiter); // compatibility to windows \r\n
 
 		for (String line : compatibleFullString.split("\\" + delimiter)) {
-			if (filterComments && line.matches("((//)|(fg=)|(bg=)|(autoresize=)|(layer=)|(group=)|(link=)).*")) {
+			if (filterComments && line.matches("((//)|(fg=)|(bg=)|(autoresize=)|(layer=)|(group=)|(" + LinkFacet.LINK + "=)).*")) {
 				continue;
 			}
 			else if (filterNewLines && line.isEmpty()) {

diff --git a/umlet-swing/src/main/java/com/baselet/gui/BaseGUI.java b/umlet-swing/src/main/java/com/baselet/gui/BaseGUI.java
@@ -12,9 +12,6 @@
 import javax.swing.UIManager;
 import javax.swing.plaf.InsetsUIResource;
 
-import com.baselet.util.logging.Logger;
-import com.baselet.util.logging.LoggerFactory;
-
 import com.baselet.control.CanCloseProgram;
 import com.baselet.control.HandlerElementMap;
 import com.baselet.control.config.Config;
@@ -27,6 +24,8 @@
 import com.baselet.element.old.custom.CustomElementHandler;
 import com.baselet.gui.menu.MenuFactorySwing;
 import com.baselet.gui.pane.OwnSyntaxPane;
+import com.baselet.util.logging.Logger;
+import com.baselet.util.logging.LoggerFactory;
 
 public abstract class BaseGUI {
 
@@ -60,7 +59,9 @@ public JPopupMenu getContextMenu(GridElement e) {
 		MenuFactorySwing menuFactory = MenuFactorySwing.getInstance();
 
 		JPopupMenu contextMenu = new JPopupMenu();
-		contextMenu.add(createOpenLinkMenu(menuFactory));
+		if (selected_elements.size() == 1 && selected_elements.iterator().next().getSetting("link") != null) {
+			contextMenu.add(menuFactory.createOpenLinkMenu());
+		}
 		if (e instanceof CustomElement) {
 			contextMenu.add(menuFactory.createEditSelected());
 		}
@@ -91,12 +92,6 @@ public JPopupMenu getContextMenu(GridElement e) {
 		return contextMenu;
 	}
 
-	private JMenuItem createOpenLinkMenu(MenuFactorySwing menuFactory) {
-		JMenuItem item = menuFactory.createOpenLinkMenu();
-		item.setEnabled((selected_elements.size() == 1) && (selected_elements.iterator().next().getSetting("link") != null));
-		return item;
-	}
-
 	private JMenu createLayerMenu(MenuFactorySwing menuFactory) {
 		JMenu layerMenu = menuFactory.createLayerUp();
 		layerMenu.setEnabled(!selected_elements.isEmpty());

diff --git a/umlet-swing/src/main/java/com/baselet/gui/menu/MenuFactory.java b/umlet-swing/src/main/java/com/baselet/gui/menu/MenuFactory.java
@@ -42,10 +42,9 @@
 import static com.baselet.control.constants.MenuConstants.UNGROUP;
 import static com.baselet.control.constants.MenuConstants.VIDEO_TUTORIAL;
 
-import java.io.File;
-
 import java.awt.MouseInfo;
 import java.awt.Point;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -64,6 +63,7 @@
 import com.baselet.diagram.io.ClassChooser;
 import com.baselet.element.facet.common.GroupFacet;
 import com.baselet.element.facet.common.LayerFacet;
+import com.baselet.element.facet.common.LinkFacet;
 import com.baselet.element.interfaces.GridElement;
 import com.baselet.element.old.custom.CustomElement;
 import com.baselet.generator.ClassDiagramConverter;
@@ -244,24 +244,21 @@ else if (menuItem.equals(LAYER) && actualHandler != null && actualSelector != nu
 						valueMap.put(e, Integer.toString(e.getLayer() + change));
 					}
 					actualHandler.getController().executeCommand(new ChangeElementSetting(LayerFacet.KEY, valueMap));
-                                }
+				}
 				else if (menuItem.equals(OPEN_LINK) && actualHandler != null && actualSelector != null) {
-					List<GridElement> v = actualSelector.getSelectedElements();
-					if (v.size() == 1) {
-                                            GridElement e = v.get(0);
-                                            String absoluteLinkName = e.getSetting("link");
-                                            File link = new File(absoluteLinkName);
-                                            if (!link.isAbsolute()) {
-                                                File file = new File(actualHandler.getFileHandler().getFullPathName());
-                                                String parentDir = file.getParent();
-                                                try {
-                                                    File canonical = new File(parentDir + "/" + absoluteLinkName).getCanonicalFile();
-                                                    absoluteLinkName = canonical.getAbsolutePath();
-                                                } catch (Exception exc) {
-                                                    exc.printStackTrace();
-                                                }
-                                            }
-                                            main.doOpen(absoluteLinkName);
+					List<GridElement> elements = actualSelector.getSelectedElements();
+					if (elements.size() == 1) {
+						String absoluteLink = elements.get(0).getSetting(LinkFacet.LINK);
+						File link = new File(absoluteLink);
+						if (!link.isAbsolute()) {
+							String parentDir = new File(actualHandler.getFileHandler().getFullPathName()).getParent(); // relative paths are relative to the currently opened diagram
+							try {
+								absoluteLink = new File(parentDir + "/" + absoluteLink).getCanonicalFile().getAbsolutePath();
+							} catch (Exception ex) {
+								throw new RuntimeException("Cannot get link path", ex);
+							}
+						}
+						main.doOpen(absoluteLink);
 					}
 				}
 			}