Author: rob.stryker(a)jboss.com Date: 2008-02-22 16:32:52 -0500 (Fri, 22 Feb 2008) New Revision: 6544 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVariables.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java Log: code review with marshall. Moving constants (xml location) outside of variables API Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVariables.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVariables.java 2008-02-22 15:18:18 UTC (rev 6543) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVariables.java 2008-02-22 21:32:52 UTC (rev 6544) @@ -1,7 +1,5 @@ package org.jboss.ide.eclipse.archives.core.model.other.internal; -import java.net.URL; - import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -13,14 +11,6 @@ public class WorkspaceVariables implements IRuntimeVariables { - public URL getBindingLog4j() { - return getClass().getClassLoader().getResource("log4j.xml"); - } - - public URL getBindingSchema() { - return getClass().getClassLoader().getResource("packages.xsd"); - } - public IPath getProjectPath (String projectName) { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java 2008-02-22 15:18:18 UTC (rev 6543) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java 2008-02-22 21:32:52 UTC (rev 6544) @@ -1,6 +1,5 @@ package org.jboss.ide.eclipse.archives.core.ant; -import java.net.URL; import java.util.HashMap; import java.util.Iterator; import java.util.Properties; @@ -17,14 +16,6 @@ public void setCurrentTask(Task task) { currentTask = task; } public Task getCurrentTask() { return currentTask; } - public URL getBindingLog4j() { - return getClass().getClassLoader().getResource("log4j.xml"); - } - - public URL getBindingSchema() { - return getClass().getClassLoader().getResource("packages.xsd"); - } - public IPath getProjectPath(String projectName) { HashMap<Object, Object> map = ResourceModel.getDefault().getTaskEnvironment(currentTask); if( map.containsKey(projectName)) return new Path((String)map.get(projectName)); Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java 2008-02-22 15:18:18 UTC (rev 6543) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java 2008-02-22 21:32:52 UTC (rev 6544) @@ -15,8 +15,6 @@ public boolean isDebugging(String option); public IPath getProjectPath(String projectName); public String getProjectName(IPath path); - public URL getBindingSchema(); - public URL getBindingLog4j(); // allow for variable replacement public String performStringSubstitution(String expression, boolean reportUndefinedVariables) throws CoreException; Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2008-02-22 15:18:18 UTC (rev 6543) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2008-02-22 21:32:52 UTC (rev 6544) @@ -52,9 +52,9 @@ public static final int NUM_UNMARSHAL_MONITOR_STEPS = 3; public static final int NUM_MARSHALL_MONITOR_STEPS = 2; - - private static URL schema = ArchivesCore.getInstance().getVariables().getBindingSchema(); - private static URL log4jxml = ArchivesCore.getInstance().getVariables().getBindingLog4j(); + + private static URL schema = XMLBinding.class.getClassLoader().getResource("packages.xsd"); + private static URL log4jxml = XMLBinding.class.getClassLoader().getResource("log4j.xml"); private static SchemaBinding binding; private static boolean initialized = false;