JBoss Tools SVN: r35752 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-18 04:36:36 -0400 (Tue, 18 Oct 2011)
New Revision: 35752
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
Log:
[JBIDE-9793] corrected "New" button vertical size back to default
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-18 08:35:51 UTC (rev 35751)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-18 08:36:36 UTC (rev 35752)
@@ -149,7 +149,7 @@
Button newButton = new Button(applicationGroup, SWT.PUSH);
newButton.setText("Ne&w");
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(80, 30).applyTo(newButton);
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(80, SWT.DEFAULT).applyTo(newButton);
newButton.addSelectionListener(onNew(dbc));
Button deleteButton = new Button(applicationGroup, SWT.PUSH);
13 years, 2 months
JBoss Tools SVN: r35751 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-18 04:35:51 -0400 (Tue, 18 Oct 2011)
New Revision: 35751
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java
Log:
JBIDE-9793 - Marking username / password as uneditable
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java 2011-10-18 08:32:17 UTC (rev 35750)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java 2011-10-18 08:35:51 UTC (rev 35751)
@@ -27,6 +27,7 @@
}
+ //private Text userText, passText;
private Text userText, passText;
private Combo modeCombo;
@@ -53,7 +54,8 @@
userText.setText(ExpressServerUtils.getExpressUsername(callback.getServer()));
passText.setText(ExpressServerUtils.getExpressPassword(callback.getServer()));
-
+ userText.setEnabled(false);
+ passText.setEnabled(false);
// Maybe just make this a label ??
// modeCombo = new Combo(composite, SWT.READ_ONLY);
// modeCombo.setItems(new String[]{
13 years, 2 months
JBoss Tools SVN: r35750 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-18 04:32:17 -0400 (Tue, 18 Oct 2011)
New Revision: 35750
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java
Log:
[JBIDE-9793] added customizable commit message
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java 2011-10-18 08:22:30 UTC (rev 35749)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java 2011-10-18 08:32:17 UTC (rev 35750)
@@ -62,7 +62,7 @@
* @throws CoreException
* the core exception
*/
- public static void commit(IProject project, IProgressMonitor monitor) throws CoreException {
+ public static void commit(IProject project, String commitMessage, IProgressMonitor monitor) throws CoreException {
Assert.isLegal(project != null, "Cannot commit project. No project provided");
/**
* TODO: add capability to commit selectively
@@ -79,12 +79,16 @@
null,
getFormattedUser(userConfig.getAuthorName(), userConfig.getAuthorEmail()),
getFormattedUser(userConfig.getCommitterName(), userConfig.getCommitterEmail()),
- "Push from JBoss Tools Server adapt er " + System.currentTimeMillis());
+ commitMessage);
op.setCommitAll(true);
op.setRepository(repository);
op.execute(monitor);
}
+ public static void commit(IProject project, IProgressMonitor monitor) throws CoreException {
+ commit(project, "Commit from JBoss Tools", monitor);
+ }
+
/**
* Pushes the given repository to the remote repository it's current branch
* originates from.
13 years, 2 months
JBoss Tools SVN: r35749 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-18 04:22:30 -0400 (Tue, 18 Oct 2011)
New Revision: 35749
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
JBIDE-9793 - combo for runtime should be modify listener, not selection listener
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-18 07:35:49 UTC (rev 35748)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-18 08:22:30 UTC (rev 35749)
@@ -27,6 +27,8 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -280,13 +282,10 @@
// appLabel = new Label(c, SWT.NONE);
modeLabel = new Label(c, SWT.NONE);
- suitableRuntimes.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
+ suitableRuntimes.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
updateSelectedRuntimeDelegate();
}
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
});
addRuntimeLink.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
13 years, 2 months
JBoss Tools SVN: r35748 - trunk/as/tests.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-18 03:35:49 -0400 (Tue, 18 Oct 2011)
New Revision: 35748
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/
Log:
[JBIDE-9841] removing dead plugin
13 years, 2 months
JBoss Tools SVN: r35747 - in trunk/as/features: org.jboss.tools.openshift.express.source.feature and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-10-18 03:08:52 -0400 (Tue, 18 Oct 2011)
New Revision: 35747
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.source.feature/.project
trunk/as/features/org.jboss.tools.openshift.express.source.feature/.project
Log:
give unique names to .project files
Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.source.feature/.project
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.source.feature/.project 2011-10-18 06:42:02 UTC (rev 35746)
+++ trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.source.feature/.project 2011-10-18 07:08:52 UTC (rev 35747)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.ide.eclipse.as.source.feature</name>
+ <name>org.jboss.ide.eclipse.as.server.egit.integration.source.feature</name>
<comment></comment>
<projects>
</projects>
Modified: trunk/as/features/org.jboss.tools.openshift.express.source.feature/.project
===================================================================
--- trunk/as/features/org.jboss.tools.openshift.express.source.feature/.project 2011-10-18 06:42:02 UTC (rev 35746)
+++ trunk/as/features/org.jboss.tools.openshift.express.source.feature/.project 2011-10-18 07:08:52 UTC (rev 35747)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.ide.eclipse.as.source.feature</name>
+ <name>org.jboss.tools.openshift.express.source.feature</name>
<comment></comment>
<projects>
</projects>
13 years, 2 months
JBoss Tools SVN: r35746 - in trunk: central/plugins/org.jboss.tools.central.discovery and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-10-18 02:42:02 -0400 (Tue, 18 Oct 2011)
New Revision: 35746
Removed:
trunk/.project
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
remove root .project so projects can be imported
Deleted: trunk/.project
===================================================================
--- trunk/.project 2011-10-18 01:30:32 UTC (rev 35745)
+++ trunk/.project 2011-10-18 06:42:02 UTC (rev 35746)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbosstools_trunk</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-10-18 01:30:32 UTC (rev 35745)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-10-18 06:42:02 UTC (rev 35746)
@@ -4,33 +4,43 @@
<extension
point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
<certification
- id="com.jboss.jbds.discovery.JbdsCertified"
- name="JBDS Certified"
- url="http://devstudio.jboss.com/updates/4.0/">
+ id="org.jboss.tools.central.discovery.certification"
+ name="JBoss Tools"
+ url="http://jboss.org/tools/">
<description>
- Features certified with JBoss Developer Studio have been tested by Red Hat.
+ Plugins for JBoss Tools.
</description>
<icon
- image48="images/redhat_48.png">
+ image48="images/jbosstools_icon32.png">
</icon>
</certification>
<connectorCategory
- description="a category for testing purposes"
- id="org.jboss.tools.category.test"
- name="Test Category"
+ description="Plugins related to working with Maven"
+ id="org.jboss.tools.central.discovery.maven"
+ name="Maven"
relevance="60">
<group id="bundled" />
<group id="extra" />
</connectorCategory>
+
+ <connectorCategory
+ description="Plugins related to working with source control systems"
+ id="org.jboss.tools.central.discovery.scm"
+ name="Source Control Management"
+ relevance="60">
+ <group id="bundled" />
+ <group id="extra" />
+ </connectorCategory>
+
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- description="Eclipse EGit."
+ categoryId="org.jboss.tools.central.discovery.scm"
+ description="An Eclipse Git Team provider in pure Java"
id="org.eclipse.egit"
kind="task"
license="Free, EPL, Incubation"
- name="An Eclipse Git Team provider in pure Java."
+ name="Eclipse EGit"
provider="Eclipse Git"
siteUrl="http://download.eclipse.org/egit/updates">
<icon
@@ -41,7 +51,7 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
+ categoryId="org.jboss.tools.central.discovery.maven"
description="m2e - Maven Integration for Eclipse."
id="org.eclipse.m2e.feature"
kind="task"
@@ -57,8 +67,8 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- description="Maven Integration for WTP."
+ categoryId="org.jboss.tools.central.discovery.maven"
+ description="Maven Integration for Web Tools."
id="org.maven.ide.eclipse.wtp.feature"
kind="task"
license="Free, EPL"
@@ -73,8 +83,8 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- certificationId="com.jboss.jbds.discovery.JbdsCertified"
+ categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="org.jboss.tools.central.discovery.certification"
description="TestNG plug-in for Eclipse."
id="org.testng.eclipse"
kind="task"
@@ -92,8 +102,8 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- certificationId="com.jboss.jbds.discovery.JbdsCertified"
+ categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="org.jboss.tools.central.discovery.certification"
description="JBoss Maven Integration."
id="org.jboss.tools.maven.feature"
kind="task"
@@ -110,8 +120,8 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- certificationId="com.jboss.jbds.discovery.JbdsCertified"
+ categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="org.jboss.tools.central.discovery.certification"
description="JBoss Maven CDI Configurator."
id="org.jboss.tools.maven.cdi.feature"
kind="task"
@@ -127,8 +137,8 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- certificationId="com.jboss.jbds.discovery.JbdsCertified"
+ categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="org.jboss.tools.central.discovery.certification"
description="JBoss Maven Hibernate Configurator."
id="org.jboss.tools.maven.hibernate.feature"
kind="task"
@@ -144,8 +154,8 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- certificationId="com.jboss.jbds.discovery.JbdsCertified"
+ categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="org.jboss.tools.central.discovery.certification"
description="JBoss Maven JAX-RS Configurator."
id="org.jboss.tools.maven.jaxrs.feature"
kind="task"
@@ -161,8 +171,8 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- certificationId="com.jboss.jbds.discovery.JbdsCertified"
+ categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="org.jboss.tools.central.discovery.certification"
description="JBoss Maven JSF Configurator."
id="org.jboss.tools.maven.jsf.feature"
kind="task"
@@ -178,8 +188,8 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- certificationId="com.jboss.jbds.discovery.JbdsCertified"
+ categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="org.jboss.tools.central.discovery.certification"
description="JBoss Maven Portlet Configurator."
id="org.jboss.tools.maven.portlet.feature"
kind="task"
@@ -195,8 +205,8 @@
</overview>
</connectorDescriptor>
<connectorDescriptor
- categoryId="org.jboss.tools.category.test"
- certificationId="com.jboss.jbds.discovery.JbdsCertified"
+ categoryId="org.jboss.tools.central.discovery.maven"
+ certificationId="org.jboss.tools.central.discovery.certification"
description="JBoss Maven Seam Configurator."
id="org.jboss.tools.maven.seam.feature"
kind="task"
13 years, 2 months
JBoss Tools SVN: r35745 - in trunk/cdi/plugins: org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-10-17 21:30:32 -0400 (Mon, 17 Oct 2011)
New Revision: 35745
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
Log:
Updated in order to work with binary files https://issues.jboss.org/browse/JBIDE-9764
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -19,6 +19,7 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.ITypeRoot;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
@@ -42,18 +43,15 @@
public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
IRegion region, boolean canShowMultipleHyperlinks) {
ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class);
- if (region == null || !canShowMultipleHyperlinks || !(textEditor instanceof JavaEditor))
+ if (region == null || !(textEditor instanceof JavaEditor))
return null;
int offset = region.getOffset();
- IJavaElement input= EditorUtility.getEditorInputJavaElement(textEditor, false);
+ ITypeRoot input = EditorUtility.getEditorInputJavaElement(textEditor, false);
if (input == null)
return null;
- if (input.getResource() == null)
- return null;
-
IDocument document= textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
IFile file = null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -24,6 +24,7 @@
import org.eclipse.jdt.core.ILocalVariable;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.ITypeRoot;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
@@ -62,7 +63,7 @@
int offset= region.getOffset();
- IJavaElement input = EditorUtility.getEditorInputJavaElement(textEditor, false);
+ ITypeRoot input = EditorUtility.getEditorInputJavaElement(textEditor, false);
if (input == null)
return null;
@@ -85,7 +86,7 @@
IJavaElement[] elements = null;
try {
- elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+ elements = input.codeSelect(wordRegion.getOffset(), wordRegion.getLength());
if (elements == null)
return null;
if(elements.length != 1)
@@ -94,8 +95,7 @@
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
int position = 0;
if(elements[0] instanceof IType){
- ICompilationUnit cUnit = (ICompilationUnit)input;
- elements[0] = cUnit.getElementAt(wordRegion.getOffset());
+ elements[0] = input.getElementAt(wordRegion.getOffset());
if(elements[0] == null)
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICodeAssist;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
@@ -48,12 +47,12 @@
public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
IRegion region, boolean canShowMultipleHyperlinks) {
ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class);
- if (region == null || !canShowMultipleHyperlinks || !(textEditor instanceof JavaEditor))
+ if (region == null || !(textEditor instanceof JavaEditor))
return null;
int offset= region.getOffset();
- IJavaElement input= EditorUtility.getEditorInputJavaElement(textEditor, true);
+ ITypeRoot input= EditorUtility.getEditorInputJavaElement(textEditor, true);
if (input == null)
return null;
@@ -76,19 +75,20 @@
IJavaElement[] elements = null;
try {
- elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+ elements = input.codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+
if (elements == null)
return null;
+
if(elements.length != 1)
return null;
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
int position = 0;
+
if(elements[0] instanceof IType){
- if(input instanceof ITypeRoot){
- ITypeRoot cUnit = (ITypeRoot)input;
- elements[0] = cUnit.getElementAt(wordRegion.getOffset());
- }
+ elements[0] = input.getElementAt(wordRegion.getOffset());
+
if(elements[0] == null)
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICodeAssist;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -49,12 +48,12 @@
this.viewer = textViewer;
ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class);
- if (region == null || !canShowMultipleHyperlinks || !(textEditor instanceof JavaEditor))
+ if (region == null || !(textEditor instanceof JavaEditor))
return null;
int offset= region.getOffset();
- IJavaElement input= EditorUtility.getEditorInputJavaElement(textEditor, true);
+ ITypeRoot input= EditorUtility.getEditorInputJavaElement(textEditor, true);
if (input == null)
return null;
@@ -77,19 +76,18 @@
IJavaElement[] elements = null;
try {
- elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+ elements = input.codeSelect(wordRegion.getOffset(), wordRegion.getLength());
if (elements == null)
return null;
+
if(elements.length != 1)
return null;
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
int position = 0;
if(elements[0] instanceof IType){
- if(input instanceof ITypeRoot){
- ITypeRoot cUnit = (ITypeRoot)input;
- elements[0] = cUnit.getElementAt(wordRegion.getOffset());
- }
+ elements[0] = input.getElementAt(wordRegion.getOffset());
+
if(elements[0] == null)
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICodeAssist;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -47,12 +46,12 @@
public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
IRegion region, boolean canShowMultipleHyperlinks) {
ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class);
- if (region == null || !canShowMultipleHyperlinks || !(textEditor instanceof JavaEditor))
+ if (region == null || !(textEditor instanceof JavaEditor))
return null;
int offset= region.getOffset();
- IJavaElement input= EditorUtility.getEditorInputJavaElement(textEditor, true);
+ ITypeRoot input= EditorUtility.getEditorInputJavaElement(textEditor, true);
if (input == null)
return null;
@@ -76,7 +75,8 @@
IJavaElement[] elements = null;
try {
- elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+ elements = input.codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+
if (elements == null)
return null;
if(elements.length != 1)
@@ -85,10 +85,8 @@
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
if(elements[0] instanceof IType){
if(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME.equals(((IType) elements[0]).getFullyQualifiedName())){
- if(input instanceof ITypeRoot){
- ITypeRoot cUnit = (ITypeRoot)input;
- elements[0] = cUnit.getElementAt(wordRegion.getOffset());
- }
+ elements[0] = input.getElementAt(wordRegion.getOffset());
+
if(elements[0] == null)
return null;
}
13 years, 2 months
JBoss Tools SVN: r35744 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-10-17 21:30:13 -0400 (Mon, 17 Oct 2011)
New Revision: 35744
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java
Log:
Updated CDI Query Participants in order to search in related projects and check search scope https://issues.jboss.org/browse/JBIDE-9801
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-10-18 00:29:52 UTC (rev 35743)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-10-18 01:30:13 UTC (rev 35744)
@@ -60,8 +60,6 @@
ICDIProject cdiProject = CDICorePlugin.getCDIProject(project, true);
-
-
if(cdiProject == null) {
return;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java 2011-10-18 00:29:52 UTC (rev 35743)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java 2011-10-18 01:30:13 UTC (rev 35744)
@@ -14,7 +14,7 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -80,11 +80,11 @@
ElementQuerySpecification qs = (ElementQuerySpecification)querySpecification;
IJavaElement element = qs.getElement();
if(element instanceof IMethod || element instanceof IField || element instanceof ILocalVariable){
- IFile file = (IFile)element.getResource();
- if(file == null)
+ IProject project = element.getJavaProject().getProject();
+ if(project == null)
return;
- CDICoreNature cdiNature = CDICorePlugin.getCDI(file.getProject(), true);
+ CDICoreNature cdiNature = CDICorePlugin.getCDI(project, true);
if(cdiNature == null)
return;
@@ -94,7 +94,7 @@
if(cdiProject == null)
return;
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Set<IBean> beans = cdiProject.getBeans(element.getPath());
IInjectionPoint injectionPoint = CDIUtil.findInjectionPoint(beans, element, 0);
if(injectionPoint != null){
13 years, 2 months
JBoss Tools SVN: r35743 - in trunk: central/plugins/org.jboss.tools.central.discovery/META-INF and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2011-10-17 20:29:52 -0400 (Mon, 17 Oct 2011)
New Revision: 35743
Modified:
trunk/build/pom.xml
trunk/central/plugins/org.jboss.tools.central.discovery/META-INF/MANIFEST.MF
Log:
cenrtal-bootstrap profile fixed to fix build
vesion of o.j.t.central.discovery adjusted with parent pom to 1.0.0.qualifier to fix build warnings
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-10-18 00:18:54 UTC (rev 35742)
+++ trunk/build/pom.xml 2011-10-18 00:29:52 UTC (rev 35743)
@@ -649,6 +649,9 @@
<module>../seam</module>
<module>../portlet</module>
<module>../examples</module>
+ <module>../esb</module>
+ <module>../jbpm</module>
+ <module>../flow</module>
<module>../central</module>
</modules>
</profile>
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/META-INF/MANIFEST.MF
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/META-INF/MANIFEST.MF 2011-10-18 00:18:54 UTC (rev 35742)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/META-INF/MANIFEST.MF 2011-10-18 00:29:52 UTC (rev 35743)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %BundleVendor
Bundle-SymbolicName: org.jboss.tools.central.discovery;singleton:=true
-Bundle-Version: 3.3.0
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.discovery.core;bundle-version="3.6.0"
Bundle-ActivationPolicy: lazy
13 years, 2 months