JBoss Tools SVN: r12988 - trunk/documentation/jboss-tools-docs/index/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-01-12 05:09:44 -0500 (Mon, 12 Jan 2009)
New Revision: 12988
Modified:
trunk/documentation/jboss-tools-docs/index/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-453 - adding 'Drools Tools guide' into the nightly build page;
Modified: trunk/documentation/jboss-tools-docs/index/en/master.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/index/en/master.xml 2009-01-12 10:09:27 UTC (rev 12987)
+++ trunk/documentation/jboss-tools-docs/index/en/master.xml 2009-01-12 10:09:44 UTC (rev 12988)
@@ -133,6 +133,15 @@
>(pdf)</ulink>
</primaryie>
</indexentry>
+
+ <indexentry>
+ <primaryie>Drools Tools Reference Guide<ulink
+ url="en/drools_tools_ref_guide/html/index.html">(html)</ulink>
+ <ulink url="en/drools_tools_ref_guide/html_single/index.html">(html single)</ulink>
+ <ulink url="en/drools_tools_ref_guide/pdf/Drools_Tools_Reference_Guide.pdf"
+ >(pdf)</ulink>
+ </primaryie>
+ </indexentry>
<indexentry>
16 years
- 1
- 0
JBoss Tools SVN: r12987 - trunk/documentation/jboss-tools-docs.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-01-12 05:09:27 -0500 (Mon, 12 Jan 2009)
New Revision: 12987
Modified:
trunk/documentation/jboss-tools-docs/all-guides.xml
trunk/documentation/jboss-tools-docs/pom.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-453 - adding 'Drools Tools guide' into the nightly build page;
Modified: trunk/documentation/jboss-tools-docs/all-guides.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/all-guides.xml 2009-01-12 09:54:02 UTC (rev 12986)
+++ trunk/documentation/jboss-tools-docs/all-guides.xml 2009-01-12 10:09:27 UTC (rev 12987)
@@ -6,7 +6,7 @@
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <!--
+<!--
<moduleSets>
<moduleSet>
<includes>
@@ -18,7 +18,6 @@
</binaries>
</moduleSet>
</moduleSets>
-
-->
<fileSets>
<fileSet>
@@ -126,7 +125,7 @@
</fileSet>
<fileSet>
<directory>../../jbpm/docs/reference/target/docbook/publish/en-US</directory>
- <outputDirectory>/jbpm</outputDirectory>
+ <outputDirectory>/jboss_jbpm_ref_guide</outputDirectory>
<filtered>false</filtered>
<lineEnding>keep</lineEnding>
<includes>
@@ -288,6 +287,20 @@
</fileSet>
<fileSet>
+ <directory>../../drools/docs/reference/target/docbook/publish/en-US</directory>
+ <outputDirectory>/drools_tools_ref_guide</outputDirectory>
+ <filtered>false</filtered>
+ <lineEnding>keep</lineEnding>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ <useStrictFiltering>false</useStrictFiltering>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+
+ <fileSet>
<directory>../../smooks/docs/reference/target/docbook/publish/en-US</directory>
<outputDirectory>/jboss_smooks_plugin_ref_guide</outputDirectory>
<filtered>false</filtered>
Modified: trunk/documentation/jboss-tools-docs/pom.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/pom.xml 2009-01-12 09:54:02 UTC (rev 12986)
+++ trunk/documentation/jboss-tools-docs/pom.xml 2009-01-12 10:09:27 UTC (rev 12987)
@@ -26,6 +26,7 @@
<module>../../ws/docs/reference</module>
<module>../../portlet/docs/reference</module>
<module>../../birt/docs</module>
+ <module>../../drools/docs/reference</module>
<module>../../smooks/docs/reference</module>
<module>../../jbpm/docs/converter_ref</module>
16 years
- 1
- 0
JBoss Tools SVN: r12986 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog: common and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-01-12 04:54:02 -0500 (Mon, 12 Jan 2009)
New Revision: 12986
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/common/Constants.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3148
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-12 06:59:15 UTC (rev 12985)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-01-12 09:54:02 UTC (rev 12986)
@@ -1,883 +1,886 @@
-/*******************************************************************************
- * 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;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.fieldassist.ComboContentAdapter;
-import org.eclipse.jface.fieldassist.ContentProposalAdapter;
-import org.eclipse.jface.fieldassist.IContentProposal;
-import org.eclipse.jface.fieldassist.IContentProposalListener;
-import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
-import org.eclipse.ui.model.BaseWorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.progress.UIJob;
-import org.jboss.tools.common.model.ui.widgets.Split;
-import org.jboss.tools.jst.jsp.JspEditorPlugin;
-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.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;
-import org.jboss.tools.jst.jsp.outline.cssdialog.events.ManualChangeStyleListener;
-import org.jboss.tools.jst.jsp.outline.cssdialog.events.MessageDialogEvent;
-import org.jboss.tools.jst.jsp.outline.cssdialog.events.MessageDialogListener;
-import org.jboss.tools.jst.jsp.outline.cssdialog.events.StyleAttributes;
-
-/**
- * This dialog represents CSSClass dialog.
- *
- * @author Igor Zhukov (izhukov(a)exadel.com)
- */
-public class CSSClassDialog extends TitleAreaDialog {
-
- public static final String ID = "org.jboss.tools.jst.jsp.outline.cssdialog.CSSClassDialog"; //$NON-NLS-1$
-
- private static String notUsed = "not_used"; //$NON-NLS-1$
- private final static String[] fileExtensions = { Util.CSS_FILE_EXTENTION };
-
- private Composite browserContainer = null;
- private Browser browser = null;
- private Text textBrowser = null;
- private String previewBrowserValue = JstUIMessages.DEFAULT_TEXT_FOR_BROWSER_PREVIEW;
-
- private StyleComposite styleComposite = null;
- private StyleAttributes styleAttributes = null;
- // css file path
- private Text text;
- // css style classes
- private Combo classCombo;
- // combo box content assist
- private ContentAssistCommandAdapter contentAssistAdapter = null;
- // apply button
- private Button applyButton;
-
- // model is the core of the CSS Class Dialog, it manages style attributes
- private CSSModel cssModel;
-
- // file is "current" in case of the following priority order:
- // 1 - this is selected css file in eclipse project tree
- // 2 - this is opened and active css file
- private IFile currentFile;
- private String currentClassStyle = null;
-
- // workbench selection when the wizard was started
- protected IStructuredSelection selection;
-
- private boolean styleChanged = false;
-
- private boolean keyInputSelector = false;
-
- // Status variables for the possible errors on this page.
- // 1. timeStatus holds an error if CSS file is not specified
- private IStatus filePathStatus = null;
- // 2. holds an error if the destination class style is empty
- private IStatus classNameStatus = null;
-
- // an array of subscribed message dialog listener
- private ArrayList<MessageDialogListener> errorListeners = new ArrayList<MessageDialogListener>();
-
- // parameter indicates if dialog was opened from Wizard
- private final boolean callFromWizard;
-
- // this job is used to correctly process change style class combo text with delay
- private UIJob uiJob = null;
- // the job name
- private String jobName = "Update CSS Composite"; //$NON-NLS-1$
- // delay for job in milliseconds
- private int delay = 1000;
-
- /**
- * Constructor.
- *
- * @param parentShell Shell object
- * @param allProject (if allProject is true - browse css file in all projects, else only in current project)
- * @param callFromWizard indicates if CSS dialog is created within Wizard page
- */
- public CSSClassDialog(Shell parentShell, IStructuredSelection selection, boolean callFromWizard) {
- super(parentShell);
-
- setShellStyle(getShellStyle() | SWT.RESIZE | SWT.MAX | SWT.APPLICATION_MODAL);
-
- filePathStatus = new Status(IStatus.ERROR, notUsed, 0, JstUIMessages.CSS_EMPTY_FILE_PATH_MESSAGE, null);
- classNameStatus = new Status(IStatus.ERROR, notUsed, 0, JstUIMessages.CSS_EMPTY_STYLE_CLASS_MESSAGE, null);
-
- styleAttributes = new StyleAttributes();
- this.callFromWizard = callFromWizard;
- this.selection = selection;
- init();
- }
-
- /**
- * Initialize method.
- */
- private void init() {
- if (selection != null && !selection.isEmpty()) {
- for (Iterator<?> iterator = selection.iterator(); iterator.hasNext();) {
- Object element = iterator.next();
- if (element instanceof IResource) {
- if (element instanceof IFile) {
- if (((IFile) element).getName().toLowerCase().endsWith(Util.CSS_FILE_EXTENTION)) {
- currentFile = (IFile)element;
- }
- }
- }
- }
- }
- // if any CSS file is currently opened and has active page status this method should return style class
- // within this file where cursor is located
- if (currentFile == null) {
- currentFile = Util.getActiveCssFile();
- }
- currentClassStyle = Util.getActivePageCSSSelectorIfAny();
- }
-
- /**
- * Sets current style class value.
- *
- * @param currentClassStyle String value
- */
- public void setCurrentStyleClass(String currentClassStyle) {
- this.currentClassStyle = Util.formatStyleClassToCSSView(currentClassStyle);
- }
-
- /**
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite)
- */
- @Override
- protected Control createDialogArea(final Composite parent) {
- final Composite composite = (Composite) super.createDialogArea(parent);
- if(composite.getLayoutData()!=null && composite.getLayoutData() instanceof GridData) {
- ((GridData)composite.getLayoutData()).widthHint=500;
- ((GridData)composite.getLayoutData()).heightHint=500;
- }
- final Control control = createDialogComposite(composite);
- return control;
- }
-
- public Control createDialog(final Composite parent) {
- return createDialogArea(parent);
- }
-
- /**
- * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(Composite)
- */
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
- updateOKButtonState();
-
- }
- private Split split;
- /**
- * Create the dialog itself.
- *
- * @param composite parent window
- * @return eclipse Control object
- */
- private Control createDialogComposite(Composite composite) {
- if (!this.callFromWizard) {
- setTitle(JstUIMessages.CSS_STYLE_CLASS_EDITOR_TITLE);
- setMessage(JstUIMessages.CSS_STYLE_CLASS_EDITOR_DESCRIPTION);
- }
- composite.setLayout(new GridLayout());
-
- // ===============================================================================
- // Create split component that separates dialog on 2 parts
- // ===============================================================================
- split = new Split(composite, SWT.VERTICAL);
-
- // ===============================================================================
- // Create browser container
- // ===============================================================================
- browserContainer = getCompositeElement(split);
- // create browser component
- createBrowserComponent();
-
- // ===============================================================================
- // Create down splitter container
- // ===============================================================================
- Composite downSplitPane = getCompositeElement(split);
-
- Composite classComposite = new Composite(downSplitPane, SWT.BORDER);
- classComposite.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
- classComposite.setLayout(new GridLayout(3, false));
-
- // ===============================================================================
- // Create component that contains CSS file pass and it's selectors (style classes combo box)
- // ===============================================================================
- createCSSFilePathComponent(classComposite);
- createStyleClassCombo(classComposite);
-
- // ===============================================================================
- // Create style composite component
- // ===============================================================================
- styleComposite = new StyleComposite(downSplitPane, styleAttributes, Constants.EMPTY);
- styleComposite.addManualChangeStyleListener(new ManualChangeStyleListener() {
- public void styleChanged(ChangeStyleEvent event) {
- styleChanged = true;
- if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)
- && currentFile != null && !currentFile.equals(Constants.EMPTY)) {
- applyButton.setEnabled(true);
- }
- }
- });
-
- // ===============================================================================
- // Create custom button panel
- // ===============================================================================
- createCustomButtonPanel(downSplitPane);
-
- styleAttributes.addChangeStyleListener(new ChangeStyleListener() {
- public void styleChanged(ChangeStyleEvent event) {
- if (!browser.isDisposed()) {
- browser.setText(getTextForBrowser());
- }
- }
- });
-
- if (currentFile != null) {
- initCSSModel(currentFile, true, true);
- } else if (currentClassStyle != null) {
- classCombo.setText(currentClassStyle);
- styleAttributes.setCssSelector(currentClassStyle);
- }
-
- // add content assist to style COMBO component
- SimpleContentProposalProvider proposalProvider = new SimpleContentProposalProvider(classCombo.getItems());
- proposalProvider.setFiltering(true);
- contentAssistAdapter = new ContentAssistCommandAdapter(
- classCombo, new ComboContentAdapter(), proposalProvider, null, null, true);
- contentAssistAdapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
- contentAssistAdapter.addContentProposalListener(new IContentProposalListener() {
- public void proposalAccepted(IContentProposal proposal) {
- cssStyleClassChanged();
- applyButton.setEnabled(false);
- keyInputSelector = false;
- }
- });
-
- split.setWeights(new int[]{15, 85});
- split.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, true));
-
- return composite;
- }
-
- private void createCSSFilePathComponent(Composite parent) {
- Label label = new Label(parent, SWT.LEFT);
- label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
- label.setText(JstUIMessages.CSS_CLASS_DIALOG_FILE_LABEL);
-
- // Text field contains path to the CSS file
- text = new Text(parent, SWT.BORDER);
- text.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
- text.setEditable(false);
- text.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String cssFile = text.getText().trim();
- // Initialize a variable with the no error status
- filePathStatus = new Status(IStatus.ERROR, notUsed, 0, JstUIMessages.CSS_EMPTY_FILE_PATH_MESSAGE, null);
- if (cssFile != null && !cssFile.equals(Constants.EMPTY)) {
- filePathStatus = new Status(IStatus.OK, notUsed, 0, JstUIMessages.CSS_STYLE_CLASS_EDITOR_DESCRIPTION, null);
- }
- // show corresponding message
- IStatus status = findMostSevere();
- notifyListeners(text, status);
- applyToStatusLine(status);
- }
- });
-
- Button button = new Button(parent, SWT.PUSH);
- button.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
-
- ImageDescriptor imageDesc = JspEditorPlugin.getImageDescriptor(Constants.IMAGE_FOLDERLARGE_FILE_LOCATION);
- Image image = imageDesc.createImage();
- button.setImage(image);
- button.setToolTipText(JstUIMessages.CSS_BROWSE_BUTTON_TOOLTIP);
- button.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- Button button = (Button) e.getSource();
- button.getImage().dispose();
- }
- });
- button.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
-// IResource project = Util.getCurrentProject();
- IResource project = ResourcesPlugin.getWorkspace().getRoot();
-
- ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(),
- new WorkbenchLabelProvider(), new BaseWorkbenchContentProvider());
- dialog.addFilter(new FileExtensionFilter(fileExtensions));
- dialog.setTitle(JstUIMessages.CSS_FILE_SELECT_DIALOG_TITLE);
- dialog.setMessage(JstUIMessages.CSS_FILE_SELECT_DIALOG_LABEL);
- dialog.setInput(project);
- dialog.setAllowMultiple(false);
- dialog.setDoubleClickSelects(false);
- if (currentFile != null) {
- dialog.setInitialSelection(currentFile);
- }
- dialog.setEmptyListMessage(JstUIMessages.CSS_FILE_SELECT_DIALOG_EMPTY_MESSAGE);
-
- if (dialog.open() == Window.OK) {
- IResource res = (IResource) dialog.getFirstResult();
- // make some important saving actions
- if (res instanceof IFile) {
- if (styleChanged && currentFile != null) {
- MessageBox messageBox = new MessageBox(getParentShell(), SWT.YES | SWT.NO | SWT.ICON_QUESTION);
- messageBox.setText(JstUIMessages.CSS_SAVE_DIALOG_TITLE);
- messageBox.setMessage("'" + currentFile + "' " + JstUIMessages.CSS_SAVE_DIALOG_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
- int result = messageBox.open();
- if (result == SWT.YES) {
- saveChanges(true);
- } else {
- styleComposite.closePreview(false);
- updateStyleComposite();
- }
- }
- styleComposite.revertPreview();
-
- // open new CSS file and initialize dialog
- boolean useRelativePath = true;
- if (project instanceof IWorkspaceRoot) {
- useRelativePath = false;
- }
- boolean updateCSSModel = false;
- if (currentFile != null && !currentFile.equals(Constants.EMPTY)) {
- currentClassStyle = null;
- updateCSSModel = true;
- }
- currentFile = (IFile)res;
- initCSSModel(currentFile, useRelativePath, updateCSSModel);
- updateOKButtonState();
- applyButton.setEnabled(false);
- styleChanged = false;
-
- // update content assist proposals
- SimpleContentProposalProvider proposalProvider =
- (SimpleContentProposalProvider)contentAssistAdapter.getContentProposalProvider();
- proposalProvider.setProposals(classCombo.getItems());
- }
- }
- }
- });
- }
-
- /**
- * This method is used to create and initialize style class comboBox component.
- *
- * @param parent Composite component
- */
- private void createStyleClassCombo(Composite parent) {
- Label label = new Label(parent, SWT.LEFT);
- label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
- label.setText(JstUIMessages.CSS_CLASS_DIALOG_STYLE_CLASS_LABEL);
-
- GridData gridData = new GridData(GridData.FILL, GridData.CENTER, true, false);
- gridData.horizontalSpan = 2;
-
- classCombo = new Combo(parent, SWT.BORDER);
- classCombo.setLayoutData(gridData);
- classCombo.setEnabled(false);
- // add selection listener
- classCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (keyInputSelector) {
- keyInputSelector = false;
- if (currentClassStyle != null && classCombo.indexOf(currentClassStyle) != -1) {
- return;
- }
- }
- keyInputSelector = false;
- }
- });
- // add key modified listener
- classCombo.addKeyListener(new KeyAdapter() {
- public void keyReleased(KeyEvent e) {
- keyInputSelector = true;
- }
- });
- // this listener is responsible for processing dialog header message events
- classCombo.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String cssClass = classCombo.getText().trim();
- // Initialize a variable with the no error status
- classNameStatus = new Status(IStatus.ERROR, notUsed, 0, JstUIMessages.CSS_EMPTY_STYLE_CLASS_MESSAGE, null);
- if (cssClass != null && !cssClass.equals(Constants.EMPTY)) {
- classNameStatus = new Status(IStatus.OK, notUsed, 0, JstUIMessages.CSS_STYLE_CLASS_EDITOR_DESCRIPTION, null);
- }
- // show corresponding message
- IStatus status = findMostSevere();
- notifyListeners(classCombo, status);
- applyToStatusLine(status);
- // update CSS style cmposite if needed
- if ((currentClassStyle != null && currentClassStyle.equals(classCombo.getText().trim()))
- || (currentClassStyle == null && classCombo.getText().trim().equals(Constants.EMPTY))) {
- return;
- }
- notifyStyleClassChanged();
- applyButton.setEnabled(false);
- }
- });
- }
-
- /**
- * This method is invoked to correctly process class style combo modify event.
- */
- private void notifyStyleClassChanged() {
- Display display = null;
- if (PlatformUI.isWorkbenchRunning()) {
- display = PlatformUI.getWorkbench().getDisplay();
- }
- if (display != null && (Thread.currentThread() == display.getThread())) {
- if (uiJob == null) {
- uiJob = new UIJob(jobName) {
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
- if (monitor.isCanceled()) {
- return Status.CANCEL_STATUS;
- }
- monitor.beginTask(jobName, IProgressMonitor.UNKNOWN);
-
- // start operation
- cssStyleClassChanged();
- // end operation
-
- monitor.done();
-
- return Status.OK_STATUS;
- }
- };
- }
-
- uiJob.setPriority(Job.SHORT);
- uiJob.schedule(delay);
-
- return;
- }
- }
-
- /**
- * This method is used to create custom button panel.
- *
- * @param parent Composite component
- */
- private void createCustomButtonPanel(Composite parent) {
- Composite buttonComposite = new Composite(parent, SWT.NONE);
- buttonComposite.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, true, false));
- buttonComposite.setLayout(new GridLayout());
- // add APPLY button
- applyButton = createCustomButton(buttonComposite, JstUIMessages.BUTTON_APPLY);
- applyButton.setEnabled(false);
- applyButton.setToolTipText(JstUIMessages.CSS_APPLY_CHANGES);
- applyButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) {
- // update ComboBox element list
- if (classCombo.indexOf(currentClassStyle) == -1) {
- classCombo.add(currentClassStyle);
- }
- saveChanges(false);
- applyButton.setEnabled(false);
- styleChanged = false;
- }
- }
- });
- // add CLEAR button
- Button clearButton = createCustomButton(buttonComposite, JstUIMessages.BUTTON_CLEAR);
- clearButton.setToolTipText(JstUIMessages.CSS_CLEAR_STYLE_SHEET);
- clearButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- styleComposite.clearStyleComposite(currentClassStyle);
- styleComposite.updatePreview(currentClassStyle);
- styleComposite.updateStyle();
- applyButton.setEnabled(true);
- styleChanged = true;
- }
- });
- }
-
- /**
- * This method is used to create custom button.
- *
- * @param parent Composite component
- * @param label Button label value
- */
- protected Button createCustomButton(Composite parent, String label) {
- // increment the number of columns in the button bar
- ((GridLayout) parent.getLayout()).numColumns++;
- Button button = new Button(parent, SWT.PUSH);
- button.setText(label);
-// setButtonLayoutData(button);
- return button;
- }
-
- /**
- * Method is used to correctly process style class change operation.
- */
- private void cssStyleClassChanged() {
- if (currentFile != null && !currentFile.equals(Constants.EMPTY)) {
- if (styleChanged && currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) {
- MessageBox messageBox = new MessageBox(getParentShell(), SWT.YES | SWT.NO | SWT.ICON_QUESTION);
- messageBox.setText(JstUIMessages.CSS_SAVE_DIALOG_TITLE);
- messageBox.setMessage("'" + currentFile + "' " + JstUIMessages.CSS_SAVE_DIALOG_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
- int result = messageBox.open();
- if (result == SWT.YES) {
- // update ComboBox element list
- if (classCombo.indexOf(currentClassStyle) == -1) {
- classCombo.add(currentClassStyle);
- }
- saveChanges(false);
- // update content assist proposals
- SimpleContentProposalProvider proposalProvider =
- (SimpleContentProposalProvider)contentAssistAdapter.getContentProposalProvider();
- proposalProvider.setProposals(classCombo.getItems());
- } else {
- cssModel.init(currentFile);
- }
- }
- // update current class style value
- currentClassStyle = classCombo.getText().trim();
- styleComposite.revertPreview();
- updateStyleComposite();
- styleAttributes.setCssSelector(currentClassStyle);
- styleComposite.updatePreview(currentClassStyle);
- updateOKButtonState();
- } else {
- currentClassStyle = classCombo.getText().trim();
- styleAttributes.setCssSelector(currentClassStyle);
- }
- styleChanged = false;
- }
-
- /**
- * Initialize CSS model with active opened CSS file.
- *
- * @param file IFile object
- * @param useRelativePathPath
- */
- private void initCSSModel(IFile file, boolean useRelativePathPath, boolean updateCSSModel) {
- if (file != null) {
- // create CSS Model
- cssModel = new CSSModel(file);
- classCombo.setEnabled(true);
- classCombo.removeAll();
- // set file path to corresponding text field
- if (useRelativePathPath) {
- text.setText(file.getProjectRelativePath().toOSString());
- } else {
- text.setText(file.getFullPath().toOSString());
- }
- // fill in ComboBox component with CSS model selectors
- List<Selector> selectors = cssModel.getSelectors();
- int selectedIndex = -1;
- for (int i = 0; i < selectors.size(); i++) {
- Selector value = selectors.get(i);
- classCombo.add(value.getValue());
- if (currentClassStyle != null && currentClassStyle.equals(value.getValue())) {
- selectedIndex = i;
- }
- }
- if (currentClassStyle != null && selectedIndex == -1) {
- classCombo.setText(currentClassStyle);
- } else {
- classCombo.select(selectedIndex);
- }
- classCombo.setToolTipText(cssModel.getCSSText(currentClassStyle));
-
- styleComposite.setShowPreviewTab(true);
- styleComposite.setCSSModel(cssModel);
- // update style composite component with the values from new CSS file
- if (updateCSSModel) {
- updateStyleComposite();
- }
- styleComposite.initPreview(cssModel);
- }
- }
-
- /**
- * This method takes affect to OK button when dialog is opened in "dialog" mode and not in "wizard".
- * In case of "wizard" mode OK button is not available.
- */
- private void updateOKButtonState() {
- Button okButton = getButton(IDialogConstants.OK_ID);
- if (okButton != null) {
- if (currentClassStyle == null || currentClassStyle.equals(Constants.EMPTY) || currentFile == null) {
- okButton.setEnabled(false);
- } else {
- okButton.setEnabled(true);
- }
- }
- }
-
- /**
- * Method is used to create browser component to display preview HTML.
- */
- private void createBrowserComponent() {
- GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
- browser = new Browser(browserContainer, SWT.BORDER | SWT.MOZILLA);
- browser.setText(getTextForBrowser());
- browser.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (e.widget == browser) {
- browser.removeMouseListener(this);
- browser.dispose();
- // create Text area component instead of HTML Browser
- GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
-// textBrowser = new Text(browserContainer, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
- textBrowser = new Text(browserContainer, SWT.NONE | SWT.H_SCROLL);
- textBrowser.setText(previewBrowserValue);
- textBrowser.addFocusListener(new FocusAdapter() {
- public void focusLost(FocusEvent e) {
- if (e.widget == textBrowser) {
- String text = textBrowser.getText();
- if (text == null || text.equals(Constants.EMPTY)) {
- previewBrowserValue = JstUIMessages.DEFAULT_TEXT_FOR_BROWSER_PREVIEW;
- } else {
- previewBrowserValue = text;
- }
- textBrowser.dispose();
- // create Browse component instead of text area
- createBrowserComponent();
- }
- browserContainer.layout();
- }
- });
- textBrowser.setLayoutData(gridData);
- textBrowser.setEditable(true);
- textBrowser.setFocus();
- }
- browserContainer.layout();
- }
- });
- browser.setLayoutData(gridData);
- }
-
- /**
- * Update style composite component in accordance with the attributes of selected CSS selector.
- */
- private void updateStyleComposite() {
- String style = cssModel.getStyle(currentClassStyle);
- styleComposite.recreateStyleComposite(style, currentClassStyle);
- }
-
- /**
- * Method is used to build html body that is appropriate to browse.
- *
- * @return String html text representation
- */
- private String getTextForBrowser() {
- String styleForSpan = Constants.EMPTY;
- Set<String> keySet = styleAttributes.keySet();
- for (String key : keySet) {
- styleForSpan += (key + Constants.COLON + styleAttributes.getAttribute(key) + Constants.SEMICOLON);
- }
- String html = Constants.OPEN_DIV_TAG + styleForSpan + "\">" + previewBrowserValue + Constants.CLOSE_DIV_TAG; //$NON-NLS-1$
-
- return html;
- }
-
- /**
- * Create container that take up 2 cells and contains fontSizeCombo and extFontSizeCombo elements.
- */
- private Composite getCompositeElement(Composite parent) {
- GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
- GridLayout gridLayoutTmp = new GridLayout();
- gridLayoutTmp.marginHeight = 0;
- gridLayoutTmp.marginWidth = 0;
- Composite classComposite = new Composite(parent, SWT.FILL);
- classComposite.setLayout(gridLayoutTmp);
- classComposite.setLayoutData(gridData);
-
- return classComposite;
- }
-
- /**
- * Method should be called in case of dialog closure operation.
- */
- public void saveChanges(boolean close) {
- styleComposite.updateStyle();
- cssModel.setCSS(currentClassStyle, styleAttributes);
- cssModel.saveModel();
- if (close) {
- styleComposite.closePreview(true);
- }
- }
-
- /**
- * Gets current selected style class value.
- *
- * @return selector name
- */
- public String getSelectorName() {
- return Util.formatCSSSelectorToStyleClassView(currentClassStyle);
- }
-
- /**
- * Method for setting title for dialog
- *
- * @param newShell Shell object
- * @see org.eclipse.jface.window.Window#configureShell(Shell)
- */
- @Override
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(JstUIMessages.CSS_STYLE_CLASS_EDITOR_TITLE);
- }
-
- /**
- * This method close the dialog.
- *
- * @return true if dialog was closed, false - otherwise
- */
- public boolean closeDialog() {
- setReturnCode(Window.CANCEL);
- return close();
- }
-
- /**
- * @see org.eclipse.jface.dialogs.Dialog#close()
- */
- @Override
- public boolean close() {
- int code = getReturnCode();
- switch (code) {
- case OK:
- if (styleChanged || classCombo.indexOf(currentClassStyle) == -1) {
- saveChanges(true);
- } else {
- styleComposite.closePreview(true);
- }
- break;
- case CANCEL:
- default:
- // make some closure operation
- styleComposite.closePreview(false);
- }
- return super.close();
- }
-
- /**
- * Add MessageDialogListener object.
- *
- * @param listener MessageDialogListener object to be added
- */
- public void addMessageDialogListener(MessageDialogListener listener) {
- errorListeners.add(listener);
- }
-
- /**
- * Method is used to notify all subscribed listeners about possible any errors on the page.
- */
- private void notifyListeners(Object source, IStatus operationStatus) {
- MessageDialogEvent event = new MessageDialogEvent(source, operationStatus);
- for (MessageDialogListener listener : errorListeners) {
- listener.throwMessage(event);
- }
- }
-
- /**
- * Method return the most serious error occurs on the page and that should be displayed.
- *
- * @return IStatus object
- */
- private IStatus findMostSevere() {
- if (filePathStatus.matches(IStatus.ERROR)) {
- return filePathStatus;
- }
- if (classNameStatus.matches(IStatus.ERROR)) {
- return classNameStatus;
- }
- if (filePathStatus.getSeverity() > classNameStatus.getSeverity()) {
- return filePathStatus;
- }
- else return classNameStatus;
- }
-
- /**
- * Applies the status to the status line of a dialog page.
- */
- private void applyToStatusLine(IStatus status) {
- if (!callFromWizard) {
- String message= status.getMessage();
- if (message.length() == 0) {
- message = null;
- }
- switch (status.getSeverity()) {
- case IStatus.OK:
- setErrorMessage(null);
- setMessage(message);
- break;
- case IStatus.WARNING:
- setErrorMessage(null);
- setMessage(message, WizardPage.WARNING);
- break;
- case IStatus.INFO:
- setErrorMessage(null);
- setMessage(message, WizardPage.INFORMATION);
- break;
- default:
- setErrorMessage(message);
- setMessage(null);
- break;
- }
- }
- }
-}
+/*******************************************************************************
+ * 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;
+
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.fieldassist.ComboContentAdapter;
+import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.IContentProposal;
+import org.eclipse.jface.fieldassist.IContentProposalListener;
+import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
+import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
+import org.eclipse.ui.model.BaseWorkbenchContentProvider;
+import org.eclipse.ui.model.WorkbenchLabelProvider;
+import org.eclipse.ui.progress.UIJob;
+import org.jboss.tools.common.model.ui.widgets.Split;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
+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.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;
+import org.jboss.tools.jst.jsp.outline.cssdialog.events.ManualChangeStyleListener;
+import org.jboss.tools.jst.jsp.outline.cssdialog.events.MessageDialogEvent;
+import org.jboss.tools.jst.jsp.outline.cssdialog.events.MessageDialogListener;
+import org.jboss.tools.jst.jsp.outline.cssdialog.events.StyleAttributes;
+
+/**
+ * This dialog represents CSSClass dialog.
+ *
+ * @author Igor Zhukov (izhukov(a)exadel.com)
+ */
+public class CSSClassDialog extends TitleAreaDialog {
+
+ public static final String ID = "org.jboss.tools.jst.jsp.outline.cssdialog.CSSClassDialog"; //$NON-NLS-1$
+
+ private static String notUsed = "not_used"; //$NON-NLS-1$
+ private final static String[] fileExtensions = { Util.CSS_FILE_EXTENTION };
+
+ private Composite browserContainer = null;
+ private Browser browser = null;
+ private Text textBrowser = null;
+ private String previewBrowserValue = JstUIMessages.DEFAULT_TEXT_FOR_BROWSER_PREVIEW;
+
+ private StyleComposite styleComposite = null;
+ private StyleAttributes styleAttributes = null;
+ // css file path
+ private Text text;
+ // css style classes
+ private Combo classCombo;
+ // combo box content assist
+ private ContentAssistCommandAdapter contentAssistAdapter = null;
+ // apply button
+ private Button applyButton;
+
+ // model is the core of the CSS Class Dialog, it manages style attributes
+ private CSSModel cssModel;
+
+ // file is "current" in case of the following priority order:
+ // 1 - this is selected css file in eclipse project tree
+ // 2 - this is opened and active css file
+ private IFile currentFile;
+ private String currentClassStyle = null;
+
+ // workbench selection when the wizard was started
+ protected IStructuredSelection selection;
+
+ private boolean styleChanged = false;
+
+ private boolean keyInputSelector = false;
+
+ // Status variables for the possible errors on this page.
+ // 1. timeStatus holds an error if CSS file is not specified
+ private IStatus filePathStatus = null;
+ // 2. holds an error if the destination class style is empty
+ private IStatus classNameStatus = null;
+
+ // an array of subscribed message dialog listener
+ private ArrayList<MessageDialogListener> errorListeners = new ArrayList<MessageDialogListener>();
+
+ // parameter indicates if dialog was opened from Wizard
+ private final boolean callFromWizard;
+
+ // this job is used to correctly process change style class combo text with delay
+ private UIJob uiJob = null;
+ // the job name
+ private String jobName = "Update CSS Composite"; //$NON-NLS-1$
+ // delay for job in milliseconds
+ private int delay = 1000;
+
+ /**
+ * Constructor.
+ *
+ * @param parentShell Shell object
+ * @param allProject (if allProject is true - browse css file in all projects, else only in current project)
+ * @param callFromWizard indicates if CSS dialog is created within Wizard page
+ */
+ public CSSClassDialog(Shell parentShell, IStructuredSelection selection, boolean callFromWizard) {
+ super(parentShell);
+
+ setShellStyle(getShellStyle() | SWT.RESIZE | SWT.MAX | SWT.APPLICATION_MODAL);
+
+ filePathStatus = new Status(IStatus.ERROR, notUsed, 0, JstUIMessages.CSS_EMPTY_FILE_PATH_MESSAGE, null);
+ classNameStatus = new Status(IStatus.ERROR, notUsed, 0, JstUIMessages.CSS_EMPTY_STYLE_CLASS_MESSAGE, null);
+
+ styleAttributes = new StyleAttributes();
+ this.callFromWizard = callFromWizard;
+ this.selection = selection;
+ init();
+ }
+
+ /**
+ * Initialize method.
+ */
+ private void init() {
+ if (selection != null && !selection.isEmpty()) {
+ for (Iterator<?> iterator = selection.iterator(); iterator.hasNext();) {
+ Object element = iterator.next();
+ if (element instanceof IResource) {
+ if (element instanceof IFile) {
+ if (((IFile) element).getName().toLowerCase().endsWith(Util.CSS_FILE_EXTENTION)) {
+ currentFile = (IFile)element;
+ }
+ }
+ }
+ }
+ }
+ // if any CSS file is currently opened and has active page status this method should return style class
+ // within this file where cursor is located
+ if (currentFile == null) {
+ currentFile = Util.getActiveCssFile();
+ }
+ currentClassStyle = Util.getActivePageCSSSelectorIfAny();
+ }
+
+ /**
+ * Sets current style class value.
+ *
+ * @param currentClassStyle String value
+ */
+ public void setCurrentStyleClass(String currentClassStyle) {
+ this.currentClassStyle = Util.formatStyleClassToCSSView(currentClassStyle);
+ }
+
+ /**
+ * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite)
+ */
+ @Override
+ protected Control createDialogArea(final Composite parent) {
+ final Composite composite = (Composite) super.createDialogArea(parent);
+ if(composite.getLayoutData()!=null && composite.getLayoutData() instanceof GridData) {
+ ((GridData)composite.getLayoutData()).widthHint=500;
+ ((GridData)composite.getLayoutData()).heightHint=500;
+ }
+ final Control control = createDialogComposite(composite);
+ return control;
+ }
+
+ public Control createDialog(final Composite parent) {
+ return createDialogArea(parent);
+ }
+
+ /**
+ * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(Composite)
+ */
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ super.createButtonsForButtonBar(parent);
+ updateOKButtonState();
+
+ }
+ private Split split;
+ /**
+ * Create the dialog itself.
+ *
+ * @param composite parent window
+ * @return eclipse Control object
+ */
+ private Control createDialogComposite(Composite composite) {
+ if (!this.callFromWizard) {
+ setTitle(JstUIMessages.CSS_STYLE_CLASS_EDITOR_TITLE);
+ setMessage(JstUIMessages.CSS_STYLE_CLASS_EDITOR_DESCRIPTION);
+ }
+ composite.setLayout(new GridLayout());
+
+ // ===============================================================================
+ // Create split component that separates dialog on 2 parts
+ // ===============================================================================
+ split = new Split(composite, SWT.VERTICAL);
+
+ // ===============================================================================
+ // Create browser container
+ // ===============================================================================
+ browserContainer = getCompositeElement(split);
+ // create browser component
+ createBrowserComponent();
+
+ // ===============================================================================
+ // Create down splitter container
+ // ===============================================================================
+ Composite downSplitPane = getCompositeElement(split);
+
+ Composite classComposite = new Composite(downSplitPane, SWT.BORDER);
+ classComposite.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
+ classComposite.setLayout(new GridLayout(3, false));
+
+ // ===============================================================================
+ // Create component that contains CSS file pass and it's selectors (style classes combo box)
+ // ===============================================================================
+ createCSSFilePathComponent(classComposite);
+ createStyleClassCombo(classComposite);
+
+ // ===============================================================================
+ // Create style composite component
+ // ===============================================================================
+ styleComposite = new StyleComposite(downSplitPane, styleAttributes, Constants.EMPTY);
+ styleComposite.addManualChangeStyleListener(new ManualChangeStyleListener() {
+ public void styleChanged(ChangeStyleEvent event) {
+ styleChanged = true;
+ if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)
+ && currentFile != null && !currentFile.equals(Constants.EMPTY)) {
+ applyButton.setEnabled(true);
+ }
+ }
+ });
+
+ // ===============================================================================
+ // Create custom button panel
+ // ===============================================================================
+ createCustomButtonPanel(downSplitPane);
+
+ styleAttributes.addChangeStyleListener(new ChangeStyleListener() {
+ public void styleChanged(ChangeStyleEvent event) {
+ if (!browser.isDisposed()) {
+ browser.setText(getTextForBrowser());
+ }
+ }
+ });
+
+ if (currentFile != null) {
+ initCSSModel(currentFile, true, true);
+ } else if (currentClassStyle != null) {
+ classCombo.setText(currentClassStyle);
+ styleAttributes.setCssSelector(currentClassStyle);
+ }
+
+ // add content assist to style COMBO component
+ SimpleContentProposalProvider proposalProvider = new SimpleContentProposalProvider(classCombo.getItems());
+ proposalProvider.setFiltering(true);
+ contentAssistAdapter = new ContentAssistCommandAdapter(
+ classCombo, new ComboContentAdapter(), proposalProvider, null, null, true);
+ contentAssistAdapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
+ contentAssistAdapter.addContentProposalListener(new IContentProposalListener() {
+ public void proposalAccepted(IContentProposal proposal) {
+ cssStyleClassChanged();
+ applyButton.setEnabled(false);
+ keyInputSelector = false;
+ }
+ });
+
+ split.setWeights(new int[]{15, 85});
+ split.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, true));
+
+ return composite;
+ }
+
+ private void createCSSFilePathComponent(Composite parent) {
+ Label label = new Label(parent, SWT.LEFT);
+ label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
+ label.setText(JstUIMessages.CSS_CLASS_DIALOG_FILE_LABEL);
+
+ // Text field contains path to the CSS file
+ text = new Text(parent, SWT.BORDER);
+ text.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+ text.setEditable(false);
+ text.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ String cssFile = text.getText().trim();
+ // Initialize a variable with the no error status
+ filePathStatus = new Status(IStatus.ERROR, notUsed, 0, JstUIMessages.CSS_EMPTY_FILE_PATH_MESSAGE, null);
+ if (cssFile != null && !cssFile.equals(Constants.EMPTY)) {
+ filePathStatus = new Status(IStatus.OK, notUsed, 0, JstUIMessages.CSS_STYLE_CLASS_EDITOR_DESCRIPTION, null);
+ }
+ // show corresponding message
+ IStatus status = findMostSevere();
+ notifyListeners(text, status);
+ applyToStatusLine(status);
+ }
+ });
+
+ Button button = new Button(parent, SWT.PUSH);
+ button.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
+
+ ImageDescriptor imageDesc = JspEditorPlugin.getImageDescriptor(Constants.IMAGE_FOLDERLARGE_FILE_LOCATION);
+ Image image = imageDesc.createImage();
+ button.setImage(image);
+ button.setToolTipText(JstUIMessages.CSS_BROWSE_BUTTON_TOOLTIP);
+ button.addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ Button button = (Button) e.getSource();
+ button.getImage().dispose();
+ }
+ });
+ button.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent event) {
+// IResource project = Util.getCurrentProject();
+ IResource project = ResourcesPlugin.getWorkspace().getRoot();
+
+ ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(),
+ new WorkbenchLabelProvider(), new BaseWorkbenchContentProvider());
+ dialog.addFilter(new FileExtensionFilter(fileExtensions));
+ dialog.setTitle(JstUIMessages.CSS_FILE_SELECT_DIALOG_TITLE);
+ dialog.setMessage(JstUIMessages.CSS_FILE_SELECT_DIALOG_LABEL);
+ dialog.setInput(project);
+ dialog.setAllowMultiple(false);
+ dialog.setDoubleClickSelects(false);
+ if (currentFile != null) {
+ dialog.setInitialSelection(currentFile);
+ }
+ dialog.setEmptyListMessage(JstUIMessages.CSS_FILE_SELECT_DIALOG_EMPTY_MESSAGE);
+
+ if (dialog.open() == Window.OK) {
+ IResource res = (IResource) dialog.getFirstResult();
+ // make some important saving actions
+ if (res instanceof IFile) {
+ if (styleChanged && currentFile != null) {
+ MessageBox messageBox = new MessageBox(getParentShell(), SWT.YES | SWT.NO | SWT.ICON_QUESTION);
+ messageBox.setText(JstUIMessages.CSS_SAVE_DIALOG_TITLE);
+ messageBox.setMessage("'" + currentFile + "' " + JstUIMessages.CSS_SAVE_DIALOG_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
+ int result = messageBox.open();
+ if (result == SWT.YES) {
+ saveChanges(true);
+ } else {
+ styleComposite.closePreview(false);
+ updateStyleComposite();
+ }
+ }
+ styleComposite.revertPreview();
+
+ // open new CSS file and initialize dialog
+ boolean useRelativePath = true;
+ if (project instanceof IWorkspaceRoot) {
+ useRelativePath = false;
+ }
+ boolean updateCSSModel = false;
+ if (currentFile != null && !currentFile.equals(Constants.EMPTY)) {
+ currentClassStyle = null;
+ updateCSSModel = true;
+ }
+ currentFile = (IFile)res;
+ initCSSModel(currentFile, useRelativePath, updateCSSModel);
+ updateOKButtonState();
+ applyButton.setEnabled(false);
+ styleChanged = false;
+
+ // update content assist proposals
+ SimpleContentProposalProvider proposalProvider =
+ (SimpleContentProposalProvider)contentAssistAdapter.getContentProposalProvider();
+ proposalProvider.setProposals(classCombo.getItems());
+ }
+ }
+ }
+ });
+ }
+
+ /**
+ * This method is used to create and initialize style class comboBox component.
+ *
+ * @param parent Composite component
+ */
+ private void createStyleClassCombo(Composite parent) {
+ Label label = new Label(parent, SWT.LEFT);
+ label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
+ label.setText(JstUIMessages.CSS_CLASS_DIALOG_STYLE_CLASS_LABEL);
+
+ GridData gridData = new GridData(GridData.FILL, GridData.CENTER, true, false);
+ gridData.horizontalSpan = 2;
+
+ classCombo = new Combo(parent, SWT.BORDER);
+ classCombo.setLayoutData(gridData);
+ classCombo.setEnabled(false);
+ // add selection listener
+ classCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ if (keyInputSelector) {
+ keyInputSelector = false;
+ if (currentClassStyle != null && classCombo.indexOf(currentClassStyle) != -1) {
+ return;
+ }
+ }
+ keyInputSelector = false;
+ }
+ });
+ // add key modified listener
+ classCombo.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent e) {
+ keyInputSelector = true;
+ }
+ });
+ // this listener is responsible for processing dialog header message events
+ classCombo.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ String cssClass = classCombo.getText().trim();
+ // Initialize a variable with the no error status
+ classNameStatus = new Status(IStatus.ERROR, notUsed, 0, JstUIMessages.CSS_EMPTY_STYLE_CLASS_MESSAGE, null);
+ if (cssClass != null && !cssClass.equals(Constants.EMPTY)) {
+ classNameStatus = new Status(IStatus.OK, notUsed, 0, JstUIMessages.CSS_STYLE_CLASS_EDITOR_DESCRIPTION, null);
+ }
+ // show corresponding message
+ IStatus status = findMostSevere();
+ notifyListeners(classCombo, status);
+ applyToStatusLine(status);
+ // update CSS style cmposite if needed
+ if ((currentClassStyle != null && currentClassStyle.equals(classCombo.getText().trim()))
+ || (currentClassStyle == null && classCombo.getText().trim().equals(Constants.EMPTY))) {
+ return;
+ }
+ notifyStyleClassChanged();
+ applyButton.setEnabled(false);
+ }
+ });
+ }
+
+ /**
+ * This method is invoked to correctly process class style combo modify event.
+ */
+ private void notifyStyleClassChanged() {
+ Display display = null;
+ if (PlatformUI.isWorkbenchRunning()) {
+ display = PlatformUI.getWorkbench().getDisplay();
+ }
+ if (display != null && (Thread.currentThread() == display.getThread())) {
+ if (uiJob == null) {
+ uiJob = new UIJob(jobName) {
+ @Override
+ public IStatus runInUIThread(IProgressMonitor monitor) {
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ monitor.beginTask(jobName, IProgressMonitor.UNKNOWN);
+
+ // start operation
+ cssStyleClassChanged();
+ // end operation
+
+ monitor.done();
+
+ return Status.OK_STATUS;
+ }
+ };
+ }
+
+ uiJob.setPriority(Job.SHORT);
+ uiJob.schedule(delay);
+
+ return;
+ }
+ }
+
+ /**
+ * This method is used to create custom button panel.
+ *
+ * @param parent Composite component
+ */
+ private void createCustomButtonPanel(Composite parent) {
+ Composite buttonComposite = new Composite(parent, SWT.NONE);
+ buttonComposite.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, true, false));
+ buttonComposite.setLayout(new GridLayout());
+ // add APPLY button
+ applyButton = createCustomButton(buttonComposite, JstUIMessages.BUTTON_APPLY);
+ applyButton.setEnabled(false);
+ applyButton.setToolTipText(JstUIMessages.CSS_APPLY_CHANGES);
+ applyButton.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent event) {
+ if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) {
+ // update ComboBox element list
+ if (classCombo.indexOf(currentClassStyle) == -1) {
+ classCombo.add(currentClassStyle);
+ }
+ saveChanges(false);
+ applyButton.setEnabled(false);
+ styleChanged = false;
+ }
+ }
+ });
+ // add CLEAR button
+ Button clearButton = createCustomButton(buttonComposite, JstUIMessages.BUTTON_CLEAR);
+ clearButton.setToolTipText(JstUIMessages.CSS_CLEAR_STYLE_SHEET);
+ clearButton.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent event) {
+ styleComposite.clearStyleComposite(currentClassStyle);
+ styleComposite.updatePreview(currentClassStyle);
+ styleComposite.updateStyle();
+ applyButton.setEnabled(true);
+ styleChanged = true;
+ }
+ });
+ }
+
+ /**
+ * This method is used to create custom button.
+ *
+ * @param parent Composite component
+ * @param label Button label value
+ */
+ protected Button createCustomButton(Composite parent, String label) {
+ // increment the number of columns in the button bar
+ ((GridLayout) parent.getLayout()).numColumns++;
+ Button button = new Button(parent, SWT.PUSH);
+ button.setText(label);
+// setButtonLayoutData(button);
+ return button;
+ }
+
+ /**
+ * Method is used to correctly process style class change operation.
+ */
+ private void cssStyleClassChanged() {
+ if (currentFile != null && !currentFile.equals(Constants.EMPTY)) {
+ if (styleChanged && currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) {
+ MessageBox messageBox = new MessageBox(getParentShell(), SWT.YES | SWT.NO | SWT.ICON_QUESTION);
+ messageBox.setText(JstUIMessages.CSS_SAVE_DIALOG_TITLE);
+ messageBox.setMessage("'" + currentFile + "' " + JstUIMessages.CSS_SAVE_DIALOG_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
+ int result = messageBox.open();
+ if (result == SWT.YES) {
+ // update ComboBox element list
+ if (classCombo.indexOf(currentClassStyle) == -1) {
+ classCombo.add(currentClassStyle);
+ }
+ saveChanges(false);
+ // update content assist proposals
+ SimpleContentProposalProvider proposalProvider =
+ (SimpleContentProposalProvider)contentAssistAdapter.getContentProposalProvider();
+ proposalProvider.setProposals(classCombo.getItems());
+ } else {
+ cssModel.init(currentFile);
+ }
+ }
+ // update current class style value
+ currentClassStyle = classCombo.getText().trim();
+ styleComposite.revertPreview();
+ updateStyleComposite();
+ styleAttributes.setCssSelector(currentClassStyle);
+ styleComposite.updatePreview(currentClassStyle);
+ updateOKButtonState();
+ } else {
+ currentClassStyle = classCombo.getText().trim();
+ styleAttributes.setCssSelector(currentClassStyle);
+ }
+ styleChanged = false;
+ }
+
+ /**
+ * Initialize CSS model with active opened CSS file.
+ *
+ * @param file IFile object
+ * @param useRelativePathPath
+ */
+ private void initCSSModel(IFile file, boolean useRelativePathPath, boolean updateCSSModel) {
+ if (file != null) {
+ // create CSS Model
+ cssModel = new CSSModel(file);
+ classCombo.setEnabled(true);
+ classCombo.removeAll();
+ // set file path to corresponding text field
+ if (useRelativePathPath) {
+ text.setText(file.getProjectRelativePath().toOSString());
+ } else {
+ text.setText(file.getFullPath().toOSString());
+ }
+ // fill in ComboBox component with CSS model selectors
+// List<Selector> selectors = cssModel.getSelectors();
+ List<String> selectors = cssModel.getSelectorLabels();
+ int selectedIndex = -1;
+ for (int i = 0; i < selectors.size(); i++) {
+// Selector value = selectors.get(i);
+ String label = selectors.get(i);
+ classCombo.add(/*value.getValue()*/ label);
+ if (currentClassStyle != null && currentClassStyle.equals(/*value.getValue()*/label)) {
+ selectedIndex = i;
+ }
+ }
+ if (currentClassStyle != null && selectedIndex == -1) {
+ classCombo.setText(currentClassStyle);
+ } else {
+ classCombo.select(selectedIndex);
+ }
+ classCombo.setToolTipText(cssModel.getCSSText(currentClassStyle));
+
+ styleComposite.setShowPreviewTab(true);
+ styleComposite.setCSSModel(cssModel);
+ // update style composite component with the values from new CSS file
+ if (updateCSSModel) {
+ updateStyleComposite();
+ }
+ styleComposite.initPreview(cssModel);
+ }
+ }
+
+ /**
+ * This method takes affect to OK button when dialog is opened in "dialog" mode and not in "wizard".
+ * In case of "wizard" mode OK button is not available.
+ */
+ private void updateOKButtonState() {
+ Button okButton = getButton(IDialogConstants.OK_ID);
+ if (okButton != null) {
+ if (currentClassStyle == null || currentClassStyle.equals(Constants.EMPTY) || currentFile == null) {
+ okButton.setEnabled(false);
+ } else {
+ okButton.setEnabled(true);
+ }
+ }
+ }
+
+ /**
+ * Method is used to create browser component to display preview HTML.
+ */
+ private void createBrowserComponent() {
+ GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
+ browser = new Browser(browserContainer, SWT.BORDER | SWT.MOZILLA);
+ browser.setText(getTextForBrowser());
+ browser.addMouseListener(new MouseAdapter() {
+ public void mouseDoubleClick(MouseEvent e) {
+ if (e.widget == browser) {
+ browser.removeMouseListener(this);
+ browser.dispose();
+ // create Text area component instead of HTML Browser
+ GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
+// textBrowser = new Text(browserContainer, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
+ textBrowser = new Text(browserContainer, SWT.NONE | SWT.H_SCROLL);
+ textBrowser.setText(previewBrowserValue);
+ textBrowser.addFocusListener(new FocusAdapter() {
+ public void focusLost(FocusEvent e) {
+ if (e.widget == textBrowser) {
+ String text = textBrowser.getText();
+ if (text == null || text.equals(Constants.EMPTY)) {
+ previewBrowserValue = JstUIMessages.DEFAULT_TEXT_FOR_BROWSER_PREVIEW;
+ } else {
+ previewBrowserValue = text;
+ }
+ textBrowser.dispose();
+ // create Browse component instead of text area
+ createBrowserComponent();
+ }
+ browserContainer.layout();
+ }
+ });
+ textBrowser.setLayoutData(gridData);
+ textBrowser.setEditable(true);
+ textBrowser.setFocus();
+ }
+ browserContainer.layout();
+ }
+ });
+ browser.setLayoutData(gridData);
+ }
+
+ /**
+ * Update style composite component in accordance with the attributes of selected CSS selector.
+ */
+ private void updateStyleComposite() {
+ String style = cssModel.getStyle(currentClassStyle);
+ styleComposite.recreateStyleComposite(style, currentClassStyle);
+ }
+
+ /**
+ * Method is used to build html body that is appropriate to browse.
+ *
+ * @return String html text representation
+ */
+ private String getTextForBrowser() {
+ String styleForSpan = Constants.EMPTY;
+ Set<String> keySet = styleAttributes.keySet();
+ for (String key : keySet) {
+ styleForSpan += (key + Constants.COLON + styleAttributes.getAttribute(key) + Constants.SEMICOLON);
+ }
+ String html = Constants.OPEN_DIV_TAG + styleForSpan + "\">" + previewBrowserValue + Constants.CLOSE_DIV_TAG; //$NON-NLS-1$
+
+ return html;
+ }
+
+ /**
+ * Create container that take up 2 cells and contains fontSizeCombo and extFontSizeCombo elements.
+ */
+ private Composite getCompositeElement(Composite parent) {
+ GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
+ GridLayout gridLayoutTmp = new GridLayout();
+ gridLayoutTmp.marginHeight = 0;
+ gridLayoutTmp.marginWidth = 0;
+ Composite classComposite = new Composite(parent, SWT.FILL);
+ classComposite.setLayout(gridLayoutTmp);
+ classComposite.setLayoutData(gridData);
+
+ return classComposite;
+ }
+
+ /**
+ * Method should be called in case of dialog closure operation.
+ */
+ public void saveChanges(boolean close) {
+ styleComposite.updateStyle();
+ cssModel.setCSS(currentClassStyle, styleAttributes);
+ cssModel.saveModel();
+ if (close) {
+ styleComposite.closePreview(true);
+ }
+ }
+
+ /**
+ * Gets current selected style class value.
+ *
+ * @return selector name
+ */
+ public String getSelectorName() {
+ return Util.formatCSSSelectorToStyleClassView(currentClassStyle);
+ }
+
+ /**
+ * Method for setting title for dialog
+ *
+ * @param newShell Shell object
+ * @see org.eclipse.jface.window.Window#configureShell(Shell)
+ */
+ @Override
+ protected void configureShell(Shell newShell) {
+ super.configureShell(newShell);
+ newShell.setText(JstUIMessages.CSS_STYLE_CLASS_EDITOR_TITLE);
+ }
+
+ /**
+ * This method close the dialog.
+ *
+ * @return true if dialog was closed, false - otherwise
+ */
+ public boolean closeDialog() {
+ setReturnCode(Window.CANCEL);
+ return close();
+ }
+
+ /**
+ * @see org.eclipse.jface.dialogs.Dialog#close()
+ */
+ @Override
+ public boolean close() {
+ int code = getReturnCode();
+ switch (code) {
+ case OK:
+ if (styleChanged || classCombo.indexOf(currentClassStyle) == -1) {
+ saveChanges(true);
+ } else {
+ styleComposite.closePreview(true);
+ }
+ break;
+ case CANCEL:
+ default:
+ // make some closure operation
+ styleComposite.closePreview(false);
+ }
+ return super.close();
+ }
+
+ /**
+ * Add MessageDialogListener object.
+ *
+ * @param listener MessageDialogListener object to be added
+ */
+ public void addMessageDialogListener(MessageDialogListener listener) {
+ errorListeners.add(listener);
+ }
+
+ /**
+ * Method is used to notify all subscribed listeners about possible any errors on the page.
+ */
+ private void notifyListeners(Object source, IStatus operationStatus) {
+ MessageDialogEvent event = new MessageDialogEvent(source, operationStatus);
+ for (MessageDialogListener listener : errorListeners) {
+ listener.throwMessage(event);
+ }
+ }
+
+ /**
+ * Method return the most serious error occurs on the page and that should be displayed.
+ *
+ * @return IStatus object
+ */
+ private IStatus findMostSevere() {
+ if (filePathStatus.matches(IStatus.ERROR)) {
+ return filePathStatus;
+ }
+ if (classNameStatus.matches(IStatus.ERROR)) {
+ return classNameStatus;
+ }
+ if (filePathStatus.getSeverity() > classNameStatus.getSeverity()) {
+ return filePathStatus;
+ }
+ else return classNameStatus;
+ }
+
+ /**
+ * Applies the status to the status line of a dialog page.
+ */
+ private void applyToStatusLine(IStatus status) {
+ if (!callFromWizard) {
+ String message= status.getMessage();
+ if (message.length() == 0) {
+ message = null;
+ }
+ switch (status.getSeverity()) {
+ case IStatus.OK:
+ setErrorMessage(null);
+ setMessage(message);
+ break;
+ case IStatus.WARNING:
+ setErrorMessage(null);
+ setMessage(message, WizardPage.WARNING);
+ break;
+ case IStatus.INFO:
+ setErrorMessage(null);
+ setMessage(message, WizardPage.INFORMATION);
+ break;
+ default:
+ setErrorMessage(message);
+ setMessage(null);
+ break;
+ }
+ }
+ }
+
+}
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-12 06:59:15 UTC (rev 12985)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-01-12 09:54:02 UTC (rev 12986)
@@ -1,247 +1,353 @@
-/*******************************************************************************
- * 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.common;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-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;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-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.IndexedRegion;
-import org.jboss.tools.jst.jsp.JspEditorPlugin;
-import org.jboss.tools.jst.jsp.outline.cssdialog.events.StyleAttributes;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleRule;
-import org.w3c.dom.css.CSSStyleSheet;
-
-/**
- * CSS class model.
- */
-public class CSSModel {
-
- private static String startBraces = "{"; //$NON-NLS-1$
- private static String endBraces = "}"; //$NON-NLS-1$
-
- private FormatProcessorCSS formatProcessorCSS = null;
- private IStructuredModel model = null;
- private IFile styleFile = null;
-
- private CSSStyleSheet styleSheet = null;
- private ICSSStyleSheet eclipseStyleSheet = null;
-
- /**
- * Constructor.
- *
- * @param styleFile CSS style class that should initialize CSS model
- */
- public CSSModel(IFile styleFile) {
- init(styleFile);
- }
-
- public void init(IFile styleFile) {
- try {
- this.styleFile = styleFile;
- if (model != null) {
- releaseModel();
- }
- formatProcessorCSS = new FormatProcessorCSS();
- IModelManager modelManager = StructuredModelManager.getModelManager();
- model = modelManager.getModelForEdit(styleFile);
- if (model instanceof ICSSModel) {
- ICSSModel cssModel = (ICSSModel) model;
- ICSSDocument document = cssModel.getDocument();
- if (document instanceof CSSStyleSheet) {
- styleSheet = (CSSStyleSheet) document;
- }
- if (document instanceof ICSSStyleSheet) {
- eclipseStyleSheet = (ICSSStyleSheet) document;
- }
- }
- } catch (IOException e) {
- JspEditorPlugin.getPluginLog().logError(e.getMessage());
- } catch (CoreException e) {
- JspEditorPlugin.getPluginLog().logError(e.getMessage());
- }
- }
-
- /**
- * 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 IndexedRegion getSelectorRegion(String selector, int index) {
- if (eclipseStyleSheet != null) {
- if (selector != null && !selector.equals(Constants.EMPTY)) {
- ICSSStyleRule styleRule = Util.getSelector(eclipseStyleSheet, selector, index);
- if (styleRule != null) {
- if (styleRule instanceof IndexedRegion) {
- return (IndexedRegion) styleRule;
- }
- }
- }
- }
- return null;
- }
-
- /**
- * Get selectors
- *
- * @return List<String>
- */
- public List<Selector> getSelectors() {
- List<Selector> selectors = new ArrayList<Selector>();
-
- if (styleSheet != null) {
- CSSRuleList list = styleSheet.getCssRules();
-
- if (list != null) {
- for (int i = 0; i < list.getLength(); i++) {
- if (list.item(i) instanceof CSSStyleRule) {
- CSSStyleRule rule = ((CSSStyleRule) list.item(i));
- Selector selector = new Selector(rule.toString(), rule.getSelectorText());
- selectors.add(selector);
- }
- }
- }
- }
-
- return selectors;
- }
-
- /**
- * Gets CSS attributes for the given selector in string representation.
- *
- * @param selector CSS selector value
- * @return CSS attributes string representation
- */
- public String getCSSText(String selector) {
- if (styleSheet != null && selector != null) {
- CSSRuleList list = styleSheet.getCssRules();
-
- if (list != null) {
- for (int i = 0; i < list.getLength(); i++) {
- if (list.item(i) instanceof CSSStyleRule &&
- ((CSSStyleRule) list.item(i)).getSelectorText().equals(selector)) {
- return ((CSSStyleRule) list.item(i)).getCssText();
- }
- }
- }
- }
-
- return null;
- }
-
- /**
- * Get style by selectorName
- *
- * @param selectorName
- * @return style
- */
- public String getStyle(String selectorName) {
- if (styleSheet != null) {
- CSSRuleList list = styleSheet.getCssRules();
-
- if (list != null) {
- for (int i = 0; i < list.getLength(); i++) {
- if (list.item(i) instanceof CSSStyleRule &&
- ((CSSStyleRule) list.item(i)).getSelectorText().equals(selectorName)) {
- return ((CSSStyleRule) list.item(i)).getStyle().getCssText();
- }
- }
- }
- }
-
- return null;
- }
-
- /**
- * Sets CSS style for the given selector.
- *
- * @param selector CSS selector value
- * @param styleAttribute the style to be set
- */
- public void setCSS(String selector, StyleAttributes styleAttributes) {
- if (styleSheet != null && selector != null && !selector.equals(Constants.EMPTY)) {
- CSSRuleList list = styleSheet.getCssRules();
-
- if (list != null) {
- // check if selector passed by parameter already exists in CSS
- for (int i = 0; i < list.getLength(); i++) {
- if (list.item(i) instanceof CSSStyleRule &&
- ((CSSStyleRule) list.item(i)).getSelectorText().equals(selector)) {
-
- CSSStyleRule rule = (CSSStyleRule) list.item(i);
- styleSheet.deleteRule(i);
-
- i = styleSheet.insertRule(selector + startBraces + styleAttributes.getStyle() + endBraces, i);
- rule = (CSSStyleRule) list.item(i);
- CSSStyleDeclaration declaration = rule.getStyle();
- // set properties
- Set<Entry<String, String>> set = styleAttributes.entrySet();
- for (Map.Entry<String, String> me : set) {
- declaration.setProperty(me.getKey(), me.getValue(), Constants.EMPTY);
- }
-
- formatProcessorCSS.formatModel(model);
- return;
- }
- }
- // insert NEW selector to style sheet
- styleSheet.insertRule(selector + startBraces + styleAttributes.getStyle() + endBraces, list.getLength());
- formatProcessorCSS.formatModel(model);
- }
- }
- }
-
- /**
- * Gets file associated with current model.
- *
- * @return the styleFile
- */
- public IFile getStyleFile() {
- return this.styleFile;
- }
-
- /**
- * Release CSS model correctly from editing.
- */
- public void releaseModel() {
- model.releaseFromEdit();
- }
-
- /**
- * Save model. Associate file will be saved automatically.
- */
- public void saveModel() {
- try {
- model.save();
- } catch (IOException e) {
- JspEditorPlugin.getPluginLog().logError(e.getMessage());
- } catch (CoreException e) {
- JspEditorPlugin.getPluginLog().logError(e.getMessage());
- }
- }
-}
+/*******************************************************************************
+ * 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.common;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+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;
+import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+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.IndexedRegion;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
+import org.jboss.tools.jst.jsp.outline.cssdialog.events.StyleAttributes;
+import org.w3c.dom.css.CSSRuleList;
+import org.w3c.dom.css.CSSStyleDeclaration;
+import org.w3c.dom.css.CSSStyleRule;
+import org.w3c.dom.css.CSSStyleSheet;
+
+/**
+ * CSS class model.
+ *
+ *
+ */
+public class CSSModel {
+
+ private static String startBraces = "{"; //$NON-NLS-1$
+ private static String endBraces = "}"; //$NON-NLS-1$
+
+ private FormatProcessorCSS formatProcessorCSS = null;
+ private IStructuredModel model = null;
+ private IFile styleFile = null;
+
+ private CSSStyleSheet styleSheet = null;
+ private ICSSStyleSheet eclipseStyleSheet = null;
+
+
+
+ /**
+ * Constructor.
+ *
+ * @param styleFile CSS style class that should initialize CSS model
+ */
+ public CSSModel(IFile styleFile) {
+ init(styleFile);
+ }
+
+ public void init(IFile styleFile) {
+ try {
+ this.styleFile = styleFile;
+ if (model != null) {
+ releaseModel();
+ }
+ formatProcessorCSS = new FormatProcessorCSS();
+ IModelManager modelManager = StructuredModelManager.getModelManager();
+ model = modelManager.getModelForEdit(styleFile);
+ if (model instanceof ICSSModel) {
+ ICSSModel cssModel = (ICSSModel) model;
+ ICSSDocument document = cssModel.getDocument();
+ if (document instanceof CSSStyleSheet) {
+ styleSheet = (CSSStyleSheet) document;
+ }
+ if (document instanceof ICSSStyleSheet) {
+ eclipseStyleSheet = (ICSSStyleSheet) document;
+ }
+
+
+ }
+ } catch (IOException e) {
+ JspEditorPlugin.getPluginLog().logError(e.getMessage());
+ } catch (CoreException e) {
+ JspEditorPlugin.getPluginLog().logError(e.getMessage());
+ }
+ }
+
+ /**
+ * 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 IndexedRegion getSelectorRegion(String selector, int index) {
+ //FIXED by sdzmitrovich - JBIDE-3148
+// if (eclipseStyleSheet != null) {
+// if (selector != null && !selector.equals(Constants.EMPTY)) {
+// ICSSStyleRule styleRule = Util.getSelector(eclipseStyleSheet, selector, index);
+// if (styleRule != null) {
+// if (styleRule instanceof IndexedRegion) {
+// return (IndexedRegion) styleRule;
+// }
+// }
+// }
+// }
+
+ if ( selector != null) {
+ CSSStyleRule rule = getRulesMapping().get(selector);
+ if (rule != null)
+ if (rule instanceof IndexedRegion) {
+ return (IndexedRegion) rule;
+ }
+
+ }
+ return null;
+ }
+
+
+ public List<String> getSelectorLabels() {
+
+ List<String> selectorLabels;
+
+ selectorLabels = new ArrayList<String>(getRulesMapping().keySet());
+
+ Collections.sort(selectorLabels);
+
+ return selectorLabels;
+ }
+
+ /**
+ * Get selectors
+ *
+ * @return List<String>
+ */
+ public List<Selector> getSelectors() {
+ List<Selector> selectors = new ArrayList<Selector>();
+
+ if (styleSheet != null) {
+ CSSRuleList list = styleSheet.getCssRules();
+
+ if (list != null) {
+ for (int i = 0; i < list.getLength(); i++) {
+ if (list.item(i) instanceof CSSStyleRule) {
+ CSSStyleRule rule = ((CSSStyleRule) list.item(i));
+ Selector selector = new Selector(rule.toString(), rule.getSelectorText());
+ selectors.add(selector);
+ }
+ }
+ }
+ }
+
+ return selectors;
+ }
+
+
+
+ /**
+ * Gets CSS attributes for the given selector in string representation.
+ *
+ * @param selector CSS selector value
+ * @return CSS attributes string representation
+ */
+ public String getCSSText(String selector) {
+ //FIXED by sdzmitrovich - JBIDE-3148
+// if (styleSheet != null && selector != null) {
+// CSSRuleList list = styleSheet.getCssRules();
+//
+// if (list != null) {
+// for (int i = 0; i < list.getLength(); i++) {
+// if (list.item(i) instanceof CSSStyleRule &&
+// ((CSSStyleRule) list.item(i)).getSelectorText().equals(selector)) {
+// return ((CSSStyleRule) list.item(i)).getCssText();
+// }
+// }
+// }
+// }
+ if ( selector != null) {
+ CSSStyleRule rule = getRulesMapping().get(selector);
+ if (rule != null)
+ return rule.getCssText();
+
+ }
+
+ return null;
+ }
+
+ /**
+ * Get style by selectorName
+ *
+ * @param selectorName
+ * @return style
+ */
+ public String getStyle(String selectorName) {
+ //FIXED by sdzmitrovich - JBIDE-3148
+// if (styleSheet != null) {
+// CSSRuleList list = styleSheet.getCssRules();
+//
+// if (list != null) {
+// for (int i = 0; i < list.getLength(); i++) {
+// if (list.item(i) instanceof CSSStyleRule &&
+// ((CSSStyleRule) list.item(i)).getSelectorText().equals(selectorName)) {
+// return ((CSSStyleRule) list.item(i)).getStyle().getCssText();
+// }
+// }
+// }
+// }
+ if (selectorName != null) {
+ CSSStyleRule rule = getRulesMapping().get(selectorName);
+ if (rule != null)
+ return rule.getStyle().getCssText();
+
+ }
+
+ return null;
+ }
+
+ /**
+ * Sets CSS style for the given selector.
+ *
+ * @param selector CSS selector value
+ * @param styleAttribute the style to be set
+ */
+ public void setCSS(String selector, StyleAttributes styleAttributes) {
+ if (styleSheet != null && selector != null && !selector.equals(Constants.EMPTY)) {
+ CSSRuleList list = styleSheet.getCssRules();
+ //FIXED by sdzmitrovich - JBIDE-3148
+// if (list != null) {
+// // check if selector passed by parameter already exists in CSS
+// for (int i = 0; i < list.getLength(); i++) {
+// if (list.item(i) instanceof CSSStyleRule &&
+// ((CSSStyleRule) list.item(i)).getSelectorText().equals(selector)) {
+//
+// CSSStyleRule rule = (CSSStyleRule) list.item(i);
+// styleSheet.deleteRule(i);
+//
+// i = styleSheet.insertRule(selector + startBraces + styleAttributes.getStyle() + endBraces, i);
+// rule = (CSSStyleRule) list.item(i);
+// CSSStyleDeclaration declaration = rule.getStyle();
+// // set properties
+// Set<Entry<String, String>> set = styleAttributes.entrySet();
+// for (Map.Entry<String, String> me : set) {
+// declaration.setProperty(me.getKey(), me.getValue(), Constants.EMPTY);
+// }
+//
+// formatProcessorCSS.formatModel(model);
+// return;
+// }
+// }
+// // insert NEW selector to style sheet
+// styleSheet.insertRule(selector + startBraces + styleAttributes.getStyle() + endBraces, list.getLength());
+// formatProcessorCSS.formatModel(model);
+ CSSStyleRule rule = getRulesMapping().get(selector);
+ if (rule == null) {
+ styleSheet.insertRule(selector + startBraces
+ + styleAttributes.getStyle() + endBraces, list
+ .getLength());
+ } else {
+
+ CSSStyleDeclaration declaration = rule.getStyle();
+ // set properties
+ Set<Entry<String, String>> set = styleAttributes.entrySet();
+ for (Map.Entry<String, String> me : set) {
+ declaration.setProperty(me.getKey(), me.getValue(),
+ Constants.EMPTY);
+ }
+ }
+
+ formatProcessorCSS.formatModel(model);
+
+ }
+ }
+
+ /**
+ * Gets file associated with current model.
+ *
+ * @return the styleFile
+ */
+ public IFile getStyleFile() {
+ return this.styleFile;
+ }
+
+ /**
+ * Release CSS model correctly from editing.
+ */
+ public void releaseModel() {
+ model.releaseFromEdit();
+ }
+
+ /**
+ * Save model. Associate file will be saved automatically.
+ */
+ public void saveModel() {
+ try {
+ model.save();
+ } catch (IOException e) {
+ JspEditorPlugin.getPluginLog().logError(e.getMessage());
+ } catch (CoreException e) {
+ JspEditorPlugin.getPluginLog().logError(e.getMessage());
+ }
+ }
+
+ /**
+ * get mapping key is label ( label = class name + sequence number of such
+ * css class ) value is CSSStyleRule
+ *
+ * now rule mapping is generated always ... keeping of ruleMapping is more
+ * right but it demands more complex synchronization data
+ *
+ */
+ private Map<String, CSSStyleRule> getRulesMapping() {
+
+ Map<String, CSSStyleRule> rulesMapping = new HashMap<String, CSSStyleRule>();
+ if (styleSheet != null) {
+ CSSRuleList list = styleSheet.getCssRules();
+
+ Map<String, Integer> frequencyMap = new HashMap<String, Integer>();
+
+ if (list != null) {
+ for (int i = 0; i < list.getLength(); i++) {
+ if (list.item(i) instanceof CSSStyleRule) {
+
+ CSSStyleRule rule = ((CSSStyleRule) list.item(i));
+
+ Integer freq = frequencyMap.get(rule.getSelectorText());
+
+ freq = freq == null ? 1 : freq + 1;
+
+ frequencyMap.put(rule.getSelectorText(), freq);
+
+ String ruleLabel = rule.getSelectorText()
+ + (freq > 1 ? Constants.START_BRACKET + freq
+ + Constants.END_BRACKET
+ : Constants.EMPTY);
+
+ rulesMapping.put(ruleLabel, rule);
+
+ }
+ }
+ }
+
+ }
+
+ return rulesMapping;
+ }
+}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Constants.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Constants.java 2009-01-12 06:59:15 UTC (rev 12985)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Constants.java 2009-01-12 09:54:02 UTC (rev 12986)
@@ -66,7 +66,10 @@
public static String COMMA = ","; //$NON-NLS-1$
public static String DASH = "-"; //$NON-NLS-1$
public static String SLASH = "/"; //$NON-NLS-1$
+ public static final String START_BRACKET = "("; //$NON-NLS-1$
+ public static final String END_BRACKET = ")"; //$NON-NLS-1$
+
public static final RGB RGB_BLACK = new RGB(0,0,0);
public static final RGB RGB_WHITE = new RGB(0xFF, 0xFF, 0xFF);
16 years
- 1
- 0
JBoss Tools SVN: r12985 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-01-12 01:59:15 -0500 (Mon, 12 Jan 2009)
New Revision: 12985
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/ServerContentProvider.java
Log:
JBIDE-3421 - unable to expand fileset fixed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java 2009-01-11 16:52:26 UTC (rev 12984)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java 2009-01-12 06:59:15 UTC (rev 12985)
@@ -38,6 +38,16 @@
public String getLocalizedResourceName() {
return path.toOSString();
}
+
+ public boolean equals(Object o) {
+ return o == null ? false :
+ !(o instanceof PathWrapper) ? false :
+ ((PathWrapper)o).folder.equals(folder) && ((PathWrapper)o).path.equals(path);
+ }
+
+ public int hashCode() {
+ return path.hashCode() + folder.hashCode();
+ }
}
public static class FolderWrapper extends PathWrapper {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/ServerContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/ServerContentProvider.java 2009-01-11 16:52:26 UTC (rev 12984)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/ServerContentProvider.java 2009-01-12 06:59:15 UTC (rev 12985)
@@ -257,6 +257,21 @@
job.schedule();
}
+ protected void updateServerLabel(final IServer server) {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ try {
+ if( viewer != null && !viewer.getControl().isDisposed()) {
+ viewer.update(server, null);
+ ServerDecorator.getDefault().redecorate(server);
+ }
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ });
+ }
+
protected void refreshServer(final IServer server) {
refreshServer(server, false);
}
@@ -315,7 +330,7 @@
IServer server = ServerCore.findServer(servers[i]);
if (server != null ) {
ServerDecorator.animate();
- refreshServer(server);
+ updateServerLabel(server);
}
}
} catch (Exception e) {
16 years
- 1
- 0
JBoss Tools SVN: r12984 - in trunk: seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-01-11 11:52:26 -0500 (Sun, 11 Jan 2009)
New Revision: 12984
Added:
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/interfaceTest.xhtml
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/InterfaceTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/Test.java
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3528 Fixed for Seam EL Resolver
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2009-01-11 13:01:44 UTC (rev 12983)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2009-01-11 16:52:26 UTC (rev 12984)
@@ -954,10 +954,16 @@
public List<MemberInfo> getMethods() {
List<MemberInfo> methods = new ArrayList<MemberInfo>();
for (MethodInfo info : fMethods) {
- if (info.isPublic() && !info.isConstructor()
- && !info.isStatic() && !info.isJavaLangObject()
- && !info.isGetter() && !info.isSetter())
- methods.add(info);
+ try {
+ if (((info.getSourceType()!=null && info.getSourceType().isInterface()) || info.isPublic())
+ && !info.isConstructor()
+ && !info.isStatic() && !info.isJavaLangObject()
+ && !info.isGetter() && !info.isSetter()) {
+ methods.add(info);
+ }
+ } catch (JavaModelException e) {
+ Activator.getPluginLog().logError(e);
+ }
}
return methods;
}
@@ -1067,10 +1073,16 @@
public List<MemberInfo> getProperties() {
List<MemberInfo> properties = new ArrayList<MemberInfo>();
for (MethodInfo info : fMethods) {
- if (info.isPublic() && !info.isConstructor()
- && !info.isStatic() && !info.isJavaLangObject()
- && (info.isGetter() || info.isSetter()))
- properties.add(info);
+ try {
+ if ((info.getSourceType()!=null && info.getSourceType().isInterface()) || (info.isPublic())
+ && !info.isConstructor()
+ && !info.isStatic() && !info.isJavaLangObject()
+ && (info.isGetter() || info.isSetter())) {
+ properties.add(info);
+ }
+ } catch (JavaModelException e) {
+ Activator.getPluginLog().logError(e);
+ }
}
/*
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/interfaceTest.xhtml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/interfaceTest.xhtml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/interfaceTest.xhtml 2009-01-11 16:52:26 UTC (rev 12984)
@@ -0,0 +1,7 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+ <h:outputText value="#{interfaceTest.test.}"/>
+</html>
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/WebContent/interfaceTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/InterfaceTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/InterfaceTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/InterfaceTest.java 2009-01-11 16:52:26 UTC (rev 12984)
@@ -0,0 +1,11 @@
+package demo;
+
+import org.jboss.seam.annotations.Name;
+
+@Name("interfaceTest")
+public class InterfaceTest {
+
+ public Test getTest() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/InterfaceTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/Test.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/Test.java 2009-01-11 16:52:26 UTC (rev 12984)
@@ -0,0 +1,6 @@
+package demo;
+
+public interface Test {
+ String getText();
+ String foo();
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/src/action/demo/Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java 2009-01-11 13:01:44 UTC (rev 12983)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java 2009-01-11 16:52:26 UTC (rev 12984)
@@ -189,7 +189,8 @@
"transition",
"uiComponent",
"userPrincipal",
- "validation"
+ "validation",
+ "interfaceTest"
};
protected Set<String> getJavaStringValidELProposals() {
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTest.java 2009-01-11 13:01:44 UTC (rev 12983)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTest.java 2009-01-11 16:52:26 UTC (rev 12984)
@@ -286,7 +286,8 @@
"transition",
"uiComponent",
"userPrincipal",
- "validation"
+ "validation",
+ "interfaceTest"
};
@@ -419,7 +420,14 @@
return regions;
}
-
+
+ /**
+ * Test for https://jira.jboss.org/jira/browse/JBIDE-3528
+ */
+ public void testInterface() {
+ checkProposals("/WebContent/interfaceTest.xhtml", 359, new String[]{"interfaceTest.test.text"}, false);
+ }
+
public void testSeamELContentAssist() {
openEditor(PAGE_NAME);
16 years
- 1
- 0
JBoss Tools SVN: r12983 - in trunk/seam/plugins/org.jboss.tools.seam.xml: resources/meta and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-01-11 08:01:44 -0500 (Sun, 11 Jan 2009)
New Revision: 12983
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/web-2.1.xsd
Log:
JBIDE-3527
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-01-11 12:29:10 UTC (rev 12982)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-01-11 13:01:44 UTC (rev 12983)
@@ -111,49 +111,87 @@
-
-
<uri
name="http://jboss.com/products/seam/async-2.0.xsd"
uri="schemas/async-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/async-2.1.xsd"
+ uri="schemas/async-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/bpm-2.0.xsd"
uri="schemas/bpm-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/bpm-2.1.xsd"
+ uri="schemas/bpm-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/components-2.0.xsd"
uri="schemas/components-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/components-2.1.xsd"
+ uri="schemas/components-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/core-2.0.xsd"
uri="schemas/core-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/core-2.1.xsd"
+ uri="schemas/core-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/drools-2.0.xsd"
uri="schemas/drools-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/drools-2.1.xsd"
+ uri="schemas/drools-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/framework-2.0.xsd"
uri="schemas/framework-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/framework-2.1.xsd"
+ uri="schemas/framework-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/international-2.0.xsd"
uri="schemas/international-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/international-2.1.xsd"
+ uri="schemas/international-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/jms-2.0.xsd"
uri="schemas/jms-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/jms-2.1.xsd"
+ uri="schemas/jms-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/mail-2.0.xsd"
uri="schemas/mail-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/mail-2.1.xsd"
+ uri="schemas/mail-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/navigation-2.0.xsd"
uri="schemas/navigation-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/navigation-2.1.xsd"
+ uri="schemas/navigation-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/pageflow-2.0.xsd"
uri="schemas/pageflow-2.0.xsd"/>
@@ -166,18 +204,34 @@
uri="schemas/pdf-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/pdf-2.1.xsd"
+ uri="schemas/pdf-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/persistence-2.0.xsd"
uri="schemas/persistence-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/persistence-2.1.xsd"
+ uri="schemas/persistence-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/remoting-2.0.xsd"
uri="schemas/remoting-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/remoting-2.1.xsd"
+ uri="schemas/remoting-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/security-2.0.xsd"
uri="schemas/security-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/security-2.1.xsd"
+ uri="schemas/security-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/spring-2.0.xsd"
uri="schemas/spring-2.0.xsd"/>
@@ -194,10 +248,18 @@
uri="schemas/transaction-2.0.xsd"/>
<uri
+ name="http://jboss.com/products/seam/transaction-2.1.xsd"
+ uri="schemas/transaction-2.1.xsd"/>
+
+ <uri
name="http://jboss.com/products/seam/web-2.0.xsd"
uri="schemas/web-2.0.xsd"/>
+ <uri
+ name="http://jboss.com/products/seam/web-2.1.xsd"
+ uri="schemas/web-2.1.xsd"/>
+
</catalogContribution>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2009-01-11 12:29:10 UTC (rev 12982)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2009-01-11 13:01:44 UTC (rev 12983)
@@ -335,6 +335,42 @@
</XModelEntity>
<XModelEntity ImplementingClass="%Custom%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData"
+ XMLSUBPATH="web:hot-deploy-filter" name="SeamWebHotDeployFilter21">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.seam.web.filter" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="hot deploy filter" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="org.jboss.seam.web.hotDeployFilter" name="name" xmlname="name"/>
+ <XModelAttributeReference
+ attributes="class,scope,precedence,installed,auto-create,startup,startupDepends"
+ entity="SeamComponent21" name="component"/>
+ <XModelAttributeReference
+ attributes="url-pattern,disabled,regex-url-pattern"
+ entity="SeamWebContextFilter20" name="filter"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItemReference entity="SeamWebContextFilter"
+ name="CopyActions" path="CopyActions"/>
+ <XActionItemReference entity="SeamWebContextFilter"
+ name="DeleteActions" path="DeleteActions"/>
+ <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/>
+ <XActionItemReference entity="SeamWebContextFilter"
+ name="MoveActions" path="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData"
XMLSUBPATH="web:identity-filter" name="SeamWebIdentityFilter21">
<XChildrenEntities/>
<XEntityRenderer>
@@ -573,6 +609,40 @@
</XModelEntity>
<XModelEntity ImplementingClass="%Custom%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData"
+ XMLSUBPATH="web:rewrite-filter" name="SeamWebRewriteFilter21">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.seam.web.filter" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="rewrite filter" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="org.jboss.seam.web.rewriteFilter" name="name" xmlname="name"/>
+ <XModelAttributeReference
+ attributes="class,scope,precedence,installed,auto-create,startup,startupDepends"
+ entity="SeamComponent21" name="component"/>
+ <XModelAttribute PROPERTIES="category=general" name="view-mapping" xmlname="view-mapping"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItemReference entity="SeamWebContextFilter"
+ name="CopyActions" path="CopyActions"/>
+ <XActionItemReference entity="SeamWebContextFilter"
+ name="DeleteActions" path="DeleteActions"/>
+ <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/>
+ <XActionItemReference entity="SeamWebContextFilter"
+ name="MoveActions" path="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData"
XMLSUBPATH="web:servlet-session" name="SeamWebServletSession20">
<XChildrenEntities/>
<XEntityRenderer>
@@ -904,6 +974,8 @@
<XChildEntity name="SeamWebSession21"/>
<XChildEntity name="SeamWebIdentityFilter21"/>
<XChildEntity name="SeamWebWicketFilter21"/>
+ <XChildEntity name="SeamWebHotDeployFilter21"/>
+ <XChildEntity name="SeamWebRewriteFilter21"/>
</XChildrenEntities>
<XActionItem kind="list">
<XActionItem ICON="action.empty" displayName="New" group="1"
@@ -998,6 +1070,21 @@
<AttributeData AttributeName="url-pattern" Mandatory="no"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Identity Filter..." kind="action" name="AddHotDeployFilter">
+ <EntityData EntityName="SeamWebHotDeployFilter21">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="url-pattern" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Identity Filter..." kind="action" name="AddRewriteFilter">
+ <EntityData EntityName="SeamWebRewriteFilter21">
+ <AttributeData AttributeName="name"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
</XActionItem>
</XActionItem>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/web-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/web-2.1.xsd 2009-01-11 12:29:10 UTC (rev 12982)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/web-2.1.xsd 2009-01-11 13:01:44 UTC (rev 12983)
@@ -4,6 +4,16 @@
xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
<xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/>
+ <xs:element name="hot-deploy-filter">
+ <xs:annotation>
+ <xs:documentation>This filter triggers a scan for hot deployable components and descriptor files on each request. The URL pattern should be set to the same pattern as used by the Faces Servlet. Note that this filter is automatically disabled when Seam debug mode is disabled.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component"/>
+ <xs:attributeGroup ref="web:attlist.filter"/>
+ </xs:complexType>
+ </xs:element>
+
<xs:element name="identity-filter">
<xs:annotation>
<xs:documentation>This filter provides integration between Servlet Security and the identity component.</xs:documentation>
@@ -120,6 +130,16 @@
</xs:complexType>
</xs:element>
+ <xs:element name="rewrite-filter">
+ <xs:annotation>
+ <xs:documentation>This filter performs URL rewriting.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component"/>
+ <xs:attributeGroup ref="web:rewrite.filter"/>
+ </xs:complexType>
+ </xs:element>
+
<xs:attributeGroup name="attlist.filter">
<xs:attribute name="url-pattern" type="components:string"/>
<xs:attribute name="regex-url-pattern" type="components:string"/>
@@ -153,5 +173,16 @@
<xs:attributeGroup name="attlist.session">
<xs:attribute name="invalidate-on-scheme-change" type="components:boolean"/>
</xs:attributeGroup>
+
+ <xs:attributeGroup name="rewrite.filter">
+ <xs:attribute name="view-mapping" type="components:string">
+ <xs:annotation>
+ <xs:documentation>
+ This is the servlet mapping. It should be set to the same pattern as used by the
+ Faces Servlet. If no value is specified, a pattern of *.seam will be assumed.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:attributeGroup>
</xs:schema>
16 years
- 1
- 0
JBoss Tools SVN: r12982 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-01-11 07:29:10 -0500 (Sun, 11 Jan 2009)
New Revision: 12982
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities/AddCapabilitiesScreenOne.java
Log:
JBIDE-3487
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities/AddCapabilitiesScreenOne.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities/AddCapabilitiesScreenOne.java 2009-01-11 12:24:11 UTC (rev 12981)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities/AddCapabilitiesScreenOne.java 2009-01-11 12:29:10 UTC (rev 12982)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jsf.ui.wizard.capabilities;
+import java.util.Properties;
+
import org.jboss.tools.common.model.ui.wizards.query.list.TreeItemSelectionManager;
import org.jboss.tools.common.model.ui.wizards.special.AbstractSpecialWizardStep;
import org.eclipse.jface.viewers.TreeViewer;
16 years
- 1
- 0
JBoss Tools SVN: r12981 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-01-11 07:24:11 -0500 (Sun, 11 Jan 2009)
New Revision: 12981
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
Log:
JBIDE-3485
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2009-01-11 11:46:21 UTC (rev 12980)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2009-01-11 12:24:11 UTC (rev 12981)
@@ -587,7 +587,7 @@
SharableJSFEditor.enableControlModeOnTransitionCompleted=Switch to standard control mode for cursor after transition is made
SharableJSFEditor.showShortcutIcon=Show shortcut icon
SharableJSFEditor.showShortcutPath=Show shortcut path
-SharableStrutsEditor.Show_Grid=Show grid
+SharableJSFEditor.Show_Grid=Show grid
JSFCapability_Edit.WindowTitle=Edit
JSFCapability_Edit.Title=Custom Capability
@@ -600,7 +600,7 @@
AddCustomJSFCapabilities_0.Title=Select Custom Capabilities
AddCustomJSFCapabilities_1.WindowTitle=Add Custom Capabilities
AddCustomJSFCapabilities_1.Title=Added Custom Capabilities
-AddCustomJSFCapabilities_1.Message=The following updates have been made to the project. The names in quotes are labels from the Custom Capabilities configuration.
+AddCustomJSFCapabilities_1.Message=The following updates have been made to the project.
JSFApplicationExtension_CreateTag.WindowTitle=Add Tag
JSFApplicationExtension_CreateTag.Title=Tag
16 years
- 1
- 0
JBoss Tools SVN: r12980 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-01-11 06:46:21 -0500 (Sun, 11 Jan 2009)
New Revision: 12980
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java
Log:
JBIDE-3486
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java 2009-01-11 11:38:59 UTC (rev 12979)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java 2009-01-11 11:46:21 UTC (rev 12980)
@@ -11,6 +11,7 @@
package org.jboss.tools.jsf.project.capabilities;
import java.lang.reflect.InvocationTargetException;
+import java.util.Properties;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -132,4 +133,24 @@
return count;
}
+ public boolean isActionEnabled(String name) {
+ if(getStepId() == 0 && FINISH.equals(name)) {
+ IPerformerItem[] cs = performer.getChildren();
+ for (int i = 0; i < cs.length; i++) {
+ if(hasSelected(cs[i])) return true;
+ }
+ return false;
+ }
+ return super.isActionEnabled(name);
+ }
+
+ boolean hasSelected(IPerformerItem item) {
+ if(!item.isSelected()) return false;
+ IPerformerItem[] cs = item.getChildren();
+ if(cs.length == 0) return true;
+ for (int i = 0; i < cs.length; i++) {
+ if(hasSelected(cs[i])) return true;
+ }
+ return false;
+ }
}
16 years
- 1
- 0
JBoss Tools SVN: r12979 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-01-11 06:38:59 -0500 (Sun, 11 Jan 2009)
New Revision: 12979
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities/AddCapabilitiesScreenOne.java
Log:
JBIDE-3486
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities/AddCapabilitiesScreenOne.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities/AddCapabilitiesScreenOne.java 2009-01-11 11:00:45 UTC (rev 12978)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/capabilities/AddCapabilitiesScreenOne.java 2009-01-11 11:38:59 UTC (rev 12979)
@@ -60,6 +60,7 @@
if(w == null || !w.isEnabled()) return;
w.setSelected(!w.isSelected());
treeViewer.refresh(w);
+ wizard.dataChanged(validator, new Properties());
}
public boolean isSelected(Object data) {
IPerformerItem w = (IPerformerItem)data;
16 years
- 1
- 0