Changeset 3027 for DataCleaner

Timestamp:

01/14/12 22:21:33 (4 months ago)

Author:

kasper

Message:

Ticket #730: Applied the "macify" library to add integration with top-menu in Mac OS

Location:

DataCleaner/trunk/core

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/org/eobjects/datacleaner/actions/OpenAnalysisJobActionListener.java (modified) (8 diffs)
• src/main/java/org/eobjects/datacleaner/bootstrap/Bootstrap.java (modified) (2 diffs)
• src/main/java/org/eobjects/datacleaner/macos (added)
• src/main/java/org/eobjects/datacleaner/macos/MacOSManager.java (added)
• src/main/java/org/eobjects/datacleaner/windows/AnalysisJobBuilderWindowImpl.java (modified) (1 diff)

DataCleaner/trunk/core/pom.xml

@@ -1 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <modelVersion>4.0.0</modelVersion>
         <parent>
@@ -53 +54 @@
                 </dependency>
                 <dependency>
+                        <groupId>org.simplericity.macify</groupId>
+                        <artifactId>macify</artifactId>
+                        <version>1.6</version>
+                </dependency>
+                <dependency>
                         <groupId>net.sf.jung</groupId>
                         <artifactId>jung-visualization</artifactId>

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/actions/OpenAnalysisJobActionListener.java

@@ -26 +26 @@
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -47 +46 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.google.inject.util.Providers;
 
 /**
@@ -62 +62 @@
         private final AnalysisJobBuilderWindow _parentWindow;
         private final WindowContext _windowContext;
-        private final Provider<OpenAnalysisJobActionListener> _openAnalysisJobActionListenerProvider;
         private final DCModule _parentModule;
         private final UserPreferences _userPreferences;
@@ -69 +68 @@
         @Inject
         protected OpenAnalysisJobActionListener(AnalysisJobBuilderWindow parentWindow, AnalyzerBeansConfiguration configuration,
-                        WindowContext windowContext, Provider<OpenAnalysisJobActionListener> openAnalysisJobActionListenerProvider,
-                        DCModule parentModule, UserPreferences userPreferences, UsageLogger usageLogger) {
+                        WindowContext windowContext, DCModule parentModule, UserPreferences userPreferences, UsageLogger usageLogger) {
                 _parentWindow = parentWindow;
                 _configuration = configuration;
                 _windowContext = windowContext;
-                _openAnalysisJobActionListenerProvider = openAnalysisJobActionListenerProvider;
                 _parentModule = parentModule;
                 _userPreferences = userPreferences;
@@ -87 +84 @@
 
                 OpenAnalysisJobFileChooserAccessory accessory = new OpenAnalysisJobFileChooserAccessory(_windowContext,
-                                _configuration, fileChooser, _openAnalysisJobActionListenerProvider);
+                                _configuration, fileChooser, Providers.of(this));
                 fileChooser.setAccessory(accessory);
 
@@ -102 +99 @@
          * Opens a job file
          * 
-         * @param parentWindow
-         *            the parent window that invoked this open call, or null if none
-         *            exists
          * @param file
-         * @param configuration
          */
         public void openFile(File file) {
@@ -121 +114 @@
                         if (result == JOptionPane.OK_OPTION) {
                                 OpenAnalysisJobAsTemplateDialog dialog = new OpenAnalysisJobAsTemplateDialog(_windowContext, _configuration,
-                                                file, metadata, _openAnalysisJobActionListenerProvider);
+                                                file, metadata, Providers.of(this));
                                 dialog.setVisible(true);
                         }
@@ -131 +124 @@
          * 
          * @param file
-         * @param configuration
          * @param ajb
          */

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/bootstrap/Bootstrap.java

@@ -39 +39 @@
 import org.eobjects.datacleaner.extensionswap.ExtensionSwapInstallationHttpContainer;
 import org.eobjects.datacleaner.guice.DCModule;
+import org.eobjects.datacleaner.macos.MacOSManager;
 import org.eobjects.datacleaner.regexswap.RegexSwapUserPreferencesHandler;
 import org.eobjects.datacleaner.user.DataCleanerHome;
@@ -178 +179 @@
                         final HttpClient httpClient = injector.getInstance(HttpClient.class);
 
+                        // initialize Mac OS specific settings
+                        final MacOSManager macOsManager = injector.getInstance(MacOSManager.class);
+                        macOsManager.init();
+
                         // set up HTTP service for ExtensionSwap installation
                         loadExtensionSwapService(userPreferences, windowContext, configuration, httpClient, usageLogger);

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/windows/AnalysisJobBuilderWindowImpl.java

@@ -710 +710 @@
                         // TODO also handle exploring analyzers
                 }
-                logger.warn("Could not handle removal of tab {}, containing {}", ev.getTabIndex(), panel);
+                logger.info("Could not handle removal of tab {}, containing {}", ev.getTabIndex(), panel);
         }