JBoss Tools SVN: r8502 - trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-06-03 08:55:11 -0400 (Tue, 03 Jun 2008)
New Revision: 8502
Modified:
trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css
Log:
http://jira.jboss.com/jira/browse/JBDS-336 - css styles were corrected: png trabsparency in IE fixed, content was centered. All the changes were made by Gleb Galkin
Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css
===================================================================
--- trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css 2008-06-03 10:32:26 UTC (rev 8501)
+++ trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css 2008-06-03 12:55:11 UTC (rev 8502)
@@ -8,16 +8,40 @@
div.book, div.chapter, #title{
text-align:justify;
- width: 57em;
+ width: 70em;
}
ul.docnav {
margin:0px;
- width: 57em;
- ! height:40px;
+ width: 70em;
+ ! height:40px; /* CSS hack for IE*/
display:block;
}
+#title a.site_href, #title a.doc_href{
+display:block;
+height:60px;
+}
+
+#title a.site_href {
+background:transparent url(../images/enterprise/jbossdivisionlogo.png) no-repeat scroll left top;
+! background:none; /* CSS hack for IE*/
+! filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/enterprise/jbossdivisionlogo.png'); /* CSS hack for IE*/
+float:left;
+width:310px;
+}
+
+#title a.doc_href {
+background:transparent url(../images/enterprise/enterprise_doc.png) no-repeat scroll right top;
+! background:none; /* CSS hack for IE*/
+! filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/enterprise/enterprise_doc.png'); /* CSS hack for IE*/
+margin-top:5px;
+}
+
+#title{
+text-align:right;
+}
+
a.new {
background:transparent url(../images/new.png) no-repeat scroll right top;
padding-right:70px;
16 years, 7 months
JBoss Tools SVN: r8501 - in trunk/vpe/plugins: org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dsakovich
Date: 2008-06-03 06:32:26 -0400 (Tue, 03 Jun 2008)
New Revision: 8501
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/BlockFormatHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/BoldFormatHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/HandlerFactory.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/ItalicFormatHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/SimpleTagHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/UnderlineFormatHandler.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-2029
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2008-06-02 19:44:03 UTC (rev 8500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2008-06-03 10:32:26 UTC (rev 8501)
@@ -130,7 +130,7 @@
*/
private String getNodeName(Node node) {
- String nodeName = "";
+ String nodeName = ""; //$NON-NLS-1$
do {
nodeName = node.getNodeName();
node = node.getParentNode();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/BlockFormatHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/BlockFormatHandler.java 2008-06-02 19:44:03 UTC (rev 8500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/BlockFormatHandler.java 2008-06-03 10:32:26 UTC (rev 8501)
@@ -7,7 +7,7 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.vpe.editor.toolbar.format.handler;
import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
@@ -16,59 +16,81 @@
import org.jboss.tools.vpe.editor.toolbar.format.BlockFormatController;
import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
+import org.jboss.tools.vpe.editor.util.HTML;
/**
* @author Igels
*/
public class BlockFormatHandler extends FormatHandler {
- public BlockFormatHandler() {
- super();
+ public BlockFormatHandler() {
+ super();
+ }
+
+ public BlockFormatHandler(FormatControllerManager manager) {
+ super(manager);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.tools.vpe.editor.toolbar.format.handler.FormatHandler#run()
+ */
+ protected void run() {
+ BlockFormatController formatController = (BlockFormatController) controller;
+ String tagName = formatController.getTagName();
+ if (tagName == null || tagName.trim().length() == 0) {
+ return;
}
- public BlockFormatHandler(FormatControllerManager manager) {
- super(manager);
+ boolean normal = false;
+ if ("normal".equals(tagName)) {
+ normal = true;
}
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.editor.toolbar.format.handler.FormatHandler#run()
- */
- protected void run() {
- BlockFormatController formatController = (BlockFormatController)controller;
- String tagName = formatController.getTagName();
- if(tagName==null || tagName.trim().length()==0) {
- return;
- }
+ Node selectedNode = manager.getCurrentSelectedNodeInfo().getNode();
- boolean normal = false;
- if("normal".equals(tagName)) {
- normal = true;
- }
+ StructuredTextViewer viewer = manager.getVpeController()
+ .getPageContext().getSourceBuilder().getStructuredTextViewer();
- Node selectedNode = manager.getCurrentSelectedNodeInfo().getNode();
+ Node replacedNode = null;
+ //Node parentNode = selectedNode.getParentNode();
+ Node formatNode = getCurrentNodeWithoutFormatingTag(selectedNode);
+ Node parentNode = formatNode.getParentNode();
+ if (isBlockFormatNode(selectedNode)) {
+ replacedNode = selectedNode;
+ } else if (isBlockFormatNode(parentNode)) {
+ replacedNode = parentNode;
+ }
+ if (replacedNode instanceof ElementImpl) {
+ // Replase old node
+ if (normal) {
+ stripElement((ElementImpl) replacedNode, selectedNode, viewer);
+ } else {
+ replaseElementName((ElementImpl) replacedNode, tagName, viewer,
+ selectedNode);
+ }
+ } else if (!normal) {
+ insertNewElementAroundNode(tagName, formatNode, viewer, true);
+ }
+ }
- StructuredTextViewer viewer = manager.getVpeController().getPageContext().getSourceBuilder().getStructuredTextViewer();
+ private boolean isBlockFormatNode(Node node) {
+ return node != null
+ && BlockFormatController.TAGS.get(node.getNodeName()
+ .toLowerCase()) != null;
+ }
- Node replacedNode = null;
- Node parentNode = selectedNode.getParentNode();
- if(isBlockFormatNode(selectedNode)) {
- replacedNode = selectedNode;
- } else if(isBlockFormatNode(parentNode)) {
- replacedNode = parentNode;
- }
- if(replacedNode instanceof ElementImpl) {
- // Replase old node
- if(normal) {
- stripElement((ElementImpl)replacedNode, selectedNode, viewer);
- } else {
- replaseElementName((ElementImpl)replacedNode, tagName, viewer, selectedNode);
- }
- } else if(!normal) {
- insertNewElementAroundNode(tagName, selectedNode, viewer, true);
- }
+ private Node getCurrentNodeWithoutFormatingTag(Node node) {
+ Node currentNode = node;
+ while (currentNode.getParentNode() != null
+ && (currentNode.getParentNode().getNodeName().equalsIgnoreCase(HTML.TAG_B)
+ || currentNode.getParentNode().getNodeName()
+ .equalsIgnoreCase(HTML.TAG_I) || currentNode.getParentNode()
+ .getNodeName().equalsIgnoreCase(HTML.TAG_U))) {
+ currentNode = currentNode.getParentNode();
}
+ return currentNode;
+ }
- private boolean isBlockFormatNode(Node node) {
- return node!=null && BlockFormatController.TAGS.get(node.getNodeName().toLowerCase())!=null;
- }
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/BoldFormatHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/BoldFormatHandler.java 2008-06-02 19:44:03 UTC (rev 8500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/BoldFormatHandler.java 2008-06-03 10:32:26 UTC (rev 8501)
@@ -15,7 +15,11 @@
*/
public class BoldFormatHandler extends SimpleTagHandler {
- private static String TAG_NAME = "b";
+ private static String TAG_NAME = "b"; //$NON-NLS-1$
+
+ private static String TAG_STYLE = "FONT-WEIGHT"; //$NON-NLS-1$
+
+ private static String TAG_STYLE_VALUE = "bold"; //$NON-NLS-1$
/**
* Constructor
@@ -37,4 +41,22 @@
protected String getWrappingTagName() {
return TAG_NAME;
}
+
+ /**
+ *
+ * @return
+ */
+ protected String getWrappingTagStyle() {
+ return TAG_STYLE;
+ }
+
+ @Override
+ protected boolean equalsWrappingTagStyle(String tagStyle) {
+ return TAG_STYLE.equalsIgnoreCase(tagStyle);
+ }
+
+ @Override
+ protected String getWrappingTagStyleValue() {
+ return TAG_STYLE_VALUE;
+ }
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/HandlerFactory.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/HandlerFactory.java 2008-06-02 19:44:03 UTC (rev 8500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/HandlerFactory.java 2008-06-03 10:32:26 UTC (rev 8501)
@@ -12,8 +12,6 @@
import java.util.HashMap;
-import org.eclipse.core.runtime.Status;
-
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.template.textformating.FormatData;
import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
@@ -24,7 +22,7 @@
public class HandlerFactory {
private FormatControllerManager manager;
- private HashMap handlers = new HashMap();
+ private HashMap<String,IFormatHandler> handlers = new HashMap<String,IFormatHandler>();
/**
* Constructor
@@ -58,11 +56,11 @@
handlers.put(handlerClassName, handler);
return handler;
} else {
- VpePlugin.getPluginLog().logError("Wrong format handler. Class - " + handlerClassName + ". Handler must be instance of org.jboss.tools.vpe.editor.toolbar.format.handler.IFormatHandler",
- new Exception("Handler must be instance of org.jboss.tools.vpe.editor.toolbar.format.handler.IFormatHandler"));
+ VpePlugin.getPluginLog().logError("Wrong format handler. Class - " + handlerClassName + ". Handler must be instance of org.jboss.tools.vpe.editor.toolbar.format.handler.IFormatHandler", //$NON-NLS-1$//$NON-NLS-2$
+ new Exception("Handler must be instance of org.jboss.tools.vpe.editor.toolbar.format.handler.IFormatHandler")); //$NON-NLS-1$
}
} catch (Exception e) {
- VpePlugin.getPluginLog().logError("Can't create format handler. Class: " + handlerClassName, e);
+ VpePlugin.getPluginLog().logError("Can't create format handler. Class: " + handlerClassName, e); //$NON-NLS-1$
}
}
return null;
@@ -77,4 +75,13 @@
// TODO
return null;
}
+
+ /**
+ * Get count of handlers
+ *
+ * @return count of handlers
+ */
+ public int getCountHandlers() {
+ return handlers.size();
+ }
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/ItalicFormatHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/ItalicFormatHandler.java 2008-06-02 19:44:03 UTC (rev 8500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/ItalicFormatHandler.java 2008-06-03 10:32:26 UTC (rev 8501)
@@ -12,8 +12,12 @@
public class ItalicFormatHandler extends SimpleTagHandler {
- private static String TAG_NAME = "i";
+ private static String TAG_NAME = "i"; //$NON-NLS-1$
+ private static String TAG_STYLE = "FONT-STYLE"; //$NON-NLS-1$
+
+ private static String TAG_STYLE_VALUE = "italic"; //$NON-NLS-1$
+
/**
* Constructor
*/
@@ -34,4 +38,22 @@
protected String getWrappingTagName() {
return TAG_NAME;
}
+
+ /**
+ *
+ * @return
+ */
+ protected String getWrappingTagStyle() {
+ return TAG_STYLE;
+ }
+
+ @Override
+ protected boolean equalsWrappingTagStyle(String tagStyle) {
+ return TAG_STYLE.equalsIgnoreCase(tagStyle);
+ }
+
+ @Override
+ protected String getWrappingTagStyleValue() {
+ return TAG_STYLE_VALUE;
+ }
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/SimpleTagHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/SimpleTagHandler.java 2008-06-02 19:44:03 UTC (rev 8500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/SimpleTagHandler.java 2008-06-03 10:32:26 UTC (rev 8501)
@@ -12,10 +12,11 @@
import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
import org.eclipse.wst.xml.core.internal.document.ElementImpl;
-import org.w3c.dom.Node;
-
import org.jboss.tools.vpe.editor.toolbar.format.IFormatItemSelector;
import org.jboss.tools.vpe.editor.toolbar.format.ToolItemFormatController;
+import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Node;
/**
* @author Igels
@@ -34,31 +35,66 @@
*/
protected void run() {
StructuredTextViewer viewer = manager.getVpeController().getPageContext().getSourceBuilder().getStructuredTextViewer();
+ Node parentNode = null;
Node selectedNode = manager.getCurrentSelectedNodeInfo().getNode();
if(selectedNode==null) {
return;
}
if(equalsWrappingTagName(selectedNode.getNodeName())) {
stripElement((ElementImpl)selectedNode, selectedNode, viewer);
- } else if(isParentWrappingTag()) {
- Node parentNode = selectedNode.getParentNode();
+ } else if((parentNode = getParentWrappingTagNode()) != null) {
+ if (getWrappingTagName().equalsIgnoreCase(parentNode.getNodeName()))
stripElement((ElementImpl)parentNode, selectedNode, viewer);
} else {
insertNewElementAroundNode(getWrappingTagName(), selectedNode, viewer, false);
}
}
+ /**
+ * Get parent wrapping tag
+ * @return node
+ */
+ private Node getParentWrappingTagNode() {
+ Node parentNode = manager.getCurrentSelectedNodeInfo().getNode();
+ for (int i = 0; i < manager.getHandlerFactory().getCountHandlers(); i++) {
+ parentNode = parentNode.getParentNode();
+ if (parentNode == null)
+ return null;
+ if (parentNode instanceof ElementImpl) {
+ ElementImpl element = (ElementImpl) parentNode;
+ String attr = element.getAttribute("style");
+ if (attr != null) {
+ attr = attr.replaceAll(" ", "");
+ if(equalsWrappingTagStyle(attr)) {
+ return parentNode;
+ }
+ }
+ }
+ if(equalsWrappingTagName(parentNode.getNodeName())) {
+ return parentNode;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Parent is format tag
+ *
+ * @return
+ */
private boolean isParentWrappingTag() {
- Node selectedNode = manager.getCurrentSelectedNodeInfo().getNode();
- Node parentNode = selectedNode.getParentNode();
-// if(selectedNode instanceof IDOMText) {
-// }
- if(parentNode!=null) {
- return equalsWrappingTagName(parentNode.getNodeName());
+ Node parentNode = manager.getCurrentSelectedNodeInfo().getNode();
+ for (int i = 0; i < manager.getHandlerFactory().getCountHandlers(); i++) {
+ parentNode = parentNode.getParentNode();
+ if (parentNode == null)
+ return false;
+ if(equalsWrappingTagName(parentNode.getNodeName())) {
+ return true;
+ }
}
return false;
}
-
+
/**
* @return
*/
@@ -69,8 +105,23 @@
* @return
*/
abstract protected String getWrappingTagName();
+
+ /**
+ * @return
+ */
+ abstract protected String getWrappingTagStyle();
+
+ /**
+ * @return
+ */
+ abstract protected String getWrappingTagStyleValue();
/**
+ * @return
+ */
+ abstract protected boolean equalsWrappingTagStyle(String tagStyle);
+
+ /**
* @see org.jboss.tools.vpe.editor.toolbar.format.IFormatItemSelector#setToolbarItemEnabled(boolean)
*/
public void setToolbarItemEnabled(boolean enabled) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/UnderlineFormatHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/UnderlineFormatHandler.java 2008-06-02 19:44:03 UTC (rev 8500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/UnderlineFormatHandler.java 2008-06-03 10:32:26 UTC (rev 8501)
@@ -15,8 +15,11 @@
*/
public class UnderlineFormatHandler extends SimpleTagHandler {
- private static String TAG_NAME = "u";
+ private static String TAG_NAME = "u"; //$NON-NLS-1$
+
+ private static String TAG_STYLE = "TEXT-DECORATION"; //$NON-NLS-1$
+ private static String TAG_STYLE_VALUE = "underline"; //$NON-NLS-1$
/**
* Constructor
*/
@@ -37,4 +40,22 @@
protected String getWrappingTagName() {
return TAG_NAME;
}
+
+ /**
+ *
+ * @return
+ */
+ protected String getWrappingTagStyle() {
+ return TAG_STYLE;
+ }
+
+ @Override
+ protected boolean equalsWrappingTagStyle(String tagStyle) {
+ return TAG_STYLE.equalsIgnoreCase(tagStyle);
+ }
+
+ @Override
+ protected String getWrappingTagStyleValue() {
+ return TAG_STYLE_VALUE;
+ }
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-06-02 19:44:03 UTC (rev 8500)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-06-03 10:32:26 UTC (rev 8501)
@@ -147,7 +147,7 @@
</vpe:drop>
</vpe:dnd>
<vpe:textFormatting use-default-formats="yes">
- <vpe:format type="BlockFormat" addChildren="deny"
+ <vpe:format type="BlockFormat" addChildren="allow"
handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
<vpe:format type="BoldFormat" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BoldFormatHandler" />
<vpe:format type="ItalicFormat" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.ItalicFormatHandler" />
@@ -1044,10 +1044,16 @@
<vpe:drop container="yes" />
</vpe:dnd>
<vpe:textFormatting>
- <vpe:format type="BlockFormat" addChildren="deny"
+ <vpe:format type="BlockFormat" addChildren="allow"
handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
<vpe:format type="BoldFormat" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BoldFormatHandler" />
+ <vpe:format type="BoldFormat">
+ <vpe:formatAttribute type="style" />
+ </vpe:format>
<vpe:format type="ItalicFormat" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.ItalicFormatHandler" />
+ <vpe:format type="ItalicFormat">
+ <vpe:formatAttribute type="style" />
+ </vpe:format>
<vpe:format type="UnderlineFormat" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.UnderlineFormatHandler" />
<vpe:format type="UnderlineFormat">
<vpe:formatAttribute type="style" />
@@ -2062,8 +2068,10 @@
<vpe:format type="UnderlineFormat" setDefault="true">
<vpe:formatAttribute type="style" />
</vpe:format>
- <vpe:format type="BoldFormat">
- <vpe:formatAttribute type="style"/>
+ <vpe:format type="BoldFormat" addChildren="allow"
+ handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BoldFormatHandler" />
+ <vpe:format type="BoldFormat">
+ <vpe:formatAttribute type="style" />
</vpe:format>
<vpe:format type="ItalicFormat" addChildren="allow"
handler="org.jboss.tools.vpe.editor.toolbar.format.handler.ItalicFormatHandler" />
16 years, 7 months
JBoss Tools SVN: r8500 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-06-02 15:44:03 -0400 (Mon, 02 Jun 2008)
New Revision: 8500
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
Log:
Assertion added
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-06-02 14:43:15 UTC (rev 8499)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-06-02 19:44:03 UTC (rev 8500)
@@ -275,7 +275,9 @@
// init refactoring
RenameResourceProcessor processor = new RenameResourceProcessor(resource);
RenameRefactoring refactoring = new RenameRefactoring(processor);
- ((INameUpdating)refactoring.getAdapter(INameUpdating.class)).setNewElementName(newFolderName);
+ INameUpdating nameUpdateingAdapter = ((INameUpdating)refactoring.getAdapter(INameUpdating.class));
+ assertNotNull("Cannot get IUnameUpdating adapter for renaming '" +resource.getFullPath().toString() + "'",nameUpdateingAdapter);
+ nameUpdateingAdapter.setNewElementName(newFolderName);
IReferenceUpdating reference = (IReferenceUpdating)refactoring.getAdapter(IReferenceUpdating.class);
if(reference != null) {
reference.setUpdateReferences(true);
16 years, 7 months
JBoss Tools SVN: r8499 - trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-06-02 10:43:15 -0400 (Mon, 02 Jun 2008)
New Revision: 8499
Modified:
trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css
Log:
http://jira.jboss.com/jira/browse/JBDS-320 - css styles were improved.
Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css
===================================================================
--- trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css 2008-06-02 12:09:22 UTC (rev 8498)
+++ trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css 2008-06-02 14:43:15 UTC (rev 8499)
@@ -2,16 +2,27 @@
/* -----Override jbossenterprise-single.css----- */
-/* Body */
body {
- background-image:none;
- background-color:white;
- margin:0 auto;
- font-family:"Lucida Grande", verdana, "Luxi Sans","Trebuchet MS", helvetica,verdana,arial,sans-serif;
- font-size:12px;
- max-width:55em;
- padding:0em 2em;
- color:#333;
- line-height:150%;
+ text-align:center;
+ }
+
+div.book, div.chapter, #title{
text-align:justify;
+ width: 57em;
}
+
+ul.docnav {
+ margin:0px;
+ width: 57em;
+ ! height:40px;
+ display:block;
+}
+
+a.new {
+background:transparent url(../images/new.png) no-repeat scroll right top;
+padding-right:70px;
+}
+a.updated {
+background:transparent url(../images/updated.png) no-repeat scroll right top;
+padding-right:70px;
+}
16 years, 7 months
JBoss Tools SVN: r8498 - branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-02 08:09:22 -0400 (Mon, 02 Jun 2008)
New Revision: 8498
Modified:
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java
Log:
JBIDE-2259
Modified: branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java
===================================================================
--- branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2008-06-02 12:08:07 UTC (rev 8497)
+++ branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2008-06-02 12:09:22 UTC (rev 8498)
@@ -49,6 +49,7 @@
public static void saveModelObject(Element element, XModelObject object, Properties context) {
if(object == null) return;
String path = object.getPath();
+ if(path == null) return;
XModelObject base = (XModelObject)context.get(SeamXMLConstants.KEY_MODEL_OBJECT);
if(base != null && base.getModel() == object.getModel()) {
String basePath = base.getPath();
16 years, 7 months
JBoss Tools SVN: r8497 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-02 08:08:07 -0400 (Mon, 02 Jun 2008)
New Revision: 8497
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java
Log:
JBIDE-2259
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-06-02 10:21:15 UTC (rev 8496)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2008-06-02 12:08:07 UTC (rev 8497)
@@ -49,6 +49,7 @@
public static void saveModelObject(Element element, XModelObject object, Properties context) {
if(object == null) return;
String path = object.getPath();
+ if(path == null) return;
XModelObject base = (XModelObject)context.get(SeamXMLConstants.KEY_MODEL_OBJECT);
if(base != null && base.getModel() == object.getModel()) {
String basePath = base.getPath();
16 years, 7 months
JBoss Tools SVN: r8496 - trunk/documentation/jboss-tools-docs/index.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-06-02 06:21:15 -0400 (Mon, 02 Jun 2008)
New Revision: 8496
Removed:
trunk/documentation/jboss-tools-docs/index/master.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-344 - removing to /en folder
Deleted: trunk/documentation/jboss-tools-docs/index/master.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/index/master.xml 2008-06-02 10:15:53 UTC (rev 8495)
+++ trunk/documentation/jboss-tools-docs/index/master.xml 2008-06-02 10:21:15 UTC (rev 8496)
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd">
-<book>
- <bookinfo>
- <title>JBoss Tools Guides - Latest Version</title>
- <pubdate>April 2008</pubdate>
- <copyright>
- <year>2007</year>
- <year>2008</year>
- <holder>JBoss, a division of Red Hat Inc.</holder>
- </copyright>
- </bookinfo>
- <index>
- <title/>
- <indexentry>
- <primaryie>Getting Started with JBoss Developer Studio Guide <ulink
- url="en/GettingStartedGuide/html/index.html">(html)</ulink>
- <ulink url="en/GettingStartedGuide/html_single/index.html">(html single)</ulink>
- <ulink url="en/GettingStartedGuide/pdf/Getting_Started_Guide.pdf"
- >(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>Seam Dev Tools Reference Guide <ulink url="en/seam/html/index.html"
- >(html)</ulink>
- <ulink url="en/seam/html_single/index.html">(html single)</ulink>
- <ulink url="en/seam/pdf/Seam_Reference_Guide.pdf">(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>Visual Web Tools Reference Guide <ulink url="en/jsf/html/index.html"
- >(html)</ulink>
- <ulink url="en/jsf/html_single/index.html">(html single)</ulink>
- <ulink url="en/jsf/pdf/Visual_Web_Tools_Reference_Guide.pdf">(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>JBoss Server Manager Reference Guide <ulink url="en/as/html/index.html"
- >(html)</ulink>
- <ulink url="en/as/html_single/index.html">(html single)</ulink>
- <ulink url="en/as/pdf/AS_Reference_Guide.pdf">(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>jBPM Tools Reference Guide <ulink url="en/jbpm/html/index.html">(html)</ulink>
- <ulink url="en/jbpm/html_single/index.html">(html single)</ulink>
- <ulink url="en/jbpm/pdf/JBPM_Reference_Guide.pdf">(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>Hibernate Tools Reference Guide
- <ulink url="en/hibernatetools/html/index.html">(html)</ulink>
- <ulink url="en/hibernatetools/html_single/index.html">(html single)</ulink>
- <ulink url="en/hibernatetools/pdf/Hibernatetools_Reference_Guide.pdf"
- >(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>ESB Editor Reference Guide <ulink
- url="en/esb_ref_guide/html/index.html">(html)</ulink>
- <ulink url="en/esb_ref_guide/html_single/index.html">(html single)</ulink>
- <ulink url="en/esb_ref_guide/pdf/Hibernatetools_Reference_Guide.pdf"
- >(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>JSF Tools Reference Guide <ulink
- url="en/jsf_tools_ref_Guide/html/index.html">(html)</ulink>
- <ulink url="en/jsf_tools_ref_guide/html_single/index.html">(html single)</ulink>
- <ulink url="en/jsf_tools_ref_guide/pdf/JSF_Tools_Reference_Guide.pdf"
- >(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>JSF Tools Tutorial <ulink url="en/jsf_tools_tutorial/html/index.html"
- >(html)</ulink>
- <ulink url="en/jsf_tools_tutorial/html_single/index.html">(html single)</ulink>
- <ulink url="en/jsf_tools_tutorial/pdf/JSF_Tools_Tutorial.pdf">(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>Struts Tools Reference Guide <ulink
- url="en/struts_tools_ref_guide/html/index.html">(html)</ulink>
- <ulink url="en/struts_tools_ref_guide/html_single/index.html">(html single)</ulink>
- <ulink url="en/struts_tools_ref_guide/pdf/Struts_Tools_Reference_Guide.pdf"
- >(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- <indexentry>
- <primaryie>Struts Tools Tutorial <ulink
- url="en/struts_tools_tutorial/html/index.html">(html)</ulink>
- <ulink url="en/struts_tools_tutorial/html_single/index.html">(html single)</ulink>
- <ulink url="en/struts_tools_tutorial/pdf/Struts_Tools_Tutorial.pdf"
- >(pdf)</ulink>
- </primaryie>
- </indexentry>
-
-
- <indexentry>
- <primaryie>Exadel Studio Migration Guide <ulink
- url="en/Exadel-migration/html/index.html">(html)</ulink>
- <ulink url="en/Exadel-migration/html_single/index.html">(html single)</ulink>
- <ulink url="en/Exadel-migration/pdf/Exadel_Studio_Migration_Guide.pdf"
- >(pdf)</ulink>
- </primaryie>
- </indexentry>
-
- </index>
-</book>
16 years, 7 months
JBoss Tools SVN: r8495 - trunk/documentation/jboss-tools-docs/index.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-06-02 06:15:53 -0400 (Mon, 02 Jun 2008)
New Revision: 8495
Modified:
trunk/documentation/jboss-tools-docs/index/pom.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-344 - adding icon onto the page tab
Modified: trunk/documentation/jboss-tools-docs/index/pom.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/index/pom.xml 2008-06-02 10:15:41 UTC (rev 8494)
+++ trunk/documentation/jboss-tools-docs/index/pom.xml 2008-06-02 10:15:53 UTC (rev 8495)
@@ -35,7 +35,13 @@
<configuration>
<sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>${pom.basedir}</sourceDirectory>
+ <sourceDirectory>${pom.basedir}/en</sourceDirectory>
+ <imageResource>
+ <directory>${pom.basedir}/en</directory>
+ <includes>
+ <include>images/**/*</include>
+ </includes>
+ </imageResource>
<cssResource>
<directory>${pom.basedir}/${cssdir}</directory>
</cssResource>
16 years, 7 months
JBoss Tools SVN: r8494 - in trunk/documentation/jboss-tools-docs/index: en and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-06-02 06:15:41 -0400 (Mon, 02 Jun 2008)
New Revision: 8494
Added:
trunk/documentation/jboss-tools-docs/index/en/
trunk/documentation/jboss-tools-docs/index/en/images/
trunk/documentation/jboss-tools-docs/index/en/images/favicon.ico
trunk/documentation/jboss-tools-docs/index/en/master.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-344 - adding icon onto the page tab
Added: trunk/documentation/jboss-tools-docs/index/en/images/favicon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/jboss-tools-docs/index/en/images/favicon.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/jboss-tools-docs/index/en/master.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/index/en/master.xml (rev 0)
+++ trunk/documentation/jboss-tools-docs/index/en/master.xml 2008-06-02 10:15:41 UTC (rev 8494)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd">
+<book>
+ <bookinfo>
+ <title>JBoss Tools Guides - Latest Version</title>
+ <pubdate>April 2008</pubdate>
+ <copyright>
+ <year>2007</year>
+ <year>2008</year>
+ <holder>JBoss, a division of Red Hat Inc.</holder>
+ </copyright>
+ </bookinfo>
+ <index>
+ <title/>
+ <indexentry>
+ <primaryie>Getting Started with JBoss Developer Studio Guide <ulink
+ url="en/GettingStartedGuide/html/index.html">(html)</ulink>
+ <ulink url="en/GettingStartedGuide/html_single/index.html">(html single)</ulink>
+ <ulink url="en/GettingStartedGuide/pdf/Getting_Started_Guide.pdf"
+ >(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>Seam Dev Tools Reference Guide <ulink url="en/seam/html/index.html"
+ >(html)</ulink>
+ <ulink url="en/seam/html_single/index.html">(html single)</ulink>
+ <ulink url="en/seam/pdf/Seam_Reference_Guide.pdf">(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>Visual Web Tools Reference Guide <ulink url="en/jsf/html/index.html"
+ >(html)</ulink>
+ <ulink url="en/jsf/html_single/index.html">(html single)</ulink>
+ <ulink url="en/jsf/pdf/Visual_Web_Tools_Reference_Guide.pdf">(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>JBoss Server Manager Reference Guide <ulink url="en/as/html/index.html"
+ >(html)</ulink>
+ <ulink url="en/as/html_single/index.html">(html single)</ulink>
+ <ulink url="en/as/pdf/AS_Reference_Guide.pdf">(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>jBPM Tools Reference Guide <ulink url="en/jbpm/html/index.html">(html)</ulink>
+ <ulink url="en/jbpm/html_single/index.html">(html single)</ulink>
+ <ulink url="en/jbpm/pdf/JBPM_Reference_Guide.pdf">(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>Hibernate Tools Reference Guide
+ <ulink url="en/hibernatetools/html/index.html">(html)</ulink>
+ <ulink url="en/hibernatetools/html_single/index.html">(html single)</ulink>
+ <ulink url="en/hibernatetools/pdf/Hibernatetools_Reference_Guide.pdf"
+ >(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>ESB Editor Reference Guide <ulink
+ url="en/esb_ref_guide/html/index.html">(html)</ulink>
+ <ulink url="en/esb_ref_guide/html_single/index.html">(html single)</ulink>
+ <ulink url="en/esb_ref_guide/pdf/Hibernatetools_Reference_Guide.pdf"
+ >(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>JSF Tools Reference Guide <ulink
+ url="en/jsf_tools_ref_Guide/html/index.html">(html)</ulink>
+ <ulink url="en/jsf_tools_ref_guide/html_single/index.html">(html single)</ulink>
+ <ulink url="en/jsf_tools_ref_guide/pdf/JSF_Tools_Reference_Guide.pdf"
+ >(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>JSF Tools Tutorial <ulink url="en/jsf_tools_tutorial/html/index.html"
+ >(html)</ulink>
+ <ulink url="en/jsf_tools_tutorial/html_single/index.html">(html single)</ulink>
+ <ulink url="en/jsf_tools_tutorial/pdf/JSF_Tools_Tutorial.pdf">(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>Struts Tools Reference Guide <ulink
+ url="en/struts_tools_ref_guide/html/index.html">(html)</ulink>
+ <ulink url="en/struts_tools_ref_guide/html_single/index.html">(html single)</ulink>
+ <ulink url="en/struts_tools_ref_guide/pdf/Struts_Tools_Reference_Guide.pdf"
+ >(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ <indexentry>
+ <primaryie>Struts Tools Tutorial <ulink
+ url="en/struts_tools_tutorial/html/index.html">(html)</ulink>
+ <ulink url="en/struts_tools_tutorial/html_single/index.html">(html single)</ulink>
+ <ulink url="en/struts_tools_tutorial/pdf/Struts_Tools_Tutorial.pdf"
+ >(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+
+ <indexentry>
+ <primaryie>Exadel Studio Migration Guide <ulink
+ url="en/Exadel-migration/html/index.html">(html)</ulink>
+ <ulink url="en/Exadel-migration/html_single/index.html">(html single)</ulink>
+ <ulink url="en/Exadel-migration/pdf/Exadel_Studio_Migration_Guide.pdf"
+ >(pdf)</ulink>
+ </primaryie>
+ </indexentry>
+
+ </index>
+</book>
16 years, 7 months
JBoss Tools SVN: r8493 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-02 04:52:37 -0400 (Mon, 02 Jun 2008)
New Revision: 8493
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectCreationOperation.java
Log:
JBIDE-2273
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectCreationOperation.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectCreationOperation.java 2008-05-31 10:29:50 UTC (rev 8492)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectCreationOperation.java 2008-06-02 08:52:37 UTC (rev 8493)
@@ -16,8 +16,10 @@
import java.io.OutputStream;
import java.util.Properties;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -25,7 +27,9 @@
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl;
import org.jboss.tools.common.model.project.IModelNature;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.project.JSFAutoLoad;
import org.jboss.tools.jsf.project.JSFNature;
import org.jboss.tools.jsf.web.JSFTemplate;
@@ -120,7 +124,19 @@
protected void postCreateWebNature() {
if(projectFile != null) {
- if(projectFile.isFile()) projectFile.delete();
+ if(projectFile.isFile()) {
+ IFile f = EclipseResourceUtil.getFile(projectFile.getAbsolutePath());
+ if(f != null && f.exists()) {
+ try {
+ f.delete(true, new NullProgressMonitor());
+ } catch (CoreException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ projectFile.delete();
+ }
+ } else {
+ projectFile.delete();
+ }
+ }
projectFile = null;
}
model.getProperties().put(XModelConstants.AUTOLOAD, new JSFAutoLoad());
16 years, 7 months