JBoss Tools SVN: r3315 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-24 04:09:43 -0400 (Fri, 24 Aug 2007)
New Revision: 3315
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java
Log:
JBIDE-820
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2007-08-24 08:09:32 UTC (rev 3314)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2007-08-24 08:09:43 UTC (rev 3315)
@@ -13,11 +13,8 @@
import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
@@ -32,8 +29,6 @@
import org.jboss.tools.seam.core.ISeamPackage;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamScope;
-import org.jboss.tools.seam.internal.core.SeamComponentDeclaration;
-import org.jboss.tools.seam.internal.core.SeamProject;
import org.jboss.tools.seam.ui.SeamUiImages;
import org.jboss.tools.seam.ui.views.actions.ScopePresentationActionProvider;
@@ -112,7 +107,7 @@
}
return SeamUiImages.JAVA_IMAGE;
} else if(obj instanceof ISeamComponentDeclaration) {
- SeamComponentDeclaration d = (SeamComponentDeclaration)obj;
+ ISeamComponentDeclaration d = (ISeamComponentDeclaration)obj;
IResource r = d.getResource();
if(r != null) return jip.getImageLabel(r, 3);
return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
16 years, 8 months
JBoss Tools SVN: r3314 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: core/event and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-24 04:09:32 -0400 (Fri, 24 Aug 2007)
New Revision: 3314
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamElement.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamPropertiesDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValue.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueList.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueMap.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueMapEntry.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueString.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/Role.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamObject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueList.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMap.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/LoadedDeclarations.java
Log:
JBIDE-820
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -34,5 +34,7 @@
* @return
*/
public boolean isContextVariable();
+
+ public IBijectedAttribute clone() throws CloneNotSupportedException;
-}
\ No newline at end of file
+}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -16,4 +16,6 @@
*/
public interface IRole extends ISeamJavaSourceReference, ISeamContextVariable {
+ public IRole clone() throws CloneNotSupportedException;
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -18,4 +18,5 @@
boolean isAutoCreate();
+ public ISeamAnnotatedFactory clone() throws CloneNotSupportedException;
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -14,6 +14,8 @@
import java.util.List;
import java.util.Set;
+import org.jboss.tools.seam.core.event.ISeamValue;
+
/**
* Represents component in seam tools model.
* @author Alexey Kazakov
@@ -114,4 +116,7 @@
* @return
*/
public List<ISeamProperty> getProperties(String propertyName);
+
+ public ISeamComponent clone() throws CloneNotSupportedException;
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentDeclaration.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentDeclaration.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -20,4 +20,7 @@
* @return name of component.
*/
public String getName();
+
+ public ISeamComponentDeclaration clone() throws CloneNotSupportedException;
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -31,4 +31,6 @@
*/
public boolean isOfType(SeamComponentMethodType type);
+ public ISeamComponentMethod clone() throws CloneNotSupportedException;
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -37,4 +37,7 @@
* @param type
*/
public void setScope(ScopeType type);
+
+ public ISeamContextVariable clone() throws CloneNotSupportedException;
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamElement.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamElement.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamElement.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -12,7 +12,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
-import org.jboss.tools.seam.internal.core.SeamObject;
/**
* Common interface for objects of seam model.
@@ -45,6 +44,6 @@
*/
public IResource getResource();
-// public ISeamElement copy();
+ public ISeamElement clone() throws CloneNotSupportedException;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -15,5 +15,5 @@
* @author Alexey Kazakov
*/
public interface ISeamFactory extends ISeamContextVariable {
-
+ public ISeamFactory clone() throws CloneNotSupportedException;
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaComponentDeclaration.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaComponentDeclaration.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -127,4 +127,7 @@
* @param precedence
*/
public void setPrecedence(int precedence);
+
+ public ISeamJavaComponentDeclaration clone() throws CloneNotSupportedException;
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamPropertiesDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamPropertiesDeclaration.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamPropertiesDeclaration.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -54,4 +54,7 @@
* @param property
*/
public void removeProperty(ISeamProperty property);
+
+ public ISeamPropertiesDeclaration clone() throws CloneNotSupportedException;
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -32,4 +32,6 @@
* @param value
*/
public void setValue(ISeamValue value);
+
+ public ISeamProperty clone() throws CloneNotSupportedException;
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -71,4 +71,7 @@
* @return string value of 'auto-create' attribute
*/
public String getAutoCreateAsString();
+
+ public ISeamXmlComponentDeclaration clone() throws CloneNotSupportedException;
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -37,4 +37,7 @@
* @param method
*/
public void setMethod(String method);
-}
\ No newline at end of file
+
+ public ISeamXmlFactory clone() throws CloneNotSupportedException;
+
+}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValue.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValue.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValue.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -17,4 +17,6 @@
*/
public interface ISeamValue extends ISeamElement {
+ public ISeamValue clone() throws CloneNotSupportedException;
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueList.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueList.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueList.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -22,4 +22,6 @@
*/
public List<ISeamValueString> getValues();
+ public ISeamValueList clone() throws CloneNotSupportedException;
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueMap.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueMap.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueMap.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -23,4 +23,6 @@
*/
public List<ISeamValueMapEntry> getEntries();
+ public ISeamValueMap clone() throws CloneNotSupportedException;
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueMapEntry.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueMapEntry.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueMapEntry.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -29,4 +29,6 @@
*/
public ISeamValueString getValue();
+ public ISeamValueMapEntry clone() throws CloneNotSupportedException;
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueString.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueString.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/ISeamValueString.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -24,4 +24,6 @@
*/
public IValueInfo getValue();
+ public ISeamValueString clone() throws CloneNotSupportedException;
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/Role.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/Role.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/Role.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -15,4 +15,8 @@
public class Role extends SeamJavaContextVariable implements IRole {
+ public Role clone() throws CloneNotSupportedException {
+ return (Role)super.clone();
+ }
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -76,7 +76,7 @@
public SeamAnnotatedFactory clone() throws CloneNotSupportedException {
SeamAnnotatedFactory c = (SeamAnnotatedFactory)super.clone();
//we need not new copy here but reference!
- c.parentDeclaration = parentDeclaration == null ? null : (SeamJavaComponentDeclaration)doClone(parentDeclaration);
+ c.parentDeclaration = parentDeclaration == null ? null : parentDeclaration.clone();
return c;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -260,4 +260,9 @@
public String toString() {
return "SeamComponent: " + getName();
}
+
+ public SeamComponent clone() throws CloneNotSupportedException {
+ return this;
+ }
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -403,15 +403,15 @@
}
c.bijectedAttributes = new HashSet<IBijectedAttribute>();
for (IBijectedAttribute a : bijectedAttributes) {
- c.addBijectedAttribute((IBijectedAttribute)doClone(a));
+ c.addBijectedAttribute(a.clone());
}
c.componentMethods = new HashSet<ISeamComponentMethod>();
for (ISeamComponentMethod m : componentMethods) {
- c.addMethod((ISeamComponentMethod)doClone(m));
+ c.addMethod(m.clone());
}
c.roles = new HashSet<IRole>();
for (IRole r : roles) {
- c.addRole((IRole)doClone(r));
+ c.addRole(r.clone());
}
return c;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamObject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamObject.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamObject.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -133,11 +133,4 @@
return c;
}
- protected static ISeamElement doClone(ISeamElement object) throws CloneNotSupportedException {
- if(!(object instanceof SeamObject)) {
- throw new CloneNotSupportedException("Only instance of SeamObject can be cloned: " + object);
- }
- return ((SeamObject)object).clone();
- }
-
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -350,7 +350,7 @@
*/
public void registerComponents(LoadedDeclarations ds, IPath source) {
- SeamComponentDeclaration[] components = ds.getComponents().toArray(new SeamComponentDeclaration[0]);
+ ISeamComponentDeclaration[] components = ds.getComponents().toArray(new ISeamComponentDeclaration[0]);
ISeamFactory[] factories = ds.getFactories().toArray(new ISeamFactory[0]);
if(components.length == 0 && factories.length == 0) {
@@ -476,12 +476,11 @@
for (SeamProject p : usedBy) {
p.resolve();
LoadedDeclarations ds1 = new LoadedDeclarations();
- for (SeamComponentDeclaration d: ds.getComponents()) {
+ for (ISeamComponentDeclaration d: ds.getComponents()) {
ds1.getComponents().add(d.clone());
}
for (ISeamFactory f : ds.getFactories()) {
- SeamObject copy = ((SeamObject)f).clone();
- ds1.getFactories().add((ISeamFactory)copy);
+ ds1.getFactories().add(f.clone());
}
p.registerComponents(ds1, source);
}
@@ -501,7 +500,7 @@
String className = xml.getClassName();
List<Change> changes = null;
if(isClassNameChanged(oldClassName, className)) {
- SeamComponentDeclaration[] ds1 = c.getAllDeclarations().toArray(new SeamComponentDeclaration[0]);
+ ISeamComponentDeclaration[] ds1 = c.getAllDeclarations().toArray(new ISeamComponentDeclaration[0]);
for (int i1 = 0; i1 < ds1.length; i1++) {
if(!(ds1[i1] instanceof ISeamJavaComponentDeclaration)) continue;
ISeamJavaComponentDeclaration jcd = (ISeamJavaComponentDeclaration)ds1[i1];
@@ -530,9 +529,9 @@
while(iterator.hasNext()) {
List<Change> changes = null;
SeamComponent c = iterator.next();
- SeamComponentDeclaration[] ds = c.getAllDeclarations().toArray(new SeamComponentDeclaration[0]);
+ ISeamComponentDeclaration[] ds = c.getAllDeclarations().toArray(new ISeamComponentDeclaration[0]);
for (int i = 0; i < ds.length; i++) {
- if(ds[i].source.equals(source)) {
+ if(ds[i].getSourcePath().equals(source)) {
c.removeDeclaration(ds[i]);
if(ds[i] instanceof ISeamJavaComponentDeclaration) {
SeamJavaComponentDeclaration jd = (SeamJavaComponentDeclaration)ds[i];
@@ -592,9 +591,9 @@
while(iterator.hasNext()) {
List<Change> changes = null;
SeamComponent c = iterator.next();
- SeamComponentDeclaration[] ds = c.getAllDeclarations().toArray(new SeamComponentDeclaration[0]);
+ ISeamComponentDeclaration[] ds = c.getAllDeclarations().toArray(new ISeamComponentDeclaration[0]);
for (int i = 0; i < ds.length; i++) {
- if(removed.containsKey(ds[i].getId())) {
+ if(removed.containsKey(((SeamObject)ds[i]).getId())) {
c.removeDeclaration(ds[i]);
changes = Change.addChange(changes, new Change(c, null, ds[i], null));
}
@@ -945,7 +944,7 @@
ds = new LoadedDeclarations();
map.put(p, ds);
}
- ds.getComponents().add(((SeamComponentDeclaration)d).clone());
+ ds.getComponents().add(d.clone());
}
}
for (ISeamFactory f : allFactories) {
@@ -956,7 +955,7 @@
ds = new LoadedDeclarations();
map.put(p, ds);
}
- ds.getFactories().add((ISeamFactory)((SeamObject)f).clone());
+ ds.getFactories().add(f.clone());
}
return map;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -127,7 +127,7 @@
SeamPropertiesDeclaration c = (SeamPropertiesDeclaration)super.clone();
c.properties = new HashMap<String, ISeamProperty>();
for (String name : properties.keySet()) {
- ISeamProperty p = (ISeamProperty)doClone(properties.get(name));
+ ISeamProperty p = properties.get(name).clone();
c.addProperty(p);
}
return c;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -82,7 +82,7 @@
public SeamProperty clone() throws CloneNotSupportedException {
SeamProperty c = (SeamProperty)super.clone();
- c.value = value == null ? null : (ISeamValue)doClone(value);
+ c.value = value == null ? null : value.clone();
return c;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueList.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueList.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueList.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -29,7 +29,7 @@
return values;
}
- public void addValue(SeamValueString value) {
+ public void addValue(ISeamValueString value) {
values.add(value);
adopt(value);
}
@@ -54,7 +54,7 @@
SeamValueList c = (SeamValueList)super.clone();
c.values = new ArrayList<ISeamValueString>();
for (ISeamValueString v : values) {
- c.addValue((SeamValueString)doClone(v));
+ c.addValue(v.clone());
}
return c;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMap.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMap.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMap.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -29,7 +29,7 @@
return entries;
}
- public void addEntry(SeamValueMapEntry entry) {
+ public void addEntry(ISeamValueMapEntry entry) {
entries.add(entry);
adopt(entry);
}
@@ -54,7 +54,7 @@
SeamValueMap c = (SeamValueMap)super.clone();
c.entries = new ArrayList<ISeamValueMapEntry>();
for (ISeamValueMapEntry v : entries) {
- c.addEntry((SeamValueMapEntry)doClone(v));
+ c.addEntry(v.clone());
}
return c;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/LoadedDeclarations.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/LoadedDeclarations.java 2007-08-24 05:49:44 UTC (rev 3313)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/LoadedDeclarations.java 2007-08-24 08:09:32 UTC (rev 3314)
@@ -13,8 +13,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.tools.seam.core.ISeamComponentDeclaration;
import org.jboss.tools.seam.core.ISeamFactory;
-import org.jboss.tools.seam.internal.core.SeamComponentDeclaration;
/**
* This object keeps all declarations loaded from one source.
@@ -22,10 +22,10 @@
* @author Viacheslav Kabanovich
*/
public class LoadedDeclarations {
- List<SeamComponentDeclaration> components = new ArrayList<SeamComponentDeclaration>();
+ List<ISeamComponentDeclaration> components = new ArrayList<ISeamComponentDeclaration>();
List<ISeamFactory> factories = new ArrayList<ISeamFactory>();
- public List<SeamComponentDeclaration> getComponents() {
+ public List<ISeamComponentDeclaration> getComponents() {
return components;
}
16 years, 8 months
JBoss Tools SVN: r3313 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-08-24 01:49:44 -0400 (Fri, 24 Aug 2007)
New Revision: 3313
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java
Log:
Fix null pointer exception
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-08-24 05:25:39 UTC (rev 3312)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-08-24 05:49:44 UTC (rev 3313)
@@ -106,7 +106,9 @@
try {
IFacetedProject facetedProject = ProjectFacetsManager.create(project);
IRuntime rt = facetedProject.getPrimaryRuntime();
- return facetedProject.getPrimaryRuntime().getName();
+ if(facetedProject.getPrimaryRuntime()!=null) {
+ return facetedProject.getPrimaryRuntime().getName();
+ }
} catch (CoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
16 years, 8 months
JBoss Tools SVN: r3312 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: widget/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-08-24 01:25:39 -0400 (Fri, 24 Aug 2007)
New Revision: 3312
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-673
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-08-24 05:23:23 UTC (rev 3311)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-08-24 05:25:39 UTC (rev 3312)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.seam.ui.internal.project.facet;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -322,6 +324,12 @@
new PackageNameValidator(
sessionBeanPkgNameditor.getName(), "session beans"));
}
+
+ jBossAsDbTypeEditor.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ jBossHibernateDialectEditor.setValue(HIBERNATE_HELPER.getDialectClass(evt.getNewValue().toString()));
+ }
+ });
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java 2007-08-24 05:23:23 UTC (rev 3311)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java 2007-08-24 05:25:39 UTC (rev 3312)
@@ -75,7 +75,6 @@
}
public void setValue(Object value) {
- // supress parent method
}
/* (non-Javadoc)
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-08-24 05:23:23 UTC (rev 3311)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-08-24 05:25:39 UTC (rev 3312)
@@ -36,7 +36,9 @@
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.jboss.tools.seam.ui.internal.project.facet.IValidator;
import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory;
+import org.jboss.tools.seam.ui.widget.editor.CompositeEditor;
import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
+import org.jboss.tools.seam.ui.widget.editor.LabelFieldEditor;
/**
* @author eskimo
@@ -70,7 +72,7 @@
List<IFieldEditor> editorOrder = new ArrayList<IFieldEditor>();
- /* (non-Javadoc)
+ /**
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
public void createControl(Composite parent) {
@@ -84,7 +86,9 @@
setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false);
} else if(isWar()) {
- getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false);
+ getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false);
+ LabelFieldEditor label = (LabelFieldEditor)((CompositeEditor)getEditor(IParameter.SEAM_LOCAL_INTERFACE_NAME)).getEditors().get(0);
+ label.getLabelControl().setText("POJO class name:");
} else {
getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(true);
}
@@ -184,7 +188,10 @@
String type = SeamCorePlugin.getSeamFacetPreferences(project.getProject()).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,"war");
- getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(!"war".equals(type));
+ getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(!isWar());
+
+ LabelFieldEditor label = (LabelFieldEditor)((CompositeEditor)getEditor(IParameter.SEAM_LOCAL_INTERFACE_NAME)).getEditors().get(0);
+ label.getLabelControl().setText(isWar()?"POJO class name:": "Local interface:");
errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(
editorRegistry.get(IParameter.SEAM_COMPONENT_NAME).getValue(), null);
16 years, 8 months
JBoss Tools SVN: r3311 - in trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common: reporting and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-08-24 01:23:23 -0400 (Fri, 24 Aug 2007)
New Revision: 3311
Added:
trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/reporting/
trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/reporting/test/
trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/reporting/test/ProblemReportingHelperTest.java
trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/CommonPluginTest.java
Log:
http://jira.jboss.org/jira/browse/EXIN-13
Added: trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/reporting/test/ProblemReportingHelperTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/reporting/test/ProblemReportingHelperTest.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/reporting/test/ProblemReportingHelperTest.java 2007-08-24 05:23:23 UTC (rev 3311)
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * 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.tools.common.reporting.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.ILogListener;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.jboss.tools.common.CommonPlugin;
+import org.jboss.tools.common.reporting.ProblemReportingHelper;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ProblemReportingHelperTest extends TestCase {
+
+ boolean testPassed = false;
+
+
+
+ @Override
+ protected void setUp() throws Exception {
+ // TODO Auto-generated method stub
+ super.setUp();
+ testPassed = false;
+ CommonPlugin.getInstance().getLog().addLogListener(new ILogListener() {
+ public void logging(IStatus status, String plugin) {
+ testPassed = true;
+
+ }});
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.reporting.ProblemReportingHelper#reportProblem(java.lang.String, java.lang.Throwable)}.
+ */
+ public void testReportProblemStringThrowable() {
+ ProblemReportingHelper.reportProblem(CommonPlugin.PLUGIN_ID, new Throwable("Message"));
+ assertTrue(testPassed);
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.reporting.ProblemReportingHelper#reportProblem(java.lang.String, java.lang.String, java.lang.Throwable)}.
+ */
+ public void testReportProblemStringStringThrowable() {
+ ProblemReportingHelper.reportProblem(CommonPlugin.PLUGIN_ID, "Message", new Throwable("Message"));
+ assertTrue(testPassed);
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.reporting.ProblemReportingHelper#reportProblem(org.eclipse.core.runtime.IStatus)}.
+ */
+ public void testReportProblemIStatus() {
+ ProblemReportingHelper.reportProblem(Status.OK_STATUS);
+ assertTrue(testPassed);
+ }
+
+}
Added: trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/CommonPluginTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/CommonPluginTest.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/CommonPluginTest.java 2007-08-24 05:23:23 UTC (rev 3311)
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * 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.tools.common.test;
+
+import org.jboss.tools.common.CommonPlugin;
+
+import junit.framework.TestCase;
+
+/**
+ * @author eskimo
+ *
+ */
+public class CommonPluginTest extends TestCase {
+
+ /**
+ * Test method for {@link org.jboss.tools.common.CommonPlugin#getInstance()}.
+ */
+ public void testGetInstance() {
+ assertNotNull("Common plugin is not loaded", CommonPlugin.getInstance());
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.CommonPlugin#getMessage(java.lang.String)}.
+ */
+ public void testGetMessage() {
+ assertNotNull(CommonPlugin.getMessage("reportingUrl"));
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.CommonPlugin#getEnvironment()}.
+ */
+ public void testGetEnvironment() {
+ assertNotNull(CommonPlugin.getEnvironment());
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.CommonPlugin#getDefault()}.
+ */
+ public void testGetDefault() {
+ assertNotNull(CommonPlugin.getDefault());
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.CommonPlugin#getPluginLog()}.
+ */
+ public void testGetPluginLog() {
+ assertNotNull(CommonPlugin.getPluginLog());
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.log.BasePlugin#logError(java.lang.String, java.lang.Throwable)}.
+ */
+ public void testLogErrorStringThrowable() {
+ CommonPlugin.getPluginLog().logError("Error message", new Throwable("Message"));
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.log.BasePlugin#logError(java.lang.String)}.
+ */
+ public void testLogErrorString() {
+ CommonPlugin.getPluginLog().logError("Error message");
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.log.BasePlugin#logError(java.lang.Throwable)}.
+ */
+ public void testLogErrorThrowable() {
+ CommonPlugin.getPluginLog().logError(new Throwable("Message"));
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.log.BasePlugin#logWarning(java.lang.String, java.lang.Throwable)}.
+ */
+ public void testLogWarningStringThrowable() {
+ CommonPlugin.getPluginLog().logWarning("Message", new Throwable("Message"));
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.log.BasePlugin#logWarning(java.lang.String)}.
+ */
+ public void testLogWarningString() {
+ CommonPlugin.getPluginLog().logWarning("Message");
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.log.BasePlugin#logWarning(java.lang.Throwable)}.
+ */
+ public void testLogWarningThrowable() {
+ CommonPlugin.getPluginLog().logWarning(new Throwable("Message"));
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.log.BasePlugin#logInfo(java.lang.String, java.lang.Throwable)}.
+ */
+ public void testLogInfoStringThrowable() {
+ CommonPlugin.getPluginLog().logInfo("Message", new Throwable("Message"));
+ }
+
+ /**
+ * Test method for {@link org.jboss.tools.common.log.BasePlugin#logInfo(java.lang.String)}.
+ */
+ public void testLogInfoString() {
+ CommonPlugin.getPluginLog().logInfo("message");
+ }
+
+}
16 years, 8 months
JBoss Tools SVN: r3310 - trunk/seam/plugins/org.jboss.tools.seam.ui.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-08-23 16:00:32 -0400 (Thu, 23 Aug 2007)
New Revision: 3310
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
http://jira.jboss.org/jira/browse/RHDS-83
setup an icon for perspective
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-08-23 19:57:15 UTC (rev 3309)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-08-23 20:00:32 UTC (rev 3310)
@@ -327,6 +327,7 @@
point="org.eclipse.ui.perspectives">
<perspective
class="org.jboss.tools.seam.ui.SeamPerspectiveFactory"
+ icon="icons/seam16.png"
id="org.jboss.tools.seam.ui.SeamPerspective"
name="Seam">
</perspective>
16 years, 8 months
JBoss Tools SVN: r3309 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-08-23 15:57:15 -0400 (Thu, 23 Aug 2007)
New Revision: 3309
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
http://jira.jboss.org/jira/browse/RHDS-83
seam perrspective is created
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-08-23 19:00:15 UTC (rev 3308)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-08-23 19:57:15 UTC (rev 3309)
@@ -323,4 +323,12 @@
</enabledWhen>
</page>
</extension>
+ <extension
+ point="org.eclipse.ui.perspectives">
+ <perspective
+ class="org.jboss.tools.seam.ui.SeamPerspectiveFactory"
+ id="org.jboss.tools.seam.ui.SeamPerspective"
+ name="Seam">
+ </perspective>
+ </extension>
</plugin>
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java 2007-08-23 19:57:15 UTC (rev 3309)
@@ -0,0 +1,64 @@
+package org.jboss.tools.seam.ui;
+
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+public class SeamPerspectiveFactory implements IPerspectiveFactory {
+
+ public static final String PERSPECTIVE_ID = "org.jboss.tools.seam.ui.SeamPerspective";
+
+ public void createInitialLayout(IPageLayout layout) {
+ String editorArea = layout.getEditorArea();
+
+ IFolderLayout leftTop = layout.createFolder("leftTop", IPageLayout.LEFT, (float)0.2, editorArea); //$NON-NLS-1$
+ leftTop.addView(JavaUI.ID_PACKAGES);
+ leftTop.addView("org.jboss.tools.seam.ui.views.SeamComponentsNavigator");
+ leftTop.addPlaceholder(IPageLayout.ID_RES_NAV);
+
+
+ IFolderLayout leftBottom = layout.createFolder("leftBottom", IPageLayout.BOTTOM, 0.64f, "leftTop");
+ //leftBottom.addView(IPageLayout.ID_OUTLINE);
+ leftBottom.addView(IPageLayout.ID_PROP_SHEET);
+
+
+ IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.78, editorArea); //$NON-NLS-1$
+ bottom.addView(IPageLayout.ID_PROBLEM_VIEW);
+ bottom.addView(IPageLayout.ID_TASK_LIST);
+
+
+ IFolderLayout rightTop = layout.createFolder("right", IPageLayout.RIGHT, (float)0.8, editorArea); //$NON-NLS-1$
+ rightTop.addView("com.redhat.palette.swt");
+ IFolderLayout rightBottom = layout.createFolder("rightBottom", IPageLayout.BOTTOM, (float)0.64, "right"); //$NON-NLS-1$
+ rightBottom.addView(IPageLayout.ID_OUTLINE);
+
+ layout.addActionSet(JavaUI.ID_ACTION_SET);
+ layout.addActionSet(JavaUI.ID_ELEMENT_CREATION_ACTION_SET);
+ layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
+
+ // views - seam
+ layout.addShowViewShortcut("org.jboss.tools.seam.ui.views.SeamComponentsNavigator");
+
+ // views - java
+ layout.addShowViewShortcut(JavaUI.ID_PACKAGES);
+ layout.addShowViewShortcut(JavaUI.ID_TYPE_HIERARCHY);
+ layout.addShowViewShortcut(JavaUI.ID_SOURCE_VIEW);
+
+ // views - standard workbench
+ layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
+ layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
+ layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
+
+ // new actions - Java project creation wizard
+ layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewPackageCreationWizard"); //$NON-NLS-1$
+ layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewClassCreationWizard"); //$NON-NLS-1$
+ layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard"); //$NON-NLS-1$
+ layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard"); //$NON-NLS-1$
+ layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard"); //$NON-NLS-1$
+ layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$
+ layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$
+
+ }
+
+}
16 years, 8 months
JBoss Tools SVN: r3308 - trunk/seam/features/org.jboss.tools.seam.feature.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2007-08-23 15:00:15 -0400 (Thu, 23 Aug 2007)
New Revision: 3308
Modified:
trunk/seam/features/org.jboss.tools.seam.feature/feature.xml
Log:
also added DTP jdbc enablement feature (so the user can actually select a DS from seam project wizard) http://jira.jboss.com/jira/browse/JBIDE-834
Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2007-08-23 18:42:34 UTC (rev 3307)
+++ trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2007-08-23 19:00:15 UTC (rev 3308)
@@ -223,6 +223,7 @@
<import feature="org.jboss.ide.eclipse.as.feature"/>
<import feature="org.hibernate.eclipse.feature"/>
<import feature="org.eclipse.datatools.connectivity.feature"/>
+ <import feature="org.eclipse.datatools.enablement.jdbc.feature"/>
</requires>
<plugin
16 years, 8 months
JBoss Tools SVN: r3307 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-23 14:42:34 -0400 (Thu, 23 Aug 2007)
New Revision: 3307
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerLaunchConfiguration.java
Log:
null pointer if user did not set a username or password
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerLaunchConfiguration.java 2007-08-23 18:39:22 UTC (rev 3306)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerLaunchConfiguration.java 2007-08-23 18:42:34 UTC (rev 3307)
@@ -159,9 +159,9 @@
String args = configuration.getAttribute(argsKey, (String)null);
String user = ArgsUtil.getValue(args, "-u", "--user");
String pass = ArgsUtil.getValue(args, "-p", "--password");
- if( user == null )
+ if( user == null && server.getUsername() != null && !server.getUsername().equals(""))
args = args + " -u " + server.getUsername();
- if( pass == null )
+ if( pass == null && server.getPassword() != null && !server.getPassword().equals(""))
args = args + " -p " + server.getPassword();
configuration.setAttribute(argsKey, args);
16 years, 8 months
JBoss Tools SVN: r3305 - trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2007-08-23 14:33:40 -0400 (Thu, 23 Aug 2007)
New Revision: 3305
Modified:
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml
Log:
updated feature text/copyright
Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml 2007-08-23 18:25:10 UTC (rev 3304)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml 2007-08-23 18:33:40 UTC (rev 3305)
@@ -1,17 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.jboss.ide.eclipse.freemarker.feature"
- label="JBossIDE FreeMarker Feature"
+ label="FreeMarkerIDE Feature"
version="1.0.0"
provider-name="JBoss, a division of Red Hat">
- <description url="http://www.jboss.com/products/jbosside">
- JBossIDE's Freemarker Feature
+ <description url="http://www.jboss.org/tools">
+ FreemarkerIDE Feature
</description>
<copyright>
- JBoss, Home of Professional Open Source
-Copyright 2006, JBoss Inc., and individual contributors as indicated by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors.
+ 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
</copyright>
<license url="http://osdn.dl.sourceforge.net/sourceforge/jboss/LGPL.html">
16 years, 8 months