Ticket #2282: design-code-file-icons.patch

src/main/java/org/sophie2/main/func/file/dialogs/Icons.java

@@ +1 @@
+package org.sophie2.main.func.file.dialogs;
+
+import java.io.File;
+
+import javax.swing.Icon;
+
+import org.sophie2.base.commons.util.ImmImage;
+import org.sophie2.base.skins.SkinElementId;
+import org.sophie2.base.skins.SkinUtil;
+import org.sophie2.core.prolib.impl.AutoProperty;
+import org.sophie2.core.prolib.impl.BaseProObject;
+import org.sophie2.core.prolib.interfaces.Prop;
+import org.sophie2.main.func.file.FileIconProvider;
+
+public class Icons {
+
+        
+        @SkinElementId("main.func.file.dialogs.file-icons")
+        public static class FileIcon extends BaseProObject {
+
+                /**
+                 * The skin id of the icons for this button.
+                 */
+                public static final String ICONS_PROP_ID = "button-icons";
+
+                private static FileIcon instance = new FileIcon();
+                
+                private FileIcon() {
+                        
+                }
+                
+                public static FileIcon get() {
+                        return instance;
+                }
+
+                public Prop<ImmImage> fileIcon() {
+                        class fileIcon extends AutoProperty<ImmImage> {
+
+                                @Override
+                                protected ImmImage compute() {
+                                        return SkinUtil.getSkinValue(FileIcon.this.getClass(), ICONS_PROP_ID, ImmImage.class);
+                                }
+                        }
+                        return getBean().makeProp(fileIcon.class);
+                }
+        }
+
+        @SkinElementId("main.func.file.dialogs.text-icons")
+        public static class TextIcon extends FileIcon implements FileIconProvider {
+                
+                public Icon getIcon(File file) {
+                        if (file.getName().endsWith(".txt")) {
+                                return fileIcon().get().toIcon();
+                        }
+                        return null;
+                }
+        }
+}

src/main/java/org/sophie2/main/func/file/FileIconProvider.java

@@ +1 @@
+package org.sophie2.main.func.file;
+
+import java.io.File;
+
+import javax.swing.Icon;
+
+public interface FileIconProvider {
+
+        public Icon getIcon(File file);
+}

src/main/java/org/sophie2/main/func/file/FileFunctionalityModule.java

@@ -1 +1 @@
 package org.sophie2.main.func.file;
 
+import java.awt.datatransfer.DataFlavor;
+import java.io.File;
 import java.util.List;
 
+import javax.swing.Icon;
+
+import org.sophie2.base.commons.util.ImageUtil;
 import org.sophie2.base.dialogs.Dialog;
+import org.sophie2.base.skins.BaseSkinPart;
+import org.sophie2.base.skins.SkinUtil;
 import org.sophie2.core.modularity.SimpleSophieExtension;
 import org.sophie2.core.modularity.SophieExtension;
 import org.sophie2.core.modularity.SophieExtensionPoint;
 import org.sophie2.core.modularity.SophieModule;
 import org.sophie2.main.func.file.dialogs.FileDialog;
+import org.sophie2.main.func.file.dialogs.Icons;
 
 /**
  * Module class for the file functionality modules
@@ -17 +25 @@
  */
 public class FileFunctionalityModule extends SophieModule {
 
+        private static FileFunctionalityModule instance = null;
+
         @Override
         protected void doStart() {
-                // nothing
-
+                assert instance == null;
+                instance = this;
         }
 
         @Override
         protected void doStop() {
-                // nothing
+                assert instance == this;
+                instance = null;
         }
+        
+        /**
+         * Gets the module instance.
+         * 
+         * @return the instance or null if not active
+         */
+        public static FileFunctionalityModule get() {
+                return instance;
+        }
+        
+        private FileIconProviderPoint dndDataExtensionPoint = null;
+        
+        /**
+         * Gets the extension point for {@link DndProvider} implementations.
+         * 
+         * @return The extension point.
+         */
+        public FileIconProviderPoint getFileIconProviderPoint() {
+                if (this.dndDataExtensionPoint == null) {
+                        this.dndDataExtensionPoint = new FileIconProviderPoint();
+                }
 
+                return this.dndDataExtensionPoint;
+        }
+        
         @Override
         protected void defineExtensionPoints(List<SophieExtensionPoint<?>> res) {
                 //no extension points
+                
+                res.add(getFileIconProviderPoint());
         }
 
         @SuppressWarnings("unchecked")
@@ -38 +75 @@
         protected void defineExtensions(List<SophieExtension<?>> res) {
                 res.add(new SimpleSophieExtension<Dialog>(
                                                 Dialog.class, new FileDialog()));
+                
+                res.add(initSkin().asExtension());
+                
+                res.add(new SimpleSophieExtension<FileIconProvider>(FileIconProvider.class,
+                                new Icons.TextIcon()));
         }
 
+        private BaseSkinPart initSkin() {
+                BaseSkinPart part = new BaseSkinPart();
+                
+                part.add(SkinUtil.getElementId(Icons.FileIcon.class), 
+                                Icons.FileIcon.ICONS_PROP_ID, 
+                                ImageUtil.loadIcon("file.png"));
+
+                part.add(SkinUtil.getElementId(Icons.TextIcon.class), 
+                                Icons.FileIcon.ICONS_PROP_ID, 
+                                ImageUtil.loadIcon("text.png"));
+
+                return part;
+        }
+        
+        
+        
+        
+        public static class FileIconProviderPoint extends SophieExtensionPoint<FileIconProvider> {
+                @Override
+                public Class<FileIconProvider> getExtensionClass() {
+                        return FileIconProvider.class;
+                }
+                
+                public FileIconProvider getProvider(File file) {
+                        for(SophieExtension<FileIconProvider> e : extensions().get()) {
+                                FileIconProvider provider = e.getObject();
+                                Icon icon = provider.getIcon(file);
+                                if (icon != null) {
+                                        return provider;        
+                                }
+                        }
+                        return null;
+                }       
+        }
 }
+ No newline at end of file

src/main/java/org/sophie2/main/func/file/dialogs/FileDialog.java

@@ -1 +1 @@
 package org.sophie2.main.func.file.dialogs;
 
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Graphics;
 import java.awt.Insets;
+import java.awt.Polygon;
 import java.io.File;
 
 import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JFileChooser;
 import javax.swing.JPanel;
+import javax.swing.filechooser.FileView;
 
+import org.sophie2.base.commons.util.ImmImage;
 import org.sophie2.base.dialogs.Dialog;
 import org.sophie2.base.dialogs.DialogManager;
+import org.sophie2.base.skins.SkinElementId;
+import org.sophie2.base.visual.BaseSwingVisualElement;
+import org.sophie2.core.logging.SophieLog;
+import org.sophie2.core.prolib.impl.ResourceProperty;
+import org.sophie2.core.prolib.interfaces.Prop;
 import org.sophie2.main.dialogs.input.ConfirmDialogInput;
 import org.sophie2.main.dialogs.input.DialogUtils;
 import org.sophie2.main.dialogs.input.FileDialogInput;
 import org.sophie2.main.dialogs.input.FileDialogInput.AccessoryData;
 import org.sophie2.main.dialogs.input.FileDialogInput.FileAccessory;
+import org.sophie2.main.func.file.FileFunctionalityModule;
+import org.sophie2.main.func.file.FileIconProvider;
 
 /**
  * A file dialog for Sophie2.
@@ -27 +40 @@
 public class FileDialog extends Dialog<FileDialogInput, FileDialogInput.FileContainer> {
 
         private final JFileChooser fileChooser = new JFileChooser();
+        
+        public FileDialog() {
+                this.fileChooser.setFileView(new SophieFileView());
+        }
 
         @SuppressWarnings("fallthrough")
         @Override
@@ -149 +166 @@
         public Class<FileDialogInput.FileContainer> getOutputClass() {
                 return FileDialogInput.FileContainer.class;
         }
-}
+
+
+        class SophieFileView extends FileView {
+
+                  public Icon getIcon(File file) {
+                    if (file.isDirectory()) {
+                      return null;
+                    }
+                   
+                    Icon icon = null;
+                    icon = new ImageIcon();
+                    
+                    FileIconProvider provider = 
+                                FileFunctionalityModule.get().getFileIconProviderPoint().getProvider(file);
+                        
+                        if (provider != null) {
+                                icon = provider.getIcon(file);
+                        } else {
+                                ImmImage fileIcon = Icons.FileIcon.get().fileIcon().get();
+                                if (fileIcon != null) {
+                                        icon = fileIcon.toIcon();
+                                }
+                        }
+                        
+                    return icon;
+                  }
+                }
+        }
+