From 3a43cdfb3805a692fe7d865edd5d3a7e5e66bd6a Mon Sep 17 00:00:00 2001 From: Sascha Zeller Date: Tue, 22 Nov 2016 00:22:54 +0100 Subject: [PATCH] move bibsonomy files to jabref package --- .../jabref/bibsonomy}/BibsonomyGlobals.java | 2 +- .../bibsonomy}/BibsonomyProperties.java | 2 +- .../BibsonomySidePaneComponent.java | 15 +++-- .../java/net/sf/jabref/gui/JabRefFrame.java | 2 +- .../bibsonomy}/AbstractBibsonomyAction.java | 4 +- ...BibsonomySettingsDialogByCancelAction.java | 5 +- ...seBibsonomySettingsDialogBySaveAction.java | 11 ++-- .../DeleteSelectedEntriesAction.java | 5 +- .../bibsonomy}/DownloadDocumentsAction.java | 5 +- .../ExportSelectedEntriesAction.java | 6 +- .../bibsonomy}/ImportAllMyPostsAction.java | 8 +-- .../OpenDatabasePropertiesAction.java | 2 +- .../bibsonomy}/RefreshTagListAction.java | 10 +-- .../gui/actions/bibsonomy}/SearchAction.java | 11 ++-- .../bibsonomy}/ShowSettingsDialogAction.java | 5 +- .../actions/bibsonomy}/SynchronizeAction.java | 5 +- .../ToggleSidePaneComponentAction.java | 7 +-- .../bibsonomy}/UpdateVisibilityAction.java | 6 +- .../gui/bibsonomy}/BibsonomyMenuItem.java | 21 +++---- .../bibsonomy}/BibsonomySettingsDialog.java | 14 ++--- .../gui/bibsonomy}/BibsonomySidePanel.java | 16 ++--- .../bibsonomy}/BibsonomyToolBarExtender.java | 13 ++-- .../jabref/gui/bibsonomy}/ComboBoxItem.java | 2 +- .../jabref/gui/bibsonomy}/CompareDialog.java | 4 +- .../bibsonomy}/EntryEditorTabExtender.java | 7 +-- .../gui/bibsonomy}/GroupingComboBoxItem.java | 2 +- .../gui/bibsonomy}/OrderComboBoxItem.java | 2 +- .../sf/jabref/gui/bibsonomy}/SearchType.java | 2 +- .../bibsonomy}/SearchTypeComboBoxItem.java | 2 +- .../BibsonomyDataBaseChangeListener.java | 6 +- .../listener/BibsonomyHyperLinkListener.java | 10 +-- .../listener/TabbedPaneChangeListener.java | 2 +- .../listener/VisibilityItemListener.java | 6 +- .../util/bibsonomy}/BibsonomyCallBack.java | 5 +- .../gui/util/bibsonomy}/CheckTagsUtil.java | 5 +- .../util/bibsonomy}/JabRefFileFactory.java | 4 +- .../util/bibsonomy}/JabRefGlobalsHelper.java | 2 +- .../gui/util/bibsonomy}/WorkerUtil.java | 2 +- .../bibsonomy}/AbstractBibsonomyWorker.java | 6 +- .../worker/bibsonomy}/DeletePostsWorker.java | 4 +- .../bibsonomy}/DownloadDocumentsWorker.java | 6 +- .../gui/worker/bibsonomy}/ExportWorker.java | 10 +-- .../ImportPostsByCriteriaWorker.java | 12 ++-- .../bibsonomy}/RefreshTagListWorker.java | 4 +- .../bibsonomy}/SynchronizationWorker.java | 12 ++-- .../bibsonomy}/UpdateVisibilityWorker.java | 8 +-- .../bibsonomy}/UploadDocumentsWorker.java | 4 +- .../fileformat/PdfContentImporter.java | 2 - .../util/bibsonomy}/BibtexEntryUtil.java | 2 +- .../util/bibsonomy}/JabRefModelConverter.java | 3 +- .../logic/util/bibsonomy/TagComparator.java | 36 +++++++++++ .../jabref/preferences/JabRefPreferences.java | 3 +- .../plugin/jabref/util/TagComparator.java | 61 ------------------- 53 files changed, 185 insertions(+), 226 deletions(-) rename src/main/java/{org/bibsonomy/plugin/jabref => net/sf/jabref/bibsonomy}/BibsonomyGlobals.java (94%) rename src/main/java/{org/bibsonomy/plugin/jabref => net/sf/jabref/bibsonomy}/BibsonomyProperties.java (99%) rename src/main/java/{org/bibsonomy/plugin/jabref => net/sf/jabref/bibsonomy}/BibsonomySidePaneComponent.java (88%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/AbstractBibsonomyAction.java (93%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/CloseBibsonomySettingsDialogByCancelAction.java (88%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/CloseBibsonomySettingsDialogBySaveAction.java (93%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/DeleteSelectedEntriesAction.java (89%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/DownloadDocumentsAction.java (91%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/ExportSelectedEntriesAction.java (92%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/ImportAllMyPostsAction.java (77%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/OpenDatabasePropertiesAction.java (94%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/RefreshTagListAction.java (87%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/SearchAction.java (84%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/ShowSettingsDialogAction.java (89%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/SynchronizeAction.java (87%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/ToggleSidePaneComponentAction.java (88%) rename src/main/java/{org/bibsonomy/plugin/jabref/action => net/sf/jabref/gui/actions/bibsonomy}/UpdateVisibilityAction.java (84%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/BibsonomyMenuItem.java (76%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/BibsonomySettingsDialog.java (98%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/BibsonomySidePanel.java (96%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/BibsonomyToolBarExtender.java (85%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/ComboBoxItem.java (96%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/CompareDialog.java (99%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/EntryEditorTabExtender.java (93%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/GroupingComboBoxItem.java (84%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/OrderComboBoxItem.java (82%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/SearchType.java (55%) rename src/main/java/{org/bibsonomy/plugin/jabref/gui => net/sf/jabref/gui/bibsonomy}/SearchTypeComboBoxItem.java (80%) rename src/main/java/{org/bibsonomy/plugin/jabref => net/sf/jabref/gui/bibsonomy}/listener/BibsonomyDataBaseChangeListener.java (92%) rename src/main/java/{org/bibsonomy/plugin/jabref => net/sf/jabref/gui/bibsonomy}/listener/BibsonomyHyperLinkListener.java (84%) rename src/main/java/{org/bibsonomy/plugin/jabref => net/sf/jabref/gui/bibsonomy}/listener/TabbedPaneChangeListener.java (96%) rename src/main/java/{org/bibsonomy/plugin/jabref => net/sf/jabref/gui/bibsonomy}/listener/VisibilityItemListener.java (78%) rename src/main/java/{org/bibsonomy/plugin/jabref/util => net/sf/jabref/gui/util/bibsonomy}/BibsonomyCallBack.java (83%) rename src/main/java/{org/bibsonomy/plugin/jabref/util => net/sf/jabref/gui/util/bibsonomy}/CheckTagsUtil.java (97%) rename src/main/java/{org/bibsonomy/plugin/jabref/util => net/sf/jabref/gui/util/bibsonomy}/JabRefFileFactory.java (94%) rename src/main/java/{org/bibsonomy/plugin/jabref/util => net/sf/jabref/gui/util/bibsonomy}/JabRefGlobalsHelper.java (97%) rename src/main/java/{org/bibsonomy/plugin/jabref/util => net/sf/jabref/gui/util/bibsonomy}/WorkerUtil.java (94%) rename src/main/java/{org/bibsonomy/plugin/jabref/worker => net/sf/jabref/gui/worker/bibsonomy}/AbstractBibsonomyWorker.java (88%) rename src/main/java/{org/bibsonomy/plugin/jabref/worker => net/sf/jabref/gui/worker/bibsonomy}/DeletePostsWorker.java (94%) rename src/main/java/{org/bibsonomy/plugin/jabref/worker => net/sf/jabref/gui/worker/bibsonomy}/DownloadDocumentsWorker.java (96%) rename src/main/java/{org/bibsonomy/plugin/jabref/worker => net/sf/jabref/gui/worker/bibsonomy}/ExportWorker.java (93%) rename src/main/java/{org/bibsonomy/plugin/jabref/worker => net/sf/jabref/gui/worker/bibsonomy}/ImportPostsByCriteriaWorker.java (94%) rename src/main/java/{org/bibsonomy/plugin/jabref/worker => net/sf/jabref/gui/worker/bibsonomy}/RefreshTagListWorker.java (97%) rename src/main/java/{org/bibsonomy/plugin/jabref/worker => net/sf/jabref/gui/worker/bibsonomy}/SynchronizationWorker.java (94%) rename src/main/java/{org/bibsonomy/plugin/jabref/worker => net/sf/jabref/gui/worker/bibsonomy}/UpdateVisibilityWorker.java (91%) rename src/main/java/{org/bibsonomy/plugin/jabref/worker => net/sf/jabref/gui/worker/bibsonomy}/UploadDocumentsWorker.java (96%) rename src/main/java/{org/bibsonomy/plugin/jabref/util => net/sf/jabref/logic/util/bibsonomy}/BibtexEntryUtil.java (98%) rename src/main/java/{org/bibsonomy/plugin/jabref/util => net/sf/jabref/logic/util/bibsonomy}/JabRefModelConverter.java (99%) create mode 100644 src/main/java/net/sf/jabref/logic/util/bibsonomy/TagComparator.java delete mode 100644 src/main/java/org/bibsonomy/plugin/jabref/util/TagComparator.java diff --git a/src/main/java/org/bibsonomy/plugin/jabref/BibsonomyGlobals.java b/src/main/java/net/sf/jabref/bibsonomy/BibsonomyGlobals.java similarity index 94% rename from src/main/java/org/bibsonomy/plugin/jabref/BibsonomyGlobals.java rename to src/main/java/net/sf/jabref/bibsonomy/BibsonomyGlobals.java index 6cf45afdcf4d..4f9695f36f9e 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/BibsonomyGlobals.java +++ b/src/main/java/net/sf/jabref/bibsonomy/BibsonomyGlobals.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref; +package net.sf.jabref.bibsonomy; /** * Provide some default values for configuration of the plugin. diff --git a/src/main/java/org/bibsonomy/plugin/jabref/BibsonomyProperties.java b/src/main/java/net/sf/jabref/bibsonomy/BibsonomyProperties.java similarity index 99% rename from src/main/java/org/bibsonomy/plugin/jabref/BibsonomyProperties.java rename to src/main/java/net/sf/jabref/bibsonomy/BibsonomyProperties.java index afa7023777f5..cd55d6bd6918 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/BibsonomyProperties.java +++ b/src/main/java/net/sf/jabref/bibsonomy/BibsonomyProperties.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref; +package net.sf.jabref.bibsonomy; import java.util.Optional; import java.util.Properties; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/BibsonomySidePaneComponent.java b/src/main/java/net/sf/jabref/bibsonomy/BibsonomySidePaneComponent.java similarity index 88% rename from src/main/java/org/bibsonomy/plugin/jabref/BibsonomySidePaneComponent.java rename to src/main/java/net/sf/jabref/bibsonomy/BibsonomySidePaneComponent.java index 4f8c0505fb2f..c6ef600dac7d 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/BibsonomySidePaneComponent.java +++ b/src/main/java/net/sf/jabref/bibsonomy/BibsonomySidePaneComponent.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref; +package net.sf.jabref.bibsonomy; import java.awt.Dimension; @@ -8,15 +8,14 @@ import net.sf.jabref.gui.JabRefFrame; import net.sf.jabref.gui.SidePaneComponent; import net.sf.jabref.gui.SidePaneManager; +import net.sf.jabref.gui.bibsonomy.BibsonomyMenuItem; +import net.sf.jabref.gui.bibsonomy.BibsonomySidePanel; +import net.sf.jabref.gui.bibsonomy.BibsonomyToolBarExtender; +import net.sf.jabref.gui.bibsonomy.EntryEditorTabExtender; +import net.sf.jabref.gui.bibsonomy.listener.BibsonomyDataBaseChangeListener; +import net.sf.jabref.gui.bibsonomy.listener.TabbedPaneChangeListener; import net.sf.jabref.logic.l10n.Localization; -import org.bibsonomy.plugin.jabref.gui.BibsonomyMenuItem; -import org.bibsonomy.plugin.jabref.gui.BibsonomySidePanel; -import org.bibsonomy.plugin.jabref.gui.BibsonomyToolBarExtender; -import org.bibsonomy.plugin.jabref.gui.EntryEditorTabExtender; -import org.bibsonomy.plugin.jabref.listener.BibsonomyDataBaseChangeListener; -import org.bibsonomy.plugin.jabref.listener.TabbedPaneChangeListener; - /** * {@link BibsonomySidePaneComponent} holds the dimension of the {@link BibsonomySidePanel}. * Additionally it sets the icon and the name. diff --git a/src/main/java/net/sf/jabref/gui/JabRefFrame.java b/src/main/java/net/sf/jabref/gui/JabRefFrame.java index 9976dc7c5eec..e0c13efcb018 100644 --- a/src/main/java/net/sf/jabref/gui/JabRefFrame.java +++ b/src/main/java/net/sf/jabref/gui/JabRefFrame.java @@ -60,6 +60,7 @@ import net.sf.jabref.Globals; import net.sf.jabref.JabRefExecutorService; +import net.sf.jabref.bibsonomy.BibsonomySidePaneComponent; import net.sf.jabref.gui.actions.Actions; import net.sf.jabref.gui.actions.AutoLinkFilesAction; import net.sf.jabref.gui.actions.ErrorConsoleAction; @@ -142,7 +143,6 @@ import com.jgoodies.looks.Options; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.bibsonomy.plugin.jabref.BibsonomySidePaneComponent; import osx.macadapter.MacAdapter; /** diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/AbstractBibsonomyAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/AbstractBibsonomyAction.java similarity index 93% rename from src/main/java/org/bibsonomy/plugin/jabref/action/AbstractBibsonomyAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/AbstractBibsonomyAction.java index 5cec0113fd17..88eb7701dc6b 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/AbstractBibsonomyAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/AbstractBibsonomyAction.java @@ -1,14 +1,14 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import javax.swing.AbstractAction; import javax.swing.Icon; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.util.bibsonomy.WorkerUtil; import net.sf.jabref.gui.worker.AbstractWorker; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.bibsonomy.plugin.jabref.util.WorkerUtil; /** * {@link AbstractBibsonomyAction} is the base class for all actions. diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/CloseBibsonomySettingsDialogByCancelAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/CloseBibsonomySettingsDialogByCancelAction.java similarity index 88% rename from src/main/java/org/bibsonomy/plugin/jabref/action/CloseBibsonomySettingsDialogByCancelAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/CloseBibsonomySettingsDialogByCancelAction.java index f64625a03b64..2804fa5feeac 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/CloseBibsonomySettingsDialogByCancelAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/CloseBibsonomySettingsDialogByCancelAction.java @@ -1,14 +1,13 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.ImageIcon; +import net.sf.jabref.gui.bibsonomy.BibsonomySettingsDialog; import net.sf.jabref.logic.l10n.Localization; -import org.bibsonomy.plugin.jabref.gui.BibsonomySettingsDialog; - /** * {@link CloseBibsonomySettingsDialogByCancelAction} closes the {@link BibsonomySettingsDialog} without saving the properties * diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/CloseBibsonomySettingsDialogBySaveAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/CloseBibsonomySettingsDialogBySaveAction.java similarity index 93% rename from src/main/java/org/bibsonomy/plugin/jabref/action/CloseBibsonomySettingsDialogBySaveAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/CloseBibsonomySettingsDialogBySaveAction.java index 162e80434c00..cc5ddbf32603 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/CloseBibsonomySettingsDialogBySaveAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/CloseBibsonomySettingsDialogBySaveAction.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; @@ -9,13 +9,12 @@ import javax.swing.JSpinner; import javax.swing.JTextField; +import net.sf.jabref.bibsonomy.BibsonomyProperties; +import net.sf.jabref.gui.bibsonomy.BibsonomySettingsDialog; +import net.sf.jabref.gui.bibsonomy.GroupingComboBoxItem; +import net.sf.jabref.gui.bibsonomy.OrderComboBoxItem; import net.sf.jabref.logic.l10n.Localization; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.gui.BibsonomySettingsDialog; -import org.bibsonomy.plugin.jabref.gui.GroupingComboBoxItem; -import org.bibsonomy.plugin.jabref.gui.OrderComboBoxItem; - /** * {@link CloseBibsonomySettingsDialogBySaveAction} saves the properties and closes the {@link BibsonomySettingsDialog}. * diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/DeleteSelectedEntriesAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/DeleteSelectedEntriesAction.java similarity index 89% rename from src/main/java/org/bibsonomy/plugin/jabref/action/DeleteSelectedEntriesAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/DeleteSelectedEntriesAction.java index 2041baa6d6e2..ad199670ade0 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/DeleteSelectedEntriesAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/DeleteSelectedEntriesAction.java @@ -1,15 +1,14 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; import javax.swing.ImageIcon; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.worker.bibsonomy.DeletePostsWorker; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.model.entry.BibEntry; -import org.bibsonomy.plugin.jabref.worker.DeletePostsWorker; - /** * {@link DeleteSelectedEntriesAction} runs the {@link DeletePostsWorker}. * diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/DownloadDocumentsAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/DownloadDocumentsAction.java similarity index 91% rename from src/main/java/org/bibsonomy/plugin/jabref/action/DownloadDocumentsAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/DownloadDocumentsAction.java index b6d6ea943402..5bb482ccbd0a 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/DownloadDocumentsAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/DownloadDocumentsAction.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; import java.util.Collection; @@ -6,11 +6,10 @@ import javax.swing.ImageIcon; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.worker.bibsonomy.DownloadDocumentsWorker; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.model.entry.BibEntry; -import org.bibsonomy.plugin.jabref.worker.DownloadDocumentsWorker; - /** * {@link DownloadDocumentsAction} collects all entries of a the {@link net.sf.jabref.model.database.BibDatabase BibDatabase} and fetches all documents available for the post. * diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/ExportSelectedEntriesAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/ExportSelectedEntriesAction.java similarity index 92% rename from src/main/java/org/bibsonomy/plugin/jabref/action/ExportSelectedEntriesAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/ExportSelectedEntriesAction.java index b3d8d0bacdc4..8d5b3c416c9f 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/ExportSelectedEntriesAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/ExportSelectedEntriesAction.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; import java.util.List; @@ -7,13 +7,13 @@ import javax.swing.JOptionPane; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.util.bibsonomy.CheckTagsUtil; +import net.sf.jabref.gui.worker.bibsonomy.ExportWorker; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.model.entry.BibEntry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.bibsonomy.plugin.jabref.util.CheckTagsUtil; -import org.bibsonomy.plugin.jabref.worker.ExportWorker; /** * {@link ExportSelectedEntriesAction} checks for entries without keywords and does diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/ImportAllMyPostsAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/ImportAllMyPostsAction.java similarity index 77% rename from src/main/java/org/bibsonomy/plugin/jabref/action/ImportAllMyPostsAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/ImportAllMyPostsAction.java index f35be665296f..e80fdc405091 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/ImportAllMyPostsAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/ImportAllMyPostsAction.java @@ -1,13 +1,13 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.bibsonomy.SearchType; +import net.sf.jabref.gui.worker.bibsonomy.ImportPostsByCriteriaWorker; import org.bibsonomy.common.enums.GroupingEntity; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.gui.SearchType; -import org.bibsonomy.plugin.jabref.worker.ImportPostsByCriteriaWorker; /** diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/OpenDatabasePropertiesAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/OpenDatabasePropertiesAction.java similarity index 94% rename from src/main/java/org/bibsonomy/plugin/jabref/action/OpenDatabasePropertiesAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/OpenDatabasePropertiesAction.java index 32c7b6fe5ff0..422cfd990330 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/OpenDatabasePropertiesAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/OpenDatabasePropertiesAction.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/RefreshTagListAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/RefreshTagListAction.java similarity index 87% rename from src/main/java/org/bibsonomy/plugin/jabref/action/RefreshTagListAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/RefreshTagListAction.java index 0732b7d1b757..8fe759931b2b 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/RefreshTagListAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/RefreshTagListAction.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; import java.util.ArrayList; @@ -8,14 +8,14 @@ import javax.swing.JComboBox; import javax.swing.JEditorPane; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.bibsonomy.GroupingComboBoxItem; +import net.sf.jabref.gui.worker.bibsonomy.RefreshTagListWorker; +import net.sf.jabref.gui.worker.bibsonomy.UpdateVisibilityWorker; import net.sf.jabref.logic.l10n.Localization; import org.bibsonomy.common.enums.GroupingEntity; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.gui.GroupingComboBoxItem; -import org.bibsonomy.plugin.jabref.worker.RefreshTagListWorker; -import org.bibsonomy.plugin.jabref.worker.UpdateVisibilityWorker; /** * {@link RefreshTagListAction} runs the {@link RefreshTagListWorker} to refresh the tag cloud diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/SearchAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/SearchAction.java similarity index 84% rename from src/main/java/org/bibsonomy/plugin/jabref/action/SearchAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/SearchAction.java index 13f50f66e7d8..20c506050d7b 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/SearchAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/SearchAction.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; @@ -7,11 +7,10 @@ import javax.swing.JTextField; import net.sf.jabref.gui.JabRefFrame; - -import org.bibsonomy.plugin.jabref.gui.GroupingComboBoxItem; -import org.bibsonomy.plugin.jabref.gui.SearchType; -import org.bibsonomy.plugin.jabref.gui.SearchTypeComboBoxItem; -import org.bibsonomy.plugin.jabref.worker.ImportPostsByCriteriaWorker; +import net.sf.jabref.gui.bibsonomy.GroupingComboBoxItem; +import net.sf.jabref.gui.bibsonomy.SearchType; +import net.sf.jabref.gui.bibsonomy.SearchTypeComboBoxItem; +import net.sf.jabref.gui.worker.bibsonomy.ImportPostsByCriteriaWorker; /** * {@link SearchAction} runs the {@link ImportPostsByCriteriaWorker} with the values of the search text box diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/ShowSettingsDialogAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/ShowSettingsDialogAction.java similarity index 89% rename from src/main/java/org/bibsonomy/plugin/jabref/action/ShowSettingsDialogAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/ShowSettingsDialogAction.java index 9c8a05eed640..01533bc2629c 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/ShowSettingsDialogAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/ShowSettingsDialogAction.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; @@ -6,10 +6,9 @@ import javax.swing.ImageIcon; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.bibsonomy.BibsonomySettingsDialog; import net.sf.jabref.logic.l10n.Localization; -import org.bibsonomy.plugin.jabref.gui.BibsonomySettingsDialog; - /** * {@link ShowSettingsDialogAction} creates and displays the {@link BibsonomySettingsDialog} diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/SynchronizeAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/SynchronizeAction.java similarity index 87% rename from src/main/java/org/bibsonomy/plugin/jabref/action/SynchronizeAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/SynchronizeAction.java index c20ce25774e2..0f720b919eb5 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/SynchronizeAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/SynchronizeAction.java @@ -1,14 +1,13 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; import javax.swing.ImageIcon; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.worker.bibsonomy.SynchronizationWorker; import net.sf.jabref.logic.l10n.Localization; -import org.bibsonomy.plugin.jabref.worker.SynchronizationWorker; - /** * {@link SynchronizeAction} runs the {@link SynchronizationWorker} diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/ToggleSidePaneComponentAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/ToggleSidePaneComponentAction.java similarity index 88% rename from src/main/java/org/bibsonomy/plugin/jabref/action/ToggleSidePaneComponentAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/ToggleSidePaneComponentAction.java index 7d0f3e963364..2c977e255fa4 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/ToggleSidePaneComponentAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/ToggleSidePaneComponentAction.java @@ -1,17 +1,16 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.ImageIcon; +import net.sf.jabref.bibsonomy.BibsonomySidePaneComponent; import net.sf.jabref.gui.JabRefFrame; import net.sf.jabref.gui.SidePaneManager; +import net.sf.jabref.gui.bibsonomy.BibsonomySidePanel; import net.sf.jabref.logic.l10n.Localization; -import org.bibsonomy.plugin.jabref.BibsonomySidePaneComponent; -import org.bibsonomy.plugin.jabref.gui.BibsonomySidePanel; - /** * Display or hide the {@link BibsonomySidePanel} * diff --git a/src/main/java/org/bibsonomy/plugin/jabref/action/UpdateVisibilityAction.java b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/UpdateVisibilityAction.java similarity index 84% rename from src/main/java/org/bibsonomy/plugin/jabref/action/UpdateVisibilityAction.java rename to src/main/java/net/sf/jabref/gui/actions/bibsonomy/UpdateVisibilityAction.java index 67ebcac48341..1366b8578a31 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/action/UpdateVisibilityAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/bibsonomy/UpdateVisibilityAction.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.action; +package net.sf.jabref.gui.actions.bibsonomy; import java.awt.event.ActionEvent; import java.util.List; @@ -7,8 +7,8 @@ import net.sf.jabref.gui.JabRefFrame; -import org.bibsonomy.plugin.jabref.gui.GroupingComboBoxItem; -import org.bibsonomy.plugin.jabref.worker.UpdateVisibilityWorker; +import net.sf.jabref.gui.bibsonomy.GroupingComboBoxItem; +import net.sf.jabref.gui.worker.bibsonomy.UpdateVisibilityWorker; /** * {@link UpdateVisibilityAction} runs the {@link UpdateVisibilityWorker} diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomyMenuItem.java b/src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomyMenuItem.java similarity index 76% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomyMenuItem.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomyMenuItem.java index 6a2742db8ce8..47467cae48ae 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomyMenuItem.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomyMenuItem.java @@ -1,20 +1,19 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; import javax.swing.JMenu; import javax.swing.JMenuItem; +import net.sf.jabref.bibsonomy.BibsonomyGlobals; +import net.sf.jabref.bibsonomy.BibsonomySidePaneComponent; +import net.sf.jabref.gui.actions.bibsonomy.DeleteSelectedEntriesAction; +import net.sf.jabref.gui.actions.bibsonomy.DownloadDocumentsAction; +import net.sf.jabref.gui.actions.bibsonomy.ExportSelectedEntriesAction; +import net.sf.jabref.gui.actions.bibsonomy.ImportAllMyPostsAction; +import net.sf.jabref.gui.actions.bibsonomy.ShowSettingsDialogAction; +import net.sf.jabref.gui.actions.bibsonomy.SynchronizeAction; +import net.sf.jabref.gui.actions.bibsonomy.ToggleSidePaneComponentAction; import net.sf.jabref.logic.l10n.Localization; -import org.bibsonomy.plugin.jabref.BibsonomyGlobals; -import org.bibsonomy.plugin.jabref.BibsonomySidePaneComponent; -import org.bibsonomy.plugin.jabref.action.DeleteSelectedEntriesAction; -import org.bibsonomy.plugin.jabref.action.DownloadDocumentsAction; -import org.bibsonomy.plugin.jabref.action.ExportSelectedEntriesAction; -import org.bibsonomy.plugin.jabref.action.ImportAllMyPostsAction; -import org.bibsonomy.plugin.jabref.action.ShowSettingsDialogAction; -import org.bibsonomy.plugin.jabref.action.SynchronizeAction; -import org.bibsonomy.plugin.jabref.action.ToggleSidePaneComponentAction; - /** * {@link BibsonomyMenuItem} is the plugins menu item * diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomySettingsDialog.java b/src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomySettingsDialog.java similarity index 98% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomySettingsDialog.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomySettingsDialog.java index 2cec5161e69a..47cc759a88bb 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomySettingsDialog.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomySettingsDialog.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; import java.awt.BorderLayout; import java.awt.Color; @@ -25,17 +25,17 @@ import javax.swing.SpinnerNumberModel; import javax.swing.border.TitledBorder; +import net.sf.jabref.bibsonomy.BibsonomyGlobals; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.actions.bibsonomy.CloseBibsonomySettingsDialogByCancelAction; +import net.sf.jabref.gui.actions.bibsonomy.CloseBibsonomySettingsDialogBySaveAction; +import net.sf.jabref.gui.actions.bibsonomy.OpenDatabasePropertiesAction; +import net.sf.jabref.gui.actions.bibsonomy.UpdateVisibilityAction; import net.sf.jabref.logic.l10n.Localization; import org.bibsonomy.common.enums.GroupingEntity; import org.bibsonomy.model.enums.Order; -import org.bibsonomy.plugin.jabref.BibsonomyGlobals; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.action.CloseBibsonomySettingsDialogByCancelAction; -import org.bibsonomy.plugin.jabref.action.CloseBibsonomySettingsDialogBySaveAction; -import org.bibsonomy.plugin.jabref.action.OpenDatabasePropertiesAction; -import org.bibsonomy.plugin.jabref.action.UpdateVisibilityAction; public class BibsonomySettingsDialog extends JDialog { diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomySidePanel.java b/src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomySidePanel.java similarity index 96% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomySidePanel.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomySidePanel.java index 18c94cfc796c..12216379f58b 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomySidePanel.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomySidePanel.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; import java.awt.Color; import java.awt.Font; @@ -18,17 +18,17 @@ import javax.swing.JTextField; import javax.swing.border.TitledBorder; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.actions.bibsonomy.RefreshTagListAction; +import net.sf.jabref.gui.actions.bibsonomy.SearchAction; +import net.sf.jabref.gui.actions.bibsonomy.ShowSettingsDialogAction; +import net.sf.jabref.gui.actions.bibsonomy.UpdateVisibilityAction; +import net.sf.jabref.gui.bibsonomy.listener.BibsonomyHyperLinkListener; +import net.sf.jabref.gui.bibsonomy.listener.VisibilityItemListener; import net.sf.jabref.logic.l10n.Localization; import org.bibsonomy.common.enums.GroupingEntity; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.action.RefreshTagListAction; -import org.bibsonomy.plugin.jabref.action.SearchAction; -import org.bibsonomy.plugin.jabref.action.ShowSettingsDialogAction; -import org.bibsonomy.plugin.jabref.action.UpdateVisibilityAction; -import org.bibsonomy.plugin.jabref.listener.BibsonomyHyperLinkListener; -import org.bibsonomy.plugin.jabref.listener.VisibilityItemListener; public class BibsonomySidePanel extends JPanel { diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomyToolBarExtender.java b/src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomyToolBarExtender.java similarity index 85% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomyToolBarExtender.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomyToolBarExtender.java index 730aab0ad2b4..7137d5e8b26e 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/BibsonomyToolBarExtender.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/BibsonomyToolBarExtender.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; import java.awt.Component; @@ -8,13 +8,12 @@ import javax.swing.JRootPane; import javax.swing.JToolBar; +import net.sf.jabref.bibsonomy.BibsonomyGlobals; +import net.sf.jabref.bibsonomy.BibsonomySidePaneComponent; import net.sf.jabref.gui.JabRefFrame; - -import org.bibsonomy.plugin.jabref.BibsonomyGlobals; -import org.bibsonomy.plugin.jabref.BibsonomySidePaneComponent; -import org.bibsonomy.plugin.jabref.action.DeleteSelectedEntriesAction; -import org.bibsonomy.plugin.jabref.action.ExportSelectedEntriesAction; -import org.bibsonomy.plugin.jabref.action.ToggleSidePaneComponentAction; +import net.sf.jabref.gui.actions.bibsonomy.DeleteSelectedEntriesAction; +import net.sf.jabref.gui.actions.bibsonomy.ExportSelectedEntriesAction; +import net.sf.jabref.gui.actions.bibsonomy.ToggleSidePaneComponentAction; /** diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/ComboBoxItem.java b/src/main/java/net/sf/jabref/gui/bibsonomy/ComboBoxItem.java similarity index 96% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/ComboBoxItem.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/ComboBoxItem.java index ca015dba8b45..a94ee4f9c31f 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/ComboBoxItem.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/ComboBoxItem.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; /** * {@link ComboBoxItem} is a simple class to represent a key-value store in a combo box diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/CompareDialog.java b/src/main/java/net/sf/jabref/gui/bibsonomy/CompareDialog.java similarity index 99% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/CompareDialog.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/CompareDialog.java index 75d5e2357b36..ae1a8bbe9463 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/CompareDialog.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/CompareDialog.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; import java.awt.Color; import java.awt.ComponentOrientation; @@ -20,12 +20,12 @@ import net.sf.jabref.gui.JabRefFrame; import net.sf.jabref.logic.l10n.Localization; +import net.sf.jabref.logic.util.bibsonomy.JabRefModelConverter; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.FieldName; import org.bibsonomy.model.Post; import org.bibsonomy.model.Resource; -import org.bibsonomy.plugin.jabref.util.JabRefModelConverter; /** * @author Waldemar Biller diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/EntryEditorTabExtender.java b/src/main/java/net/sf/jabref/gui/bibsonomy/EntryEditorTabExtender.java similarity index 93% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/EntryEditorTabExtender.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/EntryEditorTabExtender.java index 1c75201564b8..0a43dd052331 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/EntryEditorTabExtender.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/EntryEditorTabExtender.java @@ -1,11 +1,10 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; +import net.sf.jabref.bibsonomy.BibsonomyGlobals; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.preferences.JabRefPreferences; -import org.bibsonomy.plugin.jabref.BibsonomyGlobals; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; - /** * {@link EntryEditorTabExtender} extends the {@link net.sf.jabref.gui.entryeditor.EntryEditor EntryEditor} with custom tabs. diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/GroupingComboBoxItem.java b/src/main/java/net/sf/jabref/gui/bibsonomy/GroupingComboBoxItem.java similarity index 84% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/GroupingComboBoxItem.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/GroupingComboBoxItem.java index 177cc1bbc52d..7629b7753da6 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/GroupingComboBoxItem.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/GroupingComboBoxItem.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; import org.bibsonomy.common.enums.GroupingEntity; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/OrderComboBoxItem.java b/src/main/java/net/sf/jabref/gui/bibsonomy/OrderComboBoxItem.java similarity index 82% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/OrderComboBoxItem.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/OrderComboBoxItem.java index d11c8eb83a6f..9feb20f4994b 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/OrderComboBoxItem.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/OrderComboBoxItem.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; import org.bibsonomy.model.enums.Order; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/SearchType.java b/src/main/java/net/sf/jabref/gui/bibsonomy/SearchType.java similarity index 55% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/SearchType.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/SearchType.java index 9b0862a3cadd..7e3cc635b2c2 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/SearchType.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/SearchType.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; public enum SearchType { TAGS, diff --git a/src/main/java/org/bibsonomy/plugin/jabref/gui/SearchTypeComboBoxItem.java b/src/main/java/net/sf/jabref/gui/bibsonomy/SearchTypeComboBoxItem.java similarity index 80% rename from src/main/java/org/bibsonomy/plugin/jabref/gui/SearchTypeComboBoxItem.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/SearchTypeComboBoxItem.java index d1aab4092dfa..84e08542af5b 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/gui/SearchTypeComboBoxItem.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/SearchTypeComboBoxItem.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.gui; +package net.sf.jabref.gui.bibsonomy; public class SearchTypeComboBoxItem extends ComboBoxItem { diff --git a/src/main/java/org/bibsonomy/plugin/jabref/listener/BibsonomyDataBaseChangeListener.java b/src/main/java/net/sf/jabref/gui/bibsonomy/listener/BibsonomyDataBaseChangeListener.java similarity index 92% rename from src/main/java/org/bibsonomy/plugin/jabref/listener/BibsonomyDataBaseChangeListener.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/listener/BibsonomyDataBaseChangeListener.java index 9f864d151fa3..2fc69b31be5c 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/listener/BibsonomyDataBaseChangeListener.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/listener/BibsonomyDataBaseChangeListener.java @@ -1,17 +1,17 @@ -package org.bibsonomy.plugin.jabref.listener; +package net.sf.jabref.gui.bibsonomy.listener; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.util.bibsonomy.WorkerUtil; +import net.sf.jabref.gui.worker.bibsonomy.DownloadDocumentsWorker; import net.sf.jabref.model.database.event.EntryAddedEvent; import net.sf.jabref.model.entry.BibEntry; import com.google.common.eventbus.Subscribe; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.bibsonomy.plugin.jabref.util.WorkerUtil; -import org.bibsonomy.plugin.jabref.worker.DownloadDocumentsWorker; /** * {@link BibsonomyDataBaseChangeListener} runs the {@link DownloadDocumentsWorker} as soon as a new entry was added to the database. diff --git a/src/main/java/org/bibsonomy/plugin/jabref/listener/BibsonomyHyperLinkListener.java b/src/main/java/net/sf/jabref/gui/bibsonomy/listener/BibsonomyHyperLinkListener.java similarity index 84% rename from src/main/java/org/bibsonomy/plugin/jabref/listener/BibsonomyHyperLinkListener.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/listener/BibsonomyHyperLinkListener.java index f94395c5ee5f..998d3f5eee35 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/listener/BibsonomyHyperLinkListener.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/listener/BibsonomyHyperLinkListener.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.listener; +package net.sf.jabref.gui.bibsonomy.listener; import java.awt.event.ActionEvent; import java.util.StringTokenizer; @@ -10,10 +10,10 @@ import net.sf.jabref.gui.JabRefFrame; -import org.bibsonomy.plugin.jabref.action.AbstractBibsonomyAction; -import org.bibsonomy.plugin.jabref.gui.GroupingComboBoxItem; -import org.bibsonomy.plugin.jabref.gui.SearchType; -import org.bibsonomy.plugin.jabref.worker.ImportPostsByCriteriaWorker; +import net.sf.jabref.gui.actions.bibsonomy.AbstractBibsonomyAction; +import net.sf.jabref.gui.bibsonomy.GroupingComboBoxItem; +import net.sf.jabref.gui.bibsonomy.SearchType; +import net.sf.jabref.gui.worker.bibsonomy.ImportPostsByCriteriaWorker; /** * {@link BibsonomyHyperLinkListener} runs the {@link ImportPostsByCriteriaWorker} as soon as diff --git a/src/main/java/org/bibsonomy/plugin/jabref/listener/TabbedPaneChangeListener.java b/src/main/java/net/sf/jabref/gui/bibsonomy/listener/TabbedPaneChangeListener.java similarity index 96% rename from src/main/java/org/bibsonomy/plugin/jabref/listener/TabbedPaneChangeListener.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/listener/TabbedPaneChangeListener.java index db5c75845e8a..50b4356f0bbc 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/listener/TabbedPaneChangeListener.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/listener/TabbedPaneChangeListener.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.listener; +package net.sf.jabref.gui.bibsonomy.listener; import java.awt.Component; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/listener/VisibilityItemListener.java b/src/main/java/net/sf/jabref/gui/bibsonomy/listener/VisibilityItemListener.java similarity index 78% rename from src/main/java/org/bibsonomy/plugin/jabref/listener/VisibilityItemListener.java rename to src/main/java/net/sf/jabref/gui/bibsonomy/listener/VisibilityItemListener.java index 66622f8ee0f6..a45122a850ee 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/listener/VisibilityItemListener.java +++ b/src/main/java/net/sf/jabref/gui/bibsonomy/listener/VisibilityItemListener.java @@ -1,10 +1,10 @@ -package org.bibsonomy.plugin.jabref.listener; +package net.sf.jabref.gui.bibsonomy.listener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.gui.GroupingComboBoxItem; +import net.sf.jabref.bibsonomy.BibsonomyProperties; +import net.sf.jabref.gui.bibsonomy.GroupingComboBoxItem; /** * {@link VisibilityItemListener} saves the current value of "import posts from..." combo box diff --git a/src/main/java/org/bibsonomy/plugin/jabref/util/BibsonomyCallBack.java b/src/main/java/net/sf/jabref/gui/util/bibsonomy/BibsonomyCallBack.java similarity index 83% rename from src/main/java/org/bibsonomy/plugin/jabref/util/BibsonomyCallBack.java rename to src/main/java/net/sf/jabref/gui/util/bibsonomy/BibsonomyCallBack.java index e96a57da2ae5..f30606c6757d 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/util/BibsonomyCallBack.java +++ b/src/main/java/net/sf/jabref/gui/util/bibsonomy/BibsonomyCallBack.java @@ -1,8 +1,7 @@ -package org.bibsonomy.plugin.jabref.util; +package net.sf.jabref.gui.util.bibsonomy; import net.sf.jabref.gui.importer.ImportInspectionDialog; - -import org.bibsonomy.plugin.jabref.worker.AbstractBibsonomyWorker; +import net.sf.jabref.gui.worker.bibsonomy.AbstractBibsonomyWorker; /** * {@link BibsonomyCallBack} is a util to stop execution of workers diff --git a/src/main/java/org/bibsonomy/plugin/jabref/util/CheckTagsUtil.java b/src/main/java/net/sf/jabref/gui/util/bibsonomy/CheckTagsUtil.java similarity index 97% rename from src/main/java/org/bibsonomy/plugin/jabref/util/CheckTagsUtil.java rename to src/main/java/net/sf/jabref/gui/util/bibsonomy/CheckTagsUtil.java index 5c94565b7702..4d93a79e58b5 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/util/CheckTagsUtil.java +++ b/src/main/java/net/sf/jabref/gui/util/bibsonomy/CheckTagsUtil.java @@ -1,14 +1,13 @@ -package org.bibsonomy.plugin.jabref.util; +package net.sf.jabref.gui.util.bibsonomy; import java.util.List; import javax.swing.JOptionPane; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; import net.sf.jabref.model.entry.BibEntry; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; - import static org.bibsonomy.util.ValidationUtils.present; /** diff --git a/src/main/java/org/bibsonomy/plugin/jabref/util/JabRefFileFactory.java b/src/main/java/net/sf/jabref/gui/util/bibsonomy/JabRefFileFactory.java similarity index 94% rename from src/main/java/org/bibsonomy/plugin/jabref/util/JabRefFileFactory.java rename to src/main/java/net/sf/jabref/gui/util/bibsonomy/JabRefFileFactory.java index 0aea22b19aed..9a0ebfe75cae 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/util/JabRefFileFactory.java +++ b/src/main/java/net/sf/jabref/gui/util/bibsonomy/JabRefFileFactory.java @@ -1,10 +1,10 @@ -package org.bibsonomy.plugin.jabref.util; +package net.sf.jabref.gui.util.bibsonomy; import java.util.Optional; +import net.sf.jabref.bibsonomy.BibsonomyGlobals; import net.sf.jabref.gui.JabRefFrame; -import org.bibsonomy.plugin.jabref.BibsonomyGlobals; import org.bibsonomy.rest.client.util.MultiDirectoryFileFactory; public class JabRefFileFactory extends MultiDirectoryFileFactory { diff --git a/src/main/java/org/bibsonomy/plugin/jabref/util/JabRefGlobalsHelper.java b/src/main/java/net/sf/jabref/gui/util/bibsonomy/JabRefGlobalsHelper.java similarity index 97% rename from src/main/java/org/bibsonomy/plugin/jabref/util/JabRefGlobalsHelper.java rename to src/main/java/net/sf/jabref/gui/util/bibsonomy/JabRefGlobalsHelper.java index 112af8ca6bc0..0ffe633386f6 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/util/JabRefGlobalsHelper.java +++ b/src/main/java/net/sf/jabref/gui/util/bibsonomy/JabRefGlobalsHelper.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.util; +package net.sf.jabref.gui.util.bibsonomy; import java.util.Vector; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/util/WorkerUtil.java b/src/main/java/net/sf/jabref/gui/util/bibsonomy/WorkerUtil.java similarity index 94% rename from src/main/java/org/bibsonomy/plugin/jabref/util/WorkerUtil.java rename to src/main/java/net/sf/jabref/gui/util/bibsonomy/WorkerUtil.java index 425288b8eed8..ab509020831b 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/util/WorkerUtil.java +++ b/src/main/java/net/sf/jabref/gui/util/bibsonomy/WorkerUtil.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.util; +package net.sf.jabref.gui.util.bibsonomy; import net.sf.jabref.gui.worker.AbstractWorker; import net.sf.jabref.gui.worker.CallBack; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/worker/AbstractBibsonomyWorker.java b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/AbstractBibsonomyWorker.java similarity index 88% rename from src/main/java/org/bibsonomy/plugin/jabref/worker/AbstractBibsonomyWorker.java rename to src/main/java/net/sf/jabref/gui/worker/bibsonomy/AbstractBibsonomyWorker.java index 657ef4c84458..c93a0f81815f 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/worker/AbstractBibsonomyWorker.java +++ b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/AbstractBibsonomyWorker.java @@ -1,11 +1,11 @@ -package org.bibsonomy.plugin.jabref.worker; +package net.sf.jabref.gui.worker.bibsonomy; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.util.bibsonomy.JabRefFileFactory; import net.sf.jabref.gui.worker.AbstractWorker; import org.bibsonomy.model.logic.LogicInterface; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.util.JabRefFileFactory; import org.bibsonomy.rest.client.RestLogicFactory; import org.bibsonomy.rest.client.util.FileFactory; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/worker/DeletePostsWorker.java b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/DeletePostsWorker.java similarity index 94% rename from src/main/java/org/bibsonomy/plugin/jabref/worker/DeletePostsWorker.java rename to src/main/java/net/sf/jabref/gui/worker/bibsonomy/DeletePostsWorker.java index ac4c9b284d70..61573c126ee0 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/worker/DeletePostsWorker.java +++ b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/DeletePostsWorker.java @@ -1,8 +1,9 @@ -package org.bibsonomy.plugin.jabref.worker; +package net.sf.jabref.gui.worker.bibsonomy; import java.util.Collections; import java.util.Optional; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.model.entry.BibEntry; @@ -10,7 +11,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; /** * Delete a Post from the service diff --git a/src/main/java/org/bibsonomy/plugin/jabref/worker/DownloadDocumentsWorker.java b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/DownloadDocumentsWorker.java similarity index 96% rename from src/main/java/org/bibsonomy/plugin/jabref/worker/DownloadDocumentsWorker.java rename to src/main/java/net/sf/jabref/gui/worker/bibsonomy/DownloadDocumentsWorker.java index baa06a0c71f5..752e3a175c00 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/worker/DownloadDocumentsWorker.java +++ b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/DownloadDocumentsWorker.java @@ -1,9 +1,11 @@ -package org.bibsonomy.plugin.jabref.worker; +package net.sf.jabref.gui.worker.bibsonomy; import java.net.URLEncoder; import java.util.Optional; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.actions.bibsonomy.ShowSettingsDialogAction; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.FieldName; @@ -15,8 +17,6 @@ import org.bibsonomy.model.Document; import org.bibsonomy.model.Post; import org.bibsonomy.model.Resource; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.action.ShowSettingsDialogAction; import org.bibsonomy.rest.exceptions.AuthenticationException; import org.bibsonomy.util.file.FileUtil; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/worker/ExportWorker.java b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/ExportWorker.java similarity index 93% rename from src/main/java/org/bibsonomy/plugin/jabref/worker/ExportWorker.java rename to src/main/java/net/sf/jabref/gui/worker/bibsonomy/ExportWorker.java index 13cd614a177b..e95f37468e91 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/worker/ExportWorker.java +++ b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/ExportWorker.java @@ -1,11 +1,15 @@ -package org.bibsonomy.plugin.jabref.worker; +package net.sf.jabref.gui.worker.bibsonomy; import java.util.Collections; import java.util.List; import java.util.Optional; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.actions.bibsonomy.ShowSettingsDialogAction; +import net.sf.jabref.gui.util.bibsonomy.WorkerUtil; import net.sf.jabref.logic.l10n.Localization; +import net.sf.jabref.logic.util.bibsonomy.JabRefModelConverter; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.FieldName; @@ -16,10 +20,6 @@ import org.bibsonomy.model.Post; import org.bibsonomy.model.Resource; import org.bibsonomy.model.User; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.action.ShowSettingsDialogAction; -import org.bibsonomy.plugin.jabref.util.JabRefModelConverter; -import org.bibsonomy.plugin.jabref.util.WorkerUtil; import org.bibsonomy.rest.exceptions.AuthenticationException; /** diff --git a/src/main/java/org/bibsonomy/plugin/jabref/worker/ImportPostsByCriteriaWorker.java b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/ImportPostsByCriteriaWorker.java similarity index 94% rename from src/main/java/org/bibsonomy/plugin/jabref/worker/ImportPostsByCriteriaWorker.java rename to src/main/java/net/sf/jabref/gui/worker/bibsonomy/ImportPostsByCriteriaWorker.java index ae07f2654124..34ab653aaf0f 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/worker/ImportPostsByCriteriaWorker.java +++ b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/ImportPostsByCriteriaWorker.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.worker; +package net.sf.jabref.gui.worker.bibsonomy; import java.util.Arrays; import java.util.Collection; @@ -8,9 +8,14 @@ import javax.swing.JOptionPane; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.actions.bibsonomy.ShowSettingsDialogAction; +import net.sf.jabref.gui.bibsonomy.SearchType; import net.sf.jabref.gui.importer.ImportInspectionDialog; +import net.sf.jabref.gui.util.bibsonomy.BibsonomyCallBack; import net.sf.jabref.logic.l10n.Localization; +import net.sf.jabref.logic.util.bibsonomy.JabRefModelConverter; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.FieldName; @@ -20,11 +25,6 @@ import org.bibsonomy.model.BibTex; import org.bibsonomy.model.Post; import org.bibsonomy.model.Resource; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.action.ShowSettingsDialogAction; -import org.bibsonomy.plugin.jabref.gui.SearchType; -import org.bibsonomy.plugin.jabref.util.BibsonomyCallBack; -import org.bibsonomy.plugin.jabref.util.JabRefModelConverter; import org.bibsonomy.rest.exceptions.AuthenticationException; /** diff --git a/src/main/java/org/bibsonomy/plugin/jabref/worker/RefreshTagListWorker.java b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/RefreshTagListWorker.java similarity index 97% rename from src/main/java/org/bibsonomy/plugin/jabref/worker/RefreshTagListWorker.java rename to src/main/java/net/sf/jabref/gui/worker/bibsonomy/RefreshTagListWorker.java index d39cd6be25bc..d8072281aeb0 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/worker/RefreshTagListWorker.java +++ b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/RefreshTagListWorker.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.worker; +package net.sf.jabref.gui.worker.bibsonomy; import java.util.LinkedList; import java.util.List; @@ -6,6 +6,7 @@ import javax.swing.JEditorPane; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.model.metadata.MetaData; @@ -13,7 +14,6 @@ import org.bibsonomy.common.enums.GroupingEntity; import org.bibsonomy.model.BibTex; import org.bibsonomy.model.Tag; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; /** diff --git a/src/main/java/org/bibsonomy/plugin/jabref/worker/SynchronizationWorker.java b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/SynchronizationWorker.java similarity index 94% rename from src/main/java/org/bibsonomy/plugin/jabref/worker/SynchronizationWorker.java rename to src/main/java/net/sf/jabref/gui/worker/bibsonomy/SynchronizationWorker.java index 11ef28435b99..162168a1b475 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/worker/SynchronizationWorker.java +++ b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/SynchronizationWorker.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.worker; +package net.sf.jabref.gui.worker.bibsonomy; import java.util.HashSet; import java.util.LinkedList; @@ -7,8 +7,13 @@ import javax.swing.JOptionPane; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.bibsonomy.CompareDialog; +import net.sf.jabref.gui.util.bibsonomy.WorkerUtil; import net.sf.jabref.logic.l10n.Localization; +import net.sf.jabref.logic.util.bibsonomy.BibtexEntryUtil; +import net.sf.jabref.logic.util.bibsonomy.JabRefModelConverter; import net.sf.jabref.model.database.BibDatabase; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.FieldName; @@ -18,11 +23,6 @@ import org.bibsonomy.model.Post; import org.bibsonomy.model.Resource; import org.bibsonomy.model.logic.LogicInterface; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.gui.CompareDialog; -import org.bibsonomy.plugin.jabref.util.BibtexEntryUtil; -import org.bibsonomy.plugin.jabref.util.JabRefModelConverter; -import org.bibsonomy.plugin.jabref.util.WorkerUtil; /** * Basic synchronization. The user decides which version of the post to keep diff --git a/src/main/java/org/bibsonomy/plugin/jabref/worker/UpdateVisibilityWorker.java b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/UpdateVisibilityWorker.java similarity index 91% rename from src/main/java/org/bibsonomy/plugin/jabref/worker/UpdateVisibilityWorker.java rename to src/main/java/net/sf/jabref/gui/worker/bibsonomy/UpdateVisibilityWorker.java index 9379415fabe2..e748fa9345db 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/worker/UpdateVisibilityWorker.java +++ b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/UpdateVisibilityWorker.java @@ -1,10 +1,13 @@ -package org.bibsonomy.plugin.jabref.worker; +package net.sf.jabref.gui.worker.bibsonomy; import java.util.List; import javax.swing.JComboBox; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; +import net.sf.jabref.gui.actions.bibsonomy.ShowSettingsDialogAction; +import net.sf.jabref.gui.bibsonomy.GroupingComboBoxItem; import net.sf.jabref.logic.l10n.Localization; import org.apache.commons.logging.Log; @@ -12,9 +15,6 @@ import org.bibsonomy.common.enums.GroupingEntity; import org.bibsonomy.model.Group; import org.bibsonomy.model.User; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; -import org.bibsonomy.plugin.jabref.action.ShowSettingsDialogAction; -import org.bibsonomy.plugin.jabref.gui.GroupingComboBoxItem; import org.bibsonomy.rest.exceptions.AuthenticationException; /** diff --git a/src/main/java/org/bibsonomy/plugin/jabref/worker/UploadDocumentsWorker.java b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/UploadDocumentsWorker.java similarity index 96% rename from src/main/java/org/bibsonomy/plugin/jabref/worker/UploadDocumentsWorker.java rename to src/main/java/net/sf/jabref/gui/worker/bibsonomy/UploadDocumentsWorker.java index 8b30bdba804c..e604da1f22c3 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/worker/UploadDocumentsWorker.java +++ b/src/main/java/net/sf/jabref/gui/worker/bibsonomy/UploadDocumentsWorker.java @@ -1,14 +1,14 @@ -package org.bibsonomy.plugin.jabref.worker; +package net.sf.jabref.gui.worker.bibsonomy; import java.io.File; +import net.sf.jabref.bibsonomy.BibsonomyProperties; import net.sf.jabref.gui.JabRefFrame; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.preferences.JabRefPreferences; import org.bibsonomy.model.Document; import org.bibsonomy.model.logic.LogicInterface; -import org.bibsonomy.plugin.jabref.BibsonomyProperties; /** * Upload documents from the file system directly to the service. diff --git a/src/main/java/net/sf/jabref/logic/importer/fileformat/PdfContentImporter.java b/src/main/java/net/sf/jabref/logic/importer/fileformat/PdfContentImporter.java index 200ae12346ca..75e0f05ec8f2 100644 --- a/src/main/java/net/sf/jabref/logic/importer/fileformat/PdfContentImporter.java +++ b/src/main/java/net/sf/jabref/logic/importer/fileformat/PdfContentImporter.java @@ -28,8 +28,6 @@ import net.sf.jabref.model.entry.FieldName; import com.google.common.base.Strings; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.util.PDFTextStripper; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/util/BibtexEntryUtil.java b/src/main/java/net/sf/jabref/logic/util/bibsonomy/BibtexEntryUtil.java similarity index 98% rename from src/main/java/org/bibsonomy/plugin/jabref/util/BibtexEntryUtil.java rename to src/main/java/net/sf/jabref/logic/util/bibsonomy/BibtexEntryUtil.java index a83d72977e5f..f909b74ca424 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/util/BibtexEntryUtil.java +++ b/src/main/java/net/sf/jabref/logic/util/bibsonomy/BibtexEntryUtil.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.util; +package net.sf.jabref.logic.util.bibsonomy; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/org/bibsonomy/plugin/jabref/util/JabRefModelConverter.java b/src/main/java/net/sf/jabref/logic/util/bibsonomy/JabRefModelConverter.java similarity index 99% rename from src/main/java/org/bibsonomy/plugin/jabref/util/JabRefModelConverter.java rename to src/main/java/net/sf/jabref/logic/util/bibsonomy/JabRefModelConverter.java index 3ff4c8c2a9c8..d6b99f7a7555 100644 --- a/src/main/java/org/bibsonomy/plugin/jabref/util/JabRefModelConverter.java +++ b/src/main/java/net/sf/jabref/logic/util/bibsonomy/JabRefModelConverter.java @@ -1,4 +1,4 @@ -package org.bibsonomy.plugin.jabref.util; +package net.sf.jabref.logic.util.bibsonomy; import java.beans.BeanInfo; import java.beans.IntrospectionException; @@ -79,7 +79,6 @@ public class JabRefModelConverter { /** * Converts a BibSonomy post into a JabRef BibEntry * -<<<<<<< HEAD * @param post A Post you need to convert * @return An optional BibEntry * @since 3.7 diff --git a/src/main/java/net/sf/jabref/logic/util/bibsonomy/TagComparator.java b/src/main/java/net/sf/jabref/logic/util/bibsonomy/TagComparator.java new file mode 100644 index 000000000000..278d41260cb8 --- /dev/null +++ b/src/main/java/net/sf/jabref/logic/util/bibsonomy/TagComparator.java @@ -0,0 +1,36 @@ +package net.sf.jabref.logic.util.bibsonomy; + +import java.util.Comparator; + +import org.bibsonomy.common.enums.GroupingEntity; +import org.bibsonomy.model.Tag; + +public class TagComparator implements Comparator { + + private static final int LESS_THAN = -100, EQUAL = 0, GREATER_THAN = 100; + private GroupingEntity grouping; + + public TagComparator(GroupingEntity grouping) { + + this.grouping = grouping; + } + + public int compare(Tag currentTag, Tag nextTag) { + switch(grouping) { + case USER: + if(currentTag.getUsercount() < nextTag.getUsercount()) + return GREATER_THAN; + else if(currentTag.getUsercount() > nextTag.getUsercount()) + return LESS_THAN; + else return EQUAL; + default: + if(currentTag.getGlobalcount() < nextTag.getGlobalcount()) + return GREATER_THAN; + else if(currentTag.getGlobalcount() > nextTag.getGlobalcount()) + return LESS_THAN; + else return EQUAL; + } + } + + +} diff --git a/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java b/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java index 1730855692bd..f8169ad98fef 100644 --- a/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java @@ -35,6 +35,7 @@ import net.sf.jabref.JabRefException; import net.sf.jabref.JabRefMain; +import net.sf.jabref.gui.bibsonomy.EntryEditorTabExtender; import net.sf.jabref.gui.desktop.JabRefDesktop; import net.sf.jabref.gui.entryeditor.EntryEditorTabList; import net.sf.jabref.gui.preftabs.ImportSettingsTab; @@ -423,7 +424,7 @@ public class JabRefPreferences { private static final String CUSTOM_TYPE_PRIOPT = "customTypePriOpt_"; /** - * Temporaly getter for {@link org.bibsonomy.plugin.jabref.gui.EntryEditorTabExtender EntryEditorTabExtender} + * Temporaly getter for {@link EntryEditorTabExtender EntryEditorTabExtender} * TODO: Find another solution * @return CUSTOM_TYPE_NAME */ diff --git a/src/main/java/org/bibsonomy/plugin/jabref/util/TagComparator.java b/src/main/java/org/bibsonomy/plugin/jabref/util/TagComparator.java deleted file mode 100644 index 258169a8b874..000000000000 --- a/src/main/java/org/bibsonomy/plugin/jabref/util/TagComparator.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * - * JabRef Bibsonomy Plug-in - Plugin for the reference management - * software JabRef (http://jabref.sourceforge.net/) - * to fetch, store and delete entries from BibSonomy. - * - * Copyright (C) 2008 - 2011 Knowledge & Data Engineering Group, - * University of Kassel, Germany - * http://www.kde.cs.uni-kassel.de/ - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package org.bibsonomy.plugin.jabref.util; - -import java.util.Comparator; - -import org.bibsonomy.common.enums.GroupingEntity; -import org.bibsonomy.model.Tag; - -public class TagComparator implements Comparator { - - private static final int LESS_THAN = -100, EQUAL = 0, GREATER_THAN = 100; - private GroupingEntity grouping; - - public TagComparator(GroupingEntity grouping) { - - this.grouping = grouping; - } - - public int compare(Tag currentTag, Tag nextTag) { - switch(grouping) { - case USER: - if(currentTag.getUsercount() < nextTag.getUsercount()) - return GREATER_THAN; - else if(currentTag.getUsercount() > nextTag.getUsercount()) - return LESS_THAN; - else return EQUAL; - default: - if(currentTag.getGlobalcount() < nextTag.getGlobalcount()) - return GREATER_THAN; - else if(currentTag.getGlobalcount() > nextTag.getGlobalcount()) - return LESS_THAN; - else return EQUAL; - } - } - - -}