Author: svasilyev Date: 2008-04-01 10:41:09 -0400 (Tue, 01 Apr 2008) New Revision: 7245 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java Log: http://jira.jboss.com/jira/browse/JBIDE-1978 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-04-01 14:08:50 UTC (rev 7244) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-04-01 14:41:09 UTC (rev 7245) @@ -11,6 +11,8 @@ package org.jboss.tools.vpe.editor.template; import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -29,7 +31,6 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.editor.util.VpeDebugUtil; import org.jboss.tools.vpe.editor.util.XmlUtil; import org.osgi.framework.Bundle; import org.w3c.dom.Document; @@ -235,11 +236,13 @@ /** * contains default text formating file name */ - private static final String DEFAUL_TEXT_FORMATTING_CONF_FILE_NAME= File.separator+"resources"+File.separator+"textFormatting.xml"; //$NON-NLS-1$ //$NON-NLS-2$ + private static final String DEFAUL_TEXT_FORMATTING_CONF_FILE_NAME = + //File.separator + "resources" + File.separator + + "textFormatting.xml"; //$NON-NLS-1$ /** * Property which indicates that with this tag will be added default formats */ - public static final String ATTR_USE_DEFAULT_FORMATS="use-default-formats"; //$NON-NLS-1$ + public static final String ATTR_USE_DEFAULT_FORMATS = "use-default-formats"; //$NON-NLS-1$ /* * Added by Max Areshkau(mareshkau(a)exadel.com) */ @@ -249,7 +252,9 @@ */ private static final String NAMESPACE_IDENTIFIER_ATTRIBUTE = "namespaceIdentifier"; //$NON-NLS-1$ + private VpeTemplateManager() { + // singleton } public static final VpeTemplateManager getInstance() { @@ -886,18 +891,16 @@ * @return the defaultTextFormatingData */ public static TextFormatingData getDefaultTextFormattingData() { - if(defaultTextFormattingData==null) { - try { - IPath path = VpeTemplateFileList.getFilePath(DEFAUL_TEXT_FORMATTING_CONF_FILE_NAME, null); - Element root = XMLUtilities.getElement(path.toFile(), null); + InputStream is = VpePlugin.getDefault().getBundle().getResource(DEFAUL_TEXT_FORMATTING_CONF_FILE_NAME).openStream(); + Element root = XMLUtilities.getElement(new InputStreamReader(is), null); defaultTextFormattingData = new TextFormatingData(root); } catch (Exception e) { - VpePlugin.getPluginLog().logError(e); } } + return defaultTextFormattingData; } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java 2008-04-01 14:08:50 UTC (rev 7244) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java 2008-04-01 14:41:09 UTC (rev 7245) @@ -97,13 +97,13 @@ * @return */ public FormatData[] getFormatDatas(String type) { - ArrayList result = new ArrayList(); + ArrayList<FormatData> result = new ArrayList<FormatData>(); for(int i=0; i<formats.length; i++) { if(type.equals(formats[i].getType())) { result.add(formats[i]); } } - return (FormatData[])result.toArray(new FormatData[result.size()]); + return result.toArray(new FormatData[]{}); } /**