Skip to content

Commit

Permalink
Test javafx import order
Browse files Browse the repository at this point in the history
  • Loading branch information
boceckts committed Jun 27, 2016
1 parent 7564862 commit 642f6ba
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 29 deletions.
10 changes: 5 additions & 5 deletions src/main/java/net/sf/jabref/gui/FXAlert.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;

import net.sf.jabref.Globals;
import net.sf.jabref.JabRefGUI;
import net.sf.jabref.gui.keyboard.KeyBinding;
import net.sf.jabref.gui.keyboard.KeyBindingPreferences;

import javafx.application.Platform;
import javafx.fxml.FXMLLoader;
import javafx.scene.control.Alert;
import javafx.scene.image.Image;
import javafx.stage.Stage;

import net.sf.jabref.Globals;
import net.sf.jabref.JabRefGUI;
import net.sf.jabref.gui.keyboard.KeyBinding;
import net.sf.jabref.gui.keyboard.KeyBindingPreferences;

/**
* This class shall provide a super class for future dialogs implemented in java fx.
* It mimics the behavior of a swing JDialog which means once a object of this class
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/sf/jabref/gui/help/AboutAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import javax.swing.Action;
import javax.swing.Icon;

import net.sf.jabref.gui.actions.MnemonicAwareAction;

import javafx.application.Platform;

import net.sf.jabref.gui.actions.MnemonicAwareAction;

public class AboutAction extends MnemonicAwareAction {

public AboutAction(String title, String tooltip, Icon iconFile) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/net/sf/jabref/gui/help/AboutDialogView.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
*/
package net.sf.jabref.gui.help;

import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.DialogPane;

import net.sf.jabref.gui.FXAlert;
import net.sf.jabref.logic.l10n.Localization;

import com.airhacks.afterburner.views.FXMLView;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.DialogPane;

public class AboutDialogView extends FXMLView {

Expand Down
11 changes: 6 additions & 5 deletions src/main/java/net/sf/jabref/gui/help/AboutDialogViewModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@

import java.io.IOException;

import javafx.beans.property.ReadOnlyStringProperty;
import javafx.beans.property.ReadOnlyStringWrapper;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.stage.Stage;

import net.sf.jabref.Globals;
import net.sf.jabref.JabRefGUI;
import net.sf.jabref.gui.ClipBoardManager;
import net.sf.jabref.gui.desktop.JabRefDesktop;
import net.sf.jabref.logic.l10n.Localization;

import javafx.beans.property.ReadOnlyStringProperty;
import javafx.beans.property.ReadOnlyStringWrapper;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.stage.Stage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
import javax.swing.AbstractAction;
import javax.swing.Action;

import javafx.application.Platform;

import net.sf.jabref.Globals;
import net.sf.jabref.gui.IconTheme;
import net.sf.jabref.logic.l10n.Localization;

import javafx.application.Platform;


public class KeyBindingAction extends AbstractAction {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@

import javax.swing.KeyStroke;

import net.sf.jabref.JabRefPreferences;
import net.sf.jabref.logic.util.OS;

import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;

import net.sf.jabref.JabRefPreferences;
import net.sf.jabref.logic.util.OS;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
*/
package net.sf.jabref.gui.keyboard;

import com.google.common.base.CaseFormat;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;

import com.google.common.base.CaseFormat;

/**
* This class represents a view model for objects of the KeyBinding
* class. It has two properties representing the localized name of an
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package net.sf.jabref.gui.keyboard;

import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.DialogPane;
import javafx.stage.Stage;

import net.sf.jabref.gui.FXAlert;
import net.sf.jabref.logic.l10n.Localization;

import com.airhacks.afterburner.views.FXMLView;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.DialogPane;
import javafx.stage.Stage;

public class KeyBindingsDialogView extends FXMLView {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
*/
package net.sf.jabref.gui.keyboard;

import net.sf.jabref.gui.FXDialogs;
import net.sf.jabref.gui.IconTheme;
import net.sf.jabref.logic.l10n.Localization;

import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.fxml.FXML;
Expand All @@ -37,6 +33,10 @@
import javafx.stage.Stage;
import javafx.util.Callback;

import net.sf.jabref.gui.FXDialogs;
import net.sf.jabref.gui.IconTheme;
import net.sf.jabref.logic.l10n.Localization;

public class KeyBindingsDialogViewModel {

private KeyBindingRepository keyBindingRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package net.sf.jabref.gui.keyboard;

import net.sf.jabref.JabRefPreferences;

import javafx.scene.control.TreeItem;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;

import net.sf.jabref.JabRefPreferences;

import org.junit.Before;
import org.junit.Test;

Expand Down

0 comments on commit 642f6ba

Please sign in to comment.