Author: dgolovin
Date: 2007-10-26 19:49:23 -0400 (Fri, 26 Oct 2007)
New Revision: 4550
Added:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreLog.java
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/internal/ArchiveFileSetImpl.java
Log:
fix compilation problems in archives.core
there is cyclic dependency between jars in plugin. I've create ArchiveCoreLog class
that uses PLUGIN_ID constant copied from ArchiveCorePlugin to obtain plugin log and log
method of this class used everywhere instead of ArchiveCorePlugin.getDefault().log()
Added:
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
(rev 0)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreLog.java 2007-10-26
23:49:23 UTC (rev 4550)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * 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;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author eskimo
+ *
+ */
+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);
+ }
+}
Property changes on:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreLog.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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 2007-10-26
22:53:49 UTC (rev 4549)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java 2007-10-26
23:49:23 UTC (rev 4550)
@@ -27,8 +27,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin;
+import org.jboss.ide.eclipse.archives.core.ArchivesCoreLog;
import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
/**
@@ -101,8 +100,7 @@
}
return paths;
} catch( IllegalStateException ise ) {
- IStatus status = new Status(IStatus.WARNING, ArchivesCorePlugin.PLUGIN_ID, "Error
creating directory scanner", ise);
- ArchivesCorePlugin.getDefault().getLog().log(status);
+ ArchivesCoreLog.log(IStatus.WARNING, "Error creating directory scanner",
ise);
return new IPath[]{};
}
}
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 2007-10-26
22:53:49 UTC (rev 4549)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2007-10-26
23:49:23 UTC (rev 4550)
@@ -27,8 +27,7 @@
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.jboss.ide.eclipse.archives.core.ArchivesCorePlugin;
+import org.jboss.ide.eclipse.archives.core.ArchivesCoreLog;
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;
@@ -157,8 +156,7 @@
}
matchingPaths = paths;
} catch( IllegalStateException ise ) {
- IStatus status = new Status(IStatus.WARNING, ArchivesCorePlugin.PLUGIN_ID,
"Could not create directory scanner", ise);
- ArchivesCorePlugin.getDefault().getLog().log(status);
+ ArchivesCoreLog.log(IStatus.WARNING, "Could not create directory scanner",
ise);
}
}
return scanner;