Minor debugging

modules/DesktopLayout/src/main/java/org/gephi/desktop/layout/LayoutTopComponent.java

@@ -56,15 +56,15 @@ import org.openide.util.NbBundle;
 import org.openide.windows.TopComponent;
 
 @ConvertAsProperties(dtd = "-//org.gephi.desktop.layout//Layout//EN",
-autostore = false)
+        autostore = false)
 @TopComponent.Description(preferredID = "LayoutTopComponent",
-iconBase = "org/gephi/desktop/layout/resources/small.png",
-persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+        iconBase = "org/gephi/desktop/layout/resources/small.png",
+        persistenceType = TopComponent.PERSISTENCE_ALWAYS)
 @TopComponent.Registration(mode = "layoutmode", openAtStartup = true, roles = {"overview"})
 @ActionID(category = "Window", id = "org.gephi.desktop.layout.LayoutTopComponent")
 @ActionReference(path = "Menu/Window", position = 700)
 @TopComponent.OpenActionRegistration(displayName = "#CTL_LayoutTopComponent",
-preferredID = "LayoutTopComponent")
+        preferredID = "LayoutTopComponent")
 public final class LayoutTopComponent extends TopComponent {
 
     private LayoutPanel layoutPanel;
@@ -83,7 +83,6 @@ public final class LayoutTopComponent extends TopComponent {
         add(layoutPanel, BorderLayout.CENTER);
 
         Lookup.getDefault().lookup(ProjectController.class).addWorkspaceListener(new WorkspaceListener() {
-
             public void initialize(Workspace workspace) {
             }
 
@@ -93,7 +92,9 @@ public final class LayoutTopComponent extends TopComponent {
             }
 
             public void unselect(Workspace workspace) {
-                model.removePropertyChangeListener(layoutPanel);
+                if (model != null) {
+                    model.removePropertyChangeListener(layoutPanel);
+                }
             }
 
             public void close(Workspace workspace) {

modules/MostRecentFilesAPI/src/main/java/org/gephi/desktop/mrufiles/impl/MostRecentFilesImpl.java

 /*
-Copyright 2008-2010 Gephi
-Authors : Mathieu Bastian <mathieu.bastian@gephi.org>
-Website : http://www.gephi.org
-
-This file is part of Gephi.
-
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 2011 Gephi Consortium. All rights reserved.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 3 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://gephi.org/about/legal/license-notice/
-or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License files at
-/cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 3, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 3] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 3 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 3 code and therefore, elected the GPL
-Version 3 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Gephi Consortium.
-*/
+ Copyright 2008-2010 Gephi
+ Authors : Mathieu Bastian <mathieu.bastian@gephi.org>
+ Website : http://www.gephi.org
+
+ This file is part of Gephi.
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2011 Gephi Consortium. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 3 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with the
+ License. You can obtain a copy of the License at
+ http://gephi.org/about/legal/license-notice/
+ or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.  When distributing the software, include this License Header
+ Notice in each file and include the License files at
+ /cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
+ License Header, with the fields enclosed by brackets [] replaced by
+ your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ If you wish your version of this file to be governed by only the CDDL
+ or only the GPL Version 3, indicate your decision by adding
+ "[Contributor] elects to include this software in this distribution
+ under the [CDDL or GPL Version 3] license." If you do not indicate a
+ single choice of license, a recipient has the option to distribute
+ your version of this file under either the CDDL, the GPL Version 3 or
+ to extend the choice of license to its licensees as provided above.
+ However, if you add GPL Version 3 code and therefore, elected the GPL
+ Version 3 license, then the option applies only if the new code is
+ made subject to such option by the copyright holder.
+
+ Contributor(s):
+
+ Portions Copyrighted 2011 Gephi Consortium.
+ */
 package org.gephi.desktop.mrufiles.impl;
 
 import java.beans.PropertyChangeEvent;
@@ -52,7 +52,6 @@ import org.gephi.desktop.mrufiles.api.MostRecentFiles;
 import org.openide.util.NbPreferences;
 import org.openide.util.lookup.ServiceProvider;
 
-
 /**
  *
  * @author Mathieu Bastian
@@ -76,6 +75,7 @@ public class MostRecentFilesImpl implements MostRecentFiles {
         retrieve();
     }
 
+    @Override
     public List<String> getMRUFileList() {
         return mruFileList;
     }
@@ -92,6 +92,7 @@ public class MostRecentFilesImpl implements MostRecentFiles {
         store();
     }
 
+    @Override
     public void addFile(String absolutePath) {
         // remove the old
         mruFileList.remove(absolutePath);
@@ -134,12 +135,16 @@ public class MostRecentFilesImpl implements MostRecentFiles {
         }
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void addPropertyChangeListener(PropertyChangeListener listener) {
         listenerList.add(PropertyChangeListener.class, listener);
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void removePropertyChangeListener(PropertyChangeListener listener) {
         listenerList.remove(PropertyChangeListener.class, listener);
     }
@@ -157,7 +162,9 @@ public class MostRecentFilesImpl implements MostRecentFiles {
         }
     }
 
-    /** Return the backing store Preferences
+    /**
+     * Return the backing store Preferences
+     *
      * @return Preferences
      */
     protected final Preferences getPreferences() {