Move KeyCollisionException to model.database and replace it if possible

JabRef · Aug 24, 2015 · 86f635c · 86f635c
1 parent dc26f03
commit 86f635c
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 20 deletions.
diff --git a/src/main/java/net/sf/jabref/collab/StringAddChange.java b/src/main/java/net/sf/jabref/collab/StringAddChange.java
@@ -19,7 +19,7 @@
 import javax.swing.JScrollPane;
 
 import net.sf.jabref.gui.BasePanel;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.logic.id.IdGenerator;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.database.BibtexDatabase;

diff --git a/src/main/java/net/sf/jabref/collab/StringChange.java b/src/main/java/net/sf/jabref/collab/StringChange.java
@@ -19,7 +19,7 @@
 import javax.swing.JScrollPane;
 
 import net.sf.jabref.gui.BasePanel;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.logic.id.IdGenerator;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.database.BibtexDatabase;

diff --git a/src/main/java/net/sf/jabref/collab/StringNameChange.java b/src/main/java/net/sf/jabref/collab/StringNameChange.java
@@ -19,7 +19,7 @@
 import javax.swing.JLabel;
 
 import net.sf.jabref.gui.BasePanel;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.logic.id.IdGenerator;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.database.BibtexDatabase;

diff --git a/src/main/java/net/sf/jabref/external/DroppedFileHandler.java b/src/main/java/net/sf/jabref/external/DroppedFileHandler.java
@@ -26,7 +26,6 @@
 import com.jgoodies.forms.factories.Borders;
 import net.sf.jabref.*;
 import net.sf.jabref.gui.*;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
 import net.sf.jabref.gui.undo.NamedCompound;
 import net.sf.jabref.gui.undo.UndoableFieldChange;
 import net.sf.jabref.gui.undo.UndoableInsertEntry;

diff --git a/src/main/java/net/sf/jabref/gui/BasePanel.java b/src/main/java/net/sf/jabref/gui/BasePanel.java
@@ -57,7 +57,7 @@
 import javax.swing.undo.CannotUndoException;
 
 import net.sf.jabref.*;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.model.database.BibtexDatabase;
 import net.sf.jabref.model.database.DatabaseChangeEvent;
 import net.sf.jabref.model.database.DatabaseChangeEvent.ChangeType;

diff --git a/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java b/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java
@@ -55,7 +55,6 @@
 import net.sf.jabref.logic.id.IdGenerator;
 import net.sf.jabref.JabRefExecutorService;
 import net.sf.jabref.JabRefPreferences;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
 import net.sf.jabref.MetaData;
 import net.sf.jabref.importer.OutputPrinter;
 import net.sf.jabref.external.DownloadExternalFile;

diff --git a/src/main/java/net/sf/jabref/gui/JabRefFrame.java b/src/main/java/net/sf/jabref/gui/JabRefFrame.java
@@ -77,7 +77,6 @@
 
 import net.sf.jabref.*;
 import net.sf.jabref.gui.action.AutoLinkFilesAction;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
 import net.sf.jabref.gui.worker.AbstractWorker;
 import net.sf.jabref.gui.worker.MarkEntriesAction;
 import net.sf.jabref.gui.preftabs.PreferencesDialog;

diff --git a/src/main/java/net/sf/jabref/gui/StringDialog.java b/src/main/java/net/sf/jabref/gui/StringDialog.java
@@ -49,7 +49,7 @@
 import net.sf.jabref.*;
 import net.sf.jabref.exporter.LatexFieldFormatter;
 import net.sf.jabref.gui.help.HelpAction;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.gui.undo.UndoableInsertString;
 import net.sf.jabref.gui.undo.UndoableRemoveString;
 import net.sf.jabref.gui.undo.UndoableStringChange;

diff --git a/src/main/java/net/sf/jabref/gui/undo/UndoableInsertString.java b/src/main/java/net/sf/jabref/gui/undo/UndoableInsertString.java
@@ -18,7 +18,7 @@
 import javax.swing.undo.AbstractUndoableEdit;
 
 import net.sf.jabref.gui.BasePanel;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.database.BibtexDatabase;
 import net.sf.jabref.model.entry.BibtexString;

diff --git a/src/main/java/net/sf/jabref/gui/undo/UndoableRemoveString.java b/src/main/java/net/sf/jabref/gui/undo/UndoableRemoveString.java
@@ -18,7 +18,7 @@
 import javax.swing.undo.AbstractUndoableEdit;
 
 import net.sf.jabref.gui.BasePanel;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.database.BibtexDatabase;
 import net.sf.jabref.model.entry.BibtexString;

diff --git a/src/main/java/net/sf/jabref/importer/AppendDatabaseAction.java b/src/main/java/net/sf/jabref/importer/AppendDatabaseAction.java
@@ -28,7 +28,7 @@
 import net.sf.jabref.groups.structure.AllEntriesGroup;
 import net.sf.jabref.groups.structure.ExplicitGroup;
 import net.sf.jabref.groups.GroupTreeNode;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.gui.undo.NamedCompound;
 import net.sf.jabref.gui.undo.UndoableInsertEntry;
 import net.sf.jabref.gui.undo.UndoableInsertString;

diff --git a/src/main/java/net/sf/jabref/importer/ImportFormatReader.java b/src/main/java/net/sf/jabref/importer/ImportFormatReader.java
@@ -18,7 +18,6 @@
 import java.io.*;
 import java.util.*;
 
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
 import net.sf.jabref.importer.fileformat.*;
 import net.sf.jabref.logic.id.IdGenerator;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/importer/ImportMenuItem.java b/src/main/java/net/sf/jabref/importer/ImportMenuItem.java
@@ -29,7 +29,7 @@
 
 import net.sf.jabref.*;
 import net.sf.jabref.gui.*;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.gui.worker.AbstractWorker;
 import net.sf.jabref.importer.fileformat.ImportFormat;
 import net.sf.jabref.logic.bibtex.DuplicateCheck;

diff --git a/src/main/java/net/sf/jabref/importer/fileformat/BibtexParser.java b/src/main/java/net/sf/jabref/importer/fileformat/BibtexParser.java
@@ -40,7 +40,7 @@
 
 import net.sf.jabref.*;
 import net.sf.jabref.gui.GUIGlobals;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.importer.ParserResult;
 import net.sf.jabref.logic.id.IdGenerator;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/model/database/BibtexDatabase.java b/src/main/java/net/sf/jabref/model/database/BibtexDatabase.java
@@ -29,7 +29,6 @@
 */
 package net.sf.jabref.model.database;
 
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
 import net.sf.jabref.logic.bibtex.EntrySorter;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.logic.util.date.MonthUtil;

diff --git a/src/main/java/net/sf/jabref/model/database/DatabaseChangeEvent.java b/src/main/java/net/sf/jabref/model/database/DatabaseChangeEvent.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2003-2011 JabRef contributors.
+/*  Copyright (C) 2003-2015 JabRef contributors.
     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

diff --git a/src/main/java/net/sf/jabref/model/database/DatabaseChangeListener.java b/src/main/java/net/sf/jabref/model/database/DatabaseChangeListener.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2003-2011 JabRef contributors.
+/*  Copyright (C) 2003-2015 JabRef contributors.
     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

diff --git a/...f/gui/keyboard/KeyCollisionException.java → ...model/database/KeyCollisionException.java b/...f/gui/keyboard/KeyCollisionException.java → ...model/database/KeyCollisionException.java
@@ -23,7 +23,7 @@
 http://www.gnu.org/copyleft/gpl.ja.html
 
 */
-package net.sf.jabref.gui.keyboard;
+package net.sf.jabref.model.database;
 
 public class KeyCollisionException extends RuntimeException {
 

diff --git a/src/main/java/net/sf/jabref/wizard/auximport/AuxSubGenerator.java b/src/main/java/net/sf/jabref/wizard/auximport/AuxSubGenerator.java
@@ -60,7 +60,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
 import net.sf.jabref.logic.id.IdGenerator;
 import net.sf.jabref.model.database.BibtexDatabase;
 import net.sf.jabref.model.entry.BibtexEntry;

diff --git a/src/main/java/spl/PdfImporter.java b/src/main/java/spl/PdfImporter.java
@@ -12,7 +12,7 @@
 import net.sf.jabref.external.DroppedFileHandler;
 import net.sf.jabref.gui.*;
 import net.sf.jabref.gui.entryeditor.EntryEditor;
-import net.sf.jabref.gui.keyboard.KeyCollisionException;
+import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.gui.preftabs.ImportSettingsTab;
 import net.sf.jabref.importer.OutputPrinter;
 import net.sf.jabref.importer.fileformat.PdfContentImporter;