JBoss Tools SVN: r34828 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui: icons/quickfixes and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-16 14:05:56 -0400 (Fri, 16 Sep 2011)
New Revision: 34828
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_add.png
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_change.png
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_edit.png
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_remove.png
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
Log:
We need icon images for CDI Tools UI https://issues.jboss.org/browse/JBIDE-9717
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_add.png
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_add.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_change.png
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_change.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_edit.png
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_edit.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_remove.png
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/quickfixes/cdi_remove.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -33,6 +33,11 @@
public static final Image CDI_BEAN_IMAGE = getImage("search/cdi_bean.gif"); //$NON-NLS-1$
public static final Image WELD_IMAGE = getImage("search/weld_icon_16x.gif"); //$NON-NLS-1$
+ public static final Image QUICKFIX_ADD = getImage("quickfixes/cdi_add.png"); //$NON-NLS-1$
+ public static final Image QUICKFIX_REMOVE = getImage("quickfixes/cdi_remove.png"); //$NON-NLS-1$
+ public static final Image QUICKFIX_EDIT = getImage("quickfixes/cdi_edit.png"); //$NON-NLS-1$
+ public static final Image QUICKFIX_CHANGE = getImage("quickfixes/cdi_change.png"); //$NON-NLS-1$
+
public static final String WELD_WIZARD_IMAGE_PATH = "wizard/WeldWizBan.gif"; //$NON-NLS-1$
public static Image getImage(String key) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -25,6 +25,7 @@
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
public class AddAnnotationMarkerResolution implements
IMarkerResolution2 {
@@ -73,6 +74,6 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_ADD;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -30,6 +30,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
@@ -125,7 +126,7 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_ADD;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -21,6 +21,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
public class AddRetentionAnnotationMarkerResolution implements
IMarkerResolution2 {
@@ -57,6 +58,6 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_ADD;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -22,6 +22,7 @@
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.common.EclipseUtil;
/**
@@ -69,7 +70,7 @@
@Override
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_ADD;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -21,6 +21,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
public class AddTargetAnnotationMarkerResolution implements
IMarkerResolution2 {
@@ -67,6 +68,6 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_ADD;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -23,6 +23,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
public class ChangeAnnotationMarkerResolution implements
IMarkerResolution2 {
@@ -105,6 +106,6 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_CHANGE;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -20,6 +20,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.cdi.ui.wizard.DeletePreviewWizard;
/**
@@ -58,7 +59,7 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_REMOVE;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -21,6 +21,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.cdi.ui.wizard.DeletePreviewWizard;
/**
@@ -68,7 +69,7 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_REMOVE;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -25,6 +25,7 @@
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
public class DeleteAnnotationMarkerResolution implements
IMarkerResolution2 {
@@ -73,6 +74,6 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_REMOVE;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -33,6 +33,7 @@
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.common.EclipseUtil;
/**
@@ -145,7 +146,7 @@
@Override
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_EDIT;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -27,6 +27,7 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.common.EclipseUtil;
/**
@@ -98,6 +99,6 @@
@Override
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_EDIT;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -25,6 +25,7 @@
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.common.EclipseUtil;
/**
@@ -90,7 +91,7 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_EDIT;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -28,6 +28,7 @@
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizard;
import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite;
import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier;
@@ -136,7 +137,7 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_EDIT;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -27,6 +27,7 @@
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
@@ -145,7 +146,7 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_ADD;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -25,6 +25,7 @@
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.common.EclipseUtil;
/**
@@ -89,7 +90,7 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_EDIT;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-09-16 17:57:05 UTC (rev 34827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-09-16 18:05:56 UTC (rev 34828)
@@ -26,6 +26,7 @@
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.cdi.ui.CDIUiImages;
import org.jboss.tools.cdi.ui.wizard.SelectBeanWizard;
import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier;
@@ -119,6 +120,6 @@
}
public Image getImage() {
- return null;
+ return CDIUiImages.QUICKFIX_EDIT;
}
}
14 years, 7 months
JBoss Tools SVN: r34827 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-16 13:57:05 -0400 (Fri, 16 Sep 2011)
New Revision: 34827
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
Log:
JBIDE-9723
https://issues.jboss.org/browse/JBIDE-9723
InjectionPointParameter.getBean() is implemented.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-09-16 17:48:11 UTC (rev 34826)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-09-16 17:57:05 UTC (rev 34827)
@@ -91,7 +91,6 @@
*/
@Override
public IBean getBean() {
- // TODO we should return the actual bean that declares this injection point.
- return getClassBean();
+ return (getBeanMethod() instanceof IBean) ? (IBean)getBeanMethod() : getClassBean();
}
}
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r34826 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-16 13:48:11 -0400 (Fri, 16 Sep 2011)
New Revision: 34826
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
Log:
https://issues.jboss.org/browse/JBIDE-9723 Injection points declared in producer methods should be validated as injection points of the producer but not as injections of the class bean
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-09-16 17:44:10 UTC (rev 34825)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-09-16 17:48:11 UTC (rev 34826)
@@ -93,7 +93,7 @@
*/
@Override
public IBean getBean() {
- // TODO we should return the actual bean that declares this injection point.
+ // Injected field may be declared in a class bean only.
return getClassBean();
}
}
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r34824 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-16 13:38:47 -0400 (Fri, 16 Sep 2011)
New Revision: 34824
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
Log:
https://issues.jboss.org/browse/JBIDE-9723 Injection points declared in producer methods should be validated as injection points of the producer but not as injections of the class bean
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-09-16 16:38:21 UTC (rev 34823)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-09-16 17:38:47 UTC (rev 34824)
@@ -22,7 +22,7 @@
public interface IBeanMember extends IJavaSourceReference, IAnnotated, ICDIElement {
/**
- * Returns the class bean that declares this method.
+ * Returns the class bean that declares this member.
*
* @return
*/
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-09-16 16:38:21 UTC (rev 34823)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-09-16 17:38:47 UTC (rev 34824)
@@ -24,6 +24,13 @@
public interface IInjectionPoint extends ICDIElement, IBeanMember {
/**
+ * Returns the bean that declares this injection point.
+ *
+ * @return the bean that declares this injection point.
+ */
+ IBean getBean();
+
+ /**
* Returns the required type of this injection point.
*
* @return the required type of this injection point.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-09-16 16:38:21 UTC (rev 34823)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-09-16 17:38:47 UTC (rev 34824)
@@ -12,6 +12,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDIUtil;
+import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
@@ -25,6 +26,7 @@
public InjectionPointField() {}
+ @Override
public IParametedType getType() {
if(getDefinition().getOverridenType() != null) {
return getDefinition().getOverridenType();
@@ -53,6 +55,7 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation()
*/
+ @Override
public IAnnotationDeclaration getDelegateAnnotation() {
return getDefinition().getDelegateAnnotation();
}
@@ -61,6 +64,7 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#isDelegate()
*/
+ @Override
public boolean isDelegate() {
return getDelegateAnnotation() != null;
}
@@ -69,6 +73,7 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getInjectAnnotation()
*/
+ @Override
public IAnnotationDeclaration getInjectAnnotation() {
return definition.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
}
@@ -77,7 +82,18 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#containsDefaultQualifier()
*/
+ @Override
public boolean hasDefaultQualifier() {
return CDIUtil.containsDefaultQualifier(this);
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#getBean()
+ */
+ @Override
+ public IBean getBean() {
+ // TODO we should return the actual bean that declares this injection point.
+ return getClassBean();
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-09-16 16:38:21 UTC (rev 34823)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-09-16 17:38:47 UTC (rev 34824)
@@ -14,6 +14,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDIUtil;
+import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.common.java.IAnnotationDeclaration;
@@ -31,6 +32,7 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation()
*/
+ @Override
public ITextSourceReference getDelegateAnnotation() {
return getAnnotationPosition(CDIConstants.DELEGATE_STEREOTYPE_TYPE_NAME);
}
@@ -39,6 +41,7 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getQualifierDeclarations()
*/
+ @Override
public Set<IQualifierDeclaration> getQualifierDeclarations() {
return super.getQualifierDeclarations();
}
@@ -47,6 +50,7 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#isDelegate()
*/
+ @Override
public boolean isDelegate() {
return isAnnotationPresent(CDIConstants.DELEGATE_STEREOTYPE_TYPE_NAME);
}
@@ -55,6 +59,7 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getInjectAnnotation()
*/
+ @Override
public IAnnotationDeclaration getInjectAnnotation() {
return beanMethod.inject;
}
@@ -63,6 +68,7 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#containsDefaultQualifier()
*/
+ @Override
public boolean hasDefaultQualifier() {
return CDIUtil.containsDefaultQualifier(this);
}
@@ -78,4 +84,14 @@
}
return null;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#getBean()
+ */
+ @Override
+ public IBean getBean() {
+ // TODO we should return the actual bean that declares this injection point.
+ return getClassBean();
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-09-16 16:38:21 UTC (rev 34823)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-09-16 17:38:47 UTC (rev 34824)
@@ -1661,7 +1661,7 @@
* - bean that declares any scope other than @Dependent has an injection point of type InjectionPoint and qualifier @Default
*/
if(type!=null && CDIConstants.INJECTIONPOINT_TYPE_NAME.equals(type.getFullyQualifiedName())) {
- IScope beanScope = injection.getClassBean().getScope();
+ IScope beanScope = injection.getBean().getScope();
if(injection.hasDefaultQualifier() && beanScope!=null && !CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME.equals(beanScope.getSourceType().getFullyQualifiedName())) {
addError(CDIValidationMessages.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, CDIPreferences.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, reference, injection.getResource());
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-09-16 16:38:21 UTC (rev 34823)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-09-16 17:38:47 UTC (rev 34824)
@@ -6,6 +6,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IMember;
+import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
@@ -148,4 +149,9 @@
public String getElementName() {
return null;
}
+
+ @Override
+ public IBean getBean() {
+ return null;
+ }
}
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r34823 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf: jsp/hover and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-09-16 12:38:21 -0400 (Fri, 16 Sep 2011)
New Revision: 34823
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/ELTooltipTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-9448
EL tooltip doesn't work
JUnit test is added
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/ELTooltipTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/ELTooltipTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/ELTooltipTest.java 2011-09-16 16:38:21 UTC (rev 34823)
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.jsf.jsp.hover;
+
+import java.lang.reflect.Method;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextHoverExtension2;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.TextViewer;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+/**
+ * The JUnit test cases for JBIDE-9448 issue
+ *
+ * @author Victor Rubezhny
+ */
+public class ELTooltipTest extends ContentAssistantTestCase {
+ private static final String PROJECT_NAME = "JSF2KickStartWithoutLibs";
+ private static final String PAGE_NAME = "WebContent/pages/inputname.xhtml";
+
+ private static final String EL_PREFIX[] = {"value=\"#{user", "value=\"#{user.name", "action=\"#{user.sayHello"};
+ private static final String EL_VALUE[] = {"user", "name", "sayHello"};
+ private static final String EL_TOOLTIP_TEXT[] = {
+ "<html><body text=\"#000000\" bgcolor=\"#ffffe1\"><h5><img style='position: relative; width: 16px; height: 16px; top: 2px; left: 2px; ' src='file:/home/jeremy/projects/junit-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png'>\n" +
+ "<span style='word-wrap:break-word;margin-left: 2px; margin-top: 2px; '>demo.User</span></span></h5><p>Created by JBoss Tools</body></html>",
+ "<html><body text=\"#000000\" bgcolor=\"#ffffe1\">- <span style='word-wrap:break-word;'>void demo.<a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User'>User</a>.setName(<a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User~setName~QString;%E2%98%82String'>String</a> name)</span><br/>- <span style='word-wrap:break-word;'><a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User~getName%E2%98%82String'>String</a> demo.<a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User'>User</a>.getName()</span><br/><br/><h5><img style='position: relative; width: 16px; height: 16px; top: 2px; left: 2px; ' src='file:/home/jeremy/projects/junit-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png'>\n" +
+ "<span style='word-wrap:break-word;margin-left: 2px; margin-top: 2px; '>void demo.<a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User'>User</a>.setName(<a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User~setName~QString;%E2%98%82String'>String</a> name)</span></span></h5><br/><h5><img style='position: relative; width: 16px; height: 16px; top: 2px; left: 2px; ' src='file:/home/jeremy/projects/junit-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png'>\n" +
+ "<span style='word-wrap:break-word;margin-left: 2px; margin-top: 2px; '><a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User~getName%E2%98%82String'>String</a> demo.<a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User'>User</a>.getName()</span></span></h5></body></html>",
+ "<html><body text=\"#000000\" bgcolor=\"#ffffe1\"><h5><img style='position: relative; width: 16px; height: 16px; top: 2px; left: 2px; ' src='file:/home/jeremy/projects/junit-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png'>\n" +
+ "<span style='word-wrap:break-word;margin-left: 2px; margin-top: 2px; '><a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User~sayHello%E2%98%82String'>String</a> demo.<a class='header' href='eclipse-javadoc:%E2%98%82=JSF2KickStartWithoutLibs/JavaSource%3Cdemo%7BUser.java%E2%98%83User'>User</a>.sayHello()</span></span></h5></body></html>"
+ };
+
+ public void setUp() throws Exception {
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ }
+
+ public static Test suite() {
+ return new TestSuite(ELTooltipTest.class);
+ }
+
+ @SuppressWarnings("deprecation")
+ private void doELTooltipTest(String prefix, String value, String compare) {
+ String documentContent = document.get();
+ int start = (documentContent == null ? -1 : documentContent.indexOf(prefix));
+ assertFalse("Required node '" + prefix + "' not found in document", (start == -1));
+ int offsetToTest = start + prefix.length();
+
+ ITextHover hover = getTextHover(viewer, offsetToTest - 1);
+ assertNotNull("Hover not found for value: '" + value + "'", hover);
+
+ String hoverText = null;
+ if (hover instanceof ITextHoverExtension2) {
+ Object hoverInfo2 = ((ITextHoverExtension2)hover).getHoverInfo2(viewer, hover.getHoverRegion(viewer, offsetToTest));
+ hoverText = String.valueOf(hoverInfo2);
+ } else {
+ hoverText = ((ITextHover)hover).getHoverInfo(viewer, hover.getHoverRegion(viewer, offsetToTest));
+ }
+ String hoverTextValue = html2Text(hoverText);
+ String compareValue = html2Text(compare);
+// System.out.println("Hover Text: [" + hoverTextValue + "]\nExpected Value: [" + compareValue + "]\nEqual: " + compareValue.equalsIgnoreCase(hoverTextValue) + "\n");
+ assertTrue("Hover exists but its value is not expected:\nHover Text: [" + hoverTextValue + "]\nExpected Value: [" + compareValue + "]", compareValue.equalsIgnoreCase(hoverTextValue));
+ }
+
+ String html2Text(String html) {
+ StringBuilder sb = new StringBuilder();
+ int state = 0;
+ for (char ch : html.toCharArray()) {
+ switch (state) {
+ case (int)'<':
+ // Read to null until '>'-char is read
+ if (ch != '>')
+ continue;
+ state = 0;
+ break;
+ default:
+ if (ch == '<') {
+ state = '<';
+ continue;
+ }
+ sb.append(ch);
+ break;
+ }
+ }
+ return sb.toString();
+ }
+
+ public ITextHover getTextHover(ITextViewer viewer, int offset) {
+ try {
+ Method m = TextViewer.class.getDeclaredMethod("getTextHover", int.class, int.class); //$NON-NLS-1$
+ m.setAccessible(true);
+ return (ITextHover)m.invoke(viewer, Integer.valueOf(offset), Integer.valueOf(0));
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ return null;
+ }
+
+ public void testELTooltip() {
+ assertNotNull("Test project '" + PROJECT_NAME + "' is not prepared", project);
+
+ openEditor(PAGE_NAME);
+ try {
+ for (int i = 0; i < EL_PREFIX.length; i++) {
+ doELTooltipTest(EL_PREFIX[i], EL_VALUE[i], EL_TOOLTIP_TEXT[i]);
+ }
+ } finally {
+ closeEditor();
+ }
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/ELTooltipTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-09-16 16:16:01 UTC (rev 34822)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-09-16 16:38:21 UTC (rev 34823)
@@ -37,6 +37,7 @@
import org.jboss.tools.jsf.jsp.ca.test.JsfJspLongResourceBundlePropertyNamesTest;
import org.jboss.tools.jsf.jsp.ca.test.JspElFunctionsTest;
import org.jboss.tools.jsf.jsp.ca.test.WebContentAssistProviderTest;
+import org.jboss.tools.jsf.jsp.hover.ELTooltipTest;
import org.jboss.tools.jsf.ui.test.refactoring.ELReferencesRenameTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
@@ -126,6 +127,11 @@
new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ ELTooltipTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
+ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
+ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
+
// return new TestWizardsProject(suite);
return suite;
}
14 years, 7 months
JBoss Tools SVN: r34821 - in trunk/download.jboss.org/jbosstools/updates/development/indigo: soa-tooling and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-16 12:14:13 -0400 (Fri, 16 Sep 2011)
New Revision: 34821
Modified:
trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA...
trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC...
trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html
trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin...
trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin...
trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin...
Log:
link to new 3.3.0.M3 update site
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA... 2011-09-16 15:24:12 UTC (rev 34820)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA... 2011-09-16 16:14:13 UTC (rev 34821)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1309362410000'/>
+<property name='p2.timestamp' value='1316189208000'/>
</properties>
<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M2/'/>
+<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M3/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC... 2011-09-16 15:24:12 UTC (rev 34820)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC... 2011-09-16 16:14:13 UTC (rev 34821)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1309362410000'/>
+<property name='p2.timestamp' value='1316189208000'/>
</properties>
<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M2/'/>
+<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M3/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html 2011-09-16 15:24:12 UTC (rev 34820)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html 2011-09-16 16:14:13 UTC (rev 34821)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools Development Milestone Update Site: 3.3.0.M2.2011-06-24_07-36-50-H7</title>
+<title>JBoss Tools Development Milestone Update Site: 3.3.0.M3.2011-09-15_20-45-52-H23</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -21,7 +21,7 @@
<h2 class="title">JBoss Tools Development Milestone Update Site</h2>
<table width="100%">
<tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.M2.2011-06-24_07-36-50-H7</span></td>
+ <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.M3.2011-09-15_20-45-52-H23</span></td>
</tr>
<tr class="light-row" style="height: 30px">
@@ -41,7 +41,8 @@
</p>
<ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2">JBoss Tools Requirements - Composite Mirror - Indigo RC2</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li>
+ <li><a href="http://dl.google.com/eclipse/plugin/3.7/">Google Plugin for Eclipse 3.7 (Indigo)</a></li>
</ul>
</td>
</tr>
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-09-16 15:24:12 UTC (rev 34820)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-09-16 16:14:13 UTC (rev 34821)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1309362410000'/>
+<property name='p2.timestamp' value='1316189208000'/>
</properties>
<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M2.soa-tooling'/>
+<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M3.soa-tooling'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-09-16 15:24:12 UTC (rev 34820)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-09-16 16:14:13 UTC (rev 34821)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1309362410000'/>
+<property name='p2.timestamp' value='1316189208000'/>
</properties>
<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M2.soa-tooling'/>
+<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M3.soa-tooling'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-09-16 15:24:12 UTC (rev 34820)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-09-16 16:14:13 UTC (rev 34821)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - SOA Tooling - Development Milestone Update Site: 3.3.0.M2.soa-tooling.2011-06-24_05-36-09-H6</title>
+<title>JBoss Tools - SOA Tooling - Development Milestone Update Site: 3.3.0.M3c.soa-tooling.2011-09-15_17-03-00-H35</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -21,7 +21,7 @@
<h2 class="title">JBoss Tools - SOA Tooling - Development Milestone Update Site</h2>
<table width="100%">
<tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.M2.soa-tooling.2011-06-24_05-36-09-H6</span></td>
+ <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.M3.soa-tooling.2011-09-15_17-03-00-H35</span></td>
</tr>
<tr class="light-row" style="height: 30px">
@@ -41,7 +41,7 @@
</p>
<ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2">JBoss Tools Requirements - Composite Mirror - Indigo RC2</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li>
<li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li>
</ul>
</td>
14 years, 7 months
JBoss Tools SVN: r34820 - trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-16 11:24:12 -0400 (Fri, 16 Sep 2011)
New Revision: 34820
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftTestSuite.java
Log:
[JBIDE-9510] added tests to the test suites
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java 2011-09-16 15:12:26 UTC (rev 34819)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java 2011-09-16 15:24:12 UTC (rev 34820)
@@ -19,7 +19,8 @@
ApplicationIntegrationTest.class,
CartridgesIntegrationTest.class,
DomainIntegrationTest.class,
- ListCartridgesIntegrationTest.class
+ ListCartridgesIntegrationTest.class,
+ UserInfoIntegrationTest.class
})
/**
* @author André Dietisheim
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftTestSuite.java 2011-09-16 15:12:26 UTC (rev 34819)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftTestSuite.java 2011-09-16 15:24:12 UTC (rev 34820)
@@ -19,7 +19,8 @@
ApplicationTest.class,
ListCartridgesTest.class,
DomainTest.class,
- UserInfoTest.class
+ UserInfoTest.class,
+ SSHKeyTest.class
})
/**
* @author André Dietisheim
14 years, 7 months
JBoss Tools SVN: r34819 - trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-16 11:12:26 -0400 (Fri, 16 Sep 2011)
New Revision: 34819
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java
Log:
[JBIDE-9510] implementing IOpenshiftService#getUserInfo (added integration test for the ssh key that is being reported)
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java 2011-09-16 15:04:16 UTC (rev 34818)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java 2011-09-16 15:12:26 UTC (rev 34819)
@@ -18,6 +18,7 @@
import org.jboss.ide.eclipse.as.openshift.core.Application;
import org.jboss.ide.eclipse.as.openshift.core.Cartridge;
import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService;
+import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.User;
import org.jboss.ide.eclipse.as.openshift.core.UserInfo;
@@ -55,10 +56,6 @@
UserInfo userInfo = openshiftService.getUserInfo();
assertNotNull(userInfo);
- User user = userInfo.getUser();
- assertEquals(USERNAME, user.getRhlogin());
- assertNotNull(user.getSshKey());
-
List<Application> applications = userInfo.getApplications();
assertNotNull(applications);
int numberOfApplications = applications.size();
@@ -75,6 +72,17 @@
}
}
+ @Test
+ public void canUseReturnedSSHKeyToChangeDomain() throws Exception {
+ UserInfo userInfo = openshiftService.getUserInfo();
+ assertNotNull(userInfo);
+
+ User user = userInfo.getUser();
+ assertNotNull(user);
+ ISSHPublicKey sshKey = user.getSshKey();
+ openshiftService.changeDomain(createRandomName(), sshKey);
+ }
+
private String createRandomName() {
return String.valueOf(System.currentTimeMillis());
}
14 years, 7 months