JBoss Tools SVN: r2736 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-07-30 17:36:45 -0400 (Mon, 30 Jul 2007)
New Revision: 2736
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java
Log:
correction to edit file action
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java 2007-07-30 21:34:05 UTC (rev 2735)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java 2007-07-30 21:36:45 UTC (rev 2736)
@@ -294,11 +294,14 @@
try {
Object o = getPropertySelection();
Path p = null;
+ if( o instanceof XPathQuery && ((XPathQuery)o).getResults().length == 1 ) {
+ o = (XPathFileResult) ((XPathQuery)o).getResults()[0];
+ }
if( o instanceof XPathFileResult ) {
p = new Path(((XPathFileResult)o).getFileLocation());
} else if( o instanceof XPathResultNode ) {
p = new Path(((XPathResultNode)o).getFileLocation());
- }
+ }
if( p != null ) {
16 years, 9 months
JBoss Tools SVN: r2735 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-07-30 17:34:05 -0400 (Mon, 30 Jul 2007)
New Revision: 2735
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors/DescriptorXPathPropertySheetPage.java
Log:
slight ui change in xpaths properties
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors/DescriptorXPathPropertySheetPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors/DescriptorXPathPropertySheetPage.java 2007-07-30 21:28:18 UTC (rev 2734)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors/DescriptorXPathPropertySheetPage.java 2007-07-30 21:34:05 UTC (rev 2735)
@@ -92,9 +92,10 @@
menu.add(provider.editXPathAction);
menu.add(provider.deleteXPathAction);
}
- if( selected != null &&
- (selected instanceof XPathResultNode || selected instanceof XPathFileResult ))
+ if( selected != null && (selected instanceof XPathResultNode || selected instanceof XPathFileResult ) ||
+ (selected instanceof XPathQuery && ((XPathQuery)selected).getResults().length == 1)) {
menu.add(provider.editFileAction);
+ }
}
@@ -301,16 +302,8 @@
protected void createXPathComposite(Composite book) {
wrapper = new Composite(book, SWT.NONE);
+ wrapper.setLayout(new FillLayout());
int groupWidth = 500;
-
- FormData groupData = new FormData();
- groupData.right = new FormAttachment(100, -5);
- groupData.left = new FormAttachment(0, 5);
- groupData.top = new FormAttachment(0,5);
- groupData.bottom = new FormAttachment(100, -5);
- wrapper.setLayoutData(groupData);
- wrapper.setLayout(new FormLayout());
-
final Tree xpathTree = new Tree(wrapper, SWT.BORDER | SWT.FULL_SELECTION);
this.xpathTree = xpathTree;
16 years, 9 months
JBoss Tools SVN: r2734 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-07-30 17:28:18 -0400 (Mon, 30 Jul 2007)
New Revision: 2734
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesModelModuleContributor.java
Log:
NPE
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesModelModuleContributor.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesModelModuleContributor.java 2007-07-30 20:25:15 UTC (rev 2733)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesModelModuleContributor.java 2007-07-30 21:28:18 UTC (rev 2734)
@@ -84,13 +84,14 @@
ArrayList mods = (ArrayList)projectToModules.get(projectLoc);
IModule mod;
IArchive arc;
- if (mods != null)
- {
+ if (mods != null) {
for( Iterator i = mods.iterator(); i.hasNext();) {
mod = (IModule)i.next();
- arc = ((PackagedModuleDelegate)moduleDelegates.get(mod)).getPackage();
- packageToModule.remove(arc);
- moduleDelegates.remove(mod);
+ if( moduleDelegates.get(mod) != null ) {
+ arc = ((PackagedModuleDelegate)moduleDelegates.get(mod)).getPackage();
+ packageToModule.remove(arc);
+ moduleDelegates.remove(mod);
+ }
}
}
createModules(findProject(projectLoc));
16 years, 9 months
JBoss Tools SVN: r2733 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-07-30 16:25:15 -0400 (Mon, 30 Jul 2007)
New Revision: 2733
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/ProjectRuntimeClasspathProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-563 fix
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/ProjectRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/ProjectRuntimeClasspathProvider.java 2007-07-30 19:21:22 UTC (rev 2732)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/ProjectRuntimeClasspathProvider.java 2007-07-30 20:25:15 UTC (rev 2733)
@@ -40,6 +40,10 @@
public class ProjectRuntimeClasspathProvider implements IClasspathProvider {
private IRuntimeComponent rc;
+ public ProjectRuntimeClasspathProvider() {
+
+ }
+
public ProjectRuntimeClasspathProvider(final IRuntimeComponent rc) {
this.rc = rc;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2007-07-30 19:21:22 UTC (rev 2732)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2007-07-30 20:25:15 UTC (rev 2733)
@@ -419,7 +419,7 @@
<runtimeClasspathProvider
id="org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget"
runtimeTypeIds="org.jboss.ide.eclipse.as.runtime.32, org.jboss.ide.eclipse.as.runtime.40, org.jboss.ide.eclipse.as.runtime.42"
- class="org.jboss.ide.eclipse.as.core.runtime.internal.ProjectRuntimeClasspathProvider"/>
+ class="org.jboss.ide.eclipse.as.core.runtime.internal.ClientAllRuntimeClasspathProvider"/>
</extension>
<extension
point="org.eclipse.wst.server.core.moduleTypes">
16 years, 9 months
JBoss Tools SVN: r2732 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-07-30 15:21:22 -0400 (Mon, 30 Jul 2007)
New Revision: 2732
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
Log:
http://jira.jboss.com/jira/browse/EXIN-287
Path to JBoss AS changed to ../../../../jboss-eap/jboss-as
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2007-07-30 18:24:59 UTC (rev 2731)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2007-07-30 19:21:22 UTC (rev 2732)
@@ -46,7 +46,7 @@
public class WebModelPlugin extends BaseUIPlugin {
- public static final String JBOSS_AS_HOME = "../../../../jbossas"; // JBoss AS home directory (relative to plugin)- <RHDS_HOME>/jbossas.
+ public static final String JBOSS_AS_HOME = "../../../../jboss-eap/jboss-as"; // JBoss AS home directory (relative to plugin)- <RHDS_HOME>/jbossas.
public static final String JBOSS_AS_RUNTIME_TYPE_ID = "org.jboss.ide.eclipse.as.runtime.42";
public static final String JBOSS_AS_TYPE_ID = "org.jboss.ide.eclipse.as.42";
16 years, 9 months
JBoss Tools SVN: r2731 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor: src/org/jboss/tools/hibernate/ui/veditor/editors/model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mdryakhlenkov
Date: 2007-07-30 14:24:59 -0400 (Mon, 30 Jul 2007)
New Revision: 2731
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
Log:
EXIN-369: Saving positions and states (visible/hidden) of diagram elements.
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF 2007-07-30 18:16:19 UTC (rev 2730)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF 2007-07-30 18:24:59 UTC (rev 2731)
@@ -16,7 +16,8 @@
org.hibernate.eclipse,
org.jboss.tools.hibernate.ui.view,
org.jboss.tools.common,
- org.eclipse.jdt.core
+ org.eclipse.jdt.core,
+ org.jboss.tools.common.model
Bundle-Version: 2.0.0
Export-Package: org.jboss.tools.hibernate.ui.veditor,
org.jboss.tools.hibernate.ui.veditor.editors,
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-07-30 18:16:19 UTC (rev 2730)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-07-30 18:24:59 UTC (rev 2731)
@@ -13,6 +13,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -26,8 +27,6 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.jdt.core.IJavaProject;
import org.hibernate.cfg.Configuration;
@@ -47,6 +46,8 @@
import org.hibernate.mapping.Value;
import org.hibernate.type.EntityType;
import org.hibernate.type.Type;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin;
public class OrmDiagram extends ModelElement {
@@ -79,25 +80,18 @@
dirty = false;
}
- public IFile createLayoutFile(InputStream source) {
- IFile file = null;
- IPath path = javaProject.getProject().getLocation().append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME);
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
- if(!folder.exists()) {
- try {
- folder.create(true, true, null);
+ private IPath getStoreFolderPath() {
+ return javaProject.getProject().getLocation().append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME);
+ }
- file = folder.getFile(consoleConfiguration.getName() + "_" + getOrmElement().getClassName());
- if (!file.exists()) {
- file.create(source, true, null);
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return file;
+ private IPath getStoreFilePath() {
+ return getStoreFolderPath().append(getStoreFileName());
}
+ private String getStoreFileName() {
+ return consoleConfiguration.getName() + "_" + getOrmElement().getClassName();
+ }
+
public HashMap getCloneElements() {
return (HashMap)elements.clone();
}
@@ -538,13 +532,13 @@
Object element = shape.getOrmElement();
String key=null;
if (element instanceof RootClass) {
- key = ((RootClass)ormElement).getEntityName();
+ key = ((RootClass)element).getEntityName();
} else if (element instanceof Table) {
Table table = (Table)element;
key = table.getSchema() + "." + table.getName();
} else if (element instanceof Property) {
- SpecialRootClass specialRootClass = new SpecialRootClass((Property)element);
- key = specialRootClass.getEntityName();
+ Property property = (Property)element;
+ key = property.getPersistentClass().getEntityName() + "." + property.getName();
} else if (element instanceof Subclass) {
key = ((Subclass)element).getEntityName();
}
@@ -591,32 +585,55 @@
public void save(){
Properties properties = new Properties();
storeProperties(properties, this);
- try{
- File file = new File("c:\\aaa.property");
- if(!file.exists()){
+ try {
+ File folder = new File(getStoreFolderPath().toOSString());
+ if(!folder.exists()) {
+ folder.mkdirs();
+ }
+ File file = new File(getStoreFilePath().toOSString());
+ if(!file.exists()) {
file.createNewFile();
}
FileOutputStream fos = new FileOutputStream(file);
properties.store(fos, "");
- }catch(Exception ex){
- ex.printStackTrace();
+ } catch (IOException e) {
+ VisualEditorPlugin.getDefault().logError("Can't save layout of mapping.", e);
}
}
-
+
+ public IFile createLayoutFile(InputStream source) {
+ IFile file = null;
+ IPath path = javaProject.getProject().getLocation().append(".settings").append(HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME);
+ IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
+ if(!folder.exists()) {
+ try {
+ folder.create(true, true, null);
+
+ file = folder.getFile(consoleConfiguration.getName() + "_" + getOrmElement().getClassName());
+ if (!file.exists()) {
+ file.create(source, true, null);
+ }
+ } catch (CoreException e) {
+ VisualEditorPlugin.getDefault().logError(e);
+ }
+ }
+ return file;
+ }
+
private boolean loadSuccessfull = false;
public void load(){
Properties properties = new Properties();
try{
- File file = new File("c:\\aaa.property");
+ File file = new File(getStoreFilePath().toOSString());
if(file.exists()){
FileInputStream fis = new FileInputStream(file);
properties.load(fis);
propertiesInit(properties, this);
loadSuccessfull = true;
}
- }catch(Exception ex){
- ex.printStackTrace();
+ }catch(IOException ex){
+ VisualEditorPlugin.getDefault().logError("Can't load layout of mapping.", ex);
}
}
16 years, 9 months
JBoss Tools SVN: r2730 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-07-30 14:16:19 -0400 (Mon, 30 Jul 2007)
New Revision: 2730
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ComponentShapeEditPart.java
Log:
http://jira.jboss.com/jira/browse/EXIN-369
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ComponentShapeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ComponentShapeEditPart.java 2007-07-30 17:42:34 UTC (rev 2729)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ComponentShapeEditPart.java 2007-07-30 18:16:19 UTC (rev 2730)
@@ -54,8 +54,24 @@
} else {
throw new IllegalArgumentException();
}
- }
+ }
+ public void addNotify() {
+ super.addNotify();
+ if(!((ExpandeableShape)getModel()).isReferenceVisible()){
+ int i = figure.getPreferredSize().width;
+ ((ComponentFigure)figure).setChildsHiden(true);
+
+ figure.setSize(i,-1);
+
+ referenceList.add((OrmShape)getCastedModel().getParent());
+ refreshReference((ExpandeableShape)getCastedModel(), ((ExpandeableShape)getCastedModel()).isReferenceVisible());
+
+
+ ((OrmShape)getParent().getModel()).refreshReference();
+ }
+ }
+
public void performRequest(Request req) {
if(RequestConstants.REQ_OPEN.equals(req.getType()) && getModel() instanceof ComponentShape) {
((ComponentShape)getModel()).refreshChildsHiden(((OrmDiagram)getViewer().getContents().getModel()));
16 years, 9 months
JBoss Tools SVN: r2729 - in trunk/seam/plugins/org.jboss.ide.seam.gen: src/org/jboss/ide/seam/gen and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-07-30 13:42:34 -0400 (Mon, 30 Jul 2007)
New Revision: 2729
Modified:
trunk/seam/plugins/org.jboss.ide.seam.gen/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java
trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java
trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java
Log:
http://jira.jboss.org/jira/browse/EXIN-287
http://jira.jboss.org/jira/browse/EXIN-302
remove dependency from org.jboss.tools.seam.core
Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.ide.seam.gen/META-INF/MANIFEST.MF 2007-07-30 17:18:13 UTC (rev 2728)
+++ trunk/seam/plugins/org.jboss.ide.seam.gen/META-INF/MANIFEST.MF 2007-07-30 17:42:34 UTC (rev 2729)
@@ -16,8 +16,7 @@
org.eclipse.ant.ui,
org.eclipse.core.filesystem,
org.eclipse.datatools.connectivity,
- org.eclipse.datatools.connectivity.db.generic,
- org.jboss.tools.seam.core
+ org.eclipse.datatools.connectivity.db.generic
Bundle-ClassPath: org.jboss.ide.seam.gen.jar
Export-Package: org.jboss.ide.seam.gen,
org.jboss.ide.seam.gen.actions
Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java
===================================================================
--- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java 2007-07-30 17:18:13 UTC (rev 2728)
+++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java 2007-07-30 17:42:34 UTC (rev 2729)
@@ -8,15 +8,17 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationType;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
import org.jboss.ide.seam.gen.actions.SeamGenAction;
-import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.core.project.facet.SeamFacetPreference;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
/**
@@ -56,7 +58,9 @@
File buildXmlPath = null;
if(config==null) {
try {
- String seamHome = SeamFacetPreference.getStringPreference(SeamFacetPreference.SEAM_HOME_FOLDER);
+ Bundle plugin = Platform.getBundle("org.jboss.tools.seam.core");
+ if(plugin==null) return;
+ String seamHome = new ScopedPreferenceStore(new InstanceScope(),plugin.getSymbolicName()).getString("org.jboss.tools.seam.core.project.facet.seamhome");
buildXmlPath = new File(seamHome+File.separator+"seam-gen"+File.separator+"build.xml");
if(buildXmlPath.exists())
SeamGenAction.createSeamgenLaunchConfig(buildXmlPath.getAbsolutePath());
Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java
===================================================================
--- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java 2007-07-30 17:18:13 UTC (rev 2728)
+++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java 2007-07-30 17:42:34 UTC (rev 2729)
@@ -36,7 +36,7 @@
}
public String getDefaultValue(Properties others) {
- return null;
+ return "";
}
protected String upper(String name)
Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java 2007-07-30 17:18:13 UTC (rev 2728)
+++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java 2007-07-30 17:42:34 UTC (rev 2729)
@@ -44,8 +44,6 @@
return GENERAL;
}
}
-
-
);
properties.put( "workspace.home.new", new SeamGenProperty(
16 years, 9 months
JBoss Tools SVN: r2728 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-07-30 13:18:13 -0400 (Mon, 30 Jul 2007)
New Revision: 2728
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/UpDownListComposite.java
Log:
JBIDE-608 multiple selection in up/down list
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/UpDownListComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/UpDownListComposite.java 2007-07-30 17:00:23 UTC (rev 2727)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/UpDownListComposite.java 2007-07-30 17:18:13 UTC (rev 2728)
@@ -116,7 +116,7 @@
gridData1.heightHint = 20;
gridData1.widthHint = 20;
- table = new Table(group, SWT.FULL_SELECTION | SWT.BORDER);
+ table = new Table(group, SWT.FULL_SELECTION | SWT.BORDER | SWT.MULTI );
table.setHeaderVisible(false);
table.setLayoutData(gridData1);
table.setLinesVisible(false);
16 years, 9 months
JBoss Tools SVN: r2727 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/console and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-07-30 13:00:23 -0400 (Mon, 30 Jul 2007)
New Revision: 2727
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java
Log:
fixed JBIDE-625 Hibernate Configurations can't be deleted
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java 2007-07-30 16:37:04 UTC (rev 2726)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java 2007-07-30 17:00:23 UTC (rev 2727)
@@ -53,6 +53,7 @@
import org.hibernate.SessionFactory;
import org.hibernate.console.node.BaseNode;
import org.hibernate.console.node.ConfigurationListNode;
+import org.hibernate.eclipse.HibernatePlugin;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -145,7 +146,7 @@
// Cache the location instance for later retrieval
getRepositoriesMap().put(configuration.getName(), configuration);
configuration.addConsoleConfigurationListener(sfListener);
- //TODO: location.storePreferences();
+
existingConfiguration = configuration;
}
@@ -180,6 +181,7 @@
});
oldConfig.reset();
removeLoggingStream( oldConfig );
+
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2007-07-30 16:37:04 UTC (rev 2726)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2007-07-30 17:00:23 UTC (rev 2727)
@@ -51,9 +51,11 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.hibernate.HibernateException;
+import org.hibernate.SessionFactory;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.HibernateConsoleRuntimeException;
import org.hibernate.console.KnownConfigurations;
+import org.hibernate.console.KnownConfigurationsListener;
import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
import org.hibernate.eclipse.console.workbench.ConfigurationAdapterFactory;
import org.hibernate.eclipse.criteriaeditor.CriteriaEditorInput;
@@ -85,6 +87,7 @@
private JavaTextTools javaTextTools;
private ILaunchConfigurationListener icl;
+ private KnownConfigurationsListener kcl;
/**
* The constructor.
@@ -118,6 +121,38 @@
private void listenForConfigurations() {
final ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
+ kcl = new KnownConfigurationsListener() {
+
+ public void sessionFactoryClosing(ConsoleConfiguration configuration,
+ SessionFactory closingFactory) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void sessionFactoryBuilt(ConsoleConfiguration ccfg,
+ SessionFactory builtFactory) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void configurationRemoved(ConsoleConfiguration root) {
+ try {
+ removeConfiguration(root.getName());
+ } catch (CoreException e) {
+ logErrorMessage("Could not delete launch configuration for: " + root.getName(), e);
+ }
+
+ }
+
+ public void configurationAdded(ConsoleConfiguration root) {
+ // TODO Auto-generated method stub
+
+ }
+
+ };
+
+ KnownConfigurations.getInstance().addConsoleConfigurationListener(kcl);
+
icl = new ILaunchConfigurationListener() {
boolean isConsoleConfiguration(ILaunchConfiguration configuration) {
@@ -187,6 +222,7 @@
private void stopListeningForConfigurations() {
final ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
launchManager.removeLaunchConfigurationListener( icl );
+ KnownConfigurations.getInstance().removeConfigurationListener(kcl);
}
@@ -203,6 +239,34 @@
}
+ private void removeConfiguration(String name) throws CoreException {
+ ILaunchConfiguration findLaunchConfig = findLaunchConfig(name);
+ if (findLaunchConfig != null) {
+ findLaunchConfig.delete();
+ }
+ }
+
+ private ILaunchConfiguration findLaunchConfig(String name)
+ throws CoreException {
+ ILaunchManager launchManager = DebugPlugin.getDefault()
+ .getLaunchManager();
+ ILaunchConfigurationType launchConfigurationType = launchManager
+ .getLaunchConfigurationType(ICodeGenerationLaunchConstants.CONSOLE_CONFIGURATION_LAUNCH_TYPE_ID);
+ ILaunchConfiguration[] launchConfigurations = launchManager
+ .getLaunchConfigurations(launchConfigurationType);
+
+ for (int i = 0; i < launchConfigurations.length; i++) { // can't believe
+ // there is no
+ // look up by
+ // name API
+ ILaunchConfiguration launchConfiguration = launchConfigurations[i];
+ if (launchConfiguration.getName().equals(name)) {
+ return launchConfiguration;
+ }
+ }
+ return null;
+ }
+
/**
* This method is called when the plug-in is stopped
*/
16 years, 9 months