JBoss Tools SVN: r7834 - branches/ganymede/trunk/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-26 12:57:47 -0400 (Sat, 26 Apr 2008)
New Revision: 7834
Modified:
branches/ganymede/trunk/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java
Log:
JBIDE-2150 [Ganymede] JavaProjectWizardSecondPage cannot be resolved to a type
Modified: branches/ganymede/trunk/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java
===================================================================
--- branches/ganymede/trunk/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java 2008-04-26 16:47:53 UTC (rev 7833)
+++ branches/ganymede/trunk/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java 2008-04-26 16:57:47 UTC (rev 7834)
@@ -30,8 +30,8 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.internal.ui.util.CoreUtility;
-import org.eclipse.jdt.internal.ui.wizards.JavaProjectWizardSecondPage;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jdt.ui.wizards.NewJavaProjectWizardPageTwo;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -160,7 +160,7 @@
IProject project = page.getProjectHandle();
- JavaProjectWizardSecondPage.createProject(project, page.getLocationPath(), monitor);
+ NewJavaProjectWizardPageTwo.createProject(project, page.getLocationPath(), monitor);
monitor.worked(1);
IJavaProject javaProject = JavaCore.create(project);
16 years, 1 month
JBoss Tools SVN: r7833 - branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-26 12:47:53 -0400 (Sat, 26 Apr 2008)
New Revision: 7833
Modified:
branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java
Log:
JBIDE-2149 [Ganymede] The method open(IWorkbenchPage, IFile, boolean) in the type EditorOpener is not applicable for the arguments (IFile, boolean)
JBIDE-2148 [Ganymede] SearchMessages.FileSearchPage_limited_format cannot be resolved
Modified: branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java
===================================================================
--- branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2008-04-26 16:25:08 UTC (rev 7832)
+++ branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2008-04-26 16:47:53 UTC (rev 7833)
@@ -214,7 +214,7 @@
((IOpenableElement)match.getElement()).open();
} else if (match.getElement() instanceof IFile) {
IFile file= (IFile) match.getElement();
- IEditorPart editor= fEditorOpener.open(file, activate);
+ IEditorPart editor= fEditorOpener.open(getSite().getPage(),file, activate);
offset = match.getOffset();
length = match.getLength();
if (offset != 0 && length != 0) {
@@ -400,8 +400,8 @@
if (result != null) {
int itemCount= ((IStructuredContentProvider) tv.getContentProvider()).getElements(getInput()).length;
int fileCount= getInput().getElements().length;
- if (itemCount < fileCount) {
- String format= SearchMessages.FileSearchPage_limited_format;
+ if (itemCount < fileCount) {
+ String format= SearchMessages.FileSearchPage_limited_format_files;
return Messages.format(format, new Object[]{label, new Integer(itemCount), new Integer(fileCount)});
}
}
16 years, 1 month
JBoss Tools SVN: r7832 - branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-26 12:25:08 -0400 (Sat, 26 Apr 2008)
New Revision: 7832
Modified:
branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java
Log:
JBIDE-2147 [Ganymede] ResourceTransferDragAdapter cannot be resolved to a type
Modified: branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java
===================================================================
--- branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2008-04-26 16:00:21 UTC (rev 7831)
+++ branches/ganymede/trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2008-04-26 16:25:08 UTC (rev 7832)
@@ -11,11 +11,17 @@
package org.jboss.tools.seam.ui.search;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jdt.core.IJavaElement;
@@ -23,9 +29,13 @@
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.util.TransferDragSourceListener;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
@@ -38,7 +48,7 @@
import org.eclipse.search.internal.ui.text.FileSearchQuery;
import org.eclipse.search.internal.ui.text.IFileSearchContentProvider;
import org.eclipse.search.internal.ui.text.NewTextSearchActionGroup;
-import org.eclipse.search.internal.ui.text.ResourceTransferDragAdapter;
+
import org.eclipse.search.ui.IContextMenuConstants;
import org.eclipse.search.ui.ISearchResultViewPart;
import org.eclipse.search.ui.NewSearchUI;
@@ -47,6 +57,8 @@
import org.eclipse.search.ui.text.Match;
import org.eclipse.search2.internal.ui.OpenSearchPreferencesAction;
import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DragSourceAdapter;
+import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IMemento;
@@ -397,4 +409,55 @@
return label;
}
+ /** copy from Eclipse 3.3 org.eclipse.search.internal.ui.text.ResourceTransferDragAdapter */
+ /** Maybe NavigatorDragAdopter would be a better alternative. */
+ static public class ResourceTransferDragAdapter extends DragSourceAdapter implements TransferDragSourceListener {
+
+ private ISelectionProvider fProvider;
+
+ /**
+ * Creates a new ResourceTransferDragAdapter for the given selection
+ * provider.
+ *
+ * @param provider the selection provider to access the viewer's selection
+ */
+ public ResourceTransferDragAdapter(ISelectionProvider provider) {
+ fProvider= provider;
+ Assert.isNotNull(fProvider);
+ }
+
+ public Transfer getTransfer() {
+ return ResourceTransfer.getInstance();
+ }
+
+ public void dragStart(DragSourceEvent event) {
+ event.doit= convertSelection().size() > 0;
+ }
+
+ public void dragSetData(DragSourceEvent event) {
+ List resources= convertSelection();
+ event.data= resources.toArray(new IResource[resources.size()]);
+ }
+
+ public void dragFinished(DragSourceEvent event) {
+ if (!event.doit)
+ return;
+ }
+
+ private List convertSelection() {
+ ISelection s= fProvider.getSelection();
+ if (!(s instanceof IStructuredSelection))
+ return Collections.EMPTY_LIST;
+ IStructuredSelection selection= (IStructuredSelection) s;
+ List result= new ArrayList(selection.size());
+ for (Iterator iter= selection.iterator(); iter.hasNext();) {
+ Object element= iter.next();
+ if (element instanceof IResource) {
+ result.add(element);
+ }
+ }
+ return result;
+ }
+ }
+
}
16 years, 1 month
JBoss Tools SVN: r7831 - branches/ganymede/trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-26 12:00:21 -0400 (Sat, 26 Apr 2008)
New Revision: 7831
Modified:
branches/ganymede/trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/PackageModuleFactory.java
Log:
JBIDE-2146 [Ganymede] The field ModuleFile.name|path is not visible
Modified: branches/ganymede/trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/PackageModuleFactory.java
===================================================================
--- branches/ganymede/trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/PackageModuleFactory.java 2008-04-25 23:29:47 UTC (rev 7830)
+++ branches/ganymede/trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/PackageModuleFactory.java 2008-04-26 16:00:21 UTC (rev 7831)
@@ -362,13 +362,13 @@
this.node = fs;
}
public int hashCode() {
- return name.hashCode() * 37 + path.hashCode();
+ return getName().hashCode() * 37 + getPath().hashCode();
}
public IPath getPath() { return srcPath; }
public IArchiveNode getNode() { return node; }
public IPath getDeepDestination() {
- return node.getRootArchive().getGlobalDestinationPath().append(node.getRootArchiveRelativePath(path));
+ return node.getRootArchive().getGlobalDestinationPath().append(node.getRootArchiveRelativePath(getModuleRelativePath()));
}
public IPath getSourcePath() {
return this.srcPath;
16 years, 1 month
JBoss Tools SVN: r7830 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-25 19:29:47 -0400 (Fri, 25 Apr 2008)
New Revision: 7830
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java
Log:
fix JUnit Test Errors
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java 2008-04-25 18:59:42 UTC (rev 7829)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java 2008-04-25 23:29:47 UTC (rev 7830)
@@ -60,6 +60,7 @@
pref.flush();
EditorTestHelper.joinBackgroundActivities();
+ EditorTestHelper.runEventQueue(2000);
}
}
16 years, 1 month
JBoss Tools SVN: r7829 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-25 14:59:42 -0400 (Fri, 25 Apr 2008)
New Revision: 7829
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
Log:
JBIDE-1656 - quotes required
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2008-04-25 18:51:04 UTC (rev 7828)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2008-04-25 18:59:42 UTC (rev 7829)
@@ -121,9 +121,9 @@
ret += "-Djava.net.preferIPv4Stack=true ";
ret += "-Dsun.rmi.dgc.client.gcInterval=3600000 ";
ret += "-Dsun.rmi.dgc.server.gcInterval=3600000 ";
- ret += "-Djava.endorsed.dirs=" + (getRuntime().getLocation().append("lib").append("endorsed")) + " ";
+ ret += "-Djava.endorsed.dirs=\"" + (getRuntime().getLocation().append("lib").append("endorsed")) + "\" ";
if( getRuntime().getLocation().append("bin").append("native").toFile().exists() )
- ret += "-Djava.library.path=" + getRuntime().getLocation().append("bin").append("native") + " ";
+ ret += "-Djava.library.path=\"" + getRuntime().getLocation().append("bin").append("native") + "\" ";
return ret;
}
16 years, 1 month
JBoss Tools SVN: r7828 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-25 14:51:04 -0400 (Fri, 25 Apr 2008)
New Revision: 7828
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
Log:
JBIDE-1656 - native directory added
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2008-04-25 17:50:32 UTC (rev 7827)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2008-04-25 18:51:04 UTC (rev 7828)
@@ -122,6 +122,8 @@
ret += "-Dsun.rmi.dgc.client.gcInterval=3600000 ";
ret += "-Dsun.rmi.dgc.server.gcInterval=3600000 ";
ret += "-Djava.endorsed.dirs=" + (getRuntime().getLocation().append("lib").append("endorsed")) + " ";
+ if( getRuntime().getLocation().append("bin").append("native").toFile().exists() )
+ ret += "-Djava.library.path=" + getRuntime().getLocation().append("bin").append("native") + " ";
return ret;
}
16 years, 1 month
JBoss Tools SVN: r7827 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui/actions and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-04-25 13:50:32 -0400 (Fri, 25 Apr 2008)
New Revision: 7827
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2121 Different behavior(result) of actions Find Seam Declarations and Find Seam References when call them using hot keys or selection from Navigate menu.
Actions are moved to the Search menu.
Hot-key combinations are made editor context sensitive.
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties 2008-04-25 17:50:32 UTC (rev 7827)
@@ -0,0 +1,2 @@
+# Menus
+searchMenu.label= Se&arch
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-04-25 16:30:13 UTC (rev 7826)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-04-25 17:50:32 UTC (rev 7827)
@@ -446,48 +446,47 @@
toolbarPath="org.eclipse.search.searchActionSet/Search"
tooltip="Open Seam Component">
</action>
+ </actionSet>
+ <actionSet
+ id="org.eclipse.search.seamSearchActionSet"
+ label="Seam Search"
+ visible="true">
+ <!-- see http://bugs.eclipse.org/bugs/show_bug.cgi?id=15684 -->
+<!-- Note: The menu (re-) definition has to be here due to bug: -->
+<!-- =================================================================== -->
+<!-- Search Menu -->
+<!-- =================================================================== -->
+ <menu
+ label="%searchMenu.label"
+ path="navigate"
+ id="org.eclipse.search.menu">
+ <groupMarker name="internalDialogGroup"/> <!-- not to be used by clients -->
+ <groupMarker name="dialogGroup"/> <!-- to be used by clients -->
+ <separator name="seamSearchMenuActionsGroup"/> <!-- to be used by clients -->
+ <separator name="fileSearchContextMenuActionsGroup"/> <!-- to be used by clients -->
+ <separator name="contextMenuActionsGroup"/> <!-- to be used by clients -->
+ <separator name="occurencesActionsGroup"/> <!-- to be used by clients -->
+ <separator name="extraSearchGroup"/> <!-- to be used by clients -->
+ </menu>
+
<action
class="org.jboss.tools.seam.ui.actions.FindSeamDeclarationsAction"
- definitionId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.workspace"
- helpContextId="org.eclipse.jdt.ui.find_declarations_action"
+ definitionId="org.jboss.tools.seam.ui.find.declarations"
icon="icons/find_seam_declarations.gif"
id="findDeclarations"
label="Find Seam Declarations"
- menubarPath="navigate/open.ext2"
+ menubarPath="org.eclipse.search.menu/seamSearchMenuActionsGroup"
tooltip="Find Seam Declarations">
</action>
<action
class="org.jboss.tools.seam.ui.actions.FindSeamReferencesAction"
- definitionId="org.eclipse.jdt.ui.edit.text.java.search.references.in.workspace"
- helpContextId="org.eclipse.jdt.ui.find_references_action"
+ definitionId="org.jboss.tools.seam.ui.find.references"
icon="icons/find_seam_references.gif"
id="findReferences"
label="Find Seam References"
- menubarPath="navigate/open.ext2"
+ menubarPath="org.eclipse.search.menu/seamSearchMenuActionsGroup"
tooltip="Find Seam References">
</action>
- <!-- action
- class="org.jboss.tools.seam.ui.actions.FindSeamDeclarationsAction"
- definitionId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.workspace"
- helpContextId="org.eclipse.jdt.ui.find_declarations_action"
- icon="icons/find_seam_declarations.gif"
- id="findDeclarations"
- label="Find Seam Declarations"
- menubarPath="navigate/open.ext2"
- toolbarPath="org.eclipse.search.searchActionSet/Search"
- tooltip="Find Seam Declarations">
- </action>
- <action
- class="org.jboss.tools.seam.ui.actions.FindSeamReferencesAction"
- definitionId="org.eclipse.jdt.ui.edit.text.java.search.references.in.workspace"
- helpContextId="org.eclipse.jdt.ui.find_references_action"
- icon="icons/find_seam_references.gif"
- id="findReferences"
- label="Find Seam References"
- menubarPath="navigate/open.ext2"
- toolbarPath="org.eclipse.search.searchActionSet/Search"
- tooltip="Find Seam References">
- </action -->
</actionSet>
</extension>
<extension
@@ -499,13 +498,13 @@
name="Open Seam Component">
</command>
<command
- categoryId="org.eclipse.ui.category.navigate"
+ categoryId="org.eclipse.search.ui.category.search"
description="Find Seam Declarations"
id="org.jboss.tools.seam.ui.find.declarations"
name="Find Seam Declarations">
</command>
<command
- categoryId="org.eclipse.ui.category.navigate"
+ categoryId="org.eclipse.search.ui.category.search"
description="Find Seam References"
id="org.jboss.tools.seam.ui.find.references"
name="Find Seam References">
@@ -518,16 +517,21 @@
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M1+M2+Z">
</key>
- <!-- key
+ <!--
+ contextId="org.jboss.tools.vpe.editorContext"
+ -->
+ <key
commandId="org.jboss.tools.seam.ui.find.declarations"
+ contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M1+G">
</key>
<key
commandId="org.jboss.tools.seam.ui.find.references"
+ contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M1+M2+G">
- </key -->
+ </key>
</extension>
<extension
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-04-25 16:30:13 UTC (rev 7826)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-04-25 17:50:32 UTC (rev 7827)
@@ -53,6 +53,7 @@
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.progress.IProgressService;
import org.eclipse.ui.texteditor.AbstractTextEditor;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
import org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor;
@@ -69,6 +70,8 @@
import org.jboss.tools.seam.ui.search.SeamSearchQuery;
import org.jboss.tools.seam.ui.search.SeamSearchScope;
+import com.mchange.v2.async.StrandedTaskReporting;
+
/**
* Base class for Seam Find actions
*
@@ -124,7 +127,10 @@
if (activeEditor instanceof AbstractTextEditor) {
viewer = getSourceViewer((AbstractTextEditor)activeEditor);
}
- } else if (editor instanceof CompilationUnitEditor) {
+ } else if (editor instanceof AbstractTextEditor ) {
+ viewer = getSourceViewer((AbstractTextEditor)editor);
+ }
+ else if (editor instanceof CompilationUnitEditor) {
viewer = ((CompilationUnitEditor)editor).getViewer();
}
return viewer;
16 years, 1 month
JBoss Tools SVN: r7826 - in trunk/documentation/development: usecases and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-25 12:30:13 -0400 (Fri, 25 Apr 2008)
New Revision: 7826
Added:
trunk/documentation/development/usecases/pom.xml
Removed:
trunk/documentation/development/resources/
trunk/documentation/development/usecases/build.xml
Log:
Clean Up documentation module. Usecases docbook switched to maven
Deleted: trunk/documentation/development/usecases/build.xml
===================================================================
--- trunk/documentation/development/usecases/build.xml 2008-04-25 16:22:44 UTC (rev 7825)
+++ trunk/documentation/development/usecases/build.xml 2008-04-25 16:30:13 UTC (rev 7826)
@@ -1,20 +0,0 @@
-<project name="UseCases" default="all.doc" basedir=".">
-
- <!-- Set the following property to generate the doco in the output folder -->
- <property name="build.dir" value="${basedir}/../build"/>
-
- <property name="pdf.name" value="usecases.pdf" />
- <import file="../resources/support.xml" />
-
- <target name="all.doc" depends="clean">
- <antcall target="lang.all"><param name="lang" value="en"/></antcall>
- </target>
-
- <!-- Use this alternate target to enable uptodate checking, i.e.
- don't generate docs if nothing has changed
- <target name="all.doc">
- <antcall target="lang.all.run"><param name="lang" value="en"/></antcall>
- </target>
- -->
-
-</project>
Added: trunk/documentation/development/usecases/pom.xml
===================================================================
--- trunk/documentation/development/usecases/pom.xml (rev 0)
+++ trunk/documentation/development/usecases/pom.xml 2008-04-25 16:30:13 UTC (rev 7826)
@@ -0,0 +1,83 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>seam-usecases-${translation}</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>Seam_Usecases</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <sourceDirectory>${pom.basedir}/en</sourceDirectory>
+ <imageResource>
+ <directory>${pom.basedir}/en</directory>
+ <includes>
+ <include>images/**/*</include>
+ </includes>
+ </imageResource>
+ <!--<cssResource>
+ <directory>src/main/css</directory>
+ </cssResource>-->
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${pom.name}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <translation>en-US</translation>
+ </properties>
+
+</project>
Property changes on: trunk/documentation/development/usecases/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 1 month
JBoss Tools SVN: r7825 - branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-25 12:22:44 -0400 (Fri, 25 Apr 2008)
New Revision: 7825
Modified:
branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java
Log:
JBIDE-2134 [Ganymede] ClosableWizardDialog cannot be resolved to a type
Modified: branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java
===================================================================
--- branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java 2008-04-25 16:16:13 UTC (rev 7824)
+++ branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java 2008-04-25 16:22:44 UTC (rev 7825)
@@ -25,7 +25,6 @@
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.TaskModel;
-import org.eclipse.wst.server.ui.internal.wizard.ClosableWizardDialog;
import org.eclipse.wst.server.ui.internal.wizard.NewServerWizard;
import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.jst.web.server.*;
16 years, 1 month