JBoss Tools SVN: r2839 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2007-08-02 06:54:34 -0400 (Thu, 02 Aug 2007)
New Revision: 2839
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/MethodDescriptor.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java
Log:
Type structure processed using IType instead of java.lang.Class
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/MethodDescriptor.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/MethodDescriptor.java 2007-08-02 10:26:07 UTC (rev 2838)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/MethodDescriptor.java 2007-08-02 10:54:34 UTC (rev 2839)
@@ -10,71 +10,92 @@
******************************************************************************/
package org.jboss.tools.struts.model.helpers;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
+import org.eclipse.jdt.core.Flags;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
-
-public class MethodDescriptor
-{
- private Constructor constructor;
+public class MethodDescriptor {
+ private IMethod constructor;
- public MethodDescriptor(Constructor constructor)
- {
+ public MethodDescriptor(IMethod constructor) {
this.constructor = constructor;
}
- public String getName()
- {
- return constructor.getName();
+ public String getName() {
+ return constructor.getElementName();
}
- public String getParameters()
- {
+ public String getParameters() {
StringBuffer result = new StringBuffer();
- Class parameters[] = constructor.getParameterTypes();
- for (int i = 0; i < parameters.length; i++)
- result.append('p').append(i).append((i == parameters.length - 1) ? "" : ", ");
+ String[] ps = constructor.getParameterTypes();
+
+ for (int i = 0; i < ps.length; i++) {
+ String type = EclipseJavaUtil.resolveType(constructor.getDeclaringType(), ps[i]);
+ if(type == null) type = ps[i];
+ result.append('p').append(i).append((i == ps.length - 1) ? "" : ", ");
+ }
return result.toString();
}
- public String getParametersWithType()
- {
+ public String getParametersWithType() {
StringBuffer result = new StringBuffer();
- Class parameters[] = constructor.getParameterTypes();
- for (int i = 0; i < parameters.length; i++)
- {
- if (parameters[i].isArray())
- result.append(parameters[i].getComponentType().getName()).append("[]");
- else
- result.append(parameters[i].getName());
+ String[] ps = constructor.getParameterTypes();
+
+ for (int i = 0; i < ps.length; i++) {
+ String type = EclipseJavaUtil.resolveType(constructor.getDeclaringType(), ps[i]);
+ if(type == null) type = ps[i];
+ type = convertType(type);
+ result.append(type);
result.append(' ').append('p').append(i);
- if (i < parameters.length - 1) result.append(", ");
+ if (i < ps.length - 1) result.append(", ");
}
return result.toString();
}
+ private String convertType(String type) {
+ String postfix = "";
+ while(type.startsWith("[")) {
+ postfix += "[]";
+ type = type.substring(1);
+ }
+ if(type.startsWith("L") && type.endsWith(";")) {
+ return type.substring(1, type.length() - 1) + postfix;
+ }
+ if(type.equals("I")) {
+ type = "int";
+ }
+ return type + postfix;
+ }
+
public String getModifiers()
{
StringBuffer result = new StringBuffer();
- int modifiers = constructor.getModifiers();
+ int modifiers = 0;
+ try {
+ modifiers = constructor.getFlags();
+ } catch (JavaModelException e) {
+ //ignore
+ }
- if ((Modifier.PUBLIC & modifiers) != 0)
+ if (Flags.isPublic(modifiers))
result.append("public");
- else if ((Modifier.PRIVATE & modifiers) != 0)
+ else if (Flags.isPrivate(modifiers))
result.append("private");
- else if ((Modifier.PROTECTED & modifiers) != 0)
+ else if (Flags.isProtected(modifiers))
result.append("protected");
- if ((Modifier.STATIC & modifiers) != 0)
+ if (Flags.isStatic(modifiers))
result.append(result.length() > 0 ? " " : "").append("static");
- if ((Modifier.FINAL & modifiers) != 0)
+ if (Flags.isFinal(modifiers))
result.append(result.length() > 0 ? " " : "").append("final");
return result.toString();
}
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java 2007-08-02 10:26:07 UTC (rev 2838)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java 2007-08-02 10:54:34 UTC (rev 2839)
@@ -10,7 +10,6 @@
import java.io.File;
import java.io.FileWriter;
import java.io.Writer;
-import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -26,12 +25,19 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.model.ServiceDialog;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.struts.StrutsConstants;
import org.jboss.tools.struts.StrutsModelPlugin;
import org.jboss.tools.struts.messages.StrutsUIMessages;
@@ -97,7 +103,7 @@
if (!checkOverwrite(source, forward.getModel())) return null;
targetPath = source.getAbsolutePath();
- ArrayList properties = getProperties(forward, genProps);
+ ArrayList<PropertyDescriptor> properties = getProperties(forward, genProps);
Map<String,Object> parameters = getParameters(forward, className, baseClass, properties);
executeTemplate(parameters, templatePath, targetPath);
@@ -120,7 +126,7 @@
if (!checkOverwrite(source, exception.getModel())) return null;
targetPath = source.getAbsolutePath();
- ArrayList properties = getProperties(exception, genProps);
+ ArrayList<PropertyDescriptor> properties = getProperties(exception, genProps);
Map<String,Object> parameters = getParameters(exception, className, baseClass, properties);
parameters.put("constructors", getConstructors(exception, baseClass)); //$NON-NLS-1$
@@ -145,7 +151,7 @@
if (!checkOverwrite(source, formBean.getModel())) return null;
targetPath = source.getAbsolutePath();
- ArrayList properties = getProperties(formBean, genProps);
+ ArrayList<PropertyDescriptor> properties = getProperties(formBean, genProps);
Map<String,Object> parameters = getParameters(formBean, className, baseClass, properties);
executeTemplate(parameters, templatePath, targetPath);
@@ -173,7 +179,7 @@
return velocityEngine;
}
- private void executeTemplate(Map parameters, String templatePath, String targetPath) {
+ private void executeTemplate(Map<String,Object> parameters, String templatePath, String targetPath) {
ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService();
try {
VelocityContext context = new VelocityContext(parameters);
@@ -234,7 +240,7 @@
if (!checkOverwrite(source, action.getModel())) return null;
targetPath = source.getAbsolutePath();
- ArrayList<Object> properties = getProperties(action, genProps);
+ ArrayList<PropertyDescriptor> properties = getProperties(action, genProps);
ArrayList<Object> globalForwards = null;
if (genGlobal) {
@@ -269,16 +275,22 @@
return className;
}
- private List getConstructors(XModelObject object, String baseClass)
- {
- List<Object> constructors = new ArrayList<Object>();
+ private List<MethodDescriptor> getConstructors(XModelObject object, String baseClass) {
+ List<MethodDescriptor> constructors = new ArrayList<MethodDescriptor>();
- ClassLoader classLoader = object.getModel().getModelClassLoader();
try {
- Class classObject = classLoader.loadClass(baseClass);
- Constructor constr[] = classObject.getConstructors();
- for (int i = 0; i < constr.length; i++) constructors.add(new MethodDescriptor(constr[i]));
- } catch (ClassNotFoundException ex) {
+ IJavaProject javaProject = EclipseResourceUtil.getJavaProject(EclipseResourceUtil.getProject(object));
+ IType type = EclipseJavaUtil.findType(javaProject, baseClass);
+ if(type == null) return constructors;
+ IJavaElement[] ch = type.getChildren();
+ for (int i = 0; i < ch.length; i++) {
+ if(!(ch[i] instanceof IMethod)) continue;
+ IMethod method = (IMethod)ch[i];
+ if(!method.isConstructor()) continue;
+ constructors.add(new MethodDescriptor(method));
+
+ }
+ } catch (JavaModelException ex) {
StrutsModelPlugin.getPluginLog().logError(ex);
}
@@ -332,7 +344,7 @@
return (ind > 0) ? fullName.substring(0, ind) : ""; //$NON-NLS-1$
}
- private Map<String,Object> getParameters(XModelObject o, String className, String baseClass, ArrayList properties) {
+ private Map<String,Object> getParameters(XModelObject o, String className, String baseClass, ArrayList<PropertyDescriptor> properties) {
Map<String,Object> parameters = new HashMap<String,Object>();
parameters.put("package", getPackageName(className)); //$NON-NLS-1$
parameters.put("className", getClassName(className)); //$NON-NLS-1$
@@ -341,10 +353,10 @@
return parameters;
}
- private ArrayList<Object> getProperties(XModelObject o, boolean genProps) {
- ArrayList<Object> p = null;
+ private ArrayList<PropertyDescriptor> getProperties(XModelObject o, boolean genProps) {
+ ArrayList<PropertyDescriptor> p = null;
if (genProps) {
- p = new ArrayList<Object>();
+ p = new ArrayList<PropertyDescriptor>();
XModelObject[] props = o.getChildren(ENT_SETPROPERTY); /// one entity for both versions
for (int i = 0; i < props.length; i++) {
String name = props[i].getAttributeValue(ATT_PROPERTY);
16 years, 8 months
JBoss Tools SVN: r2838 - trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2007-08-02 06:26:07 -0400 (Thu, 02 Aug 2007)
New Revision: 2838
Added:
trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images/bg_table.gif
trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images/ico_important.gif
trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images/ico_note.gif
Log:
http://jira.jboss.com/jira/browse/EXIN-403
Added: trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images/bg_table.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images/bg_table.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images/ico_important.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images/ico_important.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images/ico_note.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/resources/styles/en/Images/ico_note.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 8 months
JBoss Tools SVN: r2836 - in trunk/documentation/GettingStartedGuide/docs: build and 5 other directories.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2007-08-02 06:23:38 -0400 (Thu, 02 Aug 2007)
New Revision: 2836
Added:
trunk/documentation/GettingStartedGuide/docs/build/
trunk/documentation/GettingStartedGuide/docs/build/usersguide/
trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/
trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/
trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/
trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/
trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/bg_table.gif
trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/ico_important.gif
trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/ico_note.gif
Log:
http://jira.jboss.com/jira/browse/EXIN-403
Added: trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/bg_table.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/bg_table.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/ico_important.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/ico_important.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/ico_note.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/GettingStartedGuide/docs/build/usersguide/en/html/css/images/ico_note.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 8 months
JBoss Tools SVN: r2834 - in trunk/documentation/GettingStartedGuide/docs/resources: styles/en and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2007-08-02 05:57:09 -0400 (Thu, 02 Aug 2007)
New Revision: 2834
Modified:
trunk/documentation/GettingStartedGuide/docs/resources/styles/en/html.css
trunk/documentation/GettingStartedGuide/docs/resources/support.xml
Log:
http://jira.jboss.com/jira/browse/EXIN-403
Special text paragraphs framing
Modified: trunk/documentation/GettingStartedGuide/docs/resources/styles/en/html.css
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/resources/styles/en/html.css 2007-08-02 08:33:17 UTC (rev 2833)
+++ trunk/documentation/GettingStartedGuide/docs/resources/styles/en/html.css 2007-08-02 09:57:09 UTC (rev 2834)
@@ -1,390 +1,335 @@
* {
-font-family:verdana, helvetica, sans-serif;
-line-height:20px;
+ LINE-HEIGHT: 20px; FONT-FAMILY: verdana, helvetica, sans-serif
}
-
-div.navheader table {
-margin:0px;
-border:0px;
+DIV.navheader TABLE, DIV.navheader TABLE td, DIV.navfooter TABLE, DIV.navfooter TABLE td{
+ BORDER-RIGHT: 0px; BORDER-TOP: 0px; MARGIN: 0px; BORDER-LEFT: 0px; BORDER-BOTTOM: 0px; FONT-SIZE: 11px; padding : 0px;
}
-
-div.navfooter table {
-margin:0px;
-border:0px;
-}
-
-
A {
- FONT-SIZE: 12px;
- COLOR: #2A7BD4;
- FONT-FAMILY: verdana, helvetica, sans-serif;
+ COLOR: #2a7bd4; FONT-FAMILY: verdana, helvetica, sans-serif
}
-
A:hover {
- FONT-SIZE: 12px;
- COLOR: #003399;
- FONT-FAMILY: verdana, helvetica, sans-serif
+ COLOR: #003399; FONT-FAMILY: verdana, helvetica, sans-serif
}
-
A:visited {
- font-family:verdana, helvetica, sans-serif;
- color: #888888;
- font-size:12px;
+ COLOR: #888888; FONT-FAMILY: verdana, helvetica, sans-serif
}
-
-P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
- color: #000000;
- font-size:12px;
+P {
+ FONT-SIZE: 12px; COLOR: #000000; margin : 5px 0px 5px 0px;
}
-
-TD, TH, SPAN {
- color: #000000;
+OL {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
}
-
+UL {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+LI {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+DL {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+DT {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+DD {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+BLOCKQUOTE {
+ FONT-SIZE: 12px; COLOR: #000000
+}
+TD {
+ COLOR: #000000
+}
+TH {
+ COLOR: #000000
+}
+SPAN {
+ COLOR: #000000
+}
SPAN.property {
- font-family: Verdana, Helvetica, sans-serif;
- color: #008CCA;
+ COLOR: #008cca;
}
-
SPAN.italic {
- font-family: Verdana, Helvetica, sans-serif;
- font-style:italic;
-
+ FONT-STYLE: italic;
}
-SPAN.bold {
- font-family: Verdana, Helvetica, sans-serif;
- font-style:bold;
-}
-
BLOCKQUOTE {
- margin-right: 0px;
+ MARGIN-RIGHT: 0px
}
-div.titlepage div.mediaobject{
-text-align:center;
+P.title {
+ MARGIN-BOTTOM: 5px;
+ MARGIN-top: 20px;
}
-div.mediaobject, div.mediaobject img{
-text-align:left;
+div.book div.chapter .title {
+ text-align: left;
+}
+
+div.book .title {
+ text-align: center;
}
+.mediaobject{
+ padding : 5px 10px 5px 35px;
+}
H1 {
- color: #FF6600;
- padding-top:30px;
- MARGIN-TOP: 0px;
- FONT-SIZE: 22px;
- PADDING-TOP: 15px;
+ MARGIN: 0px; FONT-SIZE: 22px; COLOR: #ff6600; PADDING: 45px 0px 10px 0px;
}
-
H2 {
- MARGIN-TOP: 10px;
- FONT-SIZE: 18px;
- COLOR: #2A7BD4;
- PADDING-TOP: 20px
+ MARGIN: 0px; FONT-SIZE: 18px; COLOR: #2a7bd4; PADDING: 25px 0px 10px 0px;
}
-
H3 {
- MARGIN-TOP: 15px;
- FONT-SIZE: 16px;
- COLOR: #000000;
- PADDING-TOP: 5px
+ MARGIN: 0px; FONT-SIZE: 15px; COLOR: #000000; PADDING: 20px 0px 10px 0px;
}
-
H4 {
- MARGIN-TOP: 10px;
- FONT-SIZE: 12px;
- COLOR: #000000;
- PADDING-TOP: 15px
+ MARGIN: 0px; FONT-SIZE: 12px; COLOR: #000000; PADDING: 15px 0px 10px 0px;
}
H5 {
- MARGIN-TOP: 10px;
- FONT-SIZE: 12px;
- COLOR: #000000;
- PADDING-TOP: 15px
+ MARGIN: 0px; FONT-SIZE: 12px; COLOR: #000000; PADDING: 15px 0px 10px 0px;
}
-
H6 {
- MARGIN-TOP: 10px;
- FONT-SIZE: 12px;
- COLOR: #000000;
- PADDING-TOP:15px;
+ MARGIN: 0px; FONT-SIZE: 11px; COLOR: #000000; PADDING: 5px 0px 0px 0px;
}
-div.note {
- FONT-SIZE: 12px;
- Color:#000000;
- width:500px;
- text-align:justify;
- font-family:Verdana, Arial, Helvetica, sans-serif;
- border-style:solid;
- border-width:1px;
- border-left-color:#CCCCCC;
- border-top-color:#CCCCCC;
- border-right-color: #CCCCCC;
- border-bottom-color: #CCCCCC;
- background-color: #F4F4F4;
- PADDING-LEFT:1em;
- PADDING-RIGHT:1em;
- PADDING-TOP:0px;
- PADDING-BOTTOM:0px;
- MARGIN-BOTTOM:0px;
- MARGIN-TOP:0px;
+div.book div.section div.mediaobject{
+text-align:left;
}
-.note .title, .important .title {
-MARGIN-BOTTOM:0px;
-MARGIN-TOP:0px;
-MARGIN-BOTTOM:0px;
-MARGIN-TOP:0px;
-PADDING-LEFT:0px;
-PADDING-RIGHT:0px;
-PADDING-TOP:1em;
-PADDING-BOTTOM:5px;
-}
-.note p, .important p {
- PADDING-TOP:0px;
- PADDING-BOTTOM:0px;
- MARGIN-BOTTOM:1em;
- MARGIN-TOP:0px;
+div.book div.mediaobject{
+text-align:center;
}
-div.important {
- FONT-SIZE: 12px;
- Color:#000000;
- width:500px;
- text-align:justify;
- font-family:Verdana, Arial, Helvetica, sans-serif;
- border-style:solid;
- border-width:1px;
- border-left-color:#2A7BD4;
- border-top-color:#2A7BD4;
- border-right-color:#2A7BD4;
- border-bottom-color:#2A7BD4;
- PADDING-LEFT:1em;
- PADDING-RIGHT:1em;
- PADDING-TOP:0px;
- PADDING-BOTTOM:0px;
- MARGIN-BOTTOM:0px;
- MARGIN-TOP:0px;
+div.mediaobject, div.mediaobject img *{
+text-align:left;
+
}
-
-TABLE {
- font-family:Verdana, Arial, Helvetica, sans-serif;
- font-size:12px;
- text-align:justify;
- border-collapse: collapse;
- border-spacing:0;
- border-bottom-width:1px;
- border-top-width:1px;
- border-left-width:1px;
- border-right-width:1px;
- border-left-color:#d8e7f8;
- border-right-color:#d8e7f8;
- border-top-color:#CCCCCC;
- border-bottom-color:#CCCCCC;
- empty-cells: hide;
- border-style: solid;
+DIV.note{
+ BORDER: #CECECE 1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px; MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #FFFDD3;
+ background-image : url('Images/ico_note.gif'); background-repeat : no-repeat; background-position :top left;
}
-.table TH {
- background-color:#d8e7f8;
- text-align:center;
- white-space:nowrap;
+DIV.note *{
+ line-height : 14px;
}
-ul, li {
-list-style-type: disc;
-
-list-style-position:inside;
+.note P {
+ MARGIN-TOP: 0px; MARGIN-BOTTOM: 1em; PADDING-BOTTOM: 0px; PADDING-TOP: 0px
}
+.important P {
+ MARGIN-TOP: 0px; MARGIN-BOTTOM: 1em; PADDING-BOTTOM: 0px; PADDING-TOP: 0px
+}
+DIV.important {
+ BORDER: #CECECE 1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px; MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #CFE3FF;
+ background-image : url('Images/ico_important.gif'); background-repeat : no-repeat; background-position :top left;
+}
-div.table {
- width:800px;
+DIV.important *{
+ line-height : 14px;
}
+.important pre.XML {
+PADDING: 1px 1px 1px 10px;
-TD {
- padding: 4pt;
}
-H1 { font-size: 140%; }
-H2 { font-size: 120%; }
-H3 { font-size: 100%; }
-H4 { font-size: 100%; }
-H5 { font-size: 100%; }
-H6 { font-size: 100%; }
+TABLE {
+ BORDER: #cccccc 1px solid; FONT-SIZE: 11px; BORDER-COLLAPSE: collapse; border-spacing: 0; empty-cells: hide; margin-bottom : 10px;
+}
-p.copyright {
- text-align:center
+table *{
+ line-height : 14px;
}
+.table TH {
+ WHITE-SPACE: nowrap; BACKGROUND-COLOR: #EEF5FF; TEXT-ALIGN: center; BORDER-BOTTOM: #CAE1FF 2px solid; PADDING: 2px 8px 2px 8px;
+ background-image : url('Images/bg_table.gif'); background-repeat : repeat-x; background-position :top left;
+}
+TD {
+ PADDING: 4px 8px 4px 8px; BORDER-BOTTOM: #cccccc 1px dotted; BORDER-right: #cccccc 1px dotted;
+}
+P.copyright {
+ TEXT-ALIGN: center
+}
TT {
-font-size: 90%;
- font-family: "Courier New", Courier, monospace;
- color: #000000;
+ FONT-SIZE: 90%; COLOR: #000000; FONT-FAMILY: "Courier New", Courier, monospace
}
-
-dl, dt, dd{margin-left : 8; margin-bottom : 6;}
-
+DL {
+ MARGIN-BOTTOM: 6px; MARGIN-LEFT: 8px
+}
+DT {
+ MARGIN-BOTTOM: 6px; MARGIN-LEFT: 8px
+}
+DD {
+ MARGIN-BOTTOM: 6px; MARGIN-LEFT: 8px
+}
PRE {
-
- font-family:Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- padding: 5px;
- border-style: solid;
- border-width: 1px;
- border-left-color:#2A7BD4;
- border-top-color:#2A7BD4;
- border-right-color: #CCCCCC;
- border-bottom-color: #CCCCCC;
- background-color: #F4F4F4;
- width:800px;
+ BORDER: #cccccc 1px solid; PADDING: 5px 15px 5px 25px; FONT-SIZE: 11px; BACKGROUND-COLOR: #f5f5f5;
}
-
-UL LI {
- PADDING-LEFT: 20px; LIST-STYLE-TYPE: disc
+HR {
+ BORDER-TOP-WIDTH: 0px; PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BORDER-LEFT-WIDTH: 0px; BORDER-BOTTOM-WIDTH: 0px; PADDING-BOTTOM: 0px; WIDTH: 100%; COLOR: #cccccc; PADDING-TOP: 0px; HEIGHT: 1px; BACKGROUND-COLOR: #cccccc; BORDER-RIGHT-WIDTH: 0px
}
-
-OL LI {
- PADDING-LEFT: 20px; LIST-STYLE-TYPE: decimal
+.variablelist {
+ PADDING-BOTTOM: 10px; MARGIN: 0px; PADDING-TOP: 10px
}
-
-HR {
- BORDER-TOP-WIDTH: 0px;
- PADDING-RIGHT: 0px;
- PADDING-LEFT: 0px;
- BORDER-LEFT-WIDTH: 0px;
- BORDER-BOTTOM-WIDTH: 0px;
- PADDING-BOTTOM: 0px;
- WIDTH: 100%;
- COLOR: #cccccc;
- PADDING-TOP: 0px;
- HEIGHT: 1px;
- BACKGROUND-COLOR: #cccccc;
- BORDER-RIGHT-WIDTH: 0px
+.itemizedlist {
+ FONT-SIZE: 12px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px;TEXT-ALIGN: justify
}
-
-.variablelist {
- padding-top: 10px;
- padding-bottom:10px;
- margin:0;
+.term {
+ FONT-WEIGHT: bold
}
-
-.itemizedlist, UL {
- font-family:Verdana, Arial, Helvetica, sans-serif;
- font-size:12px;
- padding-top: 0;
- padding-bottom:0;
- margin:0;
- text-align:justify;
+PRE.JAVA {
+ LINE-HEIGHT: 0px
}
-
-.itemizedlist, li {
-list-style-position:outside;
+PRE.XML {
+ LINE-HEIGHT: 0px
}
-
-.term {
- font-weight:bold;
+PRE.JSP {
+ LINE-HEIGHT: 0px
}
-
-pre.JAVA, pre.XML, pre.JSP, pre.XHTML {
- line-height:0px;
+PRE.XHTML {
+ LINE-HEIGHT: 0px
}
-
.java_type {
-color:#008CCA;
+ COLOR: #008cca
}
.java_keyword {
-color: rgb(0,0,0); font-weight: bold;
+ FONT-WEIGHT: bold; COLOR: rgb(0,0,0)
}
.java_javadoc_comment {
-color: rgb(147,147,147); background-color: rgb(247,247,247); font-style: italic;
+ COLOR: rgb(147,147,147); FONT-STYLE: italic; BACKGROUND-COLOR: rgb(247,247,247)
}
.java_comment {
-color: rgb(147,147,147); background-color: rgb(247,247,247);
+ COLOR: rgb(147,147,147); BACKGROUND-COLOR: rgb(247,247,247)
}
.java_operator {
-color: #003399;
+ COLOR: #003399
}
.java_plain {
-color: rgb(0,0,0);
+ COLOR: rgb(0,0,0)
}
.java_literal {
-color:#FF6600;
+ COLOR: #ff6600
}
-pre code {
- color: rgb(0,0,0); font-family: monospace; font-size: 12px; white-space: nowrap;
+PRE CODE {
+ FONT-SIZE: 12px; COLOR: rgb(0,0,0); FONT-FAMILY: monospace; WHITE-SPACE: nowrap
}
.java_javadoc_tag {
-color: rgb(147,147,147); background-color: rgb(247,247,247); font-style: italic; font-weight: bold;
+ FONT-WEIGHT: bold; COLOR: rgb(147,147,147); FONT-STYLE: italic; BACKGROUND-COLOR: rgb(247,247,247)
}
.java_separator {
-color:#008CCA;
+ COLOR: #008cca
}
.xml_plain {
-color: rgb(0,0,0);
+ COLOR: rgb(0,0,0)
}
.xml_tag_name {
-color: #008CCA;
+ COLOR: #008cca
}
.xml_comment {
-color: rgb(147,147,147); background-color: rgb(247,247,247);
+ COLOR: rgb(147,147,147); BACKGROUND-COLOR: rgb(247,247,247)
}
.xml_tag_symbols {
-color:#008CCA;
+ COLOR: #008cca
}
.xml_rife_tag {
-color: rgb(0,0,0); background-color: rgb(228,230,160);
+ COLOR: rgb(0,0,0); BACKGROUND-COLOR: rgb(228,230,160)
}
.xml_attribute_value {
-color:#FF6600
+ COLOR: #ff6600
}
-
.xml_attribute_name {
-color: rgb(0,0,0); font-weight: bold;
+ FONT-WEIGHT: bold; COLOR: rgb(0,0,0)
}
.xml_char_data {
-color: rgb(0,0,0);
+ COLOR: rgb(0,0,0)
}
.xml_rife_name {
-color:#008CCA; background-color: rgb(228,230,160);
+ COLOR: #008cca; BACKGROUND-COLOR: rgb(228,230,160)
}
.xml_processing_instruction {
-color: rgb(0,0,0); font-weight: bold; font-style: italic;
+ FONT-WEIGHT: bold; COLOR: rgb(0,0,0); FONT-STYLE: italic
}
-
-.book .titlepage .title {
- text-align:center;
+TD.java {
+ VERTICAL-ALIGN: top; LINE-HEIGHT: 10px
}
-
-.book .chapter .title {
- text-align:left;
+TD.java-ln {
+ VERTICAL-ALIGN: top; LINE-HEIGHT: 10px
}
-
-td.java, td.java-ln {vertical-align:top; line-height:10px;}
-tt.java, tt.java-ln, pre.java, pre.java-ln {line-height:1em; margin-bottom:0em;line-height:10px;}
-td.java-ln { text-align:right; line-height:10px;}
-tt.java-ln, pre.java-ln { color:#888888; line-height:10px;}
-/* Background */ span.java0 { font-size: 8pt; color:#ffffff; line-height:10px;}
-/* Line numbers */ span.java1 { font-size: 8pt; color:#808080; }
-/* Multi-line comments */ span.java2 { font-size: 8pt; color:#3f7f5f; line-height:10px;}
-/* Single-line comments */ span.java3 { font-size: 8pt; color:#3f7f5f; line-height:10px;}
-/* Keywords */ span.java4 { font-size: 8pt; color:#FF6600; font-weight:bold; line-height:10px;}
-/* Strings */ span.java5 { font-size:8pt; color:#2a00ff; line-height:10px;}
-/* Character constants */ span.java6 { font-size: 8pt; color:#990000; line-height:10px;}
-/* Numeric constants */ span.java7 { font-size: 8pt; color:#990000; line-height:10px;}
-/* Parenthesis */ span.java8 { font-size: 8pt; color:#000000; line-height:10px;}
-/* Primitive Types */ span.java9 { font-size: 8pt; color:#FF6600; font-weight:bold; line-height:10px;}
-/* Others */ span.java10 { font-size: 8pt; color:#000000; line-height:10px;}
-/* Javadoc keywords */ span.java11 { font-size: 8pt; color:#7f9fbf; line-height:10px;}
-/* Javadoc HTML tags */ span.java12 { font-size: 8pt; color:#7f7f9f; line-height:10px;}
-/* Javadoc links */ span.java13 { font-size: 8pt; color:#3f3fbf; line-height:10px;}
-/* Javadoc others */ span.java14 { font-size: 8pt; color:#3f5fbf; line-height:10px;}
-/* Undefined */ span.java15 { font-size: 8pt; color:#ff6100; line-height:10px;}
-/* Annotation */ span.java16 { font-size: 8pt; color:#646464; line-height:10px;}
\ No newline at end of file
+TT.java {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+TT.java-ln {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+PRE.java {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+PRE.java-ln {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+TD.java-ln {
+ LINE-HEIGHT: 10px; TEXT-ALIGN: right
+}
+TT.java-ln {
+ COLOR: #888888; LINE-HEIGHT: 10px
+}
+PRE.java-ln {
+ COLOR: #888888; LINE-HEIGHT: 10px
+}
+SPAN.java0 {
+ FONT-SIZE: 8pt; COLOR: #ffffff; LINE-HEIGHT: 10px
+}
+SPAN.java1 {
+ FONT-SIZE: 8pt; COLOR: #808080
+}
+SPAN.java2 {
+ FONT-SIZE: 8pt; COLOR: #3f7f5f; LINE-HEIGHT: 10px
+}
+SPAN.java3 {
+ FONT-SIZE: 8pt; COLOR: #3f7f5f; LINE-HEIGHT: 10px
+}
+SPAN.java4 {
+ FONT-WEIGHT: bold; FONT-SIZE: 8pt; COLOR: #ff6600; LINE-HEIGHT: 10px
+}
+SPAN.java5 {
+ FONT-SIZE: 8pt; COLOR: #2a00ff; LINE-HEIGHT: 10px
+}
+SPAN.java6 {
+ FONT-SIZE: 8pt; COLOR: #990000; LINE-HEIGHT: 10px
+}
+SPAN.java7 {
+ FONT-SIZE: 8pt; COLOR: #990000; LINE-HEIGHT: 10px
+}
+SPAN.java8 {
+ FONT-SIZE: 8pt; COLOR: #000000; LINE-HEIGHT: 10px
+}
+SPAN.java9 {
+ FONT-WEIGHT: bold; FONT-SIZE: 8pt; COLOR: #ff6600; LINE-HEIGHT: 10px
+}
+SPAN.java10 {
+ FONT-SIZE: 8pt; COLOR: #000000; LINE-HEIGHT: 10px
+}
+SPAN.java11 {
+ FONT-SIZE: 8pt; COLOR: #7f9fbf; LINE-HEIGHT: 10px
+}
+SPAN.java12 {
+ FONT-SIZE: 8pt; COLOR: #7f7f9f; LINE-HEIGHT: 10px
+}
+SPAN.java13 {
+ FONT-SIZE: 8pt; COLOR: #3f3fbf; LINE-HEIGHT: 10px
+}
+SPAN.java14 {
+ FONT-SIZE: 8pt; COLOR: #3f5fbf; LINE-HEIGHT: 10px
+}
+SPAN.java15 {
+ FONT-SIZE: 8pt; COLOR: #ff6100; LINE-HEIGHT: 10px
+}
+SPAN.java16 {
+ FONT-SIZE: 8pt; COLOR: #646464; LINE-HEIGHT: 10px
+}
Modified: trunk/documentation/GettingStartedGuide/docs/resources/support.xml
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/resources/support.xml 2007-08-02 08:33:17 UTC (rev 2833)
+++ trunk/documentation/GettingStartedGuide/docs/resources/support.xml 2007-08-02 09:57:09 UTC (rev 2834)
@@ -171,6 +171,13 @@
</fileset>
</copy>
+ <copy todir="${build.dir}/${lang}/html/css/images">
+ <fileset dir="${styles.dir}/${lang}/Images">
+ <include name="**/*.gif"/>
+ </fileset>
+ </copy>
+
+
<java classname="com.icl.saxon.StyleSheet"
fork="true" dir="${build.dir}/${lang}/html">
<classpath refid="lib.classpath"/>
@@ -196,6 +203,13 @@
</fileset>
</copy>
+
+ <copy todir="${build.dir}/${lang}/html_single/css/images">
+ <fileset dir="${styles.dir}/${lang}/Images">
+ <include name="**/*.gif"/>
+ </fileset>
+ </copy>
+
<java classname="com.icl.saxon.StyleSheet"
fork="true" dir="${basedir}">
<classpath refid="lib.classpath"/>
16 years, 8 months
JBoss Tools SVN: r2833 - in trunk/common/plugins/org.jboss.tools.common.model: resources/meta and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2007-08-02 04:33:17 -0400 (Thu, 02 Aug 2007)
New Revision: 2833
Removed:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/model/handler/RunJavaHandler.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model/plugin.xml
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/jclass.meta
Log:
Obsolete class RunJavaHandler removed
Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2007-08-02 07:55:38 UTC (rev 2832)
+++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2007-08-02 08:33:17 UTC (rev 2833)
@@ -91,8 +91,6 @@
class="org.jboss.tools.common.java.jsp.model.FileJSPImpl"/>
<xclass id="org.jboss.tools.common.java.model.handler.CreateJavaFileHandler"
class="org.jboss.tools.common.java.model.handler.CreateJavaFileHandler"/>
- <xclass id="org.jboss.tools.common.java.model.handler.RunJavaHandler"
- class="org.jboss.tools.common.java.model.handler.RunJavaHandler"/>
<xclass id="org.jboss.tools.common.meta.action.impl.handlers.ChildrenCopyHandler"
class="org.jboss.tools.common.meta.action.impl.handlers.ChildrenCopyHandler"/>
<xclass id="org.jboss.tools.common.meta.action.impl.handlers.ChildrenDeleteHandler"
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/jclass.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/jclass.meta 2007-08-02 07:55:38 UTC (rev 2832)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/jclass.meta 2007-08-02 08:33:17 UTC (rev 2833)
@@ -108,12 +108,6 @@
ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
</XActionItem>
<XActionItem displayName="Run" kind="list" name="RunActions">
- <XActionItem HIDE="disabled"
- HandlerClassName="org.jboss.tools.common.java.model.handler.RunJavaHandler"
- ICON="action.start" displayName="Run" kind="action" name="Run"/>
- <XActionItem HIDE="disabled"
- HandlerClassName="org.jboss.tools.common.model.engines.impl.StopProcessHandler"
- ICON="action.stop" displayName="Stop" kind="action" name="Stop"/>
</XActionItem>
<XActionItem ICON="action.empty" kind="list" name="Properties">
<XActionItem HIDE="always" HandlerClassName="%Properties%"
Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/model/handler/RunJavaHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/model/handler/RunJavaHandler.java 2007-08-02 07:55:38 UTC (rev 2832)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/model/handler/RunJavaHandler.java 2007-08-02 08:33:17 UTC (rev 2833)
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.java.model.handler;
-
-import java.io.*;
-import java.util.*;
-import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.model.util.*;
-import org.jboss.tools.common.model.engines.impl.*;
-import org.jboss.tools.common.meta.action.impl.*;
-import org.jboss.tools.common.model.util.FindObjectHelper;
-import org.jboss.tools.common.model.impl.XModelClassLoader;
-
-public class RunJavaHandler extends AbstractHandler {
-
- public RunJavaHandler() {}
-
- public boolean isEnabled(XModelObject object) {
- if(object == null) return false;
- object = object.getChildByPath(object.getAttributeValue("name"));
- if(object == null) return false;
- XModelObject m = object.getChildByPath("main(String[])");
- if(m == null) m = object.getChildByPath("main(java.lang.String[])");
- return (m != null);
- }
-
- public void executeHandler(XModelObject object, Properties p) throws Exception {
- if(!isEnabled(object)) return;
- RunJavaProcess process = new RunJavaProcess(object);
- process.start();
- XProcessStorage.getDefaultStorage().addInstance(object.getPath(), process);
- }
-
-}
-
-class RunJavaProcess extends XProcess {
- private XModelObject js = null;
- private String qn = null;
-
- public RunJavaProcess(XModelObject js) {
- this.js = js;
- qn = qualifiedName();
- }
-
- protected String getRoot() {
- return ".";
- }
-
- private String qualifiedName() {
- String p = XModelObjectLoaderUtil.getResourcePath(js);
- return p.substring(1, p.length() - 5).replace('/', '.');
- }
-
- protected void buildCommandLine(ArrayList<String> l) {
- appendJava(l, js.getModel().getProperties());
- l.add("-classpath");
- l.add(getClassPath());
- l.add(qn);
- }
-
- private String getClassPath() {
- XModelClassLoader l = (XModelClassLoader)js.getModel().getModelClassLoader();
- String s = l.getClassPath();
- XModelObject g = js.getModel().getByPath("Engines/generator");
- String bo = XModelObjectUtil.getExpandedValue(g, "directory", null) + "/classes";
- s += File.pathSeparator + bo;
- return s;
- }
-
- protected void write(String s) {
- StringTokenizer st = new StringTokenizer(s, "\n");
- while(st.hasMoreTokens()) {
- String n = st.nextToken();
- n = FindObjectHelper.enhanceStackTraceEntry(js.getModel(), n);
- js.getModel().getOut().println(n);
- }
- }
-
-}
-
16 years, 8 months
JBoss Tools SVN: r2832 - in trunk/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/common/ant/model/handlers and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2007-08-02 03:55:38 -0400 (Thu, 02 Aug 2007)
New Revision: 2832
Removed:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/ant/model/handlers/RunTargetHandler.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model/plugin.xml
Log:
Obsolete class RunTargetHandler removed
Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2007-08-02 07:53:47 UTC (rev 2831)
+++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2007-08-02 07:55:38 UTC (rev 2832)
@@ -87,8 +87,6 @@
<extension point="org.jboss.tools.common.model.classes">
<xclass id="org.jboss.tools.common.ant.model.AntEntityRecognizer"
class="org.jboss.tools.common.ant.model.AntEntityRecognizer"/>
- <xclass id="org.jboss.tools.common.ant.model.handlers.RunTargetHandler"
- class="org.jboss.tools.common.ant.model.handlers.RunTargetHandler"/>
<xclass id="org.jboss.tools.common.java.jsp.model.FileJSPImpl"
class="org.jboss.tools.common.java.jsp.model.FileJSPImpl"/>
<xclass id="org.jboss.tools.common.java.model.handler.CreateJavaFileHandler"
Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/ant/model/handlers/RunTargetHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/ant/model/handlers/RunTargetHandler.java 2007-08-02 07:53:47 UTC (rev 2831)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/ant/model/handlers/RunTargetHandler.java 2007-08-02 07:55:38 UTC (rev 2832)
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.ant.model.handlers;
-
-import java.util.*;
-import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.model.impl.*;
-import org.jboss.tools.common.model.engines.impl.*;
-import org.jboss.tools.common.meta.action.impl.*;
-import org.jboss.tools.common.model.filesystems.XFileObject;
-import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
-import org.jboss.tools.common.model.util.*;
-
-public class RunTargetHandler extends AbstractHandler {
-
- public RunTargetHandler() {}
-
- public boolean isEnabled(XModelObject object) {
- return (object != null);
- }
-
- public void executeHandler(XModelObject object, Properties p) throws Exception {
- if(!isEnabled(object)) return;
- RunAntProcess process = new RunAntProcess(object);
- process.start();
- new Thread(new U(object.getModel(), process)).start();
- XProcessStorage.getDefaultStorage().addInstance(object.getPath(), process);
- }
-
- class U implements Runnable {
- XModel model;
- XProcess process;
- U(XModel model, XProcess process) {
- this.model = model;
- this.process = process;
- }
- public void run() {
- process.waitFor();
- model.update();
- }
- }
-
-}
-
-class RunAntProcess extends XProcess {
- private XModelObject js = null;
-
- public RunAntProcess(XModelObject js) {
- this.js = js;
- }
-
- protected String getRoot() {
- return ".";
- }
-
- private String qualifiedName() {
- String r = "";
- XModelObject p = (js.getFileType() == XFileObject.FILE) ? js : js.getParent();
- r = FileAnyImpl.toFileName(p);
- p = p.getParent();
- while(p != null && p.getFileType() != XFileObject.SYSTEM) {
- r = p.getAttributeValue("name") + "/" + r;
- p = p.getParent();
- }
- if(p == null) return null;
- r = p.get("LOCATION") + "/" + r;
- r = XModelObjectUtil.expand(r, p.getModel(), null);
- return r;
- }
-
- protected void buildCommandLine(ArrayList<String> l) {
- appendJava(l, js.getModel().getProperties());
- l.add("-classpath");
- l.add(getClassPath());
- l.add("org.apache.tools.ant.Main");
- l.add("-buildfile");
- l.add(qualifiedName());
- if(js.getFileType() != XFileObject.FILE);
- l.add(js.getAttributeValue("name"));
- }
-
- private String getClassPath() {
- XModelClassLoader cl = (XModelClassLoader)js.getModel().getModelClassLoader();
- return cl.getClassPath();
- }
-
- protected void write(String s) {
- StringTokenizer st = new StringTokenizer(s, "\n");
- while(st.hasMoreTokens()) {
- String n = st.nextToken();
- n = FindObjectHelper.enhanceStackTraceEntry(js.getModel(), n);
- js.getModel().getOut().println(n);
- }
- }
-}
-
16 years, 8 months
JBoss Tools SVN: r2831 - in trunk/common/plugins/org.jboss.tools.common.model: resources/meta and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2007-08-02 03:53:47 -0400 (Thu, 02 Aug 2007)
New Revision: 2831
Removed:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/ant/model/FileAntImpl.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/ant.meta
Log:
Obsolete class FileAntImpl removed
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties 2007-08-02 07:49:36 UTC (rev 2830)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties 2007-08-02 07:53:47 UTC (rev 2831)
@@ -219,12 +219,6 @@
FileANT_Properties.WindowTitle=Properties
FileANT_Properties.Title=File ANT
-AntTarget=/model/AntTarget.html
-
-AntTarget_Properties=/model/AntTarget_Properties.html
-AntTarget_Properties.WindowTitle=Properties
-AntTarget_Properties.Title=Target
-
##### Create File ANT #####
FileFolder_CreateFileANT=/model/CreateFile.html
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/ant.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/ant.meta 2007-08-02 07:49:36 UTC (rev 2830)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/ant.meta 2007-08-02 07:53:47 UTC (rev 2831)
@@ -12,45 +12,11 @@
</MAPPINGS>
<ICONS/>
<GlobalActions kind="list"/>
- <XModelEntity ImplementingClass="%Regular%" name="AntTarget">
- <XChildrenEntities/>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.attribute" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="target" loader="ElementType" name="element type">
- <Constraint/>
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute name="name" xmlname="NAME">
- <Constraint/>
- <Editor name="Uneditable"/>
- </XModelAttribute>
- </XModelAttributes>
- <XActionItem kind="list">
- <XActionItem displayName="Run" kind="list" name="RunActions">
- <XActionItem
- HandlerClassName="org.jboss.tools.common.ant.model.handlers.RunTargetHandler"
- ICON="action.start" displayName="Run" kind="action" name="Run"/>
- <XActionItem HIDE="disabled"
- HandlerClassName="org.jboss.tools.common.model.engines.impl.StopProcessHandler"
- ICON="action.stop" displayName="Stop" kind="action" name="Stop"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
<XModelEntity
ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader"
ImplementingClass="org.jboss.tools.common.model.filesystems.impl.FileXMLImpl"
ObjectEditorClass="org.eclipse.ant.ui.internal.editor.AntEditor" name="FileANT">
<XChildrenEntities>
- <XChildEntity name="AntTarget"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/ant/model/FileAntImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/ant/model/FileAntImpl.java 2007-08-02 07:49:36 UTC (rev 2830)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/ant/model/FileAntImpl.java 2007-08-02 07:53:47 UTC (rev 2831)
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.ant.model;
-
-import java.util.*;
-import org.jboss.tools.common.ant.parser.*;
-import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.model.event.*;
-import org.jboss.tools.common.model.filesystems.*;
-import org.jboss.tools.common.model.filesystems.impl.*;
-
-public class FileAntImpl extends RecognizedFileImpl {
- private static final long serialVersionUID = 1L;
- private boolean loaded = false;
- private String[] targets = null;
-
- public FileAntImpl() {}
-
- public boolean hasChildren() {
- return true;
- }
-
- public boolean isValid() {
- return loaded && targets != null;
- }
-
- protected void loadChildren() {
- if(loaded || !isActive()) return;
- loaded = true;
- parse();
- if(targets == null) return;
- for (int i = 0; i < targets.length; i++) {
- try {
- Properties p = new Properties();
- p.setProperty("name", targets[i]);
- addChild_0(getModel().createModelObject("AntTarget", p));
- } catch (Exception e) {
- //ignore
- }
- }
- }
-
- private void parse() {
- if(targets != null) return;
- String b = getAttributeValue("body");
- try {
- targets = new AntParser(b).getTargets();
- } catch (Exception e) {
- //ignore
- targets = null;
- }
- }
-
- public void invalidate() {
- if(!loaded || getParent() == null) return;
- targets = null;
- parse();
- if(targets == null) return;
- children.clear();
- loaded = false;
- fireStructureChanged(XModelTreeEvent.STRUCTURE_CHANGED, getParent());
- }
-
- public void changeBody(String body) {
- getModel().changeObjectAttribute(this, "body", body);
- }
-
- public void set(String name, String value) {
- super.set(name, value);
- if("body".equals(name) && loaded) {
- invalidate();
- }
- }
-
- public XModelObject[] getChildrenForSave() {
- return new XModelObject[0];
- }
-
- public void setBodySource(BodySource bodysource) {
- super.setBodySource(bodysource);
- invalidate();
- }
-
-}
16 years, 8 months
JBoss Tools SVN: r2830 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2007-08-02 03:49:36 -0400 (Thu, 02 Aug 2007)
New Revision: 2830
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePathDiagramChange.java
Log:
Reference to obsolete class FileAntImpl removed
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePathDiagramChange.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePathDiagramChange.java 2007-08-02 07:49:29 UTC (rev 2829)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePathDiagramChange.java 2007-08-02 07:49:36 UTC (rev 2830)
@@ -14,8 +14,8 @@
import org.eclipse.core.runtime.*;
import org.eclipse.ltk.core.refactoring.*;
-import org.jboss.tools.common.ant.model.FileAntImpl;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.messages.JSFUIMessages;
@@ -23,8 +23,8 @@
static String getName(XModelObject config) {
String n = config.getAttributeValue("name");
- if(config instanceof FileAntImpl) {
- n = FileAntImpl.toFileName(config);
+ if(config instanceof FileAnyImpl) {
+ n = FileAnyImpl.toFileName(config);
}
IResource r = EclipseResourceUtil.getResource(config);
if(r != null && r.getParent() != null) {
16 years, 8 months