renamed EntryPoint class so default Netbeans packager uses a sensible

name for osx app title Updated build date/version
CharlesSkelton · Feb 28, 2018 · 0669d6d · 0669d6d
1 parent fb79cfd
commit 0669d6d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/src/studio/core/EntryPoint.java → src/studio/core/Studio.java b/src/studio/core/EntryPoint.java → src/studio/core/Studio.java
@@ -4,12 +4,12 @@
 import java.util.Locale;
 import studio.kdb.Config;
 import studio.ui.ExceptionGroup;
-import studio.ui.Studio;
+import studio.ui.StudioPanel;
 
 import java.util.TimeZone;
 import javax.swing.UIManager;
 
-public class EntryPoint {
+public class Studio {
     public static void main(final String[] args) {
         TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
 
@@ -63,7 +63,7 @@ public static void main(final String[] args) {
 
         new Thread(exceptionThreadGroup,"Init thread") {
             public void run() {
-                Studio.init(args);
+                StudioPanel.init(args);
             }
         }.start();
 

diff --git a/src/studio/kdb/Lm.java b/src/studio/kdb/Lm.java
@@ -9,14 +9,14 @@
 
 public class Lm {
     private static int majorVersion = 3;
-    private static int minorVersion = 33;
+    private static int minorVersion = 34;
     public static Date buildDate;
 
     static {
         try {
             SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");
             f.setTimeZone(TimeZone.getTimeZone("GMT"));
-            buildDate = f.parse("20151008");
+            buildDate = f.parse("20180228");
         }
         catch (ParseException e) {
         }

diff --git a/src/studio/ui/AboutHandler.java b/src/studio/ui/AboutHandler.java
@@ -1,9 +1,9 @@
 package studio.ui;
 
 public class AboutHandler {
-    private Studio s;
+    private StudioPanel s;
 
-    public AboutHandler(Studio s) {
+    public AboutHandler(StudioPanel s) {
         this.s = s;
     }
 

diff --git a/src/studio/ui/QuitHandler.java b/src/studio/ui/QuitHandler.java
@@ -1,9 +1,9 @@
 package studio.ui;
 
 public class QuitHandler {
-    private Studio s;
+    private StudioPanel s;
 
-    public QuitHandler(Studio s) {
+    public QuitHandler(StudioPanel s) {
         this.s = s;
     }
 

diff --git a/src/studio/ui/Studio.java → src/studio/ui/StudioPanel.java b/src/studio/ui/Studio.java → src/studio/ui/StudioPanel.java
@@ -32,7 +32,7 @@
 import studio.utils.OSXAdapter;
 import studio.utils.SwingWorker;
 
-public class Studio extends JPanel implements Observer,WindowListener {
+public class StudioPanel extends JPanel implements Observer,WindowListener {
     static {
         // Register us
         LocaleSupport.addLocalizer(new Impl("org.netbeans.editor.Bundle"));
@@ -937,8 +937,8 @@ else if ((row == 1) && ((noWins % 3) > 1))
                 Object o = i.next();
                 JFrame f;
 
-                if (o instanceof Studio)
-                    f = ((Studio) o).frame;
+                if (o instanceof StudioPanel)
+                    f = ((StudioPanel) o).frame;
                 else
                     f = (JFrame) o;
 
@@ -1067,7 +1067,7 @@ public void actionPerformed(ActionEvent e) {
                                                    new Integer(KeyEvent.VK_N),
                                                    null) {
             public void actionPerformed(ActionEvent e) {
-                new Studio(server,null);
+                new StudioPanel(server,null);
             }
         };
 
@@ -1325,8 +1325,8 @@ public boolean quit() {
         for (int i = 0;i < objs.length;i++) {
             Object o = objs[i];
 
-            if (o instanceof Studio) {
-                if (!((Studio) o).quitWindow())
+            if (o instanceof StudioPanel) {
+                if (!((StudioPanel) o).quitWindow())
                     okToExit = false;
             }
             else
@@ -1530,8 +1530,8 @@ public void actionPerformed(ActionEvent e) {
 
                 final Object o = it.next();
 
-                if (o instanceof Studio) {
-                    Studio r = (Studio) o;
+                if (o instanceof StudioPanel) {
+                    StudioPanel r = (StudioPanel) o;
                     String filename = (String) r.textArea.getDocument().getProperty("filename");
 
                     if (filename != null)
@@ -1550,8 +1550,8 @@ public void actionPerformed(ActionEvent e) {
                 item.addActionListener(new ActionListener() {
 
                                        public void actionPerformed(ActionEvent e) {
-                                           if (o instanceof Studio) {
-                                               JFrame f = ((Studio) o).frame;
+                                           if (o instanceof StudioPanel) {
+                                               JFrame f = ((StudioPanel) o).frame;
                                                ensureDeiconified(f);
                                            }
                                            else
@@ -1801,7 +1801,7 @@ private void toggleDividerOrientation() {
         splitpane.setDividerLocation(0.5);
     }
 
-    public Studio(Server server,String filename) {
+    public StudioPanel(Server server,String filename) {
         super(true);
 
         registerForMacOSXEvents();
@@ -1932,7 +1932,7 @@ public static void init(String[] args) {
             if (lruServer != null)
                 s = Config.getInstance().getServer(lruServer);
 
-            new Studio(s,filename);
+            new StudioPanel(s,filename);
         }
         catch (Exception e) {
             e.printStackTrace();
@@ -2309,7 +2309,7 @@ public void removeUpdate(DocumentEvent evt) {
     }
 
     public static ImageIcon getImage(String strFilename) {
-        Class thisClass = Studio.class;
+        Class thisClass = StudioPanel.class;
 
         java.net.URL url = null;