Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Temporarily remove "Customize entry types" #4716

Merged
merged 2 commits into from
Mar 4, 2019
Merged

Temporarily remove "Customize entry types" #4716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
115b84c
Temporarily remove "Customize entry types"
tobiasdiez Mar 3, 2019
8002eda
Add reference to issue
tobiasdiez Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/jabref/gui/JabRefFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
import org.jabref.gui.actions.BibtexKeyPatternAction;
import org.jabref.gui.actions.ConnectToSharedDatabaseCommand;
import org.jabref.gui.actions.CopyFilesAction;
import org.jabref.gui.actions.CustomizeEntryAction;
import org.jabref.gui.actions.CustomizeKeyBindingAction;
import org.jabref.gui.actions.DatabasePropertiesAction;
import org.jabref.gui.actions.EditExternalFileTypesAction;
Expand Down Expand Up @@ -942,7 +941,8 @@ private MenuBar createMenu() {
new SeparatorMenuItem(),

factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new ManageContentSelectorAction(this)),
factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
// TODO: Reenable customize entry types feature (https://github.com/JabRef/jabref/issues/4719)
//factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add a comment to the mentioned follow-up issue here.

factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this)));

help.getItems().addAll(
Expand Down
10 changes: 4 additions & 6 deletions ...ref/gui/actions/CustomizeEntryAction.java → ...ustomentrytypes/CustomizeEntryAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package org.jabref.gui.actions;

import javax.swing.JDialog;
package org.jabref.gui.customentrytypes;

import org.jabref.gui.JabRefFrame;
import org.jabref.gui.customentrytypes.EntryTypeCustomizationDialog;
import org.jabref.gui.actions.SimpleCommand;

public class CustomizeEntryAction extends SimpleCommand {

Expand All @@ -15,7 +13,7 @@ public CustomizeEntryAction(JabRefFrame frame) {

@Override
public void execute() {
JDialog dialog = new EntryTypeCustomizationDialog(frame);
dialog.setVisible(true);
EntryTypeCustomizationDialog dialog = new EntryTypeCustomizationDialog();
dialog.showAndWait();
}
}
61 changes: 7 additions & 54 deletions src/main/java/org/jabref/gui/customentrytypes/EntryTypeCustomizationDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,11 @@
package org.jabref.gui.customentrytypes;

import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

import javax.swing.AbstractAction;
import javax.swing.ActionMap;
import javax.swing.BorderFactory;
import javax.swing.InputMap;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;

import org.jabref.Globals;
import org.jabref.gui.BasePanel;
import org.jabref.gui.JabRefDialog;
import org.jabref.gui.JabRefFrame;
import org.jabref.gui.keyboard.KeyBinding;
import org.jabref.logic.l10n.Localization;
import org.jabref.model.EntryTypes;
import org.jabref.model.database.BibDatabaseMode;
import org.jabref.model.entry.BibEntry;
import org.jabref.model.entry.CustomEntryType;
import org.jabref.model.entry.EntryType;
import org.jabref.model.entry.InternalBibtexFields;
import org.jabref.model.strings.StringUtil;

import com.jgoodies.forms.builder.ButtonBarBuilder;

public class EntryTypeCustomizationDialog extends JabRefDialog implements ListSelectionListener {
import org.jabref.gui.util.BaseDialog;

public class EntryTypeCustomizationDialog extends BaseDialog<Void> {

// TODO: Re-implement customize entry types feature (https://github.com/JabRef/jabref/issues/4719)
/*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here the same: please also add a comment to the mentioned follow-up issue here.

protected GridBagLayout gbl = new GridBagLayout();
protected GridBagConstraints con = new GridBagConstraints();
protected JButton delete;
Expand All @@ -70,9 +25,6 @@ public class EntryTypeCustomizationDialog extends JabRefDialog implements ListSe
private boolean biblatexMode;
private BibDatabaseMode bibDatabaseMode;

/**
* Creates a new instance of EntryTypeCustomizationDialog
*/
public EntryTypeCustomizationDialog(JabRefFrame frame) {
super(Localization.lang("Customize entry types"), false, EntryTypeCustomizationDialog.class);

Expand Down Expand Up @@ -419,6 +371,7 @@ private void record() {
changed.add(lastSelected);
typeComp.enable(lastSelected, true);
}

}

*/
}