January 2010 - jbosstools-commits

JBoss Tools SVN: r19940 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2010-01-26 13:45:48 -0500 (Tue, 26 Jan 2010) New Revision: 19940 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java Log: JBIDE-3290: sorting/filtering is not updating correctly in code completion of source page in VPE The sorting algorithm for TEXT proposals is modified due to show the TAGNAME proposal above the EL proposals in case of empty match string and vice versa in case of non-empty match string. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2010-01-26 18:07:18 UTC (rev 19939) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2010-01-26 18:45:48 UTC (rev 19940) @@ -74,7 +74,7 @@ } addTagNameProposals(contentAssistRequest, childPosition, true); - addAttributeValueELPredicateProposals(contentAssistRequest); + addELPredicateProposals(contentAssistRequest, TextProposal.R_TAG_INSERTION, true); } /** Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-01-26 18:07:18 UTC (rev 19939) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-01-26 18:45:48 UTC (rev 19940) @@ -18,6 +18,7 @@ import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.swt.graphics.Image; import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; +import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; import org.jboss.tools.common.el.core.resolver.ELContext; @@ -105,7 +106,7 @@ } addTagNameProposals(contentAssistRequest, childPosition, true); - addAttributeValueELPredicateProposals(contentAssistRequest); + addELPredicateProposals(contentAssistRequest, TextProposal.R_TAG_INSERTION, true); } private void addTagNameProposalsForPrefix( @@ -285,16 +286,16 @@ contentAssistRequest.addProposal(proposal); } - addAttributeValueELPredicateProposals(contentAssistRequest); + addELPredicateProposals(contentAssistRequest, TextProposal.R_JSP_ATTRIBUTE_VALUE, false); } - + /** * Calculates and adds EL predicate proposals based on the last word typed * To be used only outside the EL. * * @param contentAssistRequest */ - protected void addAttributeValueELPredicateProposals(ContentAssistRequest contentAssistRequest) { + protected void addELPredicateProposals(ContentAssistRequest contentAssistRequest, int baseRelevance, boolean shiftRelevanceAgainstTagNameProposals) { // Need to check if the cursor is placed right after a word part. // If there is no word part found then just quit TextRegion prefix = getELPredicatePrefix(contentAssistRequest); @@ -306,6 +307,10 @@ if (query == null) query = ""; //$NON-NLS-1$ String stringQuery = matchString; + int relevanceShift = 0; + if (shiftRelevanceAgainstTagNameProposals) { + relevanceShift += prefix.getText() != null && prefix.getText().trim().length() > 0 ? (XMLRelevanceConstants.R_STRICTLY_VALID_TAG_INSERTION - baseRelevance + 2): -2; + } int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset(); @@ -343,8 +348,9 @@ String additionalProposalInfo = (textProposal.getContextInfo() == null ? "" : textProposal.getContextInfo()); //$NON-NLS-1$ int relevance = textProposal.getRelevance(); if (relevance == TextProposal.R_NONE) { - relevance = TextProposal.R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE; + relevance = baseRelevance; } + relevance += relevanceShift; AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString,

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19939 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-01-26 13:07:18 -0500 (Tue, 26 Jan 2010) New Revision: 19939 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-5738 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2010-01-26 17:15:02 UTC (rev 19938) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2010-01-26 18:07:18 UTC (rev 19939) @@ -397,7 +397,19 @@ // register project on the selected server; // deploy datasource xml file to the selected server; - IServer server = (IServer) model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER); + Object serverObject = model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER); + IServer server = null; + if(serverObject instanceof String) { + IServer[] servers = ServerCore.getServers(); + for (IServer i : servers) { + if(serverObject.equals(i.getName())) { + server = i; + break; + } + } + } else if(serverObject instanceof IServer) { + server = (IServer)serverObject; + } if (server != null) { JBossServer jbs = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor()); if (jbs != null) {

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19938 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-01-26 12:15:02 -0500 (Tue, 26 Jan 2010) New Revision: 19938 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-5737 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2010-01-26 17:06:32 UTC (rev 19937) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2010-01-26 17:15:02 UTC (rev 19938) @@ -222,8 +222,10 @@ dm.setTargetedRuntimes(Collections.singleton(runtime)); } if(dontUseRuntimeConfig) { - dm.setSelectedPreset(oldPreset.getId()); - } else { + if(dm.getAvailablePresets().contains(oldPreset)) { + dm.setSelectedPreset(oldPreset.getId()); + } + } else if(dm.getAvailablePresets().contains(FacetedProjectFramework.DEFAULT_CONFIGURATION_PRESET_ID)) { dm.setSelectedPreset(FacetedProjectFramework.DEFAULT_CONFIGURATION_PRESET_ID); } }

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19937 - in trunk/modeshape: plugins/org.jboss.tools.modeshape.rest and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: elvisisking Date: 2010-01-26 12:06:32 -0500 (Tue, 26 Jan 2010) New Revision: 19937 Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/COPYRIGHT.txt trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/epl-v10.html trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/license.html trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.html Removed: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/LEGAL.txt Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/build.properties trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.properties trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/LEGAL.txt trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.ini trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.properties trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ModeShapeMessageConsole.html trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ModeShapePreferencesDialog.html trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/PublishDialog.html trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/PublishedLocationsDialog.html trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ResourceContextMenu.html trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerDialog.html trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerView.html trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/Toc.html trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/helpContexts.xml trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/toc.xml trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Activator.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IServerRegistryListener.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IUiConstants.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/PersistedServer.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/PublishedResourceHelper.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerRegistryEvent.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Utils.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/BasePublishingAction.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/DeleteServerAction.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/EditServerAction.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/NewServerAction.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/PublishAction.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ReconnectToServerAction.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ShowPublishedLocationsAction.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/UnpublishAction.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/package-info.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/DeleteServerDialog.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/PublishedLocationsDialog.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/package-info.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/PublishJob.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/ReconnectJob.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLoggerFactory.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/StaticLoggerBinder.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/package-info.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFileExtensionEditor.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFoldersEditor.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/ModeShapePreferencePage.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/NewItemDialog.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PrefUtils.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PublishingFileFilter.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/prefs.properties trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeContentProvider.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeMessageConsole.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ServerView.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/package-info.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishWizard.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerWizard.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/package-info.java trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/PersistedServerTest.java trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/ServerManagerTest.java trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/ServerRegistryEventTest.java Log: Changed file headers and organized feature to be more like other JBoss Tools projects. Copied: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/COPYRIGHT.txt (from rev 19869, trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/LEGAL.txt) =================================================================== --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/COPYRIGHT.txt (rev 0) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/COPYRIGHT.txt 2010-01-26 17:06:32 UTC (rev 19937) @@ -0,0 +1,9 @@ +The ModeShape Eclipse Feature is copyright 2008-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. + +See the AUTHORS.txt file in the distribution for a full listing of +individual contributors. Property changes on: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/COPYRIGHT.txt ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/LEGAL.txt =================================================================== --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/LEGAL.txt 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/LEGAL.txt 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,6 +0,0 @@ -The ModeShape REST Eclipse Feature (http://www.modeshape.org/) is copyright 2000-2009 MetaMatrix, Inc. and Red Hat, Inc. - -This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is -available at http://www.eclipse.org/legal/epl-v10.html. - -Some portions may be licensed to Red Hat, Inc. under one or more contributor license agreements. Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/build.properties =================================================================== --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/build.properties 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/build.properties 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ # -# ModeShape (http://www.modeshape.org) # See the COPYRIGHT.txt file distributed with this work for information # regarding copyright ownership. # @@ -13,7 +12,12 @@ # bin.includes = feature.xml,\ feature.properties,\ - LEGAL.txt,\ + COPYRIGHT.txt,\ AUTHORS.txt,\ - feature.png -src.includes = LEGAL.txt + feature.png,\ + license.html,\ + epl-v10.html +src.includes = COPYRIGHT.txt,\ + AUTHORS.txt,\ + epl-v10.html,\ + license.html Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/epl-v10.html =================================================================== --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/epl-v10.html (rev 0) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/epl-v10.html 2010-01-26 17:06:32 UTC (rev 19937) @@ -0,0 +1,261 @@ +<?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-Type" content="text/html; charset=ISO-8859-1" /> +<title>Eclipse Public License - Version 1.0</title> +<style type="text/css"> + body { + size: 8.5in 11.0in; + margin: 0.25in 0.5in 0.25in 0.5in; + tab-interval: 0.5in; + } + p { + margin-left: auto; + margin-top: 0.5em; + margin-bottom: 0.5em; + } + p.list { + margin-left: 0.5in; + margin-top: 0.05em; + margin-bottom: 0.05em; + } + </style> + +</head> + +<body lang="EN-US"> + +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR +DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS +AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial +code and documentation distributed under this Agreement, and +b) in the case of each subsequent Contributor: +i) changes to the Program, and +ii) additions to the Program; +where such changes and/or additions to the Program +originate from and are distributed by that particular Contributor. A +Contribution 'originates' from a Contributor if it was added to the +Program by such Contributor itself or anyone acting on such +Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) +are not derivative works of the Program. + +"Contributor" means any person or entity that distributes +the Program. + +"Licensed Patents" mean patent claims licensable by a +Contributor which are necessarily infringed by the use or sale of its +Contribution alone or when combined with the Program. + +"Program" means the Contributions distributed in accordance +with this Agreement. + +"Recipient" means anyone who receives the Program under +this Agreement, including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free copyright license to reproduce, prepare derivative works +of, publicly display, publicly perform, distribute and sublicense the +Contribution of such Contributor, if any, and such derivative works, in +source code and object code form. + +b) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free patent license under Licensed Patents to make, use, sell, +offer to sell, import and otherwise transfer the Contribution of such +Contributor, if any, in source code and object code form. This patent +license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, +such addition of the Contribution causes such combination to be covered +by the Licensed Patents. The patent license shall not apply to any other +combinations which include the Contribution. No hardware per se is +licensed hereunder. + +c) Recipient understands that although each Contributor +grants the licenses to its Contributions set forth herein, no assurances +are provided by any Contributor that the Program does not infringe the +patent or other intellectual property rights of any other entity. Each +Contributor disclaims any liability to Recipient for claims brought by +any other entity based on infringement of intellectual property rights +or otherwise. As a condition to exercising the rights and licenses +granted hereunder, each Recipient hereby assumes sole responsibility to +secure any other intellectual property rights needed, if any. For +example, if a third party patent license is required to allow Recipient +to distribute the Program, it is Recipient's responsibility to acquire +that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it +has sufficient copyright rights in its Contribution, if any, to grant +the copyright license set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code +form under its own license agreement, provided that: + +a) it complies with the terms and conditions of this +Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors +all warranties and conditions, express and implied, including warranties +or conditions of title and non-infringement, and implied warranties or +conditions of merchantability and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors +all liability for damages, including direct, indirect, special, +incidental and consequential damages, such as lost profits; + +iii) states that any provisions which differ from this +Agreement are offered by that Contributor alone and not by any other +party; and + +iv) states that source code for the Program is available +from such Contributor, and informs licensees how to obtain it in a +reasonable manner on or through a medium customarily used for software +exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each +copy of the Program. + +Contributors may not remove or alter any copyright notices contained +within the Program. + +Each Contributor must identify itself as the originator of its +Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain +responsibilities with respect to end users, business partners and the +like. While this license is intended to facilitate the commercial use of +the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create +potential liability for other Contributors. Therefore, if a Contributor +includes the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and +indemnify every other Contributor ("Indemnified Contributor") +against any losses, damages and costs (collectively "Losses") +arising from claims, lawsuits and other legal actions brought by a third +party against the Indemnified Contributor to the extent caused by the +acts or omissions of such Commercial Contributor in connection with its +distribution of the Program in a commercial product offering. The +obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In +order to qualify, an Indemnified Contributor must: a) promptly notify +the Commercial Contributor in writing of such claim, and b) allow the +Commercial Contributor to control, and cooperate with the Commercial +Contributor in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own +expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those +performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor +must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, +ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY +OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to +the risks and costs of program errors, compliance with applicable laws, +damage to or loss of data, programs or equipment, and unavailability or +interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT +NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other +software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the +date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of time +after becoming aware of such noncompliance. If all Recipient's rights +under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this +Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The +Agreement Steward reserves the right to publish new versions (including +revisions) of this Agreement from time to time. No one other than the +Agreement Steward has the right to modify this Agreement. The Eclipse +Foundation is the initial Agreement Steward. The Eclipse Foundation may +assign the responsibility to serve as the Agreement Steward to a +suitable separate entity. Each new version of the Agreement will be +given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version +of the Agreement is published, Contributor may elect to distribute the +Program (including its Contributions) under the new version. Except as +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no +rights or licenses to the intellectual property of any Contributor under +this Agreement, whether expressly, by implication, estoppel or +otherwise. All rights in the Program not expressly granted under this +Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and +the intellectual property laws of the United States of America. No party +to this Agreement will bring a legal action under this Agreement more +than one year after the cause of action arose. Each party waives its +rights to a jury trial in any resulting litigation. + +</body> + +</html> Property changes on: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/epl-v10.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.properties =================================================================== --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.properties 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.properties 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ # -# ModeShape (http://www.modeshape.org) # See the COPYRIGHT.txt file distributed with this work for information # regarding copyright ownership. # @@ -11,13 +10,30 @@ # See the AUTHORS.txt file in the distribution for a full listing of # individual contributors. # -copyright = ModeShape REST Eclipse Client (http://www.modeshape.org) is copyright of Red Hat, Inc. -license = 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. - -# Feature Information Page properties -description = The ModeShape REST Eclipse Client provides a resource publishing and unpublishing capability to ModeShape repositories. +featureName = ModeShape JCR REST Tools for Eclipse +featureProvider = JBoss by Red Hat, Inc. -# Feature Overview Page properties -featureName = ModeShape JCR REST Eclipse Client -featureProvider = Red Hat, Inc. \ No newline at end of file +description = Provides a resource publishing and unpublishing capability to ModeShape repositories. + +copyright = See the COPYRIGHT.txt file distributed with this work for information\n\ +regarding copyright ownership.\n\ +\n\ +Distributed under license by Red Hat, Inc. All rights reserved.\n\ +This program is made available under the terms of the\n\ +Eclipse Public License v1.0 which accompanies this distribution, and is\n\ +available at http://www.eclipse.org/legal/epl-v10.html.\n\ +\n\ +See the AUTHORS.txt file in the distribution for a full listing of\n\ +individual contributors. + +licenseUrl = license.html +license = Red Hat, Inc. licenses these features and plugins to you under \ +certain open source licenses (or aggregations of such licenses), which \ +in a particular case may include the Eclipse Public License, the GNU \ +Lesser General Public License, and/or certain other open source \ +licenses. For precise licensing details, consult the corresponding \ +source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \ +Raleigh NC 27606 USA. + +updateSiteName = JBossTools Update Site Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml =================================================================== --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>  +</style> +</head> +<body> +<h1>ModeShape REST Tools</h1> + + +This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a> + + +Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a> + + +This software is distributed under the terms of the Eclipse Public License - v 1.0 +(see <a href="www.eclipse.org/legal/epl-v10.html">Eclipse Public License - Version 1.0</a>). + +</body> +</html> \ No newline at end of file Property changes on: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.ini =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.ini 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.ini 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ # -# ModeShape (http://www.modeshape.org) # See the COPYRIGHT.txt file distributed with this work for information # regarding copyright ownership. # Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.properties 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.properties 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ # -# ModeShape (http://www.modeshape.org) # See the COPYRIGHT.txt file distributed with this work for information # regarding copyright ownership. # @@ -12,12 +11,12 @@ # individual contributors. # -featureText=ModeShape REST Eclipse Feature\n\ -Version: 1.0\n\ +featureText=ModeShape REST Tools for Eclipse\n\ \n\ -(c) 2000-2009 MetaMatrix, Inc. and Red Hat, Inc.\n\ +Version: {featureVersion}\n\ \n\ -Visit http://www.modeshape.org/ +Copyright (c) 2008-2010 Red Hat, Inc. All rights reserved.\n\ +Visit http://www.jboss.org/tools and http://www.modeshape.org/ -featureName=ModeShape REST Eclipse Feature +featureName=ModeShape REST Tools for Eclipse Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ # -# ModeShape (http://www.modeshape.org) # See the COPYRIGHT.txt file distributed with this work for information # regarding copyright ownership. # Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ModeShapeMessageConsole.html =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ModeShapeMessageConsole.html 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ModeShapeMessageConsole.html 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ModeShapePreferencesDialog.html =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ModeShapePreferencesDialog.html 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ModeShapePreferencesDialog.html 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/PublishDialog.html =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/PublishDialog.html 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/PublishDialog.html 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/PublishedLocationsDialog.html =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/PublishedLocationsDialog.html 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/PublishedLocationsDialog.html 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ResourceContextMenu.html =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ResourceContextMenu.html 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ResourceContextMenu.html 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerDialog.html =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerDialog.html 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerDialog.html 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerView.html =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerView.html 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerView.html 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/Toc.html =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/Toc.html 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/Toc.html 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/helpContexts.xml =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/helpContexts.xml 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/helpContexts.xml 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/toc.xml =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/toc.xml 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/toc.xml 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ # -# ModeShape (http://www.modeshape.org) # See the COPYRIGHT.txt file distributed with this work for information # regarding copyright ownership. # Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.2"?> <!-- - ~ ModeShape (http://www.modeshape.org) - See the COPYRIGHT.txt file distributed with this work for information - regarding copyright ownership. - Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ # -# ModeShape (http://www.modeshape.org) # See the COPYRIGHT.txt file distributed with this work for information # regarding copyright ownership. # Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Activator.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Activator.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Activator.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IServerRegistryListener.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IServerRegistryListener.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IServerRegistryListener.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IUiConstants.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IUiConstants.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IUiConstants.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/PersistedServer.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/PersistedServer.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/PersistedServer.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/PublishedResourceHelper.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/PublishedResourceHelper.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/PublishedResourceHelper.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ # -# ModeShape (http://www.modeshape.org) # See the COPYRIGHT.txt file distributed with this work for information # regarding copyright ownership. # Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerRegistryEvent.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerRegistryEvent.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerRegistryEvent.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Utils.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Utils.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Utils.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/BasePublishingAction.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/BasePublishingAction.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/BasePublishingAction.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/DeleteServerAction.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/DeleteServerAction.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/DeleteServerAction.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/EditServerAction.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/EditServerAction.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/EditServerAction.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/NewServerAction.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/NewServerAction.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/NewServerAction.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/PublishAction.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/PublishAction.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/PublishAction.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ReconnectToServerAction.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ReconnectToServerAction.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ReconnectToServerAction.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ShowPublishedLocationsAction.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ShowPublishedLocationsAction.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ShowPublishedLocationsAction.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/UnpublishAction.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/UnpublishAction.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/UnpublishAction.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/package-info.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/package-info.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/package-info.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/DeleteServerDialog.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/DeleteServerDialog.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/DeleteServerDialog.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/PublishedLocationsDialog.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/PublishedLocationsDialog.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/PublishedLocationsDialog.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/package-info.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/package-info.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/package-info.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/PublishJob.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/PublishJob.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/PublishJob.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/ReconnectJob.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/ReconnectJob.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/ReconnectJob.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLoggerFactory.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLoggerFactory.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLoggerFactory.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/StaticLoggerBinder.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/StaticLoggerBinder.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/StaticLoggerBinder.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/package-info.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/package-info.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/package-info.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFileExtensionEditor.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFileExtensionEditor.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFileExtensionEditor.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFoldersEditor.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFoldersEditor.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFoldersEditor.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/ModeShapePreferencePage.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/ModeShapePreferencePage.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/ModeShapePreferencePage.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/NewItemDialog.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/NewItemDialog.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/NewItemDialog.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PrefUtils.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PrefUtils.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PrefUtils.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PublishingFileFilter.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PublishingFileFilter.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PublishingFileFilter.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/prefs.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/prefs.properties 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/prefs.properties 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ # -# ModeShape (http://www.modeshape.org) # See the COPYRIGHT.txt file distributed with this work for information # regarding copyright ownership. # Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeContentProvider.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeContentProvider.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeContentProvider.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeMessageConsole.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeMessageConsole.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeMessageConsole.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ServerView.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ServerView.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ServerView.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/package-info.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/package-info.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/package-info.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishWizard.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishWizard.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishWizard.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerWizard.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerWizard.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerWizard.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/package-info.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/package-info.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/package-info.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/PersistedServerTest.java =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/PersistedServerTest.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/PersistedServerTest.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/ServerManagerTest.java =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/ServerManagerTest.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/ServerManagerTest.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. * Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/ServerRegistryEventTest.java =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/ServerRegistryEventTest.java 2010-01-26 16:52:15 UTC (rev 19936) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/ServerRegistryEventTest.java 2010-01-26 17:06:32 UTC (rev 19937) @@ -1,5 +1,4 @@ /* - * ModeShape (http://www.modeshape.org) * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. *

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19936 - in trunk/cdi/plugins: org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-01-26 11:52:15 -0500 (Tue, 26 Jan 2010) New Revision: 19936 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3125 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-01-26 16:51:37 UTC (rev 19935) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-01-26 16:52:15 UTC (rev 19936) @@ -10,8 +10,16 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMethod; import org.jboss.tools.common.EclipseUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jst.web.kb.IKbProject; @@ -51,4 +59,53 @@ CDICorePlugin.getDefault().logError(e); } } + + /** + * Finds CDI injected point in beans for particular java element. + * + * @param beans + * @param element + */ + public static IInjectionPoint findInjectionPoint(Set<IBean> beans, IJavaElement element){ + if(!(element instanceof IField) && (element instanceof IMethod) ) + return null; + + for(IBean bean : beans){ + Set<IInjectionPoint> injectionPoints = bean.getInjectionPoints(); + for(IInjectionPoint iPoint : injectionPoints){ + if(element instanceof IField && iPoint instanceof IInjectionPointField){ + if(((IInjectionPointField)iPoint).getField() != null && ((IInjectionPointField)iPoint).getField().equals(element)) + return iPoint; + }else if(element instanceof IMethod && iPoint instanceof IInjectionPointMethod){ + if(((IInjectionPointMethod)iPoint).getMethod() != null && ((IInjectionPointMethod)iPoint).getMethod().equals(element)) + return iPoint; + + } + } + } + return null; + } + + /** + * Sorts CDI beans. Sets for alternative beans higher position and for nonalternative beans lower position. + * + * @param beans + * @param element + */ + public static List<IBean> sortBeans(Set<IBean> beans){ + Set<IBean> alternativeBeans = new HashSet<IBean>(); + Set<IBean> nonAlternativeBeans = new HashSet<IBean>(); + + for(IBean bean : beans){ + if(bean.isAlternative()) + alternativeBeans.add(bean); + else + nonAlternativeBeans.add(bean); + } + + ArrayList<IBean> sortedBeans = new ArrayList<IBean>(); + sortedBeans.addAll(alternativeBeans); + sortedBeans.addAll(nonAlternativeBeans); + return sortedBeans; + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-01-26 16:51:37 UTC (rev 19935) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-01-26 16:52:15 UTC (rev 19936) @@ -11,7 +11,6 @@ package org.jboss.tools.cdi.text.ext.hyperlink; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Set; @@ -20,9 +19,7 @@ import org.eclipse.jdt.core.IAnnotatable; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.ICodeAssist; -import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility; import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; @@ -35,11 +32,10 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IInjectionPoint; -import org.jboss.tools.cdi.core.IInjectionPointField; -import org.jboss.tools.cdi.core.IInjectionPointMethod; public class InjectedPointHyperlinkDetector extends AbstractHyperlinkDetector{ @@ -102,13 +98,13 @@ if (element instanceof IAnnotatable) { IAnnotatable annotatable = (IAnnotatable)element; - IAnnotation annotation = annotatable.getAnnotation("Injected"); + IAnnotation annotation = annotatable.getAnnotation("Injected"); //$NON-NLS-1$ if (annotation == null) continue; - IInjectionPoint injectionPoint = findInjectionPoint(beans, element); + IInjectionPoint injectionPoint = CDIUtil.findInjectionPoint(beans, element); if(injectionPoint != null){ Set<IBean> resultBeanSet = cdiProject.getBeans(injectionPoint); - List<IBean> resultBeanList = sortBeans(resultBeanSet); + List<IBean> resultBeanList = CDIUtil.sortBeans(resultBeanSet); for(IBean bean : resultBeanList){ if(bean != null) hyperlinks.add(new InjectedPointHyperlink(wordRegion, bean, document)); @@ -125,41 +121,6 @@ return null; } - private IInjectionPoint findInjectionPoint(Set<IBean> beans, IJavaElement element){ - if(!(element instanceof IField) && (element instanceof IMethod) ) - return null; - - for(IBean bean : beans){ - Set<IInjectionPoint> injectionPoints = bean.getInjectionPoints(); - for(IInjectionPoint iPoint : injectionPoints){ - if(element instanceof IField && iPoint instanceof IInjectionPointField){ - if(((IInjectionPointField)iPoint).getField() != null && ((IInjectionPointField)iPoint).getField().equals(element)) - return iPoint; - }else if(element instanceof IMethod && iPoint instanceof IInjectionPointMethod){ - if(((IInjectionPointMethod)iPoint).getMethod() != null && ((IInjectionPointMethod)iPoint).getMethod().equals(element)) - return iPoint; - - } - } - } - return null; - } - private List<IBean> sortBeans(Set<IBean> beans){ - Set<IBean> alternativeBeans = new HashSet<IBean>(); - Set<IBean> nonAlternativeBeans = new HashSet<IBean>(); - - for(IBean bean : beans){ - if(bean.isAlternative()) - alternativeBeans.add(bean); - else - nonAlternativeBeans.add(bean); - } - - ArrayList<IBean> sortedBeans = new ArrayList<IBean>(); - sortedBeans.addAll(alternativeBeans); - sortedBeans.addAll(nonAlternativeBeans); - return sortedBeans; - } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2010-01-26 16:51:37 UTC (rev 19935) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2010-01-26 16:52:15 UTC (rev 19936) @@ -17,7 +17,9 @@ org.eclipse.jdt.ui, org.eclipse.jface.text, org.eclipse.wst.sse.ui, - org.jboss.tools.jst.web.kb + org.jboss.tools.jst.web.kb, + org.eclipse.jdt.core;bundle-version="3.5.0", + org.eclipse.search;bundle-version="3.5.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2010-01-26 16:51:37 UTC (rev 19935) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2010-01-26 16:52:15 UTC (rev 19936) @@ -97,5 +97,13 @@ <partition type="__java_string"/> </javaCompletionProposalComputer> </extension> - -</plugin> \ No newline at end of file + <extension + point="org.eclipse.jdt.ui.queryParticipants"> + <queryParticipant + class="org.jboss.tools.cdi.ui.search.InjectionPointQueryParticipant" + id="org.jboss.tools.cdi.ui.search.InjectionPointQueryParticipant" + name="cdi-InjectionPointReferencesParticipant" + nature="org.jboss.tools.cdi.core.cdinature"> + </queryParticipant> + </extension> +</plugin> Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java 2010-01-26 16:52:15 UTC (rev 19936) @@ -0,0 +1,109 @@ +/******************************************************************************* + * 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.cdi.ui.search; + +import java.util.List; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.core.IAnnotatable; +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.ISourceRange; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.search.IJavaSearchConstants; +import org.eclipse.jdt.internal.core.Member; +import org.eclipse.jdt.ui.search.ElementQuerySpecification; +import org.eclipse.jdt.ui.search.IMatchPresentation; +import org.eclipse.jdt.ui.search.IQueryParticipant; +import org.eclipse.jdt.ui.search.ISearchRequestor; +import org.eclipse.jdt.ui.search.QuerySpecification; +import org.eclipse.search.ui.text.Match; +import org.jboss.tools.cdi.core.CDICoreNature; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIUtil; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IInjectionPoint; + +public class InjectionPointQueryParticipant implements IQueryParticipant{ + + public int estimateTicks(QuerySpecification specification) { + return 10; + } + + public IMatchPresentation getUIParticipant() { + return null; + } + + public void search(ISearchRequestor requestor, + QuerySpecification querySpecification, IProgressMonitor monitor) + throws CoreException { + + if(querySpecification instanceof ElementQuerySpecification){ + if (!isSearchForReferences(querySpecification.getLimitTo())) + return; + + ElementQuerySpecification qs = (ElementQuerySpecification)querySpecification; + IJavaElement element = qs.getElement(); + if(element instanceof IMethod || element instanceof IField){ + IFile file = (IFile)element.getResource(); + + CDICoreNature cdiNature = CDICorePlugin.getCDI(file.getProject(), true); + + if(cdiNature == null) + return; + + ICDIProject cdiProject = cdiNature.getDelegate(); + + if(cdiProject == null) + return; + + Set<IBean> beans = cdiProject.getBeans(file.getFullPath()); + + if (element instanceof IAnnotatable) { + IAnnotatable annotatable = (IAnnotatable)element; + + IAnnotation annotation = annotatable.getAnnotation("Injected"); //$NON-NLS-1$ + if (annotation == null) + return; + IInjectionPoint injectionPoint = CDIUtil.findInjectionPoint(beans, element); + if(injectionPoint != null){ + Set<IBean> resultBeanSet = cdiProject.getBeans(injectionPoint); + List<IBean> resultBeanList = CDIUtil.sortBeans(resultBeanSet); + for(IBean bean : resultBeanList){ + if(bean != null){ + IType type = bean.getBeanClass(); + ISourceRange range = ((Member)type).getNameRange(); + Match match = new Match(type.getResource(), range.getOffset(), range.getLength()); + requestor.reportMatch(match); + } + } + } + } + } + } + } + + public boolean isSearchForReferences(int limitTo) { + int maskedLimitTo = limitTo & ~(IJavaSearchConstants.IGNORE_DECLARING_TYPE+IJavaSearchConstants.IGNORE_RETURN_TYPE); + if (maskedLimitTo == IJavaSearchConstants.REFERENCES || maskedLimitTo == IJavaSearchConstants.ALL_OCCURRENCES) { + return true; + } + + return false; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19935 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-01-26 11:51:37 -0500 (Tue, 26 Jan 2010) New Revision: 19935 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/ Log: https://jira.jboss.org/jira/browse/JBIDE-3125

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19934 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-01-26 11:25:20 -0500 (Tue, 26 Jan 2010) New Revision: 19934 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-5736 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java 2010-01-26 15:46:27 UTC (rev 19933) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java 2010-01-26 16:25:20 UTC (rev 19934) @@ -22,6 +22,7 @@ public class WebDevelopmentPerspectiveFactory implements IPerspectiveFactory { public static final String PERSPECTIVE_ID = "org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"; //$NON-NLS-1$ + private static String WTP_SERVERS_VIEW = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$ /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout) @@ -34,17 +35,16 @@ leftTop.addView("org.jboss.tools.jst.web.ui.navigator.WebProjectsView"); //$NON-NLS-1$ leftTop.addView("org.jboss.tools.seam.ui.views.SeamComponentsNavigator"); //$NON-NLS-1$ leftTop.addPlaceholder(IPageLayout.ID_RES_NAV); - IFolderLayout leftBottom = layout.createFolder("leftBottom", IPageLayout.BOTTOM, 0.64f, "leftTop"); //$NON-NLS-1$ //$NON-NLS-2$ //leftBottom.addView(IPageLayout.ID_OUTLINE); leftBottom.addView(IPageLayout.ID_PROP_SHEET); - IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.78, editorArea); //$NON-NLS-1$ bottom.addView(IPageLayout.ID_PROBLEM_VIEW); bottom.addView(IPageLayout.ID_TASK_LIST); - bottom.addView("org.jboss.ide.eclipse.as.ui.views.JBossServerView"); //$NON-NLS-1$ +// bottom.addView("org.jboss.ide.eclipse.as.ui.views.JBossServerView"); //$NON-NLS-1$ + bottom.addView(WTP_SERVERS_VIEW); IFolderLayout rightTop = layout.createFolder("right", IPageLayout.RIGHT, (float)0.8, editorArea); //$NON-NLS-1$ // rightTop.addView("org.jboss.tools.common.model.ui.views.palette.PaletteView"); //$NON-NLS-1$ @@ -59,7 +59,7 @@ // views - seam layout.addShowViewShortcut("org.jboss.tools.seam.ui.views.SeamComponentsNavigator"); //$NON-NLS-1$ - + // views - java layout.addShowViewShortcut(JavaUI.ID_PACKAGES); layout.addShowViewShortcut(JavaUI.ID_TYPE_HIERARCHY);

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19933 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-01-26 10:46:27 -0500 (Tue, 26 Jan 2010) New Revision: 19933 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-5382 add openOn action for name param for h:outputStylesheet, h:outputScript, h:graphicImage jsf 2.0 tags - JSFJSPLinkHyperlinkPartitioner was deleted by a mistake. That is fixed. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2010-01-26 15:31:05 UTC (rev 19932) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2010-01-26 15:46:27 UTC (rev 19933) @@ -403,10 +403,20 @@ </hyperlinkPartitioner> <hyperlinkPartitioner - id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSF2JSPLinkHyperlinkPartitioner" - class="org.jboss.tools.jsf.text.ext.hyperlink.JSF2JSPLinkHyperlinkPartitioner"> + id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSFJSPLinkHyperlinkPartitioner" + class="org.jboss.tools.jsf.text.ext.hyperlink.JSFJSPLinkHyperlinkPartitioner"> + <contentType id="org.eclipse.jst.jsp.core.jspsource"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" /> + </contentType> + <contentType id="org.eclipse.wst.html.core.htmlsource"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" /> + </contentType> + </hyperlinkPartitioner> + + <hyperlinkPartitioner + id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSF2JSPLinkHyperlinkPartitioner" + class="org.jboss.tools.jsf.text.ext.hyperlink.JSF2JSPLinkHyperlinkPartitioner"> <contentType id="org.eclipse.jst.jsp.core.jspsource"> - <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" /> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> <axis path="*/[http://java.sun.com/jsf/html]:outputStylesheet/name/" /> <axis path="*/[http://java.sun.com/jsf/html]:outputScript/name/" /> @@ -414,7 +424,6 @@ </partitionType> </contentType> <contentType id="org.eclipse.wst.html.core.htmlsource"> - <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" /> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> <axis path="*/[http://java.sun.com/jsf/html]:outputStylesheet/name/" /> <axis path="*/[http://java.sun.com/jsf/html]:outputScript/name/" />

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19932 - in trunk: hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jpeterka Date: 2010-01-26 10:31:05 -0500 (Tue, 26 Jan 2010) New Revision: 19932 Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CodeGenerationLauncherTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingFileTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateAllTests.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java Log: Fixed minor bot issues of SWTBotExt and HibernateTest Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/META-INF/MANIFEST.MF 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/META-INF/MANIFEST.MF 2010-01-26 15:31:05 UTC (rev 19932) @@ -18,7 +18,6 @@ org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", org.jboss.tools.ui.bot.ext;bundle-version="1.0.0", org.eclipse.jdt.ui, - org.jboss.tools.jst.ui.bot.test;bundle-version="1.0.0", org.jboss.tools.hibernate.ui;bundle-version="3.3.0", org.jboss.tools.hibernate.xml.ui;bundle-version="3.1.0", org.jboss.tools.common.model.ui;bundle-version="3.1.0", Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CodeGenerationLauncherTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CodeGenerationLauncherTest.java 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/CodeGenerationLauncherTest.java 2010-01-26 15:31:05 UTC (rev 19932) @@ -43,6 +43,7 @@ prepareProject(); prepareConsole(); prepareDatabase(); + util.waitForNonIgnoredJobs(); } /** @@ -53,8 +54,10 @@ if (generationDone) return; log.info("HB Code Generation STARTED"); + log.info("Active Shell: " + bot.activeShell().getText()); + eclipse.openPerspective(PerspectiveType.HIBERNATE); - + createNewHibernateCodeGenerationConfiguration(); fillMainTab(); @@ -66,8 +69,10 @@ log.info("HB Code Generation FINISHED"); util.waitForNonIgnoredJobs(); + log.info("Active Shell: " + bot.activeShell().getText()); + checkGeneratedFiles(); - + generationDone = true; } /** @@ -75,6 +80,13 @@ */ private void checkGeneratedFiles() { + log.info("Active Shell: " + bot.activeShell().getText()); + SWTBotShell[] shells = bot.shells(); + for (SWTBotShell shell : shells) { + log.info("Possible shell: " + shell.getText()); + } + + bot.sleep(TIME_20S); SWTBot viewBot = eclipse.showView(ViewType.PROJECT_EXPLORER); SWTBotTreeItem item; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java 2010-01-26 15:31:05 UTC (rev 19932) @@ -78,9 +78,11 @@ if (!cb.isChecked()) cb.click(); - SWTBotShell shell = bot.activeShell(); + SWTBotShell shell = bot.activeShell(); + log.info("Active shell:" + shell.getText()); bot.button(IDELabel.Button.FINISH).click(); - eclipse.waitForClosedShell(shell); + eclipse.waitForClosedShell(shell); + log.info("Active Shell: " + bot.activeShell().getText()); } /** @@ -96,8 +98,7 @@ */ public void editFile() throws ParserConfigurationException, SAXException, IOException, XPathExpressionException { - eclipse.openFile(Project.PROJECT_NAME, "src", Project.CONF_FILE_NAME2); - SWTBotEditor editor = bot.editorByTitle(Project.CONF_FILE_NAME2); + SWTBotEditor editor = eclipse.openFile(Project.PROJECT_NAME, "src", Project.CONF_FILE_NAME2); ObjectMultiPageEditorBot multiBot = new ObjectMultiPageEditorBot(Project.CONF_FILE_NAME2); // 1. Tabs availability @@ -177,7 +178,6 @@ editor.saveAndClose(); assertTrue("Security element not found in xml", found); - bot.sleep(TIME_10S); } } Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java 2010-01-26 15:31:05 UTC (rev 19932) @@ -59,6 +59,7 @@ createCommonTab(); bot.button(IDELabel.Button.FINISH).click(); + util.waitForNonIgnoredJobs(); log.info("HB Console creation FINISHED"); done = true; @@ -84,6 +85,7 @@ SWTBotShell shell = bot.activeShell(); bot.button(IDELabel.Button.FINISH).click(); eclipse.waitForClosedShell(shell); + log.info("HB Console Main tab DONE"); bot.sleep(TIME_1S); } Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingFileTest.java 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/MappingFileTest.java 2010-01-26 15:31:05 UTC (rev 19932) @@ -17,8 +17,8 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.hibernate.ui.bot.testsuite.Project; +import org.jboss.tools.ui.bot.ext.parts.ObjectMultiPageEditorBot; import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; -import org.jboss.tools.ui.bot.ext.parts.ObjectMultiPageEditorBot; import org.jboss.tools.ui.bot.ext.types.EntityType; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.AfterClass; @@ -70,7 +70,7 @@ // Create mapping files eclipse.createNew(EntityType.HIBERNATE_MAPPING_FILE); - eclipse.waitForShell(IDELabel.Shell.NEW_HIBERNATE_MAPPING_FILE); + bot.button(IDELabel.Button.NEXT).click(); bot.button(IDELabel.Button.FINISH).click(); util.waitForNonIgnoredJobs(); @@ -86,12 +86,13 @@ private void createFilesFromPackage() { // Select Package file SWTBot viewBot = bot.viewByTitle(IDELabel.View.PACKAGE_EXPLORER).bot(); + bot.viewByTitle(IDELabel.View.PACKAGE_EXPLORER).show(); + bot.viewByTitle(IDELabel.View.PACKAGE_EXPLORER).setFocus(); SWTBotTreeItem item = viewBot.tree().expandNode(Project.PROJECT_NAME).expandNode("src"); item = item.expandNode(Project.PACKAGE_NAME).select(); // Create mapping files eclipse.createNew(EntityType.HIBERNATE_MAPPING_FILE); - eclipse.waitForShell(IDELabel.Shell.NEW_HIBERNATE_MAPPING_FILE); bot.button(IDELabel.Button.FINISH).click(); util.waitForNonIgnoredJobs(); Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateAllTests.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateAllTests.java 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateAllTests.java 2010-01-26 15:31:05 UTC (rev 19932) @@ -33,10 +33,10 @@ MappingsDiagramTest.class, ReverseEngineerFileTest.class, ViewsTest.class */ -@SuiteClasses( { ConfigurationFileTest.class, - ConsoleTest.class, +@SuiteClasses( { ConfigurationFileTest.class, MappingFileTest.class, - CodeGenerationLauncherTest.class}) + CodeGenerationLauncherTest.class, + ConsoleTest.class}) public class HibernateAllTests extends HibernateTest { Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-01-26 15:31:05 UTC (rev 19932) @@ -36,7 +36,7 @@ log.error(msg); fail(msg); } - + // ------------------------------------------------------------ // SWTBot method wrapper ( for better logging mainly ) // ------------------------------------------------------------ Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-01-26 15:31:05 UTC (rev 19932) @@ -1,13 +1,13 @@ - /******************************************************************************* - * Copyright (c) 2007-2009 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.ui.bot.ext; @@ -23,8 +23,10 @@ import org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory; import org.eclipse.swtbot.eclipse.finder.waits.Conditions; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; @@ -40,32 +42,34 @@ /** * Provides Eclipse common operation based on SWTBot element operations + * * @author jpeterka - * + * */ public class SWTEclipseExt { - private SWTWorkbenchBot bot; - private SWTUtilExt swtUtilExt; - private Logger log = Logger.getLogger(SWTEclipseExt.class); - + private SWTUtilExt util; + private SWTBotExt bot; + // private SWTUtilExt swtUtilExt; + private Logger log = Logger.getLogger(SWTEclipseExt.class); + public SWTWorkbenchBot getBot() { - return bot; - } + return bot; + } - public SWTUtilExt getSwtUtilExt() { - return swtUtilExt; - } + public Logger getLog() { + return log; + } - public Logger getLog() { - return log; - } - - public SWTEclipseExt(SWTWorkbenchBot bot) { + public SWTEclipseExt(SWTBotExt bot) { this.bot = bot; - swtUtilExt = new SWTUtilExt(bot); + this.util = new SWTUtilExt(bot); } - + public SWTEclipseExt() { + this.bot = new SWTBotExt(); + this.util = new SWTUtilExt(bot); + } + // ------------------------------------------------------------ // View related methods // ------------------------------------------------------------ @@ -81,15 +85,19 @@ * * @param type */ - public SWTBot showView(ViewType type) { - bot.menu(IDELabel.Menu.WINDOW).menu(IDELabel.Menu.SHOW_VIEW).menu( - IDELabel.Menu.OTHER).click(); - bot.tree().expandNode(type.getGroupLabel()).expandNode(type.getViewLabel()).select(); + public SWTBot showView(ViewType type) { + SWTBotMenu menu1 = bot.menu(IDELabel.Menu.WINDOW); + SWTBotMenu menu2 = menu1.menu(IDELabel.Menu.SHOW_VIEW); + menu2.menu(IDELabel.Menu.OTHER).click(); + + bot.tree().expandNode(type.getGroupLabel()).expandNode( + type.getViewLabel()).select(); bot.button(IDELabel.Button.OK).click(); - + SWTBot viewBot = bot.viewByTitle(type.getViewLabel()).bot(); - return viewBot; + return viewBot; } + // ------------------------------------------------------------ // Perspective related methods // ------------------------------------------------------------ @@ -102,30 +110,43 @@ String perspectiveLabel = ""; switch (type) { - case JAVA: perspectiveLabel = IDELabel.SelectPerspectiveDialog.JAVA; break; - case HIBERNATE: perspectiveLabel = IDELabel.SelectPerspectiveDialog.HIBERNATE;break; - case SEAM: perspectiveLabel = IDELabel.SelectPerspectiveDialog.SEAM;break; - case WEB_DEVELOPMENT:perspectiveLabel = IDELabel.SelectPerspectiveDialog.WEB_DEVELOPMENT; break; - case DB_DEVELOPMENT: perspectiveLabel = IDELabel.SelectPerspectiveDialog.DB_DEVELOPMENT; break; - default: fail("Unknown perspective to open"); + case JAVA: + perspectiveLabel = IDELabel.SelectPerspectiveDialog.JAVA; + break; + case HIBERNATE: + perspectiveLabel = IDELabel.SelectPerspectiveDialog.HIBERNATE; + break; + case SEAM: + perspectiveLabel = IDELabel.SelectPerspectiveDialog.SEAM; + break; + case WEB_DEVELOPMENT: + perspectiveLabel = IDELabel.SelectPerspectiveDialog.WEB_DEVELOPMENT; + break; + case DB_DEVELOPMENT: + perspectiveLabel = IDELabel.SelectPerspectiveDialog.DB_DEVELOPMENT; + break; + default: + fail("Unknown perspective to open"); } - - bot.menu(IDELabel.Menu.WINDOW).menu(IDELabel.Menu.OPEN_PERSPECTIVE).menu( - IDELabel.Menu.OTHER).click(); + + SWTBotMenu menu1 = bot.menu(IDELabel.Menu.WINDOW); + SWTBotMenu menu2 = menu1.menu(IDELabel.Menu.OPEN_PERSPECTIVE); + menu2.menu(IDELabel.Menu.OTHER).click(); bot.table().select(perspectiveLabel); // Another approach - SWTBotShell openPerpectiveShell = bot.shell("Open Perspective"); - openPerpectiveShell.activate(); + SWTBotShell openPerpectiveShell = bot.shell("Open Perspective"); + openPerpectiveShell.activate(); bot.button(IDELabel.Button.OK).click(); } // ------------------------------------------------------------ // Create related methods - // ------------------------------------------------------------ + // ------------------------------------------------------------ /** * Create Java Project desribed with propriate entity + * * @param entity */ public void createJavaProject(JavaProjectEntity entity) { @@ -140,30 +161,34 @@ // Wait for shell closing JavaProjectWizard waitForClosedShell(IDELabel.Shell.NEW_JAVA_PROJECT); - swtUtilExt.waitForNonIgnoredJobs(); + util.waitForNonIgnoredJobs(); } - + // ------------------------------------------------------------ // Create related methods - // ------------------------------------------------------------ + // ------------------------------------------------------------ /** * Create new Java Class described with JavaClassEntity + * * @param entity */ public void createJavaClass(JavaClassEntity entity) { createNew(EntityType.JAVA_CLASS); waitForShell(IDELabel.Shell.NEW_JAVA_CLASS); - - bot.textWithLabel(IDELabel.NewClassCreationWizard.PACKAGE_NAME).setText(entity.getPackageName()); - bot.textWithLabel(IDELabel.NewClassCreationWizard.CLASS_NAME).setText(entity.getClassName()); + + bot.textWithLabel(IDELabel.NewClassCreationWizard.PACKAGE_NAME) + .setText(entity.getPackageName()); + bot.textWithLabel(IDELabel.NewClassCreationWizard.CLASS_NAME).setText( + entity.getClassName()); bot.button(IDELabel.Button.FINISH).click(); - + waitForClosedShell(IDELabel.Shell.NEW_JAVA_CLASS); - swtUtilExt.waitForNonIgnoredJobs(); + util.waitForNonIgnoredJobs(); } - + /** * Remove entity from package explorer + * * @param projectName * @param path */ @@ -172,110 +197,123 @@ SWTBot viewBot = bot.viewByTitle(IDELabel.View.PACKAGE_EXPLORER).bot(); SWTBotTreeItem item = viewBot.tree().expandNode(projectName); - // Go through path - for ( String nodeName: path ) { + // Go through path + for (String nodeName : path) { item = item.expandNode(nodeName); } // Delete File - item.select().contextMenu("Delete").click(); - bot.button(IDELabel.Button.OK).click(); + item.select().contextMenu("Delete").click(); + bot.button(IDELabel.Button.OK).click(); } - /** * Open File in Package Explorer + * * @param projectName * @param path */ - public void openFile(String projectName, String... path) { + public SWTBotEditor openFile(String projectName, String... path) { SWTBot viewBot = bot.viewByTitle(IDELabel.View.PACKAGE_EXPLORER).bot(); - SWTBotTreeItem item = viewBot.tree().expandNode(projectName); + bot.viewByTitle(IDELabel.View.PACKAGE_EXPLORER).show(); + bot.viewByTitle(IDELabel.View.PACKAGE_EXPLORER).setFocus(); + SWTBotTree tree = viewBot.tree(); + SWTBotTreeItem item = tree.expandNode(projectName); StringBuilder builder = new StringBuilder(projectName); - - // Go through path - for ( String nodeName: path ) { + + // Go through path + for (String nodeName : path) { item = item.expandNode(nodeName); builder.append("/" + nodeName); } - + item.select().doubleClick(); log.info("File Opened:" + builder.toString()); + + SWTBotEditor editor = bot.activeEditor(); + return editor; } - + // ------------------------------------------------------------ // Navigation related - // ------------------------------------------------------------ + // ------------------------------------------------------------ /** * Select element in tree - * @return + * + * @return */ - public SWTBotTreeItem selectTreeLocation(String... path) { + public SWTBotTreeItem selectTreeLocation(String... path) { return selectTreeLocation(bot, path); - } + } + /** * Select element in tree with given bot - * @return - */ + * + * @return + */ public SWTBotTreeItem selectTreeLocation(SWTBot bot, String... path) { SWTBot viewBot = bot; - - SWTBotTreeItem item = null; - // Go through path - for ( String nodeName: path ) { - if ( item == null ) { + + SWTBotTreeItem item = null; + // Go through path + for (String nodeName : path) { + if (item == null) { item = viewBot.tree().expandNode(nodeName); } else { - item = item.expandNode(nodeName); + item = item.expandNode(nodeName); } - log.info(nodeName); + log.info(nodeName); } return item.select(); } - + // ------------------------------------------------------------ // Subroutines // ------------------------------------------------------------ /** - * Invoke Create new entity dialog (it means File -> New -> EntityType -> Next ) + * Invoke Create new entity dialog (it means File -> New -> EntityType -> + * Next ) */ public void createNew(EntityType entityType) { - - bot.menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.NEW).menu(IDELabel.Menu.OTHER).click(); + + bot.menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.NEW).menu( + IDELabel.Menu.OTHER).click(); waitForShell(IDELabel.Shell.NEW); String entityLabel = entityType.getEntityLabel(); SWTBotTree tree = bot.tree(); - Iterator<String> itGroupsNodes = entityType.getGroupsLabels().iterator(); + Iterator<String> itGroupsNodes = entityType.getGroupsLabels() + .iterator(); // if there are group labels defined expand groups nodes - if (itGroupsNodes.hasNext()){ - SWTBotTreeItem groupTreeItem = tree.expandNode(itGroupsNodes.next()); - while (itGroupsNodes.hasNext()){ - groupTreeItem = groupTreeItem.expandNode(itGroupsNodes.next()); - } - groupTreeItem.select(entityLabel); + if (itGroupsNodes.hasNext()) { + SWTBotTreeItem groupTreeItem = tree + .expandNode(itGroupsNodes.next()); + while (itGroupsNodes.hasNext()) { + groupTreeItem = groupTreeItem.expandNode(itGroupsNodes.next()); + } + groupTreeItem.select(entityLabel); + } else { + tree.select(entityLabel); } - else{ - tree.select(entityLabel); - } bot.button(IDELabel.Button.NEXT).click(); } - + /** * Wait for appearance shell of given name + * * @param shellName */ - public void waitForShell(String shellName) { - Matcher<Shell> matcher = WidgetMatcherFactory - .withText(shellName); + public void waitForShell(String shellName) { + Matcher<Shell> matcher = WidgetMatcherFactory.withText(shellName); bot.waitUntil(Conditions.waitForShell(matcher)); - + } - + /** * Waits for closed shell with shell name + * * @param shellName */ public void waitForClosedShell(String shellName) { @@ -288,141 +326,166 @@ log.info("Waiting for closing shell..."); } } - + /** - * Assert same content of file in project explorer with content of file in resources + * Assert same content of file in project explorer with content of file in + * resources + * * @param pluginId * @param projectName * @param path */ - public void assertSameContent(String pluginId, String projectName, String... path) { - File file = swtUtilExt.getResourceFile(pluginId, path); - String resourceContent = swtUtilExt.readTextFile(file); - + public void assertSameContent(String pluginId, String projectName, + String... path) { + File file = util.getResourceFile(pluginId, path); + String resourceContent = SWTTestExt.util.readTextFile(file); + openAsText(projectName, path); - SWTBotEclipseEditor editor = bot.editorByTitle(path[path.length - 1]).toTextEditor(); + SWTBotEclipseEditor editor = bot.editorByTitle(path[path.length - 1]) + .toTextEditor(); String fileContent = editor.getText(); - - assertEquals(resourceContent, fileContent ); + + assertEquals(resourceContent, fileContent); } - + /** * Open file from Package Explorer as text + * * @param projectName * @param path */ public void openAsText(String projectName, String... path) { SWTBot viewBot = bot.viewByTitle(IDELabel.View.PACKAGE_EXPLORER).bot(); SWTBotTreeItem item = viewBot.tree().expandNode(projectName); - - // Go through path - for ( String nodeName: path ) { + + // Go through path + for (String nodeName : path) { log.info(nodeName); item = item.expandNode(nodeName); - } - - item.select(); + } + + item.select(); } /** * Replace class content from content of class from resource + * * @param pluginId * @param path */ - public void setClassContentFromResource(boolean save, String pluginId, String... path) { + public void setClassContentFromResource(boolean save, String pluginId, + String... path) { SWTBotEclipseEditor editor; editor = bot.editorByTitle(path[path.length - 1]).toTextEditor(); editor.selectRange(0, 0, editor.getLineCount()); - File file = swtUtilExt.getResourceFile(pluginId, path); - String content = swtUtilExt.readTextFile(file); + File file = util.getResourceFile(pluginId, path); + String content = util.readTextFile(file); editor.setText(content); if (save) - editor.save(); + editor.save(); } - /** - * Define new Server Runtime only if it's not specified yet - * @param runtimeName - * @param runtimeGroup - * @param runtimeType - * @param runtimeHomeDir - */ - public void addServerRuntime (String runtimeName, String runtimeGroup, - String runtimeType, String runtimeHomeDir){ - - bot.menu(IDELabel.Menu.WINDOW).menu(IDELabel.Menu.PREFERENCES).click(); - bot.shell(IDELabel.Shell.PREFERENCES).activate(); - bot.tree().expandNode(IDELabel.PreferencesDialog.SERVER_GROUP) - .select(PreferencesDialog.RUNTIME_ENVIRONMENTS); - SWTBotTable tbRuntimeEnvironments = bot.table(); - boolean createRuntime = true; - // first check if Environment doesn't exist - int numRows = tbRuntimeEnvironments.rowCount(); - if (numRows > 0){ - int currentRow = 0; - while (createRuntime && currentRow < numRows){ - if (tbRuntimeEnvironments.cell(currentRow, 0).equalsIgnoreCase(runtimeName)){ - createRuntime = false; - } - else { - currentRow++; - } - } - } - // create Server Runtime - if (createRuntime){ - bot.button(IDELabel.Button.ADD).click(); - bot.shell(IDELabel.Shell.NEW_SERVER_RUNTIME_ENVIRONMENT).activate(); - bot.tree().expandNode(runtimeGroup).select(runtimeType); - bot.button("Next >").click(); - bot.textWithLabel(IDELabel.JBossServerRuntimeDialog.NAME).setText(runtimeName); - bot.textWithLabel(IDELabel.JBossServerRuntimeDialog.HOME_DIRECTORY).setText(runtimeHomeDir); - bot.button(IDELabel.Button.FINISH).click(); - } - bot.button(IDELabel.Button.OK).click(); + + /** + * Define new Server Runtime only if it's not specified yet + * + * @param runtimeName + * @param runtimeGroup + * @param runtimeType + * @param runtimeHomeDir + */ + public void addServerRuntime(String runtimeName, String runtimeGroup, + String runtimeType, String runtimeHomeDir) { + + bot.menu(IDELabel.Menu.WINDOW).menu(IDELabel.Menu.PREFERENCES).click(); + bot.shell(IDELabel.Shell.PREFERENCES).activate(); + bot.tree().expandNode(IDELabel.PreferencesDialog.SERVER_GROUP).select( + PreferencesDialog.RUNTIME_ENVIRONMENTS); + SWTBotTable tbRuntimeEnvironments = bot.table(); + boolean createRuntime = true; + // first check if Environment doesn't exist + int numRows = tbRuntimeEnvironments.rowCount(); + if (numRows > 0) { + int currentRow = 0; + while (createRuntime && currentRow < numRows) { + if (tbRuntimeEnvironments.cell(currentRow, 0).equalsIgnoreCase( + runtimeName)) { + createRuntime = false; + } else { + currentRow++; + } + } + } + // create Server Runtime + if (createRuntime) { + bot.button(IDELabel.Button.ADD).click(); + bot.shell(IDELabel.Shell.NEW_SERVER_RUNTIME_ENVIRONMENT).activate(); + bot.tree().expandNode(runtimeGroup).select(runtimeType); + bot.button("Next >").click(); + bot.textWithLabel(IDELabel.JBossServerRuntimeDialog.NAME).setText( + runtimeName); + bot.textWithLabel(IDELabel.JBossServerRuntimeDialog.HOME_DIRECTORY) + .setText(runtimeHomeDir); + bot.button(IDELabel.Button.FINISH).click(); + } + bot.button(IDELabel.Button.OK).click(); } + /** * Test if tree contains item with itemLabel + * * @param tree * @param itemLabel * @return */ - public static boolean treeContainsItemWithLabel(SWTBotTree tree, String itemLabel){ - boolean containsItem = false; - try { - tree.getTreeItem(itemLabel); - containsItem = true; - } catch (WidgetNotFoundException e) { - } - return containsItem; + public static boolean treeContainsItemWithLabel(SWTBotTree tree, + String itemLabel) { + boolean containsItem = false; + try { + tree.getTreeItem(itemLabel); + containsItem = true; + } catch (WidgetNotFoundException e) { + } + return containsItem; } + /** - * if Open Associated Perspective Shell is opened close it - * and depend on switchPerspective parameter change current perspective + * if Open Associated Perspective Shell is opened close it and depend on + * switchPerspective parameter change current perspective + * * @param switchPerspective */ - public void closeOpenAssociatedPerspectiveShellIfOpened(boolean switchPerspective){ - try{ - bot.shell(IDELabel.Shell.OPEN_ASSOCIATED_PERSPECTIVE).activate(); - bot.button(switchPerspective ? IDELabel.Button.YES : IDELabel.Button.NO).click(); - } catch (WidgetNotFoundException wnfe){ - // do nothing - } + public void closeOpenAssociatedPerspectiveShellIfOpened( + boolean switchPerspective) { + try { + bot.shell(IDELabel.Shell.OPEN_ASSOCIATED_PERSPECTIVE).activate(); + bot.button( + switchPerspective ? IDELabel.Button.YES + : IDELabel.Button.NO).click(); + } catch (WidgetNotFoundException wnfe) { + // do nothing + } } + /** - * Close Warning Window if is opened. - * Press Continue or Cancel button dependent on pressContinueButton + * Close Warning Window if is opened. Press Continue or Cancel button + * dependent on pressContinueButton + * * @param pressContinueButton */ - public void closeWarningWindowIfOpened(boolean pressContinueButton){ - try{ - bot.shell(IDELabel.Shell.WARNING).activate(); - bot.button(pressContinueButton ? IDELabel.Button.CONTINUE : IDELabel.Button.CANCEL).click(); - } catch (WidgetNotFoundException wnfe){ - // do nothing - } - } - public static void closeWarningWindowIfOpened(SWTWorkbenchBot bot, boolean pressContinueButton){ - closeWarningWindowIfOpened(bot, pressContinueButton); + public void closeWarningWindowIfOpened(boolean pressContinueButton) { + try { + bot.shell(IDELabel.Shell.WARNING).activate(); + bot.button( + pressContinueButton ? IDELabel.Button.CONTINUE + : IDELabel.Button.CANCEL).click(); + } catch (WidgetNotFoundException wnfe) { + // do nothing + } } - + + public static void closeWarningWindowIfOpened(SWTWorkbenchBot bot, + boolean pressContinueButton) { + closeWarningWindowIfOpened(bot, pressContinueButton); + } + } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-01-26 15:31:05 UTC (rev 19932) @@ -33,7 +33,7 @@ */ public class SWTJBTExt { - SWTWorkbenchBot bot; + SWTWorkbenchBot bot; Logger log = Logger.getLogger(SWTJBTExt.class); public SWTJBTExt(SWTWorkbenchBot bot) { @@ -128,7 +128,7 @@ * @param timeOut */ public static void chooseServerPopupMenu(SWTWorkbenchBot bot , int index, String menuLabel, long timeOut){ - SWTEclipseExt swtEclipseExt = new SWTEclipseExt(bot); + SWTEclipseExt swtEclipseExt = new SWTEclipseExt(); SWTBot servers = swtEclipseExt.showView(ViewType.SERVERS); SWTBotTree serverTree = servers.tree(); @@ -136,8 +136,7 @@ new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, menuLabel, false)).click(); - swtEclipseExt.getSwtUtilExt().waitForAll(timeOut); - + SWTTestExt.util.waitForAll(timeOut); } /** * Deletes Application Server in Server View on position specified by index Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java 2010-01-26 14:47:50 UTC (rev 19931) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java 2010-01-26 15:31:05 UTC (rev 19932) @@ -24,8 +24,9 @@ public static final Logger log = Logger.getLogger(SWTTestExt.class); public static final SWTBotExt bot = new SWTBotExt(); + public static final SWTEclipseExt eclipse = new SWTEclipseExt(bot); public static final SWTUtilExt util = new SWTUtilExt(bot); - public static final SWTEclipseExt eclipse = new SWTEclipseExt(bot); + // Views public static final PackageExplorer packageExplorer = new PackageExplorer();

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19931 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-01-26 09:47:50 -0500 (Tue, 26 Jan 2010) New Revision: 19931 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java Log: https://jira.jboss.org/jira/browse/JBIDE-5591 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2010-01-26 14:39:30 UTC (rev 19930) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2010-01-26 14:47:50 UTC (rev 19931) @@ -181,64 +181,6 @@ if(wizard.getContainer() != null) { wizard.performFinish(); } -// try { -// IType type = EclipseJavaUtil.findType(javaAdapter.getJavaProject(), newValue); -// String name = type.getElementName(); -// String sc = type.getSuperclassTypeSignature(); -// if(sc != null) { -// sc = EclipseJavaUtil.resolveTypeAsString(type, sc); -// } -// //TODO use interface and register for specific cases. This is new ESB action case. -// 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(); -// -// 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 -// + 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(); -// } } dialog.close(); } else {

14 years, 3 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 January 2010