JBoss Tools SVN: r10061 - trunk/docbook.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-04 02:36:44 -0400 (Thu, 04 Sep 2008)
New Revision: 10061
Added:
trunk/docbook/plugins/
Log:
17 years, 7 months
JBoss Tools SVN: r10060 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-04 02:36:21 -0400 (Thu, 04 Sep 2008)
New Revision: 10060
Added:
trunk/docbook/
Log:
17 years, 7 months
JBoss Tools SVN: r10059 - in trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference: messages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-09-04 02:22:56 -0400 (Thu, 04 Sep 2008)
New Revision: 10059
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/BaseFieldEditor.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/ButtonFieldEditor.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/CompositeEditor.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossESBRuntimePreferencePage.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossLibraryListFieldEditor.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/TextFieldEditor.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/messages/JBossESBUI.properties
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/messages/JBossESBUIMessages.java
Log:
change some error messages
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/BaseFieldEditor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/BaseFieldEditor.java 2008-09-04 05:19:10 UTC (rev 10058)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/BaseFieldEditor.java 2008-09-04 06:22:56 UTC (rev 10059)
@@ -66,8 +66,8 @@
* @param parent
*/
public void doFillIntoGrid(Object parent) {
- Assert.isTrue(parent instanceof Composite, JBossESBUIMessages.Error_JBossWS_Basic_Editor_Composite);
- Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,JBossESBUIMessages.Error_JBossWS_Basic_Editor_Support);
+ Assert.isTrue(parent instanceof Composite, JBossESBUIMessages.Error_JBoss_Basic_Editor_Composite);
+ Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,JBossESBUIMessages.Error_JBoss_Basic_Editor_Support);
Composite aComposite = (Composite) parent;
final Control[] controls = (Control[])getEditorControls(aComposite);
GridLayout gl = (GridLayout)((Composite)parent).getLayout();
@@ -110,7 +110,7 @@
labelControl.setText(this.labelText);
} else if(parent!=null) {
if(labelControl.getParent()!=parent)
- throw new IllegalArgumentException(JBossESBUIMessages.Error_JBossWS_Basic_Editor_Different);
+ throw new IllegalArgumentException(JBossESBUIMessages.Error_JBoss_Basic_Editor_Different);
}
return labelControl;
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/ButtonFieldEditor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/ButtonFieldEditor.java 2008-09-04 05:19:10 UTC (rev 10058)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/ButtonFieldEditor.java 2008-09-04 06:22:56 UTC (rev 10059)
@@ -26,10 +26,10 @@
PushButtonField button= null;
int style;
- private ButtonPressedAction buttonAction = new ButtonPressedAction(JBossESBUIMessages.JBossWS_Button_Field_Editor_Browse) {
+ private ButtonPressedAction buttonAction = new ButtonPressedAction(JBossESBUIMessages.JBoss_Button_Field_Editor_Browse) {
@Override
public void run() {
- throw new RuntimeException(JBossESBUIMessages.Error_JBossWS_Button_Field_Editor_Not_Implemented_Yet);
+ throw new RuntimeException(JBossESBUIMessages.Error_JBoss_Button_Field_Editor_Not_Implemented_Yet);
}
};
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/CompositeEditor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/CompositeEditor.java 2008-09-04 05:19:10 UTC (rev 10058)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/CompositeEditor.java 2008-09-04 06:22:56 UTC (rev 10059)
@@ -41,9 +41,9 @@
@Override
public void doFillIntoGrid(Object parent) {
Assert.isTrue(parent instanceof Composite,
- JBossESBUIMessages.Error_JBossWS_Basic_Editor_Composite);
+ JBossESBUIMessages.Error_JBoss_Basic_Editor_Composite);
Assert.isTrue(((Composite) parent).getLayout() instanceof GridLayout,
- JBossESBUIMessages.Error_JBossWS_Basic_Editor_Support);
+ JBossESBUIMessages.Error_JBoss_Basic_Editor_Support);
Composite aComposite = (Composite) parent;
final Control[] controls = (Control[]) getEditorControls(aComposite);
@@ -78,7 +78,7 @@
@Override
public Object[] getEditorControls() {
if(controls.size()>0) return controls.toArray();
- else throw new IllegalStateException(JBossESBUIMessages.JBossWS_Composite_Editor_This_Method_Can_Be_Invoked);
+ else throw new IllegalStateException(JBossESBUIMessages.JBoss_Composite_Editor_This_Method_Can_Be_Invoked);
}
@Override
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossESBRuntimePreferencePage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossESBRuntimePreferencePage.java 2008-09-04 05:19:10 UTC (rev 10058)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossESBRuntimePreferencePage.java 2008-09-04 06:22:56 UTC (rev 10059)
@@ -40,7 +40,7 @@
private static final int COLUMNS = 3;
JBossRuntimeListFieldEditor jbossRuntimes = new JBossRuntimeListFieldEditor(
- "rtlist", JBossESBUIMessages.JBossWS_Preference_Page_Runtimes, new ArrayList<JBossRuntime>(Arrays.asList(JBossRuntimeManager.getInstance().getRuntimes()))); //$NON-NLS-1$
+ "rtlist", JBossESBUIMessages.JBoss_Preference_Page_Runtimes, new ArrayList<JBossRuntime>(Arrays.asList(JBossRuntimeManager.getInstance().getRuntimes()))); //$NON-NLS-1$
/**
* Create contents of JBoss ESB preferences page. list editor
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossLibraryListFieldEditor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossLibraryListFieldEditor.java 2008-09-04 05:19:10 UTC (rev 10058)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossLibraryListFieldEditor.java 2008-09-04 06:22:56 UTC (rev 10059)
@@ -166,7 +166,7 @@
protected void createCheckButton(Composite parent){
final Button btnDefault = new Button(parent, SWT.CHECK);
- btnDefault.setText(JBossESBUIMessages.JBossWS_Runtime_Check_Field_Default_Classpath);
+ btnDefault.setText(JBossESBUIMessages.JBoss_Runtime_Check_Field_Default_Classpath);
GridData gd = new GridData();
gd.horizontalSpan = 2;
btnDefault.setLayoutData(gd);
@@ -201,8 +201,8 @@
return ((JBossRuntime) inputElement).getLibraries().toArray();
} else {
throw new IllegalArgumentException(
- JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be
- + JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_An_Instance_Of_List);
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Inputelement_Must_Be
+ + JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_An_Instance_Of_List);
}
}
@@ -303,9 +303,9 @@
@Override
public void doFillIntoGrid(Object parent) {
Assert.isTrue(parent instanceof Composite,
- JBossESBUIMessages.Error_JBossWS_Basic_Editor_Composite);
+ JBossESBUIMessages.Error_JBoss_Basic_Editor_Composite);
Assert.isTrue(((Composite) parent).getLayout() instanceof GridLayout,
- JBossESBUIMessages.Error_JBossWS_Basic_Editor_Support);
+ JBossESBUIMessages.Error_JBoss_Basic_Editor_Support);
Composite aComposite = (Composite) parent;
getEditorControls(aComposite);
GridLayout gl = (GridLayout) ((Composite) parent).getLayout();
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2008-09-04 05:19:10 UTC (rev 10058)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2008-09-04 06:22:56 UTC (rev 10059)
@@ -204,16 +204,16 @@
TableColumn tc2 = new TableColumn(tableView.getTable(), SWT.LEFT);
tc2.setWidth(TC_NAME_WIDTH);
- tc2.setText(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Name);
+ tc2.setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Name);
TableColumn tc3 = new TableColumn(tableView.getTable(), SWT.LEFT);
tc3.setWidth(TC_VERSION_WIDTH);
tc3
- .setText(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Version);
+ .setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Version);
TableColumn tc4 = new TableColumn(tableView.getTable(), SWT.LEFT);
tc4.setWidth(TC_PATH_WIDTH);
- tc4.setText(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Path);
+ tc4.setText(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Path);
tableView.setContentProvider(new IStructuredContentProvider() {
@@ -222,8 +222,8 @@
return ((List<JBossRuntime>) inputElement).toArray();
} else {
throw new IllegalArgumentException(
- JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be
- + JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_An_Instance_Of_List);
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Inputelement_Must_Be
+ + JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_An_Instance_Of_List);
}
}
@@ -389,9 +389,9 @@
@Override
public void doFillIntoGrid(Object parent) {
Assert.isTrue(parent instanceof Composite,
- JBossESBUIMessages.Error_JBossWS_Basic_Editor_Composite);
+ JBossESBUIMessages.Error_JBoss_Basic_Editor_Composite);
Assert.isTrue(((Composite) parent).getLayout() instanceof GridLayout,
- JBossESBUIMessages.Error_JBossWS_Basic_Editor_Support);
+ JBossESBUIMessages.Error_JBoss_Basic_Editor_Support);
Composite aComposite = (Composite) parent;
getEditorControls(aComposite);
GridLayout gl = (GridLayout) ((Composite) parent).getLayout();
@@ -421,14 +421,14 @@
List<JBossRuntime> value = null;
IFieldEditor name = createTextEditor(SRT_NAME,
- JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Name2, ""); //$NON-NLS-1$
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Name2, ""); //$NON-NLS-1$
IFieldEditor version = createComboEditor(SRT_VERSION,
- JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Version, getESBFacetVersions(), ""); //$NON-NLS-1$
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Version, getESBFacetVersions(), ""); //$NON-NLS-1$
IFieldEditor homeDir = createBrowseFolderEditor(
SRT_HOMEDIR,
- JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Home_Folder,
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Home_Folder,
""); //$NON-NLS-1$
JBossRuntime current = null;
@@ -437,10 +437,10 @@
public JBossWSRuntimeWizardPage(List<JBossRuntime> editedList) {
super(
- JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_New_Runtime);
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_New_Runtime);
- setMessage(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Create_A_Runtime);
- setTitle(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Runtime);
+ setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Create_A_Runtime);
+ setTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Runtime);
value = editedList;
}
@@ -496,20 +496,20 @@
if (name.getValueAsString() == null || "".equals(//$NON-NLS-1$
name.getValueAsString().toString().trim())) {
- setErrorMessage(JBossESBUIMessages.Error_JBossWS_Runtime_List_Field_Editor_Name_Cannot_Be_Empty);
+ setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Name_Cannot_Be_Empty);
setPageComplete(false);
return;
}
if(version.getValueAsString() == null || "".equals(version.getValueAsString())){
- setErrorMessage(JBossESBUIMessages.Error_JBossWS_Runtime_List_Field_Editor_Version_Cannot_Be_Empty);
+ setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Version_Cannot_Be_Empty);
setPageComplete(false);
return;
}
if (!name.getValueAsString().matches(
"[a-zA-Z_][a-zA-Z0-9_\\-\\. ]*")) { //$NON-NLS-1$
- setErrorMessage(JBossESBUIMessages.Error_JBossWS_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct);
+ setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct);
setPageComplete(false);
return;
}
@@ -518,9 +518,9 @@
continue;
}
if (rt.getName().equals(name.getValueAsString())) {
- setErrorMessage(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Runtime
+ setErrorMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Runtime
+ name.getValueAsString()
- + JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Already_Exists);
+ + JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Already_Exists);
setPageComplete(false);
return;
}
@@ -550,13 +550,13 @@
if (homeDir.getValueAsString() == null
|| "".equals(homeDir.getValueAsString().trim())) { //$NON-NLS-1$
- setErrorMessage(JBossESBUIMessages.Error_JBossWS_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty);
+ setErrorMessage(JBossESBUIMessages.Error_JBoss_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty);
setPageComplete(false);
return;
}
if (!runtimeExist(homeDir.getValueAsString())) {
- setErrorMessage(JBossESBUIMessages.Label_JBossWS_Runtime_Load_Error);
+ setErrorMessage(JBossESBUIMessages.Label_JBoss_Runtime_Load_Error);
setPageComplete(false);
return;
}
@@ -631,7 +631,7 @@
new TextFieldEditor(name, label, defaultValue),
new ButtonFieldEditor(
name,
- createSelectFolderAction(JBossESBUIMessages.JBossWS_SWT_Field_Editor_Factory_Browse),
+ createSelectFolderAction(JBossESBUIMessages.JBoss_SWT_Field_Editor_Factory_Browse),
defaultValue) });
return editor;
}
@@ -645,7 +645,7 @@
.getCurrent().getActiveShell());
dialog.setFilterPath(getFieldEditor().getValueAsString());
dialog
- .setMessage(JBossESBUIMessages.JBossWS_SWT_Field_Editor_Factory_Select_Home_Folder);
+ .setMessage(JBossESBUIMessages.JBoss_SWT_Field_Editor_Factory_Select_Home_Folder);
dialog.setFilterPath(getFieldEditor().getValueAsString());
String directory = dialog.open();
if (directory != null) {
@@ -724,7 +724,7 @@
public JBossRuntimeNewWizard(List<JBossRuntime> exist,
List<JBossRuntime> added) {
super();
- setWindowTitle(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_New_Runtime);
+ setWindowTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_New_Runtime);
page1 = new JBossWSRuntimeWizardPage(exist);
addPage(page1);
this.value = exist;
@@ -780,12 +780,12 @@
JBossRuntime source, List<JBossRuntime> added,
Map<JBossRuntime, JBossRuntime> changed) {
super();
- setWindowTitle(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Edit_Runtime);
+ setWindowTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Edit_Runtime);
page1 = new JBossWSRuntimeWizardPage(existing);
page1
- .setMessage(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Modify_Runtime);
+ .setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Modify_Runtime);
page1
- .setTitle(JBossESBUIMessages.JBossWS_Runtime_List_Field_Editor_Edit_Runtime);
+ .setTitle(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Edit_Runtime);
addPage(page1);
this.value = existing;
this.added = added;
@@ -1146,11 +1146,11 @@
@SuppressWarnings("unchecked")
private void removeRuntime(JBossRuntime r) {
boolean used = JBossRuntimeManager.isRuntimeUsed(r.getName());
- String title = JBossESBUIMessages.JBossWS_Runtime_Delete_Confirm_Title;
+ String title = JBossESBUIMessages.JBoss_Runtime_Delete_Confirm_Title;
String message = (used) ? NLS.bind(
- JBossESBUIMessages.JBossWS_Runtime_Delete_Used_Confirm, r
+ JBossESBUIMessages.JBoss_Runtime_Delete_Used_Confirm, r
.getName()) : NLS.bind(
- JBossESBUIMessages.JBossWS_Runtime_Delete_Not_Used_Confirm,
+ JBossESBUIMessages.JBoss_Runtime_Delete_Not_Used_Confirm,
r.getName());
boolean b = MessageDialog.openConfirm(tableView.getControl()
.getShell(), title, message);
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/TextFieldEditor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/TextFieldEditor.java 2008-09-04 05:19:10 UTC (rev 10058)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/TextFieldEditor.java 2008-09-04 06:22:56 UTC (rev 10059)
@@ -68,8 +68,8 @@
@Override
public void doFillIntoGrid(Object aParent) {
- Assert.isTrue(aParent instanceof Composite, JBossESBUIMessages.Error_JBossWS_Basic_Editor_Composite);
- Assert.isTrue(((Composite)aParent).getLayout() instanceof GridLayout,JBossESBUIMessages.Error_JBossWS_Basic_Editor_Support);
+ Assert.isTrue(aParent instanceof Composite, JBossESBUIMessages.Error_JBoss_Basic_Editor_Composite);
+ Assert.isTrue(((Composite)aParent).getLayout() instanceof GridLayout,JBossESBUIMessages.Error_JBoss_Basic_Editor_Support);
Composite aComposite = (Composite) aParent;
getEditorControls(aComposite);
GridLayout gl = (GridLayout)((Composite)aParent).getLayout();
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/messages/JBossESBUI.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/messages/JBossESBUI.properties 2008-09-04 05:19:10 UTC (rev 10058)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/messages/JBossESBUI.properties 2008-09-04 06:22:56 UTC (rev 10059)
@@ -1,38 +1,32 @@
-Label_JBossWS_Runtime_Load_Error=Error occurred while loading JBoss ESB runtime. Please select a correct ESB runtime or SOA-P location
+Label_JBoss_Runtime_Load_Error=Error occurred while loading JBoss ESB runtime. Please select a correct JBoss ESB runtime or JBoss ESB server location
-Command=wsconsume.sh
-Bin=bin
-Client=client
-Lib=lib
-Endorsed=endorsed
-
-Error_JBossWS_Basic_Editor_Composite=Parent control should be Composite
-Error_JBossWS_Basic_Editor_Support=Editor supports only grid layout
-Error_JBossWS_Basic_Editor_Different=Parent for label is different
-JBossWS_Runtime_List_Field_Editor_Name=Name
-JBossWS_Runtime_List_Field_Editor_Version=Version
-JBossWS_Runtime_List_Field_Editor_Path=Path
-JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be=inputElement must be
-JBossWS_Runtime_List_Field_Editor_An_Instance_Of_List=an instance of List<JBossRuntime>.
-JBossWS_Runtime_Delete_Confirm_Title=Confirm Runtime Delete
-JBossWS_Runtime_Delete_Used_Confirm=Runtime ''{0}'' is used by JBoss ESB projects. Are you sure you want to delete it?
-JBossWS_Runtime_Delete_Not_Used_Confirm=Are you sure you want to delete runtime ''{0}''?
-JBossWS_Runtime_List_Field_Editor_Edit_Runtime=Edit JBoss ESB Runtime
-JBossWS_Runtime_List_Field_Editor_Modify_Runtime=Input new values
-JBossWS_Runtime_List_Field_Editor_New_Runtime=New JBoss ESB Runtime
-Error_JBossWS_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty=Path to JBoss ESB runtime home directory cannot be empty
-JBossWS_Runtime_List_Field_Editor_Already_Exists=' already exists
-JBossWS_Runtime_List_Field_Editor_Runtime=JBoss ESB Runtime
-Error_JBossWS_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct=Runtime name is not correct
-Error_JBossWS_Runtime_List_Field_Editor_Name_Cannot_Be_Empty=Name cannot be empty
-Error_JBossWS_Runtime_List_Field_Editor_Version_Cannot_Be_Empty=Version cannot be empty
-JBossWS_Runtime_List_Field_Editor_Create_A_Runtime=Create a JBoss ESB Runtime
-JBossWS_Runtime_List_Field_Editor_Home_Folder=Home Folder:
-JBossWS_Composite_Editor_This_Method_Can_Be_Invoked=This metod can be invoked after getEditorControls(parent) only
-JBossWS_Button_Field_Editor_Browse=Browse...
-Error_JBossWS_Button_Field_Editor_Not_Implemented_Yet=Not implemented yet. Please setup real acion for editor.
-JBossWS_SWT_Field_Editor_Factory_Browse=Browse...
-JBossWS_SWT_Field_Editor_Factory_Select_Home_Folder=Select JBoss ESB runtime Home Folder
-JBossWS_Runtime_List_Field_Editor_Name2=Name:
-JBossWS_Runtime_Check_Field_Default_Classpath=Customize JBoss ESB runtime jars
-JBossWS_Preference_Page_Runtimes=JBoss ESB Runtimes
\ No newline at end of file
+Error_JBoss_Basic_Editor_Composite=Parent control should be Composite
+Error_JBoss_Basic_Editor_Support=Editor supports only grid layout
+Error_JBoss_Basic_Editor_Different=Parent for label is different
+JBoss_Runtime_List_Field_Editor_Name=Name
+JBoss_Runtime_List_Field_Editor_Version=Version
+JBoss_Runtime_List_Field_Editor_Path=Path
+JBoss_Runtime_List_Field_Editor_Inputelement_Must_Be=inputElement must be
+JBoss_Runtime_List_Field_Editor_An_Instance_Of_List=an instance of List<JBossRuntime>.
+JBoss_Runtime_Delete_Confirm_Title=Confirm Runtime Delete
+JBoss_Runtime_Delete_Used_Confirm=Runtime ''{0}'' is used by JBoss ESB projects. Are you sure you want to delete it?
+JBoss_Runtime_Delete_Not_Used_Confirm=Are you sure you want to delete runtime ''{0}''?
+JBoss_Runtime_List_Field_Editor_Edit_Runtime=Edit JBoss ESB Runtime
+JBoss_Runtime_List_Field_Editor_Modify_Runtime=Input new values
+JBoss_Runtime_List_Field_Editor_New_Runtime=New JBoss ESB Runtime
+Error_JBoss_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty=Path to JBoss ESB runtime home directory cannot be empty
+JBoss_Runtime_List_Field_Editor_Already_Exists=' already exists
+JBoss_Runtime_List_Field_Editor_Runtime=JBoss ESB Runtime
+Error_JBoss_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct=Runtime name is not correct
+Error_JBoss_Runtime_List_Field_Editor_Name_Cannot_Be_Empty=Name cannot be empty
+Error_JBoss_Runtime_List_Field_Editor_Version_Cannot_Be_Empty=Version cannot be empty
+JBoss_Runtime_List_Field_Editor_Create_A_Runtime=Create a JBoss ESB Runtime
+JBoss_Runtime_List_Field_Editor_Home_Folder=Home Folder:
+JBoss_Composite_Editor_This_Method_Can_Be_Invoked=This metod can be invoked after getEditorControls(parent) only
+JBoss_Button_Field_Editor_Browse=Browse...
+Error_JBoss_Button_Field_Editor_Not_Implemented_Yet=Not implemented yet. Please setup real acion for editor.
+JBoss_SWT_Field_Editor_Factory_Browse=Browse...
+JBoss_SWT_Field_Editor_Factory_Select_Home_Folder=Select JBoss ESB runtime Home Folder
+JBoss_Runtime_List_Field_Editor_Name2=Name:
+JBoss_Runtime_Check_Field_Default_Classpath=Customize JBoss ESB runtime jars
+JBoss_Preference_Page_Runtimes=JBoss ESB Runtimes
\ No newline at end of file
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/messages/JBossESBUIMessages.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/messages/JBossESBUIMessages.java 2008-09-04 05:19:10 UTC (rev 10058)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/messages/JBossESBUIMessages.java 2008-09-04 06:22:56 UTC (rev 10059)
@@ -25,44 +25,38 @@
// Do not instantiate
}
- public static String Label_JBossWS_Runtime_Load_Error;
-
- public static String Bin;
- public static String Command;
- public static String Client;
- public static String Lib;
- public static String Endorsed;
+ public static String Label_JBoss_Runtime_Load_Error;
- public static String Error_JBossWS_Basic_Editor_Composite;
- public static String Error_JBossWS_Basic_Editor_Support;
- public static String Error_JBossWS_Basic_Editor_Different;
- public static String JBossWS_Runtime_List_Field_Editor_Name;
- public static String JBossWS_Runtime_List_Field_Editor_Version;
- public static String JBossWS_Runtime_List_Field_Editor_Path;
- public static String JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be;
- public static String JBossWS_Runtime_List_Field_Editor_An_Instance_Of_List;
- public static String JBossWS_Runtime_Delete_Confirm_Title;
- public static String JBossWS_Runtime_Delete_Used_Confirm;
- public static String JBossWS_Runtime_Delete_Not_Used_Confirm;
- public static String JBossWS_Runtime_List_Field_Editor_Edit_Runtime;
- public static String JBossWS_Runtime_List_Field_Editor_Modify_Runtime;
- public static String JBossWS_Runtime_List_Field_Editor_New_Runtime;
- public static String Error_JBossWS_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty;
- public static String JBossWS_Runtime_List_Field_Editor_Already_Exists;
- public static String JBossWS_Runtime_List_Field_Editor_Runtime;
- public static String Error_JBossWS_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct;
- public static String Error_JBossWS_Runtime_List_Field_Editor_Name_Cannot_Be_Empty;
- public static String Error_JBossWS_Runtime_List_Field_Editor_Version_Cannot_Be_Empty;
- public static String JBossWS_Runtime_List_Field_Editor_Create_A_Runtime;
- public static String JBossWS_Runtime_List_Field_Editor_Home_Folder;
- public static String JBossWS_Composite_Editor_This_Method_Can_Be_Invoked;
- public static String JBossWS_Button_Field_Editor_Browse;
- public static String Error_JBossWS_Button_Field_Editor_Not_Implemented_Yet;
- public static String JBossWS_SWT_Field_Editor_Factory_Browse;
- public static String JBossWS_SWT_Field_Editor_Factory_Select_Home_Folder;
- public static String JBossWS_Runtime_List_Field_Editor_Name2;
- public static String JBossWS_Runtime_Check_Field_Default_Classpath;
- public static String JBossWS_Preference_Page_Runtimes;
+ public static String Error_JBoss_Basic_Editor_Composite;
+ public static String Error_JBoss_Basic_Editor_Support;
+ public static String Error_JBoss_Basic_Editor_Different;
+ public static String JBoss_Runtime_List_Field_Editor_Name;
+ public static String JBoss_Runtime_List_Field_Editor_Version;
+ public static String JBoss_Runtime_List_Field_Editor_Path;
+ public static String JBoss_Runtime_List_Field_Editor_Inputelement_Must_Be;
+ public static String JBoss_Runtime_List_Field_Editor_An_Instance_Of_List;
+ public static String JBoss_Runtime_Delete_Confirm_Title;
+ public static String JBoss_Runtime_Delete_Used_Confirm;
+ public static String JBoss_Runtime_Delete_Not_Used_Confirm;
+ public static String JBoss_Runtime_List_Field_Editor_Edit_Runtime;
+ public static String JBoss_Runtime_List_Field_Editor_Modify_Runtime;
+ public static String JBoss_Runtime_List_Field_Editor_New_Runtime;
+ public static String Error_JBoss_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty;
+ public static String JBoss_Runtime_List_Field_Editor_Already_Exists;
+ public static String JBoss_Runtime_List_Field_Editor_Runtime;
+ public static String Error_JBoss_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct;
+ public static String Error_JBoss_Runtime_List_Field_Editor_Name_Cannot_Be_Empty;
+ public static String Error_JBoss_Runtime_List_Field_Editor_Version_Cannot_Be_Empty;
+ public static String JBoss_Runtime_List_Field_Editor_Create_A_Runtime;
+ public static String JBoss_Runtime_List_Field_Editor_Home_Folder;
+ public static String JBoss_Composite_Editor_This_Method_Can_Be_Invoked;
+ public static String JBoss_Button_Field_Editor_Browse;
+ public static String Error_JBoss_Button_Field_Editor_Not_Implemented_Yet;
+ public static String JBoss_SWT_Field_Editor_Factory_Browse;
+ public static String JBoss_SWT_Field_Editor_Factory_Select_Home_Folder;
+ public static String JBoss_Runtime_List_Field_Editor_Name2;
+ public static String JBoss_Runtime_Check_Field_Default_Classpath;
+ public static String JBoss_Preference_Page_Runtimes;
static {
17 years, 7 months
JBoss Tools SVN: r10058 - trunk/common/plugins/org.jboss.tools.common.resref/src/org/jboss/tools/common/resref/messages.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-04 01:19:10 -0400 (Thu, 04 Sep 2008)
New Revision: 10058
Modified:
trunk/common/plugins/org.jboss.tools.common.resref/src/org/jboss/tools/common/resref/messages/Messages.java
Log:
fix dialog message bundle path after refactoring.
Modified: trunk/common/plugins/org.jboss.tools.common.resref/src/org/jboss/tools/common/resref/messages/Messages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref/src/org/jboss/tools/common/resref/messages/Messages.java 2008-09-04 02:40:24 UTC (rev 10057)
+++ trunk/common/plugins/org.jboss.tools.common.resref/src/org/jboss/tools/common/resref/messages/Messages.java 2008-09-04 05:19:10 UTC (rev 10058)
@@ -23,7 +23,7 @@
public final class Messages {
/** The Constant BUNDLE_NAME. */
- private static final String BUNDLE_NAME = "org.jboss.tools.common.rreferences.messages.messages";//$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.jboss.tools.common.resref.messages.messages";//$NON-NLS-1$
/** The f resource bundle. */
private static ResourceBundle fResourceBundle;
17 years, 7 months
JBoss Tools SVN: r10057 - trunk/esb/features/org.jboss.tools.esb.feature.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-09-03 22:40:24 -0400 (Wed, 03 Sep 2008)
New Revision: 10057
Modified:
trunk/esb/features/org.jboss.tools.esb.feature/feature.xml
Log:
add the esb project wizard into nightly build
Modified: trunk/esb/features/org.jboss.tools.esb.feature/feature.xml
===================================================================
--- trunk/esb/features/org.jboss.tools.esb.feature/feature.xml 2008-09-04 01:33:49 UTC (rev 10056)
+++ trunk/esb/features/org.jboss.tools.esb.feature/feature.xml 2008-09-04 02:40:24 UTC (rev 10057)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.esb.feature"
- label="ESBTools Feature"
- version="1.0.0"
- provider-name="RedHat, Inc.">
-
- <description url="http://www.jboss.org/tools">
- JBossTools ESB Feature
- </description>
-
- <copyright>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.esb.feature"
+ label="ESBTools Feature"
+ version="1.0.0"
+ provider-name="RedHat, Inc.">
+
+ <description url="http://www.jboss.org/tools">
+ JBossTools ESB Feature
+ </description>
+
+ <copyright>
Copyright (c) 2007 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:
-Red Hat, Inc. - initial API and implementation
- </copyright>
-
- <license url="http://www.eclipse.org/legal/epl-v10.html">
+Red Hat, Inc. - initial API and implementation
+ </copyright>
+
+ <license url="http://www.eclipse.org/legal/epl-v10.html">
Eclipse Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
@@ -215,20 +215,34 @@
No party to this Agreement will bring a legal action under this
Agreement more than one year after the cause of action arose.
Each party waives its rights to a jury trial in any resulting
-litigation.
- </license>
-
- <plugin
- id="org.jboss.tools.esb.core"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.esb.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+litigation.
+ </license>
+
+ <plugin
+ id="org.jboss.tools.esb.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.esb.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.esb.project.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.esb.project.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
17 years, 7 months
JBoss Tools SVN: r10056 - in workspace/dart/plugins: org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-03 21:33:49 -0400 (Wed, 03 Sep 2008)
New Revision: 10056
Added:
workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java
Modified:
workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IAnalyzer.java
workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataConnectionModel.java
workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/LineConnectionModel.java
workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/BeanContentProvider.java
workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src_test/test/SmooksAnalyzerTester.java
Log:
Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IAnalyzer.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IAnalyzer.java 2008-09-03 22:14:54 UTC (rev 10055)
+++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IAnalyzer.java 2008-09-04 01:33:49 UTC (rev 10056)
@@ -28,8 +28,8 @@
SmooksConfigurationFileGenerateContext context)
throws SmooksAnalyzerException;
- public List<LineConnectionModel> analyzeMappingSmooksModel(
- SmooksResourceListType listType);
+ public List<MappingModel> analyzeMappingSmooksModel(
+ SmooksResourceListType listType,Object sourceObject,Object targetObject);
public Object buildSourceInputObjects(GraphInformations graphInfo,
SmooksResourceListType listType, IFile sourceFile)
Added: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java (rev 0)
+++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java 2008-09-04 01:33:49 UTC (rev 10056)
@@ -0,0 +1,45 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.analyzer;
+
+/**
+ * @author root
+ *
+ */
+public class MappingModel {
+ protected Object source;
+ protected Object target;
+
+ public MappingModel(Object source,Object target){
+ setSource(source);
+ setTarget(target);
+ }
+
+ public Object getSource() {
+ return source;
+ }
+ public void setSource(Object source) {
+ this.source = source;
+ }
+ public Object getTarget() {
+ return target;
+ }
+ public void setTarget(Object target) {
+ this.target = target;
+ }
+
+
+ public String toString(){
+ StringBuffer buffer = new StringBuffer();
+ if(source != null)
+ buffer.append("Source : " + source);
+ else
+ buffer.append("Source is NULL ");
+ if(target != null)
+ buffer.append(";Target : " + target);
+ else
+ buffer.append(";Target is NULL ");
+ return buffer.toString();
+ }
+}
Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-03 22:14:54 UTC (rev 10055)
+++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-04 01:33:49 UTC (rev 10056)
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.EventObject;
+import java.util.Iterator;
import java.util.List;
import org.eclipse.core.resources.IFile;
@@ -51,6 +52,7 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
@@ -86,6 +88,7 @@
import org.eclipse.ui.forms.widgets.Section;
import org.jboss.tools.smooks.analyzer.AnalyzerFactory;
import org.jboss.tools.smooks.analyzer.IAnalyzer;
+import org.jboss.tools.smooks.analyzer.MappingModel;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
import org.jboss.tools.smooks.analyzer.SmooksFileBuilder;
import org.jboss.tools.smooks.graphical.GraphInformations;
@@ -98,6 +101,7 @@
import org.jboss.tools.smooks.ui.gef.editparts.SmooksEditPartFactory;
import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel;
import org.jboss.tools.smooks.ui.gef.model.GraphRootModel;
+import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel;
import org.jboss.tools.smooks.ui.gef.model.RootModel;
import org.jboss.tools.smooks.ui.gef.model.SourceModel;
import org.jboss.tools.smooks.ui.gef.model.TargetModel;
@@ -138,6 +142,7 @@
protected Object sourceTreeViewerInputModel = null;
protected Object targetTreeViewerInputModel = null;
+ protected List<MappingModel> initConnectionList = null;
protected boolean commandStackChanged = false;
protected ActionRegistry actionRegistry;
@@ -305,15 +310,17 @@
toolkit.paintBordersFor(rootMainControl);
form.pack();
-
- this.hookGraphicalViewer();
- this.initGraphicalViewer();
if (initSourceTreeViewerProviders()) {
initSourceTreeViewer();
+ expandSourceConnectionModel();
}
if (initTargetTreeViewerProviders()) {
initTargetTreeViewer();
+ expandTargetConnectionModel();
}
+ this.hookGraphicalViewer();
+ this.initGraphicalViewer();
+
getSite().getSelectionProvider().addSelectionChangedListener(this);
}
@@ -351,6 +358,34 @@
}
}
+ protected void expandSourceConnectionModel() {
+ this.expandConnectionModel(sourceViewer, true);
+ }
+
+ protected void expandConnectionModel(TreeViewer viewer, boolean isSource) {
+ ITreeContentProvider provider = (ITreeContentProvider) viewer
+ .getContentProvider();
+ if (provider == null)
+ return;
+ for (Iterator iterator = initConnectionList.iterator(); iterator
+ .hasNext();) {
+ MappingModel connection = (MappingModel) iterator.next();
+ Object currentModel = connection.getTarget();
+ if (isSource) {
+ currentModel = connection.getSource();
+ }
+ Object parent = provider.getParent(currentModel);
+ while (parent != null && parent != currentModel) {
+ viewer.expandToLevel(parent, 1);
+ parent = provider.getParent(parent);
+ }
+ }
+ }
+
+ protected void expandTargetConnectionModel() {
+ this.expandConnectionModel(targetViewer, false);
+ }
+
protected boolean initSourceTreeViewerProviders() {
return this.initTreeViewerProvider(sourceViewer, sourceDataTypeID);
}
@@ -521,7 +556,7 @@
rootModel = new GraphRootModel();
this.createSourceGraphModels();
this.createTargetGraphModels();
-
+ this.createConnectionModels();
this.getGraphicalViewer().setEditPartFactory(
new SmooksEditPartFactory());
this.getGraphicalViewer().setContents(rootModel);
@@ -555,6 +590,43 @@
});
}
+ protected void createConnectionModels() {
+ List children = this.rootModel.getChildren();
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ TreeItemRelationModel source = (TreeItemRelationModel) iterator
+ .next();
+ if (source instanceof SourceModel) {
+ for (Iterator iterator2 = children.iterator(); iterator2
+ .hasNext();) {
+ TreeItemRelationModel target = (TreeItemRelationModel) iterator2
+ .next();
+ if (target instanceof TargetModel) {
+ if (canConnected(source, target)) {
+ new LineConnectionModel(source, target);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected boolean canConnected(TreeItemRelationModel source,
+ TreeItemRelationModel target) {
+ Object sourceReferModel = source.getReferenceEntityModel();
+ Object targetReferModel = target.getReferenceEntityModel();
+ if (initConnectionList == null)
+ return false;
+ for (Iterator iterator = initConnectionList.iterator(); iterator
+ .hasNext();) {
+ MappingModel mapping = (MappingModel) iterator.next();
+ Object s = mapping.getSource();
+ Object t = mapping.getTarget();
+ if (s == sourceReferModel && t == targetReferModel)
+ return true;
+ }
+ return false;
+ }
+
public SelectionSynchronizer getSelectionSynchronizer() {
if (selectionSynchronizer == null)
selectionSynchronizer = new SelectionSynchronizer();
@@ -625,17 +697,25 @@
.getSmooksModelAnalyzer(sourceDataTypeID);
IAnalyzer targetModelAnalyzer = AnalyzerFactory.getInstance()
.getSmooksModelAnalyzer(targetDataTypeID);
+ IAnalyzer connectionAnalyzer = AnalyzerFactory.getInstance()
+ .getGraphModelAnalyzer(sourceDataTypeID, targetDataTypeID);
SmooksResourceListType listType = ((DocumentRoot) resource
.getContents().get(0)).getSmooksResourceList();
-
- sourceTreeViewerInputModel = sourceModelAnalyzer
- .buildSourceInputObjects(graph, listType,
- ((IFileEditorInput) input).getFile());
+ if (sourceModelAnalyzer != null)
+ sourceTreeViewerInputModel = sourceModelAnalyzer
+ .buildSourceInputObjects(graph, listType,
+ ((IFileEditorInput) input).getFile());
+ if (targetModelAnalyzer != null)
+ targetTreeViewerInputModel = targetModelAnalyzer
+ .buildTargetInputObjects(graph, listType,
+ ((IFileEditorInput) input).getFile());
+ if (connectionAnalyzer != null) {
+ initConnectionList = connectionAnalyzer
+ .analyzeMappingSmooksModel(listType,
+ sourceTreeViewerInputModel,
+ targetTreeViewerInputModel);
+ }
- targetTreeViewerInputModel = targetModelAnalyzer
- .buildTargetInputObjects(graph, listType,
- ((IFileEditorInput) input).getFile());
-
} catch (IOException e) {
e.printStackTrace();
} catch (CoreException e) {
Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataConnectionModel.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataConnectionModel.java 2008-09-03 22:14:54 UTC (rev 10055)
+++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataConnectionModel.java 2008-09-04 01:33:49 UTC (rev 10056)
@@ -4,6 +4,18 @@
private IConnectableModel source;
private IConnectableModel target;
+ public AbstractStructuredDataConnectionModel(IConnectableModel source,
+ IConnectableModel target) {
+ this.setSource(source);
+ this.setTarget(target);
+ attachSource();
+ attachTarget();
+ }
+
+ public AbstractStructuredDataConnectionModel(){
+
+ }
+
/**
* t�ӵ���ʼ����ӵ�source
*/
Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/LineConnectionModel.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/LineConnectionModel.java 2008-09-03 22:14:54 UTC (rev 10055)
+++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/LineConnectionModel.java 2008-09-04 01:33:49 UTC (rev 10056)
@@ -3,6 +3,15 @@
public class LineConnectionModel extends AbstractStructuredDataConnectionModel {
+ public LineConnectionModel(IConnectableModel source,
+ IConnectableModel target) {
+ super(source, target);
+ }
+
+ public LineConnectionModel(){
+ super();
+ }
+
public void connect() {
this.attachSource();
this.attachTarget();
Modified: workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-03 22:14:54 UTC (rev 10055)
+++ workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-04 01:33:49 UTC (rev 10056)
@@ -13,6 +13,7 @@
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -22,11 +23,8 @@
import org.eclipse.emf.common.command.BasicCommandStack;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
import org.eclipse.emf.ecore.xml.type.AnyType;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
import org.eclipse.emf.edit.command.AddCommand;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -34,6 +32,7 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.smooks.analyzer.IAnalyzer;
+import org.jboss.tools.smooks.analyzer.MappingModel;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
import org.jboss.tools.smooks.graphical.GraphInformations;
import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
@@ -340,8 +339,121 @@
this.analyzeGraphicalModel(root, listType);
}
- public List<LineConnectionModel> analyzeMappingSmooksModel(
- SmooksResourceListType listType) {
+ public List<MappingModel> analyzeMappingSmooksModel(
+ SmooksResourceListType listType, Object sourceObject,
+ Object targetObject) {
+ if (!(sourceObject instanceof JavaBeanModel)
+ || !(targetObject instanceof JavaBeanModel)) {
+ return Collections.EMPTY_LIST;
+ }
+
+ JavaBeanModel source = (JavaBeanModel) sourceObject;
+ JavaBeanModel target = (JavaBeanModel) targetObject;
+ List<MappingModel> mappingModelList = new ArrayList<MappingModel>();
+ List<AbstractResourceConfig> rcl = listType.getAbstractResourceConfig();
+ for (Iterator iterator = rcl.iterator(); iterator.hasNext();) {
+ ResourceConfigType rc = (ResourceConfigType) iterator.next();
+ ResourceType rt = rc.getResource();
+ // find the first BeanPopulator resource config , this is the root.
+ if (rt != null && BEANPOPULATOR.equals(rt.getValue())) {
+ String sourceName = source.getName();
+ Class sourceClazz = source.getBeanClass();
+ if (sourceClazz != null) {
+ sourceName = sourceClazz.getName();
+ }
+ String selector = rc.getSelector();
+ if (sourceName.equals(selector)) {
+ String targetName = target.getName();
+ Class targetClazz = target.getBeanClass();
+ if (targetClazz != null) {
+ targetName = targetClazz.getName();
+ }
+ String beanClass = SmooksModelUtils.getParmaText(
+ "beanClass", rc);
+ if (targetName.equals(beanClass)) {
+ setSelectorIsUsed(sourceName);
+ // create the first connection
+ mappingModelList.add(new MappingModel(source, target));
+ analyzeMappingModelFromResourceConfig(mappingModelList,
+ listType, rc, source, target);
+ }
+ }
+ }
+ }
+
+ return mappingModelList;
+ }
+
+ protected boolean isReferenceSelector(String selector) {
+ return (selector.startsWith("${") && selector.endsWith("}"));
+ }
+
+ protected String getBeanIdWithRawSelectorString(String selector) {
+ selector = selector.substring(2, selector.length() - 1);
+ return selector;
+ }
+
+ protected void analyzeMappingModelFromResourceConfig(
+ List<MappingModel> mappingModelList,
+ SmooksResourceListType resourceList,
+ ResourceConfigType resourceConfig, JavaBeanModel source,
+ JavaBeanModel target) {
+ List bindingList = this
+ .getBindingListFromResourceConfigType(resourceConfig);
+ for (Iterator iterator = bindingList.iterator(); iterator.hasNext();) {
+ AnyType binding = (AnyType) iterator.next();
+ String property = SmooksModelUtils.getAttributeValueFromAnyType(
+ binding, SmooksModelUtils.ATTRIBUTE_PROPERTY);
+ String selector = SmooksModelUtils.getAttributeValueFromAnyType(
+ binding, SmooksModelUtils.ATTRIBUTE_SELECTOR);
+ JavaBeanModel targetModel = findTheChildJavaBeanModel(property,
+ target);
+ JavaBeanModel sourceModel = null;
+ if (targetModel == null)
+ continue;
+ if (isReferenceSelector(selector)) {
+ ResourceConfigType rc = this
+ .findResourceCinfigTypeWithSelector(selector,
+ resourceList);
+ if (rc != null) {
+ String newSelector = rc.getSelector();
+ sourceModel = findTheChildJavaBeanModel(newSelector, source);
+ if (sourceModel != null) {
+ setSelectorIsUsed(newSelector);
+ analyzeMappingModelFromResourceConfig(mappingModelList,
+ resourceList, rc, sourceModel, targetModel);
+ }
+ }
+ } else {
+ sourceModel = findModelWithSelectorString(selector, source);
+ }
+ if(sourceModel != null){
+ mappingModelList.add(new MappingModel(sourceModel,
+ targetModel));
+ }
+ }
+ }
+
+ protected JavaBeanModel findModelWithSelectorString(String selector,
+ JavaBeanModel parentModel) {
+ String[] s = selector.trim().split(" ");
+ String pname = parentModel.getName();
+ Class clazz = parentModel.getBeanClass();
+ JavaBeanModel current = parentModel;
+ if (clazz != null)
+ pname = clazz.getName();
+ if (s != null) {
+ for (int i = 0; i < s.length; i++) {
+ String p = s[i];
+ if (p.equals(pname))
+ continue;
+ JavaBeanModel child = findTheChildJavaBeanModel(p, current);
+ if (child == null)
+ return null;
+ current = child;
+ }
+ return current;
+ }
return null;
}
@@ -488,7 +600,7 @@
// continue;
// }
processBindingPropertyFromTargetModel(listType, property,
- selector, beanModel,classLoader);
+ selector, beanModel, classLoader);
}
}
@@ -496,27 +608,23 @@
protected void processBindingPropertyFromTargetModel(
SmooksResourceListType listType, String property, String selector,
- JavaBeanModel parentModel,ClassLoader classLoader) {
+ JavaBeanModel parentModel, ClassLoader classLoader) {
parentModel.getProperties();
- JavaBeanModel model = this.findTheChildJavaBeanModel(property, parentModel);
- if(model == null){
- model = new JavaBeanModel(null,property);
+ JavaBeanModel model = this.findTheChildJavaBeanModel(property,
+ parentModel);
+ if (model == null) {
+ model = new JavaBeanModel(null, property);
parentModel.addProperty(model);
model.setError("don't exist");
}
-
- if(selector.startsWith("${") && selector.endsWith("}")){
+
+ if (selector.startsWith("${") && selector.endsWith("}")) {
selector = selector.substring(2, selector.length() - 1);
- List rList = listType.getAbstractResourceConfig();
- for (Iterator iterator = rList.iterator(); iterator.hasNext();) {
- ResourceConfigType configType = (ResourceConfigType) iterator.next();
- if(isSelectorIsUsed(configType.getSelector())){
- continue;
- }
- String beanId = this.getBeanIDFromParam(configType);
- if(selector.equals(beanId)){
- this.buildChildrenOfTargetInputModel(listType, model, false, false, configType, classLoader);
- }
+ ResourceConfigType resourceConfig = findResourceCinfigTypeWithSelector(
+ selector, listType);
+ if (resourceConfig != null) {
+ this.buildChildrenOfTargetInputModel(listType, model, false,
+ false, resourceConfig, classLoader);
}
}
}
@@ -557,6 +665,26 @@
}
}
+ protected ResourceConfigType findResourceCinfigTypeWithSelector(
+ String selector, SmooksResourceListType listType) {
+ if (isReferenceSelector(selector)) {
+ selector = this.getBeanIdWithRawSelectorString(selector);
+ }
+ List rl = listType.getAbstractResourceConfig();
+ ResourceConfigType resourceConfig = null;
+ for (Iterator iterator = rl.iterator(); iterator.hasNext();) {
+ ResourceConfigType rct = (ResourceConfigType) iterator.next();
+ if (this.isSelectorIsUsed(rct.getSelector()))
+ continue;
+ String beanId = getBeanIDFromParam(rct);
+ if (selector.equals(beanId)) {
+ resourceConfig = rct;
+ break;
+ }
+ }
+ return resourceConfig;
+ }
+
protected void analyzeBindingSelector(String selector,
JavaBeanModel currentModel, SmooksResourceListType listType,
ClassLoader classLoader) {
@@ -564,19 +692,9 @@
// should get the bean properties
// memory out???
currentModel.getProperties();
- selector = selector.substring(2, selector.length() - 1);
- List rl = listType.getAbstractResourceConfig();
- ResourceConfigType resourceConfig = null;
- for (Iterator iterator = rl.iterator(); iterator.hasNext();) {
- ResourceConfigType rct = (ResourceConfigType) iterator.next();
- if (this.isSelectorIsUsed(rct.getSelector()))
- continue;
- String beanId = getBeanIDFromParam(rct);
- if (selector.equals(beanId)) {
- resourceConfig = rct;
- break;
- }
- }
+ selector = this.getBeanIdWithRawSelectorString(selector);
+ ResourceConfigType resourceConfig = findResourceCinfigTypeWithSelector(
+ selector, listType);
if (resourceConfig != null) {
String referenceSelector = resourceConfig.getSelector();
JavaBeanModel model = findTheChildJavaBeanModel(
@@ -586,7 +704,7 @@
try {
if (classLoader != null) {
clazz = classLoader.loadClass(referenceSelector);
- if (clazz != null)
+ if (clazz != null && model == null)
model = JavaBeanModelFactory
.getJavaBeanModelWithLazyLoad(clazz);
}
@@ -595,11 +713,13 @@
}
// something wrong
if (model == null) {
- model = new JavaBeanModel(null, selector);
+ model = new JavaBeanModel(null, referenceSelector);
model.setError("don't exist");
model.setProperties(new ArrayList());
}
- currentModel.addProperty(model);
+ if(currentModel.getError() != null){
+ currentModel.addProperty(model);
+ }
buildSourceInputProperties(listType, model, false, true,
resourceConfig, classLoader);
}
@@ -650,8 +770,10 @@
* Find the child JavaBeanModel from parent with the child name <br>
* If the parent JavabeanModel is "Collection" or "Array" , the child
* JavabeanModel is the first child of the parent model,it means that the
- * param "name" is useless with the status.
+ * param "name" is useless with the status.<br>
*
+ * TODO The method need to improve!!!!!
+ *
* @param name
* @param parentModel
* @return
Modified: workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/BeanContentProvider.java
===================================================================
--- workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/BeanContentProvider.java 2008-09-03 22:14:54 UTC (rev 10055)
+++ workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/BeanContentProvider.java 2008-09-04 01:33:49 UTC (rev 10056)
@@ -21,6 +21,9 @@
}
public Object getParent(Object arg0) {
+ if(arg0 instanceof JavaBeanModel){
+ return ((JavaBeanModel)arg0).getParent();
+ }
return null;
}
Modified: workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src_test/test/SmooksAnalyzerTester.java
===================================================================
--- workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src_test/test/SmooksAnalyzerTester.java 2008-09-03 22:14:54 UTC (rev 10055)
+++ workspace/dart/plugins/trunk/org.jboss.tools.smooks.javabean/src_test/test/SmooksAnalyzerTester.java 2008-09-04 01:33:49 UTC (rev 10056)
@@ -14,6 +14,7 @@
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
+import java.util.List;
import junit.framework.TestCase;
@@ -37,24 +38,32 @@
GraphicalPackage.eINSTANCE);
Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE);
try {
- ClassLoader classLoader = SmooksAnalyzerTester.class.getClassLoader();
+ ClassLoader classLoader = SmooksAnalyzerTester.class
+ .getClassLoader();
Resource resource = new SmooksResourceFactoryImpl()
.createResource(null);
Resource gr = new XMLResourceFactoryImpl().createResource(null);
- InputStream stream1 = classLoader.getResourceAsStream("test/Test.xml");
- InputStream stream2 = classLoader.getResourceAsStream("test/Test.smooks.graph");
- gr.load(stream2,Collections.EMPTY_MAP);
+ InputStream stream1 = classLoader
+ .getResourceAsStream("test/Test.xml");
+ InputStream stream2 = classLoader
+ .getResourceAsStream("test/Test.smooks.graph");
+ gr.load(stream2, Collections.EMPTY_MAP);
GraphInformations graph = (GraphInformations) gr.getContents().get(
0);
- resource.load(stream1,Collections.EMPTY_MAP);
+ resource.load(stream1, Collections.EMPTY_MAP);
JavaBeanAnalyzer sourceModelAnalyzer = new JavaBeanAnalyzer();
-
+ JavaBeanAnalyzer targetModelAnalyzer = new JavaBeanAnalyzer();
+ JavaBeanAnalyzer connectionsAnalyzer = new JavaBeanAnalyzer();
SmooksResourceListType listType = ((DocumentRoot) resource
.getContents().get(0)).getSmooksResourceList();
- Object obj = sourceModelAnalyzer
- .buildSourceInputObjects(graph, listType, null,classLoader);
- System.out.println(obj);
+ Object source = sourceModelAnalyzer.buildSourceInputObjects(graph,
+ listType, null, classLoader);
+ Object target = targetModelAnalyzer.buildTargetInputObjects(graph,
+ listType, null, classLoader);
+ List connections = connectionsAnalyzer.analyzeMappingSmooksModel(
+ listType, source, target);
+ System.out.println(connections);
} catch (IOException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
17 years, 7 months
JBoss Tools SVN: r10055 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-09-03 18:14:54 -0400 (Wed, 03 Sep 2008)
New Revision: 10055
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
Log:
JBIDE-2688 - server's JRE should default to the same as runtimes.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2008-09-03 20:38:26 UTC (rev 10054)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2008-09-03 22:14:54 UTC (rev 10055)
@@ -24,10 +24,10 @@
import java.util.ArrayList;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
@@ -38,7 +38,10 @@
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jdt.launching.StandardClasspathProvider;
+import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerUtil;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
@@ -76,13 +79,24 @@
String serverHome = getServerHome(jbs);
if( serverHome == null )
throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server " + server.getName() + " is corrupt and the server home is unable to be located."));
-
+ IRuntime rt = jbs.getServer().getRuntime();
+ String jrePath = null;
+ if( rt != null ) {
+ IJBossServerRuntime jbrt = (IJBossServerRuntime)rt.getAdapter(IJBossServerRuntime.class);
+ if( jbrt != null ) {
+ IVMInstall install = jbrt.getVM();
+ IPath path = JavaRuntime.newJREContainerPath(install);
+ jrePath = path.toPortableString();
+ }
+ }
+
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getDefaultArgs(jbs));
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, getDefaultVMArgs(jbs));
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, START_MAIN_TYPE);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + "bin");
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.jboss.ide.eclipse.as.core.launch.classpathProvider");
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, jrePath);
wc.setAttribute(DEFAULTS_SET, true);
}
17 years, 7 months
JBoss Tools SVN: r10054 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/views/server.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-09-03 16:38:26 -0400 (Wed, 03 Sep 2008)
New Revision: 10054
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/views/server/ServerTableViewer.java
Log:
random commit to make sure as.ui works with wst's HEAD (renamed function from animate to animate2 since superclass's method became static)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/views/server/ServerTableViewer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/views/server/ServerTableViewer.java 2008-09-03 17:23:41 UTC (rev 10053)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/views/server/ServerTableViewer.java 2008-09-03 20:38:26 UTC (rev 10054)
@@ -94,7 +94,7 @@
protected String getStateLabel(IServerType serverType, int state, String mode) {
return UIDecoratorManager.getUIDecorator(serverType).getStateLabel(state, mode, myCount);
}
- protected void animate() {
+ protected void animate2() {
myCount ++;
if (myCount > 2)
myCount = 0;
@@ -140,7 +140,7 @@
public void run() {
while (!stopThread) {
try {
- labelProvider.animate();
+ labelProvider.animate2();
final Object[] rootElements = ((ITreeContentProvider)getContentProvider()).getElements(null);
Display.getDefault().asyncExec(new Runnable() {
public void run() {
17 years, 7 months
JBoss Tools SVN: r10053 - in trunk/esb/plugins: org.jboss.tools.esb.project.ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-09-03 13:23:41 -0400 (Wed, 03 Sep 2008)
New Revision: 10053
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/
trunk/esb/plugins/org.jboss.tools.esb.project.ui/
Log:
svn ignore bin
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.project.core
___________________________________________________________________
Name: svn:ignore
+ bin
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.project.ui
___________________________________________________________________
Name: svn:ignore
+ bin
17 years, 7 months