[power-architect] r3842 committed - Fixed up the OS X build so that the app works nicely in OS X (ie can b...

codesite-noreply Thu, 05 Aug 2010 12:37:53 -0700

Revision: 3842
Author: [email protected]
Date: Thu Aug  5 12:36:09 2010

Log: Fixed up the OS X build so that the app works nicely in OS X (ie canbe assigned to spaces, can open files by DnD onto the Dock)

http://code.google.com/p/power-architect/source/detail?r=3842


Modified:
 /trunk/osx_packaging_utils/ca/sqlpower/architect/swingui/OSXAdapter.java
 /trunk/osx_packaging_utils/osx_adapter.jar
 /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java

/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java/trunk/src/main/java/ca/sqlpower/architect/swingui/action/OpenProjectAction.java


=======================================

---/trunk/osx_packaging_utils/ca/sqlpower/architect/swingui/OSXAdapter.javaTue Mar 25 07:38:28 2008+++/trunk/osx_packaging_utils/ca/sqlpower/architect/swingui/OSXAdapter.javaThu Aug 5 12:36:09 2010

@@ -77,12 +77,14 @@
     private final Action quitAction;
     private final Action prefsAction;
     private final Action aboutAction;
+    private final Action openAction;

- private OSXAdapter (Action quitAction, Action prefsAction, ActionaboutAction) {+ private OSXAdapter (Action quitAction, Action prefsAction, ActionaboutAction, Action openAction) {

         this.quitAction = quitAction;
         this.prefsAction = prefsAction;
         this.aboutAction = aboutAction;
+        this.openAction = openAction;
     }

// implemented handler methods. These are basically hooks intoexisting

@@ -123,18 +125,21 @@

     @Override
     public void handleOpenFile(ApplicationEvent ae) {

- throw new IllegalStateException("Drag'n'Drop files on the dock notsupported yet.");

+        if (openAction != null) {
+            ae.setHandled(true);

+ openAction.actionPerformed(new ActionEvent(this, 0, "file:" +ae.getFilename()));

+        }
     }

// The main entry-point for this functionality. This is the onlymethod

     // that needs to be called at runtime, and it can easily be done using
     // reflection (see MyApp.java)

- public static void registerMacOSXApplication(Action quitAction, ActionprefsAction, Action aboutAction) {+ public static void registerMacOSXApplication(Action quitAction, ActionprefsAction, Action aboutAction, Action openAction) {

         if (theApplication == null) {
             theApplication = new com.apple.eawt.Application();
         }
         if (theAdapter == null) {

- theAdapter = new OSXAdapter(quitAction, prefsAction,aboutAction);+ theAdapter = new OSXAdapter(quitAction, prefsAction,aboutAction, openAction);

         }
         theApplication.addApplicationListener(theAdapter);
     }
=======================================
--- /trunk/osx_packaging_utils/osx_adapter.jar  Fri Nov 10 12:39:01 2006
+++ /trunk/osx_packaging_utils/osx_adapter.jar  Thu Aug  5 12:36:09 2010
@@ -2,47 +2,38 @@
 s{j5  META-INF/PK
 r{j5P?{s^jMETA-INF/MANIFEST.MFóMÌËLK-.Ñ
 K-*ÎÌÏ³R0Ô3àårÌCq,HLÎHU%Íôx¹RKRSt*AêMõâ
-ÌtÍL4

-rRósJKRt<óõ4y¹x¹PK
+rR<óõ4y¹x¹PK
 j{j5ca/PK
 q{j5ca/sqlpower/PK
 q{j5ca/sqlpower/architect/PK
 s{j5
 ca/sqlpower/architect/swingui/PK

s{j5DE33.ca/sqlpower/architect/swingui/OSXAdapter.classßSÔVÇ¿ww%K6

-®B
-Ý%ÑVÛVEÁ.¢Ã#¾]Dc¬Ø¿¨Ïba§e¦}«3þQçÞ,4Së>Üó9?÷~üôç_®â3èÅ)LÊcJ
-uØ¸¢áª
-|WÁ÷¸¦áz?èèÅeüTÆt3ÒtVÃ
-
-ýág
-7u·¤æ¶<æ4ÜaÐÓM1çò(1Õt¸¼ö£pKÄ6M/Nj'[^°Ñòìåg

-ÛYÒ3|Ïá©çnøÊæ¤¶à[©ûjöúëÎ9�...@óÃßfd;ÓM%Åz²oTákaëÀ¥çxéM[nÎ_«ÊPººø<p}1'£05¾ÿÂ¤Ê÷dæô±

-Piî  H}É^#Üó|
-3
-/¡¦-qGv0ß³øZF#N©ñ|ü©w
-Ãy#ò¨á¼y°eI¶ÌNÈ:U©ô¤ã=
-¿¸E²ô9¾èûbû+)OÅÂ[GDYðÑ\ý3¦j¶ÉÏô3hù¾D>`¨ªyÆTú9ý·3¦
-ø!+ó1ß¨õù8ÌujPbÒgÚ%Ó
-f¦fÒ¢0N
-kþ*ÒËñ
-~ôpÅCãkWV5jà!dSGfü7
-9ýÚÿ¬íB"Òûª      .¥j6
-åµÏìbNµÆÚ«êá]eèËº÷XÄëaüJk
-b×
-P Óî¹ëæÒmÊdeõ/-þ¾BQmjaÝÜ., 
-Qº[ÎÐuº=érn$«r
-éÈ
-r`øÞLz+
-°Ú`ÖÄ
-ÖäÖÔJï 0Ö±¦�...@rÊú
-¥02qÚÅ1ù¼u«ÈÚ�...@¹ßp|½«U½Êßû]1Å
-¦xÆÈc.uÅ$¦a
-G`ç1õÌ 
-£+£ÒHÙô¢qÐ¦ijpQÚFßë_mãä{ôm£úý{8µjML¶1ð
-Õm¥ÝÅéw
-Ì8¬f1gcúw1yà3PK
+îüö¹ÏÜÙ¼~óç_.ã
+gp¥I\åáñð±Oð©q\Çg*nÄð¹
+_Ä°ÃMKq%[
+yËm}É;*V4ô»*¾Ò(æye¯U¬)Ð¼m¹XOVyKµ'N¥¼+«¦¨ZÛ¶'-Ï¬íÚîVÝ6×
+[¹
+NðÎJÅ±-áÙeWÁé¼UÞ1-IS]Ïìø/åkOê¶·h¹#ùÇâ©xÍ`râªÜ¬µâb£\?Ü¢+Òm?ô]·]Û»¡ îEú?ksDÊ%I¶
+[rä"ËP0~OËO¥ëù{
+°~]ûbÃ!ÈpY§ÊdUº¬Q-ÁÚ=r
+Ö¨¼Û6ïHVå]#W
+Åw
+.cFHúÑÜ
+³X×qçuLópWqOÇ7¸¬`ë4Y²dR}Í¼» â¾oAê'ýLG+#·Cåxrù%+©Sr)ÿRÂç¥ìZÊ;#¿S0ÛUx.åï;éôÒ#;r)n®SG²
+^NëfÝvJÜ³ÑMò,§ã!:
+á{

+?ðÂ}üyé8IéÿÚð\SZÇøIÇÏléÔñìÃûNsCLþK×P;Ô¤wÇ· D]ÛxLzVòïÖï·Z¢»}ÞËêf¹ºÃÄÉ±çùû Ñtïôlé"Û+¡k©u(|·¤ÇÍì

+jètw.%Å¼r0W0&J¥_òÜþ.[8û¾K×Nóµ&ÉÄeÿr:ZnUºuLÑï}nûèÓIÇN3b¯§[ñB+ÎøQE
+
+æèi¢'&#³1¿°ÝGÄHFö}þ£/)2=KôÖÅ¬ñ;"/q6i çPFXi"öúCø
+ÐxúßÏ}È<ÎõÓ<Ûîô^ì        10
+CÇOôÀ»¾mÀ5D_âR[a4
+`°ØÄPb¸D¦i¿å
+rý¸thÿ-¡xq£¯XÌqN½Àè
+Æ_aøÉ¢Ï61ñã{þr¼¥tè$?¤ßÝ%
+ÅñnâèD§ß3üPK
 s{j5  íAMETA-INF/PK
 r{j5P?{s^j¤'META-INF/MANIFEST.MFPK
 j{j5íA·ca/PK
=======================================

--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.javaThu Aug 5 08:12:31 2010+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.javaThu Aug 5 12:36:09 2010

@@ -1526,6 +1526,10 @@
     public JMenuItem getEnterpriseLinkButton() {
         return enterpriseLinkButton;
     }
+
+    public OpenProjectAction getOpenProjectAction() {
+        return openProjectAction;
+    }

     public Action getOpenServerManagerAction() {
         return openServerManagerAction;
=======================================

---/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.javaWed Aug 4 13:00:45 2010+++/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.javaThu Aug 5 12:36:09 2010

@@ -521,20 +521,22 @@
         Action exitAction = frame.getExitAction();
         PreferencesAction prefAction = frame.getPrefAction();
         AboutAction aboutAction = frame.getAboutAction();
+        Action openProjectAction = frame.getOpenProjectAction();

// Whether or not this is OS X, the three actions we'rereferencing must have been initialized by now.if (exitAction == null) throw new IllegalStateException("Exitaction has not been initialized"); //$NON-NLS-1$if (prefAction == null) throw new IllegalStateException("Prefsaction has not been initialized"); //$NON-NLS-1$if (aboutAction == null) throw new IllegalStateException("Aboutaction has not been initialized"); //$NON-NLS-1$+ if (openProjectAction == null) throw newIllegalStateException("Open Project action has not been initialized");//$NON-NLS-1$


         if (context.isMacOSX()) {
             try {

Class<?> osxAdapter =ArchitectSwingSessionImpl.class.getClassLoader().loadClass("ca.sqlpower.architect.swingui.OSXAdapter");//$NON-NLS-1$

- // The main registration method. Takes quitAction,prefsAction, aboutAction.- Class<?>[] defArgs = { Action.class, Action.class,Action.class };+ // The main registration method. Takes quitAction,prefsAction, aboutAction, openAction.+ Class<?>[] defArgs = { Action.class, Action.class,Action.class, Action.class };Method registerMethod =osxAdapter.getDeclaredMethod("registerMacOSXApplication", defArgs);//$NON-NLS-1$

-                Object[] args = { exitAction, prefAction, aboutAction };

+ Object[] args = { exitAction, prefAction, aboutAction,openProjectAction };

                 registerMethod.invoke(osxAdapter, args);

                 // The enable prefs method.  Takes a boolean.
=======================================

---/trunk/src/main/java/ca/sqlpower/architect/swingui/action/OpenProjectAction.javaWed Jul 28 09:52:56 2010+++/trunk/src/main/java/ca/sqlpower/architect/swingui/action/OpenProjectAction.javaThu Aug 5 12:36:09 2010

@@ -103,17 +103,24 @@
     }

     public void actionPerformed(ActionEvent e) {

- JFileChooser chooser = newJFileChooser(getSession().getRecentMenu().getMostRecentFile());

-        chooser.addChoosableFileFilter(SPSUtils.ARCHITECT_FILE_FILTER);
-        int returnVal = chooser.showOpenDialog(frame);
-        if (returnVal == JFileChooser.APPROVE_OPTION) {
-            File f = chooser.getSelectedFile();
-            try {

-fileLoader.openAsynchronously(getSession().getContext().createSession(), f,getSession());

-            } catch (SQLObjectException ex) {

-SPSUtils.showExceptionDialogNoReport(getSession().getArchitectFrame(),-Messages.getString("OpenProjectAction.failedToOpenProjectFile"), ex);//$NON-NLS-1$

-            }
+        File f;
+        if (!e.getActionCommand().startsWith("file:")) {

+ JFileChooser chooser = newJFileChooser(getSession().getRecentMenu().getMostRecentFile());

+            chooser.addChoosableFileFilter(SPSUtils.ARCHITECT_FILE_FILTER);
+            int returnVal = chooser.showOpenDialog(frame);
+            if (returnVal == JFileChooser.APPROVE_OPTION) {
+                f = chooser.getSelectedFile();
+            } else {
+                return;
+            }
+        } else {
+            f = new File(e.getActionCommand().substring("file:".length()));
+        }
+        try {

+fileLoader.openAsynchronously(getSession().getContext().createSession(), f,getSession());

+        } catch (SQLObjectException ex) {

+SPSUtils.showExceptionDialogNoReport(getSession().getArchitectFrame(),+Messages.getString("OpenProjectAction.failedToOpenProjectFile"), ex);//$NON-NLS-1$

         }
     }

[power-architect] r3842 committed - Fixed up the OS X build so that the app works nicely in OS X (ie can b...

Reply via email to