JBoss Tools SVN: r6472 - branches/jbosstools-2.0.x/struts/plugins/org.jboss.tools.struts/resources/meta.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2008-02-20 09:58:20 -0500 (Wed, 20 Feb 2008)
New Revision: 6472
Modified:
branches/jbosstools-2.0.x/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta
Log:
http://jira.jboss.com/jira/browse/JBIDE-1737 Fixed
Modified: branches/jbosstools-2.0.x/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta
===================================================================
--- branches/jbosstools-2.0.x/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta 2008-02-20 14:56:10 UTC (rev 6471)
+++ branches/jbosstools-2.0.x/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta 2008-02-20 14:58:20 UTC (rev 6472)
@@ -224,7 +224,7 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem ICON="action.empty"
- displayName="Red Hat Developer Studio Struts" group="1" kind="list" name="StrutsStudio">
+ displayName="JBoss Tools Struts" group="1" kind="list" name="StrutsStudio">
<XActionItem
HandlerClassName="org.jboss.tools.struts.model.pv.handler.StrutsProjectsRootRedirectHandler"
ICON="action.empty" PROPERTIES="actionpath=SynchronizeModules"
18 years, 1 month
JBoss Tools SVN: r6471 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: criteriaeditor and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2008-02-20 09:56:10 -0500 (Wed, 20 Feb 2008)
New Revision: 6471
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1667
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2008-02-20 14:55:47 UTC (rev 6470)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2008-02-20 14:56:10 UTC (rev 6471)
@@ -77,14 +77,24 @@
hei.resetName();
}
this.consoleConfigurationName = name;
- execAction.setEnabled(name.trim().length() != 0);
+
showEditorInput( getEditorInput() );
}
+
+ protected void updateExecButton(){
+ if (getSourceViewer() != null ){
+ execAction.setEnabled(getConsoleConfigurationName().trim().length() != 0
+ && getSourceViewer().getDocument().get().trim().length() > 0);
+ } else {
+ execAction.setEnabled(false);
+ }
+ }
public void showEditorInput(IEditorInput editorInput) {
try {
doSetInput( editorInput );
+ updateExecButton();
}
catch (CoreException e) {
HibernateConsolePlugin.getDefault().logErrorMessage(
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2008-02-20 14:55:47 UTC (rev 6470)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2008-02-20 14:56:10 UTC (rev 6471)
@@ -36,7 +36,9 @@
import org.eclipse.jface.action.Action;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextListener;
import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.text.TextEvent;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -188,6 +190,13 @@
createToolbar( parent );
super.createPartControl( parent );
+ if (getSourceViewer() != null ){
+ getSourceViewer().addTextListener(new ITextListener(){
+
+ public void textChanged(TextEvent event) {
+ updateExecButton();
+ }});
+ }
Control control = parent.getChildren()[1];
control.setLayoutData( new GridData( GridData.FILL_BOTH ) );
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java 2008-02-20 14:55:47 UTC (rev 6470)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java 2008-02-20 14:56:10 UTC (rev 6471)
@@ -29,7 +29,9 @@
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextListener;
import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.TextEvent;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.IVerticalRuler;
import org.eclipse.jface.text.source.projection.ProjectionSupport;
@@ -135,6 +137,14 @@
super.createPartControl( parent );
+ if (getSourceViewer() != null ){
+ getSourceViewer().addTextListener(new ITextListener(){
+
+ public void textChanged(TextEvent event) {
+ updateExecButton();
+ }});
+ }
+
// move to base class?
Control control = parent.getChildren()[1];
control.setLayoutData( new GridData( GridData.FILL_BOTH ) );
18 years, 1 month
JBoss Tools SVN: r6470 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/1744 and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2008-02-20 09:55:47 -0500 (Wed, 20 Feb 2008)
New Revision: 6470
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1744/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1744/JBIDE-1744.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1744, junit test
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1744/JBIDE-1744.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1744/JBIDE-1744.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1744/JBIDE-1744.jsp 2008-02-20 14:55:47 UTC (rev 6470)
@@ -0,0 +1,83 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+<html>
+<head>
+
+<style type="text/css">
+.caption-class {
+ width: 200px;
+ background: blue;
+}
+
+.footer-class {
+ background: brown;
+ text-align: left;
+}
+
+.footer-class-alt {
+ background: blue;
+ text-align: left;
+}
+
+.header-class-alt {
+ background: cyan;
+}
+
+.header-class {
+ background: green;
+}
+</style>
+</head>
+
+<body>
+<f:view>
+
+
+ <h:dataTable value="#{users}" var="item" border="2" width="500"
+ captionClass="caption-class" captionStyle="color: grey;"
+ footerClass="footer-class" headerClass="header-class">
+
+
+ <f:facet name="header">
+ <h:outputText value="header" />
+ </f:facet>
+
+ <f:facet name="footer">
+ <h:outputText value="footer" />
+ </f:facet>
+
+ <f:facet name="caption">
+ <h:outputText value="caption" />
+ </f:facet>
+
+ <h:column footerClass="footer-class-alt"
+ headerClass="header-class-alt">
+ <f:facet name="header">
+ <h:outputText value="name1head" />
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="name1foot" />
+ </f:facet>
+ <h:outputText value="zz1" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="name22" />
+ </f:facet>
+ <h:outputText value="zz2" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="name333" />
+ </f:facet>
+ <h:outputText value="zz3" />
+ </h:column>
+
+ </h:dataTable>
+</f:view>
+</body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1744/JBIDE-1744.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-02-20 14:54:05 UTC (rev 6469)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-02-20 14:55:47 UTC (rev 6470)
@@ -20,6 +20,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1479Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1484Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1615Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1744Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
@@ -52,7 +53,7 @@
suite.addTestSuite(JBIDE1479Test.class);
suite.addTestSuite(JBIDE788Test.class);
suite.addTestSuite(JBIDE1105Test.class);
-
+ suite.addTestSuite(JBIDE1744Test.class);
// $JUnit-END$
//added by Max Areshkau
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2008-02-20 14:55:47 UTC (rev 6470)
@@ -0,0 +1,81 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+
+/**
+ * @author dmaliarevich
+ *
+ */
+public class JBIDE1744Test extends VpeTest {
+
+ private static final String IMPORT_PROJECT_NAME = "jsfTest";
+
+ private static final String TEST_PAGE_NAME = "JBIDE/1744/JBIDE-1744.jsp";
+
+ /**
+ * @param name
+ */
+ public JBIDE1744Test(String name) {
+ super(name);
+ }
+
+ // test method for JBIDE 1615
+ public void testJBIDE_1744() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
+ IMPORT_PROJECT_NAME);
+
+ assertNotNull("Could not open specified file " + file.getFullPath(),
+ file);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // get dom document
+ nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMElement element = document.getDocumentElement();
+
+ // check that element is not null
+ assertNotNull(element);
+
+ // get root node
+ nsIDOMNode node = (nsIDOMNode) element
+ .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+
+ List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
+
+ // find "table" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_TABLE);
+ // method does not look for nested tables
+ // thus only one element is found
+ assertEquals(1, elements.size());
+
+ if (getException() != null) {
+ throw getException();
+ }
+ }
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
18 years, 1 month
JBoss Tools SVN: r6469 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2008-02-20 09:54:05 -0500 (Wed, 20 Feb 2008)
New Revision: 6469
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1609
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2008-02-20 14:51:31 UTC (rev 6468)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2008-02-20 14:54:05 UTC (rev 6469)
@@ -51,6 +51,7 @@
private Button jpaMode;
private Button annotationsMode;
private Button confbutton;
+ private Button createconfbutton;
private Text propertyFileText;
private Text configurationFileText;
@@ -129,7 +130,7 @@
private void createConfigurationFileEditor(Composite parent) {
Group group = createGroup( parent, "Configuration file:", 3 );
configurationFileText = createBrowseEditor( parent, group);
- createNewFileButton( group, new SelectionAdapter() {
+ createconfbutton = createNewFileButton( group, new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
handleConfigurationFileCreate();
}
@@ -306,6 +307,7 @@
configurationFileText.setEnabled( /* TODO !configurationFileWillBeCreated && */ !getConfigurationMode().equals( ConfigurationMode.JPA ) );
confbutton.setEnabled( !getConfigurationMode().equals( ConfigurationMode.JPA ) );
+ createconfbutton.setEnabled(confbutton.isEnabled());
persistenceUnitNameText.setEnabled( getConfigurationMode().equals( ConfigurationMode.JPA) );
18 years, 1 month
JBoss Tools SVN: r6468 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: scanner/xml and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2008-02-20 09:51:31 -0500 (Wed, 20 Feb 2008)
New Revision: 6468
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLValueInfo.java
Log:
JBIDE-1785 Handling lost reference.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2008-02-20 14:37:38 UTC (rev 6467)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2008-02-20 14:51:31 UTC (rev 6468)
@@ -32,10 +32,17 @@
IValueInfo v = null;
if(CLS_XML.equals(c.getAttribute(ATTR_CLASS))) {
v = new XMLValueInfo();
+ v.loadXML(c, context);
+ if(((XMLValueInfo)v).getObject() == null) {
+ v = new ValueInfo();
+ //that may be a problem
+ ((ValueInfo)v).setValue("");
+ }
} else {
v = new ValueInfo();
+ v.loadXML(c, context);
}
- v.loadXML(c, context);
+
return v;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLValueInfo.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLValueInfo.java 2008-02-20 14:37:38 UTC (rev 6467)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLValueInfo.java 2008-02-20 14:51:31 UTC (rev 6468)
@@ -59,6 +59,10 @@
h.update();
return h;
}
+
+ public XModelObject getObject() {
+ return object;
+ }
public Element toXML(Element parent, Properties context) {
Element element = XMLUtilities.createElement(parent, SeamXMLConstants.TAG_VALUE_INFO);
18 years, 1 month
JBoss Tools SVN: r6467 - trunk/vpe/plugins/org.jboss.tools.vpe.
by jbosstools-commits@lists.jboss.org
Author: svasilyev
Date: 2008-02-20 09:37:38 -0500 (Wed, 20 Feb 2008)
New Revision: 6467
Removed:
trunk/vpe/plugins/org.jboss.tools.vpe/html/
trunk/vpe/plugins/org.jboss.tools.vpe/images/
Log:
Delete unnecessary files.
18 years, 1 month
JBoss Tools SVN: r6466 - trunk/jsf/features/org.jboss.tools.richfaces.feature.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-02-20 09:10:40 -0500 (Wed, 20 Feb 2008)
New Revision: 6466
Modified:
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
Log:
JBIDE-1687
including plug-ins with templates for html and jsp tags in build
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-02-20 13:55:34 UTC (rev 6465)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-02-20 14:10:40 UTC (rev 6466)
@@ -467,14 +467,12 @@
id="org.jboss.tools.jst.vpe.html"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
<plugin
id="org.jboss.tools.jst.vpe.jsp"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
</feature>
18 years, 1 month
JBoss Tools SVN: r6465 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2008-02-20 08:55:34 -0500 (Wed, 20 Feb 2008)
New Revision: 6465
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1609
enablement for "create new" configuration button changes
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2008-02-20 13:45:16 UTC (rev 6464)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2008-02-20 13:55:34 UTC (rev 6465)
@@ -9,6 +9,8 @@
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextListener;
+import org.eclipse.jface.text.TextEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -21,6 +23,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IPropertyListener;
import org.eclipse.ui.IShowEditorInput;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.editors.text.TextEditor;
@@ -34,6 +37,7 @@
QueryEditor, IShowEditorInput {
private ToolBarManager tbm;
+ private ExecuteQueryAction execAction = null;
final private QueryInputModel queryInputModel;
// to enable execution of queries from files - hack for HBX-744
@@ -73,6 +77,7 @@
hei.resetName();
}
this.consoleConfigurationName = name;
+ execAction.setEnabled(name.trim().length() != 0);
showEditorInput( getEditorInput() );
}
@@ -123,8 +128,16 @@
bar.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
tbm = new ToolBarManager( bar );
+ execAction = new ExecuteQueryAction( this );
+ //getDocumentProvider().addElementStateListener(listener)
+ /*getSourceViewer().addTextListener(new ITextListener(){
+
+ public void textChanged(TextEvent event) {
+ System.out.println(event.getText());
+
+ }});*/
ActionContributionItem item = new ActionContributionItem(
- new ExecuteQueryAction( this ) );
+ execAction );
tbm.add( item );
18 years, 1 month
JBoss Tools SVN: r6464 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2008-02-20 08:45:16 -0500 (Wed, 20 Feb 2008)
New Revision: 6464
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
JBIDE-1785 Firing events modified.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java 2008-02-20 13:45:04 UTC (rev 6463)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java 2008-02-20 13:45:16 UTC (rev 6464)
@@ -78,32 +78,40 @@
protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
throws CoreException {
SeamProject sp = getSeamProject();
- if(sp==null) {
- return null; //
+ if(sp == null) {
+ return null;
}
- sp.resolveStorage(kind != FULL_BUILD);
+ sp.postponeFiring();
- if(sp.getClassPath().update()) {
- sp.getClassPath().process();
- }
+ try {
+
+ sp.resolveStorage(kind != FULL_BUILD);
+
+ if(sp.getClassPath().update()) {
+ sp.getClassPath().process();
+ }
- new SeamRuntimeValidation().validate(sp);
-
- if (kind == FULL_BUILD) {
- fullBuild(monitor);
- } else {
- IResourceDelta delta = getDelta(getProject());
- if (delta == null) {
- fullBuild(monitor);
- } else {
- incrementalBuild(delta, monitor);
- }
- }
- try {
- sp.store();
- } catch (IOException e) {
- SeamCorePlugin.getPluginLog().logError(NLS.bind(SeamCoreMessages.SeamCoreBuilder_1,sp.getProject().getName()), e); //$NON-NLS-1$
+ new SeamRuntimeValidation().validate(sp);
+
+ if (kind == FULL_BUILD) {
+ fullBuild(monitor);
+ } else {
+ IResourceDelta delta = getDelta(getProject());
+ if (delta == null) {
+ fullBuild(monitor);
+ } else {
+ incrementalBuild(delta, monitor);
+ }
+ }
+ try {
+ sp.store();
+ } catch (IOException e) {
+ SeamCorePlugin.getPluginLog().logError(NLS.bind(SeamCoreMessages.SeamCoreBuilder_1,sp.getProject().getName()), e); //$NON-NLS-1$
+ }
+
+ } finally {
+ sp.fireChanges();
}
return null;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java 2008-02-20 13:45:04 UTC (rev 6463)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java 2008-02-20 13:45:16 UTC (rev 6464)
@@ -11,6 +11,8 @@
package org.jboss.tools.seam.core;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
@@ -24,6 +26,8 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
+import org.jboss.tools.seam.core.event.ISeamProjectChangeListener;
+import org.jboss.tools.seam.core.event.SeamProjectChangeEvent;
import org.osgi.framework.BundleContext;
/**
@@ -151,5 +155,38 @@
public static IStatus createErrorStatus(String message, Throwable exception) {
return new Status(IStatus.ERROR, PLUGIN_ID, -1, message, exception);
}
+
+ private static List<ISeamProjectChangeListener> listeners = new ArrayList<ISeamProjectChangeListener>();
+
+ /**
+ *
+ */
+ public static void addSeamProjectListener(ISeamProjectChangeListener listener) {
+ synchronized(listeners) {
+ if(listeners.contains(listener)) return;
+ listeners.add(listener);
+ }
+ }
+ /**
+ *
+ */
+ public static void removeSeamProjectListener(ISeamProjectChangeListener listener) {
+ synchronized(listeners) {
+ listeners.remove(listener);
+ }
+ }
+
+ public static void fire(SeamProjectChangeEvent event) {
+ ISeamProjectChangeListener[] ls = null;
+ synchronized(listeners) {
+ ls = listeners.toArray(new ISeamProjectChangeListener[0]);
+ }
+ if(ls != null) {
+ for (int i = 0; i < ls.length; i++) {
+ ls[i].projectChanged(event);
+ }
+ }
+ }
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-02-20 13:45:04 UTC (rev 6463)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-02-20 13:45:16 UTC (rev 6464)
@@ -381,27 +381,35 @@
long begin = System.currentTimeMillis();
- boolean b = getClassPath().update();
- if(b) {
- getClassPath().validateProjectDependencies();
- }
- File file = getStorageFile();
- Element root = null;
- if(file != null && file.isFile()) {
- root = XMLUtilities.getElement(file, null);
- if(root != null) {
- loadProjectDependencies(root);
- loadSourcePaths2(root);
-// loadSourcePaths(root);
+ postponeFiring();
+
+ try {
+
+ boolean b = getClassPath().update();
+ if(b) {
+ getClassPath().validateProjectDependencies();
}
- }
+ File file = getStorageFile();
+ Element root = null;
+ if(file != null && file.isFile()) {
+ root = XMLUtilities.getElement(file, null);
+ if(root != null) {
+ loadProjectDependencies(root);
+ loadSourcePaths2(root);
+// loadSourcePaths(root);
+ }
+ }
- if(b) {
- getClassPath().process();
- }
+ if(b) {
+ getClassPath().process();
+ }
- if(root != null) {
- getValidationContext().load(root);
+ if(root != null) {
+ getValidationContext().load(root);
+ }
+
+ } finally {
+ fireChanges();
}
long e = System.currentTimeMillis();
@@ -1375,12 +1383,32 @@
return c;
}
+ List<Change> postponedChanges = null;
+
+ public void postponeFiring() {
+ if(postponedChanges == null) {
+ postponedChanges = new ArrayList<Change>();
+ }
+ }
+
+ public void fireChanges() {
+ if(postponedChanges == null) return;
+ List<Change> changes = postponedChanges;
+ postponedChanges = null;
+ System.out.println("fireng " + changes.size() + " changes");
+ fireChanges(changes);
+ }
+
/**
*
* @param changes
*/
void fireChanges(List<Change> changes) {
if(changes == null || changes.size() == 0) return;
+ if(postponedChanges != null) {
+ postponedChanges.addAll(changes);
+ return;
+ }
SeamProjectChangeEvent event = new SeamProjectChangeEvent(this, changes);
ISeamProjectChangeListener[] ls = null;
synchronized(this) {
@@ -1391,6 +1419,7 @@
ls[i].projectChanged(event);
}
}
+ SeamCorePlugin.fire(event);
}
/**
18 years, 1 month
JBoss Tools SVN: r6463 - trunk/jsf/features/org.jboss.tools.richfaces.feature.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-02-20 08:45:04 -0500 (Wed, 20 Feb 2008)
New Revision: 6463
Modified:
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
Log:
JBIDE-1687
including plug-ins with templates for html and jsp tags in build
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-02-20 12:56:56 UTC (rev 6462)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-02-20 13:45:04 UTC (rev 6463)
@@ -463,4 +463,18 @@
install-size="0"
version="0.0.0"/>
+ <plugin
+ id="org.jboss.tools.jst.vpe.html"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.vpe.jsp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
18 years, 1 month