Author: scabanovich Date: 2009-09-25 08:37:34 -0400 (Fri, 25 Sep 2009) New Revision: 17729 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertHelper.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java Log: Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertHelper.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertHelper.java 2009-09-25 12:36:36 UTC (rev 17728) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertHelper.java 2009-09-25 12:37:34 UTC (rev 17729) @@ -34,11 +34,10 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; -import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; -import org.jboss.tools.jst.web.tld.URIConstants; /** * @author Jeremy @@ -46,15 +45,11 @@ public class PaletteInsertHelper { public static final String PROPOPERTY_TAG_NAME = "tag name"; //$NON-NLS-1$ - public static final String PROPOPERTY_START_TEXT = TLDToPaletteHelper.START_TEXT; - public static final String PROPOPERTY_END_TEXT = TLDToPaletteHelper.END_TEXT; + public static final String PROPOPERTY_START_TEXT = XModelObjectConstants.START_TEXT; + public static final String PROPOPERTY_END_TEXT = XModelObjectConstants.END_TEXT; public static final String PROPOPERTY_NEW_LINE = "new line"; //$NON-NLS-1$ - public static final String PROPOPERTY_REFORMAT_BODY = TLDToPaletteHelper.REFORMAT; - public static final String PROPOPERTY_TAGLIBRARY_URI = URIConstants.LIBRARY_URI; - public static final String PROPOPERTY_TAGLIBRARY_VERSION = URIConstants.LIBRARY_VERSION; - public static final String PROPOPERTY_DEFAULT_PREFIX = URIConstants.DEFAULT_PREFIX; + public static final String PROPOPERTY_REFORMAT_BODY = XModelObjectConstants.REFORMAT; public static final String PROPOPERTY_SELECTION_PROVIDER = "selectionProvider"; //$NON-NLS-1$ - public static final String PROPOPERTY_ADD_TAGLIB = TLDToPaletteHelper.ADD_TAGLIB; static PaletteInsertHelper instance = new PaletteInsertHelper(); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java 2009-09-25 12:36:36 UTC (rev 17728) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java 2009-09-25 12:37:34 UTC (rev 17729) @@ -35,7 +35,6 @@ import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.dnd.ModelTransfer; import org.jboss.tools.common.model.ui.editor.EditorPartWrapper; -import org.jboss.tools.jst.web.tld.URIConstants; public class PaletteViewPart extends ViewPart implements IPartListener { @@ -144,6 +143,8 @@ if(dropIntoEditor(editor, macro)) return; if(dropIntoEditor2(editor, macro)) return; + //TODO implement a service +/** String tagname = macro.getAttributeValue("name"); //$NON-NLS-1$ String startText = "" + macro.getAttributeValue("start text"); //$NON-NLS-1$ //$NON-NLS-2$ String endText = "" + macro.getAttributeValue("end text"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -174,6 +175,7 @@ ); page.activate(part); } +*/ } private boolean dropIntoEditor(ITextEditor editor, XModelObject macro) {