JBoss Tools SVN: r26326 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-08 08:09:09 -0500 (Mon, 08 Nov 2010)
New Revision: 26326
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.settings/org.projectusus.core.prefs
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/.settings/org.projectusus.core.prefs
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java
Log:
[JBIDE-7513] extracted several common parts (code duplication) to common superclass, implemented generic selection restoring
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.settings/org.projectusus.core.prefs
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.settings/org.projectusus.core.prefs (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.settings/org.projectusus.core.prefs 2010-11-08 13:09:09 UTC (rev 26326)
@@ -0,0 +1,3 @@
+#Sun Nov 07 00:34:37 CET 2010
+eclipse.preferences.version=1
+ususProject=true
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.settings/org.projectusus.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/.settings/org.projectusus.core.prefs
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/.settings/org.projectusus.core.prefs (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/.settings/org.projectusus.core.prefs 2010-11-08 13:09:09 UTC (rev 26326)
@@ -0,0 +1,3 @@
+#Sun Nov 07 00:34:41 CET 2010
+eclipse.preferences.version=1
+ususProject=true
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/.settings/org.projectusus.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-08 11:21:07 UTC (rev 26325)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-08 13:09:09 UTC (rev 26326)
@@ -1,3 +1,11 @@
+2010-11-08 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java (getChildrenWithSameElement):
+ * src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java (dispose):
+ (CVInstancesCategoryElement):
+ (listChanged):
+ [JBIDE-7513] extracted several common parts (code duplication) to common superclass, implemented generic selection restoring
+
2010-11-05 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java (getStatusIcon):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-08 11:21:07 UTC (rev 26325)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-08 13:09:09 UTC (rev 26326)
@@ -11,7 +11,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Deltacloud Tools"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.usage.test,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.jobs@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.equinox.http.registry@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.net@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi@-1:true,org.eclipse.emf.edit@default:default,org.apache.ant@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.debug.core@default:def!
ault,org.eclipse.help.webapp@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.resources@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.security@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.xml.serializer@default:default,org.eclipse.jface@default:default,org.eclipse.emf.common@default:default,org.eclipse.rse.services@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.team.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.sdk@default:default,org.eclipse.help.appserver@default:default,org.eclipse.emf.ecore.x!
mi@default:default,org.eclipse.core.net.linux.x86_64@default:f!
alse,org
.eclipse.ecf.filetransfer@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:default,org.eclipse.jem.util@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.search@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.rse.core@default:default,org.eclipse.text@default:default,org.jboss.tools.common@default:default,org.eclipse.wst.sse.core@default:default,javax.xml@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.ui.forms@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.nav!
igator.resources@default:default,org.apache.jasper@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ecf@default:default,org.ec!
lipse.jdt.ui@default:default,org.eclipse.equinox.p2.metadata.r!
epositor
y@default:default,org.hamcrest.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.core.commands@default:default,org.eclipse.compare.core@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.compare@default:default,org.eclipse.ui.cheatsheets@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.apache.lucene@default:default,org.apache.xml.resolver@default:default,org.eclipse.help@default:default,org.eclipse.core.variables@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,javax.servlet@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.workbench.texteditor@default:default!
,org.eclipse.ecf.ssl@default:false,org.eclipse.wst.common.core@default:default,org.junit4@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.update.configurator@3:true,org.eclipse.help.ui@default:default,org.eclipse.core.databinding.beans@default:default,javax.servlet.jsp@default:default,org.apache.xerces@default:default,org.eclipse.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common@default:default,org.jruby.jruby@default:default,org.jboss.tools.deltacloud.ui@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.help.ui@default:default,org.eclipse.team.core@default:default,org.apache.lucene.analysis@default:default,org.jboss.tools.common@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.security@default:default,org.eclipse.core.runtime@default:true,org.eclipse.compare@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.ecf@default:default,org.eclipse.jface@default:default,org.eclipse.ui.ide.application@default:defau!
lt,org.eclipse.core.variables@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.xml@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.swt@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.emf.common@default:default,org.apache.lucene@default:default,org.eclipse.ui.ide@default:default,org.junit4@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.wst.common.core@default:default,javax.servlet.jsp@default:default,org.eclipse.!
jem.util@default:default,org.eclipse.jdt.core.manipulation@def!
ault:def
ault,org.apache.commons.el@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jface.text@default:default,org.eclipse.rse.services@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.help.appserver@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.help.webapp@default:default,org.eclipse.core.net@default:default,org.eclipse.osgi@-1:true,org.eclipse.wst.common.emf@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.views@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.xml.core@default:default,org.eclipse.sw!
t.gtk.linux.x86_64@default:false,org.eclipse.core.databinding@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.xml.resolver@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui@default:default,org.eclipse.rse.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.launching@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.forms@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.help@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.app@!
default:default,org.eclipse.jdt.debug@default:default,org.ecli!
pse.core
.jobs@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.databinding.property@default:default,org.apache.ant@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.sse.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.p2.repository@default:default,javax.servlet@default:default,org.apache.xerces@default:default,org.eclipse.core.resources@default:default!
,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.sdk@default:default,org.apache.jasper@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.text@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.search@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jface.databinding@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.debug.core@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.test@default:default,org.jruby.jruby@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-11-08 11:21:07 UTC (rev 26325)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-11-08 13:09:09 UTC (rev 26326)
@@ -10,36 +10,138 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.ui.views;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.views.properties.IPropertySource;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudImage;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
public abstract class CVCategoryElement extends CloudViewElement {
- public final static int INSTANCES = 0;
- public final static int IMAGES = 1;
-
- protected int type;
protected boolean initialized;
-
- public CVCategoryElement(Object element, String name, int type) {
+ private TreeViewer viewer;
+
+ public CVCategoryElement(Object element, String name, TreeViewer viewer) {
super(element, name);
- this.type = type;
+ this.viewer = viewer;
+ viewer.getControl().addDisposeListener(onDispose());
}
@Override
public Object[] getChildren() {
return super.getChildren();
}
-
+
@Override
public boolean hasChildren() {
return true;
}
-
+
@Override
public IPropertySource getPropertySource() {
// no property source for cathegories
return null;
}
-
+ protected Viewer getViewer() {
+ return viewer;
+ }
+
+ protected void refresh() {
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ IStructuredSelection oldSelection = (IStructuredSelection) viewer.getSelection();
+ ((TreeViewer) viewer).refresh(CVCategoryElement.this, false);
+ restoreSelection(oldSelection);
+ }
+ });
+ }
+
+ /**
+ * This is a workaround:
+ *
+ * When a change in the list of instances happens, DeltaCloud notifies this
+ * class with the list of all instances (@see
+ * DeltaCloud#performInstanceAction). This class then removes all children
+ * and readds new children with the same DeltaCloudInstance instances.
+ *
+ * <p>
+ * I also tried an alternative approach where I implemented an equals method
+ * in CVInstanceElement that returns <code>true</code> if both elements have
+ * the same DeltaCloudInsta instance. The consequence is that the viewer
+ * keeps the selection, but is not aware of a change in the underlying
+ * items. The consequence is that the context-menu does not change its state
+ * (the instance action, that was executed, should disappear) and the
+ * properties view does not update either.
+ *
+ * @param selection
+ *
+ * @see DeltaCloud#performInstanceAction
+ * @see #listChanged
+ */
+ private void restoreSelection(IStructuredSelection selection) {
+ List<?> newSelectedElements = getChildrenWithSameElement(selection.toList());
+ if (newSelectedElements != null && newSelectedElements.size() > 0) {
+ ISelection newSelection = new StructuredSelection(newSelectedElements);
+ viewer.setSelection(newSelection);
+ }
+ }
+
+ /**
+ * Returns the children of this category element that have the same elements
+ * (#getElement) as the given items. This method is used to restore
+ * selection after the {@link CVInstanceElement} or {@link CVImageElement}
+ * have been recreated. They still have the same {@link DeltaCloudInstance}
+ * or {@link DeltaCloudImage}.
+ *
+ * @param elementsToMatch
+ * the elements to match
+ * @return the children with same element
+ *
+ * @see #CloudViewElement#getElement
+ * @see CVInstanceElement
+ * @see CVImageElement
+ */
+ private List<?> getChildrenWithSameElement(List<?> itemsToMatch) {
+ if (itemsToMatch == null || itemsToMatch.size() == 0) {
+ return Collections.EMPTY_LIST;
+ }
+ List<Object> children = new ArrayList<Object>();
+ for (Object member : itemsToMatch) {
+ Object element = ((CloudViewElement) member).getElement();
+ if (element != null) {
+ for (Object child : getChildren()) {
+ Object childElement = ((CloudViewElement) child).getElement();
+ if (element.equals(childElement)) {
+ children.add(child);
+ }
+ }
+ }
+ }
+ return children;
+ }
+
+ private DisposeListener onDispose() {
+ return new DisposeListener() {
+
+ @Override
+ public void widgetDisposed(DisposeEvent e) {
+ dispose();
+ }
+ };
+ }
+
+ protected abstract void dispose();
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java 2010-11-08 11:21:07 UTC (rev 26325)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java 2010-11-08 13:09:09 UTC (rev 26326)
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.ui.views;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.ui.views.properties.IPropertySource;
import org.jboss.tools.deltacloud.core.DeltaCloud;
@@ -19,10 +20,10 @@
private static final String INSTANCE_CATEGORY_NAME = "InstanceCategoryName"; //$NON-NLS-1$
private static final String IMAGE_CATEGORY_NAME = "ImageCategoryName"; //$NON-NLS-1$
- private Viewer viewer;
+ private TreeViewer viewer;
private boolean initialized;
- public CVCloudElement(Object element, String name, Viewer viewer) {
+ public CVCloudElement(Object element, String name, TreeViewer viewer) {
super(element, name);
this.viewer = viewer;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-11-08 11:21:07 UTC (rev 26325)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-11-08 13:09:09 UTC (rev 26326)
@@ -13,8 +13,6 @@
import java.util.ArrayList;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Display;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.IImageFilter;
@@ -22,22 +20,11 @@
public class CVImagesCategoryElement extends CVCategoryElement implements IImageListListener {
- private Viewer viewer;
- private CVImagesCategoryElement category;
-
- public CVImagesCategoryElement(Object element, String name, Viewer viewer) {
- super(element, name, CVCategoryElement.INSTANCES);
- this.viewer = viewer;
+ public CVImagesCategoryElement(Object element, String name, TreeViewer viewer) {
+ super(element, name, viewer);
DeltaCloud cloud = (DeltaCloud)getElement();
cloud.addImageListListener(this);
- this.category = this;
}
-
- protected void finalize() throws Throwable {
- DeltaCloud cloud = (DeltaCloud)getElement();
- cloud.removeImageListListener(this);
- super.finalize();
- }
private void addImages(DeltaCloudImage[] images) {
if (images.length > CVNumericFoldingElement.FOLDING_SIZE) {
@@ -95,12 +82,7 @@
DeltaCloudImage[] images = filter(newImages);
addImages(images);
initialized = true;
- Display.getDefault().asyncExec(new Runnable() {
- @Override
- public void run() {
- ((TreeViewer)viewer).refresh(category, false);
- }
- });
+ refresh();
}
public DeltaCloudImage[] filter(DeltaCloudImage[] input) {
@@ -116,4 +98,8 @@
}
+ protected void dispose() {
+ DeltaCloud cloud = (DeltaCloud)getElement();
+ cloud.removeImageListListener(this);
+ }
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-11-08 11:21:07 UTC (rev 26325)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-11-08 13:09:09 UTC (rev 26326)
@@ -11,16 +11,8 @@
package org.jboss.tools.deltacloud.ui.views;
import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.widgets.Display;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.core.IInstanceFilter;
@@ -28,37 +20,12 @@
public class CVInstancesCategoryElement extends CVCategoryElement implements IInstanceListListener {
- private Viewer viewer;
- private CVInstancesCategoryElement category;
-
- public CVInstancesCategoryElement(Object element, String name, Viewer viewer) {
- super(element, name, CVCategoryElement.INSTANCES);
- this.viewer = viewer;
+ public CVInstancesCategoryElement(Object element, String name, TreeViewer viewer) {
+ super(element, name, viewer);
DeltaCloud cloud = (DeltaCloud) getElement();
cloud.addInstanceListListener(this);
- viewer.getControl().addDisposeListener(onDispose());
- this.category = this;
}
- private DisposeListener onDispose() {
- return new DisposeListener() {
-
- @Override
- public void widgetDisposed(DisposeEvent e) {
- DeltaCloud cloud = (DeltaCloud) getElement();
- if (cloud != null) {
- cloud.removeInstanceListListener(CVInstancesCategoryElement.this);
- }
- }
- };
- }
-
- protected void finalize() throws Throwable {
- DeltaCloud cloud = (DeltaCloud) getElement();
- cloud.removeInstanceListListener(this);
- super.finalize();
- }
-
private void addInstances(DeltaCloudInstance[] instances) {
if (instances.length > CVNumericFoldingElement.FOLDING_SIZE) {
int min = 0;
@@ -115,62 +82,7 @@
final DeltaCloudInstance[] instances = filter(newInstances);
addInstances(instances);
initialized = true;
- Display.getDefault().asyncExec(new Runnable() {
- @Override
- public void run() {
- IStructuredSelection oldSelection = (IStructuredSelection) viewer.getSelection();
- ((TreeViewer) viewer).refresh(category, false);
- restoreSelection(oldSelection);
- }
-
- /**
- * This is a workaround:
- *
- * When a change in the list of instances happens, DeltaCloud
- * notifies this class with the list of all instances (@see
- * DeltaCloud#performInstanceAction). This class then removes all
- * children and readds new children with the same DeltaCloudInstance
- * instances.
- *
- * <p>
- * I also tried an alternative approach where I implemented an
- * equals method in CVInstanceElement that returns <code>true</code>
- * if both elements have the same DeltaCloudInsta instance. The
- * consequence is that the viewer keeps the selection, but is not
- * aware of a change in the underlying items. The consequence is
- * that the context-menu does not change its state (the instance
- * action, that was executed, should disappear) and the properties
- * view does not update either.
- *
- * @param selection
- *
- * @see DeltaCloud#performInstanceAction
- * @see #listChanged
- */
- private void restoreSelection(IStructuredSelection selection) {
- ISelection newSelection = new StructuredSelection(getChildrenWithSameDeltaCloudInstance(selection
- .toList()));
- viewer.setSelection(newSelection);
- }
-
- private List<CVInstanceElement> getChildrenWithSameDeltaCloudInstance(List<?> cvInstanceElements) {
- List<CVInstanceElement> cvInstances = new ArrayList<CVInstanceElement>();
- Object[] children = getChildren();
- for (Object member : cvInstanceElements) {
- CVInstanceElement cvInstance = (CVInstanceElement) member;
- DeltaCloudInstance instance = (DeltaCloudInstance) cvInstance.getElement();
- for (Object child : children) {
- CVInstanceElement childCvInstanceElement = (CVInstanceElement) child;
- DeltaCloudInstance childInstance = (DeltaCloudInstance) childCvInstanceElement.getElement();
- if (instance != null && instance.equals(childInstance)) {
- cvInstances.add(childCvInstanceElement);
- }
- }
- }
- return cvInstances;
- }
-
- });
+ refresh();
}
private DeltaCloudInstance[] filter(DeltaCloudInstance[] input) {
@@ -185,4 +97,10 @@
return array.toArray(new DeltaCloudInstance[array.size()]);
}
+ protected void dispose() {
+ DeltaCloud cloud = (DeltaCloud) getElement();
+ if (cloud != null) {
+ cloud.removeInstanceListListener(this);
+ }
+ }
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java 2010-11-08 11:21:07 UTC (rev 26325)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java 2010-11-08 13:09:09 UTC (rev 26326)
@@ -11,7 +11,6 @@
package org.jboss.tools.deltacloud.ui.views;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.views.properties.IPropertySource;
import org.jboss.tools.deltacloud.core.DeltaCloud;
@@ -21,9 +20,9 @@
public class CVRootElement extends CloudViewElement implements ICloudManagerListener {
private boolean initialized;
- private Viewer viewer;
+ private TreeViewer viewer;
- public CVRootElement(Viewer viewer) {
+ public CVRootElement(TreeViewer viewer) {
super(DeltaCloudManager.getDefault(), "root"); //$NON-NLS-1$
this.viewer = viewer;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java 2010-11-08 11:21:07 UTC (rev 26325)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java 2010-11-08 13:09:09 UTC (rev 26326)
@@ -72,5 +72,4 @@
}
return null;
}
-
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26325 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-08 06:21:07 -0500 (Mon, 08 Nov 2010)
New Revision: 26325
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
Log:
[JBIDE-7512] added comment
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-11-08 11:06:20 UTC (rev 26324)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-11-08 11:21:07 UTC (rev 26325)
@@ -37,7 +37,9 @@
@Override
public IPropertySource getPropertySource() {
+ // no property source for cathegories
return null;
}
+
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26324 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-08 06:06:20 -0500 (Mon, 08 Nov 2010)
New Revision: 26324
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java
Log:
[JBIDE-7512] cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java 2010-11-08 06:38:28 UTC (rev 26323)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java 2010-11-08 11:06:20 UTC (rev 26324)
@@ -42,7 +42,6 @@
@Override
public void dispose() {
- // TODO Auto-generated method stub
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26323 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-11-08 01:38:28 -0500 (Mon, 08 Nov 2010)
New Revision: 26323
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java
Log:
JBIDE-7346
Change the line style
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java 2010-11-08 05:16:51 UTC (rev 26322)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java 2010-11-08 06:38:28 UTC (rev 26323)
@@ -16,6 +16,7 @@
import org.eclipse.draw2d.ActionEvent;
import org.eclipse.draw2d.ActionListener;
import org.eclipse.draw2d.Clickable;
+import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.Figure;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.GridData;
@@ -30,6 +31,7 @@
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Menu;
@@ -134,7 +136,9 @@
protected void paintBorder(Graphics graphics) {
// super.paintBorder(graphics);
if (showRectangle) {
- graphics.setLineWidth(2);
+// graphics.setLineWidth(2);
+ graphics.setForegroundColor(ColorConstants.blue);
+ graphics.setLineStyle(SWT.LINE_DOT);
graphics.drawRectangle(getBounds().x+1,getBounds().y+1,getBounds().width - 2 , getBounds().height - 2);
}
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26322 - in trunk/gwt: plugins/org.jboss.tools.gwt.core/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-08 00:16:51 -0500 (Mon, 08 Nov 2010)
New Revision: 26322
Modified:
trunk/gwt/features/org.jboss.tools.gwt.feature/feature.xml
trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF
trunk/gwt/site/
Log:
feature should not require stuff - only plugins should require stuff; bump dep to 2.1.0 from 2.0.4; set svn:ignore
Modified: trunk/gwt/features/org.jboss.tools.gwt.feature/feature.xml
===================================================================
--- trunk/gwt/features/org.jboss.tools.gwt.feature/feature.xml 2010-11-08 01:25:35 UTC (rev 26321)
+++ trunk/gwt/features/org.jboss.tools.gwt.feature/feature.xml 2010-11-08 05:16:51 UTC (rev 26322)
@@ -18,8 +18,6 @@
</license>
<requires>
- <import feature="com.google.gwt.eclipse.sdkbundle.e36.feature.2.0.4" version="2.0.4" match="greaterOrEqual"/>
- <import feature="com.google.gdt.eclipse.suite.e36.feature" version="1.3.3" match="greaterOrEqual"/>
<import feature="org.eclipse.jst.enterprise_ui.feature" version="3.2.0" match="greaterOrEqual"/>
<import feature="org.eclipse.wst.web_ui.feature" version="3.2.0" match="greaterOrEqual"/>
<import feature="org.eclipse.jst.web_ui.feature" version="3.2.0" match="greaterOrEqual"/>
Modified: trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF 2010-11-08 01:25:35 UTC (rev 26321)
+++ trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF 2010-11-08 05:16:51 UTC (rev 26322)
@@ -8,7 +8,7 @@
Require-Bundle:
org.jboss.tools.common;bundle-version="[3.2.0,4.0.0)",
com.google.gwt.eclipse.core;bundle-version="[1.3.3,2.0.0)",
- com.google.gwt.eclipse.sdkbundle.2.0.4;bundle-version="[2.0.4,3.0.0)",
+ com.google.gwt.eclipse.sdkbundle.2.1.0;bundle-version="[2.0.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
Property changes on: trunk/gwt/site
___________________________________________________________________
Name: svn:ignore
+ target
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26321 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-11-07 20:25:35 -0500 (Sun, 07 Nov 2010)
New Revision: 26321
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
Log:
updated with corrected build errors
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-11-08 01:20:05 UTC (rev 26320)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-11-08 01:25:35 UTC (rev 26321)
@@ -45,7 +45,7 @@
</listitem>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-6728">JBIDE-6728</ulink>: Each field injection point that includes an <parameter>Event</parameter> type is now provided with a default bean. For example the injection field <code>@Inject @Any @Tame @Role("Master") Event<TamingCommand> tamingEvent</code> will now have a bean for injection.
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-6728">JBIDE-6728</ulink>: Each field injection point that includes an <parameter>Event</parameter> type is now provided with a default bean. For example the injection field <code>@Inject @Any @Tame @Role("Master") Event<TamingCommand> tamingEvent</code> will now have a bean for injection.
</para>
</listitem>
<listitem>
@@ -224,8 +224,9 @@
</menuchoice> is available from the ESB editor's menu when the <classname>org.jboss.soa.esb.actions.bpel.BPELInvoke</classname> class is apart of the project classpath. This ensures that the <methodname>BPELInvoke</methodname> action is only enabled when the Riftsaw runtime is installed.
</para>
</listitem>
- <para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5551">JBIDE-5551</ulink>: Language property support has been corrected in the ESB editor. When specifying a <property>ScriptingAction</property> a user can now set a <property>language</property> property instead of allowing the <property>ScriptingAction</property> to determine the language based on the extension of the file.
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5551">JBIDE-5551</ulink>: Language property support has been corrected in the ESB editor. When specifying a <property>ScriptingAction</property> a user can now set a <property>language</property> property instead of allowing the <property>ScriptingAction</property> to determine the language based on the extension of the file.
</para>
</listitem>
</itemizedlist>
@@ -907,7 +908,7 @@
</listitem>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-6083">JBIDE-6083</ulink>: Functionality has been added to all editors that allow for them to be placed vertically side by side, rather than just horizontally. This new feature is available through the <menuchoice>Window</menuchoice> menu of Eclipse.
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-6083">JBIDE-6083</ulink>: Functionality has been added to all editors that allow for them to be placed vertically side by side, rather than just horizontally. This new feature is available through the <menuchoice><guimenuitem>Window</guimenuitem></menuchoice> menu of Eclipse.
</para>
</listitem>
<listitem>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26320 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-11-07 20:20:05 -0500 (Sun, 07 Nov 2010)
New Revision: 26320
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
Log:
updated with new fixed issues
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-11-07 23:27:57 UTC (rev 26319)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-11-08 01:20:05 UTC (rev 26320)
@@ -139,6 +139,11 @@
<ulink url="http://jira.jboss.com/jira/browse/JBIDE-6251">JBIDE-6251</ulink>: OpenOn support has been added for <methodname>Disposer</methodname> and <methodname>Producer</methodname> methods.
</para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5927">JBIDE-5927</ulink>: A new feature has been added allowing for CDI <property>@Named</property> annotated beans to be renamed through refactoring. This change appears when using the <guilabel>Find References</guilabel> functionality for EL expressions. The <guimenuitem>Rename</guimenuitem> action is available from the context menu for a <property>@Named</property> annotation in the Java Source editor.
+ </para>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
@@ -219,6 +224,10 @@
</menuchoice> is available from the ESB editor's menu when the <classname>org.jboss.soa.esb.actions.bpel.BPELInvoke</classname> class is apart of the project classpath. This ensures that the <methodname>BPELInvoke</methodname> action is only enabled when the Riftsaw runtime is installed.
</para>
</listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5551">JBIDE-5551</ulink>: Language property support has been corrected in the ESB editor. When specifying a <property>ScriptingAction</property> a user can now set a <property>language</property> property instead of allowing the <property>ScriptingAction</property> to determine the language based on the extension of the file.
+ </para>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
@@ -323,6 +332,21 @@
<ulink url="http://jira.jboss.com/jira/browse/JBIDE-6115">JBIDE-6115</ulink>: The <guibutton>Schema Export (.ddl)</guibutton> exporter would apply any changes made by a user to the database during the export process. This was unexpected behavior and had the ability to cause unwanted data loss. This issue has been corrected by ensuring that the script is not exported to the database by default, thus no changes are applied to the databse by default now when using the <guibutton>Schema Export (.ddl)</guibutton> functionality.
</para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5847">JBIDE-5847</ulink>: New functionality has been added that allows for Dali 2.3 support in Hibernate Tools. Dali 2.3 is the latest release of the Eclipse Web Tools Platform, part of the larger Eclipse Helios release that this JBoss release is built upon.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5805">JBIDE-5805</ulink>: Usability has been improved with this release by including matching bracket highlighting within the Hibernate Query Language (HQL) editor. When a user has the cursor beside a bracket in their code, the paired bracket will be highlighted. This functionality is useful for debuging applicaitons.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5411">JBIDE-5411</ulink>: Packages without Java classes are now correctly filtered from being shown in the <guilabel>New Hibernate hbm.xml</guilabel> wizard. This wizard is used to create a new Hibernate XML mapping file.
+ </para>
+ </listitem>
<!-- JBIDE-5960 was included in the JBDS 3.0.1 and JBT 3.1.1 releases. Mentioned in 3.0.1 Release Notes -->
</itemizedlist>
</para>
@@ -332,10 +356,15 @@
<para>
<itemizedlist>
<listitem>
- <para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-6104">JBIDE-6104</ulink>: An error existed that meant local and deployment server settings were not saved and upon reopening the jBPM Process Definition Language (JPDL) all the settings would need to be reconfigured. With this release changes made to local and deployment server settings are made persistent across JPDL sessions.
- </para>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-6104">JBIDE-6104</ulink>: An error existed that meant local and deployment server settings were not saved and upon reopening the jBPM Process Definition Language (JPDL) all the settings would need to be reconfigured. With this release changes made to local and deployment server settings are made persistent across JPDL sessions.
+ </para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5911">JBIDE-5911</ulink>: Previously it was only possible to have one jBPM process definition in a package (folder). Support has been added in this version that allows for multiple process definitions to exist in the one package.
+ </para>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
@@ -388,6 +417,71 @@
<ulink url="http://jira.jboss.com/jira/browse/JBIDE-6259">JBIDE-6259</ulink> and <ulink url="http://jira.jboss.com/jira/browse/JBIDE-6025">JBIDE-6025</ulink>: A new option has been added to the <guilabel>Preferences</guilabel> page allowing a user to <option>enable</option> or <option>disbale</option> code assist of <methodname>get</methodname> and <methodname>set</methodname> methods in the expression language.
</para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5946">JBIDE-5946</ulink>: A new XHTML template called <guilabel>JSF Composite Component</guilabel> has been added to the new XHTML page wizard that assists in the creation of JSF2 composite components.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5943">JBIDE-5943</ulink>: The possibility to rename a JSF component attribute name now exists. To rename a component name right-click on the name in your XHTML editor and navigate to <menuchoice><guimenuitem>Refactor</guimenuitem><guimenuitem>Rename</guimenuitem></menuchoice> and input a new name in the <guilabel>Rename Composite Attribute</guilabel> dialog.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5942">JBIDE-5942</ulink>: The ability to refactor a JSF component has been added. This allows for a user to change the name of a component file and for this change to persist in the project the component is a part of.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5941">JBIDE-5941</ulink>: Content assist support has been added for composite attributes. To support this functionality the <classname>JSF2CCAttrsELCompletionEngine</classname> class has been added.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5937">JBIDE-5937</ulink>: If a custom element attribute does not exist then a user can perform a quick fix to create it.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5930">JBIDE-5930</ulink>: When creating a custom JSF2 page and a coded element name does not exist, the user will be presented with a quick fix option. To select the quick fix option navigate to the <guilabel>Problems</guilabel> window where the <guiicon>Warnings</guiicon> information appears and rick-click on the warning specifying that the element name does not exist. From the displayed menu, navigate to <menuchoice><guimenuitem>Quick Fix</guimenuitem></menuchoice>. The <guilabel>Quick Fix</guilabel> dialog will then display with a list of fixes for the problem. Select one from the list and click <guibutton>Finish</guibutton> to apply the quick fix.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5922">JBIDE-5922</ulink>: When referencing a resource that does not exist (for example, having the following code at the top of a HTML page <code>xmlns:newResource="http://java.sun.com/jsf/composite/newResource"</code>), the user can now select the <guimenuitem>Quick Fix</guimenuitem> option from the context menu that will create a folder for this resource under the <guimenuitem>resources</guimenuitem> folder for your project.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5888">JBIDE-5888</ulink>: The <guilabel>Add JSF Capabilities</guilabel> wizard has been updated to support the new Servlet 3.0 standard. A user can select to use Servlet 3.0 from the <guilabel>Servlet Version</guilabel> drop-down list on the <guilabel>Project Folders</guilabel> page of the wizard.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5677">JBIDE-5677</ulink>: JSF 2 is now supported for web projects. When a user is configuring Project Facets and selects to add JSF support, JSF 2 is now an avaiable option.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5219">JBIDE-5219</ulink>: The JSF 2 kick start project template has been added and is now available within the <guilabel>New JSF Project Wizard</guilabel>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-4990">JBIDE-4990</ulink>: When performing an Expression Language (EL) variable refactoring (renaming), all occurances of the specific variable are renamed accordingly. The refactoring action is available from the context menu of an Expression Language (EL) variable in the JSP and XHTML editors.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-4947">JBIDE-4947</ulink>: A new feature has been added that produces a tool tip for any Expression Language (EL) element that a user hovers the mouse cursor over. The tool tip displays informaiton about the EL element.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-4876">JBIDE-4876</ulink>: The quick fix operation has been enhanced, now offering to add the corresponding tag library definition to the JSP or XHTML header for any tags without a corresponding XML Namespace (XMLNS) in the document header.
+ </para>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
@@ -415,6 +509,11 @@
<ulink url="http://jira.jboss.com/jira/browse/JBIDE-6612">JBIDE-6612</ulink>: The new version of Eclipse would not recognise JBoss Application Server 6 as a valid JEE6 environment. To rectify this bug, Java EE6 has been configured to support JBoss Application Server 6 by modifying <filename>/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml </filename>.
</para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5109">JBIDE-5109</ulink>: JBoss Application Server tooling as been improved to now allow regular JBoss servers to use remote deployment instead of just SSH Server deployment. Previously remote deployment was only available to JBoss EC2 servers, and not regular remote hosts.
+ </para>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
@@ -509,6 +608,21 @@
<ulink url="http://jira.jboss.com/jira/browse/JBIDE-6360">JBIDE-6360</ulink>: Previously <property>view-id</property> entries in the navigation of XML files was not tested for validlity. Error checking for this parameter has been added to the Seam tools set with this release.
</para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5231">JBIDE-5231</ulink> and <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5198">JBIDE-5198</ulink>: Content assist has been improved to suggest attributes of Seam PDF and Seam mail components to the user, when appropriate.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5134">JBIDE-5134</ulink>: When implementing a <guimenuitem>Quick Fix</guimenuitem> from the context menu of a <errorname>Seam Runtime <replaceable>NAME</replaceable> does not exist</errorname> error the <guilabel>Name</guilabel> and <guilabel>Version</guilabel> fields are now automatically filled in. The name field is editable in case a runtime already exists with the generated name, however the version is locked to the version used in the Seam project settings.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5007">JBIDE-5007</ulink>: When using the <guilabel>Generate Seam Entities</guilabel> wizard, the option to <guilabel>Use existing reveng</guilabel> file has been added. Once this checkbox has been checked, a user can use the <guibutton>Browse</guibutton> button beside the <guilabel>reveng.xml</guilabel> field to navigate to the existing file. By importing a <filename><replaceable>NAME</replaceable>.reveng.xml</filename> file a user can regenerate the entities for use in the new Seam project.
+ </para>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
@@ -640,6 +754,48 @@
<ulink url="http://jira.jboss.com/jira/browse/JBIDE-5970">JBIDE-5970</ulink>: A new feature has been added that indicates the drop actions available to a user while they are dragging an element. Available actions are displayed to the user in a text caption.
</para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5101">JBIDE-5101</ulink>: A bug existed within the resizer tool, which meant that it was not shown correctly for buttons, input fields and controls. This readability and usability issue has been resolved by adjusting the padding for the body of a Visual Page Editor page, allowing space for resizer elements.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5042">JBIDE-5042</ulink>: Drag and drop actions have been improved to be more reliable and easier to use. The list of improvements is as follows:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The drop indicator is now shown in all drop locations available
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The four arrow resize icon is shown for any selected element that is draggable
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The drop container is now highlighted blue, making it easier to see what the result of a drop action will be
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ When an element is being dragged, an image of the element appears under the mouse cursor
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Drop targets of any move event are marked by sold black lines that may appear before or after any other object
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The current drop target is highlighted red
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
@@ -682,6 +838,11 @@
<ulink url="http://jira.jboss.com/jira/browse/JBIDE-6589">JBIDE-6589</ulink>: In previous releases a JAX-WS invocation could not be cancelled. Support for cancelling a long-running invocation has been implemented and improved for this release.
</para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5723">JBIDE-5723</ulink>: A new wizard has been added called <guilabel>Create a Sample Web Service</guilabel>. This wizard allows a user to get a web service up and running quickly. The wizard adds the RestEasy code to the <filename>web.xml</filename> file, creates the application class and JAX-RS annotated resource class, and adds the required RestEast JAR files from the runtime. Once created, the new web service project can be tested using the <guilabel>Web Service Tester</guilabel>.
+ </para>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26319 - in trunk/maven/plugins: org.jboss.tools.maven.seam and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-11-07 18:27:57 -0500 (Sun, 07 Nov 2010)
New Revision: 26319
Added:
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/FixClasspathConfigurator.java
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
Log:
JBIDE-7011 Mavenized Seam Web project can't be created using m2eclipse 0.12.x
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2010-11-06 08:53:36 UTC (rev 26318)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2010-11-07 23:27:57 UTC (rev 26319)
@@ -322,10 +322,10 @@
//IMavenConfiguration mavenConfiguration = MavenPlugin.lookup(IMavenConfiguration.class);
//IMavenConfiguration mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration();
IMavenConfiguration mavenConfiguration = getMavenConfiguration();
+
configurationManager.updateProjectConfiguration(project,
- resolverConfiguration, //
- mavenConfiguration
- .getGoalOnUpdate(), new NullProgressMonitor());
+ resolverConfiguration, mavenConfiguration.getGoalOnUpdate(),
+ new NullProgressMonitor());
}
private static IMavenConfiguration getMavenConfiguration() {
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2010-11-06 08:53:36 UTC (rev 26318)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2010-11-07 23:27:57 UTC (rev 26319)
@@ -14,4 +14,13 @@
name="%Seam_Project_configurator" priority="200"/>
</extension>
+ <extension point="org.maven.ide.eclipse.projectConfigurators">
+ <configurator
+ id="org.jboss.tools.maven.seam.configurator.fixClasspathConfigurator"
+ class="org.jboss.tools.maven.seam.configurators.FixClasspathConfigurator"
+ name="%Seam_Project_configurator" priority="300"/>
+ </extension>
+
+
+
</plugin>
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-11-06 08:53:36 UTC (rev 26318)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-11-07 23:27:57 UTC (rev 26319)
@@ -191,6 +191,7 @@
parent.setArtifactId(parentArtifactId);
parent.setGroupId(m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID));
parent.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION));
+ parent.setRelativePath("../" + parentProjectName); //$NON-NLS-1$
model.setParent(parent);
List dependencies = model.getDependencies();
@@ -362,6 +363,7 @@
parent.setArtifactId(parentArtifactId);
parent.setGroupId(m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID));
parent.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION));
+ parent.setRelativePath("../" + parentProjectName); //$NON-NLS-1$
model.setParent(parent);
List dependencies = model.getDependencies();
@@ -484,14 +486,6 @@
model.setBuild(build);
MavenCoreActivator.createMavenProject(earProjectName, null, model, true);
removeWTPContainers(m2FacetModel, project);
- // configureApplicationXml(project, m2FacetModel, null);
- //removeRuntime(project);
- //IProject ejbProject = ResourcesPlugin.getWorkspace().getRoot().getProject(ejbProjectName);
- //removeRuntime(ejbProject);
- //EarFacetRuntimeHandler.updateModuleProjectRuntime(project, ejbProject, null);
- //IProject webProject = ResourcesPlugin.getWorkspace().getRoot().getProject(webProjectName);
- //removeRuntime(webProject);
- //EarFacetRuntimeHandler.updateModuleProjectRuntime(project, webProject, null);
} catch (Exception e) {
MavenSeamActivator.log(e);
}
@@ -499,7 +493,6 @@
}
}
-
private void removeRuntime(IProject project) throws CoreException {
IFacetedProject facetedProject = ProjectFacetsManager.create( project );
facetedProject.setRuntime(null, null);
@@ -528,6 +521,7 @@
parent.setArtifactId(parentArtifactId);
parent.setGroupId(m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID));
parent.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION));
+ parent.setRelativePath("../" + parentProjectName); //$NON-NLS-1$
model.setParent(parent);
List dependencies = model.getDependencies();
@@ -589,11 +583,8 @@
String artifactId = parentProjectName;
String groupId = m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID);
String version = m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION);
- String relativePath = null;
- if (SeamFacetAbstractInstallDelegate
- .isWarConfiguration(seamFacetModel)) {
- relativePath = "../" + parentProjectName; //$NON-NLS-1$
- }
+
+ String relativePath = "../" + parentProjectName; //$NON-NLS-1$
ParentAdder parentAdder = new ParentAdder(groupId, artifactId, version, relativePath);
modelManager.updateProject(pomFile, parentAdder);
Added: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/FixClasspathConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/FixClasspathConfigurator.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/FixClasspathConfigurator.java 2010-11-07 23:27:57 UTC (rev 26319)
@@ -0,0 +1,141 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2010 JBoss by Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.maven.seam.configurators;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.maven.model.Resource;
+import org.apache.maven.project.MavenProject;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.jboss.tools.maven.seam.MavenSeamActivator;
+import org.maven.ide.eclipse.project.IMavenProjectFacade;
+import org.maven.ide.eclipse.project.MavenProjectChangedEvent;
+import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigurator;
+import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequest;
+
+/**
+ * A workaround for https://issues.sonatype.org/browse/MNGECLIPSE-2433
+ *
+ * @author Snjeza
+ */
+public class FixClasspathConfigurator extends AbstractProjectConfigurator {
+
+ @Override
+ public void configure(ProjectConfigurationRequest request,
+ IProgressMonitor monitor) throws CoreException {
+ MavenProject mavenProject = request.getMavenProject();
+ IProject project = request.getProject();
+ configureInternal(mavenProject,project, monitor);
+ }
+
+ private void configureInternal(MavenProject mavenProject, IProject project,
+ IProgressMonitor monitor) throws CoreException {
+ if (!project.hasNature(JavaCore.NATURE_ID)) {
+ return;
+ }
+ List<Resource> resources = mavenProject.getResources();
+ for (Resource resource:resources) {
+
+ File directory = new File(resource.getDirectory());
+ String absolutePath = directory.getAbsolutePath();
+ try {
+ absolutePath = directory.getCanonicalPath();
+ } catch(IOException e) {
+ MavenSeamActivator.log(e);
+ }
+ if (! new File(absolutePath).exists()) {
+ continue;
+ }
+ IPath relativePath = getProjectRelativePath(project, absolutePath);
+ IResource r = project.findMember(relativePath);
+ if (r != null) {
+ continue;
+ }
+ String path = getWorkspaceRelativePath(absolutePath);
+ IJavaProject javaProject = JavaCore.create(project);
+ IClasspathEntry[] entries = javaProject.getRawClasspath();
+ boolean exists = false;
+ for (IClasspathEntry entry:entries) {
+ if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
+ IPath entryPath = entry.getPath();
+ if (entryPath != null && path.equals(entryPath.toString())) {
+ exists = true;
+ break;
+ }
+ }
+ }
+ if (!exists) {
+ IClasspathEntry[] newEntries = new IClasspathEntry[entries.length + 1];
+ for (int i = 0; i < entries.length; i++) {
+ newEntries[i] = entries[i];
+ }
+ IClasspathEntry pathEntry = JavaCore.newLibraryEntry(new Path(path), null, null);
+ newEntries[entries.length] = pathEntry;
+ javaProject.setRawClasspath(newEntries, monitor);
+ }
+ }
+ }
+
+ private String getWorkspaceRelativePath(String absolutePath) {
+ File basedir = ResourcesPlugin.getWorkspace().getRoot().getLocation()
+ .toFile();
+ String relative;
+ if (absolutePath.equals(basedir.getAbsolutePath())) {
+ relative = "."; //$NON-NLS-1$
+ } else if (absolutePath.startsWith(basedir.getAbsolutePath())) {
+ relative = absolutePath.substring(basedir.getAbsolutePath()
+ .length() + 1);
+ } else {
+ return absolutePath;
+ }
+ relative = relative.replace("\\", "/").trim(); //$NON-NLS-1$ //$NON-NLS-2$
+ if (!relative.startsWith("/")) { //$NON-NLS-1$
+ relative = "/" + relative; //$NON-NLS-1$
+ }
+ return relative;
+ }
+
+ private IPath getProjectRelativePath(IProject project, String absolutePath) {
+ File basedir = project.getLocation().toFile();
+ String relative;
+ if (absolutePath.equals(basedir.getAbsolutePath())) {
+ relative = "."; //$NON-NLS-1$
+ } else if (absolutePath.startsWith(basedir.getAbsolutePath())) {
+ relative = absolutePath.substring(basedir.getAbsolutePath().length() + 1);
+ } else {
+ relative = absolutePath;
+ }
+ return new Path(relative.replace('\\', '/'));
+ }
+
+ @Override
+ public void mavenProjectChanged(MavenProjectChangedEvent event,
+ IProgressMonitor monitor) throws CoreException {
+ IMavenProjectFacade facade = event.getMavenProject();
+ if (facade != null) {
+ IProject project = facade.getProject();
+ MavenProject mavenProject = facade.getMavenProject(monitor);
+ configureInternal(mavenProject, project, monitor);
+ }
+ super.mavenProjectChanged(event, monitor);
+ }
+}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26318 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-11-06 04:53:36 -0400 (Sat, 06 Nov 2010)
New Revision: 26318
Modified:
trunk/build/parent/pom.xml
Log:
ant plugin reverted back to original 1.3 to fix build errors?
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-11-06 08:44:38 UTC (rev 26317)
+++ trunk/build/parent/pom.xml 2010-11-06 08:53:36 UTC (rev 26318)
@@ -18,7 +18,7 @@
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
- <maven.antrun.plugin.version>1.6</maven.antrun.plugin.version>
+ <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
<!-- target files available for building: multiple sites, 1 unified site,
1 local mirrored site -->
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26317 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-11-06 04:44:38 -0400 (Sat, 06 Nov 2010)
New Revision: 26317
Modified:
trunk/build/parent/pom.xml
Log:
ant plugin reverted back to 1.6 to fix build errors, why was it downgraded to 1.4?
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-11-06 08:28:03 UTC (rev 26316)
+++ trunk/build/parent/pom.xml 2010-11-06 08:44:38 UTC (rev 26317)
@@ -18,7 +18,7 @@
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
- <maven.antrun.plugin.version>1.4</maven.antrun.plugin.version>
+ <maven.antrun.plugin.version>1.6</maven.antrun.plugin.version>
<!-- target files available for building: multiple sites, 1 unified site,
1 local mirrored site -->
15 years, 5 months
- 1
- 0