JBoss Tools SVN: r2706 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model: internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-07-27 15:04:55 -0400 (Fri, 27 Jul 2007)
New Revision: 2706
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
Log:
extended scanner factory did not check whether filename was excluded.
method name changed to not override superclass.
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2007-07-27 19:04:09 UTC (rev 2705)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2007-07-27 19:04:55 UTC (rev 2706)
@@ -55,10 +55,12 @@
/**
* Exposes the isIncluded method so that entire scans do not need to occur
* to find matches.
+ *
+ * Overwrites
*/
public static class DirectoryScannerExtension extends DirectoryScanner {
- public boolean isIncluded(String name) {
- return super.isIncluded(name);
+ public boolean isUltimatelyIncluded(String name) {
+ return super.isIncluded(name) && !super.isExcluded(name);
}
}
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2007-07-27 19:04:09 UTC (rev 2705)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2007-07-27 19:04:55 UTC (rev 2706)
@@ -126,7 +126,7 @@
private boolean matchesPath(DirectoryScannerExtension scanner, IPath path) {
if( getGlobalSourcePath().isPrefixOf(path)) {
String s = path.toOSString().substring(getGlobalSourcePath().toOSString().length()+1);
- return scanner.isIncluded(s);
+ return scanner.isUltimatelyIncluded(s);
}
return false;
}
16 years, 10 months
JBoss Tools SVN: r2705 - trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-07-27 15:04:09 -0400 (Fri, 27 Jul 2007)
New Revision: 2705
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
Log:
method was including root node in list if it matched.
API changed to ask whether it should include self
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2007-07-27 17:15:28 UTC (rev 2704)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2007-07-27 19:04:09 UTC (rev 2705)
@@ -84,7 +84,7 @@
* @return
*/
public static IArchiveFileSet[] findAllDescendentFilesets(IArchiveNode node) {
- ArrayList matches = findAllDescendents(node, IArchiveNode.TYPE_ARCHIVE_FILESET);
+ ArrayList matches = findAllDescendents(node, IArchiveNode.TYPE_ARCHIVE_FILESET, true);
return (IArchiveFileSet[]) matches.toArray(new IArchiveFileSet[matches.size()]);
}
@@ -94,7 +94,7 @@
* @return
*/
public static IArchiveFolder[] findAllDescendentFolders(IArchiveNode node) {
- ArrayList matches = findAllDescendents(node, IArchiveNode.TYPE_ARCHIVE_FOLDER);
+ ArrayList matches = findAllDescendents(node, IArchiveNode.TYPE_ARCHIVE_FOLDER, false);
return (IArchiveFolder[]) matches.toArray(new IArchiveFolder[matches.size()]);
}
@@ -103,14 +103,12 @@
* @param node
* @return
*/
- public static ArrayList findAllDescendents(IArchiveNode node, final int type) {
+ public static ArrayList findAllDescendents(IArchiveNode node, final int type, final boolean includeSelf) {
final ArrayList matches = new ArrayList();
- if( node.getNodeType() == type && !matches.contains(node) )
- matches.add(node);
-
+ final IArchiveNode original = node;
node.accept(new IArchiveNodeVisitor() {
public boolean visit(IArchiveNode node) {
- if( node.getNodeType() == type && !matches.contains(node))
+ if( ((node.getNodeType() == type) && !matches.contains(node)) && (includeSelf || node != original))
matches.add(node);
return true;
}
16 years, 10 months
JBoss Tools SVN: r2704 - trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-07-27 13:15:28 -0400 (Fri, 27 Jul 2007)
New Revision: 2704
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
Log:
small change to ensure its getting proper archive detector if its an archive
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2007-07-27 15:36:46 UTC (rev 2703)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2007-07-27 17:15:28 UTC (rev 2704)
@@ -234,7 +234,7 @@
if( node.getNodeType() == IArchiveNode.TYPE_ARCHIVE ) {
IArchive node2 = ((IArchive)node);
boolean exploded = ((IArchive)node).isExploded();
- ArchiveDetector detector = exploded ? ArchiveDetector.NULL : ArchiveDetector.DEFAULT;
+ ArchiveDetector detector = exploded ? ArchiveDetector.NULL : TrueZipUtil.getJarArchiveDetector();
if( parentFile == null )
return new File(node2.getGlobalDestinationPath().append(node2.getName()).toOSString(), detector);
return new File(parentFile, node2.getName(), detector);
16 years, 10 months
JBoss Tools SVN: r2703 - trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-07-27 11:36:46 -0400 (Fri, 27 Jul 2007)
New Revision: 2703
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
Log:
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2007-07-27 15:20:12 UTC (rev 2702)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2007-07-27 15:36:46 UTC (rev 2703)
@@ -20,7 +20,8 @@
lib/jbossxb-1.0.1.TEST.jar,
archivescore.jar,
archivescore-eclipse.jar
-Export-Package: org.jboss.ide.eclipse.archives.core,
+Export-Package: de.schlichtherle.io;x-friends:="org.jboss.ide.eclipse.archives.test",
+ org.jboss.ide.eclipse.archives.core,
org.jboss.ide.eclipse.archives.core.build,
org.jboss.ide.eclipse.archives.core.model,
org.jboss.ide.eclipse.archives.core.model.events;x-friends:="org.jboss.ide.eclipse.archives.test",
16 years, 10 months
JBoss Tools SVN: r2702 - in trunk/seam/tests/org.jboss.tools.seam.core.test: src/org/jboss/tools/seam/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-27 11:20:12 -0400 (Fri, 27 Jul 2007)
New Revision: 2702
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/seam.properties
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
Log:
EXIN-336 More tests added.
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/seam.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/seam.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/seam.properties 2007-07-27 15:20:12 UTC (rev 2702)
@@ -0,0 +1 @@
+org.jboss.seam.core.microcontainer.persistenceUnitName=MyPersistenceUnit
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-07-27 14:55:41 UTC (rev 2701)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-07-27 15:20:12 UTC (rev 2702)
@@ -263,13 +263,35 @@
{"concurrentRequestTimeout", "2"},
{"conversationTimeout", "3"}
};
+ scanSimpleProperties(seamProject, "org.jboss.seam.core.manager", managerTestProperties);
+
+ //4. seam.properties has entry
+ //org.jboss.seam.core.microcontainer.persistenceUnitName=MyPersistenceUnit
+ // check that
+ // a) component org.jboss.seam.core.microcontainer exists,
+ // b) specified property is loaded correctly
- c = seamProject.getComponent("org.jboss.seam.core.manager");
- assertNotNull("Component org.jboss.seam.core.manager not found.", c);
+ String[][] microcontainerTestProperties = new String[][]{
+ {"persistenceUnitName", "MyPersistenceUnit"},
+ };
+ scanSimpleProperties(seamProject, "org.jboss.seam.core.microcontainer", microcontainerTestProperties);
+ }
+
+ /**
+ * Tests if component componentName exists.
+ * Then tests if it has properties, names of which are listed by testProperties[i][0],
+ * and compares their values to those listed in testProperties[i][1].
+ * @param seamProject
+ * @param componentName
+ * @param testProperties = String[][]{{name1, value1}, {name2, value2}, ... }
+ */
+ private void scanSimpleProperties(ISeamProject seamProject, String componentName, String[][] testProperties) {
+ ISeamComponent c = seamProject.getComponent(componentName);
+ assertNotNull("Component " + componentName + " not found.", c);
- for (int p = 0; p < managerTestProperties.length; p++) {
- String propertyName = managerTestProperties[p][0];
- String expectedValue = managerTestProperties[p][1];
+ for (int p = 0; p < testProperties.length; p++) {
+ String propertyName = testProperties[p][0];
+ String expectedValue = testProperties[p][1];
List<ISeamProperty> ps = c.getProperties(propertyName);
assertTrue("Property " + propertyName + " is not found", ps != null && ps.size() == 1);
ISeamProperty property = ps.get(0);
@@ -277,7 +299,7 @@
String actualValue = valueObject.getValue().getValue();
assertTrue("Property " + propertyName + " has value " + actualValue + " rather than " + expectedValue, expectedValue.equals(actualValue));
}
-
+
}
}
16 years, 10 months
JBoss Tools SVN: r2701 - in trunk/documentation/GettingStartedGuide/docs/userguide/en: modules and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-07-27 10:55:41 -0400 (Fri, 27 Jul 2007)
New Revision: 2701
Added:
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/eventlog.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/serveroverview.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/serverpreferences.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/serverstarted.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/stoppingserver2.png
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/consoleoutput.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/startingfromserversview.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/ManageJBossAS.xml
Log:
http://jira.jboss.com/jira/browse/EXIN-401 a "Manage JBoss AS from Red Hat Developer Studio" chapter is improved
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/consoleoutput.png
===================================================================
(Binary files differ)
Added: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/eventlog.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/eventlog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/serveroverview.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/serveroverview.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/serverpreferences.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/serverpreferences.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/serverstarted.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/serverstarted.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/startingfromserversview.png
===================================================================
(Binary files differ)
Added: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/stoppingserver2.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/stoppingserver2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/ManageJBossAS.xml
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/ManageJBossAS.xml 2007-07-27 13:28:26 UTC (rev 2700)
+++ trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/ManageJBossAS.xml 2007-07-27 14:55:41 UTC (rev 2701)
@@ -11,12 +11,111 @@
</keywordset>
</chapterinfo>
<title>Manage JBoss AS from Red Hat Developer Studio</title>
+ <para>Red Hat Developer Studio ships with JBoss AS v.4.2 bundled. When you followed the default installation of Red Hat Developer Studio, you already have a JBoss 4.2 server installed and defined. To run JBoss AS 4.2 you need JDK 1.5. JDK 6 is not formally supported yet, although you may be able to start the server with it.</para>
+ <section id="JBossbundled">
+ <?dbhtml filename="JBossbundled.html"?>
+ <title>How to manage the JBoss AS bundled in RHDS</title>
+ <para></para>
+ <section id="StartingServer">
+ <?dbhtml filename="StartingServer.html"?>
+ <title>Starting JBoss server</title>
+ <para>Starting JBoss server is quite simple. Red Hat Developer Studio allows you control its behaviour through a special toolbar: start it in regular or debug mode, stop it, or restart it.</para>
+ <orderedlist>
+ <listitem><para>To launch the server click the green colored icon on the panel or right click server name in JBoss Server view and select "Start". If this view is not open select Window > Show View > Other > Server > JBoss Server View:</para></listitem>
+ </orderedlist>
+ <figure>
+<title>Starting from icon</title>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="images/startingfromicon.png"/>
+ </imageobject>
+</mediaobject>
+</figure>
+
+<figure>
+<title>Starting from JBoss Server view</title>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="images/startingfromserversview.png"/>
+ </imageobject>
+</mediaobject>
+</figure>
+
+<para>While launching Server output will be written to the Console view:</para>
+<figure>
+<title>Console output</title>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="images/consoleoutput.png"/>
+ </imageobject>
+</mediaobject>
+</figure>
+<para>When server has started you should see "Started" right to its name in JBoss Server view (column "Status").</para>
+<figure>
+<title>Server is started</title>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="images/serverstarted.png"/>
+ </imageobject>
+</mediaobject>
+</figure>
+<para>To see event log after the server is started expand "Event Log" branch beneath JBoss Servers View:</para>
+<figure>
+<title>Event Log</title>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="images/eventlog.png"/>
+ </imageobject>
+</mediaobject>
+</figure>
+ </section>
+ <section id="StoppingJBoss">
+ <?dbhtml filename="StoppingJBoss.html"?>
+ <title>Stopping JBoss server</title>
+ <para>To stop the server select the Stop sign in command panel or right click the server name and press Stop.</para>
+ <figure>
+<title>Stopping server</title>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="images/stoppingserver2.png"/>
+ </imageobject>
+</mediaobject>
+</figure>
+<para>When the server is stopped you will see "Stopped" next to its name in Status column.</para>
+ </section>
+ <section id="ServerPreferences">
+ <?dbhtml filename="ServerPreferences.html"?>
+ <title>Server Container Preferences</title>
+ <para>You can control how Red Hat Developer Studio interacts with servlet containers in Preferences. Select Window > Preferences > JBoss Tools > JBoss Servers and switch to the desired server:</para>
+ <figure>
+<title>Server preferences</title>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="images/serverpreferences.png"/>
+ </imageobject>
+</mediaobject>
+</figure>
+<para>Also you can double click the server name in JBoss Server view and open an Overview of the server. Here you can specify some common settings: host name, server name, runtime and so on.</para>
+<figure>
+<title>Server overview</title>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="images/serveroverview.png"/>
+ </imageobject>
+</mediaobject>
+</figure>
+
+ </section>
+ </section>
+
+<section id="JBossInstances">
+ <?dbhtml filename="JBossInstances.html"?>
+ <title>How to manage JBoss AS instances in RHDS</title>
+ <para>Although Red Hat Developer Studio works closely with JBoss AS 4.2 we do not ultimately tie you to any particular server for deployment. There are some servers that Studio supports directly (through the bundled Eclipse WTP plug-ins). Suppose you want to deploy the application to JBoss 4.0.5 server. First of all you need to install it.</para>
<section id="JBossInstalling">
<?dbhtml filename="JBossInstalling.html"?>
<title>JBoss AS Installation</title>
- <para>If you followed the default installation of Red Hat Developer Studio, you will already have a JBoss 4.2 server installed and defined. You have to do nothing to deploy your project. Just start JBoss server using a JBoss icon from command panel and launch your application. Registration to default JBoss AS is being done when you are creating an appication, in the second screen of wizard called "Web" ("Target Server" section). Simply do not uncheck the control in this section.</para>
-<para>Besides that you can deploy your application to some servers that Red Hat Developer Studio supports directly (through the bundled Eclipse WTP plug-ins). Suppose you want to deploy the application to JBoss 4.0.5 server. First of all you need to install it.</para>
-<orderedlist>
+ <orderedlist>
<listitem><para>Download the installation pack of JBoss 4.0.5 and save it on your computer: <ulink url="http://labs.jboss.com/jbossas/downloads">http://labs.jboss.com/jbossas/downloads</ulink></para></listitem>
<listitem><para>Double-click this file or launch the installation from terminal like this:</para></listitem>
</orderedlist>
@@ -160,41 +259,6 @@
</orderedlist>
</section>
- <section id="StartingServer">
- <?dbhtml filename="StartingServer.html"?>
- <title>Starting and stopping JBoss server</title>
- <para>Starting JBoss server is quite simple. Red Hat Developer Studio allows you control its behaviour through a special toolbar: start it in regular or debug mode, stop it, or restart it.</para>
- <orderedlist>
- <listitem><para>To launch the server click the green colored icon on the panel or right click server name in Servers view and select "Start":</para></listitem>
- </orderedlist>
- <figure>
-<title>Starting from icon</title>
-<mediaobject>
- <imageobject>
- <imagedata fileref="images/startingfromicon.png"/>
- </imageobject>
-</mediaobject>
-</figure>
-
-<figure>
-<title>Starting from Servers view</title>
-<mediaobject>
- <imageobject>
- <imagedata fileref="images/startingfromserversview.png"/>
- </imageobject>
-</mediaobject>
-</figure>
-<orderedlist continuation="continues">
-<listitem><para>To stop the server click the button "Stop".</para></listitem>
-</orderedlist>
-<para>While launching Server output will be written to the Console view:</para>
-<figure>
-<title>Console output</title>
-<mediaobject>
- <imageobject>
- <imagedata fileref="images/consoleoutput.png"/>
- </imageobject>
-</mediaobject>
-</figure>
+
</section>
</chapter>
\ No newline at end of file
16 years, 10 months
JBoss Tools SVN: r2700 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-07-27 09:28:26 -0400 (Fri, 27 Jul 2007)
New Revision: 2700
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
Log:
http://jira.jboss.com/jira/browse/EXIN-365
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-27 11:45:45 UTC (rev 2699)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-07-27 13:28:26 UTC (rev 2700)
@@ -15,6 +15,8 @@
import java.util.Iterator;
import java.util.List;
+import org.eclipse.core.internal.resources.File;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.QualifiedName;
@@ -514,4 +516,73 @@
}
return classShape;
}
+
+ HashMap<String, Boolean> states = new HashMap<String, Boolean>();
+ IFile file = null;
+
+ public String getKey(Shape shape) {
+ Object element = shape.getOrmElement();
+ String key=null;
+ if (element instanceof RootClass) {
+ key = ((RootClass)ormElement).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();
+ } else if (element instanceof Subclass) {
+ key = ((Subclass)element).getEntityName();
+ }
+ return key;
+ }
+
+ public void stateInit(Shape shape){
+ for(int i=0;i<shape.getChildren().size();i++){
+
+ }
+ }
+
+ public void saveStates(){
+ Iterator<String> iter = states.keySet().iterator();
+ String key;
+ boolean value;
+ while(iter.hasNext()){
+ key = iter.next();
+ value = getState(key);
+ try{
+ file.setPersistentProperty(new QualifiedName("", key), ""+value);
+ }catch(Exception ex){
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ public void setState(String key, boolean value){
+ if(states.containsKey(key)){
+ states.remove(key);
+ states.put(key, new Boolean(value));
+ }else{
+ states.put(key, new Boolean(value));
+ }
+ }
+
+ public boolean getState(String key){
+ Boolean value = states.get(key);
+ if(value == null){
+ try{
+ String str = file.getPersistentProperty(new QualifiedName("", key));
+ if(str != null){
+ value = new Boolean(str);
+ states.put(key, value);
+ return value.booleanValue();
+ }else
+ return true;
+ }catch(Exception ex){
+ ex.printStackTrace();
+ return true;
+ }
+ }
+ return value.booleanValue();
+ }
}
\ No newline at end of file
16 years, 10 months
JBoss Tools SVN: r2699 - trunk/jsf/plugins/org.jboss.tools.jsf.ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-27 07:45:45 -0400 (Fri, 27 Jul 2007)
New Revision: 2699
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
Log:
JBIDE-622
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2007-07-27 11:45:38 UTC (rev 2698)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2007-07-27 11:45:45 UTC (rev 2699)
@@ -196,14 +196,14 @@
</action-->
</objectContribution>
<!-- IFile -->
- <objectContribution id="JSF_IFile" objectClass="org.eclipse.core.resources.IFile">
+ <!--objectContribution id="JSF_IFile" objectClass="org.eclipse.core.resources.IFile">
<menu id="RedHat4Web" label="Red Hat Developer Studio" path="additions">
<separator name="a">
</separator>
<separator name="d">
</separator>
</menu>
- </objectContribution>
+ </objectContribution-->
</extension>
<!--extension id="org.jboss.tools.jsf.ui.views" name="JSF Views" point="org.eclipse.ui.views">
<category id="jsf.views.category.id" name="%jsf.views.category.name">
16 years, 10 months
JBoss Tools SVN: r2698 - trunk/jst/plugins/org.jboss.tools.jst.web.ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-27 07:45:38 -0400 (Fri, 27 Jul 2007)
New Revision: 2698
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
Log:
JBIDE-622
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2007-07-27 11:45:29 UTC (rev 2697)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2007-07-27 11:45:38 UTC (rev 2698)
@@ -216,7 +216,7 @@
<action class="org.jboss.tools.jst.web.ui.action.SaveProjectAsTemplateActionDelegate" enablesFor="*" id="org.jboss.tools.common.xstudio.action.SaveProjectAsTemplateActionDelegate" label="%popupMenus.action.saveAsTemplate" menubarPath="RedHat4Web/c">
</action>
</objectContribution>
- <objectContribution id="RedHatEclipse4Web_IFile" objectClass="org.eclipse.core.resources.IFile">
+ <!--objectContribution id="RedHatEclipse4Web_IFile" objectClass="org.eclipse.core.resources.IFile">
<menu id="RedHat4Web" label="Red Hat Developer Studio" path="additions">
<separator name="a">
</separator>
@@ -226,9 +226,7 @@
</separator>
</menu>
- <!--action class="org.jboss.tools.common.model.ui.action.file.HelpActionDelegate" enablesFor="*" id="org.jboss.tools.common.model.ui.action.file.HelpActionDelegate" label="Help" menubarPath="RedHat4Web/help">
- </action-->
- </objectContribution>
+ </objectContribution-->
<objectContribution id="RedHatEclipse4Web_XModelObject" objectClass="org.jboss.tools.common.model.XModelObject">
<menu id="RedHat4Web" label="Red Hat Developer Studio" path="additions">
<separator name="a">
16 years, 10 months
JBoss Tools SVN: r2697 - trunk/struts/plugins/org.jboss.tools.struts.ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-27 07:45:29 -0400 (Fri, 27 Jul 2007)
New Revision: 2697
Modified:
trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml
Log:
JBIDE-622
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml 2007-07-27 11:42:48 UTC (rev 2696)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml 2007-07-27 11:45:29 UTC (rev 2697)
@@ -146,7 +146,7 @@
<action class="org.jboss.tools.struts.ui.internal.action.ModulesConfigurationActionDelegate" enablesFor="*" id="org.jboss.tools.common.xstudio.action.ModulesConfigurationActionDelegate" label="%popupMenus.action.modulesConfiguration" menubarPath="RedHat4Web/b">
</action>
</objectContribution>
- <objectContribution id="RedHatStrutsStudio_IFile" objectClass="org.eclipse.core.resources.IFile">
+ <!--objectContribution id="RedHatStrutsStudio_IFile" objectClass="org.eclipse.core.resources.IFile">
<menu id="RedHat4Web" label="Red Hat Developer Studio" path="additions">
<separator name="a">
</separator>
@@ -159,7 +159,7 @@
</action>
<action class="org.jboss.tools.struts.ui.internal.action.GenerateCodeActionDelegate" enablesFor="*" id="org.jboss.tools.struts.ui.internal.action.GenerateCodeActionDelegate" label="Generate Java Code..." menubarPath="RedHat4Web/generate">
</action>
- </objectContribution>
+ </objectContribution-->
<objectContribution id="RedHatStrutsStudio_XModelObject" objectClass="org.jboss.tools.common.model.XModelObject">
<menu id="RedHat4Web" label="Red Hat Developer Studio" path="additions">
<separator name="a">
@@ -277,7 +277,7 @@
menubarPath="RedHat4Web/b">
</action>
</objectContribution>
- <objectContribution id="RedHatEclipse4Web_IFile" objectClass="org.eclipse.core.resources.IFile">
+ <!--objectContribution id="RedHatEclipse4Web_IFile" objectClass="org.eclipse.core.resources.IFile">
<menu id="RedHat4Web" label="Red Hat Developer Studio" path="additions">
<separator name="a">
</separator>
@@ -288,15 +288,15 @@
</menu>
<action class="org.jboss.tools.struts.ui.internal.action.VerifyActionDelegate" enablesFor="*" id="org.jboss.tools.common.xstudio.action.VerifyActionDelegate" label="%popupMenus.action.verify" menubarPath="RedHat4Web/a">
</action>
- </objectContribution>
- <objectContribution id="RedHatEclipse4Web_IFolder" objectClass="org.eclipse.core.resources.IFolder">
+ </objectContribution-->
+ <!--objectContribution id="RedHatEclipse4Web_IFolder" objectClass="org.eclipse.core.resources.IFolder">
<menu id="RedHat4Web" label="Red Hat Developer Studio" path="additions">
<separator name="a">
</separator>
</menu>
<action class="org.jboss.tools.struts.ui.internal.action.VerifyActionDelegate" enablesFor="*" id="org.jboss.tools.common.xstudio.action.VerifyActionDelegate" label="%popupMenus.action.verify" menubarPath="RedHat4Web/a">
</action>
- </objectContribution>
+ </objectContribution-->
<objectContribution id="verify" objectClass="org.jboss.tools.common.model.XModelObject">
<action class="org.jboss.tools.struts.ui.internal.action.VerifyActionDelegate" enablesFor="*" id="org.jboss.tools.common.xstudio.action.VerifyActionDelegate" label="%popupMenus.action.verify" menubarPath="RedHat4Web/a">
16 years, 10 months