Changeset 686

Timestamp:

08/05/10 19:00:37 (18 months ago)

Author:

octorian

Message:

Initial platform support for BlackBerry OS 6.0.0

Location:

trunk

Files:

• LogicMail/src/org/logicprobe/LogicMail/PlatformInfo.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/ui/ScreenFactory.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/ui/StandardScreen.java (modified) (6 diffs)
• LogicMail_BB47/src/org/logicprobe/LogicMail/ui/ScreenFactoryBB47.java (modified) (3 diffs)
• LogicMail_BB60 (added)
• LogicMail_BB60/.classpath (added)
• LogicMail_BB60/.project (added)
• LogicMail_BB60/.settings (added)
• LogicMail_BB60/.settings/org.eclipse.jdt.core.prefs (added)
• LogicMail_BB60/BlackBerry_App_Descriptor.xml (added)
• LogicMail_BB60/res (added)
• LogicMail_BB60/src (added)
• LogicMail_BB60/src/org (added)
• LogicMail_BB60/src/org/logicprobe (added)
• LogicMail_BB60/src/org/logicprobe/LogicMail (added)
• LogicMail_BB60/src/org/logicprobe/LogicMail/PlatformInfoBB60.java (added)
• LogicMail_BB60/src/org/logicprobe/LogicMail/ui (added)
• LogicMail_BB60/src/org/logicprobe/LogicMail/ui/ScreenFactoryBB60.java (added)
• LogicMail_BB60/src/org/logicprobe/LogicMail/ui/StandardScreenBB60.java (added)
• LogicMail_BB60/src/org/logicprobe/LogicMail/ui/StandardTouchScreenBB60.java (added)

trunk/LogicMail/src/org/logicprobe/LogicMail/PlatformInfo.java

@@ -47 +47 @@
      */
     private static String[] infoClasses = {
+        "org.logicprobe.LogicMail.PlatformInfoBB60",
         "org.logicprobe.LogicMail.PlatformInfoBB50",
         "org.logicprobe.LogicMail.PlatformInfoBB47",

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/ScreenFactory.java

@@ -47 +47 @@
      */
     private static String[] factoryClasses = {
+        "org.logicprobe.LogicMail.ui.ScreenFactoryBB60",
         "org.logicprobe.LogicMail.ui.ScreenFactoryBB50",
         "org.logicprobe.LogicMail.ui.ScreenFactoryBB47",

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/StandardScreen.java

@@ -54 +54 @@
     protected static StatusBarField statusBarField = new StatusBarField();
     private NavigationController navigationController;
-    private HeaderField headerField;
+    private Field titleField;
     private Field originalStatusField;
     private Field currentStatusField;
@@ -88 +88 @@
         // Create screen elements
         if(screenProvider.getTitle() != null) {
-            this.headerField = new HeaderField(resources.getString(LogicMailResource.APPNAME) + " - " + screenProvider.getTitle());
-            setTitle(headerField);
+            this.titleField = createTitleField();
+            setTitle(titleField);
         }
 
@@ -95 +95 @@
         screenProvider.setNavigationController(navigationController);
         screenProvider.initFields(this);
+    }
+    
+    protected Field createTitleField() {
+        return new HeaderField(
+                resources.getString(LogicMailResource.APPNAME)
+                + " - "
+                + screenProvider.getTitle());
     }
 
@@ -243 +250 @@
                     }
                 }
-                headerField.removeListeners();
+                cleanupTitleField(titleField);
                 NotificationHandler.getInstance().shutdown();
                 System.exit(0);
@@ -249 +256 @@
         }
         else {
-            headerField.removeListeners();
+            cleanupTitleField(titleField);
             NotificationHandler.getInstance().shutdown();
             System.exit(0);
@@ -255 +262 @@
     }
 
+    protected void cleanupTitleField(Field titleField) {
+        ((HeaderField)titleField).removeListeners();
+    }
+    
     /**
      * Shows the configuration screen.

trunk/LogicMail_BB47/src/org/logicprobe/LogicMail/ui/ScreenFactoryBB47.java

@@ -47 +47 @@
     public StandardScreen getMailHomeScreen(NavigationController navigationController, MailRootNode mailRootNode) {
         if(hasTouchscreen) {
-            return new StandardTouchScreen(navigationController, new TouchMailHomeScreen(mailRootNode));
+            return getStandardTouchScreen(navigationController, new TouchMailHomeScreen(mailRootNode));
         }
         else {
@@ -56 +56 @@
     public StandardScreen getMailboxScreen(NavigationController navigationController, MailboxNode mailboxNode) {
         if(hasTouchscreen) {
-            return new StandardTouchScreen(navigationController, new MailboxScreen(mailboxNode));
+            return getStandardTouchScreen(navigationController, new MailboxScreen(mailboxNode));
         }
         else {
@@ -76 +76 @@
     }
     
+    protected StandardScreen getStandardTouchScreen(NavigationController navigationController, ScreenProvider screenProvider) {
+        return new StandardTouchScreen(navigationController, screenProvider);
+    }
 }