Author: sdzmitrovich Date: 2009-01-20 05:54:26 -0500 (Tue, 20 Jan 2009) New Revision: 13144 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java Log: https://jira.jboss.org/jira/browse/JBIDE-3459 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-01-20 10:02:46 UTC (rev 13143) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-01-20 10:54:26 UTC (rev 13144) @@ -12,7 +12,6 @@ import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -74,7 +73,6 @@ import org.jboss.tools.jst.jsp.outline.cssdialog.common.CSSModel; import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; import org.jboss.tools.jst.jsp.outline.cssdialog.common.FileExtensionFilter; -import org.jboss.tools.jst.jsp.outline.cssdialog.common.Selector; import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util; import org.jboss.tools.jst.jsp.outline.cssdialog.events.ChangeStyleEvent; import org.jboss.tools.jst.jsp.outline.cssdialog.events.ChangeStyleListener; @@ -597,10 +595,9 @@ // update current class style value currentClassStyle = classCombo.getText().trim(); - boolean inputNewClass = classCombo.indexOf(currentClassStyle) == -1; // if new css was added - if (inputNewClass) { - applyButton.setEnabled(inputNewClass); + if (classCombo.indexOf(currentClassStyle) == -1) { + applyButton.setEnabled(true); classCombo.add(currentClassStyle); } styleComposite.revertPreview(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-01-20 10:02:46 UTC (rev 13143) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-01-20 10:54:26 UTC (rev 13144) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jst.jsp.outline.cssdialog.common; +import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -21,6 +22,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.IDocument; import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS; import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; @@ -73,6 +75,7 @@ formatProcessorCSS = new FormatProcessorCSS(); IModelManager modelManager = StructuredModelManager.getModelManager(); model = modelManager.getExistingModelForEdit(styleFile); + if (model == null) model = modelManager.getModelForEdit(styleFile); if (model instanceof ICSSModel) { @@ -358,4 +361,17 @@ return rulesMapping; } + + public IDocument getStructuredDocument() { + return model.getStructuredDocument(); + } + + public void reload() { + try { + model.reload(new FileInputStream(styleFile.getLocation().toFile())); + } catch (Exception e) { + JspEditorPlugin.getPluginLog().logError(e.getMessage()); + } + + } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java 2009-01-20 10:02:46 UTC (rev 13143) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java 2009-01-20 10:54:26 UTC (rev 13144) @@ -1,134 +1,184 @@ -/******************************************************************************* - * 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.jsp.outline.cssdialog.tabs; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorReference; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.internal.EditorAreaHelper; -import org.eclipse.ui.internal.EditorManager; -import org.eclipse.ui.internal.WorkbenchPage; -import org.eclipse.ui.internal.WorkbenchWindow; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.ui.StructuredTextEditor; -import org.jboss.tools.jst.jsp.messages.JstUIMessages; -import org.jboss.tools.jst.jsp.outline.cssdialog.common.CSSModel; -import org.jboss.tools.jst.jsp.outline.cssdialog.events.StyleAttributes; - -/** - * Class for creating Preview sheet tab - */ -public class TabPreviewControl extends Composite { - - /** Editor in which we open visual page. */ - protected final static String EDITOR_ID = "org.eclipse.wst.css.core.csssource.source"; //$NON-NLS-1$ - - private StructuredTextEditor editor = null; - private CSSModel cssModel = null; - - /** - * Constructor for creating controls - * - * @param composite The parent composite for tab - * @param styleAttributes the StyleAttributes object - */ - public TabPreviewControl(Composite tabFolder, StyleAttributes styleAttributes) { - super(tabFolder, SWT.NONE); - setLayout(new FillLayout()); - Label label = new Label(this, SWT.CENTER); - label.setText(JstUIMessages.DEFAULT_PREVIEW_TEXT); - } - - /** - * Method update preview tab with information from the CSS file passed by parameter. - * - * @param cssFile CSS file to be displayed in preview area - */ - public void initPreview(CSSModel cssModel) { - this.cssModel = cssModel; - if (cssModel != null) { - IEditorInput input = new FileEditorInput(cssModel.getStyleFile()); - try { - WorkbenchWindow workbenchWindow = (WorkbenchWindow)PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - EditorAreaHelper editorPresentation = new EditorAreaHelper((WorkbenchPage) workbenchWindow.getActivePage()); - EditorManager editorManager = new EditorManager(workbenchWindow, (WorkbenchPage) workbenchWindow.getActivePage(), editorPresentation); - - IEditorReference ref = editorManager.openEditor(EDITOR_ID, input, true, null); - if (ref != null) { - // all preview tab editors should be disposed before adding new editor compoment - for (Control control : getChildren()) { - control.dispose(); - } - if (editor != null) { - editor.doRevertToSaved(); - editor.close(false); - } - editor = (StructuredTextEditor)ref.getEditor(true); - editor.createPartControl(this); - editor.getTextViewer().setEditable(false); - } - - layout(); - } catch (PartInitException e) { - e.printStackTrace(); - } - } - } - - public void doRevertToSaved() { - if (editor != null) { - editor.doRevertToSaved(); - } - } - - /** - * Method is used to select area that corresponds to specific selector. - * - * @param selector the selector that should be selected in editor area - * @param index if CSS file contains more then one elements with the same selector name, - * then index is serial number of this selector - */ - public void selectEditorArea(String selector, int index) { - if (cssModel != null) { - IndexedRegion indexedRegion = cssModel.getSelectorRegion(selector, index); - if (editor != null) { - if (indexedRegion != null) { - editor.selectAndReveal(indexedRegion.getStartOffset(), indexedRegion.getLength()); - } else { - editor.selectAndReveal(0, 0); - } - } - } - } - - /** - * Method is used to close CSS file editor correctly. - * - * @param save true if close editor with closure operation; false - otherwise - */ - public void closeEditor(boolean save) { - if (editor != null) { - editor.doRevertToSaved(); - editor.close(save); - editor = null; - } - if (cssModel != null) { - cssModel.releaseModel(); - } - } -} +/******************************************************************************* + * 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.jsp.outline.cssdialog.tabs; + +import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.text.source.SourceViewer; +import org.eclipse.jface.text.source.SourceViewerConfiguration; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS; +import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; +import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; +import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider; +import org.jboss.tools.jst.jsp.messages.JstUIMessages; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.CSSModel; +import org.jboss.tools.jst.jsp.outline.cssdialog.events.StyleAttributes; + +/** + * Class for creating Preview sheet tab + */ +public class TabPreviewControl extends Composite { + + /** Editor in which we open visual page. */ + protected final static String EDITOR_ID = "org.eclipse.wst.css.core.csssource.source"; //$NON-NLS-1$ + + + /** + * TODO remove the field + * @deprecated + */ + private StructuredTextEditor editor = null; + SourceViewer viewer = null; + private CSSModel cssModel = null; + + /** + * Constructor for creating controls + * + * @param composite The parent composite for tab + * @param styleAttributes the StyleAttributes object + */ + public TabPreviewControl(Composite tabFolder, StyleAttributes styleAttributes) { + super(tabFolder, SWT.NONE); + setLayout(new FillLayout()); + Label label = new Label(this, SWT.CENTER); + label.setText(JstUIMessages.DEFAULT_PREVIEW_TEXT); + } + + /** + * Method update preview tab with information from the CSS file passed by parameter. + * + * @param cssFile CSS file to be displayed in preview area + */ + public void initPreview(CSSModel cssModel) { + this.cssModel = cssModel; + if (cssModel != null) { + IEditorInput input = new FileEditorInput(cssModel.getStyleFile()); +// try { +// WorkbenchWindow workbenchWindow = (WorkbenchWindow)PlatformUI.getWorkbench().getActiveWorkbenchWindow(); +// EditorAreaHelper editorPresentation = new EditorAreaHelper((WorkbenchPage) workbenchWindow.getActivePage()); +// EditorManager editorManager = new EditorManager(workbenchWindow, (WorkbenchPage) workbenchWindow.getActivePage(), editorPresentation); + +// IEditorReference ref = editorManager.openEditor(EDITOR_ID, input, true, null); +// if (ref != null) { + // all preview tab editors should be disposed before adding new editor compoment + for (Control control : getChildren()) { + control.dispose(); + } +// if (editor != null) { +// editor.doRevertToSaved(); +// editor.close(false); +// } +// editor = (StructuredTextEditor)ref.getEditor(true); +// editor.createPartControl(this); +// editor.getTextViewer().setEditable(false); + + SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() { + StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationCSS(); + + public String[] getConfiguredContentTypes( + ISourceViewer sourceViewer) { + return baseConfiguration + .getConfiguredContentTypes(sourceViewer); + } + + public LineStyleProvider[] getLineStyleProviders( + ISourceViewer sourceViewer, String partitionType) { + return baseConfiguration.getLineStyleProviders( + sourceViewer, partitionType); + } + }; + viewer = new StructuredTextViewer(this, null, null, + false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); + ((StructuredTextViewer) viewer).getTextWidget().setFont( + JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$ + + // IStructuredModel scratchModel = + // StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForCSS.ContentTypeID_CSS); + // IDocument document = scratchModel.getStructuredDocument(); + viewer.configure(sourceViewerConfiguration); + viewer.setDocument(cssModel.getStructuredDocument()); + viewer.setEditable(false); +// } + + layout(); +// } catch (PartInitException e) { +// e.printStackTrace(); +// } + } + } + + public void doRevertToSaved() { + + cssModel.reload(); + +// if (editor != null) { +// editor.doRevertToSaved(); +// } + + } + + /** + * TODO redesign method : remove "index" param + * Method is used to select area that corresponds to specific selector. + * + * @param selector the selector that should be selected in editor area + * @param index if CSS file contains more then one elements with the same selector name, + * then index is serial number of this selector + */ + public void selectEditorArea(String selector, int index) { + if (cssModel != null) { + IndexedRegion indexedRegion = cssModel.getSelectorRegion(selector, + index); + if (/* editor */viewer != null) { + if (indexedRegion != null) { + // editor.selectAndReveal(indexedRegion.getStartOffset(), + // indexedRegion.getLength()); + viewer.setSelectedRange(indexedRegion.getStartOffset(), + indexedRegion.getLength()); + viewer.revealRange(indexedRegion.getStartOffset(), + indexedRegion.getLength()); + } else { + // editor.selectAndReveal(0, 0); + viewer.setSelectedRange(0, 0); + viewer.revealRange(0,0); + } + } + } + } + + /** + * Method is used to close CSS file editor correctly. + * + * @param save true if close editor with closure operation; false - otherwise + */ + public void closeEditor(boolean save) { +// if (editor != null) { +// editor.doRevertToSaved(); +// editor.close(save); +// editor = null; +// } + if(!save) + doRevertToSaved(); + + if (cssModel != null) { + cssModel.releaseModel(); + } + } +}