Skip to content

Commit

Permalink
Merge pull request #4 from agueganno/issue/1-no-more-map
Browse files Browse the repository at this point in the history
Issue/1 no more map
  • Loading branch information
agueganno committed Jun 25, 2012
2 parents 4f5871a + 5d1182e commit 11db7e1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .gitignore
@@ -0,0 +1,5 @@
/orbisgis-core/target/
/legend/target/
/orbisgis-sif/target/
/orbisgis-view/target/
/orbisgis-view/nbactions.xml
Expand Up @@ -269,6 +269,7 @@ public void show( DockingPanel frame, DockStation root, DockableProperty locatio
dockArea.getWorkingArea().add(dockItem);
}
commonControl.addDockable(dockItem);
dockItem.setVisible(true);
views.put( frame, dockItem.getUniqueId());

}
Expand Down
4 changes: 0 additions & 4 deletions orbisgis-view/src/main/java/org/orbisgis/view/main/Core.java
Expand Up @@ -34,7 +34,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.util.logging.Level;
import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
import org.orbisgis.core.Services;
Expand All @@ -51,7 +50,6 @@
import org.orbisgis.view.geocatalog.Catalog;
import org.orbisgis.view.icons.OrbisGISIcon;
import org.orbisgis.view.main.frames.MainFrame;
import org.orbisgis.view.map.MapEditor;
import org.orbisgis.view.map.MapEditorFactory;
import org.orbisgis.view.map.MapElement;
import org.orbisgis.view.output.OutputManager;
Expand Down Expand Up @@ -227,8 +225,6 @@ public void startup(){
SwingUtilities.invokeLater( new ShowSwingApplication());
}

private void loadMapContext() {
}
/**
* Change the state of the main frame in the swing thread
*/
Expand Down

0 comments on commit 11db7e1

Please sign in to comment.