August 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r24507 - trunk/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-08-27 11:06:56 -0400 (Fri, 27 Aug 2010) New Revision: 24507 Modified: trunk/build/aggregate/site/build.xml Log: less verbose logging Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2010-08-27 15:06:38 UTC (rev 24506) +++ trunk/build/aggregate/site/build.xml 2010-08-27 15:06:56 UTC (rev 24507) @@ -217,8 +217,7 @@ zipPath = @{zipPath} DEST = ${aggegate.zips.dir}/@{zipPath} </echo> - <echo> -URL = ${inputRepo@{repoNum}}/@{zipPath} + <echo>URL = ${inputRepo@{repoNum}}/@{zipPath} </echo> <exec executable="wget" dir="${aggegate.zips.dir}" failonerror="false" failifexecutionfails="false"> <arg line="${inputRepo@{repoNum}}/@{zipPath} -q --no-clobber" />

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24506 - branches/jbosstools-3.2.0.M2/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-08-27 11:06:38 -0400 (Fri, 27 Aug 2010) New Revision: 24506 Modified: branches/jbosstools-3.2.0.M2/build/aggregate/site/build.xml Log: less verbose logging Modified: branches/jbosstools-3.2.0.M2/build/aggregate/site/build.xml =================================================================== --- branches/jbosstools-3.2.0.M2/build/aggregate/site/build.xml 2010-08-27 14:39:51 UTC (rev 24505) +++ branches/jbosstools-3.2.0.M2/build/aggregate/site/build.xml 2010-08-27 15:06:38 UTC (rev 24506) @@ -186,7 +186,7 @@ <var unset="true" name="wget.return" />  <exec executable="wget" dir="${aggegate.zips.dir}" failonerror="false" failifexecutionfails="true" resultproperty="wget.return"> - <arg line="${inputRepo(a){repoNum}}/logs/zip.list.txt --no-clobber" /> + <arg line="${inputRepo(a){repoNum}}/logs/zip.list.txt -q --no-clobber" /> </exec>  <if> @@ -212,12 +212,13 @@ replace="\1" /> <mkdir dir="${aggegate.zips.dir}/${relativePath}" />  - <echo>repoNum = @{repoNum} + <echo level="verbose">repoNum = @{repoNum} relativePath = ${relativePath} zipPath = @{zipPath} -URL = ${inputRepo@{repoNum}}/@{zipPath} DEST = ${aggegate.zips.dir}/@{zipPath} </echo> + <echo>URL = ${inputRepo@{repoNum}}/@{zipPath} +</echo> <exec executable="wget" dir="${aggegate.zips.dir}" failonerror="false" failifexecutionfails="false"> <arg line="${inputRepo@{repoNum}}/@{zipPath} -q --no-clobber" /> </exec>

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24505 - in trunk/usage/plugins/org.jboss.tools.usage: src/org/jboss/tools/usage/reporting and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-08-27 10:39:51 -0400 (Fri, 27 Aug 2010) New Revision: 24505 Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java Log: [JBIDE-6880] ability to cancel added Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-27 14:37:02 UTC (rev 24504) +++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-27 14:39:51 UTC (rev 24505) @@ -6,7 +6,7 @@ <booleanAttribute key="automaticValidate" value="false"/> <stringAttribute key="bootstrap" value=""/> <stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearConfig" value="false"/> <booleanAttribute key="clearws" value="false"/> <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/> Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 14:37:02 UTC (rev 24504) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 14:39:51 UTC (rev 24505) @@ -105,12 +105,23 @@ @Override protected IStatus run(IProgressMonitor monitor) { + if (monitor.isCanceled()) { + return Status.CANCEL_STATUS; + } if (globalSettings.isEnabled()) { + monitor.beginTask("querying whether reporting is globally enabled", 2); + if (monitor.isCanceled()) { + return Status.CANCEL_STATUS; + } if (UsageReportPreferences.isAskUser()) { askUserAndReport(); + if (monitor.isCanceled()) { + return Status.CANCEL_STATUS; + } } else { doReport(); } + monitor.done(); } return Status.OK_STATUS; }

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24504 - in trunk/esb/plugins/org.jboss.tools.esb.ui: META-INF and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-08-27 10:37:02 -0400 (Fri, 27 Aug 2010) New Revision: 24504 Added: trunk/esb/plugins/org.jboss.tools.esb.ui/.settings/ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizardPage.java Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizard.java Log: https://jira.jboss.org/browse/JBIDE-6616 Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2010-08-27 14:29:10 UTC (rev 24503) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2010-08-27 14:37:02 UTC (rev 24504) @@ -30,6 +30,7 @@ org.eclipse.ui.workbench.texteditor, org.eclipse.core.expressions, org.eclipse.ui.views, + org.jboss.tools.common.ui, org.jboss.tools.common.model, org.jboss.tools.common.model.ui, org.jboss.tools.common.text.xml, Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizard.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizard.java 2010-08-27 14:29:10 UTC (rev 24503) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizard.java 2010-08-27 14:37:02 UTC (rev 24504) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2010 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 + ******************************************************************************/ package org.jboss.tools.esb.ui.wizard; import org.eclipse.core.resources.IProject; @@ -4,13 +14,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jdt.core.IBuffer; -import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.core.IType; import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.JavaPluginImages; import org.eclipse.jdt.ui.JavaUI; @@ -20,7 +25,6 @@ import org.eclipse.ui.IWorkbench; import org.jboss.tools.common.model.ui.wizards.NewClassWizard; import org.jboss.tools.common.model.ui.wizards.NewTypeWizardAdapter; -import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.esb.ui.ESBUIMessages; import org.jboss.tools.esb.ui.ESBUiPlugin; @@ -34,15 +38,16 @@ } public void addPages() { - super.addPages(); +// super.addPages(); + mainPage = new NewActionWizardPage(); + addPage(mainPage); + if (adapter!=null) mainPage.init(adapter); + mainPage.setTitle(ESBUIMessages.newESBActionWizardPageTitle); } protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException { mainPage.createType(monitor); - if(mainPage.getCreatedType() != null) { - modifyJavaSource(); - } } @Override @@ -113,69 +118,4 @@ return null; } - void modifyJavaSource() { -// String newValue = getQualifiedClassName(); - try { - IType type = mainPage.getCreatedType(); - if(type == null) { - return; - } - String name = type.getElementName(); - String sc = type.getSuperclassTypeSignature(); - if(sc != null) { - sc = EclipseJavaUtil.resolveTypeAsString(type, sc); - } - if(type != null && "org.jboss.soa.esb.actions.AbstractActionPipelineProcessor".equals(sc)) { - ICompilationUnit w = type.getCompilationUnit().getWorkingCopy(new NullProgressMonitor()); - IBuffer b = w.getBuffer(); - String s = b.getContents(); - String lineDelimiter = "\r\n"; - - String IMPORT = "import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;"; - int i1 = s.indexOf(IMPORT); - if(i1 >= 0) { - String content = ""; - String[] imports = { - "import org.jboss.soa.esb.actions.ActionProcessingException;", - "import org.jboss.soa.esb.helpers.ConfigTree;", - "import org.jboss.soa.esb.message.Message;" - }; - for (String is: imports) { - if(s.indexOf(is) < 0) { - content += lineDelimiter + is; - } - } - if(content.length() > 0) { - b.replace(i1 + IMPORT.length(), 0, content); - } - } - - s = b.getContents(); - boolean hasOverrideAnnotation = s.indexOf("@Override") > 0; - - int i = s.indexOf('{'); - int j = s.lastIndexOf('}'); - if(i > 0 && j > i) { - String tab = "\t"; - String content = lineDelimiter - + tab + "protected ConfigTree _config;" + lineDelimiter - + lineDelimiter - + tab + "public " + name + "(ConfigTree config) {" + lineDelimiter - + tab + tab + "_config = config;"+ lineDelimiter - + tab + "}" + lineDelimiter - + lineDelimiter - + (hasOverrideAnnotation ? tab + "@Override" + lineDelimiter : "") - + tab + "public Message process(Message message) throws ActionProcessingException {" + lineDelimiter - + tab + tab + "//ADD CUSTOM ACTION CODE HERE" + lineDelimiter - + tab + tab + "return message;" + lineDelimiter - + tab + "}" + lineDelimiter; - b.replace(i + 1, j - i - 1, content); - w.commitWorkingCopy(true, new NullProgressMonitor()); - } - } - } catch (CoreException e) { - e.printStackTrace(); - } - } - } Added: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizardPage.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizardPage.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizardPage.java 2010-08-27 14:37:02 UTC (rev 24504) @@ -0,0 +1,208 @@ +/******************************************************************************* + * Copyright (c) 2010 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 + ******************************************************************************/ +package org.jboss.tools.esb.ui.wizard; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.IBuffer; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.Signature; +import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.jdt.internal.ui.IJavaHelpContextIds; +import org.eclipse.jdt.ui.CodeGeneration; +import org.eclipse.jdt.ui.wizards.NewTypeWizardPage.ImportsManager; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.common.model.ui.wizards.NewClassWizardPageEx; +import org.jboss.tools.common.model.util.EclipseJavaUtil; +import org.jboss.tools.common.ui.widget.editor.CompositeEditor; +import org.jboss.tools.common.ui.widget.editor.IFieldEditor; +import org.jboss.tools.common.ui.widget.editor.LabelFieldEditor; +import org.jboss.tools.common.ui.widget.editor.RadioFieldEditor; +import org.jboss.tools.esb.core.ESBCorePlugin; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class NewActionWizardPage extends NewClassWizardPageEx { + RadioFieldEditor pojo = null; + + public NewActionWizardPage() { + } + + public void createControl(Composite parent) { + initializeDialogUnits(parent); + + Composite composite= new Composite(parent, SWT.NONE); + composite.setFont(parent.getFont()); + + int nColumns= 4; + + GridLayout layout= new GridLayout(); + layout.numColumns= nColumns; + composite.setLayout(layout); + + // pick & choose the wanted UI components + + pojo = createISPOJOControls(composite, nColumns); + + createContainerControls(composite, nColumns); + createPackageControls(composite, nColumns); + createEnclosingTypeControls(composite, nColumns); + + createSeparator(composite, nColumns); + + createTypeNameControls(composite, nColumns); + createModifierControls(composite, nColumns); + + createSuperClassControls(composite, nColumns); + createSuperInterfacesControls(composite, nColumns); + +// use reflection? +// createMethodStubSelectionControls(composite, nColumns); + + createCommentControls(composite, nColumns); + enableCommentControl(true); + + setControl(composite); + + Dialog.applyDialogFont(composite); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IJavaHelpContextIds.NEW_CLASS_WIZARD_PAGE); + } + + RadioFieldEditor createISPOJOControls(Composite composite, int nColumns) { + String name = "pojo"; + String defaultValue = "true"; + List<String> labels = new ArrayList<String>(); + labels.add("As AbstractActionPipelineProcessor implementation"); + labels.add("As annotated POJO"); + List values = new ArrayList(); + values.add("false"); + values.add("true"); + RadioFieldEditor radio = new RadioFieldEditor(name, "", labels, values, defaultValue); + CompositeEditor editor = new CompositeEditor(name,"", defaultValue); + editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,""), radio}); + editor.doFillIntoGrid(composite); + editor.addPropertyChangeListener(new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + onPOJOChange(evt.getNewValue()); + } + }); + onPOJOChange(defaultValue); + return radio; + } + + void onPOJOChange(Object value) { + if("true".equals(value)) { + setSuperClass("", true); + } else { + setSuperClass(adapter.getSuperClass(), adapter.isCanBeModified()); + } + + } + + protected void createTypeMembers(IType newType, ImportsManager imports, IProgressMonitor monitor) throws CoreException { + super.createTypeMembers(newType, imports, monitor); + if("true".equals(pojo.getValueAsString())) { + modifyJavaSourceForPOJO(newType, imports); + } else { + modifyJavaSourceForAbstractImplementation(newType, imports); + } + } + + void modifyJavaSourceForAbstractImplementation(IType type, ImportsManager imports) { + try { + String name = type.getElementName(); + String sc = type.getSuperclassTypeSignature(); + if(sc != null) { + sc = EclipseJavaUtil.resolveTypeAsString(type, sc); + } + if(type != null && "org.jboss.soa.esb.actions.AbstractActionPipelineProcessor".equals(sc)) { + ICompilationUnit w = type.getCompilationUnit(); + IBuffer b = w.getBuffer(); + String s = b.getContents(); + String lineDelimiter = StubUtility.getLineDelimiterUsed(type.getJavaProject()); + + imports.addImport("org.jboss.soa.esb.actions.AbstractActionPipelineProcessor"); + imports.addImport("org.jboss.soa.esb.actions.ActionProcessingException"); + imports.addImport("org.jboss.soa.esb.helpers.ConfigTree"); + imports.addImport("org.jboss.soa.esb.message.Message"); +// imports.addImport(""); + + + s = b.getContents(); + boolean hasOverrideAnnotation = s.indexOf("@Override") > 0; + + int i = s.indexOf('{'); + int j = s.lastIndexOf('}'); + if(i > 0 && j > i) { + String tab = "\t"; + String content = lineDelimiter + + tab + "protected ConfigTree _config;" + lineDelimiter + + lineDelimiter + + tab + "public " + name + "(ConfigTree config) {" + lineDelimiter + + tab + tab + "_config = config;"+ lineDelimiter + + tab + "}" + lineDelimiter + + lineDelimiter + + (hasOverrideAnnotation ? tab + "@Override" + lineDelimiter : "") + + tab + "public Message process(Message message) throws ActionProcessingException {" + lineDelimiter + + tab + tab + "//ADD CUSTOM ACTION CODE HERE" + lineDelimiter + + tab + tab + "return message;" + lineDelimiter + + tab + "}" + lineDelimiter; + b.replace(i + 1, j - i - 1, content); + } + } + } catch (CoreException e) { + ESBCorePlugin.log(e); + } + } + + void modifyJavaSourceForPOJO(IType type, ImportsManager imports) { + try { + StringBuffer buf= new StringBuffer(); + final String lineDelim= "\n"; // OK, since content is formatted afterwards //$NON-NLS-1$ + String comment= CodeGeneration.getMethodComment(type.getCompilationUnit(), type.getTypeQualifiedName('.'), "process", new String[] {"message"}, new String[0], Signature.createTypeSignature("void", true), null, lineDelim); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if (comment != null) { + buf.append(comment); + buf.append(lineDelim); + } + imports.addImport("org.jboss.soa.esb.actions.annotation.Process"); //$NON-NLS-1$ + buf.append("@Process").append(lineDelim); //$NON-NLS-1$ + buf.append("public Message process("); //$NON-NLS-1$ + buf.append(imports.addImport("org.jboss.soa.esb.message.Message")); //$NON-NLS-1$ + buf.append(" message) {"); //$NON-NLS-1$ + buf.append(lineDelim); + String content= "//ADD CUSTOM ACTION CODE HERE" + lineDelim + "return message;"; +// CodeGeneration.getMethodBodyContent(type.getCompilationUnit(), type.getTypeQualifiedName('.'), "process", false, "//ADD CUSTOM ACTION CODE HERE", lineDelim); //$NON-NLS-1$ //$NON-NLS-2$ + if (content != null && content.length() != 0) + buf.append(content); + buf.append(lineDelim); + buf.append("}"); //$NON-NLS-1$ + type.createMethod(buf.toString(), null, false, null); + } catch (CoreException e) { + ESBCorePlugin.log(e); + } + } + +} Property changes on: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24503 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-08-27 10:29:10 -0400 (Fri, 27 Aug 2010) New Revision: 24503 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewClassWizardPageEx.java Log: https://jira.jboss.org/browse/JBIDE-6616 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewClassWizardPageEx.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewClassWizardPageEx.java 2010-08-27 14:17:46 UTC (rev 24502) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewClassWizardPageEx.java 2010-08-27 14:29:10 UTC (rev 24503) @@ -18,7 +18,7 @@ */ public class NewClassWizardPageEx extends NewClassWizardPage { - private NewTypeWizardAdapter adapter = null; + protected NewTypeWizardAdapter adapter = null; public NewClassWizardPageEx() { super();

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24502 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-08-27 10:17:46 -0400 (Fri, 27 Aug 2010) New Revision: 24502 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java Log: https://jira.jboss.org/browse/JBIDE-6928 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java 2010-08-27 14:13:28 UTC (rev 24501) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java 2010-08-27 14:17:46 UTC (rev 24502) @@ -79,7 +79,7 @@ int location = getLocation(i); if(location < 0) location = getLocation(error); String attr = getObjectAttributeForError(i); - IMarker marker = findMarker(path, message, attr, ms); + IMarker marker = findMarker(path, message, attr, dms); if(marker != null) { dms.remove(marker); updateLocation(marker, location, getStart(i), getEnd(i)); @@ -114,16 +114,16 @@ } } - private IMarker findMarker(String path, String message, String attr, IMarker[] ms) { - if(ms == null) return null; - for (int i = 0; i < ms.length; i++) { + private IMarker findMarker(String path, String message, String attr, Set<IMarker> dms) { + if(dms == null) return null; + for (IMarker m: dms) { try { - if(!message.equals(ms[i].getAttribute(IMarker.MESSAGE))) continue; - if(attr != null && !attr.equals(ms[i].getAttribute("attribute"))) continue; //$NON-NLS-1$ - if(!path.equals(ms[i].getAttribute("path"))) { //$NON-NLS-1$ - ms[i].setAttribute("path", path); //$NON-NLS-1$ + if(!message.equals(m.getAttribute(IMarker.MESSAGE))) continue; + if(attr != null && !attr.equals(m.getAttribute("attribute"))) continue; //$NON-NLS-1$ + if(!path.equals(m.getAttribute("path"))) { //$NON-NLS-1$ + m.setAttribute("path", path); //$NON-NLS-1$ } - return ms[i]; + return m; } catch (CoreException e) { //ignore continue; @@ -203,7 +203,7 @@ if(_type.startsWith("org.jboss.tools.")) { //$NON-NLS-1$ return _type.equals(type); } - return m.isSubtypeOf(IMarker.TEXT) || m.isSubtypeOf(IMarker.PROBLEM); + return false; } protected String[] getErrors() {

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24501 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-08-27 10:13:28 -0400 (Fri, 27 Aug 2010) New Revision: 24501 Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java Log: [JBIDE-6880] initial implementation finished Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-27 13:54:47 UTC (rev 24500) +++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-27 14:13:28 UTC (rev 24501) @@ -6,7 +6,7 @@ <booleanAttribute key="automaticValidate" value="false"/> <stringAttribute key="bootstrap" value=""/> <stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="false"/> +<booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="clearws" value="false"/> <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/> Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java 2010-08-27 13:54:47 UTC (rev 24500) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java 2010-08-27 14:13:28 UTC (rev 24501) @@ -2,6 +2,7 @@ import java.io.BufferedInputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; @@ -20,7 +21,6 @@ static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ protected Plugin plugin; - protected HttpURLConnection urlConnection; private Map<String, String> valuesMap; private String[] keys; @@ -38,7 +38,9 @@ protected Map<String, String> getValueMap() throws IOException { if (valuesMap == null) { - this.valuesMap = parse(keys, valueDelimiter, request(url), new HashMap<String, String>()); + HttpURLConnection urlConnection = createURLConnection(url); + InputStreamReader reader = request(urlConnection); + this.valuesMap = parse(keys, valueDelimiter, reader, new HashMap<String, String>()); } return valuesMap; } @@ -55,7 +57,7 @@ * * @see HttpURLConnection */ - protected InputStreamReader request(String url) throws IOException { + protected InputStreamReader request(HttpURLConnection urlConnection) throws IOException { InputStreamReader responseReader = null; try { urlConnection.connect(); @@ -66,7 +68,7 @@ , UsageMessages.KillSwitchPreference_Info_HttpQuery , url); plugin.getLog().log(status); - responseReader = getInputStreamReader(urlConnection.getContentType()); + responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType()); } else { IStatus status = StatusUtils.getErrorStatus( plugin.getBundle().getSymbolicName() @@ -83,13 +85,13 @@ } } - private InputStreamReader getInputStreamReader(String contentType) throws UnsupportedEncodingException, IOException { + private InputStreamReader getInputStreamReader(InputStream inputStream, String contentType) throws UnsupportedEncodingException, IOException { String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType); if (contentTypeCharset != null && contentTypeCharset.length() > 0) { - return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream()), + return new InputStreamReader(new BufferedInputStream(inputStream), contentTypeCharset); } else { - return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream())); + return new InputStreamReader(new BufferedInputStream(inputStream)); } } @@ -118,6 +120,7 @@ * @param urlString * the url string * @return the http url connection + * @throws IOException * @throws IOException * Signals that an I/O exception has occurred. */ Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-08-27 13:54:47 UTC (rev 24500) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-08-27 14:13:28 UTC (rev 24501) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.usage.preferences; -import java.io.IOException; import java.util.Map; import org.eclipse.core.runtime.Plugin; @@ -36,7 +35,7 @@ /* the delimiter that delimits the value */ private static final char VALUE_DELIMITER = '<'; - public GlobalUsageReportingSettings(Plugin plugin) throws IOException { + public GlobalUsageReportingSettings(Plugin plugin) { super(REPORTING_ENABLEMENT_URL , VALUE_DELIMITER , plugin @@ -45,7 +44,6 @@ , INTEGER_VALUE_KEY); this.plugin = plugin; - this.urlConnection = createURLConnection(REPORTING_ENABLEMENT_URL); } public boolean isEnabled() { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 13:54:47 UTC (rev 24500) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 14:13:28 UTC (rev 24501) @@ -10,9 +10,15 @@ ******************************************************************************/ package org.jboss.tools.usage.reporting; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.IJobChangeEvent; +import org.eclipse.core.runtime.jobs.IJobChangeListener; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.progress.UIJob; import org.jboss.tools.usage.FocusPoint; import org.jboss.tools.usage.HttpGetRequest; import org.jboss.tools.usage.IHttpGetRequest; @@ -24,6 +30,7 @@ import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; +import org.jboss.tools.usage.preferences.GlobalUsageReportingSettings; import org.jboss.tools.usage.util.PreferencesUtils; import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; @@ -37,30 +44,30 @@ private static final String HOST_NAME = ReportingMessages.UsageReport_HostName; -// private FocusPoint focusPoint = new FocusPoint("tools") //$NON-NLS-1$ -// .setChild(new FocusPoint("usage") //$NON-NLS-1$ -// .setChild(new FocusPoint("action") //$NON-NLS-1$ -// .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$ + private FocusPoint focusPoint = new FocusPoint("tools") //$NON-NLS-1$ + .setChild(new FocusPoint("usage") //$NON-NLS-1$ + .setChild(new FocusPoint("action") //$NON-NLS-1$ + .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$ - private FocusPoint focusPoint = new FocusPoint("test"); //$NON-NLS-1$ + private GlobalUsageReportingSettings globalSettings = new GlobalUsageReportingSettings(JBossToolsUsageActivator + .getDefault()); public void report() { - UsageReportEnablementDialog dialog = new UsageReportEnablementDialog(ReportingMessages.UsageReport_DialogTitle, + new ReportingJob().schedule(); + } + + private void askUser() { + UsageReportEnablementDialog dialog = new UsageReportEnablementDialog( + ReportingMessages.UsageReport_DialogTitle, ReportingMessages.UsageReport_DialogMessage, ReportingMessages.UsageReport_Checkbox_Text, true, PlatformUI.getWorkbench().getActiveWorkbenchWindow()); - if (UsageReportPreferences.isAskUser()) { - if (dialog.open() == Window.OK) { - UsageReportPreferences.setEnabled(dialog.isReportEnabled()); - UsageReportPreferences.setAskUser(false); - flushPreferences(); - } + if (dialog.open() == Window.OK) { + UsageReportPreferences.setEnabled(dialog.isReportEnabled()); + UsageReportPreferences.setAskUser(false); + flushPreferences(); } - - if (UsageReportPreferences.isEnabled()) { - report(getTracker()); - } } private void flushPreferences() { @@ -73,8 +80,10 @@ } } - private void report(ITracker tracker) { - tracker.trackAsynchronously(focusPoint); + private void doReport() { + if (UsageReportPreferences.isEnabled()) { + getTracker().trackAsynchronously(focusPoint); + } } private ITracker getTracker() { @@ -88,4 +97,67 @@ IHttpGetRequest httpGetRequest = new HttpGetRequest(eclipseEnvironment.getUserAgent(), loggingAdapter); return new Tracker(urlStrategy, httpGetRequest, loggingAdapter); } + + private class ReportingJob extends Job { + private ReportingJob() { + super("Reporting eclipse usage"); + } + + @Override + protected IStatus run(IProgressMonitor monitor) { + if (globalSettings.isEnabled()) { + if (UsageReportPreferences.isAskUser()) { + askUserAndReport(); + } else { + doReport(); + } + } + return Status.OK_STATUS; + } + + private void askUserAndReport() { + Job askUserJob = new AskUserJob(); + askUserJob.addJobChangeListener(new IJobChangeListener() { + + public void sleeping(IJobChangeEvent event) { + // ignore + } + + public void scheduled(IJobChangeEvent event) { + // ignore + } + + public void running(IJobChangeEvent event) { + // ignore + } + + public void done(IJobChangeEvent event) { + doReport(); + } + + public void awake(IJobChangeEvent event) { + // ignore + } + + public void aboutToRun(IJobChangeEvent event) { + // ignore + } + }); + askUserJob.setUser(true); + askUserJob.setPriority(Job.SHORT); + askUserJob.schedule(); + } + } + + private class AskUserJob extends UIJob { + private AskUserJob() { + super("Asking User to allow reporting"); + } + + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { + askUser(); + return Status.OK_STATUS; + } + } } Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-08-27 13:54:47 UTC (rev 24500) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-08-27 14:13:28 UTC (rev 24501) @@ -18,6 +18,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; import org.jboss.tools.usage.preferences.GlobalUsageReportingSettings; import org.junit.Test; @@ -73,7 +74,7 @@ } @Override - protected InputStreamReader request(String url) throws UnsupportedEncodingException { + protected InputStreamReader request(HttpURLConnection urlConnection) throws UnsupportedEncodingException { return new InputStreamReader(new ByteArrayInputStream(getEnablementPageContent(enablementValue, stringValue, integerValue).getBytes()), "UTF-8"); }

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24500 - in trunk/seam/plugins: org.jboss.tools.seam.ui and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-08-27 09:54:47 -0400 (Fri, 27 Aug 2010) New Revision: 24500 Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties Log: https://jira.jboss.org/browse/JBIDE-6869 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-08-27 13:38:30 UTC (rev 24499) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-08-27 13:54:47 UTC (rev 24500) @@ -19,6 +19,7 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; @@ -83,8 +84,10 @@ * @author Alexey Kazakov */ public class SeamCoreValidator extends SeamValidationErrorManager implements IValidator { - public static final String ID = "org.jboss.tools.seam.core.CoreValidator"; + + public static final String MESSAGE_ID_ATTRIBUTE_NAME = "Seam_message_id"; //$NON-NLS-1$ + public static final int NONUNIQUE_COMPONENT_NAME_MESSAGE_ID = 1; private ISeamProject seamProject; private String projectName; @@ -552,7 +555,7 @@ IResource checkedDeclarationResource = checkedDeclaration.getResource(); ITextSourceReference location = ((SeamComponentDeclaration)checkedDeclaration).getLocationFor(SeamComponentDeclaration.PATH_OF_NAME); if(!SeamUtil.isEmptyLocation(location)) { - addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, checkedDeclarationResource); + addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, checkedDeclarationResource, NONUNIQUE_COMPONENT_NAME_MESSAGE_ID); } markedDeclarations.add(checkedDeclaration); } @@ -560,7 +563,7 @@ markedDeclarations.add(javaDeclaration); ITextSourceReference location = ((SeamComponentDeclaration)javaDeclaration).getLocationFor(SeamComponentDeclaration.PATH_OF_NAME); if(!SeamUtil.isEmptyLocation(location)) { - addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, javaDeclarationResource); + addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, javaDeclarationResource, NONUNIQUE_COMPONENT_NAME_MESSAGE_ID); } } } @@ -609,7 +612,7 @@ IResource checkedDeclarationResource = checkedDeclaration.getResource(); ITextSourceReference location = ((SeamComponentDeclaration)checkedDeclaration).getLocationFor(SeamComponentDeclaration.PATH_OF_NAME); if(!SeamUtil.isEmptyLocation(location)) { - addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, checkedDeclarationResource); + addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, checkedDeclarationResource, NONUNIQUE_COMPONENT_NAME_MESSAGE_ID); } markedDeclarations.add(checkedDeclaration); } @@ -617,7 +620,7 @@ markedDeclarations.add(declaration); ITextSourceReference location = ((SeamComponentDeclaration)declaration).getLocationFor(SeamComponentDeclaration.PATH_OF_NAME); if(!SeamUtil.isEmptyLocation(location)) { - addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, declaration.getResource()); + addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, declaration.getResource(), NONUNIQUE_COMPONENT_NAME_MESSAGE_ID); } } } @@ -639,12 +642,12 @@ if(!markedJavaDeclarations.contains(javaDec)) { markedJavaDeclarations.add(javaDec); ITextSourceReference location = ((SeamComponentDeclaration)javaDec).getLocationFor(SeamComponentDeclaration.PATH_OF_NAME); - addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, javaDec.getResource()); + addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, javaDec.getResource(), NONUNIQUE_COMPONENT_NAME_MESSAGE_ID); } if(!markedDeclarations.contains(declaration)) { markedDeclarations.add(declaration); ITextSourceReference location = ((SeamComponentDeclaration)declaration).getLocationFor(SeamComponentDeclaration.PATH_OF_NAME); - addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, declaration.getResource()); + addError(SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, SeamPreferences.NONUNIQUE_COMPONENT_NAME, new String[]{componentName}, location, declaration.getResource(), NONUNIQUE_COMPONENT_NAME_MESSAGE_ID); } } } @@ -1022,5 +1025,17 @@ } } + + public IMarker addError(String message, String preferenceKey, + String[] messageArguments, ITextSourceReference location, + IResource target, int messageId) { + IMarker marker = addError(message, preferenceKey, messageArguments, location, target); + try{ + marker.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, new Integer(messageId)); + }catch(CoreException ex){ + SeamCorePlugin.getDefault().logError(ex); + } + return marker; + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2010-08-27 13:38:30 UTC (rev 24499) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2010-08-27 13:54:47 UTC (rev 24500) @@ -708,5 +708,10 @@ </objectContribution> </extension> - + <extension point="org.eclipse.ui.ide.markerResolution"> + <markerResolutionGenerator + markerType="org.eclipse.wst.validation.problemmarker" + class="org.jboss.tools.seam.ui.marker.SeamProblemMarkerResolutionGenerator"> + </markerResolutionGenerator> + </extension> </plugin> Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2010-08-27 13:38:30 UTC (rev 24499) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2010-08-27 13:54:47 UTC (rev 24500) @@ -360,6 +360,8 @@ public static String SEAM_COMPONENT_RENAME_HANDLER_ERROR; + public static String DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE; + static { // load message values from bundle file NLS.initializeMessages(BUNDLE_NAME, SeamUIMessages.class); Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2010-08-27 13:54:47 UTC (rev 24500) @@ -0,0 +1,158 @@ +/******************************************************************************* + * Copyright (c) 2010 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 + ******************************************************************************/ +package org.jboss.tools.seam.ui.marker; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.IAnnotatable; +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IBuffer; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IImportContainer; +import org.eclipse.jdt.core.IImportDeclaration; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.common.EclipseUtil; +import org.jboss.tools.common.model.util.EclipseJavaUtil; +import org.jboss.tools.seam.ui.SeamGuiPlugin; + +/** + * @author Daniel Azarov + */ +public abstract class AbstractSeamMarkerResolution implements + IMarkerResolution2 { + protected IFile file; + protected int start, end; + + public AbstractSeamMarkerResolution(IFile file, int start, int end){ + this.file = file; + this.start = start; + this.end = end; + } + + protected void deleteAnnotation(String annotationTypeName){ + try{ + ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); + + IJavaElement javaElement = compilationUnit.getElementAt(start); + IType type = compilationUnit.findPrimaryType(); + if(javaElement != null && type != null){ + if(javaElement instanceof IAnnotatable){ + IAnnotation annotation = findAnnotation(type, (IAnnotatable)javaElement, annotationTypeName); + if(annotation != null){ + IBuffer buffer = compilationUnit.getBuffer(); + + // delete annotation + buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), ""); + + // check and delete import + IImportDeclaration importDeclaration = compilationUnit.getImport(annotationTypeName); + IImportContainer importContainer = compilationUnit.getImportContainer(); + if(importDeclaration != null && importContainer != null){ + int importSize = importContainer.getSourceRange().getOffset()+importContainer.getSourceRange().getLength(); + String text = buffer.getText(importSize, buffer.getLength()-importSize); + if(checkImport(text, annotationTypeName)) + importDeclaration.delete(false, new NullProgressMonitor()); + } + compilationUnit.commitWorkingCopy(false, new NullProgressMonitor()); + } + } + } + + }catch(CoreException ex){ + SeamGuiPlugin.getPluginLog().logError(ex); + } + } + + private boolean checkImport(String text, String qualifiedName){ + int lastDot = qualifiedName.lastIndexOf('.'); + String name; + if(lastDot < 0) + name = qualifiedName; + else + name = qualifiedName.substring(lastDot+1); + + Pattern p = Pattern.compile(".*\\W"+name+"\\W.*",Pattern.DOTALL); //$NON-NLS-1$ //$NON-NLS-2$ + Matcher m = p.matcher(text); + return !m.matches(); + } + + protected void addAnnotation(String annotationTypeName, String annotationString){ + try{ + ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); + + if(compilationUnit.getImport(annotationTypeName) == null){ + compilationUnit.createImport(annotationTypeName, null, new NullProgressMonitor()); + } + + IBuffer buffer = compilationUnit.getBuffer(); + + buffer.replace(start, 0, annotationString+' '); + compilationUnit.commitWorkingCopy(false, new NullProgressMonitor()); + }catch(CoreException ex){ + SeamGuiPlugin.getPluginLog().logError(ex); + } + } + + + private IAnnotation findAnnotation(IType sourceType, IAnnotatable member, String annotationTypeName) { + try { + IAnnotation[] annotations = member.getAnnotations(); + String simpleAnnotationTypeName = annotationTypeName; + int lastDot = annotationTypeName.lastIndexOf('.'); + if(lastDot>-1) { + simpleAnnotationTypeName = simpleAnnotationTypeName.substring(lastDot + 1); + } + for (IAnnotation annotation : annotations) { + if(annotationTypeName.equals(annotation.getElementName())) { + return annotation; + } + if(simpleAnnotationTypeName.equals(annotation.getElementName())) { + String fullAnnotationclassName = EclipseJavaUtil.resolveType(sourceType, simpleAnnotationTypeName); + if(fullAnnotationclassName!=null) { + IType annotationType = sourceType.getJavaProject().findType(fullAnnotationclassName); + if(annotationType!=null && annotationType.getFullyQualifiedName().equals(annotationTypeName)) { + return annotation; + } + } + } + } + } catch (JavaModelException e) { + SeamGuiPlugin.getDefault().logError(e); + } + return null; + } + + public String getLabel() { + return null; + } + + public void run(IMarker marker) { + } + + public String getDescription() { + return null; + } + + public Image getImage() { + return null; + } +} Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java 2010-08-27 13:54:47 UTC (rev 24500) @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2010 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 + ******************************************************************************/ +package org.jboss.tools.seam.ui.marker; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.jboss.tools.seam.ui.SeamUIMessages; + +/** + * @author Daniel Azarov + */ +public class DeleteNameAnnotaionMarkerResolution extends + AbstractSeamMarkerResolution { + public DeleteNameAnnotaionMarkerResolution(IFile file, int start, int end){ + super(file, start, end); + } + + public String getLabel() { + return SeamUIMessages.DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE; + } + + public void run(IMarker marker) { + deleteAnnotation("org.jboss.seam.annotations.Name"); //$NON-NLS-1$ + } + +} Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteNameAnnotaionMarkerResolution.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-08-27 13:54:47 UTC (rev 24500) @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2010 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 + ******************************************************************************/ +package org.jboss.tools.seam.ui.marker; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.ui.IMarkerResolution; +import org.eclipse.ui.IMarkerResolutionGenerator2; +import org.jboss.tools.seam.internal.core.validation.SeamCoreValidator; +import org.jboss.tools.seam.ui.SeamGuiPlugin; + +/** + * @author Daniel Azarov + */ +public class SeamProblemMarkerResolutionGenerator implements IMarkerResolutionGenerator2 { + + public IMarkerResolution[] getResolutions(IMarker marker) { + try{ + IMarkerResolution resolution = isOurCase(marker); + if(resolution != null){ + return new IMarkerResolution[] {resolution}; + } + }catch(CoreException ex){ + SeamGuiPlugin.getPluginLog().logError(ex); + } + return new IMarkerResolution[]{}; + } + + private IMarkerResolution isOurCase(IMarker marker) throws CoreException{ + Integer attribute = ((Integer)marker.getAttribute(SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME)); + if(attribute == null) + return null; + + int messageId = attribute.intValue(); + + IFile file = (IFile)marker.getResource(); + + attribute = ((Integer)marker.getAttribute(IMarker.CHAR_START)); + if(attribute == null) + return null; + int start = attribute.intValue(); + + attribute = ((Integer)marker.getAttribute(IMarker.CHAR_END)); + if(attribute == null) + return null; + int end = attribute.intValue(); + + if(messageId == SeamCoreValidator.NONUNIQUE_COMPONENT_NAME_MESSAGE_ID) + return new DeleteNameAnnotaionMarkerResolution(file, start, end); + + return null; + } + + + public boolean hasResolutions(IMarker marker) { + try{ + if(isOurCase(marker) != null) + return true; + }catch(CoreException ex){ + SeamGuiPlugin.getPluginLog().logError(ex); + } + return false; + } + +} Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2010-08-27 13:38:30 UTC (rev 24499) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2010-08-27 13:54:47 UTC (rev 24500) @@ -187,4 +187,5 @@ RENAME_SEAM_COMPONENT = Rename Seam Component RENAME_SEAM_CONTEXT_VARIABLE = Rename Seam Context Variable FIND_USAGES_IN_EL = Find Usages in Expression Language -SEAM_COMPONENT_RENAME_HANDLER_ERROR = Error +SEAM_COMPONENT_RENAME_HANDLER_ERROR = Error +DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Name annotation

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24499 - in trunk/documentation/whatsnew: teiid and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: blafond Date: 2010-08-27 09:38:30 -0400 (Fri, 27 Aug 2010) New Revision: 24499 Added: trunk/documentation/whatsnew/teiid/ trunk/documentation/whatsnew/teiid/images/ trunk/documentation/whatsnew/teiid/images/designer-perspective.png trunk/documentation/whatsnew/teiid/images/sample-model-file.png trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.M2.html Modified: trunk/documentation/whatsnew/index.html Log: JBIDE-6916 initial draft of Teiid Designer N&N html and images. Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2010-08-27 13:09:11 UTC (rev 24498) +++ trunk/documentation/whatsnew/index.html 2010-08-27 13:38:30 UTC (rev 24499) @@ -39,6 +39,7 @@ <a href="ws/ws-news-1.2.0.M2.html">JBoss Webservice Tools</a> <a href="deltacloud/deltacloud-news-1.0.0.M2.html">Deltacloud Development Tools</a> <a href="gwt/gwt-news-1.0.0.M2.html">GWT Integration</a> + <a href="teiid/teiid-news-7.1.0.M2.html">Teiid Tools</a> </td> </tr> Added: trunk/documentation/whatsnew/teiid/images/designer-perspective.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/teiid/images/designer-perspective.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/teiid/images/sample-model-file.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/teiid/images/sample-model-file.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.M2.html =================================================================== --- trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.M2.html (rev 0) +++ trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.M2.html 2010-08-27 13:38:30 UTC (rev 24499) @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<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>Teiid Designer What's New</title> +</head> +<body> +<h1>Teiid Designer 7.1.0 M2 What's New</h1> +Last revised August 26, 2010 +Teiid Designer, which is new to JBoss Tools, +is a visual tool that enables rapid, model-driven definition, integration, management and testing of data services without programming using the Teiid runtime framework. +Below is simple introduction to the tool and a summary of a few basic concepts. +For more details on <a href="http://www.jboss.org/teiid.html">Teiid</a> and <a href="http://www.jboss.org/teiiddesigner.html">Teiid Designer</a> visit: <a href="http://www.teiid.org">http://www.teiid.org</a> +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"><hr /></td> + <h3>Teiid Designer</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="left"> + Designer "modeling" Perspective</td> + <td valign="top"> + The Teiid Designer perspective provides a modeling-centric + explorer designed to aid in creating/editing and managing models (XMI/EMF-based) and + Virtual Databases (VDBs). When deployed to Teiid server, these VDB's are treated like + any other JDBC data source and queried. + <img src="images/designer-perspective.png" alt="Teiid Designer Perspective"/> + If you've been following Teiid Designer since 7.0 development you'll know that the 7.1 version + reflects major changes to both Preview Data functionality and VDB editing and VDB execution. These features + are now tied to standard application deployment technology through the Teiid Admin API. + In Designer, the Teiid view is a window to view the contents of deployed Teiid artifacts, namely Data Sources and + Virtual Databases (VDB's). + A model is a representation of a set of information constructs. + A familiar model is the relational model, which + defines tables composed of columns and containing records of data. Another + familiar model is the XML model, which defines hierarchical data sets. + In Teiid Designer, models are used to define the entities, and relationships between those + entities, required to fully define the integration of information sets so that they may be accessed in a uniform manner, + using a single API and access protocol. The file extension used for these models is '.xmi' + ( Example: NorthwindOracle.xmi ). + Below is an example of the partial contents of a model file. + <img src="images/sample-model-file.png" alt="Sample Model File" border="1"/> + The fundamental models in Teiid Designer define the structural and data + characteristics of the information contained in data sources. These are referred to + as source models. + Teiid uses the information in source models to federate the information + in multiple sources, so that from a user's viewpoint these all appear to be in a single source. + In addition to source models, Teiid Designer provides the ability to + define a variety of view models. These can be used to define + a layer of abstraction above the physical (or source) layer, so that information can + be presented to end users and consuming applications in business terms rather than as it is physically stored. + Views are mapped to sources using transformations between models. These business views can be in a + variety of forms: + <ul> + <li>Relational</li> + <li>XML</li> + <li>XML Service</li> + <li>Web services</li> + <li>Relationship </li> + <li>Extension</li> + <li>Function </li> + <li>Uml 2.0 </li> + </ul> + </td> + </tr> + <tr><td colspan="2"><hr /></td></tr> + <tr> + <td valign="top" align="left"> + The Virtual Database (VDB)</td> + <td valign="top"> + A VDB, or Virtual Database is a container for your models and pertinent source connection data used by + Teiid query engine to access your federated data. + Teiid Designer allows you to create and edit VDBs. The VDB is a zip-like file that contains sources + and view models, source connection information and index files used at runtime for data identification + and a manifest to pull it all together. + VDBs contain two primary varieties of model types - source and view. Source models represent the structure + and characteristics of physical data sources, whereas view models represent the structure and characteristics + of abstract structures you want to expose to your applications. + Each source model must contain connectivity information in order for the Teiid engine understand which + connection factory/data source instance to connect with. In particular, a "Translator" name and an existing + "JNDI" name must be defined. + After a VDB is defined, it must be deployed to the Teiid query engine to be accessed. You can select a + VDB in your Model Explorer and right-click select "Modeling > Deploy VDB" action or drag the VDB onto an + existing server connected in your Teiid view. + </td> + + </tr> + <tr><td colspan="2"><hr /></td></tr> + <tr> + <td valign="top" align="left"> + Teiid as JDBC Data Source</td> + <td valign="top"> + Teiid Designer 7.1 offers a JDBC Connection Profile contribution through the DTP extension point. The properties for + this connection include standard JDBC inputs including URL, host, port, user-name and password. + Through this connection, you can perform standard SQL queries. The nature of Teiid VDB's allows complex, multi-source + modeling and data transformation, so you can design views targeted for your front-end applications and simplify or reduce + the work necessary to pull all that data together. + </td> + </tr> + <tr><td colspan="2"><hr /></td></tr> + <tr> + <td valign="top" align="left"> + Web Services support</td> + <td valign="top"> + Teiid Designer 7.1 supports generation of deployable web service War Files. + For VDB's that contain web service models, there is a contextual menu +option to generate a JBossWS-CXF war. This generated war can be deployed to +a JBossAS server with CXF enabled. The wizard will ask for a war context name, +target namespace, JNDI name for the deployed Teiid VDB, and location to generate +the war file. Once deployed, the wsdl can be obtained via http://host:port/warContextName?wsdl + </td> + </tr> + <tr><td colspan="2"><hr /></td></tr> +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.M2.html ___________________________________________________________________ Name: svn:mime-type + text/plain

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24498 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2010-08-27 09:09:11 -0400 (Fri, 27 Aug 2010) New Revision: 24498 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java Log: https://jira.jboss.org/browse/JBIDE-3488 , I've removed additional <div> tag. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2010-08-27 12:23:11 UTC (rev 24497) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2010-08-27 13:09:11 UTC (rev 24498) @@ -82,9 +82,7 @@ Element sourceElement = (Element)sourceNode; nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE); - nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); - div.appendChild(table); - VpeCreationData creationData = new VpeCreationData(div); + VpeCreationData creationData = new VpeCreationData(table); ComponentUtil.setCSSLink(pageContext, CSS_FILE_PATH, RICH_FACES_TAB_PANEL); setDirAttr(table, sourceElement); table.setAttribute(HTML.ATTR_CLASS, Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java 2010-08-27 12:23:11 UTC (rev 24497) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java 2010-08-27 13:09:11 UTC (rev 24498) @@ -60,10 +60,8 @@ private static final String SPACE = " "; //$NON-NLS-1$ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); nsIDOMElement visualNode = visualDocument.createElement(HTML.TAG_TABLE); - div.appendChild(visualNode); - VpeCreationData creationData = new VpeCreationData(div); + VpeCreationData creationData = new VpeCreationData(visualNode); Element sourceElement = (Element) sourceNode; String itemSeparator = sourceElement.getAttribute(ITEMSEPARATOR_ATTR_NAME);

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2010