New variable tag support for resources
diff --git a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/DefaultRunnerContext.java b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/DefaultRunnerContext.java index 3944119..6e7cf1f 100644 --- a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/DefaultRunnerContext.java +++ b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/DefaultRunnerContext.java
@@ -15,6 +15,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IPath; @@ -150,12 +151,12 @@ * Expands the variable */ private void expandVariable(ToolUtil.VariableDefinition varDef, StringBuffer buf) { - if (tool.VAR_DIR_WORKSPACE.equals(varDef.name)) { + if (tool.VAR_WORKSPACE_LOC.equals(varDef.name)) { buf.append(Platform.getLocation().toString()); return; } - if (tool.VAR_DIR_PROJECT.equals(varDef.name)) { + if (tool.VAR_PROJECT_LOC.equals(varDef.name)) { IPath location = null; if (varDef.argument != null && varDef.argument.length() > 0) { IProject namedProject = ResourcesPlugin.getWorkspace().getRoot().getProject(varDef.argument); @@ -169,6 +170,19 @@ return; } + if (tool.VAR_RESOURCE_LOC.equals(varDef.name)) { + String location = null; + if (varDef.argument != null && varDef.argument.length() > 0) { + location = ResourcesPlugin.getWorkspace().getRoot().getLocation() + varDef.argument; + } else { + if (currentProject != null) + location = currentProject.getLocation().toString(); // should get current resource + } + if (location != null) + buf.append(location); + return; + } + if (tool.VAR_ANT_TARGET.equals(varDef.name)) { if (varDef.argument != null && varDef.argument.length() > 0) antTargets.add(varDef.argument);
diff --git a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/ExternalTool.java b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/ExternalTool.java index ab97d8b..a27da02 100644 --- a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/ExternalTool.java +++ b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/ExternalTool.java
@@ -42,8 +42,24 @@ public static final String TOOL_TYPE_ANT = "org.eclipse.ui.externaltools.type.ant"; //$NON-NLS-1$ // Variable names the tool will expand - public static final String VAR_DIR_WORKSPACE = "workspace_dir"; //$NON-NLS-1$ - public static final String VAR_DIR_PROJECT = "project_dir"; //$NON-NLS-1$ + public static final String VAR_WORKSPACE_LOC = "workspace_loc"; //$NON-NLS-1$ + + public static final String VAR_PROJECT_LOC = "project_loc"; //$NON-NLS-1$ + public static final String VAR_PROJECT_PATH = "project_path"; //$NON-NLS-1$ + public static final String VAR_PROJECT_NAME = "project_name"; //$NON-NLS-1$ + + public static final String VAR_RESOURCE_LOC = "resource_loc"; //$NON-NLS-1$ + public static final String VAR_RESOURCE_PATH = "resource_path"; //$NON-NLS-1$ + public static final String VAR_RESOURCE_NAME = "resource_name"; //$NON-NLS-1$ + + public static final String VAR_CONTAINER_LOC = "container_loc"; //$NON-NLS-1$ + public static final String VAR_CONTAINER_PATH = "container_path"; //$NON-NLS-1$ + public static final String VAR_CONTAINER_NAME = "container_name"; //$NON-NLS-1$ + + public static final String VAR_EDITOR_CUR_COL = "editor_cur_col"; //$NON-NLS-1$ + public static final String VAR_EDITOR_CUR_LINE = "editor_cur_line"; //$NON-NLS-1$ + public static final String VAR_EDITOR_SEL_TEXT = "editor_sel_text"; //$NON-NLS-1$ + public static final String VAR_ANT_TARGET = "ant_target"; //$NON-NLS-1$ // Known refresh scopes
diff --git a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/messages.properties b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/messages.properties index 3091b15..d65386b 100644 --- a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/messages.properties +++ b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/messages.properties
@@ -48,11 +48,11 @@ EditDialog.selectFolder = &Select the folder to use: EditDialog.browseVarTitle = Browse Variables EditDialog.selectVar = &Select a variable to use: -EditDialog.varWorkspaceDirLabel = Current workspace directory -EditDialog.varProjectDirLabel = Current project directory -EditDialog.varProjectXDirLabel = Specific project directory -EditDialog.varResourceDirLabel = Current resource directory -EditDialog.varResourceXDirLabel = Specific resource directory +EditDialog.varWorkspaceDirLabel = Current workspace location +EditDialog.varProjectDirLabel = Selected project location +EditDialog.varProjectXDirLabel = Specific project location +EditDialog.varResourceDirLabel = Selected resource location +EditDialog.varResourceXDirLabel = Specific resource location EditDialog.varAntTargetLabel = Ant targets EditDialog.browseProjectTitle = Browse Projects EditDialog.selectProject = &Select a project to use:
diff --git a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/ui/EditDialog.java b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/ui/EditDialog.java index 99e974c..f2f792a 100644 --- a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/ui/EditDialog.java +++ b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/ui/EditDialog.java
@@ -359,7 +359,7 @@ if (results == null || results.length < 1) return; IResource resource = (IResource)results[0]; - String var = ToolUtil.buildVariableTag(ExternalTool.VAR_DIR_WORKSPACE, null); + String var = ToolUtil.buildVariableTag(ExternalTool.VAR_WORKSPACE_LOC, null); locationField.setText(var + resource.getFullPath()); } }); @@ -402,7 +402,7 @@ Object[] result = dialog.getResult(); if (result != null && result.length == 1) { StringBuffer buf = new StringBuffer(); - ToolUtil.buildVariableTag(ExternalTool.VAR_DIR_WORKSPACE, null, buf); + ToolUtil.buildVariableTag(ExternalTool.VAR_WORKSPACE_LOC, null, buf); buf.append(result[0].toString()); directoryField.setText(buf.toString()); } @@ -636,11 +636,13 @@ list.add(ToolMessages.getString("EditDialog.varWorkspaceDirLabel")); //$NON-NLS-1$ list.add(ToolMessages.getString("EditDialog.varProjectDirLabel")); //$NON-NLS-1$ list.add(ToolMessages.getString("EditDialog.varProjectXDirLabel")); //$NON-NLS-1$ + list.add(ToolMessages.getString("EditDialog.varResourceDirLabel")); //$NON-NLS-1$ + list.add(ToolMessages.getString("EditDialog.varResourceXDirLabel")); //$NON-NLS-1$ location = locationField.getText().trim(); Path path = null; VariableDefinition varDef = ToolUtil.extractVariableTag(location, 0); - if (varDef.start >= 0 && ExternalTool.VAR_DIR_WORKSPACE.equals(varDef.name)) + if (varDef.start >= 0 && ExternalTool.VAR_WORKSPACE_LOC.equals(varDef.name)) location = Platform.getLocation().toString() + location.substring(varDef.end); path = new Path(location); AntTargetList targetList = AntUtil.getTargetList(path); @@ -659,11 +661,11 @@ switch (sel) { case 0 : - result = ToolUtil.buildVariableTag(ExternalTool.VAR_DIR_WORKSPACE, null); + result = ToolUtil.buildVariableTag(ExternalTool.VAR_WORKSPACE_LOC, null); break; case 1 : - result = ToolUtil.buildVariableTag(ExternalTool.VAR_DIR_PROJECT, null); + result = ToolUtil.buildVariableTag(ExternalTool.VAR_PROJECT_LOC, null); break; case 2 : @@ -672,10 +674,23 @@ dialog.open(); Object[] name = dialog.getResult(); if (name != null && name.length > 0) - result = ToolUtil.buildVariableTag(ExternalTool.VAR_DIR_PROJECT, (String)name[0]); + result = ToolUtil.buildVariableTag(ExternalTool.VAR_PROJECT_LOC, (String)name[0]); + break; + + case 3 : + result = ToolUtil.buildVariableTag(ExternalTool.VAR_RESOURCE_LOC, null); break; - case 3 : + case 4 : + ResourceSelectionDialog resDialog; + resDialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot()); + resDialog.open(); + Object[] resource = resDialog.getResult(); + if (resource != null && resource.length > 0) + result = ToolUtil.buildVariableTag(ExternalTool.VAR_RESOURCE_LOC, ((IResource)resource[0]).getFullPath().toString()); + break; + + case 5 : TargetSelectionDialog targetDialog; targetDialog = new TargetSelectionDialog(getShell(), location); targetDialog.open();