feat: add variables workspace_loc and workspace_loc_name

Signed-off-by: Andre Bossert <anb0s@anbos.de>

Author: anb0s

plugin/src/de/anbos/eclipse/easyshell/plugin/types/Resource.java

@@ -36,7 +36,7 @@ public class Resource {
     private ISelection textSelection = null;
 
     // resolved
-    private String projectName = Activator.getResourceString("easyshell.plugin.name");
+    private String defaultName = Activator.getResourceString("easyshell.plugin.name");
 
     public Resource(Resource myRes) {
         this.file = myRes.getFile();
@@ -219,7 +219,7 @@ public String getProjectName() {
         if (resource != null) {
             return resource.getProject().getName();
         }
-        return projectName;
+        return defaultName;
     }
 
     public String getProjectPath() {
@@ -229,6 +229,29 @@ public String getProjectPath() {
         return "";
     }
 
+    public String getWorkspaceLocation() {
+        if (resource != null) {
+            return resource.getWorkspace().getRoot().getLocation().toFile().toString();
+        }
+        return "";
+    }
+
+/*
+    public String getWorkspaceName() {
+        if (resource != null) {
+            return resource.getWorkspace().getRoot().
+        }
+        return defaultName;
+    }
+*/
+
+    public String getWorkspaceLocName() {
+        if (resource != null) {
+            return resource.getWorkspace().getRoot().getLocation().toFile().getName();
+        }
+        return defaultName;
+    }
+
     public String getLineSeparator(OS os) {
         switch(os) {
         case osUnix:

plugin/src/de/anbos/eclipse/easyshell/plugin/types/Variable.java

@@ -71,7 +71,7 @@ public String resolve(Object object, Object parameter) {
         };
     }),
     // ${easyshell:resource_path}
-    varResourcePath(true, false, "resource_path", "relative path to workspace of file or directory", new IVariableResolver() {
+    varResourcePath(true, false, "resource_path", "relative path of file or directory (to workspace)", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {
             if(!(object instanceof Resource)) {
                 return "";
@@ -152,7 +152,7 @@ public String resolve(Object object, Object parameter) {
         };
     }),
     // ${easyshell:container_path}
-    varContainerPath(true, false, "container_path", "relative path to workspace of file directory or directory itself", new IVariableResolver() {
+    varContainerPath(true, false, "container_path", "relative path of file's parent directory or directory itself (to workspace)", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {
             if(!(object instanceof Resource)) {
                 return "";
@@ -179,7 +179,7 @@ public String resolve(Object object, Object parameter) {
         };
     }),
     // ${easyshell:parent_path} for file it's equal to ${easyshell:container_path}
-    varParentPath(true, false, "parent_path", "relative path to workspace of parent directory\n\nfor files it's equal to ${easyshell:container_path}", new IVariableResolver() {
+    varParentPath(true, false, "parent_path", "relative path of parent directory (to workspace)\n\nfor files it's equal to ${easyshell:container_path}", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {
             if(!(object instanceof Resource)) {
                 return "";
@@ -203,14 +203,37 @@ public String resolve(Object object, Object parameter) {
         };
     }),
     // ${easyshell:project_path}
-    varProjectPath(true, false, "project_path", "relative path to workspace of project", new IVariableResolver() {
+    varProjectPath(true, false, "project_path", "relative path of project (to workspace)", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {
             if(!(object instanceof Resource)) {
                 return "";
             }
             return ((Resource)object).getProjectPath();
         };
     }),
+    // ${easyshell:workspace_loc}
+    varWorkspaceLoc(true, false, "workspace_loc", "absolute path of workspace", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            if(!(object instanceof Resource)) {
+                return "";
+            }
+            return ((Resource)object).getWorkspaceLocation();
+        };
+    }),
+/*
+    // ${easyshell:workspace_name}
+    varWorkspaceName(true, false, "workspace_name", "name of workspace (same as workspace_foldername if not configured)", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            return ((Resource)object).getWorkspaceName();
+        };
+    }),
+*/
+    // ${easyshell:workspace_loc_name}
+    varWorkspaceLocName(true, false, "workspace_loc_name", "name of workspace's folder", new IVariableResolver() {
+        public String resolve(Object object, Object parameter) {
+            return ((Resource)object).getWorkspaceLocName();
+        };
+    }),
     // ${easyshell:windows_drive} == {0}
     varWindowsDrive(true, false, "windows_drive", "drive letter of file or directory on Windows", new IVariableResolver() {
         public String resolve(Object object, Object parameter) {