click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From take...@apache.org
Subject svn commit: r797779 - in /incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse: ./ ui/editor/ ui/editor/attrs/ ui/editor/forms/
Date Sat, 25 Jul 2009 14:47:43 GMT
Author: takezoe
Date: Sat Jul 25 14:47:42 2009
New Revision: 797779

URL: http://svn.apache.org/viewvc?rev=797779&view=rev
Log:
Supports file-upload-service in the click.xml editor.

Removed:
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/attrs/FileItemFactoryAttributeEditor.java
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickFileItemFactoryEditor.java
Modified:
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.java
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.properties
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/ClickEditor.java
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickServiceEditor.java
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickTreeLabelProvider.java

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.java?rev=797779&r1=797778&r2=797779&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.java
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.java
Sat Jul 25 14:47:42 2009
@@ -70,8 +70,8 @@
 	public static final String TAG_FORMAT = "format";
 	public static final String TAG_MODE = "mode";
 	public static final String TAG_EXCLUDES = "excludes";
-	public static final String TAG_FILE_ITEM_FACTORY = "file-item-factory";
 	public static final String TAG_PROPERTY = "property";
+	public static final String TAG_FILE_UPLOAD_SERVICE = "file-upload-service";
 	public static final String TAG_LOG_SERVICE = "log-service";
 	public static final String TAG_TEMPLATE_SERVICE = "template-service";
 	public static final String ATTR_CHARSET = "charset";

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.properties?rev=797779&r1=797778&r2=797779&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.properties
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin.properties
Sat Jul 25 14:47:42 2009
@@ -23,7 +23,6 @@
 editor.clickXML.headers=Headers
 editor.clickXML.pages=Pages
 editor.clickXML.controls=Controls
-editor.clickXML.fileUpload=File Upload
 editor.clickXML.service=Service
 editor.clickXML.source=Source
 editor.clickXML.title=Click Configuration

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties?rev=797779&r1=797778&r2=797779&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickPlugin_ja.properties
Sat Jul 25 14:47:42 2009
@@ -23,7 +23,6 @@
 editor.clickXML.headers=\u30d8\u30c3\u30c0
 editor.clickXML.pages=\u30da\u30fc\u30b8
 editor.clickXML.controls=\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb
-editor.clickXML.fileUpload=\u30d5\u30a1\u30a4\u30eb\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
 editor.clickXML.service=\u30b5\u30fc\u30d3\u30b9
 editor.clickXML.source=\u30bd\u30fc\u30b9
 editor.clickXML.title=Click\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u8a2d\u5b9a

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/ClickEditor.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/ClickEditor.java?rev=797779&r1=797778&r2=797779&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/ClickEditor.java
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/ClickEditor.java
Sat Jul 25 14:47:42 2009
@@ -21,7 +21,6 @@
 
 import org.apache.click.eclipse.ClickPlugin;
 import org.apache.click.eclipse.ui.editor.forms.ClickControlsEditor;
-import org.apache.click.eclipse.ui.editor.forms.ClickFileItemFactoryEditor;
 import org.apache.click.eclipse.ui.editor.forms.ClickGeneralEditor;
 import org.apache.click.eclipse.ui.editor.forms.ClickHeadersEditor;
 import org.apache.click.eclipse.ui.editor.forms.ClickPagesEditor;
@@ -61,7 +60,6 @@
 	private ClickHeadersEditor headerEditor;
 	private ClickPagesEditor pageEditor;
 	private ClickControlsEditor controlEditor;
-	private ClickFileItemFactoryEditor fileItemFactoryEditior;
 	private ClickServiceEditor serviceEditor;
 
 //	private int generalEditorIndex;
@@ -120,15 +118,6 @@
 			removePage(0);
 		}
 		try {
-			fileItemFactoryEditior = new ClickFileItemFactoryEditor();
-			addPage(0, fileItemFactoryEditior, getEditorInput());
-			fileItemFactoryEditior.initModel(model);
-			setPageText(0, ClickPlugin.getString("editor.clickXML.fileUpload"));
-			sourceEditorIndex++;
-		} catch(Exception ex){
-			removePage(0);
-		}
-		try {
 			controlEditor = new ClickControlsEditor();
 			addPage(0, controlEditor, getEditorInput());
 			controlEditor.initModel(model);

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickServiceEditor.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickServiceEditor.java?rev=797779&r1=797778&r2=797779&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickServiceEditor.java
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickServiceEditor.java
Sat Jul 25 14:47:42 2009
@@ -36,6 +36,9 @@
 
 	protected void createMenu(IDOMElement element) {
 		if(element.getNodeName().equals(ClickPlugin.TAG_CLICK_APP)){
+			if(ClickUtils.getElement(element, ClickPlugin.TAG_FILE_UPLOAD_SERVICE)==null){
+				newMenu.add(new ElementAppendAction(ClickPlugin.TAG_FILE_UPLOAD_SERVICE, element, null,
this));
+			}
 			if(ClickUtils.getElement(element, ClickPlugin.TAG_LOG_SERVICE)==null){
 				newMenu.add(new ElementAppendAction(ClickPlugin.TAG_LOG_SERVICE, element, null, this));
 			}
@@ -43,22 +46,26 @@
 				newMenu.add(new ElementAppendAction(ClickPlugin.TAG_TEMPLATE_SERVICE, element, null,
this));
 			}
 		}
-		if(element.getNodeName().equals(ClickPlugin.TAG_LOG_SERVICE) ||
+		if(element.getNodeName().equals(ClickPlugin.TAG_FILE_UPLOAD_SERVICE) ||
+				element.getNodeName().equals(ClickPlugin.TAG_LOG_SERVICE) ||
 				element.getNodeName().equals(ClickPlugin.TAG_TEMPLATE_SERVICE)){
 			newMenu.add(new ElementAppendAction(ClickPlugin.TAG_PROPERTY, element, null, this));
 		}
 	}
 
 	protected String[] getAcceptElementNames() {
-		return new String[]{ClickPlugin.TAG_LOG_SERVICE, ClickPlugin.TAG_TEMPLATE_SERVICE, ClickPlugin.TAG_PROPERTY};
+		return new String[]{ClickPlugin.TAG_FILE_UPLOAD_SERVICE, ClickPlugin.TAG_LOG_SERVICE, ClickPlugin.TAG_TEMPLATE_SERVICE,
ClickPlugin.TAG_PROPERTY};
 	}
 
 	protected IAttributeEditor getAttributeEditor(String elementName) {
+		if(elementName.equals(ClickPlugin.TAG_FILE_UPLOAD_SERVICE)){
+			return new ServiceClassNameAttributeEditor("org.apache.click.service.FileUploadService");
+		}
 		if(elementName.equals(ClickPlugin.TAG_LOG_SERVICE)){
-			return new ServiceClassNameAttributeEditor("net.sf.click.service.LogService");
+			return new ServiceClassNameAttributeEditor("org.apache.click.service.LogService");
 		}
 		if(elementName.equals(ClickPlugin.TAG_TEMPLATE_SERVICE)){
-			return new ServiceClassNameAttributeEditor("net.sf.click.service.TemplateService");
+			return new ServiceClassNameAttributeEditor("org.apache.click.service.TemplateService");
 		}
 		if(elementName.equals(ClickPlugin.TAG_PROPERTY)){
 			return new PropertyAttributeEditor();

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickTreeLabelProvider.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickTreeLabelProvider.java?rev=797779&r1=797778&r2=797779&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickTreeLabelProvider.java
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ui/editor/forms/ClickTreeLabelProvider.java
Sat Jul 25 14:47:42 2009
@@ -56,10 +56,10 @@
 				ClickPlugin.getImageDescriptor("icons/folder.gif").createImage());
 		images.put(ClickPlugin.TAG_EXCLUDES,
 				ClickPlugin.getImageDescriptor("icons/page.gif").createImage());
-		images.put(ClickPlugin.TAG_FILE_ITEM_FACTORY,
-				ClickPlugin.getImageDescriptor("icons/folder.gif").createImage());
 		images.put(ClickPlugin.TAG_PROPERTY,
 				ClickPlugin.getImageDescriptor("icons/property.gif").createImage());
+		images.put(ClickPlugin.TAG_FILE_UPLOAD_SERVICE,
+				ClickPlugin.getImageDescriptor("icons/class.gif").createImage());
 		images.put(ClickPlugin.TAG_LOG_SERVICE,
 				ClickPlugin.getImageDescriptor("icons/class.gif").createImage());
 		images.put(ClickPlugin.TAG_TEMPLATE_SERVICE,



Mime
View raw message