Author: rob.stryker(a)jboss.com
Date: 2012-02-28 02:22:15 -0500 (Tue, 28 Feb 2012)
New Revision: 39161
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java
Log:
Remove code duplication for string substition. No jira.
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2012-02-28
07:21:49 UTC (rev 39160)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2012-02-28
07:22:15 UTC (rev 39161)
@@ -12,18 +12,13 @@
import java.io.File;
-import org.eclipse.core.internal.variables.StringSubstitutionEngine;
-import org.eclipse.core.internal.variables.StringVariableManager;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
-import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
+import org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver;
public class Fileset implements Cloneable {
@@ -54,17 +49,6 @@
return name + SEP + folder + SEP + includesPattern + SEP + excludesPattern;
}
- public static final String JBOSS_CONFIG_DIR_ARG = "${jboss_config_dir}";
//$NON-NLS-1$
- public static final String JBOSS_SERVER_ARG = "${jboss_config}";
//$NON-NLS-1$
-
- public static final String getConfigDirSubstitute(IRuntime rt) {
- return "${jboss_config_dir:" + rt.getName() + "}"; //$NON-NLS-1$
//$NON-NLS-2$
- }
-
- public static final String getServerSubstitute(IRuntime rt) {
- return "${jboss_config:" + rt.getName() + "}"; //$NON-NLS-1$
//$NON-NLS-2$
- }
-
/**
* @return the folder
*/
@@ -76,23 +60,7 @@
return getFolder(folder, runtime, true);
}
public static String getFolder(String folder, IRuntime runtime, boolean ignoreError) {
-
- String tmp = folder == null ? "" : folder; //$NON-NLS-1$
- if( runtime != null ) {
- tmp = tmp.replace(JBOSS_CONFIG_DIR_ARG, getConfigDirSubstitute(runtime));
- tmp = tmp.replace(JBOSS_SERVER_ARG, getServerSubstitute(runtime));
- }
- try {
- StringSubstitutionEngine engine = new StringSubstitutionEngine();
- tmp = engine.performStringSubstitution(tmp, true,
- true, StringVariableManager.getDefault());
- } catch( CoreException ce ) {
- if( !ignoreError ) {
- IntegrationPlugin.getDefault().getLog().log(
- new Status(IStatus.WARNING, IntegrationPlugin.PLUGIN_ID, ce.getMessage(), ce));
- }
- }
-
+ String tmp = new ConfigNameResolver().performSubstitutions(folder, runtime.getName(),
ignoreError);
IPath p = new Path(tmp);
if( !p.isAbsolute() && runtime != null ) {
p = runtime.getLocation().append(p);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java 2012-02-28
07:21:49 UTC (rev 39160)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java 2012-02-28
07:22:15 UTC (rev 39161)
@@ -45,30 +45,35 @@
* server-related replacements (adding variables) beforehand.
*
* @param dir1
- * @param serverName
+ * @param serverOrRuntimeName
* @return
*/
- public String performSubstitutions(String dir1, String serverName) {
+ public String performSubstitutions(String dir1, String serverOrRuntimeName) {
+ return performSubstitutions(dir1, serverOrRuntimeName, false);
+ }
+ public String performSubstitutions(String dir1, String serverOrRuntimeName, boolean
ignoreError) {
+
String dir2 = null;
if( dir1 != null ) {
- dir2 = replace(dir1, ConfigNameResolver.JBOSS_CONFIG, serverName);
- dir2 = replace(dir2, ConfigNameResolver.JBOSS_CONFIG_DIR, serverName);
- dir2 = replace(dir2, ConfigNameResolver.JBOSS_AS7_CONFIG_FILE, serverName);
+ dir2 = replace(dir1, ConfigNameResolver.JBOSS_CONFIG, serverOrRuntimeName);
+ dir2 = replace(dir2, ConfigNameResolver.JBOSS_CONFIG_DIR, serverOrRuntimeName);
+ dir2 = replace(dir2, ConfigNameResolver.JBOSS_AS7_CONFIG_FILE, serverOrRuntimeName);
try {
StringSubstitutionEngine engine = new StringSubstitutionEngine();
dir2 = engine.performStringSubstitution(dir2, true,
true, StringVariableManager.getDefault());
} catch( CoreException ce ) {
- JBossServerCorePlugin.log(ce.getStatus());
+ if( !ignoreError)
+ JBossServerCorePlugin.log(ce.getStatus());
}
}
return dir2;
}
- private String replace(String original, String variable, String serverName) {
+ private String replace(String original, String variable, String serverOrRuntimeName) {
if( original != null ) {
- return original.replace(getVariablePattern(variable), getVariablePattern(variable,
serverName));
+ return original.replace(getVariablePattern(variable), getVariablePattern(variable,
serverOrRuntimeName));
}
return null;
}
@@ -77,8 +82,8 @@
return "${" + var + "}"; //$NON-NLS-1$ //$NON-NLS-2$
}
- private String getVariablePattern(String var, String serverName) {
- return "${" + var + ":" + serverName + "}"; //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
+ private String getVariablePattern(String var, String serverOrRuntimeName) {
+ return "${" + var + ":" + serverOrRuntimeName + "}";
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@@ -128,17 +133,22 @@
return null;
}
- private IJBossServerRuntime findJBossServerRuntime(String serverName) {
+ /**
+ * Return either a server by this name, or a runtime by this name
+ * @param serverOrRuntimeName
+ * @return
+ */
+ private IJBossServerRuntime findJBossServerRuntime(String serverOrRuntimeName) {
IServer[] servers = ServerCore.getServers();
for( int i = 0; i < servers.length; i++ ) {
- if( servers[i].getName().equals(serverName)) {
+ if( servers[i].getName().equals(serverOrRuntimeName)) {
return (IJBossServerRuntime) servers[i].getRuntime()
.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
}
}
IRuntime[] runtimes = ServerCore.getRuntimes();
for( int i = 0; i < runtimes.length; i++ ) {
- if( runtimes[i].getName().equals(serverName)) {
+ if( runtimes[i].getName().equals(serverOrRuntimeName)) {
return (IJBossServerRuntime) runtimes[i]
.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
}