JBoss Tools SVN: r3162 - trunk/documentation/GettingStartedGuide/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: afedosik
Date: 2007-08-16 08:38:17 -0400 (Thu, 16 Aug 2007)
New Revision: 3162
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml
Log:
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml 2007-08-16 12:08:41 UTC (rev 3161)
+++ trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml 2007-08-16 12:38:17 UTC (rev 3162)
@@ -20,7 +20,7 @@
<section>
<title>Create a Seam Project</title>
- <para>To create a new web application in Seam, select <emphasis role="italic">New > Project ... > Seam > Seam Web Project</emphasis>. You will be prompted to enter a name and a location directory for your new project. You will also be asked to choose a JBoss AS server to deploy the project. You must choose the JBoss AS 4.2.0 instance we had defined in the JBoss AS Server manager view.</para>
+ <para>To create a new web application in Seam, select "New > Project ... > Seam > Seam Web Project". You will be prompted to enter a name and a location directory for your new project. You will also be asked to choose a JBoss AS server to deploy the project. You must choose the JBoss AS 4.2.0 instance we had defined in the JBoss AS Server manager view.</para>
<figure>
<title>Create a Seam project</title>
@@ -79,6 +79,10 @@
</figure>
<para>Now you need to specify driver and connection details.</para>
+ <orderedlist continuation="continues">
+ <listitem><para>Click the Browse button near driver selection drop down list.</para></listitem>
+ </orderedlist>
+
<figure>
<title>Give a name to connection profile</title>
<mediaobject>
@@ -89,7 +93,7 @@
</figure>
<orderedlist continuation="continues">
- <listitem><para>Click the Browse button near driver selection drop down list.</para></listitem>
+
<listitem><para>In the next dialog select Add button.</para></listitem>
<listitem><para>Select Hypersonic database: Hypersonic > 1.8 > Hypersonic DB.</para></listitem>
</orderedlist>
18 years, 8 months
JBoss Tools SVN: r3161 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-08-16 08:08:41 -0400 (Thu, 16 Aug 2007)
New Revision: 3161
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-744?page=all
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2007-08-16 11:28:55 UTC (rev 3160)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2007-08-16 12:08:41 UTC (rev 3161)
@@ -163,7 +163,7 @@
}
public void setAttribute(VpePageContext pageContext, Element sourceElement, Document visualDocument, Node visualNode, Object data, String name, String value) {
- setAttribute(pageContext, sourceElement, (Map)data, name, value);
+ setAttribute(pageContext, sourceElement, (Map<?,?>)data, name, value);
}
public void removeAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) {
@@ -228,7 +228,7 @@
* Deprecated
*/
public void refreshBundleValues(VpePageContext pageContext, Element sourceElement, Object data) {
- refreshBundleValues(pageContext, sourceElement, (Map) data);
+ refreshBundleValues(pageContext, sourceElement, (Map<?,?>) data);
}
private void refreshBundleValues(VpePageContext pageContext, Element sourceElement, Map visualNodeMap) {
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java 2007-08-16 11:28:55 UTC (rev 3160)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java 2007-08-16 12:08:41 UTC (rev 3161)
@@ -12,11 +12,6 @@
import java.util.Map;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeSourceDomBuilder;
import org.jboss.tools.vpe.editor.context.VpePageContext;
@@ -28,6 +23,9 @@
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMText;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
public class VpeValueCreator extends VpeAbstractCreator implements VpeOutputAttributes {
public static final String SIGNATURE_VPE_VALUE = ":vpe:value";
@@ -77,14 +75,14 @@
setValue(pageContext, sourceElement, visualNodeMap);
}
- private void setValue(VpePageContext pageContext, Element sourceElement, Map visualNodeMap) {
+ private void setValue(VpePageContext pageContext, Element sourceElement, Map<?,?> visualNodeMap) {
String value;
if (expression != null) {
value = expression.exec(pageContext, sourceElement).stringValue();
} else {
value = "";
}
- Node valueNode = (Node) visualNodeMap.get(this);
+ nsIDOMNode valueNode = (nsIDOMNode) visualNodeMap.get(this);
valueNode.setNodeValue(value);
}
18 years, 8 months
JBoss Tools SVN: r3160 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-08-16 07:28:55 -0400 (Thu, 16 Aug 2007)
New Revision: 3160
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-744?page=all, in progress
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-08-16 11:10:55 UTC (rev 3159)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-08-16 11:28:55 UTC (rev 3160)
@@ -535,7 +535,7 @@
return false;
}
- if (YES_STRING.equalsIgnoreCase(((nsIDOMElement)visualNode).getAttribute(PSEUDO_ELEMENT_ATTR))) {
+ if (YES_STRING.equalsIgnoreCase(((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)).getAttribute(PSEUDO_ELEMENT_ATTR))) {
return true;
}
@@ -1028,7 +1028,7 @@
static boolean isAnonElement(nsIDOMNode visualNode) {
if (visualNode != null && visualNode.getNodeType() == nsIDOMNode.ELEMENT_NODE) {
- String attrValue = ((nsIDOMElement)visualNode).getAttribute(MOZ_ANONCLASS_ATTR);
+ String attrValue = ((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)).getAttribute(MOZ_ANONCLASS_ATTR);
return attrValue != null && attrValue.length() > 0;
}
18 years, 8 months
JBoss Tools SVN: r3159 - trunk/documentation/GettingStartedGuide/docs/userguide/en/images.
by jbosstools-commits＠lists.jboss.org
Author: afedosik
Date: 2007-08-16 07:10:55 -0400 (Thu, 16 Aug 2007)
New Revision: 3159
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj06.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj08.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile2.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile4.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile6.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile7.png
Log:
http://jira.jboss.com/jira/browse/EXIN-394 resizing
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj06.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj08.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile2.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile4.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile6.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/connectionprofile7.png
===================================================================
(Binary files differ)
18 years, 8 months
JBoss Tools SVN: r3158 - trunk/documentation/GettingStartedGuide/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-08-16 07:08:38 -0400 (Thu, 16 Aug 2007)
New Revision: 3158
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml
trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GettingStartedWithRHDS.xml
Log:
changing font of paths
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml 2007-08-16 09:46:31 UTC (rev 3157)
+++ trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml 2007-08-16 11:08:38 UTC (rev 3158)
@@ -20,7 +20,7 @@
<section>
<title>Create a Seam Project</title>
- <para>To create a new web application in Seam, select "New > Project ... > Seam > Seam Web Project". You will be prompted to enter a name and a location directory for your new project. You will also be asked to choose a JBoss AS server to deploy the project. You must choose the JBoss AS 4.2.0 instance we had defined in the JBoss AS Server manager view.</para>
+ <para>To create a new web application in Seam, select <emphasis role="italic">New > Project ... > Seam > Seam Web Project</emphasis>. You will be prompted to enter a name and a location directory for your new project. You will also be asked to choose a JBoss AS server to deploy the project. You must choose the JBoss AS 4.2.0 instance we had defined in the JBoss AS Server manager view.</para>
<figure>
<title>Create a Seam project</title>
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GettingStartedWithRHDS.xml
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GettingStartedWithRHDS.xml 2007-08-16 09:46:31 UTC (rev 3157)
+++ trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GettingStartedWithRHDS.xml 2007-08-16 11:08:38 UTC (rev 3158)
@@ -22,13 +22,13 @@
<section id="InstallJDK50onLinux">
<title>Installing and Configuring 32-bit Sun JDK 5.0 on Linux</title>
<itemizedlist>
- <listitem><para>Download the <ulink url="http://java.sun.com/javase/downloads/index_jdk5.jsp">Sun JDK 5.0 (Java 2 Development Kit)</ulink> from Sun's website.
- Choose "JDK 5.0 Update <x>" (where x is the latest update number) for download and then select "RPM in self-extracting" file for Linux. Read the instructions on Sun's website for installing the JDK.</para></listitem>
- <listitem><para>If you don't want to use SysV service scripts you can install the "self-extracting file" for Linux instead of choosing the "RPM in self-extracting" file.
+ <listitem><para>Download the <ulink url="http://java.sun.com/javase/downloads/index_jdk5.jsp">Sun JDK 5.0 (Java 2 Development Kit)</ulink> from Sun's website.
+ Choose "JDK 5.0 Update <x>" (where x is the latest update number) for download and then select "RPM in self-extracting" file for Linux. Read the instructions on Sun's website for installing the JDK.</para></listitem>
+ <listitem><para>If you don't want to use SysV service scripts you can install the "self-extracting file" for Linux instead of choosing the "RPM in self-extracting" file.
In that case you can skip the next step mentioned here. But it is recommended to use the SysV service scripts for production servers.</para></listitem>
<listitem><para>Download and install the appropriate -compat RPM from JPackage <ulink url="ftp://jpackage.hmdc.harvard.edu/JPackage/1.7/generic/RPMS.non-free/">here</ulink>.
Please ensure you choose a matching version of the -compat package to the JDK you installed.</para></listitem>
- <listitem><para>Create an environment variable that points to the JDK installation directory and call it JAVA_HOME. Add $JAVA_HOME/bin to the system path to be able to run java from the
+ <listitem><para>Create an environment variable that points to the JDK installation directory and call it JAVA_HOME. Add <emphasis role="italic">$JAVA_HOME/bin</emphasis> to the system path to be able to run java from the
command line. You can do this by adding the following lines to the .bashrc file in your home directory.</para></listitem>
</itemizedlist>
<programlisting><![CDATA[#In this example /usr/java/jdk1.5.0_11 is the JDK installation directory.
@@ -42,7 +42,7 @@
<para>Set this variable for the user account doing the installation and also for the user account that will run the server.</para>
<itemizedlist>
- <listitem><para>If you have more than one version of JVM installed in your machine, make sure you are using the JDK1.5 installation as the default java and javac.
+ <listitem><para>If you have more than one version of JVM installed in your machine, make sure you are using the JDK 1.5 installation as the default java and javac.
You can do this using the alternatives system. The alternatives system allows different versions of Java, from different sources to co-exist on your system.</para></listitem>
</itemizedlist>
<section id="SelectAlternativesforJava">
@@ -57,7 +57,7 @@
1 /usr/lib/jvm/jre-1.4.2-gcj/bin/java
*+ 2 /usr/lib/jvm/jre-1.5.0-sun/bin/java
Enter to keep the current selection[+], or type selection number:]]></programlisting>
- <para>Make sure the Sun version [jre-1.5.0-sun in this case] is selected (marked with a '+' in the output), or select it by entering its number as prompted.</para>
+ <para>Make sure the Sun version [jre-1.5.0-sun in this case] is selected (marked with a '+' in the output), or select it by entering its number as prompted.</para>
<itemizedlist>
<listitem><para>Repeat the same for javac and java_sdk_1.5.0.</para></listitem>
</itemizedlist>
@@ -95,12 +95,12 @@
<section id="InstallJDK50onWindows">
<title>Installing and Configuring 32-bit Sun JDK 5.0 on Microsoft Windows</title>
<itemizedlist>
- <listitem><para>Download the <ulink url="http://java.sun.com/javase/downloads/index_jdk5.jsp">Sun JDK 5.0 (Java 2 Development Kit)</ulink> from Sun's website.
+ <listitem><para>Download the <ulink url="http://java.sun.com/javase/downloads/index_jdk5.jsp">Sun JDK 5.0 (Java 2 Development Kit)</ulink> from Sun's website.
Choose "JDK 5.0 Update <x>" (where x is the latest update number) for download and then select your Windows Platform options to perform the installation.</para></listitem>
<listitem><para>Create an environment variable called JAVA_HOME that points to the JDK installation directory, for example:</para></listitem>
</itemizedlist>
<programlisting><![CDATA[C:\Program Files\Java\jdk1.5.0_11\]]></programlisting>
- <para>In order to run java from the command line add the jre\bin directory to your path, for example:</para>
+ <para>In order to run java from the command line add the <emphasis role="italic">jre\bin</emphasis> directory to your path, for example:</para>
<programlisting><![CDATA[C:\Program Files\Java\jdk1.5.0_11\jre\bin]]></programlisting>
<para>To do this, open the Control Panel from the Start Menu, switch to Classic View if necessary, open the System Control Panel applet, select the Advanced Tab,
and click on the Environment Variables button.</para>
@@ -214,10 +214,10 @@
<orderedlist>
<listitem>On Red Hat based Linux distributions install the xpLib.i386 package</listitem>
-<listitem>ln -s libstdc++.so.5.0.7 libstdc++.so.5</listitem>
+<listitem>Type ln -s libstdc++.so.5.0.7 libstdc++.so.5</listitem>
<listitem>and/or use yum install libXp</listitem>
<listitem>Open the RHDS perspective. If you see the Help view open, close it and restart RHDS</listitem>
-<listitem>If none of these work, do the following
+<listitem>If none of these work, do the following:
<itemizedlist>
<listitem>Clear the Eclipse log file, <workspace>\.metadata\.log</listitem>
<listitem>Start Eclipse with the -debug option:
@@ -229,17 +229,17 @@
<para><emphasis role="bold">Do I need to have JBoss server installed to run Red Hat Developer Studio?</emphasis></para>
- <para>No. Red Hat Developer Studio already comes bundled with JBoss server. We bundle it together so that you don't need to download any
+ <para>No. Red Hat Developer Studio already comes bundled with JBoss server. We bundle it together so that you don't need to download any
additional software and can test your application in a Web browser right away.</para>
- <para>If you want to use a different JBoss server installation, after Red Hat Developer Studio is installed open Servers View (select Window > Show View > Others > Server > Servers), then right click on this view > New > Server and follow the wizards steps to point to another Jboss server installation.</para>
+ <para>If you want to use a different JBoss server installation, after Red Hat Developer Studio is installed open Servers View (select <emphasis role="italic">Window > Show View > Others > Server > Servers</emphasis>), then right click on this <emphasis role="italic">view > New > Server</emphasis> and follow the wizards steps to point to another Jboss server installation.</para>
<para>Red Hat Developer Studio works with any servlet container, not just JBoss. For more information on deployment, please see the Deploying Your Application section.</para>
</section>
<section id="Importing_Projects">
<title>Importing Projects</title>
<para><emphasis role="bold">I have an existing Struts or JSF project. Can I open the project in RHDS?</emphasis></para>
- <para>Yes. From main menu select File > Import > Other > JSF Project (or Struts Project) and follow wizards steps.</para>
+ <para>Yes. From main menu select <emphasis role="italic">File > Import > Other > JSF Project (or Struts Project)</emphasis> and follow wizards steps.</para>
<para><emphasis role="bold">Can I import a .war file?</emphasis></para>
- <para>Yes. Select File > Import > Web > WAR file. Then follow importing steps.</para>
+ <para>Yes. Select <emphasis role="italic">File > Import > Web > WAR file</emphasis> Then follow importing steps.</para>
</section>
<section id="Troubleshooting">
<title>Troubleshooting, Problems, Configuration, Error Messages</title>
18 years, 8 months
JBoss Tools SVN: r3157 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-08-16 05:46:31 -0400 (Thu, 16 Aug 2007)
New Revision: 3157
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-756
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-16 07:51:49 UTC (rev 3156)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-16 09:46:31 UTC (rev 3157)
@@ -89,9 +89,13 @@
.getString("OrmModelImageVisitor.PersistentFieldSimple_id"));
}
if (field.getValue() != null) {
- if (field.getValue() instanceof OneToOne)
+ if (field.getValue() instanceof OneToMany)
return ViewPlugin
.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldOne-to-many"));
+ else if (field.getValue() instanceof OneToOne)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
.getString("OrmModelImageVisitor.PersistentFieldOne-to-one"));
else if (field.getValue() instanceof ManyToOne)
return ViewPlugin
@@ -137,6 +141,10 @@
.getString("OrmModelImageVisitor.Collection"));
}
}
+ if("parent".equals(field.getName()))
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldParent"));
+
}
return ViewPlugin.getImageDescriptor(BUNDLE
.getString("OrmModelImageVisitor.PersistentFieldSimple"));
18 years, 8 months
JBoss Tools SVN: r3156 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-16 03:51:49 -0400 (Thu, 16 Aug 2007)
New Revision: 3156
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java
Log:
JBIDE-633
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java 2007-08-16 07:21:53 UTC (rev 3155)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java 2007-08-16 07:51:49 UTC (rev 3156)
@@ -12,10 +12,11 @@
import java.util.*;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.wst.server.core.*;
-import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.model.options.PreferenceModelUtilities;
-import org.jboss.tools.jst.web.WebPreference;
+import org.jboss.tools.jst.web.WebModelPlugin;
public class ServerManager {
private static ServerManager instance;
@@ -27,8 +28,6 @@
return instance;
}
- private XModel preferenceModel = PreferenceModelUtilities.getPreferenceModel();
- private XModelObject runningObject = preferenceModel.getByPath(WebPreference.OPTIONS_RUNNING_PATH);
private List<ServerManagerListener> listeners = new ArrayList<ServerManagerListener>();
private IServerListener serverListener;
protected IServer[] servers = new IServer[0];
@@ -49,11 +48,12 @@
}
private void loadSelectedServer() {
- String ds = WebPreference.DEFAULT_WTP_SERVER.getValue();
+ if(servers == null || servers.length == 0) return;
+ String ds = getDefaultWebServer();
IServer s = getServer(ds);
if(s == null && servers.length > 0) {
s = servers[0];
- WebPreference.DEFAULT_WTP_SERVER.setValue(servers[0].getId());
+ setDefaultWebServer(servers[0].getId());
}
setSelectedServerInternal(s);
}
@@ -90,8 +90,7 @@
IServer server = getServer(id);
if(server == selected) return;
setSelectedServerInternal(server);
- preferenceModel.changeObjectAttribute(runningObject, "Default WTP Server", id);
- preferenceModel.saveOptions();
+ setDefaultWebServer(id);
fire();
}
@@ -103,7 +102,8 @@
}
public String getSelectedServerId() {
- return WebPreference.DEFAULT_WTP_SERVER.getValue();
+ String result = getDefaultWebServer();
+ return result == null ? "" : result;
}
public IServer getSelectedServer() {
@@ -149,4 +149,34 @@
}
}
+ static String DEFAULT_WEB_SERVER = WebModelPlugin.PLUGIN_ID + ".defaultWebServer";
+
+ static String getDefaultWebServer() {
+ String result = getInstancePreference(DEFAULT_WEB_SERVER);
+ return result;
+ }
+
+ static void setDefaultWebServer(String value) {
+ getInstancePreferences().put(DEFAULT_WEB_SERVER, value);
+ }
+
+ static IEclipsePreferences getInstancePreferences() {
+ return new InstanceScope().getNode(WebModelPlugin.PLUGIN_ID);
+ }
+
+ static IEclipsePreferences getDefaultPreferences() {
+ return new DefaultScope().getNode(WebModelPlugin.PLUGIN_ID);
+ }
+
+ static String getInstancePreference(String key) {
+ IEclipsePreferences p = getInstancePreferences();
+ String value = p == null ? null : p.get(key, null);
+ return value != null ? value : getDefaultPreference(key);
+ }
+
+ static String getDefaultPreference(String key) {
+ IEclipsePreferences p = getDefaultPreferences();
+ return p == null ? null : p.get(key, null);
+ }
+
}
18 years, 8 months
JBoss Tools SVN: r3155 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-16 03:21:53 -0400 (Thu, 16 Aug 2007)
New Revision: 3155
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/ExtensionManager.java
Log:
try/catch added
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/ExtensionManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/ExtensionManager.java 2007-08-16 02:12:27 UTC (rev 3154)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/ExtensionManager.java 2007-08-16 07:21:53 UTC (rev 3155)
@@ -21,6 +21,7 @@
*/
package org.jboss.ide.eclipse.as.ui;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -59,11 +60,15 @@
// Create the extensions from the registry
IExtensionRegistry registry = Platform.getExtensionRegistry();
IConfigurationElement[] elements = registry.getConfigurationElementsFor(JBossServerUIPlugin.PLUGIN_ID, "ServerViewExtension");
- serverViewExtensions = new ServerViewProvider[elements.length];
+ ArrayList list = new ArrayList();
for( int i = 0; i < elements.length; i++ ) {
- serverViewExtensions[i] = new ServerViewProvider(elements[i]);
- //serverViewExtensions[i].setEnabled(true);
+ try {
+ list.add(new ServerViewProvider(elements[i]));
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
+ serverViewExtensions = (ServerViewProvider[]) list.toArray(new ServerViewProvider[list.size()]);
}
}
18 years, 8 months
JBoss Tools SVN: r3154 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server: providers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-15 22:12:27 -0400 (Wed, 15 Aug 2007)
New Revision: 3154
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java
Log:
JBIDE-707
API changed to allow listeners to be added before the view is instantiated.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java 2007-08-16 01:23:25 UTC (rev 3153)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java 2007-08-16 02:12:27 UTC (rev 3154)
@@ -1,7 +1,11 @@
package org.jboss.ide.eclipse.as.ui.views.server;
+import java.util.ArrayList;
+import java.util.Iterator;
+
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.graphics.Color;
@@ -17,12 +21,29 @@
public class JBossServerView extends ViewPart {
- private static final String TAG_SASHFORM_HEIGHT = "sashformHeight";
+ private static final String TAG_SASHFORM_HEIGHT = "sashformHeight";
+
public static JBossServerView instance;
+ private static ArrayList serverFrameListeners = new ArrayList();
+ private static ArrayList extensionFrameListeners = new ArrayList();
+
public static JBossServerView getDefault() {
return instance;
}
+ public static void addServerFrameListener(ISelectionChangedListener listener) {
+ if( !serverFrameListeners.contains(listener))
+ serverFrameListeners.add(listener);
+ if( getDefault() != null )
+ getDefault().getServerFrame().getViewer().addSelectionChangedListener(listener);
+ }
+ public static void addExtensionFrameListener(ISelectionChangedListener listener) {
+ if( !extensionFrameListeners.contains(listener))
+ extensionFrameListeners.add(listener);
+ if( getDefault() != null )
+ getDefault().getExtensionFrame().getViewer().addSelectionChangedListener(listener);
+ }
+
public static interface IServerViewFrame {
public IAction[] getActionBarActions();
public int getDefaultSize();
@@ -34,7 +55,6 @@
instance = this;
}
-
private SashForm form;
private int[] sashRows;
private IMemento memento;
@@ -95,6 +115,14 @@
}
form.setWeights(sashRows);
+
+
+ // if the extensions have already been created, add those listeners now.
+ Iterator k;
+ for(k = serverFrameListeners.iterator(); k.hasNext();)
+ serverFrame.getViewer().addSelectionChangedListener(((ISelectionChangedListener)k.next()));
+ for(k = extensionFrameListeners.iterator(); k.hasNext();)
+ extensionFrame.getViewer().addSelectionChangedListener(((ISelectionChangedListener)k.next()));
}
public void refreshAll() {
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-08-16 01:23:25 UTC (rev 3153)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java 2007-08-16 02:12:27 UTC (rev 3154)
@@ -85,12 +85,12 @@
}
protected void addListeners() {
- JBossServerView.getDefault().getExtensionFrame().getViewer().
- addSelectionChangedListener(new ISelectionChangedListener() {
+ JBossServerView.addExtensionFrameListener(
+ new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
activatePropertiesView();
- }
- });
+ }
+ });
}
protected void activatePropertiesView() {
18 years, 8 months
JBoss Tools SVN: r3153 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-15 21:23:25 -0400 (Wed, 15 Aug 2007)
New Revision: 3153
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java
Log:
Default shutdown poller switched to server process terminated poller, which waits until the process has finished.
Fixes JBIDE-747
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java 2007-08-16 01:16:19 UTC (rev 3152)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java 2007-08-16 01:23:25 UTC (rev 3153)
@@ -505,8 +505,8 @@
// poller
stopPollerCombo.setEnabled(true);
startPollerCombo.setEnabled(true);
- String currentStartId = helper.getAttribute(IServerPollingAttributes.STARTUP_POLLER_KEY, IServerPollingAttributes.DEFAULT_POLLER);
- String currentStopId = helper.getAttribute(IServerPollingAttributes.SHUTDOWN_POLLER_KEY, IServerPollingAttributes.DEFAULT_POLLER);
+ String currentStartId = helper.getAttribute(IServerPollingAttributes.STARTUP_POLLER_KEY, IServerPollingAttributes.DEFAULT_STARTUP_POLLER);
+ String currentStopId = helper.getAttribute(IServerPollingAttributes.SHUTDOWN_POLLER_KEY, IServerPollingAttributes.DEFAULT_SHUTDOWN_POLLER);
startPollerCombo.select(startPollerCombo.indexOf(ExtensionManager.getDefault().getPollerType(currentStartId).getName()));
stopPollerCombo.select(stopPollerCombo.indexOf(ExtensionManager.getDefault().getPollerType(currentStopId).getName()));
}
18 years, 8 months