[Gridarta-commit] SF.net SVN: gridarta:[4672] trunk

[<aki...@us...>]

Revision: 4672
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4672&view=rev
Author:   akirschbaum
Date:     2008-08-01 22:10:44 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Remove CMainControlInstance.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java

Removed Paths:
-------------
    trunk/crossfire/src/cfeditor/CMainControlInstance.java
    trunk/daimonin/src/daieditor/CMainControlInstance.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 22:07:24 UTC (rev 4671)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 22:10:44 UTC (rev 4672)
@@ -224,7 +224,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), "cfeditor", new GlobalSettingsImpl());
-        CMainControlInstance.instance = this;
         globalSettings.readGlobalSettings();
         ScriptArchEditor.setGlobalSettings(globalSettings, this);
         ScriptedEventEditor.setGlobalSettings(globalSettings);

Deleted: trunk/crossfire/src/cfeditor/CMainControlInstance.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControlInstance.java	2008-08-01 22:07:24 UTC (rev 4671)
+++ trunk/crossfire/src/cfeditor/CMainControlInstance.java	2008-08-01 22:10:44 UTC (rev 4672)
@@ -1,46 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2007 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package cfeditor;
-
-/**
- * Utility class managing the {@link CMainControl} singleton.
- * @author Andreas Kirschbaum
- */
-public class CMainControlInstance {
-
-    /**
-     * The singleton instance.
-     */
-    static CMainControl instance = null;
-
-    /**
-     * Private constructor to prevent instantiation.
-     */
-    private CMainControlInstance() {
-    }
-
-    public static synchronized CMainControl getInstance() {
-        if (instance == null) {
-            instance = new CMainControl();
-        }
-        return instance;
-    }
-
-} // class CMainControlInstance

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 22:07:24 UTC (rev 4671)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 22:10:44 UTC (rev 4672)
@@ -279,7 +279,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), "daieditor", new GlobalSettingsImpl());
-        CMainControlInstance.instance = this;
         globalSettings.readGlobalSettings();
         ScriptArchEditor.setGlobalSettings(globalSettings, this);
         ScriptedEventEditor.setGlobalSettings(globalSettings);

Deleted: trunk/daimonin/src/daieditor/CMainControlInstance.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControlInstance.java	2008-08-01 22:07:24 UTC (rev 4671)
+++ trunk/daimonin/src/daieditor/CMainControlInstance.java	2008-08-01 22:10:44 UTC (rev 4672)
@@ -1,46 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2007 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package daieditor;
-
-/**
- * Utility class managing the {@link CMainControl} singleton.
- * @author Andreas Kirschbaum
- */
-public class CMainControlInstance {
-
-    /**
-     * The singleton instance.
-     */
-    static CMainControl instance = null;
-
-    /**
-     * Private constructor to prevent instantiation.
-     */
-    private CMainControlInstance() {
-    }
-
-    public static synchronized CMainControl getInstance() {
-        if (instance == null) {
-            instance = new CMainControl();
-        }
-        return instance;
-    }
-
-} // class CMainControlInstance


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.