Author: rob.stryker(a)jboss.com
Date: 2008-02-07 17:53:56 -0500 (Thu, 07 Feb 2008)
New Revision: 6190
Added:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/ArchivesCoreLog.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesLogger.java
Removed:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreLog.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/Trace.java
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceExtensionManager.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/types/WorkspaceJARArchiveType.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java
Log:
Preparing to break / destroy archives! awesome for API refactors
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -6,6 +6,7 @@
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.build.ModelChangeListenerWithRefresh;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.IExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
import org.jboss.ide.eclipse.archives.core.model.IRuntimeVariables;
@@ -37,5 +38,14 @@
public void preRegister(IPath project) {
ProjectUtils.addProjectNature(project);
}
+
+ /* (non-Javadoc)
+ * @see org.jboss.ide.eclipse.archives.core.ArchivesCore#createLogger()
+ */
+ @Override
+ protected IArchivesLogger createLogger() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Copied:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/ArchivesCoreLog.java
(from rev 6189,
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreLog.java)
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/ArchivesCoreLog.java
(rev 0)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/ArchivesCoreLog.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.archives.core.model.other.internal;
+
+import org.eclipse.core.runtime.ILog;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
+
+/**
+ * @author eskimo
+ * Comment:
+ * This could probably be worked into ArchivesCore API
+ * This specific implementation should belong in an eclipse-specific
+ * class.
+ */
+public class ArchivesCoreLog implements IArchivesLogger {
+ /**
+ * Copy of ArchiveCorePlugin.PLUGIN_ID to break dependency cycle between
+ * jars in this plug-in
+ *
+ * @see ArchiveCorePlugin.PLUGIN_ID
+ */
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.archives.core";
+
+ static ILog log = Platform.getLog(Platform.getBundle(PLUGIN_ID));
+
+ public void log(int severety, String message,Throwable ise) {
+ IStatus status = new Status(severety, PLUGIN_ID, message, ise);
+ log.log(status);
+ }
+}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceExtensionManager.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceExtensionManager.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceExtensionManager.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -29,9 +29,10 @@
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.InvalidRegistryObjectException;
import org.eclipse.core.runtime.Platform;
-import org.jboss.ide.eclipse.archives.core.Trace;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.IArchiveType;
import org.jboss.ide.eclipse.archives.core.model.IExtensionManager;
@@ -63,9 +64,9 @@
IArchiveType type = (IArchiveType)executable;
archiveTypes.put(type.getId(), type);
} catch (InvalidRegistryObjectException e) {
- Trace.trace(WorkspaceExtensionManager.class, e);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, e.getMessage(), e);
} catch( CoreException e ) {
- Trace.trace(WorkspaceExtensionManager.class, e);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, e.getMessage(), e);
}
}
}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/types/WorkspaceJARArchiveType.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/types/WorkspaceJARArchiveType.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/types/WorkspaceJARArchiveType.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -6,11 +6,12 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
-import org.jboss.ide.eclipse.archives.core.Trace;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFileSetImpl;
@@ -41,7 +42,7 @@
try {
outputPath = javaProject.getOutputLocation();
} catch (JavaModelException e) {
- Trace.trace(WorkspaceJARArchiveType.class, e);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, e.getMessage(), e);
return null;
}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -1,6 +1,7 @@
package org.jboss.ide.eclipse.archives.core;
import org.eclipse.core.runtime.IPath;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.IExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
import org.jboss.ide.eclipse.archives.core.model.IRuntimeVariables;
@@ -22,12 +23,14 @@
private IRuntimeVariables variables;
private IExtensionManager extensionManager;
private IPreferenceManager preferenceManager;
+ private IArchivesLogger logger;
public ArchivesCore(int runType) {
this.runType = runType;
variables = createVariables();
extensionManager = createExtensionManager();
preferenceManager = createPreferenceManager();
+ logger = createLogger();
instance = this;
}
@@ -35,6 +38,7 @@
protected abstract IRuntimeVariables createVariables();
protected abstract IExtensionManager createExtensionManager();
protected abstract IPreferenceManager createPreferenceManager();
+ protected abstract IArchivesLogger createLogger();
public boolean isWorkspaceRuntype() {
return runType == WORKSPACE;
@@ -49,6 +53,9 @@
public IPreferenceManager getPreferenceManager() {
return preferenceManager;
}
+ public IArchivesLogger getLogger() {
+ return logger;
+ }
public abstract void preRegister(IPath project);
}
Deleted:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreLog.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreLog.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreLog.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.archives.core;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-
-/**
- * @author eskimo
- * Comment:
- * This could probably be worked into ArchivesCore API
- * This specific implementation should belong in an eclipse-specific
- * class.
- */
-public class ArchivesCoreLog {
- /**
- * Copy of ArchiveCorePlugin.PLUGIN_ID to break dependency cycle between
- * jars in this plug-in
- *
- * @see ArchiveCorePlugin.PLUGIN_ID
- */
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.archives.core";
-
- static ILog log = Platform.getLog(Platform.getBundle(PLUGIN_ID));
-
- public static void log(int severety, String message,Throwable ise) {
- IStatus status = new Status(severety, PLUGIN_ID, message, ise);
- log.log(status);
- }
-}
Deleted:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/Trace.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/Trace.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/Trace.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -1,66 +0,0 @@
-/*
- * JBoss, a division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.archives.core;
-
-
-public class Trace {
-
- public static final String DEBUG_OPTION_ROOT =
"org.jboss.ide.eclipse.packages.core/debug/";
- public static final String DEBUG_OPTION_STREAM_CLOSE = DEBUG_OPTION_ROOT +
"streamClose";
-
- public static boolean isDebugging(String option) {
- return ArchivesCore.getInstance().getVariables().isDebugging(option);
- }
-
- public static void trace (Class caller, String message) {
- trace(caller, message, null);
- }
-
- public static void trace (Class caller, String message, String option) {
- trace(caller, message, null, option);
- }
-
- public static void trace (Class caller, Throwable t) {
- trace(caller, t, null);
- }
-
- public static void trace (Class caller, Throwable t, String option) {
- trace(caller, t.getMessage(), t, option);
- }
-
- public static void trace (Class caller, String message, Throwable t, String option) {
- if (!isDebugging(null))
- return;
-
- if (option != null) {
- if (!isDebugging(option))
- return;
- }
-
- System.out.println("[" + caller.getName() + "] " + message);
-
- if (t != null) {
- t.printStackTrace();
- }
- }
-
-}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -4,6 +4,7 @@
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.build.ModelChangeListener;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.IExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
import org.jboss.ide.eclipse.archives.core.model.IRuntimeVariables;
@@ -35,4 +36,8 @@
public void preRegister(IPath project) {
}
+
+ protected IArchivesLogger createLogger() {
+ return null;
+ }
}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -31,9 +31,9 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
-import org.jboss.ide.eclipse.archives.core.Trace;
import org.jboss.ide.eclipse.archives.core.model.events.EventManager;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFileSetImpl;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFolderImpl;
@@ -237,7 +237,7 @@
if (packages == null) {
// Empty / non-working XML file loaded
- Trace.trace(getClass(), "WARNING: .packages file for project " +
project.lastSegment() + " is empty or contains the wrong content");
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, "Could not
unmarshall packages file", null);
return;
}
root = new ArchiveModelNode(project, packages, this);
@@ -249,7 +249,7 @@
fireRegisterProjectEvent(oldRoot, root);
monitor.worked(1);
} catch (FileNotFoundException e) {
- Trace.trace(getClass(), e);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, e.getMessage(), e);
}
} else {
// file not found, just create some default xbpackages and insert them
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -27,8 +27,9 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.jboss.ide.eclipse.archives.core.ArchivesCoreLog;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
+import org.jboss.ide.eclipse.archives.core.model.other.internal.ArchivesCoreLog;
/**
* Utility methods and entry points for model-related APIs
@@ -102,7 +103,7 @@
}
return paths;
} catch( IllegalStateException ise ) {
- ArchivesCoreLog.log(IStatus.WARNING, "Error creating directory scanner",
ise);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, "Error creating
directory scanner", ise);
return new IPath[]{};
}
}
Added:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesLogger.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesLogger.java
(rev 0)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesLogger.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -0,0 +1,30 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+* This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.archives.core.model;
+
+/**
+ * @author rob.stryker <rob.stryker(a)redhat.com>
+ *
+ */
+public interface IArchivesLogger {
+ public void log(int severety, String message,Throwable ise);
+}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-02-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -27,7 +27,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.jboss.ide.eclipse.archives.core.ArchivesCoreLog;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
import
org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension;
@@ -156,7 +156,7 @@
}
matchingPaths = paths;
} catch( IllegalStateException ise ) {
- ArchivesCoreLog.log(IStatus.WARNING, "Could not create directory scanner",
ise);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, "Could not create
directory scanner", ise);
}
}
return scanner;
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-07
22:33:08 UTC (rev 6189)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2008-02-07
22:53:56 UTC (rev 6190)
@@ -27,7 +27,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.io.Writer;
@@ -37,9 +36,9 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
-import org.jboss.ide.eclipse.archives.core.Trace;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveImpl;
import org.jboss.xb.binding.JBossXBException;
@@ -74,7 +73,7 @@
stream.close();
initialized = true;
} catch (IOException e) {
- Trace.trace(XMLBinding.class, e);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, e.getMessage(), e);
}
}
@@ -111,7 +110,7 @@
monitor.worked(1);
} catch (JBossXBException e) {
- Trace.trace(XMLBinding.class, e);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, e.getMessage(), e);
}
}
});