September 2009 - jbosstools-commits

JBoss Tools SVN: r17816 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2009-09-30 08:49:41 -0400 (Wed, 30 Sep 2009) New Revision: 17816 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java Log: https://jira.jboss.org/jira/browse/JBIDE-4771 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-09-30 12:46:07 UTC (rev 17815) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-09-30 12:49:41 UTC (rev 17816) @@ -279,19 +279,40 @@ for(ELInvocationExpression ie : instance.getExpression().getInvocations()){ ELInvocationExpression expression = findComponentReference(ie); if(expression != null){ - if(expression instanceof ELPropertyInvocation){ - ELPropertyInvocation pi = (ELPropertyInvocation)expression; - checkMatch(file, pi, offset+pi.getName().getStart(), pi.getName().getLength()); - }else if(expression instanceof ELMethodInvocation){ - ELMethodInvocation mi = (ELMethodInvocation)expression; - checkMatch(file, mi, offset+mi.getName().getStart(), mi.getName().getLength()); - } + ELInvocationExpression left = expression.getLeft(); + checkMatch(file, expression, offset+getOffset(left), offset+getOffset(expression), getLength(expression)); } } } } } + private int getOffset(ELInvocationExpression expression){ + if(expression instanceof ELPropertyInvocation){ + ELPropertyInvocation pi = (ELPropertyInvocation)expression; + + return pi.getName().getStart(); + }else if(expression instanceof ELMethodInvocation){ + ELMethodInvocation mi = (ELMethodInvocation)expression; + + return mi.getName().getStart(); + } + return 0; + } + + private int getLength(ELInvocationExpression expression){ + if(expression instanceof ELPropertyInvocation){ + ELPropertyInvocation pi = (ELPropertyInvocation)expression; + + return pi.getName().getLength(); + }else if(expression instanceof ELMethodInvocation){ + ELMethodInvocation mi = (ELMethodInvocation)expression; + + return mi.getName().getLength(); + } + return 0; + } + private void scanProperties(IFile file, String content){ scanString(file, content, 0); @@ -352,9 +373,9 @@ protected abstract void match(IFile file, int offset, int length); - private void checkMatch(IFile file, ELExpression operand, int offset, int length){ + private void checkMatch(IFile file, ELExpression operand, int leftOffset, int offset, int length){ if(javaElement != null && operand != null) - resolve(file, operand, offset, length); + resolve(file, operand, leftOffset, offset, length); else match(file, offset, length); } @@ -388,7 +409,8 @@ return false; } - private void resolve(IFile file, ELExpression operand, int offset, int length){ + private void resolve(IFile file, ELExpression operand, int leftOffset, int offset, int length){ + //System.out.println("resolve file - "+file.getFullPath()+" leftOffset - "+leftOffset+" offset - "+offset); ELResolver[] resolvers = ELResolverFactoryManager.getInstance().getResolvers(file); for(ELResolver resolver : resolvers){ @@ -400,13 +422,13 @@ context.setResource(file); context.setElResolvers(resolvers); - List<Var> vars = ElVarSearcher.findAllVars(context, offset, resolver); + List<Var> vars = ElVarSearcher.findAllVars(context, leftOffset, resolver); context.setVars(vars); ELResolution resolution = resolver.resolve(context, operand); - ELSegment segment = resolution.findSegmentByOffset(offset); + ELSegment segment = resolution.findSegmentByOffset(leftOffset); if(segment != null && segment instanceof JavaMemberELSegment && segment.isResolved()) { JavaMemberELSegment javaSegment = (JavaMemberELSegment)segment;

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r17815 - in trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld: model and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-09-30 08:46:07 -0400 (Wed, 30 Sep 2009) New Revision: 17815 Removed: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TLDUtil.java Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/helpers/TLDToPaletteHelper.java Log: https://jira.jboss.org/jira/browse/JBIDE-4934 Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TLDUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TLDUtil.java 2009-09-30 12:36:20 UTC (rev 17814) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TLDUtil.java 2009-09-30 12:46:07 UTC (rev 17815) @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.web.tld; - -import org.jboss.tools.common.model.*; - -public class TLDUtil { - static String FILE_ENTITIES = ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.FileTLD_2_1."; //$NON-NLS-1$ - static String TAG_ENTITIES = ".TLDTag.TLDTag12.TLDTag21."; //$NON-NLS-1$ - static String ATTR_ENTITIES = ".TLDAttribute.TLDAttribute12."; //$NON-NLS-1$ - - public static boolean isTaglib(XModelObject o) { - return isOfEntity(o, FILE_ENTITIES); - } - - public static boolean isTag(XModelObject o) { - return isOfEntity(o, TAG_ENTITIES); - } - - public static boolean isAttribute(XModelObject o) { - return isOfEntity(o, ATTR_ENTITIES); - } - - private static boolean isOfEntity(XModelObject o, String entities) { - return entities.indexOf("." + o.getModelEntity().getName() + ".") >= 0; //$NON-NLS-1$//$NON-NLS-2$ - } - - public static String getTagDescription(XModelObject o) { - String attr = (o.getModelEntity().getAttribute("info") != null) ? "info" : "description"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - String s = o.getAttributeValue(attr); - s = (s == null) ? "" : s.trim(); //$NON-NLS-1$ - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < s.length(); i++) { - char c = s.charAt(i); - if(c == '<') sb.append("<"); //$NON-NLS-1$ - else if(c == '>') sb.append(">"); //$NON-NLS-1$ - else sb.append(c); - } - return sb.toString(); - } - -} - Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java 2009-09-30 12:36:20 UTC (rev 17814) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java 2009-09-30 12:46:07 UTC (rev 17815) @@ -15,8 +15,11 @@ public class TLDUtil { static String FILE_ENTITIES = ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.FileTLD_2_1."; //$NON-NLS-1$ static String TAG_ENTITIES = ".TLDTag.TLDTag12.TLDTag20.TLDTag21."; //$NON-NLS-1$ - static String ATTR_ENTITIES = ".TLDAttribute.TLDAttribute12."; //$NON-NLS-1$ + static String ATTR_ENTITIES = ".TLDAttribute.TLDAttribute12.TLDAttribute20.TLDAttribute2F."; //$NON-NLS-1$ + static String FACELET_TAGLIB_ENTITIES = ".FileFaceletTaglib."; //$NON-NLS-1$ + static String FACELET_TAG_ENTITIES = ".FaceletTaglibTag."; //$NON-NLS-1$ + public static boolean isTaglib(XModelObject o) { return isOfEntity(o, FILE_ENTITIES); } @@ -46,6 +49,13 @@ } return sb.toString(); } - + + public static boolean isFaceletTaglib(XModelObject o) { + return isOfEntity(o, FACELET_TAGLIB_ENTITIES); + } + public static boolean isFaceletTag(XModelObject o) { + return isOfEntity(o, FACELET_TAG_ENTITIES); + } + } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java 2009-09-30 12:36:20 UTC (rev 17814) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java 2009-09-30 12:46:07 UTC (rev 17815) @@ -30,6 +30,7 @@ import org.jboss.tools.jst.web.messages.xpl.WebUIMessages; import org.jboss.tools.jst.web.model.tree.AllTldsTree; import org.jboss.tools.jst.web.tld.URIConstants; +import org.jboss.tools.jst.web.tld.model.TLDUtil; import org.jboss.tools.jst.web.tld.model.helpers.TLDToPaletteHelper; public class ImportTLDToPaletteSupport extends SpecialWizardSupport { @@ -133,7 +134,9 @@ String name = selectedFile.getAttributeValue("display-name"); //$NON-NLS-1$ if(name == null || name.length() == 0) name = selectedFile.getAttributeValue("shortname"); //$NON-NLS-1$ setAttributeValue(0, NAME, name); - String pref = TLDToPaletteHelper.getTldName(selectedFile); + String pref = TLDUtil.isTaglib(selectedFile) ? TLDToPaletteHelper.getTldName(selectedFile) + : TLDUtil.isFaceletTaglib(selectedFile) ? TLDToPaletteHelper.getFaceletTldName(selectedFile) + : ""; //$NON-NLS-1$ setAttributeValue(0, URIConstants.DEFAULT_PREFIX, pref); String uri = selectedFile.getAttributeValue("uri"); //$NON-NLS-1$ setAttributeValue(0, URIConstants.LIBRARY_URI, uri); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java 2009-09-30 12:36:20 UTC (rev 17814) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java 2009-09-30 12:46:07 UTC (rev 17815) @@ -26,33 +26,43 @@ public PaletteAdopt() {} public boolean isAdoptable(XModelObject target, XModelObject object) { - return isAdoptableTag(target, object) || isAdoptableTaglib(target, object); + return isAdoptableTag(target, object) + || isAdoptableTaglib(target, object) + || isAdoptableFaceletTaglib(target, object); } public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { if(isAdoptableTag(target, object)) adoptTag(target, object); else if(isAdoptableTaglib(target, object)) adoptTaglib(target, object); + else if(isAdoptableFaceletTaglib(target, object)) adoptFaceletTaglib(target, object); } protected boolean isAdoptableTag(XModelObject target, XModelObject object) { if(!TLDUtil.isTag(object)) return false; - String te = target.getModelEntity().getName(); - if(!te.startsWith("SharablePageTab") && //$NON-NLS-1$ - !te.startsWith("SharableGroup") && //$NON-NLS-1$ - !te.startsWith("SharableMacro")) return false; //$NON-NLS-1$ + if(!isPaletteObject(target, true)) return false; return true; } + private boolean isPaletteObject(XModelObject target, boolean excludeRoot) { + String te = target.getModelEntity().getName(); + if(te.startsWith("SharablePageTab")) return true; //$NON-NLS-1$ + if(te.startsWith("SharableGroup")) return true; //$NON-NLS-1$ + if(te.startsWith("SharableMacro")) return true; //$NON-NLS-1$ + if(!excludeRoot && te.startsWith("SharablePalette")) return true; //$NON-NLS-1$ + return false; + } protected boolean isAdoptableTaglib(XModelObject target, XModelObject object) { if(!TLDUtil.isTaglib(object)) return false; - String te = target.getModelEntity().getName(); - if(!te.startsWith("SharablePageTab") && //$NON-NLS-1$ - !te.startsWith("SharableGroup") && //$NON-NLS-1$ - !te.equals("SharablePalette") && //$NON-NLS-1$ - !te.startsWith("SharableMacro")) return false; //$NON-NLS-1$ + if(!isPaletteObject(target, false)) return false; return true; } - + + protected boolean isAdoptableFaceletTaglib(XModelObject target, XModelObject object) { + if(!TLDUtil.isFaceletTaglib(object)) return false; + if(!isPaletteObject(target, false)) return false; + return true; + } + public void adoptTag(XModelObject target, XModelObject object) throws XModelException { if(target.getModelEntity().getName().startsWith("SharableMacro")) target = target.getParent(); //$NON-NLS-1$ add(target, object, helper.createMacroByTag(object, target.getModel())); @@ -83,6 +93,10 @@ XActionInvoker.invoke("ImportTLDToPaletteWizard", "CreateActions.ImportTLD", paletteRoot, p); //$NON-NLS-1$ //$NON-NLS-2$ } + public void adoptFaceletTaglib(XModelObject target, XModelObject object) { + adoptTaglib(target, object); + } + static void add(XModelObject target, XModelObject object, XModelObject created) throws XModelException { if(created == null) return; XModelObject old = target.getChildByPath(created.getPathPart()); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/helpers/TLDToPaletteHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/helpers/TLDToPaletteHelper.java 2009-09-30 12:36:20 UTC (rev 17814) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/helpers/TLDToPaletteHelper.java 2009-09-30 12:46:07 UTC (rev 17815) @@ -105,6 +105,43 @@ return sb.toString(); } + public XModelObject createMacroByFaceletTag(XModelObject tag, XModel model) { + Properties p = new Properties(); + String parentname = getFaceletTldName(tag.getParent()); + String prefix = (parentname.length() == 0) ? "" : parentname + ":"; //$NON-NLS-1$ //$NON-NLS-2$ + String shortname = tag.getAttributeValue("tag-name"); //$NON-NLS-1$ + String name = prefix + shortname; + String tagname = shortname; ///name; + p.setProperty("name", shortname); //$NON-NLS-1$ + boolean empty = false; //we know nothing + if(!empty) p.setProperty(END_TEXT, "</" + tagname + ">"); //$NON-NLS-1$ //$NON-NLS-2$ + p.setProperty(START_TEXT, getStartText(tag, empty, tagname)); + p.setProperty(DESCRIPTION, getTagDescription(tag, empty, name)); + if(!empty) p.setProperty(REFORMAT, "yes"); //$NON-NLS-1$ + return model.createModelObject("SharableMacroHTML", p); //$NON-NLS-1$ + } + + public static String getFaceletTldName(XModelObject tld) { + if(tld == null) return ""; //$NON-NLS-1$ + String n = tld.getAttributeValue(XModelObjectConstants.ATTR_NAME); + String suff = ".taglib"; //$NON-NLS-1$ + if(n.endsWith(suff)) { + String p = n.substring(0, n.length() - suff.length()).toLowerCase(); + if(!"jsp".equals(p)) { //$NON-NLS-1$ + return p; + } + } + String u = tld.getAttributeValue("uri"); //$NON-NLS-1$ + if(u != null) { + int q = u.lastIndexOf('/'); + if(q >= 0) u = u.substring(q + 1); + n = u; + } + int s = n.lastIndexOf(' '); + if(s >= 0) n = n.substring(s + 1); + return n.toLowerCase(); + } + private boolean isRequired(XModelObject attr) { String required = attr.getAttributeValue("required"); //$NON-NLS-1$ return (XModelObjectConstants.TRUE.equals(required) || XModelObjectConstants.TRUE.equals(required)); @@ -126,12 +163,13 @@ p.setProperty(URIConstants.LIBRARY_URI, "" + tld.getAttributeValue("uri")); //$NON-NLS-1$ //$NON-NLS-2$ XModelObject tab = model.createModelObject(entity, p); XModelObject[] tags = tld.getChildren(); - for (int i = 0; i < tags.length; i++) - if(TLDUtil.isTag(tags[i])) tab.addChild(createMacroByTag(tags[i], model)); + for (int i = 0; i < tags.length; i++) { + if(TLDUtil.isTag(tags[i])) tab.addChild(createMacroByTag(tags[i], model)); + if(TLDUtil.isFaceletTag(tags[i])) tab.addChild(createMacroByFaceletTag(tags[i], model)); + } return tab; } - private String capitalize(String s) { return (s.length() == 0) ? s : Character.toUpperCase(s.charAt(0)) + s.substring(1); }

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r17814 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-09-30 08:36:20 -0400 (Wed, 30 Sep 2009) New Revision: 17814 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: https://jira.jboss.org/jira/browse/JBIDE-4934 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-09-30 11:41:36 UTC (rev 17813) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-09-30 12:36:20 UTC (rev 17814) @@ -93,8 +93,8 @@ import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPTagProposalFactory; import org.jboss.tools.jst.jsp.preferences.VpePreference; -import org.jboss.tools.jst.web.tld.TLDUtil; import org.jboss.tools.jst.web.tld.URIConstants; +import org.jboss.tools.jst.web.tld.model.TLDUtil; import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.dnd.DndUtil;

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r17813 - in trunk: vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-09-30 07:41:36 -0400 (Wed, 30 Sep 2009) New Revision: 17813 Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-hide.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-show.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-hide.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-show.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-hide.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-show.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-hide.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-show.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_left.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_top.gif Removed: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_bottom.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_right.gif Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_left.gif trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_top.gif trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-4914, VPE toolbar icons were created instead of drop down menu. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2009-09-30 11:41:36 UTC (rev 17813) @@ -15,6 +15,7 @@ static final String SHOW_BORDER_FOR_UNKNOWN_TAGS = "Show Border for Unknown Tags"; //$NON-NLS-1$ static final String SHOW_NON_VISUAL_TAGS = "Show non-visual tags"; //$NON-NLS-1$ static final String SHOW_SELECTION_TAG_BAR = "Show Selection Tag Bar"; //$NON-NLS-1$ + static final String SHOW_TEXT_FORMATTING = "Show Text Formatting bar"; //$NON-NLS-1$ static final String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL = "Show Resource Bundles Usage as EL Expressions"; //$NON-NLS-1$ static final String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT = "Ask for tag attributes during tag insert"; //$NON-NLS-1$ static final String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR = "Ask for confirmation when closing Selection Bar"; //$NON-NLS-1$ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2009-09-30 11:41:36 UTC (rev 17813) @@ -24,7 +24,8 @@ defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS, false); defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS, false); - defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, false); + defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, true); + defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING, true); defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, false); defaultPreferences.putBoolean(IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, true); defaultPreferences.putBoolean(IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, true); Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-hide.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-hide.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-show.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-show.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-hide.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-hide.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-show.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-show.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-hide.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-hide.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-show.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-show.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_bottom.gif =================================================================== (Binary files differ) Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_left.gif =================================================================== (Binary files differ) Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_right.gif =================================================================== (Binary files differ) Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_top.gif =================================================================== (Binary files differ) Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-hide.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-hide.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-show.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-show.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_left.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_left.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_top.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_top.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-09-30 11:41:36 UTC (rev 17813) @@ -898,7 +898,6 @@ VpeEditorPart.this)); selectionBar.setVpeController(visualEditor.getController()); visualEditor.getController().setSelectionBarController(selectionBar); - createShowSelectionBarMenuItem(); visualEditor.getController().init(sourceEditor, visualEditor); } }); @@ -907,36 +906,6 @@ visualEditor.createPartControl(visualContent); } - /** - * Creates new MenuItem in VPE drop-down menu. This menu item provides - * option to show/hide selection bar. - */ - private void createShowSelectionBarMenuItem() { - final MenuItem selectionBarVisibilityMenuItem = - new MenuItem(visualEditor.getDropDownMenu().getDropDownMenu(), SWT.PUSH); - - selectionBarVisibilityMenuItem.setText(selectionBar.isVisible() - ? VpeUIMessages.HIDE_SELECTION_BAR - : VpeUIMessages.SHOW_SELECTION_BAR); - - // add menu item listener - selectionBarVisibilityMenuItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - boolean selectionBarVisible = !selectionBar.isVisible(); - selectionBar.setAlwaysVisibleOption(selectionBarVisible); - selectionBar.setVisible(selectionBarVisible); - } - }); - // add selection bar listener - selectionBar.addVisibilityListener(new VisibilityListener() { - public void visibilityChanged(VisibilityEvent event) { - selectionBarVisibilityMenuItem.setText(event.getSource().isVisible() - ? VpeUIMessages.HIDE_SELECTION_BAR - : VpeUIMessages.SHOW_SELECTION_BAR); - } - }); - } - public void createPreviewBrowser() { previewWebBrowser = new MozillaPreview(this, sourceEditor); try { @@ -1190,6 +1159,10 @@ * has been pressed. */ public void updatePartAccordingToPreferences() { + /* + * Update MozillaEditor's toolbar items + */ + visualEditor.setDefaultToolBarItems(); /* * When switching from Source view to Visual/Source * controller could be null. @@ -1204,4 +1177,13 @@ } } + public void updateSelectionBar(boolean isSelectionBarVisible) { + if (selectionBar != null) { + selectionBar.setAlwaysVisibleOption(isSelectionBarVisible); + selectionBar.setVisible(isSelectionBarVisible); + } else { + VpePlugin.getDefault().logError("VPE Selection Bar is not initialized."); + } + } + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2009-09-30 11:41:36 UTC (rev 17813) @@ -358,7 +358,9 @@ } public String getBundleValue(String name){ - if(isShowBundleUsageAsEL) return name; + if(isShowBundleUsageAsEL) { + return name; + } List<ELInstance> is = parseJSFExpression(name); if(is == null) return null; StringBuffer sb = new StringBuffer(); @@ -463,14 +465,16 @@ } } - public void updateShowBundleUsageAsEL() { - boolean b = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( - IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); - if(isShowBundleUsageAsEL != b) { - isShowBundleUsageAsEL = b; + public void updateShowBundleUsageAsEL(boolean showBundlesAsEL) { + if(isShowBundleUsageAsEL != showBundlesAsEL) { + isShowBundleUsageAsEL = showBundlesAsEL; refresh(); } } + public void updateShowBundleUsageAsEL() { + updateShowBundleUsageAsEL(JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL)); + } static class Expression { public String prefix; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-09-30 11:41:36 UTC (rev 17813) @@ -32,16 +32,11 @@ import org.eclipse.swt.browser.ProgressEvent; import org.eclipse.swt.browser.ProgressListener; import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.custom.ScrolledComposite; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -50,8 +45,6 @@ import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.MenuItem; -import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; import org.eclipse.ui.IEditorInput; @@ -74,12 +67,10 @@ import org.jboss.tools.vpe.editor.toolbar.VpeToolBarManager; import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager; import org.jboss.tools.vpe.editor.toolbar.format.TextFormattingToolBar; -import org.jboss.tools.vpe.editor.util.Constants; import org.jboss.tools.vpe.editor.util.DocTypeUtil; import org.jboss.tools.vpe.editor.util.FileUtil; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.messages.VpeUIMessages; -import org.jboss.tools.vpe.resref.core.ReferenceWizard; import org.jboss.tools.vpe.resref.core.VpeResourcesDialog; import org.jboss.tools.vpe.xulrunner.XPCOM; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; @@ -111,9 +102,17 @@ public static final String ICON_PAGE_DESIGN_OPTIONS_DISABLED = "icons/point_to_css_disabled.gif"; //$NON-NLS-1$ public static final String ICON_ORIENTATION_SOURCE_LEFT = "icons/source_left.gif"; //$NON-NLS-1$ public static final String ICON_ORIENTATION_SOURCE_TOP = "icons/source_top.gif"; //$NON-NLS-1$ - public static final String ICON_ORIENTATION_SOURCE_RIGHT = "icons/source_right.gif"; //$NON-NLS-1$ - public static final String ICON_ORIENTATION_SOURCE_BOTTOM = "icons/source_bottom.gif"; //$NON-NLS-1$ + public static final String ICON_ORIENTATION_VISUAL_LEFT = "icons/visual_left.gif"; //$NON-NLS-1$ + public static final String ICON_ORIENTATION_VISUAI_TOP = "icons/visual_top.gif"; //$NON-NLS-1$ public static final String ICON_ORIENTATION_SOURCE_LEFT_DISABLED = "icons/source_left_disabled.gif"; //$NON-NLS-1$ + public static final String ICON_NON_VISUAL_TAGS_SHOW = "icons/non-visusal-tags-show.gif"; //$NON-NLS-1$ + public static final String ICON_NON_VISUAL_TAGS_HIDE = "icons/non-visusal-tags-hide.gif"; //$NON-NLS-1$ + public static final String ICON_SELECTION_BAR_SHOW = "icons/selbar-show.gif"; //$NON-NLS-1$ + public static final String ICON_SELECTION_BAR_HIDE = "icons/selbar-hide.gif"; //$NON-NLS-1$ + public static final String ICON_TEXT_FORMATTING_SHOW = "icons/text-formatting-show.gif"; //$NON-NLS-1$ + public static final String ICON_TEXT_FORMATTING_HIDE = "icons/text-formatting-hide.gif"; //$NON-NLS-1$ + public static final String ICON_BUNDLE_AS_EL_SHOW = "icons/bundle-as-el-show.gif"; //$NON-NLS-1$ + public static final String ICON_BUNDLE_AS_EL_HIDE = "icons/bundle-as-el-hide.gif"; //$NON-NLS-1$ static String SELECT_BAR = "SELECT_LBAR"; //$NON-NLS-1$ private XulRunnerEditor xulRunnerEditor; @@ -135,12 +134,27 @@ private static Map<String, String> layoutNames; private static List<String> layoutValues; private int currentOrientationIndex = 1; + private ToolItem rotateEditorsItem; + private ToolItem showNonVisualTagsItem; + private ToolItem showSelectionBarItem; + private ToolItem showBundlesAsELItem; + private ToolItem showTextFormattingItem; + private boolean showNonVisualTags = false; + private boolean showSelectionBar = true; + private boolean showTextFormatting = true; + private boolean showBundlesAsEL = false; + static { + /* + * Values from <code>layoutValues</code> should correspond to the order + * when increasing the index of the array will cause + * the source editor rotation + */ layoutIcons = new HashMap<String, String>(); layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE, ICON_ORIENTATION_SOURCE_LEFT); layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE, ICON_ORIENTATION_SOURCE_TOP); - layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE, ICON_ORIENTATION_SOURCE_RIGHT); - layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE, ICON_ORIENTATION_SOURCE_BOTTOM); + layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE, ICON_ORIENTATION_VISUAL_LEFT); + layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE, ICON_ORIENTATION_VISUAI_TOP); layoutNames = new HashMap<String, String>(); layoutNames.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE, VpeUIMessages.SPLITTING_HORIZ_LEFT_SOURCE); @@ -263,46 +277,25 @@ }); /* - * https://jira.jboss.org/jira/browse/JBIDE-4152 - * Compute initial icon state and add it to the tool bar. + * Create ROTATE EDITORS tool bar icon */ - currentOrientationIndex = layoutValues.indexOf(JspEditorPlugin - .getDefault().getPreferenceStore().getString( - IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); - int newIndx = currentOrientationIndex+1; - if (newIndx == layoutValues.size()) { - newIndx = newIndx % layoutValues.size(); - } - String newOrientation = layoutValues.get(newIndx); - - final ToolItem rotateEditorsItem = createToolItem(verBar, SWT.BUTTON1, - layoutIcons.get(newOrientation), - ICON_ORIENTATION_SOURCE_LEFT_DISABLED, - layoutNames.get(newOrientation), true); + createRotateEditorsItem(verBar); - rotateEditorsItem.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - /* - * Rotate editors orientation clockwise. Store this new - * orientation to the preferences. - */ - currentOrientationIndex++; - if (currentOrientationIndex == layoutValues.size()) { - currentOrientationIndex = currentOrientationIndex % layoutValues.size(); - } - String newOrientation = layoutValues.get(currentOrientationIndex); - rotateEditorsItem.setImage(ImageDescriptor.createFromFile( - MozillaEditor.class, layoutIcons.get(newOrientation)) - .createImage()); - rotateEditorsItem.setToolTipText(layoutNames.get(newOrientation)); - /* - * Call <code>filContainer()</code> from VpeEditorPart - * to redraw CustomSashForm with new layout. - */ - getController().getPageContext().getEditPart().fillContainer(true, newOrientation); - } - }); + /* + * Create SHOW INVISIBLE TAGS tool bar icon + */ + createShowNonVisualTagsItem(verBar); + /* + * Create SHOW SELECTION BAR tool bar icon + */ + createShowSelectionBarItem(verBar); + + /* + * Create SHOW BUNDLE'S MESSAGES AS EL tool bar icon + */ + createShowBundlesAsELItem(verBar); + verBar.pack(); return verBar; } @@ -352,53 +345,19 @@ * and only after that MozillaEditor should be created itself. */ if (null != verBar) { - dropDownMenu = new VpeDropDownMenu(verBar, VpeUIMessages.MENU); - // add Invisible tags support to menu - // create menu item - MenuItem menuItem = new MenuItem(dropDownMenu.getDropDownMenu(), SWT.PUSH); - // get default value of flag - boolean showInvisibleTags = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( - IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); - - // set text - menuItem.setText(showInvisibleTags ? VpeUIMessages.HIDE_NON_VISUAL_TAGS - : VpeUIMessages.SHOW_NON_VISUAL_TAGS); - - // add listener - menuItem.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - MenuItem selectedItem = (MenuItem) e.widget; - - // get current value of flag - boolean showInvisibleTags = !controller.getVisualBuilder() - .isShowInvisibleTags(); - - // change text - selectedItem - .setText((showInvisibleTags ? VpeUIMessages.HIDE - : VpeUIMessages.SHOW) - + Constants.WHITE_SPACE - + VpeUIMessages.NON_VISUAL_TAGS); - - // change flag - controller.getVisualBuilder().setShowInvisibleTags( - showInvisibleTags); - // update vpe - controller.visualRefresh(); - } - }); // Use vpeToolBarManager to create a horizontal toolbar. - vpeToolBarManager = new VpeToolBarManager(dropDownMenu - .getDropDownMenu()); + vpeToolBarManager = new VpeToolBarManager(); if (vpeToolBarManager != null) { vpeToolBarManager.createToolBarComposite(cmpEdTl); vpeToolBarManager.addToolBar(new TextFormattingToolBar(formatControllerManager)); + + /* + * Create SHOW TEXT FORMATTING tool bar icon + */ + createShowTextFormattingItem(verBar); } } - - //Create a composite to the Editor Composite cmpEd = new Composite (cmpEdTl, SWT.NATIVE); GridLayout layoutEd = new GridLayout(1, false); @@ -987,4 +946,228 @@ public VpeDropDownMenu getDropDownMenu() { return dropDownMenu; } + + private void createShowNonVisualTagsItem(ToolBar parent) { + showNonVisualTags = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); + showNonVisualTagsItem = createToolItem(parent, SWT.BUTTON1, + showNonVisualTags ? ICON_NON_VISUAL_TAGS_SHOW + : ICON_NON_VISUAL_TAGS_HIDE, "", //$NON-NLS-1$ + showNonVisualTags ? VpeUIMessages.SHOW_NON_VISUAL_TAGS + : VpeUIMessages.HIDE_NON_VISUAL_TAGS, true); + showNonVisualTagsItem.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event event) { + /* + * Switch the value + */ + showNonVisualTags = !showNonVisualTags; + + /* + * Update icon and tooltip + */ + updateShowNonVisualTagsItem(showNonVisualTags); + /* + * Change flag + */ + controller.getVisualBuilder().setShowInvisibleTags( + showNonVisualTags); + /* + * Update VPE + */ + controller.visualRefresh(); + } + }); + } + + private void updateShowNonVisualTagsItem(boolean showInvisibleTags) { + showNonVisualTagsItem.setImage(ImageDescriptor.createFromFile( + MozillaEditor.class, + showInvisibleTags ? ICON_NON_VISUAL_TAGS_SHOW + : ICON_NON_VISUAL_TAGS_HIDE).createImage()); + showNonVisualTagsItem.setToolTipText(showInvisibleTags ? VpeUIMessages.SHOW_NON_VISUAL_TAGS + : VpeUIMessages.HIDE_NON_VISUAL_TAGS); + } + + private void createShowSelectionBarItem(ToolBar parent) { + showSelectionBar = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_SELECTION_TAG_BAR); + showSelectionBarItem = createToolItem(parent, SWT.BUTTON1, + showSelectionBar ? ICON_SELECTION_BAR_SHOW + : ICON_SELECTION_BAR_HIDE, "", //$NON-NLS-1$ + showSelectionBar ? VpeUIMessages.SHOW_SELECTION_BAR + : VpeUIMessages.HIDE_SELECTION_BAR, true); + showSelectionBarItem.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event event) { + /* + * Switch the value + */ + showSelectionBar = !showSelectionBar; + /* + * Update icon and tooltip + */ + updateShowSelectionBarItem(showSelectionBar); + + /* + * Update Selection Bar + */ + controller.getPageContext().getEditPart().updateSelectionBar(showSelectionBar); + } + }); + } + + private void updateShowSelectionBarItem(boolean showSelectionBar) { + showSelectionBarItem.setImage(ImageDescriptor.createFromFile( + MozillaEditor.class, + showSelectionBar ? ICON_SELECTION_BAR_SHOW + : ICON_SELECTION_BAR_HIDE).createImage()); + showSelectionBarItem + .setToolTipText(showSelectionBar ? VpeUIMessages.SHOW_SELECTION_BAR + : VpeUIMessages.HIDE_SELECTION_BAR); + } + + private void createShowBundlesAsELItem(ToolBar parent) { + showBundlesAsEL = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); + showBundlesAsELItem = createToolItem(parent, SWT.BUTTON1, + showBundlesAsEL ? ICON_BUNDLE_AS_EL_SHOW + : ICON_BUNDLE_AS_EL_HIDE, "", //$NON-NLS-1$ + showBundlesAsEL ? VpeUIMessages.SHOW_BUNDLES_AS_EL + : VpeUIMessages.SHOW_BUNDLES_AS_MESSAGES, true); + showBundlesAsELItem.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event event) { + /* + * Switch the value + */ + showBundlesAsEL = !showBundlesAsEL; + /* + * Update icon and tooltip + */ + updateShowBundlesAsELItem(showBundlesAsEL); + + /* + * Update bundle messages. + */ + controller.getPageContext().getBundle().updateShowBundleUsageAsEL(showBundlesAsEL); + controller.visualRefresh(); + } + }); + } + + private void updateShowBundlesAsELItem(boolean showBundlesAsEL) { + showBundlesAsELItem.setImage(ImageDescriptor.createFromFile( + MozillaEditor.class, + showBundlesAsEL ? ICON_BUNDLE_AS_EL_SHOW + : ICON_BUNDLE_AS_EL_HIDE).createImage()); + showBundlesAsELItem + .setToolTipText(showBundlesAsEL ? VpeUIMessages.SHOW_BUNDLES_AS_EL + : VpeUIMessages.SHOW_BUNDLES_AS_MESSAGES); + } + + private void createShowTextFormattingItem(ToolBar parent) { + showTextFormatting = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_TEXT_FORMATTING); + showTextFormattingItem = createToolItem(parent, + SWT.BUTTON1, + showTextFormatting ? ICON_TEXT_FORMATTING_SHOW + : ICON_TEXT_FORMATTING_HIDE, "", //$NON-NLS-1$ + showTextFormatting ? VpeUIMessages.SHOW_TEXT_FORMATTING + : VpeUIMessages.HIDE_TEXT_FORMATTING, true); + showTextFormattingItem.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event event) { + /* + * Switch the value + */ + showTextFormatting = !showTextFormatting; + + /* + * Update icon and tooltip + */ + updateShowTextFormattingItem(showTextFormatting); + + /* + * Update Text Formatting Bar + */ + vpeToolBarManager.setToolbarVisibility(showTextFormatting); + } + }); + } + + private void updateShowTextFormattingItem(boolean showTextFormatting) { + showTextFormattingItem.setImage(ImageDescriptor.createFromFile( + MozillaEditor.class, + showTextFormatting ? ICON_TEXT_FORMATTING_SHOW + : ICON_TEXT_FORMATTING_HIDE).createImage()); + showTextFormattingItem + .setToolTipText(showTextFormatting ? VpeUIMessages.SHOW_TEXT_FORMATTING + : VpeUIMessages.HIDE_TEXT_FORMATTING); + } + + private void createRotateEditorsItem(ToolBar parent) { + /* + * https://jira.jboss.org/jira/browse/JBIDE-4152 + * Compute initial icon state and add it to the tool bar. + */ + String newOrientation = JspEditorPlugin + .getDefault().getPreferenceStore().getString( + IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); + currentOrientationIndex = layoutValues.indexOf(newOrientation); + rotateEditorsItem = createToolItem(parent, SWT.BUTTON1, + layoutIcons.get(newOrientation), + ICON_ORIENTATION_SOURCE_LEFT_DISABLED, + layoutNames.get(newOrientation), true); + + rotateEditorsItem.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event event) { + /* + * Rotate editors orientation clockwise. + */ + currentOrientationIndex++; + if (currentOrientationIndex >= layoutValues.size()) { + currentOrientationIndex = currentOrientationIndex % layoutValues.size(); + } + String newOrientation = layoutValues.get(currentOrientationIndex); + /* + * Update icon and tooltip + */ + updateRotateEditorsItem(newOrientation); + /* + * Call <code>filContainer()</code> from VpeEditorPart + * to redraw CustomSashForm with new layout. + */ + getController().getPageContext().getEditPart().fillContainer(true, newOrientation); + } + }); + } + + private void updateRotateEditorsItem(String newOrientation) { + rotateEditorsItem.setImage(ImageDescriptor.createFromFile( + MozillaEditor.class, layoutIcons.get(newOrientation)) + .createImage()); + rotateEditorsItem.setToolTipText(layoutNames.get(newOrientation)); + } + + public void setDefaultToolBarItems() { + String newOrientation = JspEditorPlugin + .getDefault().getPreferenceStore().getString( + IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); + currentOrientationIndex = layoutValues.indexOf(newOrientation); + updateRotateEditorsItem(newOrientation); + + showNonVisualTags = JspEditorPlugin.getDefault().getPreferenceStore() + .getBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); + updateShowNonVisualTagsItem(showNonVisualTags); + + showSelectionBar = JspEditorPlugin.getDefault().getPreferenceStore() + .getBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR); + updateShowSelectionBarItem(showSelectionBar); + + showBundlesAsEL = JspEditorPlugin.getDefault().getPreferenceStore() + .getBoolean( + IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); + updateShowBundlesAsELItem(showBundlesAsEL); + + showTextFormatting = JspEditorPlugin.getDefault().getPreferenceStore() + .getBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING); + updateShowTextFormattingItem(showTextFormatting); + } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2009-09-30 11:41:36 UTC (rev 17813) @@ -136,6 +136,8 @@ VpeUIMessages.SHOW_NON_VISUAL_TAGS, visualAppearanceGroup)); addField(new BooleanFieldEditor(SHOW_SELECTION_TAG_BAR, VpeUIMessages.SHOW_SELECTION_TAG_BAR, visualAppearanceGroup)); + addField(new BooleanFieldEditor(SHOW_TEXT_FORMATTING, + VpeUIMessages.SHOW_TEXT_FORMATTING, visualAppearanceGroup)); addField(new BooleanFieldEditor(SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, VpeUIMessages.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, visualAppearanceGroup)); addField(new BooleanFieldEditor(ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java 2009-09-30 11:41:36 UTC (rev 17813) @@ -35,5 +35,10 @@ */ public void addToolBar(IVpeToolBar bar); + /* + * Sets the toolbar visibility + */ + void setToolbarVisibility(boolean isVisible); + public void dispose(); } \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java 2009-09-30 11:41:36 UTC (rev 17813) @@ -10,12 +10,9 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.toolbar; -import java.text.MessageFormat; import org.eclipse.compare.Splitter; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; @@ -23,11 +20,9 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.MenuItem; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.vpe.VpePlugin; -import org.jboss.tools.vpe.messages.VpeUIMessages; /** * @author Erick Created on 14.07.2005 @@ -36,17 +31,10 @@ public class VpeToolBarManager implements IVpeToolBarManager { private Splitter splitter; + private Composite cmpToolBar; - private Menu dropDownMenu; + public VpeToolBarManager() { } - public static final String SHOW = "show"; //$NON-NLS-1$ - public static final String HIDE = "hide"; //$NON-NLS-1$ - - public VpeToolBarManager(Menu dropDownMenu) { - - this.dropDownMenu = dropDownMenu; - } - public Composite createToolBarComposite(Composite parent) { splitter = new Splitter(parent, SWT.NONE) { @@ -71,7 +59,7 @@ public void addToolBar(IVpeToolBar bar) { - Composite cmpToolBar = new Composite(splitter, SWT.NONE); + cmpToolBar = new Composite(splitter, SWT.NONE); FormData data = new FormData(); data.left = new FormAttachment(0); data.right = new FormAttachment(100); @@ -93,43 +81,20 @@ ToolbarContainer toolbarContainer = new ToolbarContainer(cmpToolBar, bar); // show or hide toolbar - setStateToolbar(cmpToolBar, isShowedToolbar(bar)); + setStateToolbar(cmpToolBar, JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_TEXT_FORMATTING)); - // create item to manage show/hide toolbar - attachToMenu(dropDownMenu, toolbarContainer); } - /** - * create item to manage show/hide toolbar - * - * @param menu - * @param toolbarContainer - */ - public void attachToMenu(Menu menu, ToolbarContainer toolbarContainer) { - MenuItem menuItem = new MenuItem(dropDownMenu, SWT.PUSH); - - boolean showToolbar = isShowedToolbar(toolbarContainer.getToolbar()); - - // set text to menu item - menuItem.setText( - MessageFormat.format((showToolbar ? VpeUIMessages.HIDE_TOOLBAR : VpeUIMessages.SHOW_TOOLBAR), - toolbarContainer.getToolbar().getName())); - - // add listener - menuItem.addSelectionListener( - new ToolbarManagerSelectionListener(toolbarContainer, showToolbar)); + public void setToolbarVisibility(boolean isVisible) { + if (cmpToolBar != null) { + setStateToolbar(cmpToolBar, isVisible); + } else { + VpePlugin.getDefault().logError("Toolbar control is not initialized."); + } } /** - * - * @param bar - * @return - */ - protected boolean isShowedToolbar(IVpeToolBar bar) { - return !HIDE.equalsIgnoreCase(getPreference(bar.getId())); - } - - /** * show/hide toolbar * * @param toolBar @@ -145,73 +110,8 @@ splitter.dispose(); splitter = null; } - - for (MenuItem menuItem : dropDownMenu.getItems()) { - menuItem.dispose(); - } - } - /** - * get preference by key - * - * @param key - * @return - */ - private String getPreference(String key) { - - return VpePlugin.getDefault().getPreferenceStore().getString(key); - } - - /** - * set preference - * - * @param key - * @param value - */ - private void setPreference(String key, String value) { - - VpePlugin.getDefault().getPreferenceStore().setValue(key, value); - } - - /** - * selection listener to manage toolbars - * - * @author Sergey Dzmitrovich - * - */ - private class ToolbarManagerSelectionListener extends SelectionAdapter { - - private ToolbarContainer toolbarContainer; - private boolean showBar; - - public ToolbarManagerSelectionListener( - ToolbarContainer toolbarContainer, boolean showBar) { - this.toolbarContainer = toolbarContainer; - this.showBar = showBar; - } - - @Override - public void widgetSelected(SelectionEvent e) { - MenuItem selectedItem = (MenuItem) e.widget; - - // change flag - showBar = !showBar; - - // set new value of preference - setPreference(toolbarContainer.getToolbar().getId(), - showBar ? SHOW : HIDE); - // change text - selectedItem.setText( - MessageFormat.format(showBar ? VpeUIMessages.HIDE_TOOLBAR - : VpeUIMessages.SHOW_TOOLBAR, - toolbarContainer.getToolbar().getName()) - ); - // show or hide toolbar - setStateToolbar(toolbarContainer.getParent(), showBar); - } - } - /* * This class describe the container for toolbars */ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-09-30 11:41:36 UTC (rev 17813) @@ -118,7 +118,11 @@ public static String VPE_PREFERENCES_PAGE_DESCRIPTION; public static String SHOW_BORDER_FOR_UNKNOWN_TAGS; public static String SHOW_SELECTION_TAG_BAR; + public static String SHOW_TEXT_FORMATTING; + public static String HIDE_TEXT_FORMATTING; public static String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL; + public static String SHOW_BUNDLES_AS_EL; + public static String SHOW_BUNDLES_AS_MESSAGES; public static String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT; public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR; public static String DEFAULT_VPE_TAB; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-09-30 10:09:05 UTC (rev 17812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-09-30 11:41:36 UTC (rev 17813) @@ -98,7 +98,11 @@ VPE_PREFERENCES_PAGE_DESCRIPTION=Visual Page Editor settings SHOW_BORDER_FOR_UNKNOWN_TAGS=Show border for unknown tags SHOW_SELECTION_TAG_BAR=Show selection tag bar +SHOW_TEXT_FORMATTING = Show Text Formatting bar +HIDE_TEXT_FORMATTING = Hide Text Formatting bar SHOW_RESOURCE_BUNDLES_USAGE_AS_EL=Show resource bundles usage as EL expressions +SHOW_BUNDLES_AS_EL=Show bundle's messages as EL +SHOW_BUNDLES_AS_MESSAGES=Show bundle's messages explicitly ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=Ask for tag attributes during tag insert ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR=Ask for confirmation when closing Selection Bar DEFAULT_VPE_TAB=Select the default active editor's tab for files that haven't been previously opened in the VPE

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r17812 - in trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css: properties and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2009-09-30 06:09:05 -0400 (Wed, 30 Sep 2009) New Revision: 17812 Added: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleElementRuleContainer.java Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java Log: https://jira.jboss.org/jira/browse/JBIDE-4951 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java 2009-09-30 07:46:46 UTC (rev 17811) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java 2009-09-30 10:09:05 UTC (rev 17812) @@ -99,7 +99,7 @@ CSSStyleRule styleRule = getStyleRule(node); if (styleRule != null) { - container = new CSSStyleRuleContainer(styleRule); + container = new StyleElementRuleContainer(styleText, styleRule); } } } Added: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleElementRuleContainer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleElementRuleContainer.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleElementRuleContainer.java 2009-09-30 10:09:05 UTC (rev 17812) @@ -0,0 +1,33 @@ +/******************************************************************************* + * 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.jst.css.common; + +import org.w3c.dom.Node; +import org.w3c.dom.css.CSSStyleRule; + +/** + * @author Sergey Dzmitrovich + * + */ +public class StyleElementRuleContainer extends CSSStyleRuleContainer { + + private Node styleNode; + + public StyleElementRuleContainer(Node styleNode, CSSStyleRule styleRule) { + super(styleRule); + this.styleNode = styleNode; + } + + public Object getStyleObject() { + return styleNode; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleElementRuleContainer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2009-09-30 07:46:46 UTC (rev 17811) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2009-09-30 10:09:05 UTC (rev 17812) @@ -124,14 +124,8 @@ .getStyleProperties()); } - notifySelectionChanged(getCurrentSelection()); - } - protected void notifySelectionChanged(ISelection selection) { - part.postSelectionChanged(new SelectionChangedEvent(part - .getSelectionProvider(), selection)); - } /** * Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2009-09-30 07:46:46 UTC (rev 17811) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2009-09-30 10:09:05 UTC (rev 17812) @@ -93,10 +93,6 @@ return super.getSelectionProvider(); } - public void postSelectionChanged(SelectionChangedEvent event) { - getSelectionProvider().postSelectionChanged(event); - } - @Override public Object getAdapter(Class key) { if (key == IContributedContentsView.class) {

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r17811 - in trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink: xpl and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2009-09-30 03:46:46 -0400 (Wed, 30 Sep 2009) New Revision: 17811 Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkDetector.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/BaseHyperlinkDetector.java Log: code cleanup Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkDetector.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkDetector.java 2009-09-29 20:19:58 UTC (rev 17810) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkDetector.java 2009-09-30 07:46:46 UTC (rev 17811) @@ -20,8 +20,18 @@ import org.jboss.tools.common.text.ext.util.AxisUtil; public class HyperlinkDetector extends BaseHyperlinkDetector { + + private static HyperlinkDetector fInstance; - + /** + * returns singleton instance of HyperlinkDetector + * + * @return HyperlinkDetector + */ + public static HyperlinkDetector getInstance() { + return HyperlinkDetectorHolder.INSTANCE; + } + /** * Returns the partition types located at offset in the document * @@ -73,4 +83,7 @@ return types.toArray(new String[types.size()]); } + static class HyperlinkDetectorHolder { + static HyperlinkDetector INSTANCE = new HyperlinkDetector(); + } } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/BaseHyperlinkDetector.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/BaseHyperlinkDetector.java 2009-09-29 20:19:58 UTC (rev 17810) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/BaseHyperlinkDetector.java 2009-09-30 07:46:46 UTC (rev 17811) @@ -23,26 +23,12 @@ import org.eclipse.wst.sse.core.internal.provisional.IModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager; -import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.hyperlink.HyperlinkBuilder; import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; public class BaseHyperlinkDetector implements IHyperlinkDetector{ - private static HyperlinkDetector fInstance; - /** - * returns singleton instance of HyperlinkDetector - * - * @return HyperlinkDetector - */ - public synchronized static HyperlinkDetector getInstance() { - if (fInstance == null) { - fInstance = new HyperlinkDetector(); - } - return fInstance; - } - public IHyperlink[] getHyperlinks(ITextViewer textViewer, IRegion region) { IHyperlink[] hyperlinks = null;

14 years, 7 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2009-09-29 16:19:58 -0400 (Tue, 29 Sep 2009) New Revision: 17810 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ITextViewerConfiguration.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/TextViewerConfigurationDelegate.java Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java Log: duplicated code was removed from JSP editor Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2009-09-29 19:32:45 UTC (rev 17809) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2009-09-29 20:19:58 UTC (rev 17810) @@ -31,97 +31,29 @@ import org.jboss.tools.jst.jsp.format.HTMLFormatProcessor; import org.osgi.framework.Bundle; -public class HTMLTextViewerConfiguration extends StructuredTextViewerConfigurationHTML { +public class HTMLTextViewerConfiguration extends StructuredTextViewerConfigurationHTML implements ITextViewerConfiguration{ + TextViewerConfigurationDelegate configurationDelegate; public HTMLTextViewerConfiguration() { super(); + configurationDelegate = new TextViewerConfigurationDelegate(this); } @SuppressWarnings("restriction") protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) { - SortingCompoundContentAssistProcessor sortingCompoundProcessor = new SortingCompoundContentAssistProcessor(sourceViewer, partitionType); - - if (sortingCompoundProcessor.supportsPartitionType(partitionType)) { - // Add the default WTP CA processors to our SortingCompoundContentAssistProcessor - IContentAssistProcessor[] superProcessors = super.getContentAssistProcessors(sourceViewer, partitionType); - - if (superProcessors != null && superProcessors.length > 0) { - for (int i = 0; i < superProcessors.length; i++) - sortingCompoundProcessor.addContentAssistProcessor(partitionType, superProcessors[i]); - } - - return new IContentAssistProcessor[] {sortingCompoundProcessor}; - } - - - return new IContentAssistProcessor[0]; + return configurationDelegate.getContentAssistProcessors(sourceViewer, partitionType); } - /* * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkDetectors(org.eclipse.jface.text.source.ISourceViewer) * @since 3.1 */ public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) { - if (fPreferenceStore == null) - return null; - if (sourceViewer == null || !fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED)) - return null; - - List allDetectors = new ArrayList(0); - - IHyperlinkDetector extHyperlinkDetector = getTextEditorsExtensionsHyperlinkDetector(); - - if (extHyperlinkDetector != null) allDetectors.add(extHyperlinkDetector); - -/* - IHyperlinkDetector[] superDetectors = super.getHyperlinkDetectors(sourceViewer); - for (int m = 0; m < superDetectors.length; m++) { - IHyperlinkDetector detector = superDetectors[m]; - if (!allDetectors.contains(detector)) { - allDetectors.add(detector); - } - } -*/ - return (IHyperlinkDetector[]) allDetectors.toArray(new IHyperlinkDetector[0]); + return configurationDelegate.getHyperlinkDetectors( + sourceViewer, + fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED)); } - private IHyperlinkDetector getTextEditorsExtensionsHyperlinkDetector() { - Plugin plugin = Platform.getPlugin("org.jboss.tools.common.text.ext"); //$NON-NLS-1$ - return (plugin != null && plugin instanceof IAdaptable ? (IHyperlinkDetector)((IAdaptable)plugin).getAdapter(IHyperlinkDetector.class):null); - } - - private IHyperlinkDetector getTextEditorsExtensionsHyperlinkDetector1() { - IHyperlinkDetector result = null; - final Object[] bundleActivationResult = new Object[] { Boolean.FALSE }; - final Bundle bundle = Platform.getBundle("org.jboss.tools.common.text.ext"); //$NON-NLS-1$ - if (bundle != null && bundle.getState() == org.osgi.framework.Bundle.ACTIVE) { - bundleActivationResult[0] = Boolean.TRUE; - } else { - BusyIndicator.showWhile(null, new Runnable() { - public void run() { - bundleActivationResult[0] = Boolean.TRUE; - } - }); - } - - if (Boolean.TRUE.equals(bundleActivationResult[0])) { - try { - Dictionary headers = bundle.getHeaders(); - String pluginClass = (String)headers.get("Plugin-Class"); //$NON-NLS-1$ - Class plugin = bundle.loadClass(pluginClass); - - Object obj = plugin.newInstance(); - if (obj instanceof IAdaptable) { - result = (IHyperlinkDetector)((IAdaptable)obj).getAdapter(IHyperlinkDetector.class); - } - } catch (Exception x) { - JspEditorPlugin.getPluginLog().logError("Error in loading hyperlink detector", x); //$NON-NLS-1$ - } - } - return result; - } - /* * (non-Javadoc) * @see org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML#getContentFormatter(org.eclipse.jface.text.source.ISourceViewer) @@ -131,4 +63,9 @@ formatter.setMasterStrategy(new StructuredFormattingStrategy(new HTMLFormatProcessor())); return formatter; } + + public IContentAssistProcessor[] getContentAssistProcessorsForPartitionType( + ISourceViewer sourceViewer, String partitionType) { + return super.getContentAssistProcessors(sourceViewer, partitionType); + } } \ No newline at end of file Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ITextViewerConfiguration.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ITextViewerConfiguration.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ITextViewerConfiguration.java 2009-09-29 20:19:58 UTC (rev 17810) @@ -0,0 +1,11 @@ +package org.jboss.tools.jst.jsp; + +import org.eclipse.jface.text.contentassist.IContentAssistProcessor; +import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; +import org.eclipse.jface.text.source.ISourceViewer; + +public interface ITextViewerConfiguration { + static final IHyperlinkDetector[] NO_CA_DETECTORS = new IHyperlinkDetector[0]; + IContentAssistProcessor[] getContentAssistProcessorsForPartitionType(ISourceViewer sourceViewer, String partitionType); + IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer); +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ITextViewerConfiguration.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2009-09-29 19:32:45 UTC (rev 17809) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2009-09-29 20:19:58 UTC (rev 17810) @@ -10,54 +10,28 @@ ******************************************************************************/ package org.jboss.tools.jst.jsp; -import java.util.ArrayList; -import java.util.Dictionary; -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jst.jsp.core.text.IJSPPartitions; import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP; import org.eclipse.jst.jsp.ui.internal.style.jspel.LineStyleProviderForJSPEL; -import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider; -import org.jboss.tools.common.text.xml.contentassist.SortingCompoundContentAssistProcessor; -import org.osgi.framework.Bundle; /** * @author Igels */ -public class JSPTextViewerConfiguration extends StructuredTextViewerConfigurationJSP { +public class JSPTextViewerConfiguration extends StructuredTextViewerConfigurationJSP implements ITextViewerConfiguration { + + private TextViewerConfigurationDelegate configurationDelegate; public JSPTextViewerConfiguration() { super(); + configurationDelegate = new TextViewerConfigurationDelegate(this); } - protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) { - SortingCompoundContentAssistProcessor sortingCompoundProcessor = new SortingCompoundContentAssistProcessor(sourceViewer, partitionType); - - if (sortingCompoundProcessor.supportsPartitionType(partitionType)) { - // Add the default WTP CA processors to our SortingCompoundContentAssistProcessor - IContentAssistProcessor[] superProcessors = super.getContentAssistProcessors(sourceViewer, partitionType); - if (superProcessors != null && superProcessors.length > 0) { - for (int i = 0; i < superProcessors.length; i++) - sortingCompoundProcessor.addContentAssistProcessor(partitionType, superProcessors[i]); - } - - return new IContentAssistProcessor[] {sortingCompoundProcessor}; - } - - - return new IContentAssistProcessor[0]; - } - - /* * JBIDE-4390: * The line style provider for partition type == "org.eclipse.jst.jsp.SCRIPT.JSP_EL2", @@ -99,67 +73,23 @@ return providers; } + protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) { + return configurationDelegate.getContentAssistProcessors(sourceViewer, partitionType); + } /* * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkDetectors(org.eclipse.jface.text.source.ISourceViewer) * @since 3.1 */ public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) { - if (fPreferenceStore == null) - return null; - if (sourceViewer == null || !fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED)) - return null; - - List allDetectors = new ArrayList(0); - - IHyperlinkDetector extHyperlinkDetector = getTextEditorsExtensionsHyperlinkDetector(); - - if (extHyperlinkDetector != null) allDetectors.add(extHyperlinkDetector); - -/* IHyperlinkDetector[] superDetectors = super.getHyperlinkDetectors(sourceViewer); - for (int m = 0; m < superDetectors.length; m++) { - IHyperlinkDetector detector = superDetectors[m]; - if (!allDetectors.contains(detector)) { - allDetectors.add(detector); - } - } -*/ - return (IHyperlinkDetector[]) allDetectors.toArray(new IHyperlinkDetector[0]); + return configurationDelegate.getHyperlinkDetectors( + sourceViewer, + fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED)); } - private IHyperlinkDetector getTextEditorsExtensionsHyperlinkDetector() { - Plugin plugin = Platform.getPlugin("org.jboss.tools.common.text.ext"); //$NON-NLS-1$ - return (plugin != null && plugin instanceof IAdaptable ? (IHyperlinkDetector)((IAdaptable)plugin).getAdapter(IHyperlinkDetector.class):null); + public IContentAssistProcessor[] getContentAssistProcessorsForPartitionType( + ISourceViewer sourceViewer, String partitionType) { + // TODO Auto-generated method stub + return super.getContentAssistProcessors(sourceViewer, partitionType); } - - private IHyperlinkDetector getTextEditorsExtensionsHyperlinkDetector1() { - IHyperlinkDetector result = null; - final Object[] bundleActivationResult = new Object[] { Boolean.FALSE }; - final Bundle bundle = Platform.getBundle("org.jboss.tools.common.text.ext"); //$NON-NLS-1$ - if (bundle != null && bundle.getState() == org.osgi.framework.Bundle.ACTIVE) { - bundleActivationResult[0] = Boolean.TRUE; - } else { - BusyIndicator.showWhile(null, new Runnable() { - public void run() { - bundleActivationResult[0] = Boolean.TRUE; - } - }); - } - - if (Boolean.TRUE.equals(bundleActivationResult[0])) { - try { - Dictionary headers = bundle.getHeaders(); - String pluginClass = (String)headers.get("Plugin-Class"); //$NON-NLS-1$ - Class plugin = bundle.loadClass(pluginClass); - - Object obj = plugin.newInstance(); - if (obj instanceof IAdaptable) { - result = (IHyperlinkDetector)((IAdaptable)obj).getAdapter(IHyperlinkDetector.class); - } - } catch (Exception x) { - JspEditorPlugin.getPluginLog().logError("Error in loading hyperlink detector", x); //$NON-NLS-1$ - } - } - return result; - } } \ No newline at end of file Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/TextViewerConfigurationDelegate.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/TextViewerConfigurationDelegate.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/TextViewerConfigurationDelegate.java 2009-09-29 20:19:58 UTC (rev 17810) @@ -0,0 +1,68 @@ +package org.jboss.tools.jst.jsp; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.text.contentassist.IContentAssistProcessor; +import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; +import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML; +import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; +import org.jboss.tools.common.text.xml.contentassist.SortingCompoundContentAssistProcessor; + +public class TextViewerConfigurationDelegate { + + ITextViewerConfiguration target; + + public TextViewerConfigurationDelegate(ITextViewerConfiguration config) { + this.target = config; + } + + protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) { + SortingCompoundContentAssistProcessor sortingCompoundProcessor = new SortingCompoundContentAssistProcessor(sourceViewer, partitionType); + + if (sortingCompoundProcessor.supportsPartitionType(partitionType)) { + // Add the default WTP CA processors to our SortingCompoundContentAssistProcessor + IContentAssistProcessor[] superProcessors = target.getContentAssistProcessorsForPartitionType(sourceViewer, partitionType); + + if (superProcessors != null && superProcessors.length > 0) { + for (int i = 0; i < superProcessors.length; i++) + sortingCompoundProcessor.addContentAssistProcessor(partitionType, superProcessors[i]); + } + + return new IContentAssistProcessor[] {sortingCompoundProcessor}; + } + + + return new IContentAssistProcessor[0]; + } + + /* + * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkDetectors(org.eclipse.jface.text.source.ISourceViewer) + * @since 3.1 + */ + public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer, boolean enabled) { + IHyperlinkDetector[] result = ITextViewerConfiguration.NO_CA_DETECTORS; + if (enabled) { + List<IHyperlinkDetector> allDetectors = new ArrayList<IHyperlinkDetector>(0); + + IHyperlinkDetector extHyperlinkDetector = HyperlinkDetector.getInstance(); + + if (extHyperlinkDetector != null) allDetectors.add(extHyperlinkDetector); + + /* IHyperlinkDetector[] superDetectors = super.getHyperlinkDetectors(sourceViewer); + for (int m = 0; m < superDetectors.length; m++) { + IHyperlinkDetector detector = superDetectors[m]; + if (!allDetectors.contains(detector)) { + allDetectors.add(detector); + } + } + */ + result = allDetectors.toArray(new IHyperlinkDetector[0]); + } + return result; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/TextViewerConfigurationDelegate.java ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r17809 - in trunk/hibernatetools: features and 23 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2009-09-29 15:32:45 -0400 (Tue, 29 Sep 2009) New Revision: 17809 Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/build.properties trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/feature.properties trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/license.html trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.ini trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.mappings trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.properties trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/build.properties trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/plugin.properties trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.cvsignore trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.project trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/build.properties trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.properties trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml trunk/hibernatetools/releng/ trunk/hibernatetools/releng/build.properties trunk/hibernatetools/releng/build.properties.example.linux trunk/hibernatetools/releng/build.properties.example.windows trunk/hibernatetools/releng/build.xml trunk/hibernatetools/releng/jbosstools-trunk hibernatetools releng build.xml.launch trunk/hibernatetools/releng/maps/ trunk/hibernatetools/releng/maps/project.map trunk/hibernatetools/releng/psfs/ trunk/hibernatetools/releng/psfs/athena.psf trunk/hibernatetools/releng/testing.properties Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-4959 athen builder & sdk feature Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ <feature id="org.hibernate.eclipse.feature" label="%featureName" - version="3.2.0.beta7" + version="3.3.0.qualifier" provider-name="%providerName" plugin="org.hibernate.eclipse"> Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/build.properties =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/build.properties (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/build.properties 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,15 @@ +############################################################################### +# Copyright (c) 2009 Red Hat and others. +# All rights reserved. This program and the accompanying materials +# are 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 - initial API and implementation +############################################################################### + +bin.includes = feature.*,\ + license.html + + Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/feature.properties =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/feature.properties (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/feature.properties 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,28 @@ +featureName=Hibernate Tools Source +featureProvider=JBoss by Red Hat + +# "updateSiteName" property - label for the update site +updateSiteName=JBossTools Update Site + +# "description" property - description of the feature +description=Hibernate Tools Eclipse Plugin provides development wizards,\n\ +a query console and a mapping editor for Hibernate 3.\n\ +Also includes hibernate-tools.jar for use with standalone Ant tools. + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +# START NON-TRANSLATABLE +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +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. +# END NON-TRANSLATABLE +########### end of license property ########################################## + \ No newline at end of file Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/feature.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/license.html =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/license.html (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/license.html 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<html> + +<body> +<p>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. +</p> +</body> +</html> \ No newline at end of file Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplateFeature/license.html ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.ini =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.ini (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.ini 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,29 @@ +# about.ini +# contains information about a feature +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# "%key" are externalized strings defined in about.properties +# This file does not need to be translated. + +# Property "aboutText" contains blurb for "About" dialog (translated) +aboutText=%blurb + +# Property "windowImage" contains path to window icon (16x16) +# needed for primary features only + +# Property "featureImage" contains path to feature image (32x32) +#featureImage=eclipse32.png + +# Property "aboutImage" contains path to product image (500x330 or 115x164) +# needed for primary features only + +# Property "appName" contains name of the application (translated) +# needed for primary features only + +# Property "welcomePage" contains path to welcome page (special XML-based format) +# optional + +# Property "welcomePerspective" contains the id of the perspective in which the +# welcome page is to be opened. +# optional + + Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.ini ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.mappings =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.mappings (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.mappings 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,6 @@ +# about.mappings +# contains fill-ins for about.properties +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file does not need to be translated. + +0=@build@ \ No newline at end of file Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.properties =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.properties (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.properties 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,7 @@ +blurb=Hibernate Tools Source\n\ +\n\ +Version: {featureVersion}\n\ +Build id: {0}\n\ +\n\ +(c) Copyright Red Hat contributors and others, 2009. All rights reserved.\n\ +Visit http://www.jboss.org/tools Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/build.properties =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/build.properties (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/build.properties 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,5 @@ +bin.includes = plugin.*,\ + about.*,\ + src/,\ + META-INF/ +sourcePlugin = true Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/plugin.properties =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/plugin.properties (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/plugin.properties 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,3 @@ +pluginName = Hibernate Tools Source +providerName = JBoss by Red Hat + Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/plugin.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.cvsignore =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.cvsignore (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.cvsignore 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1 @@ +.settings Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.cvsignore ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.project =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.project (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.project 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.hibernate.eclipse.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.project ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/build.properties =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/build.properties (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/build.properties 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,3 @@ +bin.includes = feature.xml,\ + feature.properties +generate.feature(a)org.hibernate.eclipse.source.feature=org.hibernate.eclipse.feature Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/build.properties ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.properties =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.properties (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.properties 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,31 @@ +############################################################################### +# Copyright (c) 2009 JBoss by Red Hat and others. +# All rights reserved. This program and the accompanying materials +# are 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: +# JBoss by Red Hat - Initial implementation. +############################################################################## +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=Hibernate Tools SDK + +# "providerName" property - name of the company that provides the feature +providerName=JBoss by Red Hat + +# "updateSiteName" property - label for the update site +updateSiteName=JBossTools Update Site + +devUpdateSiteName=JBossTools Development Update Site + +# "description" property - description of the feature +description=Hibernate Tools Eclipse Plugin provides development wizards,\n\ +a query console and a mapping editor for Hibernate 3.\n\ +Also includes hibernate-tools.jar for use with standalone Ant tools. Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.hibernate.eclipse.sdk.feature" + label="%featureName" + version="3.3.0.qualifier" + provider-name="%providerName" + plugin="org.hibernate.eclipse"> + + <description url="http://tools.hibernate.org"> + %description + </description> + + <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. +</license> + + + <url> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + </url> + + + <includes + id="org.hibernate.eclipse.feature" + version="0.0.0"/> + + <includes + id="org.hibernate.eclipse.source.feature" + version="0.0.0"/> + +</feature> Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Modified: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ <feature id="org.hibernate.eclipse.test.feature" label="Hibernate Tests" - version="3.1.0.beta7" + version="3.3.0.qualifier" provider-name="JBoss by Red Hat"> <description url="http://www.example.com/description"> Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse -Bundle-Version: 3.2.0.beta10 +Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: org.hibernate.eclipse.jar, lib/hibernate/asm.jar, lib/hibernate/asm-attrs.jar, Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.console; singleton:=true -Bundle-Version: 3.2.0.beta9 +Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: org.hibernate.eclipse.console.jar Bundle-Activator: org.hibernate.eclipse.console.HibernateConsolePlugin Bundle-Vendor: %Bundle-Vendor.0 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.help; singleton:=true -Bundle-Version: 3.2.0.beta9 +Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: help.jar Bundle-Activator: org.hibernate.eclipse.help.HelpPlugin Bundle-Vendor: %Bundle-Vendor.0 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.jdt.apt.ui;singleton:=true -Bundle-Version: 3.2.0.beta8 +Bundle-Version: 3.3.0.qualifier Bundle-Activator: org.hibernate.eclipse.jdt.apt.ui.Activator Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.jdt.ui;singleton:=true -Bundle-Version: 3.2.0.beta9 +Bundle-Version: 3.3.0.qualifier Bundle-Activator: org.hibernate.eclipse.jdt.ui.Activator Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.mapper; singleton:=true -Bundle-Version: 3.2.0.beta9 +Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: org.hibernate.eclipse.mapper.jar Bundle-Activator: org.hibernate.eclipse.mapper.MapperPlugin Bundle-Vendor: %Bundle-Vendor.0 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.hibernate.jpt.core;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 3.3.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.validation, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Hibernate Jdt UI Bundle-SymbolicName: org.jboss.tools.hibernate.jpt.ui;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 3.3.0.qualifier Bundle-Activator: org.jboss.tools.hibernate.jpt.ui.HibernateJptUIPlugin Require-Bundle: org.hibernate.eclipse.console, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -18,7 +18,7 @@ org.eclipse.jdt.core, org.eclipse.jdt.ui, org.hibernate.eclipse.console -Bundle-Version: 2.0.0 +Bundle-Version: 3.3.0.qualifier Export-Package: org.jboss.tools.hibernate.ui.diagram, org.jboss.tools.hibernate.ui.diagram.editors, org.jboss.tools.hibernate.ui.diagram.editors.actions, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -24,5 +24,5 @@ org.eclipse.core.runtime, org.jboss.tools.common, org.jboss.tools.common.model -Bundle-Version: 2.0.0 +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -25,5 +25,5 @@ org.jboss.tools.common.model.ui, org.jboss.tools.hibernate.xml, org.eclipse.wst.xml.ui -Bundle-Version: 2.0.0 +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Added: trunk/hibernatetools/releng/build.properties =================================================================== --- trunk/hibernatetools/releng/build.properties (rev 0) +++ trunk/hibernatetools/releng/build.properties 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,47 @@ +## BEGIN PROJECT BUILD PROPERTIES ## + +# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you +thirdPartyDownloadLicenseAcceptance="I accept" + +projectid=jbosstools.hibernatetools +zipPrefix=HibernateTools +incubation= +buildType=N +version=3.3.0 + +mainFeatureToBuildID=org.hibernate.eclipse.sdk.feature +testFeatureToBuildID=org.hibernate.eclipse.test.feature + +build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup + +# Re-use local sources? +#localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/hibernatetools +relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/hibernatetools/releng +relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder +relengCommonBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.dash.common.releng + +JAVA_HOME=/usr/lib/jvm/java +JAVA50_HOME=/usr/lib/jvm/java + +dependencyURLs=\ +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz,\ +http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ +http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ +http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ +http://downloads.sourceforge.net/sourceforge/hibernate/hibernate-3.0.3.zip + +flattenDependencies=true +parallelCompilation=true +generateFeatureVersionSuffix=true +individualSourceBundles=true + +domainNamespace=* +projNamespace=org.hibernate.eclipse +projRelengName=org.hibernate.eclipse.releng + +# needed for Hudson, not for local? +#projRelengRoot=svn://svn.jboss.org/repos/jbosstools/trunk/jmx +#projRelengPath=releng +#basebuilderBranch=R35_M6 + +## END PROJECT BUILD PROPERTIES ## Property changes on: trunk/hibernatetools/releng/build.properties ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/hibernatetools/releng/build.properties.example.linux =================================================================== --- trunk/hibernatetools/releng/build.properties.example.linux (rev 0) +++ trunk/hibernatetools/releng/build.properties.example.linux 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,47 @@ +## BEGIN PROJECT BUILD PROPERTIES ## + +# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you +thirdPartyDownloadLicenseAcceptance="I accept" + +projectid=jbosstools.hibernatetools +zipPrefix=HibernateTools +incubation= +buildType=N +version=3.3.0 + +mainFeatureToBuildID=org.hibernate.eclipse.sdk.feature +testFeatureToBuildID=org.hibernate.eclipse.test.feature + +build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup + +# Re-use local sources? +#localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/hibernatetools +relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/hibernatetools/releng +relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder +relengCommonBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.dash.common.releng + +JAVA_HOME=/usr/lib/jvm/java +JAVA50_HOME=/usr/lib/jvm/java + +dependencyURLs=\ +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz,\ +http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ +http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ +http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ +http://downloads.sourceforge.net/sourceforge/hibernate/hibernate-3.0.3.zip + +flattenDependencies=true +parallelCompilation=true +generateFeatureVersionSuffix=true +individualSourceBundles=true + +domainNamespace=* +projNamespace=org.hibernate.eclipse +projRelengName=org.hibernate.eclipse.releng + +# needed for Hudson, not for local? +#projRelengRoot=svn://svn.jboss.org/repos/jbosstools/trunk/jmx +#projRelengPath=releng +#basebuilderBranch=R35_M6 + +## END PROJECT BUILD PROPERTIES ## Property changes on: trunk/hibernatetools/releng/build.properties.example.linux ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/hibernatetools/releng/build.properties.example.windows =================================================================== --- trunk/hibernatetools/releng/build.properties.example.windows (rev 0) +++ trunk/hibernatetools/releng/build.properties.example.windows 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,55 @@ +## BEGIN PROJECT BUILD PROPERTIES ## + +# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you +thirdPartyDownloadLicenseAcceptance="I accept" + +projectid=jbosstools.hibernatetools +zipPrefix=HibernateTools +incubation= +buildType=N +version=3.3.0 + +mainFeatureToBuildID=org.hibernate.eclipse.sdk.feature +testFeatureToBuildID=org.hibernate.eclipse.test.feature + +build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup + +# Re-use local sources? +localSourceCheckoutDir=C:/workspace2 + +# For windows, must be explicit about paths using correct slashes (/); dirs with spaces should be avoided +writableBuildRoot=C:/tmp/build + +#relengBuilderDir=C:/Users/max/workspace-hibernatetoolsbuild/org.hibernate.eclipse.releng +#relengBaseBuilderDir=C:/Users/max/workspace-hibernatetoolsbuild/org.eclipse.releng.basebuilder +#relengCommonBuilderDir=C:/Users/max/workspace-hibernatetoolsbuild/org.eclipse.dash.common.releng +relengBuilderDir=C:/workspace2/org.hibernate.eclipse.releng +relengBaseBuilderDir=C:/workspace2/org.eclipse.releng.basebuilder +relengCommonBuilderDir=C:/workspace2/org.eclipse.dash.common.releng + +JAVA_HOME=C:/Progra~1/Java/jdk1.6.0_11 +JAVA50_HOME=C:/Progra~1/Java/jdk1.6.0_11 +JAVA60_HOME=C:/Progra~1/Java/jdk1.6.0_11 + +dependencyURLs=\ +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-win32.zip,\ +http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ +http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ +http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ +http://downloads.sourceforge.net/sourceforge/hibernate/hibernate-3.0.3.zip + +flattenDependencies=true +parallelCompilation=true +generateFeatureVersionSuffix=true +individualSourceBundles=true + +domainNamespace=* +projNamespace=org.hibernate.eclipse +projRelengName=org.hibernate.eclipse.releng + +# needed for Hudson, not for local? +#projRelengRoot=svn://svn.jboss.org/repos/jbosstools/trunk/jmx +#projRelengPath=releng +#basebuilderBranch=R35_M6 + +## END PROJECT BUILD PROPERTIES ## Property changes on: trunk/hibernatetools/releng/build.properties.example.windows ___________________________________________________________________ Name: svn:executable + * Added: trunk/hibernatetools/releng/build.xml =================================================================== --- trunk/hibernatetools/releng/build.xml (rev 0) +++ trunk/hibernatetools/releng/build.xml 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,40 @@ +<project default="run" name="org.jboss.tools.*.releng/build.xml - Run a JBoss Tools component build using the Athena CBI"> + <target name="run"> +  + +  + <property file="build.properties" /> + <tstamp> + <format property="buildTimestamp" pattern="yyyyMMddHHmm" /> + </tstamp> + +  + <property name="relengBuilderDir" value="${basedir}" /> + <dirname file="${relengBuilderDir}" property="workspaceDir" /> + +  + <property name="writableBuildRoot" value="/tmp/build" /> + +  + <property name="buildDir" value="${writableBuildRoot}/${buildType}${buildTimestamp}-${zipPrefix}" /> + +  + <property name="relengCommonBuilderDir" value="${workspaceDir}/org.eclipse.dash.common.releng" /> + <ant antfile="${relengCommonBuilderDir}/buildAll.xml" target="runEclipse" dir="${relengCommonBuilderDir}" /> + + </target> +</project> Property changes on: trunk/hibernatetools/releng/build.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/hibernatetools/releng/jbosstools-trunk hibernatetools releng build.xml.launch =================================================================== --- trunk/hibernatetools/releng/jbosstools-trunk hibernatetools releng build.xml.launch (rev 0) +++ trunk/hibernatetools/releng/jbosstools-trunk hibernatetools releng build.xml.launch 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/> +<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${container}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/jbosstools-trunk/hibernatetools/releng/build.xml"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/jbosstools-trunk/hibernatetools/releng}/buildlog.latest.txt"/> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jbosstools-trunk"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="java-1.6.0-openjdk-1.6.0.0"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jbosstools-trunk/hibernatetools/releng/build.xml}"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> Property changes on: trunk/hibernatetools/releng/jbosstools-trunk hibernatetools releng build.xml.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/releng/maps/project.map =================================================================== --- trunk/hibernatetools/releng/maps/project.map (rev 0) +++ trunk/hibernatetools/releng/maps/project.map 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,13 @@ +feature@org.hibernate.eclipse.sdk.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature +feature@org.hibernate.eclipse.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/features/org.hibernate.eclipse.feature +feature@org.hibernate.eclipse.test.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/features/org.hibernate.eclipse.test.feature + +plugin@org.hibernate.eclipse=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/plugins/org.hibernate.eclipse +plugin@org.hibernate.eclipse.console=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/plugins/org.hibernate.eclipse.console +plugin@org.hibernate.eclipse.mapper=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper +plugin@org.hibernate.eclipse.help=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/plugins/org.hibernate.eclipse.help +plugin@org.hibernate.eclipse.jdt.ui=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui +plugin@org.hibernate.eclipse.jdt.apt.ui=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui +plugin@org.jboss.tools.hibernate.ui=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui +plugin@org.jboss.tools.hibernate.jpt.core=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core +plugin@org.jboss.tools.hibernate.jpt.ui=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui Property changes on: trunk/hibernatetools/releng/maps/project.map ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/releng/psfs/athena.psf =================================================================== --- trunk/hibernatetools/releng/psfs/athena.psf (rev 0) +++ trunk/hibernatetools/releng/psfs/athena.psf 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<psf version="2.0"> +<provider id="org.eclipse.team.cvs.core.cvsnature"> +<project reference="1.0,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.dash/athena/org.eclipse.dash.commonbuilder/org.eclipse.dash.commonbuilder.releng,org.eclipse.dash.common.releng"/> +<project reference="1.0,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,org.eclipse.releng.basebuilder,org.eclipse.releng.basebuilder,R35_M6"/> +</provider> +</psf> \ No newline at end of file Property changes on: trunk/hibernatetools/releng/psfs/athena.psf ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/releng/testing.properties =================================================================== --- trunk/hibernatetools/releng/testing.properties (rev 0) +++ trunk/hibernatetools/releng/testing.properties 2009-09-29 19:32:45 UTC (rev 17809) @@ -0,0 +1,10 @@ +#extraVMargs="-Dfoo=bar" + +#csv list of test plugins to run +testPluginsToRun=org.hibernate.eclipse.console.test,org.hibernate.eclipse.jdt.ui.test,org.jboss.tools.hibernate.ui.test + +# define which suite to run within each test plugin; or, include a test.xml script in +# the test plugin to deviate from default one-suite-per-plugin operation +org.hibernate.eclipse.console.test.suite=org.hibernate.eclipse.console.test.ConsolePluginAllTests +org.hibernate.eclipse.jdt.ui.test.suite=org.hibernate.eclipse.jdt.ui.test.JDTuiAllTests +org.jboss.tools.hibernate.ui.test.suite=org.jboss.tools.hibernate.ui.test.HibernateUiTestSuite Property changes on: trunk/hibernatetools/releng/testing.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.console.test -Bundle-Version: 3.1.0.beta5 +Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: org.hibernate.eclipse.console.test.test/, lib/hibernate-tools-tests.jar, lib/hsqldb.jar, Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.jdt.ui.test -Bundle-Version: 1.0.0 +Bundle-Version: 3.3.0.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.hibernate.eclipse.console.test, Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.hibernate.jpt.core.test -Bundle-Version: 1.0.0 +Bundle-Version: 3.3.0.qualifier Require-Bundle: org.junit;bundle-version="3.8.2", org.eclipse.wst.common.project.facet.ui;bundle-version="1.3.0", org.eclipse.jpt.core;bundle-version="2.0.0", Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF 2009-09-29 18:58:07 UTC (rev 17808) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF 2009-09-29 19:32:45 UTC (rev 17809) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.hibernate.ui.test -Bundle-Version: 1.0.0 +Bundle-Version: 3.3.0.qualifier Require-Bundle: org.junit;bundle-version="3.8.2", org.eclipse.wst.common.project.facet.ui;bundle-version="1.3.0", org.eclipse.jdt.core,

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r17808 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-09-29 14:58:07 -0400 (Tue, 29 Sep 2009) New Revision: 17808 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java Log: JBIDE-4957 - adding edit button to new reference wizard (changes to default enablement) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09-29 16:53:44 UTC (rev 17807) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09-29 18:58:07 UTC (rev 17808) @@ -79,6 +79,7 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; +import org.eclipse.wst.server.ui.wizard.WizardFragment; import org.jboss.ide.eclipse.as.wtp.ui.Messages; import org.jboss.ide.eclipse.as.wtp.ui.WTPOveridePlugin; @@ -304,7 +305,7 @@ } case SWT.MouseHover: { TableItem item = table.getItem(new Point(event.x, event.y)); - if (item != null && item.getData() != null && !canEdit(item.getData())) { + if (item != null && item.getData() != null && !canEditPath(item.getData())) { if (tip != null && !tip.isDisposed()) tip.dispose(); tip = new Shell(PlatformUI.getWorkbench() @@ -337,7 +338,7 @@ }; } - protected boolean canEdit(Object data) { + protected boolean canEditPath(Object data) { if( data == null ) return false; if( !(data instanceof VirtualArchiveComponent)) return true; @@ -370,9 +371,17 @@ } protected void viewerSelectionChanged() { - removeButton.setEnabled(getSelectedObject() != null && canEdit(getSelectedObject())); + editReferenceButton.setEnabled(hasEditWizardPage(getSelectedObject())); + removeButton.setEnabled(getSelectedObject() != null && canEditPath(getSelectedObject())); } + protected boolean hasEditWizardPage(Object o) { + if( o == null || !(o instanceof IVirtualComponent)) + return false; + WizardFragment wf = NewReferenceWizard.getFirstEditingFragment((IVirtualComponent)o); + return wf != null; + } + protected Object getSelectedObject() { IStructuredSelection sel = (IStructuredSelection)availableComponentsViewer.getSelection(); return sel.getFirstElement(); @@ -384,7 +393,7 @@ if( property.equals(DEPLOY_PATH_PROPERTY)) { if (element instanceof VirtualArchiveComponent) { try { - return canEdit(element); + return canEditPath(element); } catch (IllegalArgumentException iae) { } } @@ -588,6 +597,8 @@ allMappings[i].getSourcePath(), allMappings[i].getRuntimePath() )); } + removeButton.setEnabled(false); + editReferenceButton.setEnabled(false); hasInitialized = true; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java 2009-09-29 16:53:44 UTC (rev 17807) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java 2009-09-29 18:58:07 UTC (rev 17808) @@ -26,18 +26,24 @@ if( component == null ) list.add(new NewReferenceRootWizardFragment()); else { - WizardFragment[] frags = DependencyPageExtensionManager.getManager().loadAllReferenceWizardFragments(); - for( int i = 0; i < frags.length; i++ ) { - if( frags[i] instanceof IReferenceEditor ) { - if( ((IReferenceEditor)frags[i]).canEdit(component)) { - // accept first one - list.add(frags[i]); - return; - } - } + WizardFragment fragment = getFirstEditingFragment(component); + if( fragment != null ) + list.add(fragment); + } + } + } + + public static WizardFragment getFirstEditingFragment(IVirtualComponent component ) { + WizardFragment[] frags = DependencyPageExtensionManager.getManager().loadAllReferenceWizardFragments(); + for( int i = 0; i < frags.length; i++ ) { + if( frags[i] instanceof IReferenceEditor ) { + if( ((IReferenceEditor)frags[i]).canEdit(component)) { + // accept first one + return frags[i]; } } } + return null; } public void init(IWorkbench newWorkbench, IStructuredSelection newSelection) {

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r17807 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2009-09-29 12:53:44 -0400 (Tue, 29 Sep 2009) New Revision: 17807 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameSeamContextVariableProcessor.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java Log: PMD violations ReturnEmptyArrayRatherThanNull were fixed Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-09-29 16:53:34 UTC (rev 17806) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-09-29 16:53:44 UTC (rev 17807) @@ -27,8 +27,8 @@ */ public class RenameComponentProcessor extends SeamRenameProcessor { private ISeamComponent component; + - /** * @param component Renamed component */ @@ -137,6 +137,6 @@ @Override public RefactoringParticipant[] loadParticipants(RefactoringStatus status, SharableParticipants sharedParticipants) throws CoreException { - return null; + return EMPTY_REF_PARTICIPANT; } } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameSeamContextVariableProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameSeamContextVariableProcessor.java 2009-09-29 16:53:34 UTC (rev 17806) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameSeamContextVariableProcessor.java 2009-09-29 16:53:44 UTC (rev 17807) @@ -252,6 +252,6 @@ @Override public RefactoringParticipant[] loadParticipants(RefactoringStatus status, SharableParticipants sharedParticipants) throws CoreException { - return null; + return EMPTY_REF_PARTICIPANT; } } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-09-29 16:53:34 UTC (rev 17806) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-09-29 16:53:44 UTC (rev 17807) @@ -22,6 +22,7 @@ import org.eclipse.ltk.core.refactoring.CompositeChange; import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.TextFileChange; +import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant; import org.eclipse.ltk.core.refactoring.participants.RenameProcessor; import org.eclipse.ltk.internal.core.refactoring.Messages; import org.eclipse.text.edits.MultiTextEdit; @@ -53,6 +54,8 @@ protected static final String JSP_EXT = "jsp"; //$NON-NLS-1$ protected static final String PROPERTIES_EXT = "properties"; //$NON-NLS-1$ + protected static final RefactoringParticipant[] EMPTY_REF_PARTICIPANT = new RefactoringParticipant[0]; + protected static final String SEAM_PROPERTIES_FILE = "seam.properties"; //$NON-NLS-1$ protected RefactoringStatus status;

14 years, 7 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 September 2009