Merge branch '2546-macos-freeze' into 0.9.8

modules/PerspectiveAPI/src/main/java/org/gephi/perspective/PerspectiveControllerImpl.java

@@ -87,50 +87,50 @@ public class PerspectiveControllerImpl implements PerspectiveController {
 
         //Store selected in prefs
         NbPreferences.root().put(SELECTED_PERSPECTIVE_PREFERENCE, selectedPerspective);
-
-        Perspective selectedPerspectiveInstance = getSelectedPerspective();
-
-        openAndCloseMembers(selectedPerspectiveInstance);
-
-        WindowManager.getDefault().addWindowSystemListener(new WindowSystemListener() {
-            private Dimension lastDimension = null;
-            private Integer lastState = null;
-            private Point lastLocation = null;
-
-            @Override
-            public void beforeLoad(WindowSystemEvent event) {
-            }
-
-            @Override
-            public void afterLoad(WindowSystemEvent event) {
-                Frame mainWindow = WindowManager.getDefault().getMainWindow();
-                if (mainWindow != null) {
-                    if (lastDimension != null) {
-                        mainWindow.setSize(lastDimension);
-                    }
-                    if (lastLocation != null) {
-                        mainWindow.setLocation(lastLocation);
-                    }
-                    if (lastState != null) {
-                        mainWindow.setState(lastState);
-                    }
-                }
-            }
-
-            @Override
-            public void beforeSave(WindowSystemEvent event) {
-                Frame mainWindow = WindowManager.getDefault().getMainWindow();
-                if (mainWindow != null) {
-                    lastDimension = mainWindow.getSize();
-                    lastLocation = mainWindow.getLocation();
-                    lastState = mainWindow.getExtendedState();
-                }
-            }
-
-            @Override
-            public void afterSave(WindowSystemEvent event) {
-            }
-        });
+//
+//        Perspective selectedPerspectiveInstance = getSelectedPerspective();
+//
+//        openAndCloseMembers(selectedPerspectiveInstance);
+//
+//        WindowManager.getDefault().addWindowSystemListener(new WindowSystemListener() {
+//            private Dimension lastDimension = null;
+//            private Integer lastState = null;
+//            private Point lastLocation = null;
+//
+//            @Override
+//            public void beforeLoad(WindowSystemEvent event) {
+//            }
+//
+//            @Override
+//            public void afterLoad(WindowSystemEvent event) {
+//                Frame mainWindow = WindowManager.getDefault().getMainWindow();
+//                if (mainWindow != null) {
+//                    if (lastDimension != null) {
+//                        mainWindow.setSize(lastDimension);
+//                    }
+//                    if (lastLocation != null) {
+//                        mainWindow.setLocation(lastLocation);
+//                    }
+//                    if (lastState != null) {
+//                        mainWindow.setState(lastState);
+//                    }
+//                }
+//            }
+//
+//            @Override
+//            public void beforeSave(WindowSystemEvent event) {
+//                Frame mainWindow = WindowManager.getDefault().getMainWindow();
+//                if (mainWindow != null) {
+//                    lastDimension = mainWindow.getSize();
+//                    lastLocation = mainWindow.getLocation();
+//                    lastState = mainWindow.getExtendedState();
+//                }
+//            }
+//
+//            @Override
+//            public void afterSave(WindowSystemEvent event) {
+//            }
+//        });
     }
 
     @Override

modules/VisualizationImpl/src/main/java/org/gephi/visualization/component/GraphTopComponent.java

@@ -69,7 +69,7 @@ import org.openide.windows.WindowManager;
 @ConvertAsProperties(dtd = "-//org.gephi.visualization.component//Graph//EN",
     autostore = false)
 @TopComponent.Description(preferredID = "GraphTopComponent",
-    persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+    persistenceType = TopComponent.PERSISTENCE_NEVER)
 @TopComponent.Registration(mode = "editor", openAtStartup = true, roles = {"overview"})
 @ActionID(category = "Window", id = "org.gephi.visualization.component.GraphTopComponent")
 @ActionReference(path = "Menu/Window", position = 500)