Changeset 1282

Timestamp:

11/09/07 10:13:01 (1 year ago)

Author:

koshi

Message:

bug fix. (#197 improved icon scale)

Files:

• org.jalcedo.generator/trunk/org.jalcedo.generator.icon.ui/META-INF/MANIFEST.MF (modified) (1 diff)
• org.jalcedo.generator/trunk/org.jalcedo.generator.icon.ui/src/org/jalcedo/generator/icon/ui/internal/resource/messages.properties (modified) (1 diff)
• org.jalcedo.generator/trunk/org.jalcedo.generator.icon.ui/src/org/jalcedo/generator/icon/ui/internal/wizard/EditIconSetWizardPage.java (modified) (3 diffs)
• org.jalcedo.generator/trunk/org.jalcedo.generator.icon.ui/src/org/jalcedo/generator/icon/ui/internal/wizard/EditIconWizardPage.java (modified) (5 diffs)
• org.jalcedo.generator/trunk/org.jalcedo.generator.icon/META-INF/MANIFEST.MF (modified) (1 diff)
• org.jalcedo.generator/trunk/org.jalcedo.generator.icon/src/org/jalcedo/generator/icon/model/CategorizedIcons.java (modified) (3 diffs)
• org.jalcedo.generator/trunk/org.jalcedo.generator.icon/src/org/jalcedo/generator/icon/model/Icon.java (modified) (2 diffs)

org.jalcedo.generator/trunk/org.jalcedo.generator.icon.ui/META-INF/MANIFEST.MF

@@ -3 +3 @@
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.jalcedo.generator.icon.ui;singleton:=true
-6
+9
-Bundle-Activator: org.jalcedo.generator.icon.ui.Activator
-Require-Bundle: org.eclipse.ui,

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

@@ -33 +33 @@
-EditIconSetWizardPage.title = Edit Icon set
-EditIconSetWizardPage.description = Edit icon set to import.
+EditIconSetWizardPage.add = Add Icon set...
+EditIconSetWizardPage.remove = Remove
+#error
+EditIconSetWizardPage.getIconImageError = get icon image error.
+EditIconSetWizardPage.setIconSetError = set icon set error.
-
-#--- Edit Icon Wizard ---

org.jalcedo.generator/trunk/org.jalcedo.generator.icon.ui/src/org/jalcedo/generator/icon/ui/internal/wizard/EditIconSetWizardPage.java

@@ -12 +12 @@
-package org.jalcedo.generator.icon.ui.internal.wizard;
-
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
+import org.jalcedo.generator.icon.model.CategorizedIcons;
+import org.jalcedo.generator.icon.ui.Activator;
-import org.jalcedo.generator.icon.ui.internal.resource.Messages;
-
@@ -21 +41 @@
- */
-public class EditIconSetWizardPage extends WizardPage {
+    private String FILE_FILTER = ".svn";
+    private TableViewer iconSetViewer;
-    
-    public EditIconSetWizardPage(){
@@ -33 +55 @@
-    public void createControl(Composite parent) {
-        // TODO Auto-generated method stub
+        Composite container = new Composite(parent, SWT.NONE);
+        container.setLayout(new GridLayout(2, false));
+        
+        createListArea(container);
+        createButtonArea(container);
+        
+        doValidate();
+        setControl(container);
+    }
+    
+    public TableViewer getIconSetViewer(){
+        return iconSetViewer;
+    }
+    
+    private Composite createListArea(Composite parent){
+        Composite container = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.marginWidth = 0;
+        layout.marginHeight = 0;
+        container.setLayout(layout);
+        container.setLayoutData(new GridData(GridData.FILL_BOTH));
+        
+        Table table = new Table(container, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
+        GridData gd = new GridData(GridData.FILL_BOTH);
+        table.setLayoutData(gd);
+        
+        iconSetViewer = new TableViewer(table);
+        iconSetViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+        iconSetViewer.setContentProvider(new iconSetProvider());
+        iconSetViewer.setLabelProvider(new LabelProvider(){
+            @Override
+            public String getText(Object element) {
+                return ((File) element).getName();
+            }
+        });
+        
+        iconSetViewer.addSelectionChangedListener(new ISelectionChangedListener(){
+            public void selectionChanged(SelectionChangedEvent event) {
+                doValidate();
+            }
+        });
+        
+        try {
+            CategorizedIcons importIcon = new CategorizedIcons(Activator.getDefault().getBundle());
+            iconSetViewer.setInput(importIcon.getIconFile());
+        } catch (IOException e) {
+            MessageDialog.openError(getShell(), "Error", Messages.getString("EditIconSetWizardPage.getIconImageError")); //$NON-NLS-1$
+            e.printStackTrace();
+        }
+        return container;
+    }
+    
+    private Composite createButtonArea(Composite parent){
+        Composite container = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.marginWidth = 0;
+        layout.marginHeight = 0;
+        container.setLayout(layout);
+        GridData gd = new GridData(GridData.FILL_VERTICAL);
+        container.setLayoutData(gd);
+        
+        Button button = new Button(container, SWT.PUSH);
+        button.setText(Messages.getString("EditIconSetWizardPage.add")); //$NON-NLS-1$
+        button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        button.addSelectionListener(new SelectionAdapter(){
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                // TODO Auto-generated method stub
+                super.widgetSelected(e);
+            }
+        });
+        
+        button = new Button(container, SWT.PUSH);
+        button.setText(Messages.getString("EditIconSetWizardPage.remove")); //$NON-NLS-1$
+        button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        button.addSelectionListener(new SelectionAdapter(){
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                // TODO Auto-generated method stub
+                super.widgetSelected(e);
+            }
+        });
+        
+        return container;
+    }
+    
+    private void doValidate(){
+        if(iconSetViewer.getInput()==null){
+            setErrorMessage(Messages.getString("EditIconSetWizardPage.setIconSetError")); //$NON-NLS-1$
+            setPageComplete(false);
+            return;
+        }
+        setErrorMessage(null);
+        setPageComplete(true);
+    }
+    
+    
+    private class iconSetProvider implements IStructuredContentProvider{
+        public Object[] getElements(Object inputElement) {
+            if(inputElement instanceof File){
+                return ((File)inputElement).listFiles(getFilter());
+            }
+            return null;
+        }
-
+        public void dispose() {}
+
+        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
+        
+        private FileFilter getFilter(){
+            return new FileFilter(){
+                public boolean accept(File pathname) {
+                    if(!pathname.getName().endsWith(FILE_FILTER) && pathname.isDirectory()){
+                        return true;
+                    }
+                    return false;
+                }
+            };
+        }
-    }
-

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

@@ -54 +54 @@
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
@@ -329 +328 @@
-            }
-        });
-        
-        explorerViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-            public void selectionChanged(SelectionChangedEvent event) {
-                IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-                availableListViewer.getTable().removeAll();
-                for(Object obj : selection.toArray()){
-                    availableListViewer.setInput(obj);
-                }
-            }
-        });
-        
-        //ディレクトリ下のファイル一覧を持ってくるモデルを適用
-        try {
@@ -348 +336 @@
-            e.printStackTrace();
-        }
+        explorerViewer.addSelectionChangedListener(new ISelectionChangedListener(){
+            public void selectionChanged(SelectionChangedEvent event) {
+                IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+                availableListViewer.getTable().removeAll();
+                for(Object obj : selection.toArray()){
+                    availableListViewer.setInput(obj);
+                }
+            }
+        });
+        
-        return container;
-    }
@@ -586 +584 @@
-            if(element instanceof Icon){
-                Icon icon = (Icon) element;
-
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-
@@ -615 +614 @@
-        
-        private Image getImage(Icon icon){
+            ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, icon.getPath());
-            if(imageRegistry.get(icon.getPath()) == null){
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                }
-            }

org.jalcedo.generator/trunk/org.jalcedo.generator.icon/META-INF/MANIFEST.MF

@@ -3 +3 @@
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.jalcedo.generator.icon
-7
+9
-Bundle-Activator: org.jalcedo.generator.icon.Activator
-Require-Bundle: org.eclipse.core.runtime,

org.jalcedo.generator/trunk/org.jalcedo.generator.icon/src/org/jalcedo/generator/icon/model/CategorizedIcons.java

@@ -24 +24 @@
- */
-public class CategorizedIcons{
-File
+Dir
-    
-    private Bundle bundle;
@@ -38 +38 @@
-    /**
-     * 
-File
+Dir
-     */
-FileName(String importIconFile
-File = importIconFile
+DirName(String importIconDir
+Dir = importIconDir
-    }
-    
@@ -50 +50 @@
-     */
-    public File getIconFile() throws IOException{
-File
+Dir
-        return new File(FileLocator.toFileURL(iconFileURL).getPath());
-    }

org.jalcedo.generator/trunk/org.jalcedo.generator.icon/src/org/jalcedo/generator/icon/model/Icon.java

@@ -7 +7 @@
-    private String path;
-    private String name;
+    private int width;
+    private int height;
-    
-    public Icon(String key, String path, String name){
@@ -46 +48 @@
-    }
-    
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)