JBoss Tools SVN: r6553 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-02-23 03:03:10 -0500 (Sat, 23 Feb 2008)
New Revision: 6553
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
is added "LABEL" tag
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-02-23 03:59:43 UTC (rev 6552)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-02-23 08:03:10 UTC (rev 6553)
@@ -56,6 +56,7 @@
public static final String TAG_B = "B"; //$NON-NLS-1$
public static final String TAG_I = "I"; //$NON-NLS-1$
public static final String TAG_U = "U"; //$NON-NLS-1$
+ public static final String TAG_LABEL = "LABEL";
public static final String ATTR_ID = "ID"; //$NON-NLS-1$
public static final String ATTR_TYPE = "TYPE"; //$NON-NLS-1$
16 years, 3 months
JBoss Tools SVN: r6552 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-22 22:59:43 -0500 (Fri, 22 Feb 2008)
New Revision: 6552
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-1774 server startup, shutdown, and project classpath with 5.0 runtimes completed.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-02-23 00:59:33 UTC (rev 6551)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-02-23 03:59:43 UTC (rev 6552)
@@ -236,7 +236,7 @@
id="org.jboss.ide.eclipse.as.ui.exitor.deployServer.deployDir"
insertionId="org.eclipse.wst.server.editor.overview.left"
order="10"
- typeIds="org.jboss.ide.eclipse.as.systemCopyServer, org.jboss.ide.eclipse.as.32, org.jboss.ide.eclipse.as.40, org.jboss.ide.eclipse.as.42"/>
+ typeIds="org.jboss.ide.eclipse.as.systemCopyServer, org.jboss.ide.eclipse.as.32, org.jboss.ide.eclipse.as.40, org.jboss.ide.eclipse.as.42, org.jboss.ide.eclipse.as.50"/>
<section
class="org.jboss.ide.eclipse.as.ui.editor.ServerPasswordSection"
id="org.jboss.ide.eclipse.as.ui.editor.passwordSection"
16 years, 3 months
JBoss Tools SVN: r6551 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src: xml and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-22 19:59:33 -0500 (Fri, 22 Feb 2008)
New Revision: 6551
Added:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbAction.java
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFolder.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackage.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackages.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd
Log:
JBIDE-476 Adding actions to schema and base xb impl
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbAction.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbAction.java (rev 0)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbAction.java 2008-02-23 00:59:33 UTC (rev 6551)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.archives.core.model.internal.xb;
+
+public class XbAction extends XbPackageNodeWithProperties {
+ private String time, type;
+
+ public XbAction() {
+ super();
+ }
+
+ public XbAction(XbAction action) {
+ super(action);
+ copyFrom(action);
+ }
+
+ public void copyFrom (XbAction node) {
+ super.copyFrom(node);
+ this.time = node.time == null ? null : new String(node.time);
+ this.type = node.type == null ? null : new String(node.type);
+ }
+
+ public String getTime() {
+ return time;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java 2008-02-22 23:58:09 UTC (rev 6550)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java 2008-02-23 00:59:33 UTC (rev 6551)
@@ -30,7 +30,6 @@
public XbFileSet ()
{
super();
- inWorkspace = true;
}
public XbFileSet (XbFileSet fileset)
@@ -41,6 +40,7 @@
public void copyFrom (XbFileSet fileset)
{
+ super.copyFrom(fileset);
this.dir = fileset.dir == null ? null : new String(fileset.dir);
this.includes = fileset.includes == null ? null : new String(fileset.includes);
this.excludes = fileset.excludes == null ? null : new String(fileset.excludes);
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFolder.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFolder.java 2008-02-22 23:58:09 UTC (rev 6550)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFolder.java 2008-02-23 00:59:33 UTC (rev 6551)
@@ -40,6 +40,7 @@
public void copyFrom (XbFolder folder)
{
+ super.copyFrom(folder);
this.name = folder.name == null ? null : new String(folder.name);
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackage.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackage.java 2008-02-22 23:58:09 UTC (rev 6550)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackage.java 2008-02-23 00:59:33 UTC (rev 6551)
@@ -42,6 +42,7 @@
public void copyFrom (XbPackage pkg)
{
+ super.copyFrom(pkg);
this.name = pkg.name == null ? null: new String(pkg.name);
this.packageType = pkg.packageType == null ? null : new String(pkg.packageType);
this.toDir = pkg.toDir == null ? null : new String(pkg.toDir);
@@ -53,6 +54,10 @@
return new XbPackage(this);
}
+ public List getActions() {
+ return getChildren(XbAction.class);
+ }
+
public List getPackages ()
{
return getChildren(XbPackage.class);
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackages.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackages.java 2008-02-22 23:58:09 UTC (rev 6550)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackages.java 2008-02-23 00:59:33 UTC (rev 6551)
@@ -32,6 +32,7 @@
public XbPackages (XbPackages packages)
{
super(packages);
+ copyFrom(packages);
}
protected Object clone() throws CloneNotSupportedException {
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java 2008-02-22 23:58:09 UTC (rev 6550)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java 2008-02-23 00:59:33 UTC (rev 6551)
@@ -38,26 +38,24 @@
protected Object getNodeChildren(XbPackageNode node, String name)
{
- if ("package".equals(name))
- {
+ if ("package".equals(name)) {
return node.getChildren(XbPackage.class);
- }
- else if ("folder".equals(name))
- {
+ }
+ else if ("folder".equals(name)) {
return node.getChildren(XbFolder.class);
}
- else if ("fileset".equals(name))
- {
+ else if ("fileset".equals(name)) {
return node.getChildren(XbFileSet.class);
}
- else if ("properties".equals(name) && node instanceof XbPackageNodeWithProperties)
- {
+ else if ("properties".equals(name) && node instanceof XbPackageNodeWithProperties) {
return ((XbPackageNodeWithProperties)node).getProperties();
}
- else if ("property".equals(name) && node instanceof XbProperties)
- {
+ else if ("property".equals(name) && node instanceof XbProperties) {
return ((XbProperties)node).getProperties().getPropertyElements();
}
+ else if( "buildAction".equals(name) && node instanceof XbPackage) {
+ return ((XbPackage)node).getActions();
+ }
return null;
}
@@ -77,9 +75,9 @@
if (object instanceof XbPackage)
{
XbPackage pkg = (XbPackage)object;
- if("id".equals(localName)) {
+ if("id".equals(localName))
return pkg.getId();
- } else if ("type".equals(localName))
+ else if ("type".equals(localName))
return pkg.getPackageType();
else if ("name".equals(localName))
return pkg.getName();
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd 2008-02-22 23:58:09 UTC (rev 6550)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd 2008-02-23 00:59:33 UTC (rev 6551)
@@ -46,7 +46,9 @@
</xsd:appinfo>
</xsd:annotation>
- <xsd:sequence>
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" minOccurs="0"
+ name="buildAction" type="build-action-type" />
<xsd:element maxOccurs="unbounded" minOccurs="0"
name="package" type="package-type" />
<xsd:element maxOccurs="unbounded" minOccurs="0"
@@ -102,6 +104,24 @@
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="value" type="xsd:string" use="required"/>
</xsd:complexType>
+
+
+ <xsd:complexType name="build-action-type">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.ide.eclipse.archives.core.model.internal.xb.XbAction"/>
+ <jbxb:addMethod name="addChild"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="0" name="properties" type="properties-type"/>
+ </xsd:sequence>
+
+ <xsd:attribute name="time" type="xsd:string" use="required"/>
+ <xsd:attribute name="type" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
<xsd:complexType name="folder-type">
<xsd:annotation>
@@ -136,7 +156,8 @@
<xsd:attribute name="dir" type="xsd:string" use="required"/>
<xsd:attribute name="includes" type="xsd:string" use="required"/>
<xsd:attribute name="excludes" type="xsd:string" use="optional"/>
- <xsd:attribute name="inWorkspace" type="xsd:boolean" use="optional" default="true"/>
+ <xsd:attribute name="inWorkspace" type="xsd:boolean" use="optional" default="true"/>
+ <xsd:attribute name="flatten" type="xsd:boolean" use="optional" default="false"/>
</xsd:complexType>
</xsd:schema>
16 years, 3 months
JBoss Tools SVN: r6550 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src: main/org/jboss/ide/eclipse/archives/core and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-22 18:58:09 -0500 (Fri, 22 Feb 2008)
New Revision: 6550
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/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
Log:
Archives API refactor (code review)
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-22 23:47:28 UTC (rev 6549)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2008-02-22 23:58:09 UTC (rev 6550)
@@ -35,7 +35,7 @@
return new WorkspaceVariables();
}
- public void preRegister(IPath project) {
+ public void preRegisterProject(IPath project) {
ProjectUtils.addProjectNature(project);
}
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-22 23:47:28 UTC (rev 6549)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-02-22 23:58:09 UTC (rev 6550)
@@ -66,10 +66,9 @@
protected abstract IPreferenceManager createPreferenceManager();
protected abstract IArchivesLogger createLogger();
- public boolean isWorkspaceRuntype() {
- return runType == WORKSPACE;
+ public int getRunType() {
+ return runType;
}
-
public IRuntimeVariables getVariables() {
return variables;
}
@@ -83,5 +82,5 @@
return logger;
}
- public abstract void preRegister(IPath project);
+ public abstract void preRegisterProject(IPath project);
}
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-22 23:47:28 UTC (rev 6549)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2008-02-22 23:58:09 UTC (rev 6550)
@@ -33,7 +33,7 @@
return new AntVariables();
}
- public void preRegister(IPath project) {
+ public void preRegisterProject(IPath project) {
}
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-22 23:47:28 UTC (rev 6549)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2008-02-22 23:58:09 UTC (rev 6550)
@@ -224,7 +224,7 @@
if( monitor == null ) monitor = new NullProgressMonitor();
monitor.beginTask("Loading configuration...", XMLBinding.NUM_UNMARSHAL_MONITOR_STEPS + 2);
- ArchivesCore.getInstance().preRegister(project);
+ ArchivesCore.getInstance().preRegisterProject(project);
ArchiveModelNode root;
IPath packagesFile = project.append(PROJECT_PACKAGES_FILE);
16 years, 3 months
JBoss Tools SVN: r6549 - trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-22 18:47:28 -0500 (Fri, 22 Feb 2008)
New Revision: 6549
Added:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/INamedContainerArchiveNode.java
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchive.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveFolder.java
Log:
Archives API refactor (code review)
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchive.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchive.java 2008-02-22 22:50:36 UTC (rev 6548)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchive.java 2008-02-22 23:47:28 UTC (rev 6549)
@@ -33,12 +33,11 @@
* @author <a href="rob.stryker(a)redhat.com">Rob Stryker</a>
* @version $Revision: 1939 $
*/
-public interface IArchive extends IArchiveNode {
+public interface IArchive extends INamedContainerArchiveNode {
public static final String ATTRIBUTE_PREFIX = "org.jboss.ide.eclipse.archives.core.model.IPackage.";
public static final String PACKAGE_TYPE_ATTRIBUTE = ATTRIBUTE_PREFIX + "packageType";
public static final String EXPLODED_ATTRIBUTE = ATTRIBUTE_PREFIX + "exploded";
public static final String DESTINATION_ATTRIBUTE = ATTRIBUTE_PREFIX + "destination";
- public static final String NAME_ATTRIBUTE = ATTRIBUTE_PREFIX + "name";
public static final String IN_WORKSPACE_ATTRIBUTE = ATTRIBUTE_PREFIX + "inWorkspace";
@@ -52,11 +51,6 @@
* @return
*/
public String getArchiveTypeId();
-
- /**
- * @return The name (with extension) of this package.
- */
- public String getName();
/**
* @return Whether or not this package will be build exploded, or as a directory instead of a ZIP/JAR
@@ -74,21 +68,6 @@
* @return Whether or not the destination of this package is in the workspace
*/
public boolean isDestinationInWorkspace();
-
- /**
- * @return A list of sub-archives contained in this package
- */
- public IArchive[] getArchives();
-
- /**
- * @return A list of folders contained in this package
- */
- public IArchiveFolder[] getFolders();
-
- /**
- * @return A list of filesets contained in this package
- */
- public IArchiveFileSet[] getFileSets();
/**
* Get The path to this package's output file.
@@ -122,13 +101,8 @@
* @param type
*/
public void setArchiveType(String type);
+
/**
- * Set the name of this package
- * @param name This package's name
- */
- public void setName(String name);
-
- /**
* Set whether or not this package is generated as a folder
* @param exploded
*/
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveFolder.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveFolder.java 2008-02-22 22:50:36 UTC (rev 6548)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveFolder.java 2008-02-22 23:47:28 UTC (rev 6549)
@@ -22,45 +22,6 @@
package org.jboss.ide.eclipse.archives.core.model;
-/**
- * <p>
- * This interface represents a folder inside a package definition.
- * A folder can contain packages, filesets, and sub-folders.
- * </p>
- *
- * @author <a href="marshall(a)jboss.org">Marshall Culpepper</a>
- * @author <a href="rob.stryker(a)redhat.com">Rob Stryker</a>
- * @version $Revision: 1929 $
- */
-public interface IArchiveFolder extends IArchiveNode {
-
- public static final String ATTRIBUTE_PREFIX = "org.jboss.ide.eclipse.archives.core.model.IPackageFolder.";
- public static final String NAME_ATTRIBUTE = ATTRIBUTE_PREFIX + "name";
-
-
- /**
- * @return The name of this folder
- */
- public String getName();
-
- /**
- * Set the name of this folder
- * @param name The name of this folder
- */
- public void setName(String name);
-
- /**
- * @return An array of sub-packages of this folder
- */
- public IArchive[] getArchives();
-
- /**
- * @return An array of sub-folders of this folder
- */
- public IArchiveFolder[] getFolders();
-
- /**
- * @return An array of filesets whose destination is this folder
- */
- public IArchiveFileSet[] getFileSets();
+public interface IArchiveFolder extends INamedContainerArchiveNode {
+ public static final String ATTRIBUTE_PREFIX = "org.jboss.ide.eclipse.archives.core.model.IPackageFolder.";
}
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/INamedContainerArchiveNode.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/INamedContainerArchiveNode.java (rev 0)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/INamedContainerArchiveNode.java 2008-02-22 23:47:28 UTC (rev 6549)
@@ -0,0 +1,65 @@
+/*
+ * 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;
+
+
+/**
+ * <p>
+ * This interface represents a folder inside a package definition.
+ * A folder can contain packages, filesets, and sub-folders.
+ * </p>
+ *
+ * @author <a href="marshall(a)jboss.org">Marshall Culpepper</a>
+ * @author <a href="rob.stryker(a)redhat.com">Rob Stryker</a>
+ * @version $Revision: 1929 $
+ */
+public interface INamedContainerArchiveNode extends IArchiveNode {
+ public static final String ATTRIBUTE_PREFIX = "org.jboss.ide.eclipse.archives.core.model.INamedContainerArchiveNode";
+ public static final String NAME_ATTRIBUTE = ATTRIBUTE_PREFIX + "name";
+
+ /**
+ * @return The name of this folder
+ */
+ public String getName();
+
+ /**
+ * Set the name of this folder
+ * @param name The name of this folder
+ */
+ public void setName(String name);
+
+ /**
+ * @return An array of sub-packages of this folder
+ */
+ public IArchive[] getArchives();
+
+ /**
+ * @return An array of sub-folders of this folder
+ */
+ public IArchiveFolder[] getFolders();
+
+ /**
+ * @return An array of filesets whose destination is this folder
+ */
+ public IArchiveFileSet[] getFileSets();
+
+}
16 years, 3 months
JBoss Tools SVN: r6548 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core: build and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-22 17:50:36 -0500 (Fri, 22 Feb 2008)
New Revision: 6548
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/build/ArchiveBuildDelegate.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelListenerManager.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveNode.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IExtensionManager.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.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
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java
Log:
generics, organized imports, cleanup, headers
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-22 22:46:46 UTC (rev 6547)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-02-22 22:50:36 UTC (rev 6548)
@@ -1,3 +1,24 @@
+/**
+ * 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;
import org.eclipse.core.runtime.IPath;
@@ -6,6 +27,11 @@
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
import org.jboss.ide.eclipse.archives.core.model.IRuntimeVariables;
+/**
+ * The core entry point for Archives
+ * @author rob.stryker(a)redhat.com
+ *
+ */
public abstract class ArchivesCore {
public static final String PLUGIN_ID = "org.jboss.ide.eclipse.archives.core";
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-02-22 22:46:46 UTC (rev 6547)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-02-22 22:50:36 UTC (rev 6548)
@@ -127,7 +127,7 @@
* @param addedChanged Set of changed / added resources
* @param setRemoved Set of removed resources
*/
- public void projectIncrementalBuild(Set addedChanged, Set removed) {
+ public void projectIncrementalBuild(Set<IArchive> addedChanged, Set<IArchive> removed) {
incrementalBuild(null, addedChanged, removed);
}
@@ -139,13 +139,13 @@
* @param addedChanged A list of added or changed resource paths
* @param removed A list of removed resource paths
*/
- public void incrementalBuild(IArchive archive, Set addedChanged, Set removed) {
+ public void incrementalBuild(IArchive archive, Set<IArchive> addedChanged, Set<IArchive> removed) {
// find any and all filesets that match each file
- Iterator i = addedChanged.iterator();
+ Iterator<IArchive> i = addedChanged.iterator();
IPath path;
IArchiveFileSet[] matchingFilesets;
- ArrayList topPackagesChanged = new ArrayList();
+ ArrayList<IArchive> topPackagesChanged = new ArrayList<IArchive>();
while(i.hasNext()) {
path = ((IPath)i.next());
matchingFilesets = ModelUtil.getMatchingFilesets(archive, path);
@@ -167,11 +167,11 @@
i = topPackagesChanged.iterator();
while(i.hasNext()) {
- EventManager.finishedBuildingArchive((IArchive)i.next());
+ EventManager.finishedBuildingArchive(i.next());
}
}
- private void localFireAffectedTopLevelPackages(ArrayList affected, IArchiveFileSet[] filesets) {
+ private void localFireAffectedTopLevelPackages(ArrayList<IArchive> affected, IArchiveFileSet[] filesets) {
for( int i = 0; i < filesets.length; i++ ) {
if( !affected.contains(filesets[i].getRootArchive())) {
affected.add(filesets[i].getRootArchive());
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelListenerManager.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelListenerManager.java 2008-02-22 22:46:46 UTC (rev 6547)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelListenerManager.java 2008-02-22 22:50:36 UTC (rev 6548)
@@ -1,3 +1,24 @@
+/**
+ * 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;
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveNode.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveNode.java 2008-02-22 22:46:46 UTC (rev 6547)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveNode.java 2008-02-22 22:50:36 UTC (rev 6548)
@@ -21,7 +21,6 @@
*/
package org.jboss.ide.eclipse.archives.core.model;
-import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath;
/**
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IExtensionManager.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IExtensionManager.java 2008-02-22 22:46:46 UTC (rev 6547)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IExtensionManager.java 2008-02-22 22:50:36 UTC (rev 6548)
@@ -1,7 +1,26 @@
+/**
+ * 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;
-
-
public interface IExtensionManager {
public IArchiveType[] getArchiveTypes();
public IArchiveType getArchiveType(String id);
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java 2008-02-22 22:46:46 UTC (rev 6547)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java 2008-02-22 22:50:36 UTC (rev 6548)
@@ -1,3 +1,24 @@
+/**
+ * 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;
import org.eclipse.core.runtime.IPath;
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 22:46:46 UTC (rev 6547)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java 2008-02-22 22:50:36 UTC (rev 6548)
@@ -1,7 +1,26 @@
+/**
+ * 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;
-import java.net.URL;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
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 22:46:46 UTC (rev 6547)
+++ 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 22:50:36 UTC (rev 6548)
@@ -48,6 +48,12 @@
import org.jboss.xb.binding.sunday.unmarshalling.XsdBinder;
import org.xml.sax.SAXException;
+/**
+ * This class is responsible for binding some xml file to it's proper
+ * objects. In short, it marshalls and unmarshalls the data.
+ * @author Marshall
+ *
+ */
public class XMLBinding {
public static final int NUM_UNMARSHAL_MONITOR_STEPS = 3;
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java 2008-02-22 22:46:46 UTC (rev 6547)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java 2008-02-22 22:50:36 UTC (rev 6548)
@@ -1,3 +1,24 @@
+/**
+ * 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.internal.xb;
import org.jboss.xb.binding.GenericObjectModelProvider;
@@ -3,4 +24,10 @@
import org.jboss.xb.binding.MarshallingContext;
+
+/**
+ * Necessary class for JBoss XB
+ * @author Marshall
+ *
+ */
public class XbPackagesObjectProvider implements GenericObjectModelProvider {
16 years, 3 months
JBoss Tools SVN: r6547 - trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-22 17:46:46 -0500 (Fri, 22 Feb 2008)
New Revision: 6547
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java
Log:
using new logger api (removed catch(Exception e) {})
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java 2008-02-22 22:21:17 UTC (rev 6546)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java 2008-02-22 22:46:46 UTC (rev 6547)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
/**
* The event manager to fire events
@@ -35,7 +36,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].cleanProject(project);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
@@ -44,8 +45,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].cleanArchive(archive);
- } catch( Exception e) {
- }
+ } catch(Exception e ) {logError(e);}
}
}
@@ -54,7 +54,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].startedBuild(project);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
@@ -63,7 +63,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].finishedBuild(project);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
@@ -72,7 +72,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].startedBuildingArchive(archive);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
@@ -81,7 +81,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].finishedBuildingArchive(archive);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
@@ -92,7 +92,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].startedCollectingFileSet(fileset);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
public static void finishedCollectingFileSet(IArchiveFileSet fileset) {
@@ -100,7 +100,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].finishedCollectingFileSet(fileset);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
@@ -123,7 +123,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].fileUpdated(topLevelArchive, fileset, filePath);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
@@ -132,7 +132,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].fileRemoved(topLevelArchive, fileset, filePath);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
@@ -154,7 +154,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].buildFailed(pkg, status);
- } catch(Exception e ) {}
+ } catch(Exception e ) {logError(e);}
}
}
@@ -171,10 +171,7 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].modelChanged(delta);
- } catch(Exception e ) {
- e.printStackTrace();
- }
- }
+ } catch(Exception e ) {logError(e);} }
}
@@ -198,4 +195,12 @@
return new IArchiveBuildListener[]{};
}
+ protected static void logError(Exception e) {
+ try {
+ StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+ ArchivesCore.getInstance().getLogger().log(IArchivesLogger.MSG_WARN, "Archives Listener error in " + trace[1].getMethodName(), e);
+ } catch( Exception f ) {
+ ArchivesCore.getInstance().getLogger().log(IArchivesLogger.MSG_WARN, "Archives Listener error", e);
+ }
+ }
}
16 years, 3 months
JBoss Tools SVN: r6546 - trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-22 17:21:17 -0500 (Fri, 22 Feb 2008)
New Revision: 6546
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
Log:
using new logger api (removed catch(Exception e) {})
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2008-02-22 22:15:30 UTC (rev 6545)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2008-02-22 22:21:17 UTC (rev 6546)
@@ -4,7 +4,7 @@
* 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
+ * 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.
16 years, 3 months
JBoss Tools SVN: r6545 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core: model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-22 17:15:30 -0500 (Fri, 22 Feb 2008)
New Revision: 6545
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesLogger.java
Log:
fleshing logger api a bit
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2008-02-22 21:32:52 UTC (rev 6544)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2008-02-22 22:15:30 UTC (rev 6545)
@@ -1,6 +1,26 @@
+/**
+ * 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.build;
-
import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.EventManager;
@@ -11,6 +31,7 @@
import org.jboss.ide.eclipse.archives.core.model.IArchiveModelNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeDelta;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
import org.jboss.ide.eclipse.archives.core.util.internal.ModelTruezipBridge;
@@ -40,7 +61,7 @@
try {
handle(delta);
} catch( Exception e ) {
- e.printStackTrace();
+ ArchivesCore.getInstance().getLogger().log(IArchivesLogger.MSG_ERR, "Error updating model changes", e);
}
}
Modified: 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 2008-02-22 21:32:52 UTC (rev 6544)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesLogger.java 2008-02-22 22:15:30 UTC (rev 6545)
@@ -26,5 +26,22 @@
*
*/
public interface IArchivesLogger {
- public void log(int severety, String message,Throwable ise);
+ /** Message priority of "error". */
+ public static final int MSG_ERR = 0;
+ /** Message priority of "warning". */
+ public static final int MSG_WARN = 1;
+ /** Message priority of "information". */
+ public static final int MSG_INFO = 2;
+ /** Message priority of "verbose". */
+ public static final int MSG_VERBOSE = 3;
+ /** Message priority of "debug". */
+ public static final int MSG_DEBUG = 4;
+
+ /**
+ * Log a message
+ * @param severety
+ * @param message
+ * @param error
+ */
+ public void log(int severety, String message,Throwable throwable);
}
16 years, 3 months
JBoss Tools SVN: r6544 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src: main/org/jboss/ide/eclipse/archives/core/ant and 2 other directories.
by jbosstools-commits＠lists.jboss.org
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;
16 years, 3 months