Changeset 1311

Timestamp:

11/14/07 13:31:38 (1 year ago)

Author:

koshi

Message:

improved error message.

Files:

• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/property/IconPropertyPage.java (modified) (1 diff)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/resource/messages.properties (modified) (4 diffs)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/wizard/EditIconKeyWizardPage.java (deleted)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/wizard/EditIconSetWizardPage.java (deleted)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/wizard/EditIconWizard.java (modified) (3 diffs)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/wizard/EditIconWizardPage.java (modified) (5 diffs)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/AbstractGeneratableClass.java (modified) (2 diffs)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/GeneratableClass.java (modified) (2 diffs)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/internal/resource/messages.properties (modified) (1 diff)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/model/CategorizedIcons.java (modified) (2 diffs)
• org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/model/IImageKeysModel.java (modified) (4 diffs)

org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/property/IconPropertyPage.java

@@ -244 +244 @@
-            IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage());
-            ErrorDialog.openError(getShell(), "Error", Messages.getString("IconPropertyPage.generateError"), status); //$NON-NLS-1$
-
+//
-            return false;
-        }

org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/resource/messages.properties

@@ -11 +11 @@
-#--- Property Page ---
-IconPropertyPage.descriptionPlugin = Configure icons for the project:
-IconPropertyPage.descriptionNotPlugin = Configure icons for the project. (Plug-in project only)
-IconPropertyPage.iconColumn = Icon 
-IconPropertyPage.keyColumn = Key
@@ -17 +16 @@
-# error
-IconPropertyPage.getSourceDirError = The source directory dose not found.
-
-
-
-
+
+
+
-IconPropertyPage.initializeProjectError = is not java project.
-
@@ -27 +25 @@
-EditIconWizard.windowTitle = Edit Icons
-# error
-
-
-
-
-
-
-
-
-
-
-
+
-
-#--- Edit Icon Wizard ---
@@ -57 +45 @@
-EditIconWizardPage.patternToolTip = Type filter text (? = any character, * = any string)
-# error
-
+
+
-EditIconWizardPage.getIconImageRootDirError = get icon image root directory error.
-

org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/wizard/EditIconWizard.java

@@ -15 +15 @@
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
@@ -31 +30 @@
- */
-public class EditIconWizard extends Wizard implements INewWizard {
-    private EditIconSetWizardPage editIconSetWizardPage;
-    private EditIconWizardPage editIconWizardPage;
-    private EditIconKeyWizardPage editIconKeyWizardPage;
-    
-    private IImageKeysModel imageKeysModel;
@@ -60 +57 @@
-    @Override
-    public void addPages() {
-        editIconSetWizardPage = new EditIconSetWizardPage();
-        
-        editIconWizardPage = new EditIconWizardPage();
-        editIconWizardPage.init(iconListViewer);
-        
-        editIconKeyWizardPage = new EditIconKeyWizardPage();
-        
-        //addPage(editIconSetWizardPage);
-        addPage(editIconWizardPage);
-        //addPage(editIconKeyWizardPage);
-    }
-    

org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager.ui/src/org/jalcedo/tools/icon/manager/ui/internal/wizard/EditIconWizardPage.java

@@ -21 +21 @@
-import java.util.List;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
@@ -77 +76 @@
- */
-public class EditIconWizardPage extends WizardPage {
-/
+
-    private static String FILE_FILTER = ".svn"; //$NON-NLS-1$
-    private int AREA_SIZE_HEIGHT = 300;
@@ -319 +318 @@
-        container.setLayoutData(new GridData(GridData.FILL_BOTH));
-        
-        explorerViewer =  new TreeViewer(container, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-        explorerViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-        explorerViewer.setContentProvider(new FileTreeContentProvider());
-        explorerViewer.setLabelProvider(new LabelProvider(){
-            public String getText(Object element){
-                return ((File) element).getName();
-            }
-            public Image getImage(Object element) {
-                return Activator.getDefault().getImageRegistry().get(Activator.ICON_FLDR_OBJ);
-            }
-        });
-        //ディレクトリ下のファイル一覧を持ってくるモデルを適用
-        try {
+            explorerViewer =  new TreeViewer(container, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+            explorerViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+            explorerViewer.setContentProvider(new FileTreeContentProvider());
+            explorerViewer.setLabelProvider(new LabelProvider(){
+                public String getText(Object element){
+                    return ((File) element).getName();
+                }
+                public Image getImage(Object element) {
+                    return Activator.getDefault().getImageRegistry().get(Activator.ICON_FLDR_OBJ);
+                }
+            });
+            //ディレクトリ下のファイル一覧を持ってくるモデルを適用
-            CategorizedIcons importIcon = new CategorizedIcons(Activator.getDefault().getBundle());
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            ErrorDialog.openError(getShell(), "Error", Messages.getString("EditIconWizardPage.getIconImageError"), status); //$NON-NLS-1$
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        
-        return container;
@@ -512 +512 @@
-        public AvailableListContentProvider(){
-            try {
-
+
+
-            } catch (IOException e) {
-                IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage());
@@ -572 +573 @@
-                Icon icon = (Icon) element;
-                if(icon.getWidth()*icon.getHeight() != 0){
-
++1
-                        + Messages.getString("EditIconWizardPage.size")+icon.getWidth()+"*"+icon.getHeight()+"\n" //$NON-NLS-1$
-                        + Messages.getString("EditIconWizardPage.type")+(icon.getName().substring(icon.getName().lastIndexOf('.')+1)).toUpperCase(); //$NON-NLS-1$

org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/AbstractGeneratableClass.java

@@ -41 +41 @@
-     */
-    public void generate(IProgressMonitor monitor, boolean force)
-
+Core
-        String source = this.createSource();
-
@@ -53 +53 @@
-            throw new CoreException(new Status(IStatus.ERROR,
-                    Activator.PLUGIN_ID, IStatus.OK,
-GeneratableSupport_generate_e
+AbstractGeneratableClass.generateE
-        }
-

org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/GeneratableClass.java

@@ -11 +11 @@
-package org.jalcedo.tools.icon.manager;
-
+import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
@@ -37 +38 @@
-     * @param monitor
-     * @param force
-
+Core
-     */
-
+Core
-}

org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/internal/resource/messages.properties

@@ -10 +10 @@
-###############################################################################
-
-
+
+
+
+
+

org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/model/CategorizedIcons.java

@@ -24 +24 @@
- */
-public class CategorizedIcons{
-    private String importIconDir = "icons"; //$NON-NLS-1$
-    
-    private Bundle bundle;
-    
@@ -38 +36 @@
-    /**
-     * 
-     * @param importIconDir
-     */
-    public void setImportIconDirName(String importIconDir){
-        this.importIconDir = importIconDir;
-    }
-    
-    /**
-     * 
-     * @return
-     * @throws IOException
-     */
-
-importIconDir
+String rootDirName
+rootDirName
-        return new File(FileLocator.toFileURL(iconFileURL).getPath());
-    }

org.jalcedo.tools/trunk/org.jalcedo.tools.icon.manager/src/org/jalcedo/tools/icon/manager/model/IImageKeysModel.java

@@ -22 +22 @@
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
@@ -30 +32 @@
-import org.eclipse.jdt.core.JavaModelException;
-import org.jalcedo.tools.icon.manager.AbstractGeneratableClass;
+import org.jalcedo.tools.icon.manager.Activator;
-import org.jalcedo.tools.icon.manager.generator.IImageKeysGenerator;
+import org.jalcedo.tools.icon.manager.internal.resource.Messages;
-import org.osgi.framework.Bundle;
-
@@ -70 +74 @@
-     */
-    @Override
-
+Core
-        super.generate(monitor, force);
-
+
+
+
+
+
+
+
+
+
-    }
-
@@ -169 +181 @@
-                i++;
-                if(i > 100){
-
+
+
-                }
-            }