JBoss Tools SVN: r24769 - in trunk/jsf/plugins/org.jboss.tools.jsf: resources/meta and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-09-07 11:12:57 -0400 (Tue, 07 Sep 2010)
New Revision: 24769
Added:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/SystemEventListenerObjectImpl.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta
Log:
https://jira.jboss.org/browse/JBIDE-7015
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-09-07 15:10:53 UTC (rev 24768)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-09-07 15:12:57 UTC (rev 24769)
@@ -172,6 +172,8 @@
class="org.jboss.tools.jsf.model.ReferenceObjectImpl"/>
<xclass id="org.jboss.tools.jsf.model.impl.OrderingObjectImpl"
class="org.jboss.tools.jsf.model.impl.OrderingObjectImpl"/>
+ <xclass id="org.jboss.tools.jsf.model.impl.SystemEventListenerObjectImpl"
+ class="org.jboss.tools.jsf.model.impl.SystemEventListenerObjectImpl"/>
<xclass id="org.jboss.tools.jsf.model.handlers.AddCaseToGroupHandler"
class="org.jboss.tools.jsf.model.handlers.AddCaseToGroupHandler"/>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta 2010-09-07 15:10:53 UTC (rev 24768)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta 2010-09-07 15:12:57 UTC (rev 24769)
@@ -1706,7 +1706,7 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
- <XModelEntity ImplementingClass="%Custom%"
+ <XModelEntity ImplementingClass="org.jboss.tools.jsf.model.impl.SystemEventListenerObjectImpl"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData"
XMLSUBPATH="system-event-listener" name="JSFSystemEventListener">
<XChildrenEntities/>
Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/SystemEventListenerObjectImpl.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/SystemEventListenerObjectImpl.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/SystemEventListenerObjectImpl.java 2010-09-07 15:12:57 UTC (rev 24769)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.model.impl;
+
+import org.jboss.tools.common.model.impl.*;
+
+public class SystemEventListenerObjectImpl extends CustomizedObjectImpl {
+ private static final long serialVersionUID = 532550263999885851L;
+
+ public String getPresentationString() {
+ String listener = getAttributeValue("system-event-listener-class");
+ if(listener != null && listener.length() > 0) {
+ listener = listener.substring(listener.lastIndexOf('.') + 1);
+ }
+ String event = getAttributeValue("system-event-class");
+ if(event != null && event.length() > 0) {
+ event = event.substring(event.lastIndexOf('.') + 1);
+ }
+ return "" + event + " -> " + listener;
+ }
+
+ public String getPathPart() {
+ String listener = getAttributeValue("system-event-listener-class");
+ String event = getAttributeValue("system-event-class");
+ return applyDuplicate("" + event + ":" + listener);
+ }
+
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/SystemEventListenerObjectImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months
JBoss Tools SVN: r24768 - trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-09-07 11:10:53 -0400 (Tue, 07 Sep 2010)
New Revision: 24768
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml
Log:
https://jira.jboss.org/browse/JBIDE-7015
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml 2010-09-07 14:24:02 UTC (rev 24767)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml 2010-09-07 15:10:53 UTC (rev 24768)
@@ -543,12 +543,12 @@
<!-- <system-event-listener> -->
<test name="JSFModelTest:testPaths:attribute">
- <property name="path" value="/faces-config-2.xml/application/MySystemEventListener"/>
+ <property name="path" value="/faces-config-2.xml/application/MySystemEvent:MySystemEventListener"/>
<property name="attributeName" value="system-event-class"/>
<property name="attributeValue" value="MySystemEvent"/>
</test>
<test name="JSFModelTest:testPaths:attribute">
- <property name="path" value="/faces-config-2.xml/application/MySystemEventListener"/>
+ <property name="path" value="/faces-config-2.xml/application/MySystemEvent:MySystemEventListener"/>
<property name="attributeName" value="source-class"/>
<property name="attributeValue" value="MySource"/>
</test>
15 years, 7 months
JBoss Tools SVN: r24767 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/console and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-09-07 10:24:02 -0400 (Tue, 07 Sep 2010)
New Revision: 24767
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-6997 - fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-09-07 14:23:44 UTC (rev 24766)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-09-07 14:24:02 UTC (rev 24767)
@@ -87,6 +87,8 @@
updateAttr(root, prefs.getEntityResolverName(), ConfigurationXMLStrings.ENTITYRESOLVER);
updateAttr(root, prefs.getNamingStrategy(), ConfigurationXMLStrings.NAMINGSTRATEGY);
updateAttr(root, prefs.getPersistenceUnitName(), ConfigurationXMLStrings.PERSISTENCEUNIT);
+ // very specific property, for more information -> JBIDE-6997
+ //updateAttr(root, additional, ConfigurationXMLStrings.PREFERBASICCOMPOSITEIDS);
updateAttr(root, additional, ConfigurationXMLStrings.DETECTMANYTOMANY);
updateAttr(root, additional, ConfigurationXMLStrings.DETECTONTTOONE);
updateAttr(root, additional, ConfigurationXMLStrings.DETECTOPTIMISTICLOCK);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2010-09-07 14:23:44 UTC (rev 24766)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2010-09-07 14:24:02 UTC (rev 24767)
@@ -386,6 +386,7 @@
public static String CodeGenerationSettingsTab_use_existing;
public static String CodeGenerationSettingsTab_workspace;
public static String CodeGenerationSettingsTab_use_generation_in_external_process;
+ public static String CodeGenerationSettingsTab_script_can_not_be_generated_correctly_without;
public static String ConsoleConfigurationLaunchDelegate_direct_launch_not_supported;
public static String ConsoleConfigurationMainTab_annotations;
public static String ConsoleConfigurationMainTab_cfg_xml;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2010-09-07 14:23:44 UTC (rev 24766)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2010-09-07 14:24:02 UTC (rev 24767)
@@ -389,6 +389,7 @@
CodeGenerationSettingsTab_use_existing=Use &existing...
CodeGenerationSettingsTab_workspace=&Workspace...
CodeGenerationSettingsTab_use_generation_in_external_process=Use generation in external process
+CodeGenerationSettingsTab_script_can_not_be_generated_correctly_without=The script can not be generated correctly without "Generate basic typed composite ids" flag set.
ConsoleConfigurationLaunchDelegate_direct_launch_not_supported=Direct launch not supported
ConsoleConfigurationMainTab_annotations=Annotations (jdk 1.5+)
ConsoleConfigurationMainTab_cfg_xml=cfg.xml
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2010-09-07 14:23:44 UTC (rev 24766)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2010-09-07 14:24:02 UTC (rev 24767)
@@ -385,6 +385,11 @@
msg = PathHelper.checkDirectory(templatePath, HibernateConsoleMessages.CodeGenerationSettingsTab_template_dir, true);
}
}
+ if (msg == null) {
+ if (reverseEngineer && !preferBasicCompositeIds) {
+ msg = HibernateConsoleMessages.CodeGenerationSettingsTab_script_can_not_be_generated_correctly_without;
+ }
+ }
return msg;
}
}
15 years, 7 months
JBoss Tools SVN: r24766 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-09-07 10:23:44 -0400 (Tue, 07 Sep 2010)
New Revision: 24766
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6997 - fixed
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-09-07 14:18:06 UTC (rev 24765)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-09-07 14:23:44 UTC (rev 24766)
@@ -406,6 +406,7 @@
expProps2.put("keyXXX", "valueYYY"); //$NON-NLS-1$ //$NON-NLS-2$
testLaunchConfigAttr.put(HBMTEMPLATE0_PROPERTIES, expProps2);
testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, reveng);
+ testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_PREFER_BASIC_COMPOSITE_IDS, true);
TestLaunchConfig testLaunchConfig = new TestLaunchConfig(testLaunchConfigAttr);
CodeGenXMLFactory codeGenFactory = new CodeGenXMLFactory4Test(testLaunchConfig, testCase);
return codeGenFactory;
15 years, 7 months
JBoss Tools SVN: r24765 - trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates.
by jbosstools-commits@lists.jboss.org
Author: dvinnichek
Date: 2010-09-07 10:18:06 -0400 (Tue, 07 Sep 2010)
New Revision: 24765
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
Log:
Add 'docbook' attribute to some vpe:tag elements in vpe-templates-docbook (https://jira.jboss.org/browse/JBIDE-6805)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-09-07 13:49:51 UTC (rev 24764)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-09-07 14:18:06 UTC (rev 24765)
@@ -97,7 +97,7 @@
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="keywordset" case-sensitive="yes">
+ <vpe:tag name="keywordset" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div/>
</vpe:template>
@@ -136,12 +136,12 @@
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="book" case-sensitive="yes">
+ <vpe:tag name="book" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div/>
</vpe:template>
</vpe:tag>
- <vpe:tag name="bookinfo" case-sensitive="yes">
+ <vpe:tag name="bookinfo" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div/>
</vpe:template>
@@ -297,7 +297,7 @@
</div>
</vpe:template>
</vpe:tag>
- <vpe:tag name="abstract" case-sensitive="yes">
+ <vpe:tag name="abstract" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div/>
</vpe:template>
@@ -317,12 +317,12 @@
<p />
</vpe:template>
</vpe:tag>
- <vpe:tag name="corpauthor" case-sensitive="yes">
+ <vpe:tag name="corpauthor" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div/>
</vpe:template>
</vpe:tag>
- <vpe:tag name="inlinemediaobject" case-sensitive="yes">
+ <vpe:tag name="inlinemediaobject" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div/>
</vpe:template>
15 years, 7 months
JBoss Tools SVN: r24764 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-09-07 09:49:51 -0400 (Tue, 07 Sep 2010)
New Revision: 24764
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6838 - fixed
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java 2010-09-07 13:33:47 UTC (rev 24763)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java 2010-09-07 13:49:51 UTC (rev 24764)
@@ -32,7 +32,7 @@
suite.addTestSuite(HBMInfoExtractorTest.class);
// https://jira.jboss.org/browse/JBIDE-6838
- //suite.addTestSuite(CodeGenXMLFactoryTest.class);
+ suite.addTestSuite(CodeGenXMLFactoryTest.class);
// core tests
//Properties properties = new Properties();
15 years, 7 months
JBoss Tools SVN: r24763 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2010-09-07 09:33:47 -0400 (Tue, 07 Sep 2010)
New Revision: 24763
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6508
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java 2010-09-07 12:58:50 UTC (rev 24762)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java 2010-09-07 13:33:47 UTC (rev 24763)
@@ -39,7 +39,7 @@
int caretOffcet = TestUtil.getLinePositionOffcet(multiPageEditor.getSourceEditor().getTextViewer(), 4, 5);
styledText.setCaretOffset(caretOffcet);
styledText.insert("xmlns:test=\"http://java.sun.com/jsf/composite/test\""); //$NON-NLS-1$
- TestUtil.delay(200);
+ TestUtil.delay(1200);
TestUtil.waitForJobs();
problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
assertEquals("res folder marker is expected", 1, problemMarkers.length); //$NON-NLS-1$
15 years, 7 months
JBoss Tools SVN: r24762 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-09-07 08:58:50 -0400 (Tue, 07 Sep 2010)
New Revision: 24762
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/InterceptorBindingSelectionProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-7009
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java 2010-09-07 12:50:09 UTC (rev 24761)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java 2010-09-07 12:58:50 UTC (rev 24762)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.ui.wizard;
+import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
@@ -24,6 +25,8 @@
public abstract class CDIAnnotationSelectionProvider implements ListFieldEditorProvider<ICDIAnnotation> {
protected ICDIProject project;
protected IFieldEditor editor;
+
+ protected IPackageFragment packageFragment = null;
public CDIAnnotationSelectionProvider() {}
@@ -39,6 +42,10 @@
return project;
}
+ public void setPackageFragment(IPackageFragment f) {
+ packageFragment = f;
+ }
+
public FilteredItemsSelectionDialog createSelectionDialog() {
Shell shell = CDIUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
SelectCDIAnnotationDialog dialog = new SelectCDIAnnotationDialog(shell);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/InterceptorBindingSelectionProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/InterceptorBindingSelectionProvider.java 2010-09-07 12:50:09 UTC (rev 24761)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/InterceptorBindingSelectionProvider.java 2010-09-07 12:58:50 UTC (rev 24762)
@@ -14,6 +14,11 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.jdt.core.Flags;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.ICDIAnnotation;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.ui.CDIUIMessages;
@@ -29,6 +34,21 @@
List c = (List)editor.getValue();
for (IInterceptorBinding s: ss) {
if(c.contains(s)) continue;
+ IType t = s.getSourceType();
+ if(t != null) {
+ int kind = 0;
+ try {
+ kind = t.getFlags();
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ if(!Flags.isPublic(kind)) {
+ IPackageFragment p = t.getPackageFragment();
+ if(packageFragment != null && !packageFragment.equals(p)) {
+ continue;
+ }
+ }
+ }
as.add(s);
}
return as.toArray(new ICDIAnnotation[0]);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-09-07 12:50:09 UTC (rev 24761)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-09-07 12:58:50 UTC (rev 24762)
@@ -224,6 +224,7 @@
interceptorBindingsProvider.setProject(cdi);
}
}
+ interceptorBindingsProvider.setPackageFragment(getPackageFragment());
}
void onMethodNameChange() {
@@ -315,4 +316,12 @@
updateStatus(StatusUtil.getMostSevere(status));
}
+ protected IStatus packageChanged() {
+ IStatus result = super.packageChanged();
+ if(result != null && result.isOK()) {
+ interceptorBindingsProvider.setPackageFragment(getPackageFragment());
+ }
+ return result;
+ }
+
}
\ No newline at end of file
15 years, 7 months
JBoss Tools SVN: r24761 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-09-07 08:50:09 -0400 (Tue, 07 Sep 2010)
New Revision: 24761
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties
Log:
[JBIDE-6976] Text in Preferences Page changed from "Red Hat" to "JBoss Tools team"
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-09-07 12:45:42 UTC (rev 24760)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-09-07 12:50:09 UTC (rev 24761)
@@ -1,3 +1,3 @@
UsageReportPreferencePage_Description=Preference page with options for anonymous usage data reporting. Usage data is used for statistical matters only.
-UsageReportPreferencePage_AllowReporting=&Allow Red Hat Inc. to report usage anonymously.
+UsageReportPreferencePage_AllowReporting=&Please allow the JBoss Tools team to receive anonymous usage statistics for this Eclipse installation with JBoss tools.
UsageReportPreferencePage_Error_Saving=Could not save the preferences.
15 years, 7 months
JBoss Tools SVN: r24760 - branches/jbosstools-3.2.0.M2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-09-07 08:45:42 -0400 (Tue, 07 Sep 2010)
New Revision: 24760
Modified:
branches/jbosstools-3.2.0.M2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties
Log:
[JBIDE-6976] text in preferences changed from "Red Hat" to "JBoss Tools team"
Modified: branches/jbosstools-3.2.0.M2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties
===================================================================
--- branches/jbosstools-3.2.0.M2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-09-07 12:16:11 UTC (rev 24759)
+++ branches/jbosstools-3.2.0.M2/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-09-07 12:45:42 UTC (rev 24760)
@@ -1,3 +1,3 @@
UsageReportPreferencePage_Description=Preference page with options for anonymous usage data reporting. Usage data is used for statistical matters only.
-UsageReportPreferencePage_AllowReporting=&Allow Red Hat Inc. to report usage anonymously.
+UsageReportPreferencePage_AllowReporting=&Please allow the JBoss Tools team to receive anonymous usage statistics for this Eclipse installation with JBoss tools.
UsageReportPreferencePage_Error_Saving=Could not save the preferences.
15 years, 7 months