Revision: 5255
http://sourceforge.net/p/jump-pilot/code/5255
Author: edso
Date: 2016-12-13 13:03:59 +0000 (Tue, 13 Dec 2016)
Log Message:
-----------
revert introduced legacy incompatibility w/ ErrorHandlerV2
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/JUMPWorkbenchContext.java
core/trunk/src/com/vividsolutions/jump/workbench/WorkbenchContext.java
core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java
Removed Paths:
-------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/ErrorHandlerV2.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/JUMPWorkbenchContext.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/JUMPWorkbenchContext.java
2016-12-13 13:00:58 UTC (rev 5254)
+++ core/trunk/src/com/vividsolutions/jump/workbench/JUMPWorkbenchContext.java
2016-12-13 13:03:59 UTC (rev 5255)
@@ -61,7 +61,7 @@
return workbench.getDriverManager();
}
- public ErrorHandlerV2 getErrorHandler() {
+ public ErrorHandler getErrorHandler() {
return workbench.getFrame();
}
Modified: core/trunk/src/com/vividsolutions/jump/workbench/WorkbenchContext.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/WorkbenchContext.java
2016-12-13 13:00:58 UTC (rev 5254)
+++ core/trunk/src/com/vividsolutions/jump/workbench/WorkbenchContext.java
2016-12-13 13:03:59 UTC (rev 5255)
@@ -59,7 +59,7 @@
abstract public JUMPWorkbench getWorkbench();
- abstract public ErrorHandlerV2 getErrorHandler();
+ abstract public ErrorHandler getErrorHandler();
abstract public Blackboard getBlackboard();
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
2016-12-13 13:00:58 UTC (rev 5254)
+++ core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
2016-12-13 13:03:59 UTC (rev 5255)
@@ -366,7 +366,7 @@
}
// make sure ClassVersionErrors or such do not break OJ startup
catch (Throwable t) {
-
context.getErrorHandler().handleThrowable(t,context.getWorkbench().getFrame());
+ context.getErrorHandler().handleThrowable(t);
continue;
}
}
Deleted: core/trunk/src/com/vividsolutions/jump/workbench/ui/ErrorHandlerV2.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/ErrorHandlerV2.java
2016-12-13 13:00:58 UTC (rev 5254)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/ErrorHandlerV2.java
2016-12-13 13:03:59 UTC (rev 5255)
@@ -1,41 +0,0 @@
-
-/*
- * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI
- * for visualizing and manipulating spatial features with geometry and
attributes.
- *
- * Copyright (C) 2003 Vivid Solutions
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * For more information, contact:
- *
- * Vivid Solutions
- * Suite #1A
- * 2328 Government Street
- * Victoria BC V8T 5G5
- * Canada
- *
- * (250)385-6040
- * www.vividsolutions.com
- */
-
-package com.vividsolutions.jump.workbench.ui;
-
-import java.awt.Component;
-
-public interface ErrorHandlerV2 extends ErrorHandler {
- // allows to set a parent
- public void handleThrowable(final Throwable t, final Component parent);
-}
\ No newline at end of file
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java
2016-12-13 13:00:58 UTC (rev 5254)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java
2016-12-13 13:03:59 UTC (rev 5255)
@@ -154,7 +154,7 @@
* This class is responsible for the main window of the JUMP application.
*/
public class WorkbenchFrame extends JFrame implements LayerViewPanelContext,
- ViewportListener, ErrorHandlerV2 {
+ ViewportListener, ErrorHandler {
private String EXIT_OPENJUMP = I18N.get("ui.WorkbenchFrame.exit-jump");
private String CLOSE_PROJECT = I18N.get("ui.WorkbenchFrame.close-task");
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
