← Back to branch summary

~ubuntu-branches/ubuntu/natty/jabref/natty

~ubuntu-branches/ubuntu/natty/jabref/natty

« back to all changes in this revision

Viewing changes to src/java/net/sf/jabref/MergeDialog.java

Committer: Bazaar Package Importer
Author(s): gregor herrmann
Date: 2010-04-27 16:49:34 UTC
mfrom: (2.1.8 squeeze)
Revision ID: james.westby@ubuntu.com-20100427164934-ozu2dvinslmo3444

Tags: 2.6+ds-2

http://bugs.debian.org/579346

debian/control: add "Recommends: xdg-utils"; thanks to Vincent Fourmond
for the bug report (closes: #579346). Change xpdf to xpdf-reader in
Suggests.

files added:
.cvsignore

debian/clean

debian/jabref.bug-presubj

debian/repack.local

debian/repack.stub

debian/source

debian/source/format

src/help/ScienceDirect.html

src/images/splash-2.6.svg

src/images/splashBackground.png

src/java/net/sf/jabref/autocompleter

src/java/net/sf/jabref/autocompleter/AbstractAutoCompleter.java

src/java/net/sf/jabref/autocompleter/AutoCompleterFactory.java

src/java/net/sf/jabref/autocompleter/CrossrefAutoCompleter.java

src/java/net/sf/jabref/autocompleter/DefaultAutoCompleter.java

src/java/net/sf/jabref/autocompleter/EntireFieldAutoCompleter.java

src/java/net/sf/jabref/autocompleter/NameFieldAutoCompleter.java

src/java/net/sf/jabref/collab/MetaDataChange.java

src/java/net/sf/jabref/export/layout/format/Default.java

src/java/net/sf/jabref/export/layout/format/IfPlural.java

src/java/net/sf/jabref/external/TransferableFileLinkSelection.java

src/java/net/sf/jabref/gui/VerticalLabelUI.java

src/java/net/sf/jabref/imports/BibsonomyScraper.java

src/java/net/sf/jabref/imports/JSTORFetcher2.java

src/java/net/sf/jabref/imports/ScienceDirectFetcher.java

src/java/tests/net/sf/jabref/TestUtils.java

src/java/tests/net/sf/jabref/gui

src/java/tests/net/sf/jabref/gui/AutoCompleterTest.java

src/java/tests/net/sf/jabref/imports/GeneralFetcherTest.java

src/java/tests/net/sf/jabref/imports/RISImporterTest.java

src/java/tests/net/sf/jabref/testutils

src/java/tests/net/sf/jabref/testutils/TestUtils.java

src/resource/.cvsignore

src/resource/fields/.cvsignore

src/resource/ods/mimetype

src/tests/net/sf/jabref/bibtexFiles

src/tests/net/sf/jabref/bibtexFiles/test.bib

src/tests/net/sf/jabref/imports/RisImporterTest1.ris

src/windows/nsis/.cvsignore

files removed:
JabRef.ipr

JabRef.iws

debian/patches/03_external_apps.patch

lib

lib/EndNote.zip

lib/JavaApplicationStub

lib/JempBox-0.2.0.jar

lib/OSXAdapter.class

lib/PDFBox-0.7.3-dev-reduced.jar

lib/antlr-3.0b5.jar

lib/antlr.jar

lib/forms-1.1.0.jar

lib/glazedlists-1.7.0_java15.jar

lib/jarbundler-1.4.jar

lib/looks-2.2.0.jar

lib/microba.jar

lib/mysql-connector-java-5.0.7-bin.jar

lib/plugin

lib/plugin/JPFCodeGenerator-rt.jar

lib/plugin/JPFCodeGenerator.jar

lib/plugin/commons-logging.jar

lib/plugin/jpf-boot.jar

lib/plugin/jpf.jar

lib/plugin/velocity-dep-1.5.jar

lib/spin.jar

src/images/splash-2.5.svg

src/images/splash-2.5beta.svg

src/java/net/sf/jabref/about/HighlightFilter.java

src/java/net/sf/jabref/util/DocumentPrinter.java

src/txt/README~

files modified:
.classpath

build.number

build.xml

debian/README.Debian

debian/README.source

debian/changelog

debian/control

debian/copyright

debian/jabref-wrapper

debian/jabref.dirs

debian/jabref.install

debian/jabref.links

debian/patches/01_free_javac.patch

debian/patches/02_libs.patch

debian/patches/05_antlr.patch

debian/patches/06_BibtexEntry.patch

debian/patches/series

debian/rules

debian/watch

src/Jabref.iml

src/help/ACMPortalHelp.html

src/help/About.html

src/help/BaseFrameHelp.html

src/help/Contents.html

src/help/CustomEntriesHelp.html

src/help/CustomExports.html

src/help/EntryEditorHelp.html

src/help/IEEEXploreHelp.html

src/help/JSTOR.html

src/help/RevisionHistory.html

src/help/da/About.html

src/help/de/About.html

src/help/de/JabRef-UserManual_de.tex

src/help/fr/ACMPortalHelp.html

src/help/fr/About.html

src/help/fr/BaseFrameHelp.html

src/help/fr/Contents.html

src/help/fr/CustomEntriesHelp.html

src/help/fr/CustomExports.html

src/help/fr/EntryEditorHelp.html

src/help/fr/IEEEXploreHelp.html

src/help/fr/JSTOR.html

src/help/fr/LabelPatterns.html

src/help/fr/RevisionHistory.html

src/images/splash.png

src/java/gnu/dtools/ritopt/OptionMenu.java

src/java/net/sf/jabref/AdvancedTab.java

src/java/net/sf/jabref/AuthorList.java

src/java/net/sf/jabref/BasePanel.java

src/java/net/sf/jabref/BibtexEntryType.java

src/java/net/sf/jabref/ContentSelectorDialog2.java

src/java/net/sf/jabref/CustomEntryType.java

src/java/net/sf/jabref/DuplicateCheck.java

src/java/net/sf/jabref/EntryEditor.java

src/java/net/sf/jabref/EntryEditorTab.java

src/java/net/sf/jabref/ExternalTab.java

src/java/net/sf/jabref/FieldEditor.java

src/java/net/sf/jabref/FieldTextArea.java

src/java/net/sf/jabref/FieldTextField.java

src/java/net/sf/jabref/FieldTextMenu.java

src/java/net/sf/jabref/GeneralTab.java

src/java/net/sf/jabref/Globals.java

src/java/net/sf/jabref/HelpAction.java

src/java/net/sf/jabref/HelpContent.java

src/java/net/sf/jabref/HelpDialog.java

src/java/net/sf/jabref/JabRef.java

src/java/net/sf/jabref/JabRefFrame.java

src/java/net/sf/jabref/JabRefPreferences.java

src/java/net/sf/jabref/MergeDialog.java

src/java/net/sf/jabref/MetaData.java

src/java/net/sf/jabref/PrefsDialog3.java

src/java/net/sf/jabref/PreviewPanel.java

src/java/net/sf/jabref/RegExpRule.java

src/java/net/sf/jabref/SearchManager2.java

src/java/net/sf/jabref/SimpleSearchRule.java

src/java/net/sf/jabref/TableColumnsTab.java

src/java/net/sf/jabref/Util.java

src/java/net/sf/jabref/about/AboutPanel.java

src/java/net/sf/jabref/collab/Change.java

src/java/net/sf/jabref/collab/ChangeDisplayDialog.java

src/java/net/sf/jabref/collab/ChangeScanner.java

src/java/net/sf/jabref/collab/EntryAddChange.java

src/java/net/sf/jabref/collab/EntryChange.java

src/java/net/sf/jabref/collab/EntryDeleteChange.java

src/java/net/sf/jabref/collab/FileUpdateMonitor.java

src/java/net/sf/jabref/collab/GroupChange.java

src/java/net/sf/jabref/collab/PreambleChange.java

src/java/net/sf/jabref/collab/StringAddChange.java

src/java/net/sf/jabref/collab/StringChange.java

src/java/net/sf/jabref/collab/StringNameChange.java

src/java/net/sf/jabref/collab/StringRemoveChange.java

src/java/net/sf/jabref/export/CustomExportList.java

src/java/net/sf/jabref/export/FileActions.java

src/java/net/sf/jabref/export/OpenDocumentRepresentation.java

src/java/net/sf/jabref/export/OpenDocumentSpreadsheetCreator.java

src/java/net/sf/jabref/export/SaveDatabaseAction.java

src/java/net/sf/jabref/export/SaveException.java

src/java/net/sf/jabref/export/SaveSession.java

src/java/net/sf/jabref/export/layout/Layout.java

src/java/net/sf/jabref/export/layout/LayoutEntry.java

src/java/net/sf/jabref/export/layout/format/CreateDocBookAuthors.java

src/java/net/sf/jabref/export/layout/format/CreateDocBookEditors.java

src/java/net/sf/jabref/export/layout/format/FormatChars.java

src/java/net/sf/jabref/export/layout/format/HTMLChars.java

src/java/net/sf/jabref/export/layout/format/LastPage.java

src/java/net/sf/jabref/export/layout/format/RTFChars.java

src/java/net/sf/jabref/export/layout/format/Replace.java

src/java/net/sf/jabref/export/layout/format/ResolvePDF.java

src/java/net/sf/jabref/export/layout/format/WrapFileLinks.java

src/java/net/sf/jabref/external/DroppedFileHandler.java

src/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java

src/java/net/sf/jabref/external/FindFullText.java

src/java/net/sf/jabref/external/MoveFileAction.java

src/java/net/sf/jabref/groups/AllEntriesGroup.java

src/java/net/sf/jabref/groups/AutoGroupDialog.java

src/java/net/sf/jabref/groups/EntryTableTransferHandler.java

src/java/net/sf/jabref/groups/ExplicitGroup.java

src/java/net/sf/jabref/groups/GroupTreeCellRenderer.java

src/java/net/sf/jabref/groups/GroupTreeNode.java

src/java/net/sf/jabref/groups/KeywordGroup.java

src/java/net/sf/jabref/groups/SearchGroup.java

src/java/net/sf/jabref/gui/AutoCompleteListener.java

src/java/net/sf/jabref/gui/AutoCompleter.java

src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java

src/java/net/sf/jabref/gui/FileListEditor.java

src/java/net/sf/jabref/gui/FileListEntryEditor.java

src/java/net/sf/jabref/gui/ImportInspectionDialog.java

src/java/net/sf/jabref/gui/MainTableSelectionListener.java

src/java/net/sf/jabref/gui/SearchResultsDialog.java

src/java/net/sf/jabref/imports/ACMPortalFetcher.java

src/java/net/sf/jabref/imports/CsaImporter.java

src/java/net/sf/jabref/imports/EndnoteImporter.java

src/java/net/sf/jabref/imports/GeneralFetcher.java

src/java/net/sf/jabref/imports/HTMLConverter.java

src/java/net/sf/jabref/imports/IEEEXploreFetcher.java

src/java/net/sf/jabref/imports/IsiImporter.java

src/java/net/sf/jabref/imports/OAI2Fetcher.java

src/java/net/sf/jabref/imports/OpenDatabaseAction.java

src/java/net/sf/jabref/imports/ParserResult.java

src/java/net/sf/jabref/imports/ScifinderImporter.java

src/java/net/sf/jabref/journals/ManageJournalsPanel.java

src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java

src/java/net/sf/jabref/msbib/MSBibEntry.java

src/java/net/sf/jabref/net/Cookie.java

src/java/net/sf/jabref/net/CookieHandlerImpl.java

src/java/net/sf/jabref/net/URLDownload.java

src/java/net/sf/jabref/search/BasicSearch.java

src/java/net/sf/jabref/search/SearchExpressionTreeParser.java

src/java/net/sf/jabref/sql/DBConnectDialog.java

src/java/net/sf/jabref/sql/SQLutil.java

src/java/tests/net/sf/jabref/imports/AllTests.java

src/plugins/net.sf.jabref.core/plugin.xml

src/resource/JabRef_da.properties

src/resource/JabRef_de.properties

src/resource/JabRef_en.properties

src/resource/JabRef_fr.properties

src/resource/JabRef_it.properties

src/resource/JabRef_nl.properties

src/resource/JabRef_no.properties

src/resource/JabRef_tr.properties

src/resource/JabRef_zh.properties

src/resource/JabRef_zh.properties.UTF8

src/resource/Menu_da.properties

src/resource/Menu_de.properties

src/resource/Menu_en.properties

src/resource/Menu_es.properties

src/resource/Menu_fr.properties

src/resource/Menu_it.properties

src/resource/Menu_nl.properties

src/resource/Menu_no.properties

src/resource/Menu_tr.properties

src/resource/Menu_zh.properties

src/resource/Menu_zh.properties.UTF8

src/resource/build.properties

src/resource/layout/bibtexml.layout

src/resource/layout/docbook.begin.layout

src/resource/layout/docbook.layout

src/resource/layout/endnote/EndNote.article.layout

src/resource/layout/endnote/EndNote.book.layout

src/resource/layout/endnote/EndNote.booklet.layout

src/resource/layout/endnote/EndNote.inbook.layout

src/resource/layout/endnote/EndNote.incollection.layout

src/resource/layout/endnote/EndNote.inproceedings.layout

src/resource/layout/endnote/EndNote.layout

src/resource/layout/endnote/EndNote.manual.layout

src/resource/layout/endnote/EndNote.mastersthesis.layout

src/resource/layout/endnote/EndNote.misc.layout

src/resource/layout/endnote/EndNote.other.layout

src/resource/layout/endnote/EndNote.phdthesis.layout

src/resource/layout/endnote/EndNote.proceedings.layout

src/resource/layout/endnote/EndNote.techreport.layout

src/resource/layout/endnote/EndNote.unpublished.layout

src/resource/layout/harvard/harvard.book.layout

src/resource/layout/harvard/harvard.inbook.layout

src/resource/layout/harvard/harvard.incollection.layout

src/resource/layout/harvard/harvard.inproceedings.layout

src/resource/layout/harvard/harvard.layout

src/resource/layout/harvard/harvard.proceedings.layout

src/txt/CHANGELOG

src/txt/README

src/txt/TODO

src/windows/nsis/launcher.nsi

Show diffs side-by-side

added added

removed removed

src/java/net/sf/jabref/MergeDialog.java

46

46

}

47

47

}

48

48

49

public MergeDialog() {

50

this(null, "", false);

51

}

52

53

49

private void jbInit(JabRefFrame parent) {

54

50

// titledBorder1 = new TitledBorder(BorderFactory.createLineBorder(new Color(153, 153, 153),2),Globals.lang("Options"));

55

51

panel1.setLayout(borderLayout1);

Older »