JBoss Tools SVN: r19477 - in trunk: common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core and 6 other directories.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2009-12-18 14:59:06 -0500 (Fri, 18 Dec 2009)
New Revision: 19477
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizard.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizard.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java
trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.properties
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesPreferencePage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-2795, import/export unknown tags templates wizards were started.
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java 2009-12-18 18:39:49 UTC (rev 19476)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XTable.java 2009-12-18 19:59:06 UTC (rev 19477)
@@ -88,7 +88,7 @@
for (int i = 0; i < k; i++) {
TableColumn c = new TableColumn(table, SWT.NONE);
c.setText(provider.getColumnName(i));
- layoutData = new ColumnWeightData(widths[i], Boolean.TRUE.booleanValue());
+ layoutData = new ColumnWeightData(widths[i], true);
layout.addColumnData(layoutData);
}
table.setHeaderVisible(isHeaderVisible);
Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2009-12-18 18:39:49 UTC (rev 19476)
+++ trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2009-12-18 19:59:06 UTC (rev 19477)
@@ -107,7 +107,7 @@
String s = null;
/*
* https://jira.jboss.org/jira/browse/JBIDE-3211
- * Storing project preferences to project scope in .settings
+ * Reading preferences from project scope from .settings
*/
IScopeContext projectScope = new ProjectScope(resource.getProject());
IEclipsePreferences root = projectScope
@@ -123,30 +123,30 @@
s = node.get(getPropertyName().getLocalName(), ""); //$NON-NLS-1$
}
}
- if (s == null || s.length() == 0) {
- /*
- * Old preferences format property value.
- */
- String old = null;
- try {
- old = resource.getPersistentProperty(getPropertyName());
- } catch (CoreException e) {
+ if (s == null || s.length() == 0) {
/*
- * Ignore, there is no properties for this resource.
+ * Old preferences format property value.
*/
- }
- if (old == null || old.length() == 0) {
- return new String[0];
+ String old = null;
+ try {
+ old = resource.getPersistentProperty(getPropertyName());
+ } catch (CoreException e) {
+ /*
+ * Ignore, there is no properties for this resource.
+ */
+ }
+ if (old == null || old.length() == 0) {
+ return new String[0];
+ } else {
+ /*
+ * If there is property stored in the old preferences format
+ * return this value.
+ */
+ return decodeResourceString(old);
+ }
} else {
- /*
- * If there is property stored in the old preferences format
- * return this value.
- */
- return decodeResourceString(old);
+ return decodeResourceString(s);
}
- } else {
- return decodeResourceString(s);
- }
}
//Fix for JBIDE-2979
@@ -193,8 +193,8 @@
private boolean setDeclaredResources(IResource resource, ResourceReference[] entries, int scope, int depth) {
/*
- * https://jira.jboss.org/jira/browse/JBIDE-3211 Reading project
- * Reading preferences from project scope from .settings
+ * https://jira.jboss.org/jira/browse/JBIDE-3211
+ * Storing project preferences to project scope in .settings
*/
IScopeContext projectScope = new ProjectScope(resource.getProject());
IEclipsePreferences root = projectScope
@@ -256,47 +256,47 @@
TreeMap allExternalResources = null;
private TreeMap getAllExternalResources() {
- if (allExternalResources == null) {
- allExternalResources = new TreeMap();
- /*
- * Property value
- */
- String s = null;
-
- /*
- * https://jira.jboss.org/jira/browse/JBIDE-3211 Reading project
- * Reading global preferences from instance scope.
- */
- IScopeContext instanceContext = new InstanceScope();
- Preferences root = instanceContext.getNode(ModelPlugin.PLUGIN_ID);
- if (null != root) {
- Preferences node = root.node(ResourceReferencePlugin.PLUGIN_ID);
- s = node.get(getPropertyName().getLocalName(), ""); //$NON-NLS-1$
- }
- /*
- * If there is property stored in the old preferences format
- * and there are no other properties old value will be returned
- */
- if (s != null && s.length() > 0) {
- parseExternalResources(s);
- } else {
- /*
- * Old preferences format property value.
- */
- String old = null;
- try {
- old = ModelPlugin.getWorkspace().getRoot().getPersistentProperty(getPropertyName());
- } catch (CoreException e) {
+ if (allExternalResources == null) {
+ allExternalResources = new TreeMap();
/*
- * Ignore, there is no properties for this resource.
+ * Property value
*/
- }
- if (old != null && old.length() > 0) {
- parseExternalResources(old);
- }
+ String s = null;
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-3211
+ * Reading global preferences from instance scope.
+ */
+ IScopeContext instanceContext = new InstanceScope();
+ Preferences root = instanceContext.getNode(ModelPlugin.PLUGIN_ID);
+ if (null != root) {
+ Preferences node = root.node(ResourceReferencePlugin.PLUGIN_ID);
+ s = node.get(getPropertyName().getLocalName(), ""); //$NON-NLS-1$
+ }
+ /*
+ * If there is property stored in the old preferences format and
+ * there are no other properties old value will be returned
+ */
+ if (s != null && s.length() > 0) {
+ parseExternalResources(s);
+ } else {
+ /*
+ * Old preferences format property value.
+ */
+ String old = null;
+ try {
+ old = ModelPlugin.getWorkspace().getRoot()
+ .getPersistentProperty(getPropertyName());
+ } catch (CoreException e) {
+ /*
+ * Ignore, there is no properties for this resource.
+ */
+ }
+ if (old != null && old.length() > 0) {
+ parseExternalResources(old);
+ }
+ }
}
- }
- return allExternalResources;
+ return allExternalResources;
}
private void parseExternalResources(String s) {
@@ -313,34 +313,34 @@
}
private void setAllExternalResources() {
- StringBuffer sb = new StringBuffer();
- Iterator it = allExternalResources.keySet().iterator();
- while (it.hasNext()) {
- String path = it.next().toString();
- String list = (String) allExternalResources.get(path);
- if (path != null && list != null && new File(path).exists()) {
- if (sb.length() > 0)
- sb.append('#');
- sb.append(path).append('=').append(list);
+ StringBuffer sb = new StringBuffer();
+ Iterator it = allExternalResources.keySet().iterator();
+ while (it.hasNext()) {
+ String path = it.next().toString();
+ String list = (String) allExternalResources.get(path);
+ if (path != null && list != null && new File(path).exists()) {
+ if (sb.length() > 0)
+ sb.append('#');
+ sb.append(path).append('=').append(list);
+ }
}
- }
- /*
- * https://jira.jboss.org/jira/browse/JBIDE-3211 Reading project
- * Storing global preferences to instance scope to
- * ${workspace}\.metadata\.plugins\org.eclipse.core.runtime\
- * .settings\org.jboss.tools.common.model.prefs
- */
- IScopeContext instanceContext = new InstanceScope();
- Preferences root = instanceContext.getNode(ModelPlugin.PLUGIN_ID);
- if (null != root) {
- Preferences node = root.node(ResourceReferencePlugin.PLUGIN_ID);
- node.put(getPropertyName().getLocalName(), sb.toString());
- try {
- root.flush();
- } catch (BackingStoreException e) {
- ResourceReferencePlugin.getPluginLog().logError(e);
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-3211
+ * Storing global preferences to instance scope to
+ * ${workspace}\.metadata\.plugins\org.eclipse.core.runtime\
+ * .settings\org.jboss.tools.common.model.prefs
+ */
+ IScopeContext instanceContext = new InstanceScope();
+ Preferences root = instanceContext.getNode(ModelPlugin.PLUGIN_ID);
+ if (null != root) {
+ Preferences node = root.node(ResourceReferencePlugin.PLUGIN_ID);
+ node.put(getPropertyName().getLocalName(), sb.toString());
+ try {
+ root.flush();
+ } catch (BackingStoreException e) {
+ ResourceReferencePlugin.getPluginLog().logError(e);
+ }
}
- }
}
public ResourceReference[] getAllResources(IPath path) {
@@ -393,12 +393,16 @@
int checkScope = path.equals(Platform.getLocation()) ? ResourceReference.GLOBAL_SCOPE : ResourceReference.FILE_SCOPE;
b = setDeclaredResources(path, entries, checkScope, 0);
- if(b) changed = path;
+ if(b) {
+ changed = path;
+ }
IPath parent = path.removeLastSegments(1);
int depth = 0;
while(parent != null && parent.segmentCount() > 1) {
b = setDeclaredResources(parent, entries, ResourceReference.FOLDER_SCOPE, depth);
- if(b) changed = parent;
+ if(b) {
+ changed = parent;
+ }
parent = parent.removeLastSegments(1);
depth++;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.properties 2009-12-18 18:39:49 UTC (rev 19476)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.properties 2009-12-18 19:59:06 UTC (rev 19477)
@@ -9,3 +9,7 @@
PreferencePage_ElVariables=El Variables
visualEditorImpl_name=XulRunner Visual Editor
PreferencePage_VpeEditor=Visual Page Editor
+exportUnknownTagsTemplatesWizardName=Export unknown tags templates wizard
+exportUnknownTagsTemplatesWizardDescription=Export unknown tags templates to the external file
+importUnknownTagsTemplatesWizardName=Import unknown tags templates wizard
+importUnknownTagsTemplatesWizardDescription=Import unknown tags templates from the external file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2009-12-18 18:39:49 UTC (rev 19476)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2009-12-18 19:59:06 UTC (rev 19477)
@@ -121,4 +121,32 @@
</dynamic>
</menuContribution>
</extension>
+
+ <extension
+ point="org.eclipse.ui.exportWizards">
+ <wizard
+ id="org.jboss.tools.vpe.editor.wizards.ExportUnknownTagsTemplatesWizard"
+ class="org.jboss.tools.vpe.editor.wizards.ExportUnknownTagsTemplatesWizard"
+ name="%exportUnknownTagsTemplatesWizardName"
+ icon="icons/">
+ <description>
+ %exportUnknownTagsTemplatesWizardDescription
+ </description>
+ </wizard>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.importWizards">
+ <wizard
+ id="org.jboss.tools.vpe.editor.wizards.ImportUnknownTagsTemplatesWizard"
+ class="org.jboss.tools.vpe.editor.wizards.ImportUnknownTagsTemplatesWizard"
+ name="%importUnknownTagsTemplatesWizardName"
+ icon="icons/">
+ <description>
+ %importUnknownTagsTemplatesWizardDescription
+ </description>
+ </wizard>
+ </extension>
+
+
</plugin>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesPreferencePage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesPreferencePage.java 2009-12-18 18:39:49 UTC (rev 19476)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesPreferencePage.java 2009-12-18 19:59:06 UTC (rev 19477)
@@ -30,7 +30,8 @@
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.messages.VpeUIMessages;
-public class TemplatesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, CommandBarListener {
+public class TemplatesPreferencePage extends PreferencePage implements
+ IWorkbenchPreferencePage, CommandBarListener {
static String EDIT = VpeUIMessages.TemplatesPreferencePage_Edit;
static String REMOVE = VpeUIMessages.TemplatesPreferencePage_Remove;
protected TemplatesTableProvider tableProvider;// = new TemplatesTableProvider();
@@ -40,7 +41,8 @@
protected boolean changed;
public TemplatesPreferencePage() {
- noDefaultAndApplyButton();
+// noDefaultAndApplyButton();
+ setPreferenceStore(getPreferenceStore());
init();
}
@@ -95,7 +97,9 @@
update();
}
public boolean performOk() {
- if(changed)VpeTemplateManager.getInstance().setAnyTemplates(dataList);
+ if(changed) {
+ VpeTemplateManager.getInstance().setAnyTemplates(dataList);
+ }
return super.performOk();
}
@@ -103,7 +107,9 @@
VpeAnyData data = (VpeAnyData)dataList.get(index);
VpeEditAnyDialog editDialog = new VpeEditAnyDialog(getShell(), data);
editDialog.open();
- if(data.isChanged()) changed = true;
+ if(data.isChanged()){
+ changed = true;
+ }
}
void remove(int index) {
@@ -112,7 +118,9 @@
}
public void update() {
- if(table != null) table.update();
+ if(table != null){
+ table.update();
+ }
updateBars();
}
@@ -122,6 +130,7 @@
}
private boolean canModify() {
- return table.getSelectionIndex() >= 0;
+ return (table.getSelectionIndex() >= 0);
}
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-12-18 18:39:49 UTC (rev 19476)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-12-18 19:59:06 UTC (rev 19477)
@@ -53,7 +53,8 @@
= "templates/vpe-templates-auto.xml"; //$NON-NLS-1$
static final String TEMPLATES_FOLDER = File.separator + "templates" + File.separator; //$NON-NLS-1$
public static final String VPE_PREFIX = "vpe:"; //$NON-NLS-1$
-
+ public static final String TAG_TEMPLATES = VPE_PREFIX + "templates"; //$NON-NLS-1$
+
static final String TAG_LIST = VPE_PREFIX + "list"; //$NON-NLS-1$
static final String ATTR_LIST_ORDERED = "ordered"; //$NON-NLS-1$
static final String[] ATTR_LIST_PROPERTIES = {
@@ -82,7 +83,6 @@
};
static final String TAG_TEMPLATES_LIST = VPE_PREFIX + "templates-list"; //$NON-NLS-1$
- static final String TAG_TEMPLATES = VPE_PREFIX + "templates"; //$NON-NLS-1$
static final String TAG_TEMPLATE_TAGLIB = VPE_PREFIX + "template-taglib"; //$NON-NLS-1$
static final String TAG_TAG = VPE_PREFIX + "tag"; //$NON-NLS-1$
static final String TAG_IF = VPE_PREFIX + "if"; //$NON-NLS-1$
@@ -768,13 +768,12 @@
return null;
}
-
- public void setAnyTemplates(List<VpeAnyData> templates) {
+ public void setAnyTemplates(List<VpeAnyData> templates, IPath path) {
if (templates != null) {
Set<String> prefixSet = new HashSet<String>();
Element root = XMLUtilities.createDocumentElement(TAG_TEMPLATES);
Document document = root.getOwnerDocument();
-
+
for (Iterator<VpeAnyData> iter = templates.iterator(); iter.hasNext();) {
VpeAnyData data = iter.next();
root.appendChild(createNewTagElement(document, data));
@@ -784,9 +783,8 @@
prefixSet.add(prefix);
}
}
-
+
try {
- IPath path = getAutoTemplates();
// fixed bug [EFWPE-869] - uncomment this line
XMLUtilities.serialize(root, path.toOSString());
} catch(IOException e) {
@@ -794,6 +792,16 @@
}
}
}
+
+ public void setAnyTemplates(List<VpeAnyData> templates) {
+ IPath path;
+ try {
+ path = getAutoTemplates();
+ setAnyTemplates(templates, path);
+ } catch (IOException e) {
+ VpePlugin.reportProblem(e);
+ }
+ }
static public Element createNewTagElement(Document document, VpeAnyData data) {
Element newTagElement = document.createElement(TAG_TAG);
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizard.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizard.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizard.java 2009-12-18 19:59:06 UTC (rev 19477)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.vpe.editor.wizards;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.IExportWizard;
+import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
+
+/**
+ * Wizard that exports Unknown Tags Templates from Preference Page
+ * to the vpe-templates-auto.xml file.
+ *
+ * @author dmaliarevich
+ */
+public class ExportUnknownTagsTemplatesWizard extends Wizard implements
+ IExportWizard {
+
+ private IStructuredSelection selection;
+ private ExportUnknownTagsTemplatesWizardPage mainPage;
+
+ /**
+ * Constructor
+ */
+ public ExportUnknownTagsTemplatesWizard() {
+ setWindowTitle(VpeUIMessages.EXPORT_UNKNOWN_TAGS_PAGE_TITLE);
+ }
+
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+
+ }
+
+ @Override
+ public void addPages() {
+ super.addPages();
+ mainPage = new ExportUnknownTagsTemplatesWizardPage(
+ VpeUIMessages.EXPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE,
+ selection);
+ addPage(mainPage);
+ }
+
+ @Override
+ public boolean canFinish() {
+ return mainPage.isPageComplete();
+ }
+
+ @Override
+ public boolean performFinish() {
+ return mainPage.finish();
+ }
+
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2009-12-18 19:59:06 UTC (rev 19477)
@@ -0,0 +1,342 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.vpe.editor.wizards;
+
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.CheckboxCellEditor;
+import org.eclipse.jface.viewers.ColumnLayoutData;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTException;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.WizardExportResourcesPage;
+import org.jboss.tools.vpe.editor.template.VpeAnyData;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
+import org.jboss.tools.vpe.resref.core.ReferenceWizardPage;
+
+/**
+ * Page for exporting unknown tags templates.
+ *
+ * @author dmaliarevich
+ */
+public class ExportUnknownTagsTemplatesWizardPage extends WizardExportResourcesPage {
+
+ private static final String[] COLUMNS_NAMES = new String[] {
+ "", //$NON-NLS-1$
+ VpeUIMessages.TemplatesTableProvider_TagName,
+ VpeUIMessages.TemplatesTableProvider_TagForDisplay,
+ VpeUIMessages.TemplatesTableProvider_URI,
+ VpeUIMessages.TemplatesTableProvider_Children};
+ private static final int[] COLUMNS_WIDTHS = new int[] {
+ 15, 50, 50, 90, 30
+ };
+
+ private String pathString;
+ private Table tagsTable;
+// private TableViewer tableViewer;
+ private List<VpeAnyData> tagsList;
+ private Button selectAllButton;
+ private Button deselectAllButton;
+
+ /**
+ * Constructor
+ *
+ * @param pageName
+ * @param selection
+ */
+ public ExportUnknownTagsTemplatesWizardPage(String pageName,
+ IStructuredSelection selection) {
+ super(pageName, selection);
+ setTitle(VpeUIMessages.EXPORT_UNKNOWN_TAGS_PAGE_TITLE);
+ setDescription(VpeUIMessages.EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION);
+ setImageDescriptor(ReferenceWizardPage.getImageDescriptor());
+ /*
+ * Initialize tags list
+ */
+ tagsList = VpeTemplateManager.getInstance().getAnyTemplates();
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+ /*
+ * Create main composite element with grid layout.
+ * Two columns.
+ */
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayout(new GridLayout(2, false));
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+ composite.setFont(parent.getFont());
+
+ /*
+ * Create datatable with the list of unknown tags
+ */
+ tagsTable = new Table(composite, SWT.BORDER);
+ TableLayout layout = new TableLayout();
+ tagsTable.setLayout(layout);
+ tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 2));
+ tagsTable.setHeaderVisible(true);
+ tagsTable.setLinesVisible(true);
+// tableViewer = new TableViewer(tagsTable, SWT.MULTI | SWT.H_SCROLL
+// | SWT.V_SCROLL | SWT.FULL_SELECTION);
+ /*
+ * Create columns in the table
+ */
+ ColumnLayoutData columnLayoutData;
+ for (int i = 0; i < COLUMNS_NAMES.length; i++) {
+ TableColumn column = new TableColumn(tagsTable, SWT.NONE);
+ column.setText(COLUMNS_NAMES[i]);
+ columnLayoutData = new ColumnWeightData(COLUMNS_WIDTHS[i], true);
+ layout.addColumnData(columnLayoutData);
+ }
+ /*
+ * Fill the table with stored tags
+ */
+ updateTagsTable();
+ /*
+ * Adding checkbox to the first column
+ */
+// CellEditor[] cellEditors = { new CheckboxCellEditor(tagsTable),
+// new TextCellEditor(tagsTable), new TextCellEditor(tagsTable),
+// new TextCellEditor(tagsTable), new TextCellEditor(tagsTable) };
+// tableViewer.setCellEditors(cellEditors);
+// tableViewer.refresh();
+
+ /*
+ * Add buttons
+ */
+ selectAllButton = new Button(composite, SWT.NONE);
+ selectAllButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
+ selectAllButton.setText(VpeUIMessages.SELECT_ALL);
+
+ deselectAllButton = new Button(composite, SWT.NONE);
+ deselectAllButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
+ deselectAllButton.setText(VpeUIMessages.DESELECT_ALL);
+
+ /*
+ * Make buttons equal size
+ */
+// selectAllButton.setSize(deselectAllButton.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+
+ /*
+ * Adding event listeners to the buttons
+ */
+ selectAllButton.addListener(SWT.Modify, this);
+ selectAllButton.addListener(SWT.Selection, this);
+ deselectAllButton.addListener(SWT.Modify, this);
+ deselectAllButton.addListener(SWT.Selection, this);
+
+ /*
+ * Add path output and browse button
+ */
+ final Text pathText = new Text(composite, SWT.BORDER);
+ pathText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1));
+ pathText.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ pathString = ((Text)e.getSource()).getText();
+ setPageComplete(isPageComplete());
+ }
+ });
+
+ Button browseButton = new Button(composite, SWT.NONE);
+ browseButton.setText(VpeUIMessages.BROWSE_BUTTON_TEXT);
+ browseButton.setLayoutData(new GridData(SWT.NONE, SWT.NONE, false, false, 1, 1));
+ browseButton.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ FileDialog dialog = new FileDialog(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell(), SWT.NONE);
+ String path = dialog.open();
+ if (path != null) {
+ File file = new File(path);
+ pathString = file.toString();
+ pathText.setText(pathString);
+ setPageComplete(isPageComplete());
+ }
+ }
+ });
+
+ /*
+ * Finishing the initialization
+ */
+ updateWidgetEnablements();
+ setPageComplete(determinePageCompletion());
+ setErrorMessage(null); // should not initially have error message
+
+ setControl(composite);
+ }
+
+ @Override
+ protected void createDestinationGroup(Composite parent) {
+ /*
+ * Create nothing
+ */
+ }
+
+ private void updateTagsTable() {
+ if(tagsTable == null || tagsTable.isDisposed()) {
+ return;
+ }
+ int selectionIndex = tagsTable.getSelectionIndex();
+ TableItem tableItem = null;
+ for (int i = 0; i < tagsList.size(); i++) {
+ if(tagsTable.getItemCount() > i) {
+ /*
+ * Use existed items
+ */
+ tableItem = tagsTable.getItem(i);
+ } else {
+ /*
+ * Add necessary item
+ */
+ tableItem = new TableItem(tagsTable, SWT.BORDER, i);
+ }
+ /*
+ * Fill in columns.
+ * Tags table has 5 columns with checkbox in the first column.
+ */
+ String[] itemColumnsData = new String[tagsTable.getColumnCount()];
+ itemColumnsData[0] = ""; //$NON-NLS-1$
+ for (int j = 1; j < itemColumnsData.length; j++) {
+ /*
+ * Getting values from tagList
+ */
+ itemColumnsData[j] = toVisualValue(getValueAt(i, (j-1)));
+ }
+ /*
+ * Set cells text
+ */
+ tableItem.setText(itemColumnsData);
+ /*
+ * Adding checkbox to the first column
+ */
+// TableEditor editor = new TableEditor(tagsTable);
+// Button check = new Button(tagsTable, SWT.CHECK);
+// check.setBackground(tagsTable.getBackground());
+// editor.minimumWidth = check.getSize().x;
+// editor.grabHorizontal = true;
+// editor.setEditor(check, tableItem, 0);
+ }
+
+ /*
+ * Restoring selection index
+ */
+ if (selectionIndex > 0 ) {
+ try {
+ tagsTable.setSelection(selectionIndex);
+ } catch (SWTException e) {
+ /*
+ * Do nothing
+ */
+ }
+ }
+ }
+
+ public String getValueAt(int row, int column) {
+ String result = "List is empty"; //$NON-NLS-1$
+ if (null != tagsList) {
+ VpeAnyData tagItem = (VpeAnyData)tagsList.get(row);
+ switch(column){
+ case 0:
+ result = tagItem.getName();
+ break;
+ case 1:
+ result = tagItem.getTagForDisplay();
+ break;
+ case 2:
+ result = tagItem.getUri();
+ break;
+ case 3:
+ if(tagItem.isChildren()) {
+ result = VpeUIMessages.TemplatesTableProvider_Yes;
+ } else {
+ result = VpeUIMessages.TemplatesTableProvider_No;
+ }
+ break;
+ }
+ }
+ return result;
+ }
+
+ private String toVisualValue(String v) {
+ if(v == null) return ""; //$NON-NLS-1$
+ if(v.indexOf('\n') >= 0) v = v.replace('\n', ' ');
+ if(v.indexOf('\t') >= 0) v = v.replace('\t', ' ');
+ if(v.indexOf('\r') >= 0) v = v.replace('\r', ' ');
+ return v;
+ }
+
+ public void handleEvent(Event event) {
+ Widget source = event.widget;
+ if (source == selectAllButton) {
+ /*
+ * Handle select all event
+ */
+
+ } else if (source == deselectAllButton) {
+ /*
+ * Handle deselect all event
+ */
+
+ } else {
+ /*
+ * Handle chekbox event
+ */
+
+ }
+ }
+
+ @Override
+ public boolean isPageComplete() {
+ /*
+ * Later page should be complete some tags are selected.
+ */
+ boolean isPageComplete = false;
+ if ((pathString != null) && !"".equalsIgnoreCase(pathString)) { //$NON-NLS-1$
+ isPageComplete = true;
+ }
+ return isPageComplete;
+ }
+
+ public boolean finish() {
+ List<VpeAnyData> templates = VpeTemplateManager.getInstance().getAnyTemplates();
+ IPath path = new Path(pathString);
+ VpeTemplateManager.getInstance().setAnyTemplates(templates, path);
+ return true;
+ }
+
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizard.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizard.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizard.java 2009-12-18 19:59:06 UTC (rev 19477)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.vpe.editor.wizards;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
+
+/**
+ *
+ * Wizard that imports Unknown Tags Templates from external xml file.
+ *
+ * @author dmaliarevich
+ */
+public class ImportUnknownTagsTemplatesWizard extends Wizard implements
+ IImportWizard {
+
+ private IStructuredSelection selection;
+ private ImportUnknownTagsTemplatesWizardPage mainPage;
+
+ /**
+ * Constructor
+ */
+ public ImportUnknownTagsTemplatesWizard() {
+
+ }
+
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ this.selection = selection;
+ setWindowTitle(VpeUIMessages.IMPORT_UNKNOWN_TAGS_PAGE_TITLE);
+ }
+
+ @Override
+ public void addPages() {
+ super.addPages();
+ mainPage = new ImportUnknownTagsTemplatesWizardPage(
+ VpeUIMessages.IMPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE,
+ selection);
+ addPage(mainPage);
+ }
+
+ @Override
+ public boolean canFinish() {
+ return false;
+ }
+
+ @Override
+ public boolean performFinish() {
+ return false;
+ }
+
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2009-12-18 19:59:06 UTC (rev 19477)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.vpe.editor.wizards;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.dialogs.WizardResourceImportPage;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
+import org.jboss.tools.vpe.resref.core.ReferenceWizardPage;
+
+
+/**
+ * Page for importing unknown tags templates.
+ *
+ * @author dmaliarevich
+ */
+public class ImportUnknownTagsTemplatesWizardPage extends
+ WizardResourceImportPage {
+
+ /**
+ * Constructor
+ *
+ * @param name
+ * @param selection
+ */
+ public ImportUnknownTagsTemplatesWizardPage(String name,
+ IStructuredSelection selection) {
+ super(name, selection);
+ setTitle(VpeUIMessages.IMPORT_UNKNOWN_TAGS_PAGE_TITLE);
+ setDescription(VpeUIMessages.IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION);
+ setImageDescriptor(ReferenceWizardPage.getImageDescriptor());
+ }
+
+ @Override
+ protected void createSourceGroup(Composite parent) {
+ /*
+ * Create nothing.
+ */
+ }
+
+ @Override
+ protected ITreeContentProvider getFileProvider() {
+ return null;
+ }
+
+ @Override
+ protected ITreeContentProvider getFolderProvider() {
+ return null;
+ }
+
+
+
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-12-18 18:39:49 UTC (rev 19476)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-12-18 19:59:06 UTC (rev 19477)
@@ -138,4 +138,14 @@
public static String VISUAL_APPEARANCE_GROUP_TITLE;
public static String CONFIRMATION_GROUP_TITLE;
public static String TABS_GROUP_TITLE;
+ public static String IMPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE;
+ public static String EXPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE;
+ public static String EXPORT_UNKNOWN_TAGS_PAGE_TITLE;
+ public static String EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION;
+ public static String IMPORT_UNKNOWN_TAGS_PAGE_TITLE;
+ public static String IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION;
+ public static String SELECT_ALL;
+ public static String DESELECT_ALL;
+ public static String BROWSE_BUTTON_TEXT;
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-12-18 18:39:49 UTC (rev 19476)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-12-18 19:59:06 UTC (rev 19477)
@@ -119,4 +119,15 @@
SPLITTING_VERT_TOP_SOURCE=Vertical splitting with Source Editor on the top
SPLITTING_VERT_TOP_VISUAL=Vertical splitting with Visual Editor on the top
SPLITTING_HORIZ_LEFT_SOURCE=Horizontal splitting with Source Editor to the left
-SPLITTING_HORIZ_LEFT_VISUAL=Horizontal splitting with Visual Editor to the left
\ No newline at end of file
+SPLITTING_HORIZ_LEFT_VISUAL=Horizontal splitting with Visual Editor to the left
+
+# Import/Export Unknown Tags Templates Messages
+IMPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE=Import unknown tags templates wizard page
+EXPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE=Export unknown tags templates wizard page
+SELECT_ALL=Select All
+DESELECT_ALL=Deselect All
+BROWSE_BUTTON_TEXT=Browse...
+EXPORT_UNKNOWN_TAGS_PAGE_TITLE=Export unknown tags templates wizard
+EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Export unknown tags templates to external file
+IMPORT_UNKNOWN_TAGS_PAGE_TITLE=Import unknown tags templates wizard
+IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Import unknown tags templates from external file
\ No newline at end of file
15 years
JBoss Tools SVN: r19476 - trunk/jbpm/releng/org.jboss.tools.jbpm3.releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-12-18 13:39:49 -0500 (Fri, 18 Dec 2009)
New Revision: 19476
Modified:
trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.xml
Log:
revert
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.xml
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.xml 2009-12-18 18:39:28 UTC (rev 19475)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.xml 2009-12-18 18:39:49 UTC (rev 19476)
@@ -9,7 +9,7 @@
-->
<!-- load properties and set timestamp for the build -->
- <property file="build.properties.example.linux" />
+ <property file="build.properties" />
<tstamp>
<format property="buildTimestamp" pattern="yyyyMMddHHmm" />
</tstamp>
15 years
JBoss Tools SVN: r19475 - trunk/jbpm/releng/org.jboss.tools.jbpm3.releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-12-18 13:39:28 -0500 (Fri, 18 Dec 2009)
New Revision: 19475
Modified:
trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties
trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h...
trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.linux
trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.macosx
trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.xml
Log:
use repos instead of SDKs for building
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties 2009-12-18 18:36:23 UTC (rev 19474)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties 2009-12-18 18:39:28 UTC (rev 19475)
@@ -18,19 +18,28 @@
JAVA50_HOME=${JAVA_HOME}
JAVA60_HOME=${JAVA_HOME}
-dependencyURLs=\
-http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\
-http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\
-http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\
-http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\
-http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz
-#http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz
+repositoryURLs=http://download.eclipse.org/releases/galileo/,\
+http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
+http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
+IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\
+org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\
+org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group
+
flattenDependencies=true
parallelCompilation=true
generateFeatureVersionSuffix=true
individualSourceBundles=true
+# don't suppress cleanup if tests fail
+noclean=false
+
# do not sign or pack jars
#skipPack=true
skipSign=true
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h...
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... 2009-12-18 18:36:23 UTC (rev 19474)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... 2009-12-18 18:39:28 UTC (rev 19475)
@@ -18,19 +18,28 @@
JAVA50_HOME=${JAVA_HOME}
JAVA60_HOME=${JAVA_HOME}
-dependencyURLs=\
-http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\
-http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\
-http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\
-http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\
-http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz
-#http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz
+repositoryURLs=http://download.eclipse.org/releases/galileo/,\
+http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
+http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
+IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\
+org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\
+org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group
+
flattenDependencies=true
parallelCompilation=true
generateFeatureVersionSuffix=true
individualSourceBundles=true
+# don't suppress cleanup if tests fail
+noclean=false
+
# do not sign or pack jars
#skipPack=true
skipSign=true
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.linux
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.linux 2009-12-18 18:36:23 UTC (rev 19474)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.linux 2009-12-18 18:39:28 UTC (rev 19475)
@@ -14,7 +14,7 @@
build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
-# Re-use local sources?
+# If using local sources, must copy or symlink jbosstools-trunk/flow/* into jbosstools-trunk/jbpm/ to find all plugins/features
localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/jbpm
relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm3.releng
relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder
@@ -25,25 +25,34 @@
JAVA50_HOME=/usr/lib/jvm/java
JAVA60_HOME=/usr/lib/jvm/java
-dependencyURLs=\
-http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\
-http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\
-http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\
-http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\
-http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz
+repositoryURLs=http://download.eclipse.org/releases/galileo/,\
+http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
+http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
+IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\
+org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\
+org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group
+
flattenDependencies=true
parallelCompilation=true
generateFeatureVersionSuffix=true
individualSourceBundles=true
+# don't suppress cleanup if tests fail
+noclean=false
+
+# do not sign or pack jars
+#skipPack=true
+skipSign=true
+
domainNamespace=*
projNamespace=org.jboss.tools.jbpm3
projRelengName=org.jboss.tools.jbpm3.releng
-# needed for Hudson, not for local?
-#projRelengRoot=svn://svn.jboss.org/repos/jbosstools/trunk/jmx
-#projRelengPath=releng
-#basebuilderBranch=R35_M6
-
## END PROJECT BUILD PROPERTIES ##
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.macosx
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.macosx 2009-12-18 18:36:23 UTC (rev 19474)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.macosx 2009-12-18 18:39:28 UTC (rev 19475)
@@ -12,10 +12,9 @@
mainFeatureToBuildID=org.jboss.tools.jbpm3.sdk.feature
testFeatureToBuildID=org.jboss.tools.jbpm3.tests.feature
-# "tests" step may not work on Mac OS X
-build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
+build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup
-# Re-use local sources?
+# If using local sources, must copy or symlink jbosstools-trunk/flow/* into jbosstools-trunk/jbpm/ to find all plugins/features
localSourceCheckoutDir=/Users/nboldt/workspace/jbosstools-trunk/jbpm
relengBuilderDir=/Users/nboldt/workspace/jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm3.releng
relengBaseBuilderDir=/Users/nboldt/workspace/org.eclipse.releng.basebuilder
@@ -26,25 +25,34 @@
JAVA50_HOME=/System/Library/Frameworks/JavaVM.framework/Home
JAVA60_HOME=/System/Library/Frameworks/JavaVM.framework/Home
-dependencyURLs=\
-http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\
-http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\
-http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\
-http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\
-http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-macosx-carbon.tar.gz
+repositoryURLs=http://download.eclipse.org/releases/galileo/,\
+http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
+http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
+IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\
+org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\
+org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group
+
flattenDependencies=true
parallelCompilation=true
generateFeatureVersionSuffix=true
individualSourceBundles=true
+# don't suppress cleanup if tests fail
+noclean=false
+
+# do not sign or pack jars
+#skipPack=true
+skipSign=true
+
domainNamespace=*
projNamespace=org.jboss.tools.jbpm3
projRelengName=org.jboss.tools.jbpm3.releng
-# needed for Hudson, not for local?
-#projRelengRoot=svn://svn.jboss.org/repos/jbosstools/trunk/jmx
-#projRelengPath=releng
-#basebuilderBranch=R35_M6
-
## END PROJECT BUILD PROPERTIES ##
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.xml
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.xml 2009-12-18 18:36:23 UTC (rev 19474)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.xml 2009-12-18 18:39:28 UTC (rev 19475)
@@ -9,7 +9,7 @@
-->
<!-- load properties and set timestamp for the build -->
- <property file="build.properties" />
+ <property file="build.properties.example.linux" />
<tstamp>
<format property="buildTimestamp" pattern="yyyyMMddHHmm" />
</tstamp>
15 years
JBoss Tools SVN: r19474 - branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm4.releng/maps.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-12-18 13:36:23 -0500 (Fri, 18 Dec 2009)
New Revision: 19474
Modified:
branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/jbpm4.map
Log:
switch branch map to use branch sources
Modified: branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/jbpm4.map
===================================================================
--- branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/jbpm4.map 2009-12-18 18:35:21 UTC (rev 19473)
+++ branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/jbpm4.map 2009-12-18 18:36:23 UTC (rev 19474)
@@ -2,20 +2,20 @@
!*** See common.map for features, plugins, and tests common to both jbpm3 and jbpm4.
!*** features
-feature@org.jboss.tools.jbpm4.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm4.feature
-feature@org.jboss.tools.jbpm4.sdk.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature
-feature@org.jboss.tools.flow.jpdl4.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature
-feature@org.jboss.tools.flow.common.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/flow/features/org.jboss.tools.flow.common.feature
+feature@org.jboss.tools.jbpm4.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/features/org.jboss.tools.jbpm4.feature
+feature@org.jboss.tools.jbpm4.sdk.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/features/org.jboss.tools.jbpm4.sdk.feature
+feature@org.jboss.tools.flow.jpdl4.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/features/org.jboss.tools.flow.jpdl4.feature
+feature@org.jboss.tools.flow.common.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/flow/features/org.jboss.tools.flow.common.feature
!*** plugins
-plugin@org.jboss.tools.flow.jpdl4=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4
-plugin@org.jboss.tools.flow.jpdl4.multipage=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage
-plugin@org.jboss.tools.flow.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/flow/plugins/org.jboss.tools.flow.common
+plugin@org.jboss.tools.flow.jpdl4=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/plugins/org.jboss.tools.flow.jpdl4
+plugin@org.jboss.tools.flow.jpdl4.multipage=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage
+plugin@org.jboss.tools.flow.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/flow/plugins/org.jboss.tools.flow.common
!*** test feature
-feature@org.jboss.tools.jbpm4.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature
+feature@org.jboss.tools.jbpm4.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/features/org.jboss.tools.jbpm4.tests.feature
!*** test plugins
-plugin@org.jboss.tools.flow.jpdl4.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test
-plugin@org.jboss.tools.flow.jpdl4.multipage.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test
-plugin@org.jboss.tools.flow.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/flow/tests/org.jboss.tools.flow.common.test
+plugin@org.jboss.tools.flow.jpdl4.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/tests/org.jboss.tools.flow.jpdl4.test
+plugin@org.jboss.tools.flow.jpdl4.multipage.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test
+plugin@org.jboss.tools.flow.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/flow/tests/org.jboss.tools.flow.common.test
15 years
JBoss Tools SVN: r19473 - branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm3.releng/maps.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-12-18 13:35:21 -0500 (Fri, 18 Dec 2009)
New Revision: 19473
Modified:
branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/jbpm3.map
Log:
switch branch map to use branch sources
Modified: branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/jbpm3.map
===================================================================
--- branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/jbpm3.map 2009-12-18 17:48:02 UTC (rev 19472)
+++ branches/jbosstools-3.1.0.RC1/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/jbpm3.map 2009-12-18 18:35:21 UTC (rev 19473)
@@ -2,15 +2,15 @@
!*** See common.map for features, plugins, and tests common to both jbpm3 and jbpm4.
!*** features
-feature@org.jboss.tools.jbpm3.sdk.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature
-feature@org.jboss.tools.jbpm3.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm3.feature
-feature@org.jbpm.gd.jpdl.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jbpm.gd.jpdl.feature
+feature@org.jboss.tools.jbpm3.sdk.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/features/org.jboss.tools.jbpm3.sdk.feature
+feature@org.jboss.tools.jbpm3.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/features/org.jboss.tools.jbpm3.feature
+feature@org.jbpm.gd.jpdl.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/features/org.jbpm.gd.jpdl.feature
!*** plugins
-plugin@org.jbpm.gd.jpdl=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jbpm.gd.jpdl
+plugin@org.jbpm.gd.jpdl=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/plugins/org.jbpm.gd.jpdl
!*** test feature
-feature@org.jboss.tools.jbpm3.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature
+feature@org.jboss.tools.jbpm3.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/features/org.jboss.tools.jbpm3.tests.feature
!*** test plugins
-plugin@org.jbpm.gd.jpdl.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jbpm.gd.jpdl.test
+plugin@org.jbpm.gd.jpdl.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/jbosstools-3.1.0.RC1/jbpm/tests/org.jbpm.gd.jpdl.test
15 years
JBoss Tools SVN: r19472 - trunk/common/releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-12-18 12:48:02 -0500 (Fri, 18 Dec 2009)
New Revision: 19472
Added:
trunk/common/releng/jbosstools-trunk common releng build.xml.launch
Log:
add launcher for common
Added: trunk/common/releng/jbosstools-trunk common releng build.xml.launch
===================================================================
--- trunk/common/releng/jbosstools-trunk common releng build.xml.launch (rev 0)
+++ trunk/common/releng/jbosstools-trunk common releng build.xml.launch 2009-12-18 17:48:02 UTC (rev 19472)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${container}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/jbosstools-trunk/common/releng/build.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/jbosstools-trunk/common/releng}/buildlog.latest.txt"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jbosstools-trunk"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jbosstools-trunk/common/releng/build.xml}"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
Property changes on: trunk/common/releng/jbosstools-trunk common releng build.xml.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years
JBoss Tools SVN: r19471 - trunk/documentation/whatsnew/vpe.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2009-12-18 12:05:45 -0500 (Fri, 18 Dec 2009)
New Revision: 19471
Modified:
trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.CR1.html
Log:
note about cocoa 32bit support
Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.CR1.html 2009-12-18 16:50:52 UTC (rev 19470)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.CR1.html 2009-12-18 17:05:45 UTC (rev 19471)
@@ -23,21 +23,40 @@
</tr>
<tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>XULRunner
- 1.9</b></td>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>XULRunner 1.9</b></td>
<td valign="top">
<p>Visual Editor is now based on Mozilla Xulrunner 1.9.1.2</p>
<p>This means better performance, a lot of bugfixes
and greater portability allowing us to
support more platforms in the future.</p>
+
<p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-2248">Related
Jira</a></small></p>
</td>
</tr>
+
<tr>
<td colspan="2">
<hr />
+ </td>
+ </tr>
+
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Visual Page Editor on OSX Cocoa 32-bit</b></td>
+ <td valign="top">
+ <p>Visual Editor is available on OS X (Snow Leopard) Cocoa 32-bit version.</p>
+
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-5419">Related
+ Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
<h3>JSF2 Composite UI Components Support</h3>
<hr />
</td>
15 years
JBoss Tools SVN: r19470 - in trunk/documentation/whatsnew: esb and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2009-12-18 11:50:52 -0500 (Fri, 18 Dec 2009)
New Revision: 19470
Modified:
trunk/documentation/whatsnew/esb/esb-news-1.3.0.CR1.html
trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html
trunk/documentation/whatsnew/index.html
Log:
fix wrong esb link
Modified: trunk/documentation/whatsnew/esb/esb-news-1.3.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/esb/esb-news-1.3.0.CR1.html 2009-12-18 16:47:21 UTC (rev 19469)
+++ trunk/documentation/whatsnew/esb/esb-news-1.3.0.CR1.html 2009-12-18 16:50:52 UTC (rev 19470)
@@ -6,12 +6,12 @@
<meta http-equiv="Content-Language" content="en-us" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="../whatsnew.css"/>
-<title>ESB tools 1.1.0.CR1 What's New</title>
+<title>ESB tools 1.3.0.CR1 What's New</title>
</head>
<body>
-<h1>ESB tools 1.1.0.CR1 What's New</h1>
+<h1>ESB tools 1.3.0.CR1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../smooks/smooks-news-1.1.0.M4.html">Smooks Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
Modified: trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html 2009-12-18 16:47:21 UTC (rev 19469)
+++ trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html 2009-12-18 16:50:52 UTC (rev 19470)
@@ -11,7 +11,7 @@
<body>
<h1>Examples 1.1.0.M4 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../esb/esb-news-1.1.0.CR1.html">ESB Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../esb/esb-news-1.3.0.CR1.html">ESB Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2009-12-18 16:47:21 UTC (rev 19469)
+++ trunk/documentation/whatsnew/index.html 2009-12-18 16:50:52 UTC (rev 19470)
@@ -34,7 +34,7 @@
<p><a href="maven/maven-news-1.0.0.CR1.html">Maven Tools</a></p>
<p><a href="smooks/smooks-news-1.1.0.CR1.html">Smooks Tools</a></p>
<p><a href="examples/examples-news-1.1.0.M4.html">Project Examples</a></p>
- <p><a href="esb/esb-news-1.1.0.CR1.html">ESB Tools</a></p>
+ <p><a href="esb/esb-news-1.3.0.CR1.html">ESB Tools</a></p>
</td>
</tr>
15 years
JBoss Tools SVN: r19469 - trunk/documentation/whatsnew/vpe.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2009-12-18 11:47:21 -0500 (Fri, 18 Dec 2009)
New Revision: 19469
Modified:
trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.CR1.html
Log:
removed redundant internal toolbar section
Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.CR1.html 2009-12-18 16:34:57 UTC (rev 19468)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.CR1.html 2009-12-18 16:47:21 UTC (rev 19469)
@@ -187,25 +187,6 @@
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Internal
toolbar</b></td>
<td valign="top">
- <p>Visual editor toolbar was extended by three new tools:</p>
- <ul>
- <li>Show/hide none-visual tags</li>
- <li>Show/hide text formatting toolbar</li>
- <li>Show/hide selection bar</li>
- </ul>
- <p><small><a
- href="https://jira.jboss.org/jira/browse/JBIDE-4914">Related Jira</a></small></p>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr />
- </td>
- </tr>
- <tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Internal
- toolbar</b></td>
- <td valign="top">
<p>Visual editor toolbar have been redesigned so it
now has new icons and three new buttons:</p>
<ul>
15 years
JBoss Tools SVN: r19468 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-12-18 11:34:57 -0500 (Fri, 18 Dec 2009)
New Revision: 19468
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4943
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2009-12-18 16:24:22 UTC (rev 19467)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2009-12-18 16:34:57 UTC (rev 19468)
@@ -53,4 +53,13 @@
* @return a set of observer methods of the bean
*/
Set<IObserverMethod> getObserverMethods();
+
+
+ /**
+ * Returns all directly derived classes that declare annotation @Specializes
+ *
+ * @return
+ */
+ Set<? extends IClassBean> getSpecializingBeans();
+
}
\ No newline at end of file
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java 2009-12-18 16:34:57 UTC (rev 19468)
@@ -0,0 +1,118 @@
+package org.jboss.tools.cdi.internal.core.impl;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.tools.common.text.INodeReference;
+
+public class BeansXMLData {
+
+ private Set<INodeReference> interceptors = new HashSet<INodeReference>();
+ private Set<INodeReference> decorators = new HashSet<INodeReference>();
+ private Set<INodeReference> stereotypeAlternatives = new HashSet<INodeReference>();
+ private Set<INodeReference> typeAlternatives = new HashSet<INodeReference>();
+
+ private Set<String> interceptorTypes = new HashSet<String>();
+ private Set<String> decoratorTypes = new HashSet<String>();
+ private Set<String> stereotypeAlternativeTypes = new HashSet<String>();
+ private Set<String> typeAlternativeTypes = new HashSet<String>();
+
+ public BeansXMLData() {}
+
+ public void clean() {
+ synchronized(interceptors) {
+ interceptors.clear();
+ }
+ synchronized (decorators) {
+ decorators.clear();
+ }
+ synchronized (stereotypeAlternatives) {
+ stereotypeAlternatives.clear();
+ }
+ synchronized (typeAlternatives) {
+ typeAlternatives.clear();
+ }
+ synchronized (interceptorTypes) {
+ interceptorTypes.clear();
+ }
+ synchronized (decoratorTypes) {
+ decoratorTypes.clear();
+ }
+ synchronized (stereotypeAlternativeTypes) {
+ stereotypeAlternativeTypes.clear();
+ }
+ synchronized (typeAlternativeTypes) {
+ typeAlternativeTypes.clear();
+ }
+ }
+
+ public Set<INodeReference> getInterceptors() {
+ return interceptors;
+ }
+
+ public Set<INodeReference> getDecorators() {
+ return decorators;
+ }
+
+ public Set<INodeReference> getStereotypeAlternatives() {
+ return stereotypeAlternatives;
+ }
+
+ public Set<INodeReference> getTypeAlternatives() {
+ return typeAlternatives;
+ }
+
+ public Set<String> getInterceptorTypes() {
+ return interceptorTypes;
+ }
+
+ public Set<String> getDecoratorTypes() {
+ return decoratorTypes;
+ }
+
+ public Set<String> getStereotypeAlternativeTypes() {
+ return stereotypeAlternativeTypes;
+ }
+
+ public Set<String> getTypeAlternativeTypes() {
+ return typeAlternativeTypes;
+ }
+
+ public void addInterceptor(INodeReference r) {
+ synchronized (interceptors) {
+ interceptors.add(r);
+ }
+ if (r.getValue() != null)
+ synchronized (interceptorTypes) {
+ interceptorTypes.add(r.getValue());
+ }
+ }
+
+ public void addDecorator(INodeReference r) {
+ synchronized (decorators) {
+ decorators.add(r);
+ }
+ synchronized (decoratorTypes) {
+ decoratorTypes.add(r.getValue());
+ }
+ }
+
+ public void addStereotypeAlternative(INodeReference r) {
+ synchronized (stereotypeAlternatives) {
+ stereotypeAlternatives.add(r);
+ }
+ synchronized (stereotypeAlternativeTypes) {
+ stereotypeAlternativeTypes.add(r.getValue());
+ }
+ }
+
+ public void addTypeAlternative(INodeReference r) {
+ synchronized (typeAlternatives) {
+ typeAlternatives.add(r);
+ }
+ synchronized (typeAlternativeTypes) {
+ typeAlternativeTypes.add(r.getValue());
+ }
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2009-12-18 16:24:22 UTC (rev 19467)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2009-12-18 16:34:57 UTC (rev 19468)
@@ -56,12 +56,9 @@
private Map<IPath, Set<IBean>> beansByPath = new HashMap<IPath, Set<IBean>>();
private Map<String, Set<IBean>> beansByName = new HashMap<String, Set<IBean>>();
private Set<IBean> namedBeans = new HashSet<IBean>();
-
- private Set<INodeReference> interceptors = new HashSet<INodeReference>();
- private Set<INodeReference> decorators = new HashSet<INodeReference>();
- private Set<INodeReference> stereotypeAlternatives = new HashSet<INodeReference>();
- private Set<INodeReference> typeAlternatives = new HashSet<INodeReference>();
+ private Map<IType, ClassBean> classBeans = new HashMap<IType, ClassBean>();
+ BeansXMLData beansXMLData = new BeansXMLData();
public CDIProject() {}
@@ -75,6 +72,7 @@
public List<INodeReference> getAlternativeClasses() {
List<INodeReference> result = new ArrayList<INodeReference>();
+ Set<INodeReference> typeAlternatives = beansXMLData.getTypeAlternatives();
synchronized (typeAlternatives) {
result.addAll(typeAlternatives);
}
@@ -83,19 +81,26 @@
public List<INodeReference> getAlternativeStereotypes() {
List<INodeReference> result = new ArrayList<INodeReference>();
+ Set<INodeReference> stereotypeAlternatives = beansXMLData.getStereotypeAlternatives();
synchronized (stereotypeAlternatives) {
result.addAll(stereotypeAlternatives);
}
return result;
}
+ public boolean isClassAlternativeActivated(String fullQualifiedTypeName) {
+ return beansXMLData.getTypeAlternativeTypes().contains(fullQualifiedTypeName);
+ }
+
public List<INodeReference> getAlternatives(String fullQualifiedTypeName) {
List<INodeReference> result = new ArrayList<INodeReference>();
+ Set<INodeReference> typeAlternatives = beansXMLData.getTypeAlternatives();
synchronized (typeAlternatives) {
for (INodeReference r: typeAlternatives) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
}
}
+ Set<INodeReference> stereotypeAlternatives = beansXMLData.getStereotypeAlternatives();
synchronized (stereotypeAlternatives) {
for (INodeReference r: stereotypeAlternatives) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
@@ -166,6 +171,7 @@
public List<INodeReference> getDecoratorClasses() {
List<INodeReference> result = new ArrayList<INodeReference>();
+ Set<INodeReference> decorators = beansXMLData.getDecorators();
synchronized (decorators) {
result.addAll(decorators);
}
@@ -174,6 +180,7 @@
public List<INodeReference> getDecoratorClasses(String fullQualifiedTypeName) {
List<INodeReference> result = new ArrayList<INodeReference>();
+ Set<INodeReference> decorators = beansXMLData.getDecorators();
synchronized (decorators) {
for (INodeReference r: decorators) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
@@ -184,6 +191,7 @@
public List<INodeReference> getInterceptorClasses() {
List<INodeReference> result = new ArrayList<INodeReference>();
+ Set<INodeReference> interceptors = beansXMLData.getInterceptors();
synchronized (interceptors) {
result.addAll(interceptors);
}
@@ -193,6 +201,7 @@
public List<INodeReference> getInterceptorClasses(
String fullQualifiedTypeName) {
List<INodeReference> result = new ArrayList<INodeReference>();
+ Set<INodeReference> interceptors = beansXMLData.getInterceptors();
synchronized (interceptors) {
for (INodeReference r: interceptors) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
@@ -351,9 +360,9 @@
}
public void update() {
+ rebuildXML();
rebuildAnnotationTypes();
rebuildBeans();
- rebuildXML();
}
void rebuildAnnotationTypes() {
@@ -393,16 +402,10 @@
}
void rebuildBeans() {
- synchronized (beansByPath) {
- beansByPath.clear();
- }
- synchronized (beansByName) {
- beansByName.clear();
- }
- synchronized (namedBeans) {
- namedBeans.clear();
- }
List<TypeDefinition> typeDefinitions = n.getDefinitions().getTypeDefinitions();
+ List<IBean> beans = new ArrayList<IBean>();
+ Map<IType, ClassBean> newClassBeans = new HashMap<IType, ClassBean>();
+
for (TypeDefinition typeDefinition : typeDefinitions) {
ClassBean bean = null;
if(typeDefinition.getInterceptorAnnotation() != null) {
@@ -416,12 +419,41 @@
}
bean.setParent(this);
bean.setDefinition(typeDefinition);
- addBean(bean);
+
+ beans.add(bean);
+ newClassBeans.put(typeDefinition.getType(), bean);
+
Set<IProducer> ps = bean.getProducers();
for (IProducer producer: ps) {
- addBean(producer);
+ beans.add(producer);
}
}
+
+ for (ClassBean bean: newClassBeans.values()) {
+ ParametedType s = bean.getDefinition().getSuperType();
+ if(s != null && s.getType() != null) {
+ ClassBean superClassBean = newClassBeans.get(s.getType());
+ if(superClassBean != null) {
+ bean.setSuperClassBean(superClassBean);
+ }
+ }
+ }
+
+
+ synchronized (beansByPath) {
+ beansByPath.clear();
+ }
+ synchronized (beansByName) {
+ beansByName.clear();
+ }
+ synchronized (namedBeans) {
+ namedBeans.clear();
+ }
+ classBeans = newClassBeans;
+ for (IBean bean: beans) {
+ addBean(bean);
+ }
+
System.out.println("Project=" + getNature().getProject());
System.out.println("Qualifiers=" + qualifiers.size());
System.out.println("Stereotypes=" + stereotypes.size());
@@ -461,31 +493,20 @@
}
void rebuildXML() {
- synchronized (interceptors) {
- interceptors.clear();
- }
- synchronized (decorators) {
- decorators.clear();
- }
- synchronized (stereotypeAlternatives) {
- stereotypeAlternatives.clear();
- }
- synchronized (typeAlternatives) {
- typeAlternatives.clear();
- }
+ beansXMLData.clean();
Set<BeansXMLDefinition> beanXMLs = n.getDefinitions().getBeansXMLDefinitions();
for (BeansXMLDefinition b: beanXMLs) {
- synchronized (interceptors) {
- interceptors.addAll(b.getInterceptors());
+ for (INodeReference r: b.getInterceptors()) {
+ beansXMLData.addInterceptor(r);
}
- synchronized (decorators) {
- decorators.addAll(b.getDecorators());
+ for (INodeReference r: b.getDecorators()) {
+ beansXMLData.addDecorator(r);
}
- synchronized (stereotypeAlternatives) {
- stereotypeAlternatives.addAll(b.getStereotypeAlternatives());
+ for (INodeReference r: b.getStereotypeAlternatives()) {
+ beansXMLData.addStereotypeAlternative(r);
}
- synchronized (typeAlternatives) {
- typeAlternatives.addAll(b.getTypeAlternatives());
+ for (INodeReference r: b.getTypeAlternatives()) {
+ beansXMLData.addTypeAlternative(r);
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2009-12-18 16:24:22 UTC (rev 19467)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2009-12-18 16:34:57 UTC (rev 19468)
@@ -45,6 +45,9 @@
*
*/
public class ClassBean extends AbstractBeanElement implements IClassBean {
+ protected ClassBean superClassBean = null;
+ protected Set<ClassBean> specializingClassBeans = new HashSet<ClassBean>();
+
protected List<BeanField> fields = new ArrayList<BeanField>();
protected List<BeanMethod> methods = new ArrayList<BeanMethod>();
@@ -99,6 +102,17 @@
return result;
}
+ public void setSuperClassBean(ClassBean bean) {
+ superClassBean = bean;
+ if(superClassBean != null && isSpecializing()) {
+ superClassBean.specializingClassBeans.add(this);
+ }
+ }
+
+ public ClassBean getSuperClassBean() {
+ return superClassBean;
+ }
+
public Set<IBeanMethod> getDisposers() {
// TODO
return new HashSet<IBeanMethod>();
@@ -174,6 +188,10 @@
}
public String getName() {
+ ClassBean specialized = getSpecializedBean();
+ if(specialized != null) {
+ return specialized.getName();
+ }
AnnotationDeclaration named = findNamedAnnotation();
if(named == null) return null;
@@ -205,14 +223,17 @@
return null;
}
- public IBean getSpecializedBean() {
+ public ClassBean getSpecializedBean() {
if(getDefinition().getSpecializesAnnotation() == null) {
return null;
}
- // TODO Auto-generated method stub
- return null;
+ return superClassBean;
}
+ public Set<ClassBean> getSpecializingBeans() {
+ return specializingClassBeans;
+ }
+
public IAnnotationDeclaration getSpecializesAnnotationDeclaration() {
return getDefinition().getSpecializesAnnotation();
}
@@ -233,8 +254,16 @@
}
public boolean isEnabled() {
+ if(!specializingClassBeans.isEmpty()) {
+ return false;
+ }
+ if(getDefinition().getAlternativeAnnotation() != null) {
+ if(!getCDIProject().isClassAlternativeActivated(getDefinition().getQualifiedName())) {
+ return false;
+ }
+ }
// TODO
- return false;
+ return true;
}
public boolean isSpecializing() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2009-12-18 16:24:22 UTC (rev 19467)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2009-12-18 16:34:57 UTC (rev 19468)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
+import java.util.ArrayList;
+import java.util.List;
+
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.IParametedType;
@@ -21,6 +24,7 @@
public class ParametedType implements IParametedType {
protected IType type;
protected String signature;
+ protected List<ParametedType> parameterTypes = new ArrayList<ParametedType>();
public ParametedType() {}
@@ -32,8 +36,16 @@
return signature;
}
+ public void setType(IType type) {
+ this.type = type;
+ }
+
public void setSignature(String signature) {
this.signature = signature;
}
+ public void addParameter(ParametedType p) {
+ parameterTypes.add(p);
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2009-12-18 16:24:22 UTC (rev 19467)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2009-12-18 16:34:57 UTC (rev 19468)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.cdi.internal.core.impl.ParametedType;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
@@ -27,6 +28,7 @@
public class AbstractTypeDefinition extends AbstractMemberDefinition {
protected String qualifiedName;
protected IType type;
+ protected ParametedType superType = null;
protected Set<IParametedType> inheritedTypes = new HashSet<IParametedType>();
public AbstractTypeDefinition() {}
@@ -48,24 +50,15 @@
this.type = contextType;
super.init(contextType, context);
qualifiedName = getType().getFullyQualifiedName();
- String sc = type.getSuperclassTypeSignature();
- if(sc != null) {
- //TODO process parameter types correctly!!!
- sc = EclipseJavaUtil.resolveTypeAsString(contextType, sc);
- if(sc != null && sc.length() > 0) {
- IType t = EclipseJavaUtil.findType(contextType.getJavaProject(), sc);
-//TODO
-// if(t != null) inheritedTypes.add(t);
- }
+ if(!type.isInterface() && !type.isAnnotation()) {
+ String sc = type.getSuperclassTypeSignature();
+ superType = ParametedTypeFactory.getParametedType(type, sc);
+ if(superType != null) inheritedTypes.add(superType);
}
String[] is = type.getSuperInterfaceTypeSignatures();
if(is != null) for (int i = 0; i < is.length; i++) {
- String c = EclipseJavaUtil.resolveTypeAsString(contextType, is[i]);
- if(c != null && c.length() > 0) {
- IType t = EclipseJavaUtil.findType(contextType.getJavaProject(), c);
-//TODO
-// if(t != null) inheritedTypes.add(t);
- }
+ ParametedType t = ParametedTypeFactory.getParametedType(type, is[i]);
+ if(t != null) inheritedTypes.add(t);
}
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2009-12-18 16:34:57 UTC (rev 19468)
@@ -0,0 +1,52 @@
+package org.jboss.tools.cdi.internal.core.impl.definition;
+
+import java.util.StringTokenizer;
+
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.internal.core.impl.ParametedType;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
+
+public class ParametedTypeFactory {
+
+ public static ParametedType getParametedType(IType context, String typeSignature) throws JavaModelException {
+ if(typeSignature == null) return null;
+ ParametedType result = new ParametedType();
+ result.setSignature(typeSignature);
+ int startToken = typeSignature.indexOf('<');
+ if(startToken < 0) {
+ String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(context, typeSignature);
+ if(resovedTypeName == null) return null;
+ result.setSignature(resovedTypeName);
+ IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName);
+ if(type != null) {
+ result.setType(type);
+ return result;
+ }
+ } else {
+ int endToken = typeSignature.lastIndexOf('>');
+ if(endToken < startToken) return null;
+ String typeName = typeSignature.substring(0, startToken) + typeSignature.substring(endToken + 1);
+ String params = typeSignature.substring(startToken + 1, endToken);
+ String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(context, typeName);
+ if(resovedTypeName == null) return null;
+ IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName);
+ if(type != null) {
+ result.setType(type);
+ result.setSignature(resovedTypeName + '<' + params + '>');
+ StringTokenizer st = new StringTokenizer(params, ",");
+ while(st.hasMoreTokens()) {
+ String paramSignature = st.nextToken();
+ ParametedType param = getParametedType(context, paramSignature);
+ if(param == null) {
+ param = new ParametedType();
+ param.setSignature(paramSignature);
+ }
+ result.addParameter(param);
+ }
+ return result;
+ }
+ }
+ return null;
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2009-12-18 16:24:22 UTC (rev 19467)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2009-12-18 16:34:57 UTC (rev 19468)
@@ -20,6 +20,7 @@
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
+import org.jboss.tools.cdi.internal.core.impl.ParametedType;
/**
*
@@ -30,10 +31,6 @@
boolean isAbstract;
List<FieldDefinition> fields = new ArrayList<FieldDefinition>();
List<MethodDefinition> methods = new ArrayList<MethodDefinition>();
- AnnotationDeclaration decoratorAnnotation;
- AnnotationDeclaration interceptorAnnotation;
- AnnotationDeclaration statefulAnnotation;
- AnnotationDeclaration statelessAnnotation;
public TypeDefinition() {
}
@@ -64,6 +61,10 @@
}
}
+ public ParametedType getSuperType() {
+ return superType;
+ }
+
public List<FieldDefinition> getFields() {
return fields;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java 2009-12-18 16:24:22 UTC (rev 19467)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java 2009-12-18 16:34:57 UTC (rev 19468)
@@ -3,16 +3,10 @@
import java.util.Map;
import java.util.Set;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDICoreNature;
-import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.ICDIBuilderDelegate;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
15 years