[jabref] 28/459: Load /tmp/tmp.vLkhE21434/jabref-2.1-src into debian/jabref/branches/upstream/current.
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:39:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository jabref.
commit 0ebad218c247b05e6962fae9bbc089f0a4015e4c
Author: gregor herrmann <gregoa at debian.org>
Date: Thu Aug 10 19:37:49 2006 +0000
Load /tmp/tmp.vLkhE21434/jabref-2.1-src into
debian/jabref/branches/upstream/current.
---
.classpath | 28 +
.cvsignore | 15 +
build.number | 4 +-
build.xml | 30 +-
lib/{looks-2.0.1.jar => looks-2.0.4.jar} | Bin 367532 -> 371799 bytes
src/help/About.html | 108 +-
src/help/CiteSeerHelp.html | 5 +
src/help/GroupsHelp.html | 120 --
src/help/IEEEXploreHelp.html | 3 +
src/help/MedlineHelp.html | 4 +
src/help/de/About.html | 99 +-
src/help/fr/About.html | 104 +-
src/help/fr/CiteSeerHelp.html | 8 +
src/help/fr/IEEEXploreHelp.html | 6 +-
src/help/fr/MedlineHelp.html | 5 +
src/images/Close.gif | Bin 119 -> 0 bytes
src/images/CopyKey.gif | Bin 239 -> 0 bytes
src/images/Hourglass.png | Bin 558 -> 0 bytes
src/images/JabRef-Logo-small.gif | Bin 717 -> 0 bytes
src/images/JabRef-Logo.icns | Bin 35556 -> 31575 bytes
src/images/JabRef-icon-48.png | Bin 0 -> 2028 bytes
src/images/JabRef-icon.png | Bin 747 -> 659 bytes
src/images/JabRef-icon.svg | 207 +++
src/images/addtsk_tsk.gif | Bin 125 -> 0 bytes
src/images/backward_nav.gif | Bin 108 -> 0 bytes
src/images/close_view.gif | Bin 73 -> 0 bytes
src/images/completeItem.png | Bin 458 -> 0 bytes
src/images/configure2.png | Bin 332 -> 0 bytes
src/images/copy_edit.gif | Bin 167 -> 0 bytes
src/images/crystal_16/1downarrow.png | Bin 0 -> 630 bytes
src/images/crystal_16/1leftarrow.png | Bin 0 -> 694 bytes
src/images/crystal_16/1rightarrow.png | Bin 0 -> 693 bytes
src/images/crystal_16/1uparrow.png | Bin 0 -> 584 bytes
src/images/crystal_16/Icons.properties | 69 +
src/images/crystal_16/Icons.properties~ | 69 +
src/images/crystal_16/JabRef-icon.png | Bin 0 -> 659 bytes
src/images/{ => crystal_16}/absIcon.png | Bin
src/images/crystal_16/advancedsettings.png | Bin 0 -> 790 bytes
src/images/crystal_16/agt_internet.png | Bin 0 -> 3628 bytes
src/images/crystal_16/agt_internet_small.png | Bin 0 -> 966 bytes
src/images/crystal_16/button_ok.png | Bin 0 -> 643 bytes
src/images/crystal_16/cancel.png | Bin 0 -> 842 bytes
src/images/{ => crystal_16}/contents2.png | Bin
src/images/crystal_16/documentinfo.png | Bin 0 -> 671 bytes
src/images/{ => crystal_16}/doismall.png | Bin
src/images/{ => crystal_16}/duplicate.png | Bin
src/images/crystal_16/edit.png | Bin 0 -> 590 bytes
src/images/crystal_16/edit_add.png | Bin 0 -> 502 bytes
src/images/crystal_16/edit_remove.png | Bin 0 -> 237 bytes
src/images/crystal_16/editcopy.png | Bin 0 -> 389 bytes
src/images/crystal_16/editcut.png | Bin 0 -> 727 bytes
src/images/crystal_16/editpaste.png | Bin 0 -> 490 bytes
src/images/{ => crystal_16}/emacs.png | Bin
src/images/{ => crystal_16}/fileclose.png | Bin
src/images/{ => crystal_16}/fileclose2.png | Bin
src/images/crystal_16/fileimport.png | Bin 0 -> 851 bytes
src/images/crystal_16/filenew.png | Bin 0 -> 357 bytes
src/images/crystal_16/fileopen.png | Bin 0 -> 1080 bytes
src/images/crystal_16/filesave.png | Bin 0 -> 641 bytes
src/images/crystal_16/filesaveas.png | Bin 0 -> 841 bytes
src/images/{ => crystal_16}/genIcon.png | Bin
src/images/crystal_16/gg_ignored.png | Bin 0 -> 1018 bytes
src/images/{ => crystal_16}/groupIncluding.png | Bin
src/images/{ => crystal_16}/groupRefining.png | Bin
src/images/{ => crystal_16}/groupsHighlightAll.png | Bin
src/images/{ => crystal_16}/groupsHighlightAny.png | Bin
src/images/crystal_16/help.png | Bin 0 -> 997 bytes
src/images/crystal_16/ikon.gif | Bin 0 -> 156 bytes
src/images/crystal_16/ikon.png | Bin 0 -> 567 bytes
src/images/{ => crystal_16}/integrity.png | Bin
src/images/{ => crystal_16}/lyx2.png | Bin
src/images/{ => crystal_16}/mark.png | Bin
src/images/{ => crystal_16}/optIcon.png | Bin
src/images/crystal_16/pdf-document.png | Bin 0 -> 779 bytes
src/images/{ => crystal_16}/preamble.png | Bin
src/images/crystal_16/ps.png | Bin 0 -> 617 bytes
src/images/{ => crystal_16}/queue.png | Bin
src/images/crystal_16/redo.png | Bin 0 -> 905 bytes
src/images/crystal_16/reload.png | Bin 0 -> 761 bytes
src/images/{ => crystal_16}/reqIcon.png | Bin
src/images/crystal_16/run.png | Bin 0 -> 920 bytes
src/images/crystal_16/search.png | Bin 0 -> 1023 bytes
src/images/crystal_16/status_unknown.png | Bin 0 -> 571 bytes
src/images/{ => crystal_16}/strings.png | Bin
src/images/crystal_16/text_bottom.png | Bin 0 -> 441 bytes
src/images/crystal_16/trash.png | Bin 0 -> 3238 bytes
src/images/crystal_16/undo.png | Bin 0 -> 934 bytes
src/images/{ => crystal_16}/unmark.png | Bin
src/images/{ => crystal_16}/viewsource.gif | Bin
src/images/{ => crystal_16}/winedt.png | Bin
src/images/{ => crystal_16}/wizard.png | Bin
src/images/{ => crystal_16}/wwwciteseer.png | Bin
src/images/cut_edit.gif | Bin 152 -> 0 bytes
src/images/defaults_ps.gif | Bin 241 -> 0 bytes
src/images/delete_edit.gif | Bin 143 -> 0 bytes
src/images/editcopy.png | Bin 235 -> 0 bytes
src/images/editcut.png | Bin 249 -> 0 bytes
src/images/editdelete.png | Bin 214 -> 0 bytes
src/images/editpaste.png | Bin 283 -> 0 bytes
src/images/edittsk_tsk.gif | Bin 149 -> 0 bytes
src/images/exclamation.gif | Bin 139 -> 0 bytes
src/images/fldr_obj.gif | Bin 152 -> 0 bytes
src/images/forward_nav.gif | Bin 138 -> 0 bytes
src/images/g_icon.gif | Bin 123 -> 0 bytes
src/images/goto.png | Bin 240 -> 0 bytes
src/images/incomplete.png | Bin 387 -> 0 bytes
src/images/messageFail.png | Bin 937 -> 0 bytes
src/images/messageInfo.png | Bin 978 -> 0 bytes
src/images/messageWarn.png | Bin 1014 -> 0 bytes
src/images/minus.gif | Bin 845 -> 0 bytes
src/images/newBibFile.png | Bin 702 -> 0 bytes
src/images/new_page.gif | Bin 127 -> 0 bytes
src/images/new_wiz.gif | Bin 226 -> 0 bytes
src/images/next_nav.gif | Bin 105 -> 0 bytes
src/images/o_icon.gif | Bin 123 -> 0 bytes
src/images/paste_edit.gif | Bin 245 -> 0 bytes
src/images/pdf.png | Bin 349 -> 0 bytes
src/images/pdf_small.gif | Bin 865 -> 0 bytes
src/images/plus.gif | Bin 859 -> 0 bytes
src/images/postscript.png | Bin 233 -> 0 bytes
src/images/prev_nav.gif | Bin 132 -> 0 bytes
src/images/preview.png | Bin 218 -> 0 bytes
src/images/r_icon.gif | Bin 99 -> 0 bytes
src/images/redo_edit.gif | Bin 146 -> 0 bytes
src/images/refresh_nav.gif | Bin 182 -> 0 bytes
src/images/run.png | Bin 314 -> 0 bytes
src/images/save_edit.gif | Bin 187 -> 0 bytes
src/images/saveas_edit.gif | Bin 173 -> 0 bytes
src/images/search.gif | Bin 153 -> 0 bytes
src/images/showerr_tsk.gif | Bin 167 -> 0 bytes
src/images/splash-2.1.png | Bin 0 -> 169994 bytes
src/images/splash-2.1beta.png | Bin 179073 -> 0 bytes
src/images/toc_closed.gif | Bin 158 -> 0 bytes
src/images/undo_edit.gif | Bin 147 -> 0 bytes
src/images/up_nav.gif | Bin 165 -> 0 bytes
src/images/view.gif | Bin 169 -> 0 bytes
src/images/window_nofullscreen.png | Bin 183 -> 0 bytes
src/images/wrongItem.png | Bin 776 -> 0 bytes
src/images/www.png | Bin 725 -> 0 bytes
src/java/net/sf/jabref/AdvancedTab.java | 70 +-
src/java/net/sf/jabref/AppearancePrefsTab.java | 44 +-
src/java/net/sf/jabref/BasePanel.java | 13 +-
src/java/net/sf/jabref/BibtexEntry.java | 6 +-
src/java/net/sf/jabref/BibtexFields.java | 2 +-
src/java/net/sf/jabref/BrowseAction.java | 11 +-
.../net/sf/jabref/DuplicateResolverDialog.java | 44 +-
.../net/sf/jabref/EntryCustomizationDialog.java | 2 +-
src/java/net/sf/jabref/EntryEditor.java | 49 +-
src/java/net/sf/jabref/EntryEditorTab.java | 13 +-
src/java/net/sf/jabref/EntryTypeDialog.java | 21 +-
src/java/net/sf/jabref/FieldContentSelector.java | 14 +-
src/java/net/sf/jabref/FieldTextArea.java | 5 +
src/java/net/sf/jabref/FieldTextMenu.java | 5 +-
src/java/net/sf/jabref/GUIGlobals.java | 218 +--
src/java/net/sf/jabref/GeneralTab.java | 20 +-
src/java/net/sf/jabref/Globals.java | 22 +-
.../net/sf/jabref/{Globals.java => Globals.java~} | 18 +-
src/java/net/sf/jabref/HelpAction.java | 8 +-
src/java/net/sf/jabref/HelpDialog.java | 6 +-
src/java/net/sf/jabref/JabRef.java | 120 +-
src/java/net/sf/jabref/JabRefFrame.java | 169 +--
src/java/net/sf/jabref/JabRefPreferences.java | 6 +
src/java/net/sf/jabref/PreambleEditor.java | 4 +-
src/java/net/sf/jabref/PrefsDialog3.java | 26 +-
src/java/net/sf/jabref/RightClickMenu.java | 30 +-
src/java/net/sf/jabref/SearchManager2.java | 9 +-
src/java/net/sf/jabref/SidePaneComponent.java | 2 +-
src/java/net/sf/jabref/SidePaneHeader.java | 2 +-
src/java/net/sf/jabref/SplashScreen.java | 2 +-
.../{SplashScreen.java => SplashScreen.java~} | 0
src/java/net/sf/jabref/StringDialog.java | 10 +-
src/java/net/sf/jabref/TabLabelPattern.java | 2 +-
src/java/net/sf/jabref/TableColumnsTab.java | 6 +-
src/java/net/sf/jabref/about/NewAboutAction.java | 2 +-
src/java/net/sf/jabref/collab/FileUpdatePanel.java | 2 +-
.../net/sf/jabref/export/CustomExportDialog.java | 28 +-
.../jabref/export/ExportCustomizationDialog.java | 23 +-
src/java/net/sf/jabref/export/SaveSession.java | 2 +
.../export/layout/format/AuthorAbbreviator.java | 12 +-
.../layout/format/AuthorLastFirstAbbreviator.java | 195 ++-
.../sf/jabref/export/layout/format/HTMLChars.java | 100 +-
.../net/sf/jabref/external/ExternalFilePanel.java | 44 +-
src/java/net/sf/jabref/external/PushToEmacs.java | 2 +-
src/java/net/sf/jabref/external/PushToLyx.java | 2 +-
src/java/net/sf/jabref/external/PushToWinEdt.java | 2 +-
src/java/net/sf/jabref/groups/AbstractGroup.java | 2 +-
.../jabref/groups/EntryTableTransferHandler.java | 224 ++-
src/java/net/sf/jabref/groups/GroupSelector.java | 28 +-
.../sf/jabref/groups/GroupTreeCellRenderer.java | 18 +-
src/java/net/sf/jabref/groups/GroupsPrefsTab.java | 2 +-
src/java/net/sf/jabref/groups/SearchGroup.java | 34 +-
.../sf/jabref/gui/EntryCustomizationDialog2.java | 14 +-
src/java/net/sf/jabref/gui/FieldSetComponent.java | 4 +-
.../net/sf/jabref/gui/GenFieldsCustomizer.java | 30 +-
.../net/sf/jabref/gui/ImportInspectionDialog.java | 56 +-
src/java/net/sf/jabref/gui/MainTable.java | 12 +-
.../sf/jabref/imports/AppendDatabaseAction.java | 2 +-
src/java/net/sf/jabref/imports/BibtexParser.java | 2 +-
.../net/sf/jabref/imports/CiteSeerFetcher.java | 2 +-
.../sf/jabref/imports/CiteSeerFetcherPanel.java | 4 +-
src/java/net/sf/jabref/imports/GeneralFetcher.java | 2 +-
.../net/sf/jabref/imports/IEEEXploreFetcher.java | 2 +-
.../jabref/imports/ImportCustomizationDialog.java | 71 +-
.../net/sf/jabref/imports/ImportFormatReader.java | 1 +
src/java/net/sf/jabref/imports/ImportMenuItem.java | 47 +-
src/java/net/sf/jabref/imports/IsiImporter.java | 16 +-
src/java/net/sf/jabref/imports/MedlineFetcher.java | 4 +-
.../net/sf/jabref/imports/OpenDatabaseAction.java | 171 ++-
src/java/net/sf/jabref/imports/RisImporter.java | 15 +
.../sf/jabref/journals/ManageJournalsPanel.java | 16 +-
.../sf/jabref/labelPattern/LabelPatternUtil.java | 7 +-
src/java/net/sf/jabref/net/URLDownload.java | 31 +-
.../jabref/wizard/auximport/AuxSubGenerator.java | 80 +-
.../jabref/wizard/auximport/gui/FromAuxDialog.java | 39 +-
.../integrity/gui/IntegrityMessagePanel.java | 8 +-
.../sf/jabref/wizard/text/gui/TextInputDialog.java | 49 +-
.../format/AuthorLastFirstAbbreviatorTester.java | 27 +-
src/resource/Icons.properties | 67 +
src/resource/JabRef_de.properties | 27 +-
src/resource/JabRef_en.properties | 23 +-
src/resource/JabRef_fr.properties | 49 +-
src/resource/JabRef_it.properties | 68 +-
src/resource/JabRef_no.properties | 21 +-
src/resource/Menu_fr.properties | 2 +-
src/resource/Menu_it.properties | 19 +-
src/resource/build.properties | 6 +-
src/resource/journalList.txt | 1556 --------------------
src/resource/log4j.properties | 7 -
src/txt/README | 22 +-
src/txt/README~ | 478 ------
src/txt/apache-license.txt | 62 -
src/txt/cpl-v10.html | 125 --
232 files changed, 2357 insertions(+), 3472 deletions(-)
diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..a0c016f
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/aelfred-1.2.jar"/>
+ <classpathentry kind="lib" path="lib/antlr.jar"/>
+ <classpathentry kind="lib" path="lib/ccl.jar"/>
+ <classpathentry kind="lib" path="lib/jalopy-1.0b10.jar"/>
+ <classpathentry kind="lib" path="lib/jalopy-ant-0.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/javancss.jar"/>
+ <classpathentry kind="lib" path="lib/jaxen-core-1.0-fcs.jar"/>
+ <classpathentry kind="lib" path="lib/jaxp-1.2.jar"/>
+ <classpathentry kind="lib" path="lib/jdom-1.0b8.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.6.jar"/>
+ <classpathentry kind="lib" path="lib/looks-1.2.2.jar"/>
+ <classpathentry kind="lib" path="lib/oro-2.0.6.jar"/>
+ <classpathentry kind="lib" path="lib/plastic-1.2.1.jar"/>
+ <classpathentry kind="lib" path="lib/sax-2.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/saxpath-1.0-fcs.jar"/>
+ <classpathentry kind="lib" path="lib/vizant.jar"/>
+ <classpathentry kind="lib" path="lib/spin.jar"/>
+ <classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
+ <classpathentry kind="lib" path="lib/pmd-2.0.jar"/>
+ <classpathentry kind="lib" path="lib/forms-1.0.4.jar"/>
+ <classpathentry kind="lib" path="lib/junit.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.9.jar"/>
+ <classpathentry kind="output" path="build"/>
+</classpath>
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..0a53838
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,15 @@
+bak
+build
+.classpath
+.project
+work.jpx
+work.refactor
+.#build.xml.1.38
+.#jabref.log.1.2
+ini
+jabref.log
+jabref.log.lck
+build.number
+classes
+jabref.jpx
+jabref.oif
diff --git a/build.number b/build.number
index 34ffcd8..691512d 100644
--- a/build.number
+++ b/build.number
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
-#Thu Jun 29 22:30:13 CEST 2006
-build.number=100
+#Wed Aug 09 18:35:54 CEST 2006
+build.number=570
diff --git a/build.xml b/build.xml
index d7cc82a..36b8b76 100644
--- a/build.xml
+++ b/build.xml
@@ -22,8 +22,8 @@
Compiler: Ant
Authors: Joerg K. Wegner, wegnerj at informatik.uni-tuebingen.de
Morten O. Alver
- Version: $Revision: 1.61 $
- $Date: 2006/06/29 19:59:18 $
+ Version: $Revision: 1.62 $
+ $Date: 2006/07/25 19:56:36 $
$Author: mortenalver $
modified:
@@ -46,7 +46,7 @@
<!-- some version information -->
<property name="jabref.bin" value="jabref" />
- <property name="jabref.version" value="2.1 beta 2" />
+ <property name="jabref.version" value="2.1" />
<property name="jabref.placeholder.version" value="@version@" /> <!-- used by replace task -->
@@ -111,7 +111,7 @@
<!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
<pathelement location="${library.directory}/commons-logging.jar" />-->
<pathelement location="${library.directory}/antlr.jar" />
- <pathelement location="${library.directory}/looks-2.0.1.jar" />
+ <pathelement location="${library.directory}/looks-2.0.4.jar" />
<pathelement location="${library.directory}/forms-1.0.4.jar" />
<pathelement location="${library.directory}/spin-1.4.jar" />
<pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
@@ -126,7 +126,7 @@
<classpath>
<pathelement location="${build.lib}/jabref.jar"/>
<pathelement location="${library.directory}/antlr.jar" />
- <pathelement location="${library.directory}/looks-2.0.1.jar" />
+ <pathelement location="${library.directory}/looks-2.0.4.jar" />
<pathelement location="${library.directory}/forms-1.0.4.jar" />
<pathelement location="${library.directory}/spin.jar" />
<pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
@@ -140,7 +140,7 @@
<classpath>
<pathelement location="${build.lib}/jabref.jar"/>
<pathelement location="${library.directory}/antlr.jar" />
- <pathelement location="${library.directory}/looks-2.0.1.jar" />
+ <pathelement location="${library.directory}/looks-2.0.4.jar" />
<pathelement location="${library.directory}/forms-1.0.4.jar" />
<pathelement location="${library.directory}/spin-1.4.jar" />
<pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
@@ -156,7 +156,7 @@
<classpath>
<pathelement location="${build.lib}/jabref.jar"/>
<pathelement location="${library.directory}/antlr.jar" />
- <pathelement location="${library.directory}/looks-2.0.1.jar" />
+ <pathelement location="${library.directory}/looks-2.0.4.jar" />
<pathelement location="${library.directory}/forms-1.0.4.jar" />
<pathelement location="${library.directory}/spin-1.4.jar" />
<pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
@@ -168,7 +168,7 @@
<target name="compile">
<mkdir dir="${build.classes}" />
<!--deprecation="on"-->
- <javac debug="on" deprecation="on" destdir="${build.classes}" source="1.4" target="1.4">
+ <javac debug="off" deprecation="on" destdir="${build.classes}" source="1.4" target="1.4">
<src path="${java.dir}"/>
<exclude name="tests/**"/>
<classpath>
@@ -176,7 +176,7 @@
<!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
<pathelement location="${library.directory}/commons-logging.jar" />-->
<pathelement location="${library.directory}/antlr.jar" />
- <pathelement location="${library.directory}/looks-2.0.1.jar" />
+ <pathelement location="${library.directory}/looks-2.0.4.jar" />
<pathelement location="${library.directory}/forms-1.0.4.jar" />
<pathelement location="${library.directory}/spin-1.4.jar" />
<pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
@@ -195,7 +195,7 @@
<!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
<pathelement location="${library.directory}/commons-logging.jar" />-->
<pathelement location="${library.directory}/antlr.jar" />
- <pathelement location="${library.directory}/looks-2.0.1.jar" />
+ <pathelement location="${library.directory}/looks-2.0.4.jar" />
<pathelement location="${library.directory}/spin-1.4.jar" />
</classpath>
</javac>
@@ -205,7 +205,7 @@
<target name="osx">
<mkdir dir="${build.classes}" />
- <javac srcdir="${osx.dir}" debug="on" destdir="${build.classes}" target="1.4">
+ <javac srcdir="${osx.dir}" debug="off" destdir="${build.classes}" target="1.4">
</javac>
</target>
@@ -262,7 +262,7 @@
<mkdir dir="${build.images}" />
<copy todir="${build.images}">
<fileset dir="${images.dir}">
- <include name="*" />
+ <include name="**" />
</fileset>
</copy>
@@ -411,7 +411,7 @@ version=${jabref.version}</echo>
<unjar src="${library.directory}/commons-logging.jar" dest="${build.tmp}" />-->
<unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" />
<!-- <unjar src="${library.directory}/plastic-1.2.1.jar" dest="${build.classes}" />-->
- <unjar src="${library.directory}/looks-2.0.1.jar" dest="${build.tmp}" />
+ <unjar src="${library.directory}/looks-2.0.4.jar" dest="${build.tmp}" />
<unjar src="${library.directory}/forms-1.0.4.jar" dest="${build.tmp}" />
<unjar src="${library.directory}/spin-1.4.jar" dest="${build.tmp}" />
<unjar src="${library.directory}/glazedlists-1.5.0_java14.jar" dest="${build.tmp}" />
@@ -546,8 +546,8 @@ Number (CCN) maintenance
<!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
<pathelement location="${library.directory}/commons-logging.jar" />-->
<pathelement location="${library.directory}/antlr.jar" />
- <pathelement location="${library.directory}/looks-2.0.1.jar" />
- <pathelement location="${library.directory}/looks-2.0.1.jar" />
+ <pathelement location="${library.directory}/looks-2.0.4.jar" />
+ <pathelement location="${library.directory}/looks-2.0.4.jar" />
<pathelement location="${library.directory}/spin-1.4.jar" />
</classpath>
diff --git a/lib/looks-2.0.1.jar b/lib/looks-2.0.4.jar
similarity index 54%
rename from lib/looks-2.0.1.jar
rename to lib/looks-2.0.4.jar
index e969b64..e852c9d 100644
Binary files a/lib/looks-2.0.1.jar and b/lib/looks-2.0.4.jar differ
diff --git a/src/help/About.html b/src/help/About.html
index 59a599f..9a88101 100755
--- a/src/help/About.html
+++ b/src/help/About.html
@@ -6,58 +6,63 @@
<H1>JabRef version @version@ </H1>
(c) 2006
+<p>
+<img src="/images/JabRef-icon-48.png"></img>
<P>
-JabRef is freely distributable under the terms of the
-<a href="License.html">GNU Public License</a>, version 2.
+JabRef is freely distributable under the terms of the GNU
+<a href="License.html">General Public License</a>, version 2.
<H2>Developers:</H2>
-Morten O. Alver<BR>
-Nizar N. Batada<BR>
-Michel Baylac<BR>
-Guillaume Gardey<BR>
-Cyrille d'Haese<BR>
-Raik Nagel<BR>
-Ellen Reitmayr<BR>
-Andreas Rudert<BR>
-Michael Spiegel<BR>
-Ulrik Stervbo<BR>
-Dominik Waßenhoven<BR>
-Joerg K. Wegner<BR>
-Michael Wrighton<BR>
-Egon Willighagen <BR>
-Jörg Zieren<BR>
+Morten O. Alver,
+Nizar N. Batada,
+Michel Baylac,
+Guillaume Gardey,
+Cyrille d'Haese,
+Raik Nagel,
+Ellen Reitmayr,
+Andreas Rudert,
+Michael Spiegel,
+Ulrik Stervbo,
+Dominik Waßenhoven,
+Joerg K. Wegner,
+Michael Wrighton,
+Egon Willighagen,
+Jörg Zieren
<H2>Contributions from:</H2>
-Kolja Brix<BR>
-Frédéric Darboux<BR>
-Fabrice Dessaint<BR>
-Nathan Dunn<BR>
-Brian Van Essen<br>
-Alexis Gallagher<BR>
-Sascha Hunold<BR>
-Bernd Kalbfuss<BR>
-Martin Kähmer<BR>
-Ervin Kolenovic<BR>
-Jeffrey Kuhn<BR>
-Alex Montgomery<BR>
-John Relph<BR>
-Moritz Ringler<BR>
-Andreas Rudert<BR>
-Rudolf Seemann<BR>
-Toralf Senger<br>
-Mike Smoot<BR>
-Martin Stolle<BR>
-David Weitzman<BR>
-Seb Wills<BR>
+Kolja Brix,
+Frédéric Darboux,
+Fabrice Dessaint,
+Nathan Dunn,
+Brian Van Essen,
+Alexis Gallagher,
+Sascha Hunold,
+Bernd Kalbfuss,
+Martin Kähmer,
+Ervin Kolenovic,
+Krzysztof A. Kościuszkiewicz,
+Jeffrey Kuhn,
+Alex Montgomery,
+Christopher Oezbek,
+John Relph,
+Moritz Ringler,
+Andreas Rudert,
+Rudolf Seemann,
+Toralf Senger,
+Mike Smoot,
+Martin Stolle,
+David Weitzman,
+Seb Wills,
+John Zedlewski
<H2>Thanks to:</H2>
-Samin Muhammad Ridwanul Karim<BR>
-Stefan Robert<BR>
+Samin Muhammad Ridwanul Karim,
+Stefan Robert
<H2>Third-party software used:</H2>
-JabRef uses JGoodies Looks 1.2.2 and JGoodies Forms 1.0.4, distributed by JGoodies
+JabRef uses JGoodies Looks 2.0.4 and JGoodies Forms 1.0.5, distributed by JGoodies
(<code>http://www.jgoodies.com</code>) under the terms of the BSD License (see
<code>http://www.opensource.org/licenses/bsd-license.html</code> for details).
<P>
@@ -66,7 +71,7 @@ Lentzsch, which are distributed under <A HREF="jgoodies.html">these terms</A>.
<P>
Command line options are parsed using RitOpt (<code>http://ritopt.sourceforge.net</code>). RitOpt
-is distributed under the terms of the <a href="License.html">GNU Public License</a>,
+is distributed under the terms of the GNU <a href="License.html">General Public License</a>,
version 2.
<P>
JabRef uses the ANTLR parser generator for interpreting search strings. ANTLR is
@@ -75,28 +80,19 @@ licensing terms.
<p>
For table presentation and filtering, JabRef uses the Glazed Lists library
(<code>http://publicobject.com/glazedlists</code>), which is
- distributed under the Lesser GNU Public License.
+ distributed under the Lesser General Public License.
<P>
JabRef also uses the threading library Spin 1.3.1, which is distributed under the terms of
-the Lesser GNU Public License.
+the Lesser General Public License.
<P>
Some GUI components from the Microba library are used, it is licensed under a BSD style license.
See <code>http://sourceforge.net/projects/microba/</code> for more informations.
-<P>
-This product includes software developed by the Apache Software
-Foundation (http://www.apache.org/). The libraries Commons Logging and
-Commons HTTP Client are distributed by The Jakarta Project
-(<code>http://jakarta.apache.org</code>) under the Apache Software
-License, Version 1.1. See the enclosed file
-<code>apache-license.txt</code> or
-<code>http://opensource.org/licenses/apachepl.php</code> for details.
<P>
-Some icons are by us, but most are either from the Eclipse project (<code>http://www.eclipse.org</code>),
-distributed under the <a href="cpl-v10.html">Common Public License</a>, and from the QIcons package
-(<code>http://qt.osdn.org.ua</code>), which is distributed under the terms of the
-<a href="License.html">GNU Public License</a>.
+The majority of icons are from the Crystal Clear icon set by Everaldo
+(<code>http://www.everaldo.com</code>), which is distributed under the
+ terms of the Lesser General Public License.
</CENTER>
</BODY>
diff --git a/src/help/CiteSeerHelp.html b/src/help/CiteSeerHelp.html
index 032c361..4c33cb1 100644
--- a/src/help/CiteSeerHelp.html
+++ b/src/help/CiteSeerHelp.html
@@ -5,6 +5,11 @@
<H1>Importing From CiteSeer</H1>
+
+CiteSeer is a scientific literature digital library and search engine
+that focuses primarily on the literature in computer and information
+science.
+
<H2>Importing An Entry From CiteSeer</H2>
JabRef can download information about a particular citation from the CiteSeer database.
diff --git a/src/help/GroupsHelp.html b/src/help/GroupsHelp.html
index 9e3a980..7327168 100644
--- a/src/help/GroupsHelp.html
+++ b/src/help/GroupsHelp.html
@@ -132,124 +132,4 @@ The <b>Refresh</b> button updates the entry table to reflect the current groups
If a refining group is a subgroup of a group that includes its subgroups -- the refining group's siblings --, these siblings are ignored when the refining group is selected.
-Selecting a group shows the entries contained in that group. Selecting multiple groups shows the entries contained in any group (union) or those contained in all groups (intersection), depending on the current settings. All this is explained in detail below.
-<p>
-Group definitions are database-specific; they are saved as a <tt>@COMMENT</tt> block in the <tt>.bib</tt>-file and are shared among all users. (Future versions of JabRef might support user-dependent groups.)
-
-<H2>Interface</H2>
-
-The groups interface is shown in the side pane on the left of the screen. It can be toggled on or off by pressing <tt>CTRL-SHIFT-G</tt> or by the groups button in the toolbar. The interface has several buttons, but most functions are accessed via a context ("right-click") menu. Drag and Drop is also supported.
-<p>
-
-<table cellspacing=0 cellpadding=5 border=0 bgcolor=#c0ffc0>
-<tr><td>
-<h2>Some quick examples</h2>
-
-You might want to...
-
-<h3>...just create a group and assign some entries to it</h3>
-
-Ensure that the groups interface is visible. Press the <b>New Group</b> button, enter a name for the group, then press OK, leaving all values at their defaults. Now select the entries to be assigned to the group and use Drag and Drop to the group, or the option <b>Add to group</b> in the context menu. Finally select the group to see its content (which should be the entries you just assigned).
-
-<h3>...use the <tt>keywords</tt> field to group the entries</h3>
-
-Ensure that the groups interface is visible. Press the <b>New Group</b> button, enter a name for the group, and select the option to dynamically group entries by searching a field for a keyword. Enter the keyword to search for, then click OK. Finally select the group to see its content (which should be all entries whose <tt>keywords</tt> field contains the keyword you specified).
-
-<h3>...use a free-form search expression to define a group</h3>
-
-Ensure that the groups interface is visible. Press the <b>New Group</b> button, enter a name for the group, and select the option to dynamically group entries by a free-form search expression. Enter <tt>author=smith</tt> as a search expression (replace <tt>smith</tt> with a name that actually occurs in your database) and click <b>OK</b>. Finally select the group to see its content (which should be all entries whose <tt>author</tt> field contains the name you specified).
-
-<h3>...combine multiple groups</h3>
-
-Create two different groups (e.g. as described above). Click the <b>Settings</b> button and make sure that <b>Union</b> is selected. Now select both groups. You should see all entries contained in any of the two groups. Click <b>Settings</b> again and select <b>Intersection</b>. Now you should see only those entries contained in both groups (which might be none at all, or exactly the same entries as before in case both groups contain the same entries).
-
-<h3>...identify overlapping groups</h3>
-
-JabRef allows you to easily identify groups that overlap with the currently selected groups (i.e. that contain at least one entry that is also contained in the currently selected groups). Click <b>Settings</b> and activate the option to highlight overlapping groups. Then select a group that overlaps with other groups. The other groups should be highlighted.
-
-</tr></td>
-</table>
-<p>
-
-<H2>Types of groups</H2>
-
-In JabRef 1.8 there are four different types of groups:
-
-<ol>
-<li> The group <b>All Entries</b>, which -- as the name suggests -- contains all entries, is always present and cannot be edited or removed.
-<li> <b>Static groups</b> behave like directories on disk and contain only those entries that you explicitly assign to them.
-<li> <b>Dynamic groups based on keyword search</b> contain entries in which a certain BibTeX field (e.g. <tt>keywords</tt>) contains a certain keyword (e.g. <tt>electrical</tt>). This method does not require manual assignment of entries, but uses information that is already present in the database. If all entries in your database have suitable keywords in their <tt>keywords</tt> field, using this type of group might be the best choice.
-<li> <b>Dynamic groups based on free-form search expressions</b> contain entries that match a specified search expression, using the same syntax as the <a href="SearchHelp.html">search panel</a> on the side pane. This <a href="SearchHelp.html#advanced">syntax</a> supports logical operators (<tt>AND</tt>, <tt>OR</tt>, <tt>NOT</tt>) and allows to specify one or more BibTeX fields to search, facilitating more flexible group definitions than a keyword search (e.g. <tt>author=smith and title= [...]
-</ol>
-
-Every group that you create is of one of the last three types. The group editing dialog, which is invoked by double-clicking on a group, shows a short description of the selected/edited group in plain English.
-
-<H2>Groups structure, creating and removing groups</H2>
-
-Just like directories, groups are structured like a tree, with the group <b>All Entries</b> at the root. By right-clicking on a group you can add a new group to the tree, either at the same level as the selected group or as a subgroup of it. The <b>New Group</b> button lets you create a new subgroup of the group <b>All Entries</b>, regardless of the currently selected group(s). The context menu also allows to remove groups and/or subgroups, to sort subgroups alphabetically, or to move gr [...]
-<p>
-Undo and redo is supported for all edits.
-
-<H3>Static groups</h3>
-
-Static groups are populated only by explicit manual assignment of entries. After creating a static group you select the entries to be assigned to it, and use either Drag and Drop or the main table's context menu to perform the assignment. To remove entries from a static group, select them and use the main table's context menu. There are no options to be configured.
-<p>
-This method of grouping requires that all entries have a unique BibTeX key. In case of missing or duplicate BibTeX keys, the assignment of the affected entries cannot be correctly restored in future sessions.
-
-<H3>Dynamic groups</h3>
-
-The content of a dynamic group is defined by a logical condition. Only entries that meet this condition are contained in the group. This method uses the information stored in the database itself, and updates dynamically whenever the database changes.
-<p>
-Two types of conditions can be used:
-<dl>
-<dt><b>Searching a field for a keyword</b></dt>
-<dd>
-This method groups entries in which a specified BibTeX field (e.g. <tt>keywords</tt>) contains a specified search term (e.g. <tt>electrical</tt>). Obviously, for this to work, the grouping field must be present in every entry, and its content must be accurate. The above example would group all entries referring to something electrical. Using the field <tt>author</tt> allows to group entries by a certain author, etc. The search can either be done as a plain-text or a regular expression se [...]
-</dd>
-<dt><b>Using a free-form search expression</b></dt>
-<dd>
-This is similar to the above, but rather than search a single field for a single search term, the <a href="SearchHelp.html#advanced">search expression syntax</a> can be used, which supports logical operators (<tt>AND</tt>, <tt>OR</tt>, <tt>NOT</tt>) and allows to search multiple BibTeX fields. For example, the search expression <tt>keywords=regression and not keywords=linear</tt> groups entries concerned with non-linear regression.
-</dd>
-</dl>
-
-In the groups view, dynamic groups are shown in <i>italics</i> by default. This can be turned off in the preferences.
-
-<h3>Hierarchical context</h3>
-
-By default, a group is <b>independent</b> of its position in the groups tree: When selected, only the group's contents are shown. However, especially when using dynamic groups, it is often useful to define a subgroup that <b>refines its supergroup</b>, i.e., when selected, entries contained in both groups are displayed. For example, create a supergroup containing entries with the keyword <tt>distribution</tt> and a subgroup containing entries with the keyword <tt>gauss</tt> that refines [...]
-<p>
-The logical complement to a refining group is a group that <b>includes its subgroups</b>, i.e. when selected, not only the group's own entries, but also its subgroups' entries are shown. In the groups tree, this type of group has a special icon (this can be turned off in the preferences).
-
-<h2>Viewing a group's entries, combining multiple groups</H2>
-
-Selecting a group shows the entries contained in that group by highlighting them and, depending on the settings (accessible by clicking the <b>Settings</b> button), moving them to the top of the list and/or selecting them. These options are identical to those available for the regular search.
-<p>
-When multiple groups are selected, either the union or the intersection of their content is shown, depending on the current settings. This allows to quickly combine multiple conditions, e.g. if you have a static group <tt>Extremely Important</tt> to which you assign all extremely important entries, you can view the extremely important entries in any other group by selecting both groups (this requires to have <b>Intersection</b> selected in the settings).
-
-<h2>Groups and searching</h2>
-
-When viewing the contents of the selected group(s), a search can be performed within these contents using the regular search facility.
-
-<h2>Highlighting overlapping groups</h2>
-
-The <b>Settings</b> button offers an option to highlight overlapping groups. If this is activated, upon selection of one or more groups, all groups that contain at least one of the entries contained in the currently selected group(s) are highlighted. This quickly identifies overlap between the groups' contents. You might, for example, create a group <tt>To Read</tt> that contains all entries which you plan to read. Now, whenever you select any group, the group <tt>To Read</tt> is highlig [...]
-
-<h2>Advanced features</h2>
-
-After mastering the grouping concepts described above, the following advanced features might come in handy.
-
-<h3>Automatically creating dynamic groups</h3>
-
-By clicking the <b>Automatically create groups for database</b> button, you can quickly create a set of groups appropriate for your database. This feature will gather all words found in a specific field of your choice, and create a group for each word. This is useful for instance if your database contains suitable keywords for all entries. By autogenerating groups based on the <tt>keywords</tt> field, you should have a basic set of groups at no cost.
-<p>
-You can also specify characters to ignore, for instance commas used between keywords. These will be treated as separators between words, and not part of them. This step is important for combined keywords such as <tt>laplace distribution</tt> to be recognized as a single semantic unit. (You cannot use this option to remove complete words. Instead, delete the unwanted groups manually after they were created automatically.)
-
-<h3>Refreshing the groups view</h3>
-
-The <b>Refresh</b> button updates the entry table to reflect the current groups selection. This is usually done automatically, but in rare occasions (e.g. after a group-related undo/redo) a manual refresh is required.
-
-<h3>Mixing refining groups with including groups</h3>
-
-If a refining group is a subgroup of a group that includes its subgroups -- the refining group's siblings --, these siblings are ignored when the refining group is selected.
-
</HTML>
\ No newline at end of file
diff --git a/src/help/IEEEXploreHelp.html b/src/help/IEEEXploreHelp.html
index 43f2130..78deac0 100644
--- a/src/help/IEEEXploreHelp.html
+++ b/src/help/IEEEXploreHelp.html
@@ -5,6 +5,9 @@
<H1>Search IEEEXplore</H1>
+IEEEXplore delivers access to technical literature in electrical engineering,
+computer science, and electronics.
+<p>
JabRef can download citations from the IEEEXplore database.
To use this feature, choose <b>Web search -> Search IEEEXplore</b>,
and the search interface will appear in the side pane.
diff --git a/src/help/MedlineHelp.html b/src/help/MedlineHelp.html
index 55eaa5a..5b97f19 100644
--- a/src/help/MedlineHelp.html
+++ b/src/help/MedlineHelp.html
@@ -5,6 +5,10 @@
<H1>Fetching Medline entries</H1>
+MEDLINE is the U.S. National Library of Medicine's premier bibliographic database.
+It contains references to journal articles in life sciences
+with a concentration on biomedicine.
+<P>
JabRef can download citations from the Medline database.
To use this feature, choose <b>Web search -> Fetch Medline</b>,
and the Medline interface will appear in the side pane.
diff --git a/src/help/de/About.html b/src/help/de/About.html
index 8bd20ff..2bfe7ed 100644
--- a/src/help/de/About.html
+++ b/src/help/de/About.html
@@ -7,71 +7,76 @@
<h1>JabRef Version @version@</h1>
(c) 2006
+<p>
+<img src="/images/JabRef-icon-48.png"></img>
<p>
-JabRef ist frei verfügbar unter den Bedingungen der
-<a href="License.html">Gnu Public License</a>.
+JabRef ist frei verfügbar unter den Bedingungen der GNU
+<a href="License.html">General Public License</a>.
</p><h2>Entwickler:</h2>
-Morten O. Alver<br>
-Nizar N. Batada<br>
-Michel Baylac<br>
-Guillaume Gardey<br>
-Cyrille d'Haese<br>
-Raik Nagel<br>
-Ellen Reitmayr<br>
-Andreas Rudert<br>
-Michael Spiegel<br>
-Ulrik Stervbo<br>
-Dominik Waßenhoven<br>
-Joerg K. Wegner<br>
-Michael Wrighton<br>
-Egon Willighagen <br>
-Jörg Zieren<br>
+Morten O. Alver,
+Nizar N. Batada,
+Michel Baylac,
+Guillaume Gardey,
+Cyrille d'Haese,
+Raik Nagel,
+Ellen Reitmayr,
+Andreas Rudert,
+Michael Spiegel,
+Ulrik Stervbo,
+Dominik Waßenhoven,
+Joerg K. Wegner,
+Michael Wrighton,
+Egon Willighagen,
+Jörg Zieren
<h2>Beiträge von:</h2>
-Kolja Brix<br>
-Frédéric Darboux<br>
-Fabrice Dessaint<br>
-Nathan Dunn<br>
-Brian van Essen<br>
-Alexis Gallagher<br>
-Sascha Hunold<br>
-Bernd Kalbfuss<br>
-Martin Kähmer<br>
-Ervin Kolenovic<BR>
-Jeffrey Kuhn<br>
-Alex Montgomery<br>
-John Relph<br>
-Moritz Ringler<br>
-Rudolf Seemann<br>
-Toralf Senger<br>
-Mike Smoot<br>
-Martin Stolle<br>
-David Weitzman<br>
-Seb Wills<br>
-
+Kolja Brix,
+Frédéric Darboux,
+Fabrice Dessaint,
+Nathan Dunn,
+Brian van Essen,
+Alexis Gallagher,
+Sascha Hunold,
+Bernd Kalbfuss,
+Martin Kähmer,
+Ervin Kolenovic,
+Krzysztof A. Kościuszkiewicz,
+Jeffrey Kuhn,
+Alex Montgomery,
+Christopher Oezbek,
+John Relph,
+Moritz Ringler,
+Rudolf Seemann,
+Toralf Senger,
+Mike Smoot,
+Martin Stolle,
+David Weitzman,
+Seb Wills,
+John Zedlewski
+
<h2>Dank an:</h2>
-Samin Muhammad Ridwanul Karim<br>
-Stefan Robert<br>
+Samin Muhammad Ridwanul Karim,
+Stefan Robert
<h2>Benutzte Fremdsoftware:</h2>
-JabRef benutzt JGoodies Looks 1.2.2 und JGoodiesForms 1.0.4, das von JGoodies (<code>http://www.jgoodies.com</code>) unter den Bedingungen der BSD License vertrieben wird (siehe <code>http://www.opensource.org/licenses/bsd-license.html</code> für nähere Einzelheiten dieser Lizenz).
+JabRef benutzt JGoodies Looks 2.0.4 und JGoodiesForms 1.0.5, das von JGoodies (<code>http://www.jgoodies.com</code>) unter den Bedingungen der BSD License vertrieben wird (siehe <code>http://www.opensource.org/licenses/bsd-license.html</code> für nähere Einzelheiten dieser Lizenz).
<p>
Außerdem werden zwei zustätzliche Klassen
(SimpleInternalFrame and UIFSplitPane) von Karsten Lentzsch benutzt,
die unter <a href="jgoodies.html">diesen Bedingungen</a> vertrieben werden.
</p><p>
-Kommandozeilenbefehle werden geparst mit RitOpt (<code>http://ritopt.sourceforge.net</code>), das unter den Bedingungen der <a href="License.html">GNU Public License</a> (Version 2) verfügbar ist.
+Kommandozeilenbefehle werden geparst mit RitOpt (<code>http://ritopt.sourceforge.net</code>), das unter den Bedingungen der GNU <a href="License.html">General Public License</a> (Version 2) verfügbar ist.
</p><p>
JabRef verwendet für die Suche den ANTLR Parser Generator. ANTLR ist public domain software - siehe <code>http://www.antlr.org/license.html</code> für die Lizenzbedingungen.
</p><p>
Für die Darstellung und Filterung der Tabelle benutzt JabRef die Glazed Lists library
- (<code>http://publicobject.com/glazedlists</code>), die unter den Bedingungen der Lesser GNU Public License vertrieben wird.
+ (<code>http://publicobject.com/glazedlists</code>), die unter den Bedingungen der Lesser General Public License vertrieben wird.
</p><p>
JabRef benutzt darüber hinaus die "threading library" Spin 1.3.1,
-die unter den Bedingungen der LGPL (Lesser GNU Public License)
+die unter den Bedingungen der LGPL (Lesser General Public License)
vertrieben wird.<br>
</p>
<p>Für die einfache Auswahl und den Umgang mit Datumsangaben
@@ -80,9 +85,9 @@ einer BSD Lizenz vertrieben, siehe auch <code>http://sourceforge.net/projects/mi
für eine genauere Beschreibung.
</p><p>
-Dieses Produkt beinhaltet Software, die von der Apache Software Foundation (<code>http://www.apache.org</code>) entwickelt wurde. Die Bibliotheken "Commons Logging" und "Commons HTTP Client" werden von The Jakarta Project (<code>http://jakarta.apache.org</code>) unter der Apache Software Lizenz (Version 1.1) vertrieben (siehe die beigelegte Datei <code>apache-license.txt</code> oder <code>http://opensource.org/licenses/apachepl.php</code> für nähere Einzelheiten dieser Lizenz).
-</p><p>
-Einige Icons sind von uns, aber die meisten stammen vom Eclipse Projekt (<code>http://www.eclipse.org</code>), das unter den Bedingungen der <a href="cpl-v10.html">Common Public License</a> vertrieben wird, sowie vom QIcons Paket (<code>http://qt.osdn.org.ua</code>), das unter den Bedingungen der <a href="License.html">GNU Public License</a> vertrieben wird.
+The majority of icons are from the Crystal Clear icon set by Everaldo
+(<code>http://www.everaldo.com</code>), which is distributed under the
+ terms of the Lesser General Public License.
</p></center>
</body></html>
\ No newline at end of file
diff --git a/src/help/fr/About.html b/src/help/fr/About.html
index 794c8b6..b891a34 100644
--- a/src/help/fr/About.html
+++ b/src/help/fr/About.html
@@ -6,86 +6,88 @@
<H1>JabRef version @version@</H1>
(c) 2006
+<p>
+<img src="/images/JabRef-icon-48.png"></img>
<P>
-JabRef est librement distribuable selon les termes de la
-<a href="License.html">GNU Public License</a>, version 2.
+JabRef est librement distribuable selon les termes de la GNU
+<a href="../License.html">General Public License</a>, version 2.
<H2>Développeurs :</H2>
-Morten O. Alver<BR>
-Nizar N. Batada<BR>
-Michel Baylac<BR>
-Guillaume Gardey<BR>
-Cyrille d'Haese<BR>
-Raik Nagel<BR>
-Ellen Reitmayr<BR>
-Andreas Rudert<BR>
-Michael Spiegel<BR>
-Ulrik Stervbo<BR>
-Dominik Waßenhoven<BR>
-Joerg K. Wegner<BR>
-Michael Wrighton<BR>
-Egon Willighagen <BR>
-Jörg Zieren<BR>
+Morten O. Alver,
+Nizar N. Batada,
+Michel Baylac,
+Guillaume Gardey,
+Cyrille d'Haese,
+Raik Nagel,
+Ellen Reitmayr,
+Andreas Rudert,
+Michael Spiegel,
+Ulrik Stervbo,
+Dominik Waßenhoven,
+Joerg K. Wegner,
+Michael Wrighton,
+Egon Willighagen,
+Jörg Zieren
<H2>Contributions de :</H2>
-Kolja Brix<BR>
-Frédéric Darboux<BR>
-Fabrice Dessaint<BR>
-Nathan Dunn<BR>
-Brian Van Essen<br>
-Alexis Gallagher<BR>
-Sascha Hunold<BR>
-Bernd Kalbfuss<BR>
-Martin Kähmer<BR>
-Ervin Kolenovic<BR>
-Jeffrey Kuhn<BR>
-Alex Montgomery<BR>
-John Relph<BR>
-Moritz Ringler<BR>
-Rudolf Seemann<BR>
-Toralf Senger<br>
-Mike Smoot<BR>
-Martin Stolle<BR>
-David Weitzman<BR>
-Seb Wills<BR>
+Kolja Brix,
+Frédéric Darboux,
+Fabrice Dessaint,
+Nathan Dunn,
+Brian Van Essen,
+Alexis Gallagher,
+Sascha Hunold,
+Bernd Kalbfuss,
+Martin Kähmer,
+Ervin Kolenovic,
+Krzysztof A. Kościuszkiewicz,
+Jeffrey Kuhn,
+Alex Montgomery,
+Christopher Oezbek,
+John Relph,
+Moritz Ringler,
+Rudolf Seemann,
+Toralf Senger,
+Mike Smoot,
+Martin Stolle,
+David Weitzman,
+Seb Wills,
+John Zedlewski
<H2>Remerciements à :</H2>
-Samin Muhammad Ridwanul Karim<BR>
-Stefan Robert<BR>
+Samin Muhammad Ridwanul Karim,
+Stefan Robert
<H2>Logiciels tiers utilisés :</H2>
-JabRef utilise JGoodies Looks 1.2.2 et JGoodies Forms 1.0.4, distribués par JGoodies
+JabRef utilise JGoodies Looks 2.0.4 et JGoodies Forms 1.0.5 distribués par JGoodies
(<code>http://www.jgoodies.com</code>) selon les termes de la License BSD (voir
<code>http://www.opensource.org/licenses/bsd-license.html</code> pour plus de détails).
<P>
Deux classes additionnelles sont aussi incluses (SimpleInternalFrame et UIFSplitPane), de Karsten
-Lentzsch, qui sont distribuées sous <A HREF="jgoodies.html">ces termes</A>.
+Lentzsch, qui sont distribuées sous <A HREF="../jgoodies.html">ces termes</A>.
<P>
Les options de la ligne de commande sont traitées en utilisant RitOpt (<code>http://ritopt.sourceforge.net</code>). RitOpt
-est distribuée selon les termes de la <a href="License.html">GNU Public License</a>,
+est distribuée selon les termes de la GNU <a href="../License.html">General Public License</a>,
version 2.
<P>
JabRef utilise le générateur d'analyseur syntaxique ANTLR pour interpréter les chaînes de recherche. ANTLR est un logiciel du domaine public
- voir <code>http://www.antlr.org/license.html</code> pour les termes de la license.
<p>
Pour la présentation de la table et le filtrage, JabRef utilise la bibliothèque Glazed Lists
-(<code>http://publicobject.com/glazedlists</code>), qui est distribuée sous la license "Lesser GNU Public License".
+(<code>http://publicobject.com/glazedlists</code>), qui est distribuée sous la license "Lesser General Public License".
<P>
JabRef utilise aussi la bibliothèque de threading Spin 1.3.1, qui est distribuée selon les termes de la Lesser GNU Public License.
+
<P>
-Ce produit inclut des logiciels développés par Apache Software
-Foundation (http://www.apache.org/). Les bibliothèques Commons Logging et
-Commons HTTP Client sont distribuées par The Jakarta Project
-(<code>http://jakarta.apache.org</code>) sous la License Apache Software, Version 1.1. Voir le fichier inclus
-<code>apache-license.txt</code> ou
-<code>http://opensource.org/licenses/apachepl.php</code> pour plus de détails.
+Certains composants de l'interface graphique de la biblioth�que Microba sont utilis�s. Elle est distribu�e sous une license de type BSD. Voir <code>http://sourceforge.net/projects/microba/</code> pour plus d'informations.
<P>
-Certains icônes sont de notre facture, mais la plupart viennent soit du projet Eclipse (<code>http://www.eclipse.org</code>),
-distribués sous la <a href="cpl-v10.html">Common Public License</a>, soit du paquetage QIcons (<code>http://qt.osdn.org.ua</code>), qui est distribué selon les termes de la <a href="License.html">GNU Public License</a>.
+La majorit� des ic�nes proviennent de l'ensemble d'ic�nes Crystal Clear par Everaldo
+(<code>http://www.everaldo.com</code>), qui est distribu�e sous les termes de la
+Lesser General Public License.
</CENTER>
</BODY>
diff --git a/src/help/fr/CiteSeerHelp.html b/src/help/fr/CiteSeerHelp.html
index ec5efd7..6aad68a 100644
--- a/src/help/fr/CiteSeerHelp.html
+++ b/src/help/fr/CiteSeerHelp.html
@@ -5,6 +5,14 @@
<basefont size="4" color="#2F4958" face="arial">
<h1>Récupération depuis CiteSeer</h1>
+
+
+CiteSeer est une bibliothèque numérique et un moteur de
+recherche qui s'intéresse principalement à la
+littérature scientifique en informatique et science de
+l'information.
+
+
<h2>Récupération d'une entrée depuis CiteSeer</h2>
<p>
diff --git a/src/help/fr/IEEEXploreHelp.html b/src/help/fr/IEEEXploreHelp.html
index 0085700..a570190 100644
--- a/src/help/fr/IEEEXploreHelp.html
+++ b/src/help/fr/IEEEXploreHelp.html
@@ -5,8 +5,10 @@
<H1>Recherche IEEEXplore</H1>
+IEEEXplore permet l'accès à de la litterature technique
+en génie électrique, informatique et électronique.
+<p>
JabRef peut télécharger des citations à partir de la base de données IEEEXplore.
-
Pour utiliser cette fonction, sélectionner <b>Recherche internet -> Recherche IEEEXplore</b>
fera apparaître l'interface de recherche dans le panneau latéral.
<P>
@@ -21,7 +23,7 @@ vous seront retournés.
<p>
Vous pouvez choisir de télécharger les résumés avec les informations de citation pour chaque
entrée en cochant la case <b>Inclure les résumés</b>. Comme cela entraîne une
-quantité importante de requêtes réseau, afin d'éviter une pression excessive
+quantité importante de requêtes réseau, afin d'éviter une pression excessive
sur le site internet IEEExplore, Jabref refusera de télécharger les résumés
pour les recherches retournant plus qu'un nombre donné de résultats.
diff --git a/src/help/fr/MedlineHelp.html b/src/help/fr/MedlineHelp.html
index 2704a50..93022c2 100644
--- a/src/help/fr/MedlineHelp.html
+++ b/src/help/fr/MedlineHelp.html
@@ -6,6 +6,11 @@
<h1>Récupération d'entrées depuis Medline</h1>
+MEDLINE est la principale base de données bibliographique de la
+biblioth�que nationale de médecine des Etats-Unis.
+Elle contient des références à des articles de journaux
+sur les sciences de la vie avec une sp�cialisation
+sur la biomédecine.
<p>
JabRef peut télécharger des citations depuis la base de données Medline. Pour réaliser cette opération, sélectionnez <b>Recherche internet -> Recherche Medline</b> et vous verrez apparaître l'interface de Medline dans le panneau latéral.
</p>
diff --git a/src/images/Close.gif b/src/images/Close.gif
deleted file mode 100644
index f53ee93..0000000
Binary files a/src/images/Close.gif and /dev/null differ
diff --git a/src/images/CopyKey.gif b/src/images/CopyKey.gif
deleted file mode 100755
index f81c64a..0000000
Binary files a/src/images/CopyKey.gif and /dev/null differ
diff --git a/src/images/Hourglass.png b/src/images/Hourglass.png
deleted file mode 100644
index d93cadd..0000000
Binary files a/src/images/Hourglass.png and /dev/null differ
diff --git a/src/images/JabRef-Logo-small.gif b/src/images/JabRef-Logo-small.gif
deleted file mode 100644
index 2efd2e0..0000000
Binary files a/src/images/JabRef-Logo-small.gif and /dev/null differ
diff --git a/src/images/JabRef-Logo.icns b/src/images/JabRef-Logo.icns
index 7f30a50..ff51d59 100644
Binary files a/src/images/JabRef-Logo.icns and b/src/images/JabRef-Logo.icns differ
diff --git a/src/images/JabRef-icon-48.png b/src/images/JabRef-icon-48.png
new file mode 100644
index 0000000..ed424d7
Binary files /dev/null and b/src/images/JabRef-icon-48.png differ
diff --git a/src/images/JabRef-icon.png b/src/images/JabRef-icon.png
index 4ea527b..ca11220 100644
Binary files a/src/images/JabRef-icon.png and b/src/images/JabRef-icon.png differ
diff --git a/src/images/JabRef-icon.svg b/src/images/JabRef-icon.svg
new file mode 100644
index 0000000..1204858
--- /dev/null
+++ b/src/images/JabRef-icon.svg
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ sodipodi:docbase="/home/alver/Documents"
+ sodipodi:docname="jabrefIkon.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient2915">
+ <stop
+ id="stop2917"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop2919"
+ offset="1"
+ style="stop-color:#dadce0;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2909">
+ <stop
+ id="stop2911"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop2913"
+ offset="1"
+ style="stop-color:#cfd1d7;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2897">
+ <stop
+ style="stop-color:#dadee7;stop-opacity:1;"
+ offset="0"
+ id="stop2899" />
+ <stop
+ style="stop-color:#1e68c6;stop-opacity:1;"
+ offset="1"
+ id="stop2901" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2889">
+ <stop
+ style="stop-color:#e0e4ee;stop-opacity:1;"
+ offset="0"
+ id="stop2891" />
+ <stop
+ style="stop-color:#e0e4ee;stop-opacity:0;"
+ offset="1"
+ id="stop2893" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2915"
+ id="linearGradient2971"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.115225,0,0,1,-1.889007,46.1244)"
+ x1="329.18756"
+ y1="289.87192"
+ x2="598.66205"
+ y2="548.62866" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2909"
+ id="linearGradient2974"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.082601,0,0,1,-1.374219,40)"
+ x1="145.45497"
+ y1="332.74286"
+ x2="326.12537"
+ y2="576.18854" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2909"
+ id="linearGradient2983"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(8.119652e-2,0,0,7.966468e-2,422.1323,954.272)"
+ x1="145.45497"
+ y1="332.74286"
+ x2="326.12537"
+ y2="576.18854" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2915"
+ id="linearGradient2985"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(8.119652e-2,0,0,7.966468e-2,424.2434,954.7598)"
+ x1="329.18756"
+ y1="289.87192"
+ x2="598.66205"
+ y2="548.62866" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2909"
+ id="linearGradient3878"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.824753e-2,0,0,3.538487e-2,403.2956,1005.814)"
+ x1="145.45497"
+ y1="332.74286"
+ x2="326.12537"
+ y2="576.18854" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2915"
+ id="linearGradient3880"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.863231e-2,4.140938e-3,-3.672702e-3,3.351102e-2,404.9189,1005.265)"
+ x1="329.18756"
+ y1="289.87192"
+ x2="598.66205"
+ y2="548.62866" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="50"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="21.286454"
+ inkscape:cx="416.46054"
+ inkscape:cy="31.511436"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:guide-bbox="false"
+ showguides="true"
+ inkscape:window-width="1118"
+ inkscape:window-height="944"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <rect
+ style="opacity:1;fill:#4f5f8f;fill-opacity:1"
+ id="rect2905"
+ width="716.55713"
+ height="730.3371"
+ x="10.717734"
+ y="89.297173" />
+ <path
+ style="fill:url(#linearGradient2974);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 122.04224,150.95548 C 208.65029,150.95548 286.97046,184.73542 286.97046,184.73542 C 286.97046,184.73542 372.48612,237.27117 327.52453,611.24332 C 314.57556,683.68157 250.81542,747.98797 172.90939,747.98797 C 95.003363,747.98797 50.24884,702.05483 50.24884,648.46615 C 119.867,694.3993 168.69957,681.54848 189.48514,672.96384 C 199.45516,668.84613 251.63441,636.1731 257.44572,548.94433 C 264.07602,449.42251 247.50026,297.84312 122.04224,150.95548 z "
+ id="path1972"
+ sodipodi:nodetypes="cccscssc" />
+ <path
+ style="fill:url(#linearGradient2971);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.05348015px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 322.49657,164.88378 C 533.15821,196.83799 712.94701,311.87314 516.81377,452.47165 C 462.33232,497.20754 627.59274,671.35798 692.97048,751.2435 C 544.0545,717.69157 402.40271,580.28849 400.58666,476.43731 C 398.77062,401.34492 516.81377,393.35637 516.81377,347.02276 C 516.81377,300.68916 344.28916,262.34411 322.49657,164.88378 z "
+ id="path1993"
+ sodipodi:nodetypes="cccc" />
+ <rect
+ style="opacity:1;fill:#4f5f8f;fill-opacity:1"
+ id="rect3872"
+ width="24.96747"
+ height="24.892717"
+ x="403.74191"
+ y="1008.134"
+ inkscape:export-xdpi="173.03"
+ inkscape:export-ydpi="173.03"
+ inkscape:export-filename="/home/alver/div/smalltheme/jabrefIkon-48.png" />
+ <path
+ style="fill:url(#linearGradient3878);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 407.84626,1010.4236 C 410.90607,1010.4236 413.43489,1010.4972 413.43489,1010.4972 C 413.43489,1010.4972 416.50376,1012.7951 414.91528,1026.0281 C 414.45779,1028.5913 412.2052,1030.8669 409.45284,1030.8669 C 406.70046,1030.8669 405.11931,1029.2413 405.11931,1027.3453 C 407.95995,1028.6292 410.06622,1027.9794 410.80057,1027.6755 C 411.15281,1027.5298 412.46165,1026.9172 412.43944,1023.8236 C 412.38788,1016.6442 413.08837,1015.0847 407.84626,1010.4236 z "
+ id="path3874"
+ sodipodi:nodetypes="cccscssc"
+ inkscape:export-filename="/home/alver/div/smalltheme/jabrefIkon-48.png"
+ inkscape:export-xdpi="173.03"
+ inkscape:export-ydpi="173.03" />
+ <path
+ style="fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.05348015px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 415.71976,1010.449 C 423.13477,1010.8154 428.70544,1016.8245 421.39485,1020.8079 C 419.34326,1022.1048 424.42839,1028.5544 426.39975,1031.4741 C 421.3644,1029.7968 416.96212,1024.6664 417.28063,1021.1794 C 417.49352,1018.6562 421.61195,1018.8269 421.78212,1017.2742 C 421.95228,1015.7216 419.07637,1015.8865 415.71976,1010.449 z "
+ id="path3876"
+ sodipodi:nodetypes="ccccsc"
+ inkscape:export-filename="/home/alver/div/smalltheme/jabrefIkon-48.png"
+ inkscape:export-xdpi="173.03"
+ inkscape:export-ydpi="173.03" />
+ </g>
+</svg>
diff --git a/src/images/addtsk_tsk.gif b/src/images/addtsk_tsk.gif
deleted file mode 100644
index dad7260..0000000
Binary files a/src/images/addtsk_tsk.gif and /dev/null differ
diff --git a/src/images/backward_nav.gif b/src/images/backward_nav.gif
deleted file mode 100644
index 740419b..0000000
Binary files a/src/images/backward_nav.gif and /dev/null differ
diff --git a/src/images/close_view.gif b/src/images/close_view.gif
deleted file mode 100644
index 1aca259..0000000
Binary files a/src/images/close_view.gif and /dev/null differ
diff --git a/src/images/completeItem.png b/src/images/completeItem.png
deleted file mode 100644
index 5eeadc7..0000000
Binary files a/src/images/completeItem.png and /dev/null differ
diff --git a/src/images/configure2.png b/src/images/configure2.png
deleted file mode 100644
index 9df41c4..0000000
Binary files a/src/images/configure2.png and /dev/null differ
diff --git a/src/images/copy_edit.gif b/src/images/copy_edit.gif
deleted file mode 100644
index 4274b07..0000000
Binary files a/src/images/copy_edit.gif and /dev/null differ
diff --git a/src/images/crystal_16/1downarrow.png b/src/images/crystal_16/1downarrow.png
new file mode 100755
index 0000000..2dd28e9
Binary files /dev/null and b/src/images/crystal_16/1downarrow.png differ
diff --git a/src/images/crystal_16/1leftarrow.png b/src/images/crystal_16/1leftarrow.png
new file mode 100755
index 0000000..5b07c5e
Binary files /dev/null and b/src/images/crystal_16/1leftarrow.png differ
diff --git a/src/images/crystal_16/1rightarrow.png b/src/images/crystal_16/1rightarrow.png
new file mode 100755
index 0000000..70cfd5f
Binary files /dev/null and b/src/images/crystal_16/1rightarrow.png differ
diff --git a/src/images/crystal_16/1uparrow.png b/src/images/crystal_16/1uparrow.png
new file mode 100755
index 0000000..c6bd1fb
Binary files /dev/null and b/src/images/crystal_16/1uparrow.png differ
diff --git a/src/images/crystal_16/Icons.properties b/src/images/crystal_16/Icons.properties
new file mode 100644
index 0000000..f68961f
--- /dev/null
+++ b/src/images/crystal_16/Icons.properties
@@ -0,0 +1,69 @@
+jabrefIcon=JabRef-icon.png
+#jabrefIcon=ikon.gif
+about=JabRef-icon.png
+
+new=filenew.png
+open=fileopen.png
+loadSession=fileimport.png
+save=filesave.png
+saveAs=filesaveas.png
+copy=editcopy.png
+paste=editpaste.png
+cut=editcut.png
+undo=undo.png
+redo=redo.png
+refresh=reload.png
+left=1leftarrow.png
+right=1rightarrow.png
+up=1uparrow.png
+down=1downarrow.png
+add=edit_add.png
+remove=edit_remove.png
+delete=trash.png
+edit=edit.png
+help=help.png
+helpSmall=help.png
+helpContents=contents2.png
+search=search.png
+incSearch=search.png
+toggleSearch=search.png
+complete=button_ok.png
+wrong=cancel.png
+makeKey=wizard.png
+psSmall=ps.png
+pdfSmall=pdf-document.png
+openFile=pdf-document.png
+preferences=advancedsettings.png
+openUrl=agt_internet.png
+www=agt_internet.png
+wwwSmall=agt_internet_small.png
+medline=agt_internet.png
+integrityWarn=status_unknown.png
+integrityInfo=documentinfo.png
+integrityFail=gg_ignored.png
+
+togglePreview=text_bottom.png
+toggleGroups=queue.png
+editPreamble=preamble.png
+editStrings=strings.png
+emacs=emacs.png
+lyx=lyx2.png
+winedt=winedt.png
+required=reqIcon.png
+optional=optIcon.png
+general=genIcon.png
+abstract=absIcon.png
+source=viewsource.gif
+duplicate=duplicate.png
+autoGroup=run.png
+markEntries=mark.png
+unmarkEntries=unmark.png
+citeseer=wwwciteseer.png
+doiSmall=doismall.png
+groupsHighlightAny=groupsHighlightAny.png
+groupsHighlightAll=groupsHighlightAll.png
+close=fileclose.png
+close2=fileclose2.png
+integrityCheck=integrity.png
+groupIncluding=groupIncluding.png
+groupRefining=groupRefining.png
diff --git a/src/images/crystal_16/Icons.properties~ b/src/images/crystal_16/Icons.properties~
new file mode 100644
index 0000000..bc48561
--- /dev/null
+++ b/src/images/crystal_16/Icons.properties~
@@ -0,0 +1,69 @@
+#jabrefIcon=JabRef-icon.png
+jabrefIcon=ikon.gif
+about=JabRef-icon.png
+
+new=filenew.png
+open=fileopen.png
+loadSession=fileimport.png
+save=filesave.png
+saveAs=filesaveas.png
+copy=editcopy.png
+paste=editpaste.png
+cut=editcut.png
+undo=undo.png
+redo=redo.png
+refresh=reload.png
+left=1leftarrow.png
+right=1rightarrow.png
+up=1uparrow.png
+down=1downarrow.png
+add=edit_add.png
+remove=edit_remove.png
+delete=trash.png
+edit=edit.png
+help=help.png
+helpSmall=help.png
+helpContents=contents2.png
+search=search.png
+incSearch=search.png
+toggleSearch=search.png
+complete=button_ok.png
+wrong=cancel.png
+makeKey=wizard.png
+psSmall=ps.png
+pdfSmall=pdf-document.png
+openFile=pdf-document.png
+preferences=advancedsettings.png
+openUrl=agt_internet.png
+www=agt_internet.png
+wwwSmall=agt_internet_small.png
+medline=agt_internet.png
+integrityWarn=status_unknown.png
+integrityInfo=documentinfo.png
+integrityFail=gg_ignored.png
+
+togglePreview=text_bottom.png
+toggleGroups=queue.png
+editPreamble=preamble.png
+editStrings=strings.png
+emacs=emacs.png
+lyx=lyx2.png
+winedt=winedt.png
+required=reqIcon.png
+optional=optIcon.png
+general=genIcon.png
+abstract=absIcon.png
+source=viewsource.gif
+duplicate=duplicate.png
+autoGroup=run.png
+markEntries=mark.png
+unmarkEntries=unmark.png
+citeseer=wwwciteseer.png
+doiSmall=doismall.png
+groupsHighlightAny=groupsHighlightAny.png
+groupsHighlightAll=groupsHighlightAll.png
+close=fileclose.png
+close2=fileclose2.png
+integrityCheck=integrity.png
+groupIncluding=groupIncluding.png
+groupRefining=groupRefining.png
diff --git a/src/images/crystal_16/JabRef-icon.png b/src/images/crystal_16/JabRef-icon.png
new file mode 100644
index 0000000..ca11220
Binary files /dev/null and b/src/images/crystal_16/JabRef-icon.png differ
diff --git a/src/images/absIcon.png b/src/images/crystal_16/absIcon.png
similarity index 100%
rename from src/images/absIcon.png
rename to src/images/crystal_16/absIcon.png
diff --git a/src/images/crystal_16/advancedsettings.png b/src/images/crystal_16/advancedsettings.png
new file mode 100755
index 0000000..0c9faff
Binary files /dev/null and b/src/images/crystal_16/advancedsettings.png differ
diff --git a/src/images/crystal_16/agt_internet.png b/src/images/crystal_16/agt_internet.png
new file mode 100755
index 0000000..6ce9ffe
Binary files /dev/null and b/src/images/crystal_16/agt_internet.png differ
diff --git a/src/images/crystal_16/agt_internet_small.png b/src/images/crystal_16/agt_internet_small.png
new file mode 100644
index 0000000..284c81d
Binary files /dev/null and b/src/images/crystal_16/agt_internet_small.png differ
diff --git a/src/images/crystal_16/button_ok.png b/src/images/crystal_16/button_ok.png
new file mode 100755
index 0000000..46710a0
Binary files /dev/null and b/src/images/crystal_16/button_ok.png differ
diff --git a/src/images/crystal_16/cancel.png b/src/images/crystal_16/cancel.png
new file mode 100755
index 0000000..e9920bf
Binary files /dev/null and b/src/images/crystal_16/cancel.png differ
diff --git a/src/images/contents2.png b/src/images/crystal_16/contents2.png
similarity index 100%
rename from src/images/contents2.png
rename to src/images/crystal_16/contents2.png
diff --git a/src/images/crystal_16/documentinfo.png b/src/images/crystal_16/documentinfo.png
new file mode 100755
index 0000000..1e49965
Binary files /dev/null and b/src/images/crystal_16/documentinfo.png differ
diff --git a/src/images/doismall.png b/src/images/crystal_16/doismall.png
similarity index 100%
rename from src/images/doismall.png
rename to src/images/crystal_16/doismall.png
diff --git a/src/images/duplicate.png b/src/images/crystal_16/duplicate.png
similarity index 100%
rename from src/images/duplicate.png
rename to src/images/crystal_16/duplicate.png
diff --git a/src/images/crystal_16/edit.png b/src/images/crystal_16/edit.png
new file mode 100755
index 0000000..cd77c30
Binary files /dev/null and b/src/images/crystal_16/edit.png differ
diff --git a/src/images/crystal_16/edit_add.png b/src/images/crystal_16/edit_add.png
new file mode 100755
index 0000000..269aaa6
Binary files /dev/null and b/src/images/crystal_16/edit_add.png differ
diff --git a/src/images/crystal_16/edit_remove.png b/src/images/crystal_16/edit_remove.png
new file mode 100755
index 0000000..2c8b19d
Binary files /dev/null and b/src/images/crystal_16/edit_remove.png differ
diff --git a/src/images/crystal_16/editcopy.png b/src/images/crystal_16/editcopy.png
new file mode 100755
index 0000000..8a227f8
Binary files /dev/null and b/src/images/crystal_16/editcopy.png differ
diff --git a/src/images/crystal_16/editcut.png b/src/images/crystal_16/editcut.png
new file mode 100755
index 0000000..edd1844
Binary files /dev/null and b/src/images/crystal_16/editcut.png differ
diff --git a/src/images/crystal_16/editpaste.png b/src/images/crystal_16/editpaste.png
new file mode 100755
index 0000000..06ea9df
Binary files /dev/null and b/src/images/crystal_16/editpaste.png differ
diff --git a/src/images/emacs.png b/src/images/crystal_16/emacs.png
similarity index 100%
rename from src/images/emacs.png
rename to src/images/crystal_16/emacs.png
diff --git a/src/images/fileclose.png b/src/images/crystal_16/fileclose.png
similarity index 100%
rename from src/images/fileclose.png
rename to src/images/crystal_16/fileclose.png
diff --git a/src/images/fileclose2.png b/src/images/crystal_16/fileclose2.png
similarity index 100%
rename from src/images/fileclose2.png
rename to src/images/crystal_16/fileclose2.png
diff --git a/src/images/crystal_16/fileimport.png b/src/images/crystal_16/fileimport.png
new file mode 100755
index 0000000..32baf9c
Binary files /dev/null and b/src/images/crystal_16/fileimport.png differ
diff --git a/src/images/crystal_16/filenew.png b/src/images/crystal_16/filenew.png
new file mode 100755
index 0000000..bfe1d06
Binary files /dev/null and b/src/images/crystal_16/filenew.png differ
diff --git a/src/images/crystal_16/fileopen.png b/src/images/crystal_16/fileopen.png
new file mode 100755
index 0000000..037c2da
Binary files /dev/null and b/src/images/crystal_16/fileopen.png differ
diff --git a/src/images/crystal_16/filesave.png b/src/images/crystal_16/filesave.png
new file mode 100755
index 0000000..f6e3175
Binary files /dev/null and b/src/images/crystal_16/filesave.png differ
diff --git a/src/images/crystal_16/filesaveas.png b/src/images/crystal_16/filesaveas.png
new file mode 100755
index 0000000..4ce047f
Binary files /dev/null and b/src/images/crystal_16/filesaveas.png differ
diff --git a/src/images/genIcon.png b/src/images/crystal_16/genIcon.png
similarity index 100%
rename from src/images/genIcon.png
rename to src/images/crystal_16/genIcon.png
diff --git a/src/images/crystal_16/gg_ignored.png b/src/images/crystal_16/gg_ignored.png
new file mode 100755
index 0000000..98674ef
Binary files /dev/null and b/src/images/crystal_16/gg_ignored.png differ
diff --git a/src/images/groupIncluding.png b/src/images/crystal_16/groupIncluding.png
similarity index 100%
rename from src/images/groupIncluding.png
rename to src/images/crystal_16/groupIncluding.png
diff --git a/src/images/groupRefining.png b/src/images/crystal_16/groupRefining.png
similarity index 100%
rename from src/images/groupRefining.png
rename to src/images/crystal_16/groupRefining.png
diff --git a/src/images/groupsHighlightAll.png b/src/images/crystal_16/groupsHighlightAll.png
similarity index 100%
rename from src/images/groupsHighlightAll.png
rename to src/images/crystal_16/groupsHighlightAll.png
diff --git a/src/images/groupsHighlightAny.png b/src/images/crystal_16/groupsHighlightAny.png
similarity index 100%
rename from src/images/groupsHighlightAny.png
rename to src/images/crystal_16/groupsHighlightAny.png
diff --git a/src/images/crystal_16/help.png b/src/images/crystal_16/help.png
new file mode 100755
index 0000000..b580f51
Binary files /dev/null and b/src/images/crystal_16/help.png differ
diff --git a/src/images/crystal_16/ikon.gif b/src/images/crystal_16/ikon.gif
new file mode 100644
index 0000000..c7b5ea3
Binary files /dev/null and b/src/images/crystal_16/ikon.gif differ
diff --git a/src/images/crystal_16/ikon.png b/src/images/crystal_16/ikon.png
new file mode 100644
index 0000000..94df09b
Binary files /dev/null and b/src/images/crystal_16/ikon.png differ
diff --git a/src/images/integrity.png b/src/images/crystal_16/integrity.png
similarity index 100%
rename from src/images/integrity.png
rename to src/images/crystal_16/integrity.png
diff --git a/src/images/lyx2.png b/src/images/crystal_16/lyx2.png
similarity index 100%
rename from src/images/lyx2.png
rename to src/images/crystal_16/lyx2.png
diff --git a/src/images/mark.png b/src/images/crystal_16/mark.png
similarity index 100%
rename from src/images/mark.png
rename to src/images/crystal_16/mark.png
diff --git a/src/images/optIcon.png b/src/images/crystal_16/optIcon.png
similarity index 100%
rename from src/images/optIcon.png
rename to src/images/crystal_16/optIcon.png
diff --git a/src/images/crystal_16/pdf-document.png b/src/images/crystal_16/pdf-document.png
new file mode 100755
index 0000000..c83e300
Binary files /dev/null and b/src/images/crystal_16/pdf-document.png differ
diff --git a/src/images/preamble.png b/src/images/crystal_16/preamble.png
similarity index 100%
rename from src/images/preamble.png
rename to src/images/crystal_16/preamble.png
diff --git a/src/images/crystal_16/ps.png b/src/images/crystal_16/ps.png
new file mode 100755
index 0000000..f3556c5
Binary files /dev/null and b/src/images/crystal_16/ps.png differ
diff --git a/src/images/queue.png b/src/images/crystal_16/queue.png
similarity index 100%
rename from src/images/queue.png
rename to src/images/crystal_16/queue.png
diff --git a/src/images/crystal_16/redo.png b/src/images/crystal_16/redo.png
new file mode 100755
index 0000000..23d2725
Binary files /dev/null and b/src/images/crystal_16/redo.png differ
diff --git a/src/images/crystal_16/reload.png b/src/images/crystal_16/reload.png
new file mode 100755
index 0000000..dfb9feb
Binary files /dev/null and b/src/images/crystal_16/reload.png differ
diff --git a/src/images/reqIcon.png b/src/images/crystal_16/reqIcon.png
similarity index 100%
rename from src/images/reqIcon.png
rename to src/images/crystal_16/reqIcon.png
diff --git a/src/images/crystal_16/run.png b/src/images/crystal_16/run.png
new file mode 100755
index 0000000..8a07377
Binary files /dev/null and b/src/images/crystal_16/run.png differ
diff --git a/src/images/crystal_16/search.png b/src/images/crystal_16/search.png
new file mode 100755
index 0000000..593a566
Binary files /dev/null and b/src/images/crystal_16/search.png differ
diff --git a/src/images/crystal_16/status_unknown.png b/src/images/crystal_16/status_unknown.png
new file mode 100755
index 0000000..fd49f31
Binary files /dev/null and b/src/images/crystal_16/status_unknown.png differ
diff --git a/src/images/strings.png b/src/images/crystal_16/strings.png
similarity index 100%
rename from src/images/strings.png
rename to src/images/crystal_16/strings.png
diff --git a/src/images/crystal_16/text_bottom.png b/src/images/crystal_16/text_bottom.png
new file mode 100755
index 0000000..cd9bcf7
Binary files /dev/null and b/src/images/crystal_16/text_bottom.png differ
diff --git a/src/images/crystal_16/trash.png b/src/images/crystal_16/trash.png
new file mode 100755
index 0000000..dcf0b77
Binary files /dev/null and b/src/images/crystal_16/trash.png differ
diff --git a/src/images/crystal_16/undo.png b/src/images/crystal_16/undo.png
new file mode 100755
index 0000000..8bc08fa
Binary files /dev/null and b/src/images/crystal_16/undo.png differ
diff --git a/src/images/unmark.png b/src/images/crystal_16/unmark.png
similarity index 100%
rename from src/images/unmark.png
rename to src/images/crystal_16/unmark.png
diff --git a/src/images/viewsource.gif b/src/images/crystal_16/viewsource.gif
similarity index 100%
rename from src/images/viewsource.gif
rename to src/images/crystal_16/viewsource.gif
diff --git a/src/images/winedt.png b/src/images/crystal_16/winedt.png
similarity index 100%
rename from src/images/winedt.png
rename to src/images/crystal_16/winedt.png
diff --git a/src/images/wizard.png b/src/images/crystal_16/wizard.png
similarity index 100%
rename from src/images/wizard.png
rename to src/images/crystal_16/wizard.png
diff --git a/src/images/wwwciteseer.png b/src/images/crystal_16/wwwciteseer.png
similarity index 100%
rename from src/images/wwwciteseer.png
rename to src/images/crystal_16/wwwciteseer.png
diff --git a/src/images/cut_edit.gif b/src/images/cut_edit.gif
deleted file mode 100644
index eb948b9..0000000
Binary files a/src/images/cut_edit.gif and /dev/null differ
diff --git a/src/images/defaults_ps.gif b/src/images/defaults_ps.gif
deleted file mode 100644
index 5e1e78a..0000000
Binary files a/src/images/defaults_ps.gif and /dev/null differ
diff --git a/src/images/delete_edit.gif b/src/images/delete_edit.gif
deleted file mode 100644
index 6f64766..0000000
Binary files a/src/images/delete_edit.gif and /dev/null differ
diff --git a/src/images/editcopy.png b/src/images/editcopy.png
deleted file mode 100644
index 313bd9b..0000000
Binary files a/src/images/editcopy.png and /dev/null differ
diff --git a/src/images/editcut.png b/src/images/editcut.png
deleted file mode 100644
index af88212..0000000
Binary files a/src/images/editcut.png and /dev/null differ
diff --git a/src/images/editdelete.png b/src/images/editdelete.png
deleted file mode 100644
index d073c87..0000000
Binary files a/src/images/editdelete.png and /dev/null differ
diff --git a/src/images/editpaste.png b/src/images/editpaste.png
deleted file mode 100644
index cba1f23..0000000
Binary files a/src/images/editpaste.png and /dev/null differ
diff --git a/src/images/edittsk_tsk.gif b/src/images/edittsk_tsk.gif
deleted file mode 100644
index a1ca3e7..0000000
Binary files a/src/images/edittsk_tsk.gif and /dev/null differ
diff --git a/src/images/exclamation.gif b/src/images/exclamation.gif
deleted file mode 100644
index 586ed8e..0000000
Binary files a/src/images/exclamation.gif and /dev/null differ
diff --git a/src/images/fldr_obj.gif b/src/images/fldr_obj.gif
deleted file mode 100644
index a9c7773..0000000
Binary files a/src/images/fldr_obj.gif and /dev/null differ
diff --git a/src/images/forward_nav.gif b/src/images/forward_nav.gif
deleted file mode 100644
index 7a1511d..0000000
Binary files a/src/images/forward_nav.gif and /dev/null differ
diff --git a/src/images/g_icon.gif b/src/images/g_icon.gif
deleted file mode 100755
index 3f4f73f..0000000
Binary files a/src/images/g_icon.gif and /dev/null differ
diff --git a/src/images/goto.png b/src/images/goto.png
deleted file mode 100644
index 58cc31c..0000000
Binary files a/src/images/goto.png and /dev/null differ
diff --git a/src/images/incomplete.png b/src/images/incomplete.png
deleted file mode 100644
index e77ff14..0000000
Binary files a/src/images/incomplete.png and /dev/null differ
diff --git a/src/images/messageFail.png b/src/images/messageFail.png
deleted file mode 100644
index 474f63f..0000000
Binary files a/src/images/messageFail.png and /dev/null differ
diff --git a/src/images/messageInfo.png b/src/images/messageInfo.png
deleted file mode 100644
index ecdc991..0000000
Binary files a/src/images/messageInfo.png and /dev/null differ
diff --git a/src/images/messageWarn.png b/src/images/messageWarn.png
deleted file mode 100755
index 55a6f01..0000000
Binary files a/src/images/messageWarn.png and /dev/null differ
diff --git a/src/images/minus.gif b/src/images/minus.gif
deleted file mode 100644
index a81eba1..0000000
Binary files a/src/images/minus.gif and /dev/null differ
diff --git a/src/images/newBibFile.png b/src/images/newBibFile.png
deleted file mode 100644
index a669555..0000000
Binary files a/src/images/newBibFile.png and /dev/null differ
diff --git a/src/images/new_page.gif b/src/images/new_page.gif
deleted file mode 100644
index 41c3958..0000000
Binary files a/src/images/new_page.gif and /dev/null differ
diff --git a/src/images/new_wiz.gif b/src/images/new_wiz.gif
deleted file mode 100644
index bf683ca..0000000
Binary files a/src/images/new_wiz.gif and /dev/null differ
diff --git a/src/images/next_nav.gif b/src/images/next_nav.gif
deleted file mode 100644
index 8392f33..0000000
Binary files a/src/images/next_nav.gif and /dev/null differ
diff --git a/src/images/o_icon.gif b/src/images/o_icon.gif
deleted file mode 100755
index 22cd977..0000000
Binary files a/src/images/o_icon.gif and /dev/null differ
diff --git a/src/images/paste_edit.gif b/src/images/paste_edit.gif
deleted file mode 100644
index 75e0ab2..0000000
Binary files a/src/images/paste_edit.gif and /dev/null differ
diff --git a/src/images/pdf.png b/src/images/pdf.png
deleted file mode 100644
index d5eab07..0000000
Binary files a/src/images/pdf.png and /dev/null differ
diff --git a/src/images/pdf_small.gif b/src/images/pdf_small.gif
deleted file mode 100644
index 2228bc9..0000000
Binary files a/src/images/pdf_small.gif and /dev/null differ
diff --git a/src/images/plus.gif b/src/images/plus.gif
deleted file mode 100644
index c123ba7..0000000
Binary files a/src/images/plus.gif and /dev/null differ
diff --git a/src/images/postscript.png b/src/images/postscript.png
deleted file mode 100644
index 5065c98..0000000
Binary files a/src/images/postscript.png and /dev/null differ
diff --git a/src/images/prev_nav.gif b/src/images/prev_nav.gif
deleted file mode 100644
index 9b278e6..0000000
Binary files a/src/images/prev_nav.gif and /dev/null differ
diff --git a/src/images/preview.png b/src/images/preview.png
deleted file mode 100644
index a8aa6b3..0000000
Binary files a/src/images/preview.png and /dev/null differ
diff --git a/src/images/r_icon.gif b/src/images/r_icon.gif
deleted file mode 100755
index 5fea573..0000000
Binary files a/src/images/r_icon.gif and /dev/null differ
diff --git a/src/images/redo_edit.gif b/src/images/redo_edit.gif
deleted file mode 100644
index 01ce578..0000000
Binary files a/src/images/redo_edit.gif and /dev/null differ
diff --git a/src/images/refresh_nav.gif b/src/images/refresh_nav.gif
deleted file mode 100644
index a063c23..0000000
Binary files a/src/images/refresh_nav.gif and /dev/null differ
diff --git a/src/images/run.png b/src/images/run.png
deleted file mode 100644
index 3662b07..0000000
Binary files a/src/images/run.png and /dev/null differ
diff --git a/src/images/save_edit.gif b/src/images/save_edit.gif
deleted file mode 100644
index 698d9a2..0000000
Binary files a/src/images/save_edit.gif and /dev/null differ
diff --git a/src/images/saveas_edit.gif b/src/images/saveas_edit.gif
deleted file mode 100644
index 76549a1..0000000
Binary files a/src/images/saveas_edit.gif and /dev/null differ
diff --git a/src/images/search.gif b/src/images/search.gif
deleted file mode 100644
index 6dc3ebe..0000000
Binary files a/src/images/search.gif and /dev/null differ
diff --git a/src/images/showerr_tsk.gif b/src/images/showerr_tsk.gif
deleted file mode 100644
index c2bfdd6..0000000
Binary files a/src/images/showerr_tsk.gif and /dev/null differ
diff --git a/src/images/splash-2.1.png b/src/images/splash-2.1.png
new file mode 100644
index 0000000..1ddced9
Binary files /dev/null and b/src/images/splash-2.1.png differ
diff --git a/src/images/splash-2.1beta.png b/src/images/splash-2.1beta.png
deleted file mode 100644
index 4304131..0000000
Binary files a/src/images/splash-2.1beta.png and /dev/null differ
diff --git a/src/images/toc_closed.gif b/src/images/toc_closed.gif
deleted file mode 100644
index e5bc046..0000000
Binary files a/src/images/toc_closed.gif and /dev/null differ
diff --git a/src/images/undo_edit.gif b/src/images/undo_edit.gif
deleted file mode 100644
index 570c61c..0000000
Binary files a/src/images/undo_edit.gif and /dev/null differ
diff --git a/src/images/up_nav.gif b/src/images/up_nav.gif
deleted file mode 100644
index 6877784..0000000
Binary files a/src/images/up_nav.gif and /dev/null differ
diff --git a/src/images/view.gif b/src/images/view.gif
deleted file mode 100644
index 6d8d1be..0000000
Binary files a/src/images/view.gif and /dev/null differ
diff --git a/src/images/window_nofullscreen.png b/src/images/window_nofullscreen.png
deleted file mode 100644
index 6383f31..0000000
Binary files a/src/images/window_nofullscreen.png and /dev/null differ
diff --git a/src/images/wrongItem.png b/src/images/wrongItem.png
deleted file mode 100644
index 8b2f1eb..0000000
Binary files a/src/images/wrongItem.png and /dev/null differ
diff --git a/src/images/www.png b/src/images/www.png
deleted file mode 100644
index 8ee63b8..0000000
Binary files a/src/images/www.png and /dev/null differ
diff --git a/src/java/net/sf/jabref/AdvancedTab.java b/src/java/net/sf/jabref/AdvancedTab.java
index b58afa0..0a686c1 100644
--- a/src/java/net/sf/jabref/AdvancedTab.java
+++ b/src/java/net/sf/jabref/AdvancedTab.java
@@ -19,7 +19,7 @@ public class AdvancedTab extends JPanel implements PrefsTab {
JPanel pan = new JPanel(),
lnf = new JPanel();
JLabel lab;
- JCheckBox useDefault, useRemoteServer;
+ JCheckBox useDefault, useRemoteServer, useNativeFileDialogOnMac;
JTextField className, remoteServerPort;
JButton def1 = new JButton(Globals.lang("Default")),
def2 = new JButton(Globals.lang("Default"));
@@ -34,9 +34,10 @@ public class AdvancedTab extends JPanel implements PrefsTab {
remoteHelp = new HelpAction(diag, GUIGlobals.remoteHelp, "Help",
- GUIGlobals.helpSmallIconFile);
+ GUIGlobals.getIconUrl("helpSmall"));
useDefault = new JCheckBox(Globals.lang("Use other look and feel"));
useRemoteServer = new JCheckBox(Globals.lang("Listen for remote operation on port")+":");
+ useNativeFileDialogOnMac = new JCheckBox(Globals.lang("Use native file dialog"));
remoteServerPort = new JTextField();
className = new JTextField(50);
final JTextField clName = className;
@@ -51,32 +52,35 @@ public class AdvancedTab extends JPanel implements PrefsTab {
"");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
JPanel pan = new JPanel();
- builder.appendSeparator(Globals.lang("Look and feel"));
- JLabel lab = new JLabel(Globals.lang("Default look and feel")+": "
- +(Globals.ON_WIN ? GUIGlobals.windowsDefaultLookAndFeel :
- GUIGlobals.linuxDefaultLookAndFeel));
- builder.nextLine();
- builder.append(pan);
- builder.append(lab);
- builder.nextLine();
- builder.append(pan);
- builder.append(useDefault);
- builder.nextLine();
- builder.append(pan);
- JPanel pan2 = new JPanel();
- lab = new JLabel(Globals.lang("Class name")+":");
- pan2.add(lab);
- pan2.add(className);
- builder.append(pan2);
- builder.nextLine();
- builder.append(pan);
- lab = new JLabel(Globals.lang("Note that you must specify the fully qualified class name for the look and feel,"));
- builder.append(lab);
- builder.nextLine();
- builder.append(pan);
- lab = new JLabel(Globals.lang("and the class must be available in your classpath next time you start JabRef."));
- builder.append(lab);
- builder.nextLine();
+
+ if (!Globals.ON_MAC) {
+ builder.appendSeparator(Globals.lang("Look and feel"));
+ JLabel lab = new JLabel(Globals.lang("Default look and feel")+": "
+ +(Globals.ON_WIN ? GUIGlobals.windowsDefaultLookAndFeel :
+ GUIGlobals.linuxDefaultLookAndFeel));
+ builder.nextLine();
+ builder.append(pan);
+ builder.append(lab);
+ builder.nextLine();
+ builder.append(pan);
+ builder.append(useDefault);
+ builder.nextLine();
+ builder.append(pan);
+ JPanel pan2 = new JPanel();
+ lab = new JLabel(Globals.lang("Class name")+":");
+ pan2.add(lab);
+ pan2.add(className);
+ builder.append(pan2);
+ builder.nextLine();
+ builder.append(pan);
+ lab = new JLabel(Globals.lang("Note that you must specify the fully qualified class name for the look and feel,"));
+ builder.append(lab);
+ builder.nextLine();
+ builder.append(pan);
+ lab = new JLabel(Globals.lang("and the class must be available in your classpath next time you start JabRef."));
+ builder.append(lab);
+ builder.nextLine();
+ }
builder.appendSeparator(Globals.lang("Remote operation"));
builder.nextLine();
builder.append(new JPanel());
@@ -86,6 +90,14 @@ public class AdvancedTab extends JPanel implements PrefsTab {
p.add(remoteHelp.getIconButton());
builder.append(p);
+ if (Globals.ON_MAC) {
+ builder.nextLine();
+ builder.appendSeparator(Globals.lang("Mac file dialog"));
+ builder.nextLine();
+ builder.append(new JPanel());
+ builder.append(useNativeFileDialogOnMac);
+ }
+
pan = builder.getPanel();
pan.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
setLayout(new BorderLayout());
@@ -102,11 +114,13 @@ public class AdvancedTab extends JPanel implements PrefsTab {
useRemoteServer.setSelected(_prefs.getBoolean("useRemoteServer"));
oldPort = _prefs.getInt("remoteServerPort");
remoteServerPort.setText(String.valueOf(oldPort));
+ useNativeFileDialogOnMac.setSelected(Globals.prefs.getBoolean("useNativeFileDialogOnMac"));
}
public void storeSettings() {
_prefs.putBoolean("useDefaultLookAndFeel", !useDefault.isSelected());
_prefs.put("lookAndFeel", className.getText());
+ _prefs.putBoolean("useNativeFileDialogOnMac", useNativeFileDialogOnMac.isSelected());
try {
int port = Integer.parseInt(remoteServerPort.getText());
if (port != oldPort) {
diff --git a/src/java/net/sf/jabref/AppearancePrefsTab.java b/src/java/net/sf/jabref/AppearancePrefsTab.java
index 2b4d4eb..3b4e6a2 100644
--- a/src/java/net/sf/jabref/AppearancePrefsTab.java
+++ b/src/java/net/sf/jabref/AppearancePrefsTab.java
@@ -13,13 +13,14 @@ import net.sf.jabref.gui.ColorSetupPanel;
class AppearancePrefsTab extends JPanel implements PrefsTab {
JabRefPreferences _prefs;
- private JCheckBox colorCodes, antialias;
+ private JCheckBox colorCodes, antialias, overrideFonts;//, useCustomIconTheme;
private GridBagLayout gbl = new GridBagLayout();
private JButton fontButton = new JButton(Globals.lang("Set table font"));
private ColorSetupPanel colorPanel = new ColorSetupPanel();
private Font font = GUIGlobals.CURRENTFONT;
private int oldMenuFontSize;
- private JTextField fontSize;
+ private boolean oldOverrideFontSize;
+ private JTextField fontSize;//, customIconThemeFile;
/**
* Customization of appearance parameters.
@@ -31,14 +32,17 @@ class AppearancePrefsTab extends JPanel implements PrefsTab {
setLayout(new BorderLayout());
// Font sizes:
- fontSize = new JTextField();
+ fontSize = new JTextField(5);
colorCodes = new JCheckBox(Globals.lang
("Color codes for required and optional fields"));
antialias = new JCheckBox(Globals.lang
("Use antialiasing font"));
+ overrideFonts = new JCheckBox(Globals.lang("Override default font settings"));
+ //useCustomIconTheme = new JCheckBox(Globals.lang("Use custom icon theme"));
+ //customIconThemeFile = new JTextField();
FormLayout layout = new FormLayout
("1dlu, 8dlu, left:pref, 4dlu, fill:pref, 4dlu, fill:60dlu, 4dlu, fill:pref",
"");
@@ -52,16 +56,29 @@ class AppearancePrefsTab extends JPanel implements PrefsTab {
p1.add(fontSize);
builder.append(p1);
builder.nextLine();
- builder.append(antialias);
+ builder.append(overrideFonts);
builder.nextLine();
builder.appendSeparator(Globals.lang("Table appearance"));
+ builder.append(antialias);
+ builder.nextLine();
builder.append(colorCodes);
builder.nextLine();
builder.append(fontButton);
builder.nextLine();
builder.append(colorPanel);
-
-
+ /*builder.appendSeparator(Globals.lang("Custom icon theme"));
+ builder.append(useCustomIconTheme);
+ builder.nextLine();
+ JPanel p2 = new JPanel();
+ lab = new JLabel(Globals.lang("Custom icon theme file")+":");
+ p2.add(lab);
+ p2.add(customIconThemeFile);
+ BrowseAction browse = new BrowseAction(null, customIconThemeFile, false);
+ JButton browseBut = new JButton(Globals.lang("Browse"));
+ browseBut.addActionListener(browse);
+ p2.add(browseBut);
+ builder.append(p2);
+ */
JPanel upper = new JPanel(),
sort = new JPanel(),
@@ -73,6 +90,11 @@ class AppearancePrefsTab extends JPanel implements PrefsTab {
iconCol.setLayout(gbl);
+ overrideFonts.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ fontSize.setEnabled(overrideFonts.isSelected());
+ }
+ });
fontButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -106,7 +128,11 @@ class AppearancePrefsTab extends JPanel implements PrefsTab {
antialias.setSelected(_prefs.getBoolean("antialias"));
fontSize.setText("" + _prefs.getInt("menuFontSize"));
oldMenuFontSize = _prefs.getInt("menuFontSize");
-
+ overrideFonts.setSelected(_prefs.getBoolean("overrideDefaultFonts"));
+ oldOverrideFontSize = overrideFonts.isSelected();
+ fontSize.setEnabled(overrideFonts.isSelected());
+ //useCustomIconTheme.setSelected(_prefs.getBoolean("useCustomIconTheme"));
+ //customIconThemeFile.setText(_prefs.get("customIconThemeFile"));
colorPanel.setValues();
}
@@ -122,11 +148,13 @@ class AppearancePrefsTab extends JPanel implements PrefsTab {
_prefs.put("fontFamily", font.getFamily());
_prefs.putInt("fontStyle", font.getStyle());
_prefs.putInt("fontSize", font.getSize());
+ _prefs.putBoolean("overrideDefaultFonts", overrideFonts.isSelected());
GUIGlobals.CURRENTFONT = font;
colorPanel.storeSettings();
try {
int size = Integer.parseInt(fontSize.getText());
- if (size != oldMenuFontSize) {
+ if ((overrideFonts.isSelected() != oldOverrideFontSize) ||
+ (size != oldMenuFontSize)) {
_prefs.putInt("menuFontSize", size);
JOptionPane.showMessageDialog(null, Globals.lang("You have changed the menu and label font size. "
+ "You must restart JabRef for this to come into effect."), Globals.lang("Changed font settings"),
diff --git a/src/java/net/sf/jabref/BasePanel.java b/src/java/net/sf/jabref/BasePanel.java
index bebddea..e6b1ff7 100644
--- a/src/java/net/sf/jabref/BasePanel.java
+++ b/src/java/net/sf/jabref/BasePanel.java
@@ -275,9 +275,10 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
// The action for saving a database.
actions.put("save", new AbstractWorker() {
- private boolean success = false;
+ private boolean success = false, cancelled = false;
public void init() throws Throwable {
success = false;
+ cancelled = false;
if (file == null)
runCommand("saveAs");
else {
@@ -324,12 +325,17 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
frame.setTabTitle(BasePanel.this, file.getName());
frame.output(Globals.lang("Saved database")+" '"
+file.getPath()+"'.");
- } else {
+ } else if (!cancelled) {
frame.output(Globals.lang("Save failed"));
}
}
public void run() {
+ if (file == null) {
+ cancelled = true;
+ return;
+ }
+
try {
// If the option is set, autogenerate keys for all entries that are
// lacking keys, before saving:
@@ -1553,7 +1559,8 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
MainTableFormat tableFormat = new MainTableFormat(this);
tableFormat.updateTableFormat();
//EventTableModel tableModel = new EventTableModel(sortedList, tableFormat);
- mainTable = new MainTable(/*tableModel, */tableFormat, searchFilterList);
+ mainTable = new MainTable(/*tableModel, */tableFormat, searchFilterList, frame);
+
selectionListener = new MainTableSelectionListener(this, mainTable);
mainTable.updateFont();
mainTable.addSelectionListener(selectionListener);
diff --git a/src/java/net/sf/jabref/BibtexEntry.java b/src/java/net/sf/jabref/BibtexEntry.java
index b5f1409..002635a 100644
--- a/src/java/net/sf/jabref/BibtexEntry.java
+++ b/src/java/net/sf/jabref/BibtexEntry.java
@@ -201,7 +201,11 @@ public class BibtexEntry
}
/**
- * Sets the given field to the given value.
+ * Sets a number of fields simultaneously. The given HashMap contains field
+ * names as keys, each mapped to the value to set.
+ * WARNING: this method does not notify change listeners, so it should *NOT*
+ * be used for entries that are being displayed in the GUI. Furthermore, it
+ * does not check values for content, so e.g. empty strings will be set as such.
*/
public void setField(HashMap fields){
_fields.putAll(fields);
diff --git a/src/java/net/sf/jabref/BibtexFields.java b/src/java/net/sf/jabref/BibtexFields.java
index 280f132..c226ab6 100644
--- a/src/java/net/sf/jabref/BibtexFields.java
+++ b/src/java/net/sf/jabref/BibtexFields.java
@@ -198,7 +198,7 @@ public class BibtexFields
dummy = new BibtexSingleField( MARKED, false) ;
dummy.setPrivate();
- dummy.setWriteable(false);
+ dummy.setWriteable(true); // This field must be written to file!
dummy.setDisplayable(false);
add(dummy) ;
diff --git a/src/java/net/sf/jabref/BrowseAction.java b/src/java/net/sf/jabref/BrowseAction.java
index b62b17b..95261b0 100644
--- a/src/java/net/sf/jabref/BrowseAction.java
+++ b/src/java/net/sf/jabref/BrowseAction.java
@@ -10,7 +10,8 @@ import java.io.File;
*/
public class BrowseAction extends AbstractAction implements ActionListener {
- JFrame frame;
+ JFrame frame=null;
+ //JDialog dialog=null;
JTextField comp;
boolean dir;
@@ -22,6 +23,14 @@ public class BrowseAction extends AbstractAction implements ActionListener {
}
+ /*public BrowseAction(JDialog dialog, JTextField tc, boolean dir) {
+ super(Globals.lang("Browse"));
+ this.dialog = dialog;
+ this.dir = dir;
+ comp = tc;
+
+ } */
+
public void actionPerformed(ActionEvent e) {
String chosen = null;
if (dir)
diff --git a/src/java/net/sf/jabref/DuplicateResolverDialog.java b/src/java/net/sf/jabref/DuplicateResolverDialog.java
index 6f0f55f..eba1961 100644
--- a/src/java/net/sf/jabref/DuplicateResolverDialog.java
+++ b/src/java/net/sf/jabref/DuplicateResolverDialog.java
@@ -27,6 +27,9 @@ public class DuplicateResolverDialog extends JDialog {
KEEP_UPPER = 1,
KEEP_LOWER = 2,
BREAK = 5, // close
+ IMPORT_AND_DELETE_OLD = 1,
+ IMPORT_AND_KEEP_OLD = 0,
+ DO_NOT_IMPORT = 2,
DUPLICATE_SEARCH = 1,
IMPORT_CHECK = 2,
INSPECTION = 3;
@@ -47,9 +50,19 @@ public class DuplicateResolverDialog extends JDialog {
boolean block = true;
TitleLabel lab;
- public DuplicateResolverDialog(JabRefFrame frame, BibtexEntry one, BibtexEntry two, int type) {
- super(frame, Globals.lang("Possible duplicate entries"), true);
+ public DuplicateResolverDialog(JFrame frame, BibtexEntry one, BibtexEntry two, int type) {
+ super(frame, Globals.lang("Possible duplicate entries"), true);
+ init(one, two, type);
+ Util.placeDialog(this, frame);
+ }
+
+ public DuplicateResolverDialog(JDialog frame, BibtexEntry one, BibtexEntry two, int type) {
+ super(frame, Globals.lang("Possible duplicate entries"), true);
+ init(one, two, type);
+ Util.placeDialog(this, frame);
+ }
+ private void init(BibtexEntry one, BibtexEntry two, int type) {
switch (type) {
case DUPLICATE_SEARCH:
first = new JButton(Globals.lang("Keep upper"));
@@ -88,8 +101,8 @@ public class DuplicateResolverDialog extends JDialog {
con.gridwidth = GridBagConstraints.REMAINDER;
con.weightx = 1;
con.weighty = 0;
- lab = new TitleLabel(Globals.lang((type==DUPLICATE_SEARCH)?"":
- "Entry in current database"));
+ lab = new TitleLabel((type==DUPLICATE_SEARCH) ? "" :
+ Globals.lang("Entry in current database"));
gbl.setConstraints(lab, con);
main.add(lab);
con.weighty = 1;
@@ -99,8 +112,8 @@ public class DuplicateResolverDialog extends JDialog {
main.add(sp);
con.weighty = 0;
con.insets = new Insets(10,10,0,10);
- lab = new TitleLabel(Globals.lang((type==DUPLICATE_SEARCH)?"":
- "Entry in import"));
+ lab = new TitleLabel((type==DUPLICATE_SEARCH) ? "" :
+ Globals.lang("Entry in import"));
gbl.setConstraints(lab, con);
main.add(lab);
con.weighty = 1;
@@ -170,7 +183,7 @@ public class DuplicateResolverDialog extends JDialog {
both.requestFocus();
- Util.placeDialog(this, frame);
+
}
private void setSourceView(BibtexEntry one, BibtexEntry two) {
@@ -206,11 +219,26 @@ public boolean isBlocking() {
return status;
}
- public static int resolveDuplicate(JabRefFrame frame, BibtexEntry one, BibtexEntry two) {
+ public static int resolveDuplicate(JFrame frame, BibtexEntry one, BibtexEntry two) {
+ DuplicateResolverDialog drd = new DuplicateResolverDialog(frame, one, two,
+ DUPLICATE_SEARCH);
+ drd.setVisible(true); // drd.show(); -> deprecated since 1.5
+ return drd.getSelected();
+ }
+
+ public static int resolveDuplicate(JDialog frame, BibtexEntry one, BibtexEntry two) {
DuplicateResolverDialog drd = new DuplicateResolverDialog(frame, one, two,
DUPLICATE_SEARCH);
drd.setVisible(true); // drd.show(); -> deprecated since 1.5
return drd.getSelected();
}
+ public static int resolveDuplicateInImport(JabRefFrame frame, BibtexEntry existing,
+ BibtexEntry imported) {
+ DuplicateResolverDialog drd = new DuplicateResolverDialog(frame, existing, imported,
+ IMPORT_CHECK);
+ drd.setVisible(true); // drd.show(); -> deprecated since 1.5
+ return drd.getSelected();
+ }
+
}
diff --git a/src/java/net/sf/jabref/EntryCustomizationDialog.java b/src/java/net/sf/jabref/EntryCustomizationDialog.java
index 5b7aabb..dcaaf90 100644
--- a/src/java/net/sf/jabref/EntryCustomizationDialog.java
+++ b/src/java/net/sf/jabref/EntryCustomizationDialog.java
@@ -68,7 +68,7 @@ class EntryCustomizationDialog extends JDialog implements ItemListener
super(parent,Globals.lang("Customize entry types"), false);
this.parent = parent;
help = new HelpAction(parent.helpDiag, GUIGlobals.customEntriesHelp,
- "Help", GUIGlobals.helpSmallIconFile);
+ "Help", GUIGlobals.getIconUrl("helpSmall"));
setTypeSelection();
//setSize(440,400);
initialize();
diff --git a/src/java/net/sf/jabref/EntryEditor.java b/src/java/net/sf/jabref/EntryEditor.java
index 0857133..6aacd67 100644
--- a/src/java/net/sf/jabref/EntryEditor.java
+++ b/src/java/net/sf/jabref/EntryEditor.java
@@ -171,7 +171,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
fieldList = java.util.Arrays.asList(fields);
reqPan = new EntryEditorTab(fieldList, this, true, Globals.lang("Required fields"));
tabbed.addTab(Globals.lang("Required fields"),
- new ImageIcon(GUIGlobals.showReqIconFile), reqPan.getPane(),
+ GUIGlobals.getImage("required"), reqPan.getPane(),
Globals.lang("Show required fields"));
tabs.add(reqPan);
//}
@@ -180,7 +180,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
optPan = new EntryEditorTab(java.util.Arrays.asList(entry.getOptionalFields()),
this, false, Globals.lang("Optional fields"));
tabbed.addTab(Globals.lang("Optional fields"),
- new ImageIcon(GUIGlobals.showOptIconFile), optPan.getPane(),
+ GUIGlobals.getImage("optional"), optPan.getPane(),
Globals.lang("Show optional fields"));
tabs.add(optPan);
}
@@ -189,14 +189,14 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
for (int i=0; i<tabList.getTabCount(); i++) {
EntryEditorTab newTab = new EntryEditorTab(tabList.getTabFields(i),
this, false, tabList.getTabName(i));
- tabbed.addTab(tabList.getTabName(i), new ImageIcon(GUIGlobals.showGenIconFile), newTab.getPane());
+ tabbed.addTab(tabList.getTabName(i), GUIGlobals.getImage("general"), newTab.getPane());
tabs.add(newTab);
}
srcPanel.setName(Globals.lang("BibTeX source"));
if (Globals.prefs.getBoolean("showSource")) {
tabbed.addTab(Globals.lang("BibTeX source"),
- new ImageIcon(GUIGlobals.sourceIconFile), srcPanel,
+ GUIGlobals.getImage("source"), srcPanel,
Globals.lang("Show/edit BibTeX source"));
tabs.add(srcPanel);
}
@@ -636,18 +636,25 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
*/
public synchronized void switchTo(BibtexEntry be) {
if (entry == be)
- return;
+ return;
- //Util.pr("EntryEditor.switchTo(BibtexEntry): "+entry.getCiteKey());
- //Util.pr("::EntryEditor.switchTo(BibtexEntry): "+this.type.getName());
+ //Util.pr("EntryEditor.switchTo(BibtexEntry): "+entry.getCiteKey());
+ //Util.pr("::EntryEditor.switchTo(BibtexEntry): "+this.type.getName());
storeCurrentEdit();
- entry = be;
- updateAllFields();
- validateAllFields();
- updateSource();
- panel.showing = be;
- }
+ // Remove this instance as property listener for the entry:
+ entry.removePropertyChangeListener(this);
+ // Register as property listener for the new entry:
+ be.addPropertyChangeListener(this);
+
+ entry = be;
+
+ updateAllFields();
+ validateAllFields();
+ updateSource();
+ panel.showing = be;
+
+ }
/**
* Returns false if the contents of the source panel has not been validated,
@@ -925,7 +932,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
class DeleteAction extends AbstractAction {
public DeleteAction() {
- super(Globals.lang("Delete"), new ImageIcon(GUIGlobals.removeIconFile));
+ super(Globals.lang("Delete"), GUIGlobals.getImage("delete"));
putValue(SHORT_DESCRIPTION, Globals.lang("Delete entry"));
}
@@ -946,7 +953,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
class CloseAction extends AbstractAction {
public CloseAction() {
- super(Globals.lang("Close window"), new ImageIcon(GUIGlobals.closeIconFile));
+ super(Globals.lang("Close window"), GUIGlobals.getImage("close"));
putValue(SHORT_DESCRIPTION, Globals.lang("Close window"));
}
@@ -962,7 +969,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
class CopyKeyAction extends AbstractAction {
public CopyKeyAction() {
- super("Copy BibTeX key to clipboard", new ImageIcon(GUIGlobals.copyKeyIconFile));
+ super("Copy BibTeX key to clipboard");
putValue(SHORT_DESCRIPTION, "Copy BibTeX key to clipboard (Ctrl-K)");
//putValue(MNEMONIC_KEY, GUIGlobals.copyKeyCode);
@@ -1158,7 +1165,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
class NextEntryAction extends AbstractAction {
public NextEntryAction() {
- super(Globals.lang("Next entry"), new ImageIcon(GUIGlobals.downIconFile));
+ super(Globals.lang("Next entry"), GUIGlobals.getImage("down"));
putValue(SHORT_DESCRIPTION, Globals.lang("Next entry"));
}
@@ -1184,7 +1191,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
class PrevEntryAction extends AbstractAction {
public PrevEntryAction() {
- super(Globals.lang("Previous entry"), new ImageIcon(GUIGlobals.upIconFile));
+ super(Globals.lang("Previous entry"), GUIGlobals.getImage("up"));
putValue(SHORT_DESCRIPTION, Globals.lang("Previous entry"));
}
@@ -1214,7 +1221,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
BibtexEntry selectedEntry;
public GenerateKeyAction(JabRefFrame parentFrame) {
- super(Globals.lang("Generate BibTeX key"), new ImageIcon(GUIGlobals.genKeyIconFile));
+ super(Globals.lang("Generate BibTeX key"), GUIGlobals.getImage("makeKey"));
parent = parentFrame;
// selectedEntry = newEntry ;
@@ -1253,7 +1260,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
class UndoAction extends AbstractAction {
public UndoAction() {
- super("Undo", new ImageIcon(GUIGlobals.undoIconFile));
+ super("Undo", GUIGlobals.getImage("undo"));
putValue(SHORT_DESCRIPTION, "Undo");
}
@@ -1267,7 +1274,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
class RedoAction extends AbstractAction {
public RedoAction() {
- super("Undo", new ImageIcon(GUIGlobals.redoIconFile));
+ super("Undo", GUIGlobals.getImage("redo"));
putValue(SHORT_DESCRIPTION, "Redo");
}
diff --git a/src/java/net/sf/jabref/EntryEditorTab.java b/src/java/net/sf/jabref/EntryEditorTab.java
index 23d0500..4cb6ac9 100644
--- a/src/java/net/sf/jabref/EntryEditorTab.java
+++ b/src/java/net/sf/jabref/EntryEditorTab.java
@@ -197,12 +197,13 @@ public class EntryEditorTab {
}
public void validateAllFields() {
- for (Iterator i=editors.keySet().iterator(); i.hasNext();) {
- String field = (String)i.next();
- FieldEditor ed = (FieldEditor)editors.get(field);
- if (((Component)ed).hasFocus())
- ed.setBackground(GUIGlobals.activeEditor);
- else
+ for (Iterator i = editors.keySet().iterator(); i.hasNext();) {
+ String field = (String) i.next();
+ FieldEditor ed = (FieldEditor) editors.get(field);
+ ed.setEnabled(true);
+ if (((Component) ed).hasFocus())
+ ed.setBackground(GUIGlobals.activeEditor);
+ else
ed.setBackground(GUIGlobals.validFieldBackground);
}
}
diff --git a/src/java/net/sf/jabref/EntryTypeDialog.java b/src/java/net/sf/jabref/EntryTypeDialog.java
index dad1619..a5ea89f 100644
--- a/src/java/net/sf/jabref/EntryTypeDialog.java
+++ b/src/java/net/sf/jabref/EntryTypeDialog.java
@@ -27,6 +27,8 @@ http://www.gnu.org/copyleft/gpl.ja.html
package net.sf.jabref;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
+
import javax.swing.*;
import java.awt.event.*;
import java.awt.*;
@@ -71,22 +73,25 @@ public class EntryTypeDialog extends JDialog implements ActionListener {
getContentPane().setLayout(new BorderLayout());
JPanel pan = new JPanel();
getContentPane().add(pan, BorderLayout.CENTER);
- JPanel lower = new JPanel();
+ JPanel buttons = new JPanel();
JButton // ok = new JButton("Ok"),
cancel = new JButton(Globals.lang("Cancel"));
//ok.addActionListener(this);
cancel.addActionListener(this);
- //pan.setBackground(GUIGlobals.lightGray);
- //lower.setBackground(GUIGlobals.lightGray);
- // Make ESC close dialog, equivalent to clicking Cancel.
+ // Make ESC close dialog, equivalent to clicking Cancel.
cancel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
.put(baseFrame_.prefs.getKey("Close dialog"), "close");
cancel.getActionMap().put("close", cancelAction);
- //lower.add(ok);
- lower.add(cancel);
- getContentPane().add(lower, BorderLayout.SOUTH);
+ //buttons.add(ok);
+ ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
+ //buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+ bb.addGlue();
+ bb.addGridded(cancel);
+ bb.addGlue();
+
+ getContentPane().add(buttons, BorderLayout.SOUTH);
GridBagLayout gbl = new GridBagLayout();
pan.setLayout(gbl);
GridBagConstraints con = new GridBagConstraints();
@@ -116,7 +121,7 @@ public class EntryTypeDialog extends JDialog implements ActionListener {
(BorderFactory.createEtchedBorder(),
Globals.lang("Entry types")));
//pan.setBackground(Color.white);
- //lower.setBackground(Color.white);
+ //buttons.setBackground(Color.white);
pack();
setResizable(false);
}
diff --git a/src/java/net/sf/jabref/FieldContentSelector.java b/src/java/net/sf/jabref/FieldContentSelector.java
index 79359e5..babd23b 100644
--- a/src/java/net/sf/jabref/FieldContentSelector.java
+++ b/src/java/net/sf/jabref/FieldContentSelector.java
@@ -33,6 +33,7 @@ import java.util.Vector;
import javax.swing.*;
import com.jgoodies.forms.layout.Sizes;
+import com.jgoodies.looks.Options;
public class FieldContentSelector extends JComponent implements ActionListener {
@@ -62,8 +63,8 @@ public class FieldContentSelector extends JComponent implements ActionListener {
* insertion.
*/
public FieldContentSelector(JabRefFrame frame, BasePanel panel,
- Dialog owner, FieldEditor editor, MetaData data,
- AbstractAction action, boolean horizontalLayout) {
+ Dialog owner, FieldEditor editor, MetaData data,
+ AbstractAction action, boolean horizontalLayout) {
m_editor = editor;
m_metaData = data;
m_action = action;
@@ -80,8 +81,8 @@ public class FieldContentSelector extends JComponent implements ActionListener {
* insertion.
*/
public FieldContentSelector(JabRefFrame frame, BasePanel panel,
- Frame owner, FieldEditor editor, MetaData data,
- AbstractAction action, boolean horizontalLayout) {
+ Frame owner, FieldEditor editor, MetaData data,
+ AbstractAction action, boolean horizontalLayout) {
m_editor = editor;
m_metaData = data;
m_action = action;
@@ -97,7 +98,10 @@ public class FieldContentSelector extends JComponent implements ActionListener {
//list.setEditable(true);
list.setMaximumRowCount(35);
-
+ // Set the width of the popup independent of the size of th box itself:
+ list.putClientProperty(
+ Options.COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY,
+ "The longest text in the combo popup menu. And even longer.");
/*
* list.getInputMap().put(Globals.prefs.getKey("Select value"),
* "enter"); list.getActionMap().put("enter", new EnterAction());
diff --git a/src/java/net/sf/jabref/FieldTextArea.java b/src/java/net/sf/jabref/FieldTextArea.java
index 979ea67..6df5279 100644
--- a/src/java/net/sf/jabref/FieldTextArea.java
+++ b/src/java/net/sf/jabref/FieldTextArea.java
@@ -190,4 +190,9 @@ public class FieldTextArea extends JTextArea implements FieldEditor, KeyListener
public void keyTyped(KeyEvent event) {
}
+
+/* public void setText(String t) {
+ super.setText(t); //To change body of overridden methods use File | Settings | File Templates.
+ Thread.dumpStack();
+ }*/
}
diff --git a/src/java/net/sf/jabref/FieldTextMenu.java b/src/java/net/sf/jabref/FieldTextMenu.java
index 4db9165..f1a83d3 100644
--- a/src/java/net/sf/jabref/FieldTextMenu.java
+++ b/src/java/net/sf/jabref/FieldTextMenu.java
@@ -153,7 +153,8 @@ public class FieldTextMenu implements MouseListener
{
public PasteAction()
{
- super("Paste from clipboard", "Paste from clipboard", GUIGlobals.pasteIconFile);
+ super("Paste from clipboard", "Paste from clipboard",
+ GUIGlobals.getIconUrl("paste"));
}
public void actionPerformed(ActionEvent e)
@@ -178,7 +179,7 @@ public class FieldTextMenu implements MouseListener
{
public CopyAction()
{
- super("Copy to clipboard", "Copy to clipboard", GUIGlobals.copyIconFile);
+ super("Copy to clipboard", "Copy to clipboard", GUIGlobals.getIconUrl("copy"));
}
public void actionPerformed(ActionEvent e)
diff --git a/src/java/net/sf/jabref/GUIGlobals.java b/src/java/net/sf/jabref/GUIGlobals.java
index 5a6ce25..9697025 100644
--- a/src/java/net/sf/jabref/GUIGlobals.java
+++ b/src/java/net/sf/jabref/GUIGlobals.java
@@ -34,9 +34,11 @@ import java.awt.*;
import java.util.*;
//import java.util.List;
import java.net.URL;
+import java.net.MalformedURLException;
import javax.swing.*;
-import java.io.FileInputStream;
import java.io.InputStream;
+import java.io.IOException;
+import java.io.File;
public class GUIGlobals {
@@ -117,9 +119,10 @@ public class GUIGlobals {
static HashMap tableIcons = new HashMap(); // Contains table icon mappings. Set up
// further below.
- public static JLabel incompleteLabel; // JLabel with icon signaling an incomplete entry.
public static Color activeEditor = new Color(230, 230, 255);
+ static HashMap iconMap;
+
public static JLabel getTableIcon(String fieldType) {
Object o = tableIcons.get(fieldType);
if (o == null) {
@@ -129,88 +132,6 @@ public class GUIGlobals {
}
- public static URL
-
- openIconFile = GUIGlobals.class.getResource(pre + "fldr_obj.gif"),
- editIconFile = GUIGlobals.class.getResource(pre + "edittsk_tsk.gif"),
- saveIconFile = GUIGlobals.class.getResource(pre + "save_edit.gif"),
- saveAsIconFile = GUIGlobals.class.getResource(pre + "saveas_edit.gif"),
- prefsIconFile = GUIGlobals.class.getResource(pre + "configure2.png"),
- newIconFile = GUIGlobals.class.getResource(pre + "new_page.gif"),
- undoIconFile = GUIGlobals.class.getResource(pre + "undo_edit.gif"),
- redoIconFile = GUIGlobals.class.getResource(pre + "redo_edit.gif"),
- preambleIconFile = GUIGlobals.class.getResource(pre + "preamble.png"),
- addIconFile = GUIGlobals.class.getResource(pre + "plus.gif"),
- delRowIconFile = GUIGlobals.class.getResource(pre + "minus.gif"),
- showReqIconFile = GUIGlobals.class.getResource(pre + "reqIcon.png"),
- showOptIconFile = GUIGlobals.class.getResource(pre + "optIcon.png"),
- showGenIconFile = GUIGlobals.class.getResource(pre + "absIcon.png"),
- showAbsIconFile = GUIGlobals.class.getResource(pre + "genIcon.png"),
- sourceIconFile = GUIGlobals.class.getResource(pre + "viewsource.gif"),
- copyIconFile = GUIGlobals.class.getResource(pre + "copy_edit.gif"),
- cutIconFile = GUIGlobals.class.getResource(pre + "cut_edit.gif"),
- copyKeyIconFile = GUIGlobals.class.getResource(pre + "copy_edit.gif"),
- genKeyIconFile = GUIGlobals.class.getResource(pre + "wizard.png"),
- lyxIconFile = GUIGlobals.class.getResource(pre + "lyx2.png"),
- backIconFile = GUIGlobals.class.getResource(pre + "backward_nav.gif"),
- forwardIconFile = GUIGlobals.class.getResource(pre + "forward_nav.gif"),
- contentsIconFile = GUIGlobals.class.getResource(pre + "toc_closed.gif"),
- removeIconFile = GUIGlobals.class.getResource(pre + "delete_edit.gif"),
- upIconFile = GUIGlobals.class.getResource(pre + "prev_nav.gif"),
- downIconFile = GUIGlobals.class.getResource(pre + "next_nav.gif"),
- stringsIconFile = GUIGlobals.class.getResource(pre + "strings.png"),
- groupsIconFile = GUIGlobals.class.getResource(pre + "queue.png"),
- groupsHighlightMatchingAnyFile = GUIGlobals.class.getResource(pre + "groupsHighlightAny.png"),
- groupsHighlightMatchingAllFile = GUIGlobals.class.getResource(pre + "groupsHighlightAll.png"),
- closeIconFile = GUIGlobals.class.getResource(pre + "fileclose.png"),
- close2IconFile = GUIGlobals.class.getResource(pre + "fileclose2.png"),
- refreshSmallIconFile = GUIGlobals.class.getResource(pre + "refresh_nav.gif"),
- helpSmallIconFile = GUIGlobals.class.getResource(pre + "view.gif"),
- helpIconFile = GUIGlobals.class.getResource(pre + "view.gif"),
- aboutIcon = GUIGlobals.class.getResource(pre + "view.gif"),
- helpContentsIconFile = GUIGlobals.class.getResource(pre + "contents2.png"),
- newSmallIconFile = GUIGlobals.class.getResource(pre + "new_page.gif"),
- pasteIconFile = GUIGlobals.class.getResource(pre + "paste_edit.gif"),
- editEntryIconFile = GUIGlobals.class.getResource(pre + "DocumentDraw.gif"),
- searchIconFile = GUIGlobals.class.getResource(pre + "search.gif"),
- previewIconFile = GUIGlobals.class.getResource(pre + "preview.png"),
- autoGroupIcon = GUIGlobals.class.getResource(pre + "addtsk_tsk.gif"),
- wwwIcon = GUIGlobals.class.getResource(pre + "www.png"),
- wwwCiteSeerIcon = GUIGlobals.class.getResource(pre + "wwwciteseer.png"),
- fetchMedlineIcon = GUIGlobals.class.getResource(pre + "goto.png"),
- fetchHourglassIcon = GUIGlobals.class.getResource(pre + "Hourglass.png"),
- pdfIcon = GUIGlobals.class.getResource(pre + "pdf.png"),
- pdfSmallIcon = GUIGlobals.class.getResource(pre + "pdf_small.gif"),
- sheetIcon = GUIGlobals.class.getResource(pre + "defaults_ps.gif"),
- doiIcon = GUIGlobals.class.getResource(pre + "doi.png"),
- doiSmallIcon = GUIGlobals.class.getResource(pre + "doismall.png"),
- psIcon = GUIGlobals.class.getResource(pre + "postscript.png"),
- incompleteIcon = GUIGlobals.class.getResource(pre + "exclamation.gif"),
- winEdtIcon = GUIGlobals.class.getResource(pre + "winedt.png"),
- jabreflogo = GUIGlobals.class.getResource(pre + "JabRef-icon.png"),
- completeTagIcon = GUIGlobals.class.getResource(pre + "completeItem.png"),
- wrongTagIcon = GUIGlobals.class.getResource(pre + "wrongItem.png"),
- clearInputArea = GUIGlobals.class.getResource(pre + "new_page.gif"),
- markIcon = GUIGlobals.class.getResource(pre + "mark.png"),
- unmarkIcon = GUIGlobals.class.getResource(pre + "unmark.png"),
- newBibFile = GUIGlobals.class.getResource(pre + "newBibFile.png"),
- integrityCheck = GUIGlobals.class.getResource(pre + "integrity.png"),
- integrityInfo = GUIGlobals.class.getResource(pre + "messageInfo.png"),
- integrityWarn = GUIGlobals.class.getResource(pre + "messageWarn.png"),
- integrityFail = GUIGlobals.class.getResource(pre + "messageFail.png"),
- duplicateIcon = GUIGlobals.class.getResource(pre + "duplicate.png"),
- emacsIcon = GUIGlobals.class.getResource(pre + "emacs.png");
-
- public static ImageIcon
- groupRefiningIcon = new ImageIcon(GUIGlobals.class.getResource(pre +"groupRefining.png")),
- groupIncludingIcon = new ImageIcon(GUIGlobals.class.getResource(pre +"groupIncluding.png")),
- groupRegularIcon = null;
-
- /*public static incompleteEntryIcon = new ImageIcon(incompleteIcon);
- static {
- incompleteEntryIcon.setTool
- }*/
-
// Help files (in HTML format):
public static String
baseFrameHelp = "BaseFrameHelp.html",
@@ -315,6 +236,123 @@ public class GUIGlobals {
}
+ /**
+ * Read either the default icon theme, or a custom one. If loading of the custom theme
+ * fails, try to fall back on the default theme.
+ */
+ public static void setUpIconTheme() {
+ String defaultPrefix = "/images/crystal_16/", prefix = defaultPrefix;
+
+ URL defaultResource = GUIGlobals.class.getResource(prefix+"Icons.properties");
+ URL resource = defaultResource;
+
+ if (Globals.prefs.getBoolean("useCustomIconTheme")) {
+ String filename = Globals.prefs.get("customIconThemeFile");
+ if (filename != null)
+ try {
+ File file = new File(filename);
+ String parent = file.getParentFile().getAbsolutePath();
+ prefix = "file://"+parent+System.getProperty("file.separator");
+ resource = new URL("file://"+file.getAbsolutePath());
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+ try {
+ iconMap = readIconThemeFile(resource, prefix);
+ } catch (IOException e) {
+ System.err.println(Globals.lang("Unable to read icon theme file")+" '"+
+ resource.toString()+"'");
+ // If we were trying to load a custom theme, try the default one as a fallback:
+ if (resource != defaultResource)
+ try {
+ iconMap = readIconThemeFile(defaultResource, defaultPrefix);
+ } catch (IOException e2) {
+ System.err.println(Globals.lang("Unable to read default icon theme."));
+ }
+
+ }
+
+
+ }
+
+ /**
+ * Looks up the URL for the image representing the given function, in the resource
+ * file listing images.
+ * @param name The name of the icon, such as "open", "save", "saveAs" etc.
+ * @return The URL to the actual image to use.
+ */
+ public static URL getIconUrl(String name) {
+ if (iconMap.containsKey(name)) {
+ String path = (String)iconMap.get(name);
+ URL url = GUIGlobals.class.getResource(path);
+ if (url == null)
+ // This may be a resource outside of the jar file, so we try a general URL:
+ try {
+ url = new URL(path);
+ } catch (MalformedURLException e) {
+ url = null;
+ }
+ if (url == null)
+ System.err.println(Globals.lang("Could not find image file")+" '"+path+"'");
+ return url;
+ }
+ else return null;
+ }
+
+ /**
+ * Constructs an ImageIcon for the given function, using the image specified in
+ * the resource files resource/Icons_en.properties.
+ * @param name The name of the icon, such as "open", "save", "saveAs" etc.
+ * @return The ImageIcon for the function.
+ */
+ public static ImageIcon getImage(String name) {
+ URL u = getIconUrl(name);
+ return u != null ? new ImageIcon(getIconUrl(name)) : null;
+ }
+
+ /**
+ * Read a typical java property file into a HashMap. Currently doesn't support escaping
+ * of the '=' character - it simply looks for the first '=' to determine where the key ends.
+ * Both the key and the value is trimmed for whitespace at the ends.
+ * @param file The URL to read information from.
+ * @param prefix A String to prefix to all values read. Can represent e.g. the directory
+ * where icon files are to be found.
+ * @return A HashMap containing all key-value pairs found.
+ * @throws IOException
+ */
+ private static HashMap readIconThemeFile(URL file, String prefix) throws IOException {
+ HashMap map = new HashMap();
+ InputStream in = null;
+ try {
+ in = file.openStream();
+ StringBuffer buffer = new StringBuffer();
+ int c;
+ while ((c = in.read()) != -1)
+ buffer.append((char)c);
+ String[] lines = buffer.toString().split("\n");
+ String directory = null;
+ for (int i=0; i<lines.length; i++) {
+ String line = lines[i].trim();
+ int index = line.indexOf("=");
+ if (index >= 0) {
+ String key = line.substring(0, index).trim();
+ String value = prefix+line.substring(index+1).trim();
+ map.put(key, value);
+ }
+ }
+ } catch (IOException ex) {
+ throw ex;
+ } finally {
+ try {
+ if (in != null) in.close();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+ return map;
+ }
+
/** returns the path to language independent help files */
public static String getLocaleHelpPath()
{
@@ -334,22 +372,20 @@ public class GUIGlobals {
public static void init() {
typeNameFont = new Font("arial", Font.ITALIC+Font.BOLD, 24);
fieldNameFont = new Font("arial", Font.ITALIC+Font.BOLD, 14);
- incompleteLabel = new JLabel(new ImageIcon(GUIGlobals.incompleteIcon));
- incompleteLabel.setToolTipText(Globals.lang("Entry is incomplete"));
JLabel lab;
- lab = new JLabel(new ImageIcon(pdfIcon));
+ lab = new JLabel(getImage("pdfSmall"));
lab.setToolTipText(Globals.lang("Open")+" PDF");
tableIcons.put("pdf", lab);
- lab = new JLabel(new ImageIcon(wwwIcon));
+ lab = new JLabel(getImage("wwwSmall"));
lab.setToolTipText(Globals.lang("Open")+" URL");
tableIcons.put("url", lab);
- lab = new JLabel(new ImageIcon(wwwCiteSeerIcon));
+ lab = new JLabel(getImage("citeseer"));
lab.setToolTipText(Globals.lang("Open")+" CiteSeer URL");
tableIcons.put("citeseerurl", lab);
- lab = new JLabel(new ImageIcon(doiSmallIcon));
+ lab = new JLabel(getImage("doiSmall"));
lab.setToolTipText(Globals.lang("Open")+" DOI "+Globals.lang("web link"));
tableIcons.put("doi", lab);
- lab = new JLabel(new ImageIcon(psIcon));
+ lab = new JLabel(getImage("psSmall"));
lab.setToolTipText(Globals.lang("Open")+" PS");
tableIcons.put("ps", lab);
diff --git a/src/java/net/sf/jabref/GeneralTab.java b/src/java/net/sf/jabref/GeneralTab.java
index 1b6c9ad..978b56d 100644
--- a/src/java/net/sf/jabref/GeneralTab.java
+++ b/src/java/net/sf/jabref/GeneralTab.java
@@ -66,9 +66,9 @@ public class GeneralTab extends JPanel implements PrefsTab {
timeStampFormat = new JTextField();
timeStampField = new JTextField();
ownerHelp = new HelpAction(frame.helpDiag, GUIGlobals.ownerHelp,
- "Help", GUIGlobals.helpSmallIconFile);
+ "Help", GUIGlobals.getIconUrl("helpSmall"));
timeStampHelp = new HelpAction(frame.helpDiag, GUIGlobals.timeStampHelp, "Help",
- GUIGlobals.helpSmallIconFile);
+ GUIGlobals.getIconUrl("helpSmall"));
inspectionWarnDupli = new JCheckBox(Globals.lang("Warn about unresolved duplicates when closing inspection window"));
Insets marg = new Insets(0,12,3,0);
@@ -101,7 +101,7 @@ public class GeneralTab extends JPanel implements PrefsTab {
"pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, "
+"pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, "
+"pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, "
- +"pref, 6dlu, pref, 6dlu, pref");
+ +"pref, 6dlu, pref, 6dlu, pref, 6dlu, pref");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
CellConstraints cc = new CellConstraints();
builder.addSeparator(Globals.lang("File"), cc.xyw(1,1, 5));
@@ -128,12 +128,12 @@ public class GeneralTab extends JPanel implements PrefsTab {
builder.add(defSource, cc.xy(2, 19));
builder.addSeparator(Globals.lang("Miscellaneous"), cc.xyw(1, 21, 5));
builder.add(useImportInspector, cc.xy(2, 23));
- builder.add(useImportInspectorForSingle, cc.xy(4, 23));
- builder.add(inspectionWarnDupli, cc.xy(4, 25));
- builder.add(ctrlClick, cc.xy(2, 27));
- builder.add(confirmDelete, cc.xy(2, 29));
- builder.add(keyDuplicateWarningDialog, cc.xy(2, 31));
- builder.add(keyEmptyWarningDialog, cc.xy(2, 33));
+ builder.add(useImportInspectorForSingle, cc.xy(2, 25));
+ builder.add(inspectionWarnDupli, cc.xy(2, 27));
+ builder.add(ctrlClick, cc.xy(2, 29));
+ builder.add(confirmDelete, cc.xy(2, 31));
+ builder.add(keyDuplicateWarningDialog, cc.xy(2, 33));
+ builder.add(keyEmptyWarningDialog, cc.xy(2, 35));
// Create a new panel with its own FormLayout for the last items:
FormLayout layout2 = new FormLayout
("left:pref, 8dlu, fill:60dlu, 4dlu, left:pref, 4dlu, fill:60dlu, 4dlu, fill:pref", "");
@@ -163,7 +163,7 @@ public class GeneralTab extends JPanel implements PrefsTab {
builder2.append(lab);
builder2.append(encodings);
- builder.add(builder2.getPanel(), cc.xyw(2, 35, 3));
+ builder.add(builder2.getPanel(), cc.xyw(2, 37, 3));
JPanel pan = builder.getPanel();
diff --git a/src/java/net/sf/jabref/Globals.java b/src/java/net/sf/jabref/Globals.java
index 15a73ae..9e036e7 100644
--- a/src/java/net/sf/jabref/Globals.java
+++ b/src/java/net/sf/jabref/Globals.java
@@ -204,8 +204,10 @@ public class Globals {
}
catch (MissingResourceException ex) {
translation = key;
- logger("Warning: could not get translation for \""
- + key + "\"");
+
+ //Thread.dumpStack(); // For debugging
+ /*logger("Warning: could not get translation for \""
+ + key + "\"");*/
}
if ((translation != null) && (translation.length() != 0)) {
translation = translation.replaceAll("_", " ");
@@ -378,8 +380,14 @@ public class Globals {
off = new OpenFileFilter();
else if (!extension.equals(NONE))
off = new OpenFileFilter(extension);
- return (String[])getNewFileImpl(owner, directory, extension, null, off,
+ Object o = getNewFileImpl(owner, directory, extension, null, off,
JFileChooser.OPEN_DIALOG, updateWorkingdirectory, false, true);
+ String[] toReturn;
+ if (o instanceof String[])
+ toReturn = (String[])o;
+ else toReturn = new String[] {(String)o};
+
+ return toReturn;
}
public static String getNewFile(JFrame owner,
@@ -443,9 +451,10 @@ public class Globals {
boolean dirOnly,
boolean multipleSelection) {
- if (ON_MAC) {
+ if (ON_MAC && prefs.getBoolean("useNativeFileDialogOnMac")) {
+
return getNewFileForMac(owner, directory, extension, dialogType,
- updateWorkingDirectory, dirOnly, off);
+ updateWorkingDirectory, dirOnly, off);
}
JFileChooser fc = null;
@@ -470,7 +479,7 @@ public class Globals {
fc.addChoosableFileFilter(off);
fc.setDialogType(dialogType);
- int dialogResult = JFileChooser.CANCEL_OPTION;
+ int dialogResult;
if (dialogType == JFileChooser.OPEN_DIALOG) {
dialogResult = fc.showOpenDialog(owner);
} else if (dialogType == JFileChooser.SAVE_DIALOG) {
@@ -522,6 +531,7 @@ public class Globals {
FilenameFilter filter) {
FileDialog fc = new FileDialog(owner);
+
//fc.setFilenameFilter(filter);
if (directory != null) {
fc.setDirectory(directory.getParent());
diff --git a/src/java/net/sf/jabref/Globals.java b/src/java/net/sf/jabref/Globals.java~
similarity index 99%
copy from src/java/net/sf/jabref/Globals.java
copy to src/java/net/sf/jabref/Globals.java~
index 15a73ae..9dc3ac8 100644
--- a/src/java/net/sf/jabref/Globals.java
+++ b/src/java/net/sf/jabref/Globals.java~
@@ -204,6 +204,8 @@ public class Globals {
}
catch (MissingResourceException ex) {
translation = key;
+
+ //Thread.dumpStack(); // For debugging
logger("Warning: could not get translation for \""
+ key + "\"");
}
@@ -378,8 +380,14 @@ public class Globals {
off = new OpenFileFilter();
else if (!extension.equals(NONE))
off = new OpenFileFilter(extension);
- return (String[])getNewFileImpl(owner, directory, extension, null, off,
+ Object o = getNewFileImpl(owner, directory, extension, null, off,
JFileChooser.OPEN_DIALOG, updateWorkingdirectory, false, true);
+ String[] toReturn;
+ if (o instanceof String[])
+ toReturn = (String[])o;
+ else toReturn = new String[] {(String)o};
+
+ return toReturn;
}
public static String getNewFile(JFrame owner,
@@ -443,9 +451,10 @@ public class Globals {
boolean dirOnly,
boolean multipleSelection) {
- if (ON_MAC) {
+ if (ON_MAC && prefs.getBoolean("useNativeFileDialogOnMac")) {
+
return getNewFileForMac(owner, directory, extension, dialogType,
- updateWorkingDirectory, dirOnly, off);
+ updateWorkingDirectory, dirOnly, off);
}
JFileChooser fc = null;
@@ -470,7 +479,7 @@ public class Globals {
fc.addChoosableFileFilter(off);
fc.setDialogType(dialogType);
- int dialogResult = JFileChooser.CANCEL_OPTION;
+ int dialogResult;
if (dialogType == JFileChooser.OPEN_DIALOG) {
dialogResult = fc.showOpenDialog(owner);
} else if (dialogType == JFileChooser.SAVE_DIALOG) {
@@ -522,6 +531,7 @@ public class Globals {
FilenameFilter filter) {
FileDialog fc = new FileDialog(owner);
+
//fc.setFilenameFilter(filter);
if (directory != null) {
fc.setDirectory(directory.getParent());
diff --git a/src/java/net/sf/jabref/HelpAction.java b/src/java/net/sf/jabref/HelpAction.java
index 4f26034..a8c9eca 100644
--- a/src/java/net/sf/jabref/HelpAction.java
+++ b/src/java/net/sf/jabref/HelpAction.java
@@ -44,14 +44,14 @@ public class HelpAction extends MnemonicAwareAction {
protected String helpFile;
public HelpAction(HelpDialog diag, String helpFile) {
- super(new ImageIcon(GUIGlobals.helpIconFile));
+ super(GUIGlobals.getImage("help"));
putValue(NAME, "Help");
this.diag = diag;
this.helpFile = helpFile;
}
public HelpAction(HelpDialog diag, String helpFile, String tooltip) {
- super(new ImageIcon(GUIGlobals.helpIconFile));
+ super(GUIGlobals.getImage("help"));
putValue(NAME, "Help");
putValue(SHORT_DESCRIPTION, Globals.lang(tooltip));
this.diag = diag;
@@ -68,7 +68,7 @@ public class HelpAction extends MnemonicAwareAction {
}
public HelpAction(String title, HelpDialog diag, String helpFile, String tooltip) {
- super(new ImageIcon(GUIGlobals.helpIconFile));
+ super(GUIGlobals.getImage("help"));
putValue(NAME, title);
putValue(SHORT_DESCRIPTION, Globals.lang(tooltip));
this.diag = diag;
@@ -77,7 +77,7 @@ public class HelpAction extends MnemonicAwareAction {
public HelpAction(String title, HelpDialog diag, String helpFile, String tooltip,
KeyStroke key) {
- super(new ImageIcon(GUIGlobals.helpIconFile));
+ super(GUIGlobals.getImage("help"));
putValue(NAME, title);
putValue(SHORT_DESCRIPTION, Globals.lang(tooltip));
putValue(ACCELERATOR_KEY, key);
diff --git a/src/java/net/sf/jabref/HelpDialog.java b/src/java/net/sf/jabref/HelpDialog.java
index a7f1a56..eb60f75 100644
--- a/src/java/net/sf/jabref/HelpDialog.java
+++ b/src/java/net/sf/jabref/HelpDialog.java
@@ -133,7 +133,7 @@ public class HelpDialog extends JDialog implements HyperlinkListener {
class BackAction extends AbstractAction {
public BackAction() {
- super("Back", new ImageIcon(GUIGlobals.backIconFile));
+ super("Back", GUIGlobals.getImage("left"));
//putValue(SHORT_DESCRIPTION, "Show the previous page");
}
@@ -145,7 +145,7 @@ public class HelpDialog extends JDialog implements HyperlinkListener {
class ForwardAction extends AbstractAction {
public ForwardAction() {
- super("Forward", new ImageIcon(GUIGlobals.forwardIconFile));
+ super("Forward", GUIGlobals.getImage("right"));
}
public void actionPerformed(ActionEvent e) {
@@ -156,7 +156,7 @@ public class HelpDialog extends JDialog implements HyperlinkListener {
class ContentsAction extends AbstractAction {
public ContentsAction() {
- super("Contents", new ImageIcon(GUIGlobals.contentsIconFile));
+ super("Contents", GUIGlobals.getImage("helpContents"));
}
public void actionPerformed(ActionEvent e) {
diff --git a/src/java/net/sf/jabref/JabRef.java b/src/java/net/sf/jabref/JabRef.java
index 76aca03..3d048c4 100644
--- a/src/java/net/sf/jabref/JabRef.java
+++ b/src/java/net/sf/jabref/JabRef.java
@@ -30,19 +30,24 @@ import net.sf.jabref.wizard.auximport.*;
import net.sf.jabref.remote.RemoteListener;
import gnu.dtools.ritopt.*;
-import java.awt.Font;
-import java.awt.Frame;
+import java.awt.*;
import java.io.*;
import java.io.File;
import java.util.*;
+import java.util.List;
import javax.swing.*;
+import javax.swing.plaf.metal.MetalLookAndFeel;
import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
+import com.jgoodies.looks.plastic.PlasticLookAndFeel;
import com.jgoodies.looks.windows.WindowsLookAndFeel;
-
+import com.jgoodies.looks.FontSet;
+import com.jgoodies.looks.FontSets;
+import com.jgoodies.looks.FontPolicy;
+import com.jgoodies.looks.FontPolicies;
//import javax.swing.UIManager;
//import javax.swing.UIDefaults;
@@ -57,7 +62,7 @@ public class JabRef {
boolean graphicFailure = false;
StringOption importFile, exportFile, exportPrefs, importPrefs, auxImExport, importToOpenBase;
- BooleanOption helpO, disableGui, blank, loadSess;
+ BooleanOption helpO, disableGui, blank, loadSess, showVersion;
/*
* class StringArrayOption extends ArrayOption { public public void
* modify(String value) { } public void modify(String[] value) { } public
@@ -135,6 +140,7 @@ public class JabRef {
disableGui = new BooleanOption();
blank = new BooleanOption();
loadSess = new BooleanOption();
+ showVersion = new BooleanOption();
exportPrefs = new StringOption("jabref_prefs.xml");
importPrefs = new StringOption("jabref_prefs.xml");
auxImExport = new StringOption("");
@@ -144,6 +150,8 @@ public class JabRef {
options.setVersion(GUIGlobals.version);
importFile.setDescription("imopoepuoeu"); //Globals.lang);
+ options.register("version", 'v',
+ Globals.lang("Display version"), showVersion);
options.register("nogui", 'n',
Globals.lang("No GUI. Only process command line options."), disableGui);
options.register("import", 'i',
@@ -174,8 +182,15 @@ public class JabRef {
setupOptions();
String[] leftOver = options.process(args);
+
+
//Util.pr(": Options processed");
+ if (initialStartup && showVersion.isInvoked()) {
+ options.displayVersion();
+ disableGui.setInvoked(true);
+ }
+
if (initialStartup && helpO.isInvoked()) {
System.out.println("jabref [options] [bibtex-file]\n");
System.out.println(options.getHelp());
@@ -494,6 +509,37 @@ public class JabRef {
return loaded;
}
+ ParserResult importFiletypeUnknown(String fname) {
+ Object[] o =
+ Globals.importFormatReader.importUnknownFormat(fname
+ .replaceAll("~", System.getProperty("user.home")));
+ String formatName = (String) o[0];
+
+ if (formatName == null) {
+ System.err.println(Globals.lang("Error opening file") + " '" + fname + "'");
+ } else if (formatName.equals(ImportFormatReader.BIBTEX_FORMAT)) {
+ ParserResult pr = (ParserResult) o[1];
+ return pr;
+ } else {
+ List entries = (java.util.List) o[1];
+ if (entries != null)
+ System.out.println(Globals.lang("Format used") + ": "
+ + formatName);
+ else
+ System.out.println(Globals.lang(
+ "Could not find a suitable import format."));
+
+ if (entries != null) {
+ BibtexDatabase base = ImportFormatReader.createDatabase(entries);
+ ParserResult pr = new ParserResult(base, null, new HashMap());
+ return pr;
+ }
+ }
+
+ // not reached
+ return null;
+ }
+
public void openWindow(Vector loaded) {
if (!graphicFailure && !disableGui.isInvoked()) {
// Call the method performCompatibilityUpdate(), which does any
@@ -501,6 +547,9 @@ public class JabRef {
// Jabref version.
Util.performCompatibilityUpdate();
+ // Set up custom or default icon theme:
+ GUIGlobals.setUpIconTheme();
+
// This property is set to make the Mac OSX Java VM move the menu bar to
// the top
// of the screen, where Mac users expect it to be.
@@ -512,7 +561,7 @@ public class JabRef {
// If we are not on Mac, deal with font sizes and LookAndFeels:
if (!Globals.ON_MAC) {
int fontSizes = Globals.prefs.getInt("menuFontSize");
-
+ boolean overrideDefaultFonts = Globals.prefs.getBoolean("overrideDefaultFonts");
String defaultLookAndFeel;
if (Globals.ON_WIN)
@@ -549,20 +598,53 @@ public class JabRef {
lnf = (LookAndFeel) objLnf;
// Set font sizes if we are using a JGoodies look and feel.
- /*if ((lnf != null) && (lnf instanceof Plastic3DLookAndFeel)) {
- //MetalLookAndFeel.setCurrentTheme(new
- // com.jgoodies.plaf.plastic.theme.SkyBluer());
- Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
- //Plastic3DLookAndFeel.setFontPolicy();
- //Plastic3DLookAndFeel.setFontPolicy(FontPolicy.);
- //plLnf.setFontSizeHints(new FontSizeHints(fontSizes, fontSizes,
- // fontSizes, fontSizes));
- } else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
- //System.out.println("ttt");
- //ExtWindowsLookAndFeel plLnf = (ExtWindowsLookAndFeel) lnf;
- //plLnf.setFontSizeHints(new FontSizeHints(fontSizes, fontSizes,
- // fontSizes, fontSizes));
- } */
+ if ((lnf != null) && (lnf instanceof Plastic3DLookAndFeel)) {
+
+ //UIManager.put("jgoodies.popupDropShadowEnabled", Boolean.TRUE);
+ MetalLookAndFeel.setCurrentTheme(new
+ com.jgoodies.looks.plastic.theme.SkyBluer());
+
+ // Set a "model" icon size, so menu items are evenly spaced even though
+ // only some items have icons. We load an arbitrary icon and look at
+ // its size to determine what size to use:
+ int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
+ com.jgoodies.looks.Options.setDefaultIconSize
+ (new Dimension(defaultIconSize, defaultIconSize));
+
+
+ if (overrideDefaultFonts) {
+ FontSet fontSet = FontSets.createDefaultFontSet(
+ new Font("Tahoma", Font.PLAIN, fontSizes), // control font
+ new Font("Tahoma", Font.PLAIN, fontSizes), // menu font
+ new Font("Tahoma", Font.BOLD, fontSizes) // title font
+ );
+ FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
+ Plastic3DLookAndFeel.setFontPolicy(fixedPolicy);
+ }
+
+ //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
+ }
+ else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
+
+ // Set a "model" icon size, so menu items are evenly spaced even though
+ // only some items have icons. We load an arbitrary icon and look at
+ // its size to determine what size to use:
+ int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
+ com.jgoodies.looks.Options.setDefaultIconSize
+ (new Dimension(defaultIconSize, defaultIconSize));
+
+ if (overrideDefaultFonts) {
+ FontSet fontSet = FontSets.createDefaultFontSet(
+ new Font("Tahoma", Font.PLAIN, fontSizes), // control font
+ new Font("Tahoma", Font.PLAIN, fontSizes), // menu font
+ new Font("Tahoma", Font.BOLD, fontSizes) // title font
+ );
+ FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
+ WindowsLookAndFeel.setFontPolicy(fixedPolicy);
+ }
+
+ //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
+ }
if (lnf != null) {
try {
diff --git a/src/java/net/sf/jabref/JabRefFrame.java b/src/java/net/sf/jabref/JabRefFrame.java
index ba1678f..a9da5da 100644
--- a/src/java/net/sf/jabref/JabRefFrame.java
+++ b/src/java/net/sf/jabref/JabRefFrame.java
@@ -57,6 +57,7 @@ import java.lang.reflect.*;
import javax.swing.event.*;
import net.sf.jabref.wizard.integrity.gui.*;
import net.sf.jabref.groups.GroupSelector;
+import net.sf.jabref.groups.EntryTableTransferHandler;
import net.sf.jabref.journals.ManageJournalsAction;
import net.sf.jabref.external.*;
import com.jgoodies.uif_lite.component.UIFSplitPane;
@@ -95,19 +96,8 @@ public class JabRefFrame
}
ToolBar tlb = new ToolBar();
- JMenuBar mb = new JMenuBar();/* {
- public void paintComponent(Graphics g) {
- Graphics2D g2 = (Graphics2D)g;
- g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON);
- g2.setRenderingHint(RenderingHints.KEY_RENDERING,
- RenderingHints.VALUE_RENDER_QUALITY);
- super.paintComponent(g2);
-
- }
-
- };*/
- GridBagLayout gbl = new GridBagLayout();
+ JMenuBar mb = new JMenuBar();
+ GridBagLayout gbl = new GridBagLayout();
GridBagConstraints con = new GridBagConstraints();
JLabel statusLine = new JLabel("", SwingConstants.LEFT),
@@ -147,55 +137,49 @@ public class JabRefFrame
prefs.getKey("Help")),
contents = new HelpAction("Help contents", helpDiag,
GUIGlobals.helpContents, "Help contents",
- GUIGlobals.helpContentsIconFile),
+ GUIGlobals.getIconUrl("helpContents")),
/* old about*/
about = new HelpAction("About JabRef", helpDiag,
GUIGlobals.aboutPage, "About JabRef",
- GUIGlobals.aboutIcon),
+ GUIGlobals.getIconUrl("about")),
/**/
// about2 = new NewAboutAction(),
editEntry = new GeneralAction("edit", "Edit entry",
- "Edit entry", GUIGlobals.editIconFile,
+ "Edit entry",
prefs.getKey("Edit entry")),
save = new GeneralAction("save", "Save database",
- "Save database", GUIGlobals.saveIconFile,
+ "Save database",
prefs.getKey("Save database")),
saveAs = new GeneralAction("saveAs", "Save database as ...",
"Save database as ...",
- GUIGlobals.saveAsIconFile,
prefs.getKey("Save database as ...")),
saveSelectedAs = new GeneralAction("saveSelectedAs",
"Save selected as ...",
"Save selected as ...",
- GUIGlobals.saveAsIconFile),
+ GUIGlobals.getIconUrl("saveAs")),
nextTab = new ChangeTabAction(true),
prevTab = new ChangeTabAction(false),
sortTabs = new SortTabsAction(this),
undo = new GeneralAction("undo", "Undo", "Undo",
- GUIGlobals.undoIconFile,
prefs.getKey("Undo")),
redo = new GeneralAction("redo", "Redo", "Redo",
- GUIGlobals.redoIconFile,
prefs.getKey("Redo")),
/*cut = new GeneralAction("cut", "Cut", "Cut",
GUIGlobals.cutIconFile,
prefs.getKey("Cut")),*/
delete = new GeneralAction("delete", "Delete", "Delete",
- GUIGlobals.removeIconFile,
prefs.getKey("Delete")),
/*copy = new GeneralAction("copy", "Copy", "Copy",
GUIGlobals.copyIconFile,
prefs.getKey("Copy")),*/
- copy = new EditAction("copy", GUIGlobals.copyIconFile),
- paste = new EditAction("paste", GUIGlobals.pasteIconFile),
- cut = new EditAction("cut", GUIGlobals.cutIconFile),
+ copy = new EditAction("copy", GUIGlobals.getIconUrl("copy")),
+ paste = new EditAction("paste", GUIGlobals.getIconUrl("paste")),
+ cut = new EditAction("cut", GUIGlobals.getIconUrl("cut")),
mark = new GeneralAction("markEntries", "Mark entries",
"Mark entries",
- GUIGlobals.markIcon,
prefs.getKey("Mark entries")),
unmark = new GeneralAction("unmarkEntries", "Unmark entries",
"Unmark entries",
- GUIGlobals.unmarkIcon,
prefs.getKey("Unmark entries")),
unmarkAll = new GeneralAction("unmarkAll", "Unmark all"),
manageSelectors = new GeneralAction("manageSelectors", "Manage content selectors"),
@@ -203,14 +187,11 @@ public class JabRefFrame
loadSessionAction = new LoadSessionAction(),
incrementalSearch = new GeneralAction("incSearch", "Incremental search",
"Start incremental search",
- GUIGlobals.searchIconFile,
prefs.getKey("Incremental search")),
normalSearch = new GeneralAction("search", "Search", "Search",
- GUIGlobals.searchIconFile,
prefs.getKey("Search")),
- toggleSearch = new GeneralAction("toggleSearch", "Search", "Toggle search panel",
- GUIGlobals.searchIconFile),
- // prefs.getKey("Search")),
+ toggleSearch = new GeneralAction("toggleSearch", "Search", "Toggle search panel"),
+
fetchCiteSeer = new FetchCiteSeerAction(),
importCiteSeer = new ImportCiteSeerAction(),
fetchMedline = new FetchMedlineAction(),
@@ -224,7 +205,7 @@ public class JabRefFrame
mergeDatabaseAction = new GeneralAction("mergeDatabase",
"Append database",
"Append contents from a BibTeX database into the currently viewed database",
- GUIGlobals.openIconFile),
+ GUIGlobals.getIconUrl("open")),
//prefs.getKey("Open")),
/*remove = new GeneralAction("remove", "Remove", "Remove selected entries",
GUIGlobals.removeIconFile),*/
@@ -235,36 +216,31 @@ public class JabRefFrame
editPreamble = new GeneralAction("editPreamble", "Edit preamble",
"Edit preamble",
- GUIGlobals.preambleIconFile,
prefs.getKey("Edit preamble")),
editStrings = new GeneralAction("editStrings", "Edit strings",
"Edit strings",
- GUIGlobals.stringsIconFile,
prefs.getKey("Edit strings")),
toggleGroups = new GeneralAction("toggleGroups",
"Toggle groups interface",
"Toggle groups interface",
- GUIGlobals.groupsIconFile,
prefs.getKey("Toggle groups interface")),
togglePreview = new GeneralAction("togglePreview",
"Toggle entry preview",
"Toggle entry preview",
- GUIGlobals.previewIconFile,
prefs.getKey("Toggle entry preview")),
toggleHighlightAny = new GeneralAction("toggleHighlightGroupsMatchingAny",
"Highlight groups matching any selected entry",
"Highlight groups matching any selected entry",
- GUIGlobals.groupsHighlightMatchingAnyFile),
+ GUIGlobals.getIconUrl("groupsHighlightAny")),
toggleHighlightAll = new GeneralAction("toggleHighlightGroupsMatchingAll",
"Highlight groups matching all selected entries",
"Highlight groups matching all selected entries",
- GUIGlobals.groupsHighlightMatchingAllFile),
+ GUIGlobals.getIconUrl("groupsHighlightAll")),
switchPreview = new GeneralAction("switchPreview",
"Switch preview layout",
prefs.getKey("Switch preview layout")),
makeKeyAction = new GeneralAction("makeKey", "Autogenerate BibTeX keys",
"Autogenerate BibTeX keys",
- GUIGlobals.genKeyIconFile,
prefs.getKey("Autogenerate BibTeX keys")),
lyxPushAction = new PushToApplicationAction(ths, new PushToLyx()),
@@ -273,11 +249,9 @@ public class JabRefFrame
latexEditorPushAction = new PushToApplicationAction(ths, new PushToLatexEditor()),
openFile = new GeneralAction("openFile", "Open PDF or PS",
"Open PDF or PS",
- GUIGlobals.pdfIcon,
prefs.getKey("Open PDF or PS")),
openUrl = new GeneralAction("openUrl", "Open URL or DOI",
"Open URL or DOI",
- GUIGlobals.wwwIcon,
prefs.getKey("Open URL or DOI")),
dupliCheck = new GeneralAction("dupliCheck", "Find duplicates"),
strictDupliCheck = new GeneralAction("strictDupliCheck", "Find and remove exact duplicates"),
@@ -375,7 +349,7 @@ public class JabRefFrame
// glassPane.setVisible(true);
setTitle(GUIGlobals.frameTitle);
- setIconImage(new ImageIcon(GUIGlobals.jabreflogo).getImage());
+ setIconImage(GUIGlobals.getImage("jabrefIcon").getImage());
setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
@@ -664,6 +638,7 @@ public JabRefPreferences prefs() {
}
private void setupLayout() {
+ tabbedPane.putClientProperty(Options.NO_CONTENT_BORDER_KEY, Boolean.TRUE);
fillMenu();
createToolBar();
getContentPane().setLayout(gbl);
@@ -675,7 +650,7 @@ public JabRefPreferences prefs() {
con.weightx = 1;
con.weighty = 0;
con.gridwidth = GridBagConstraints.REMAINDER;
- mb.setMinimumSize(mb.getPreferredSize());
+
//gbl.setConstraints(mb, con);
//getContentPane().add(mb);
setJMenuBar(mb);
@@ -736,7 +711,12 @@ public JabRefPreferences prefs() {
getContentPane().add(status);
-
+ // Drag and drop for tabbedPane:
+ TransferHandler xfer = new EntryTableTransferHandler(null, this);
+ tabbedPane.setTransferHandler(xfer);
+ tlb.setTransferHandler(xfer);
+ mb.setTransferHandler(xfer);
+ sidePaneManager.getPanel().setTransferHandler(xfer);
}
private void initLabelMaker() {
@@ -816,37 +796,55 @@ public JabRefPreferences prefs() {
}
public GeneralAction(String command, String text,
- String description, URL icon,
+ String description, String imageName,
KeyStroke key) {
- super(new ImageIcon(icon));
+ super(GUIGlobals.getImage(imageName));
this.command = command;
putValue(NAME, text);
putValue(ACCELERATOR_KEY, key);
putValue(SHORT_DESCRIPTION, Globals.lang(description));
}
- public GeneralAction(String command, String text) {
- putValue(NAME, text);
- this.command = command;
- }
+ public GeneralAction(String command, String text) {
+ putValue(NAME, text);
+ this.command = command;
+ }
- public GeneralAction(String command, String text, KeyStroke key) {
- this.command = command;
- putValue(NAME, text);
- putValue(ACCELERATOR_KEY, key);
- }
+ public GeneralAction(String command, String text, KeyStroke key) {
+ this.command = command;
+ putValue(NAME, text);
+ putValue(ACCELERATOR_KEY, key);
+ }
- public GeneralAction(String command, String text, String description) {
- this.command = command;
- putValue(NAME, text);
- putValue(SHORT_DESCRIPTION, Globals.lang(description));
- }
- public GeneralAction(String command, String text, String description, KeyStroke key) {
+ public GeneralAction(String command, String text, String description) {
+ this.command = command;
+ ImageIcon icon = GUIGlobals.getImage(command);
+ if (icon != null)
+ putValue(SMALL_ICON, icon);
+ putValue(NAME, text);
+ putValue(SHORT_DESCRIPTION, Globals.lang(description));
+ }
+
+ public GeneralAction(String command, String text, String description, KeyStroke key) {
+ this.command = command;
+ ImageIcon icon = GUIGlobals.getImage(command);
+ if (icon != null)
+ putValue(SMALL_ICON, icon);
+ putValue(NAME, text);
+ putValue(SHORT_DESCRIPTION, Globals.lang(description));
+ putValue(ACCELERATOR_KEY, key);
+ }
+
+ /* public GeneralAction(String command, String text, String description,
+ URL imageUrl, KeyStroke key) {
this.command = command;
+ ImageIcon icon = GUIGlobals.getImage(command);
+ if (icon != null)
+ putValue(SMALL_ICON, icon);
putValue(NAME, text);
putValue(SHORT_DESCRIPTION, Globals.lang(description));
putValue(ACCELERATOR_KEY, key);
- }
+ }*/
public void actionPerformed(ActionEvent e) {
if (tabbedPane.getTabCount() > 0) {
@@ -899,7 +897,7 @@ public JabRefPreferences prefs() {
public NewEntryAction(KeyStroke key) {
// This action leads to a dialog asking for entry type.
- super(new ImageIcon(GUIGlobals.addIconFile));
+ super(GUIGlobals.getImage("add"));
putValue(NAME, "New entry");
putValue(ACCELERATOR_KEY, key);
putValue(SHORT_DESCRIPTION, Globals.lang("New BibTeX entry"));
@@ -1569,7 +1567,7 @@ public JabRefPreferences prefs() {
class CloseDatabaseAction
extends MnemonicAwareAction {
public CloseDatabaseAction() {
- super(new ImageIcon(GUIGlobals.closeIconFile));
+ super(GUIGlobals.getImage("close"));
putValue(NAME, "Close database");
putValue(SHORT_DESCRIPTION,
Globals.lang("Close the current database"));
@@ -1630,7 +1628,7 @@ public JabRefPreferences prefs() {
class NewDatabaseAction
extends MnemonicAwareAction {
public NewDatabaseAction() {
- super(new ImageIcon(GUIGlobals.newIconFile));
+ super(GUIGlobals.getImage("new"));
putValue(NAME, "New database");
putValue(SHORT_DESCRIPTION, Globals.lang("New BibTeX database"));
//putValue(MNEMONIC_KEY, GUIGlobals.newKeyCode);
@@ -1648,7 +1646,7 @@ class ImportCiteSeerAction
extends MnemonicAwareAction {
public ImportCiteSeerAction() {
- super(new ImageIcon(GUIGlobals.wwwCiteSeerIcon));
+ super(GUIGlobals.getImage("citeseer"));
putValue(NAME, "Import Fields from CiteSeer");
putValue(SHORT_DESCRIPTION, Globals.lang("Import Fields from CiteSeer Database"));
putValue(ACCELERATOR_KEY, prefs.getKey("Import Fields from CiteSeer")); // Key defined in MenuTitles!
@@ -1727,7 +1725,7 @@ class FetchCiteSeerAction
extends MnemonicAwareAction {
public FetchCiteSeerAction() {
- super(new ImageIcon(GUIGlobals.wwwCiteSeerIcon));
+ super(GUIGlobals.getImage("citeseer"));
putValue(NAME, "Fetch citations from CiteSeer");
putValue(SHORT_DESCRIPTION, Globals.lang("Fetch Articles Citing your Database"));
@@ -1801,7 +1799,7 @@ class FetchCiteSeerAction
{
public NewSubDatabaseAction()
{
- super(new ImageIcon( GUIGlobals.newBibFile));
+ super(GUIGlobals.getImage("new"));
putValue(NAME, "New subdatabase based on AUX file" );
putValue( SHORT_DESCRIPTION, Globals.lang( "New BibTeX subdatabase" ) ) ;
//putValue(MNEMONIC_KEY, GUIGlobals.newKeyCode);
@@ -1840,7 +1838,7 @@ class FetchCiteSeerAction
public IntegrityCheckAction()
{
super(Globals.menuTitle("Integrity check"),
- new ImageIcon( GUIGlobals.integrityCheck ) ) ;
+ GUIGlobals.getImage("integrityCheck")) ;
//putValue( SHORT_DESCRIPTION, "integrity" ) ; //Globals.lang( "integrity" ) ) ;
//putValue(MNEMONIC_KEY, GUIGlobals.newKeyCode);
}
@@ -1866,7 +1864,7 @@ class FetchCiteSeerAction
class FetchMedlineAction
extends MnemonicAwareAction {
public FetchMedlineAction() {
- super(new ImageIcon(GUIGlobals.fetchMedlineIcon));
+ super(GUIGlobals.getImage("medline"));
putValue(NAME, "Fetch Medline");
putValue(ACCELERATOR_KEY, prefs.getKey("Fetch Medline"));
putValue(SHORT_DESCRIPTION, Globals.lang("Fetch Medline by ID"));
@@ -1888,7 +1886,7 @@ class FetchCiteSeerAction
class CiteSeerPanelAction
extends MnemonicAwareAction {
public CiteSeerPanelAction() {
- super(new ImageIcon(GUIGlobals.fetchMedlineIcon));
+ super(GUIGlobals.getImage("medline"));
putValue(NAME, "Fetch CiteSeer");
//System.out.println(Globals.menuTitle("Fetch CiteSeer"));
putValue(ACCELERATOR_KEY, prefs.getKey("Fetch CiteSeer"));
@@ -1905,34 +1903,13 @@ class FetchCiteSeerAction
}
- /*class FetchAuthorMedlineAction
- extends AbstractAction {
- public FetchAuthorMedlineAction() {
- super(Globals.lang("Fetch Medline by author"),
- new ImageIcon(GUIGlobals.fetchMedlineIcon));
- putValue(SHORT_DESCRIPTION, Globals.lang("Fetch Medline by author"));
- }
-
- public void actionPerformed(ActionEvent e) {
- if (tabbedPane.getTabCount() > 0) {
- for (int i = 0; i < tabbedPane.getTabCount(); i++) {
- ( (BasePanel) tabbedPane.getComponentAt(i)).sidePaneManager.
- ensureVisible("fetchAuthorMedline");
- new FocusRequester(basePanel().medlineFetcher);
- }
- }
- }
-
- }*/
-
// The action for opening the preferences dialog.
-
AbstractAction showPrefs = new ShowPrefsAction();
class ShowPrefsAction
extends MnemonicAwareAction {
public ShowPrefsAction() {
- super(new ImageIcon(GUIGlobals.prefsIconFile));
+ super(GUIGlobals.getImage("preferences"));
putValue(NAME, "Preferences");
putValue(SHORT_DESCRIPTION, Globals.lang("Preferences"));
}
@@ -2306,7 +2283,7 @@ class FetchCiteSeerAction
class SaveSessionAction
extends MnemonicAwareAction {
public SaveSessionAction() {
- super(new ImageIcon(GUIGlobals.saveIconFile));
+ super(GUIGlobals.getImage("save"));
putValue(NAME, "Save session");
putValue(ACCELERATOR_KEY, prefs.getKey("Save session"));
}
@@ -2415,7 +2392,7 @@ class SaveSessionAction
extends MnemonicAwareAction {
boolean running = false;
public LoadSessionAction() {
- super(new ImageIcon(GUIGlobals.openIconFile));
+ super(GUIGlobals.getImage("loadSession"));
putValue(NAME, "Load session");
putValue(ACCELERATOR_KEY, prefs.getKey("Load session"));
}
diff --git a/src/java/net/sf/jabref/JabRefPreferences.java b/src/java/net/sf/jabref/JabRefPreferences.java
index 6e5199a..1a6d56f 100644
--- a/src/java/net/sf/jabref/JabRefPreferences.java
+++ b/src/java/net/sf/jabref/JabRefPreferences.java
@@ -193,6 +193,9 @@ public class JabRefPreferences {
defaults.put("generalFields", "crossref;keywords;doi;url;urldate;citeseerurl;"+
"pdf;comment;owner");
+ defaults.put("useCustomIconTheme", Boolean.FALSE);
+ defaults.put("customIconThemeFile", "/home/alver/div/crystaltheme_16/Icons.properties");
+
// Entry editor tab 0:
defaults.put(CUSTOM_TAB_NAME+"_def0", Globals.lang("General"));
defaults.put(CUSTOM_TAB_FIELDS+"_def0", "crossref;keywords;doi;url;citeseerurl;"+
@@ -211,6 +214,7 @@ public class JabRefPreferences {
defaults.put("fontFamily", "Times");
defaults.put("fontStyle", new Integer(java.awt.Font.PLAIN));
defaults.put("fontSize", new Integer(12));
+ defaults.put("overrideDefaultFonts", Boolean.FALSE);
defaults.put("menuFontFamily", "Times");
defaults.put("menuFontStyle", new Integer(java.awt.Font.PLAIN));
defaults.put("menuFontSize", new Integer(11));
@@ -299,6 +303,8 @@ public class JabRefPreferences {
defaults.put("externalJournalLists", null);
defaults.put("citeCommand", "cite");
defaults.put("floatMarkedEntries", Boolean.TRUE);
+
+ defaults.put("useNativeFileDialogOnMac", Boolean.TRUE);
//defaults.put("tempDir", System.getProperty("java.io.tmpdir"));
//Util.pr(System.getProperty("java.io.tempdir"));
diff --git a/src/java/net/sf/jabref/PreambleEditor.java b/src/java/net/sf/jabref/PreambleEditor.java
index 807f101..ac2e899 100644
--- a/src/java/net/sf/jabref/PreambleEditor.java
+++ b/src/java/net/sf/jabref/PreambleEditor.java
@@ -180,7 +180,7 @@ public class PreambleEditor extends JDialog {
UndoAction undoAction = new UndoAction();
class UndoAction extends AbstractAction {
public UndoAction() {
- super("Undo", new ImageIcon(GUIGlobals.undoIconFile));
+ super("Undo", GUIGlobals.getImage("undo"));
putValue(SHORT_DESCRIPTION, "Undo");
}
public void actionPerformed(ActionEvent e) {
@@ -193,7 +193,7 @@ public class PreambleEditor extends JDialog {
RedoAction redoAction = new RedoAction();
class RedoAction extends AbstractAction {
public RedoAction() {
- super("Undo", new ImageIcon(GUIGlobals.redoIconFile));
+ super("Undo", GUIGlobals.getImage("redo"));
putValue(SHORT_DESCRIPTION, "Redo");
}
public void actionPerformed(ActionEvent e) {
diff --git a/src/java/net/sf/jabref/PrefsDialog3.java b/src/java/net/sf/jabref/PrefsDialog3.java
index 785586d..ff20ac5 100644
--- a/src/java/net/sf/jabref/PrefsDialog3.java
+++ b/src/java/net/sf/jabref/PrefsDialog3.java
@@ -37,6 +37,7 @@ import javax.swing.event.*;
import net.sf.jabref.groups.GroupsPrefsTab;
import net.sf.jabref.gui.MainTable;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
/**
* Preferences dialog. Contains a TabbedPane, and tabs will be defined
@@ -99,15 +100,13 @@ public class PrefsDialog3 extends JDialog {
al.add(KEY);
//al.add(JOU);
al.add(PRE);
-
+ al.add(ADV);
main.setLayout(cardLayout);
main.add(new GeneralTab(frame, _prefs), GEN);
- if (!Globals.ON_MAC) {
- al.add(ADV);
- main.add(new AdvancedTab(_prefs, parent.helpDiag), ADV);
- }
+ main.add(new AdvancedTab(_prefs, parent.helpDiag), ADV);
+
@@ -153,20 +152,21 @@ public class PrefsDialog3 extends JDialog {
upper.add(two, BorderLayout.WEST);
upper.add(main, BorderLayout.CENTER);
- // Add all panels to main panel:
- //for (Iterator i=panels.entrySet().iterator(); i.hasNext();) {
-
-
- //}
-
+
JButton
ok = new JButton(Globals.lang("Ok")),
cancel = new JButton(Globals.lang("Cancel"));
ok.addActionListener(new OkAction());
CancelAction cancelAction = new CancelAction();
cancel.addActionListener(cancelAction);
- lower.add(ok);
- lower.add(cancel);
+ lower.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+ ButtonBarBuilder bb = new ButtonBarBuilder(lower);
+ bb.addGlue();
+ bb.addGridded(ok);
+ bb.addGridded(cancel);
+ bb.addGlue();
+ //lower.add(ok);
+ //lower.add(cancel);
// Key bindings:
ActionMap am = chooser.getActionMap();
diff --git a/src/java/net/sf/jabref/RightClickMenu.java b/src/java/net/sf/jabref/RightClickMenu.java
index fdfcced..fe8c9ec 100644
--- a/src/java/net/sf/jabref/RightClickMenu.java
+++ b/src/java/net/sf/jabref/RightClickMenu.java
@@ -64,21 +64,21 @@ public class RightClickMenu extends JPopupMenu
addPopupMenuListener(this);
- add(new AbstractAction(Globals.lang("Copy"), new ImageIcon(GUIGlobals.copyIconFile)) {
+ add(new AbstractAction(Globals.lang("Copy"), GUIGlobals.getImage("copy")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("copy");
} catch (Throwable ex) {}
}
});
- add(new AbstractAction(Globals.lang("Paste"), new ImageIcon(GUIGlobals.pasteIconFile)) {
+ add(new AbstractAction(Globals.lang("Paste"), GUIGlobals.getImage("paste")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("paste");
} catch (Throwable ex) {}
}
});
- add(new AbstractAction(Globals.lang("Cut"), new ImageIcon(GUIGlobals.cutIconFile)) {
+ add(new AbstractAction(Globals.lang("Cut"), GUIGlobals.getImage("cut")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("cut");
@@ -86,7 +86,7 @@ public class RightClickMenu extends JPopupMenu
}
});
- add(new AbstractAction(Globals.lang("Delete"), new ImageIcon(GUIGlobals.removeIconFile)) {
+ add(new AbstractAction(Globals.lang("Delete"), GUIGlobals.getImage("delete")) {
public void actionPerformed(ActionEvent e) {
/*SwingUtilities.invokeLater(new Runnable () {
public void run() {*/
@@ -110,14 +110,14 @@ public class RightClickMenu extends JPopupMenu
addSeparator();
if (multiple) {
- add(new AbstractAction(Globals.lang("Mark entries"), new ImageIcon(GUIGlobals.markIcon)) {
+ add(new AbstractAction(Globals.lang("Mark entries"), GUIGlobals.getImage("markEntries")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("markEntries");
} catch (Throwable ex) {}
}
});
- add(new AbstractAction(Globals.lang("Unmark entries"), new ImageIcon(GUIGlobals.unmarkIcon)) {
+ add(new AbstractAction(Globals.lang("Unmark entries"), GUIGlobals.getImage("unmarkEntries")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("unmarkEntries");
@@ -127,7 +127,7 @@ public class RightClickMenu extends JPopupMenu
addSeparator();
} else if (be != null) {
if (be.getField(BibtexFields.MARKED) == null)
- add(new AbstractAction(Globals.lang("Mark entry"), new ImageIcon(GUIGlobals.markIcon)) {
+ add(new AbstractAction(Globals.lang("Mark entry"), GUIGlobals.getImage("markEntries")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("markEntries");
@@ -135,7 +135,7 @@ public class RightClickMenu extends JPopupMenu
}
});
else
- add(new AbstractAction(Globals.lang("Unmark entry"), new ImageIcon(GUIGlobals.unmarkIcon)) {
+ add(new AbstractAction(Globals.lang("Unmark entry"), GUIGlobals.getImage("unmarkEntries")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("unmarkEntries");
@@ -145,7 +145,7 @@ public class RightClickMenu extends JPopupMenu
addSeparator();
}
- add(new AbstractAction(Globals.lang("Open PDF or PS"), new ImageIcon(GUIGlobals.pdfIcon)) {
+ add(new AbstractAction(Globals.lang("Open PDF or PS"), GUIGlobals.getImage("openFile")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("openFile");
@@ -153,7 +153,7 @@ public class RightClickMenu extends JPopupMenu
}
});
- add(new AbstractAction(Globals.lang("Open URL or DOI"), new ImageIcon(GUIGlobals.wwwIcon)) {
+ add(new AbstractAction(Globals.lang("Open URL or DOI"), GUIGlobals.getImage("www")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("openUrl");
@@ -161,7 +161,7 @@ public class RightClickMenu extends JPopupMenu
}
});
- add(new AbstractAction(Globals.lang("Copy BibTeX key"), new ImageIcon(GUIGlobals.copyKeyIconFile)) {
+ add(new AbstractAction(Globals.lang("Copy BibTeX key")) {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("copyKey");
@@ -169,7 +169,7 @@ public class RightClickMenu extends JPopupMenu
}
});
- add(new AbstractAction(Globals.lang("Copy")+" \\cite{"+Globals.lang("BibTeX key")+"}", new ImageIcon(GUIGlobals.copyKeyIconFile)) {
+ add(new AbstractAction(Globals.lang("Copy")+" \\cite{"+Globals.lang("BibTeX key")+"}") {
public void actionPerformed(ActionEvent e) {
try {
panel.runCommand("copyCiteKey");
@@ -299,13 +299,13 @@ public class RightClickMenu extends JPopupMenu
if (Globals.prefs.getBoolean("groupShowIcons")) {
switch (group.getHierarchicalContext()) {
case AbstractGroup.INCLUDING:
- menuItem.setIcon(GUIGlobals.groupIncludingIcon);
+ menuItem.setIcon(GUIGlobals.getImage("groupIncluding"));
break;
case AbstractGroup.REFINING:
- menuItem.setIcon(GUIGlobals.groupRefiningIcon);
+ menuItem.setIcon(GUIGlobals.getImage("groupRefining"));
break;
default:
- menuItem.setIcon(GUIGlobals.groupRegularIcon);
+ menuItem.setIcon(GUIGlobals.getImage("groupRegular"));
break;
}
}
diff --git a/src/java/net/sf/jabref/SearchManager2.java b/src/java/net/sf/jabref/SearchManager2.java
index d2a23ef..f7c936d 100644
--- a/src/java/net/sf/jabref/SearchManager2.java
+++ b/src/java/net/sf/jabref/SearchManager2.java
@@ -54,11 +54,11 @@ class SearchManager2 extends SidePaneComponent
//private JabRefFrame frame;
private JTextField searchField = new JTextField("", 12);
private JLabel lab = //new JLabel(Globals.lang("Search")+":");
- new JLabel(new ImageIcon(GUIGlobals.searchIconFile));
+ new JLabel(GUIGlobals.getImage("search"));
private JPopupMenu settings = new JPopupMenu();
private JButton openset = new JButton(Globals.lang("Settings"));
private JButton escape = new JButton(Globals.lang("Clear"));
- private JButton help = new JButton(new ImageIcon(GUIGlobals.helpIconFile));
+ private JButton help = new JButton(GUIGlobals.getImage("help"));
/** This button's text will be set later. */
private JButton search = new JButton();
private JCheckBoxMenuItem searchReq, searchOpt, searchGen,
@@ -75,7 +75,7 @@ class SearchManager2 extends SidePaneComponent
public SearchManager2(JabRefFrame frame, SidePaneManager manager) {
- super(manager, GUIGlobals.searchIconFile, Globals.lang("Search"));
+ super(manager, GUIGlobals.getIconUrl("search"), Globals.lang("Search"));
this.frame = frame;
incSearcher = new IncrementalSearcher(Globals.prefs);
@@ -198,7 +198,8 @@ settings.add(select);
//search.setMargin(margin);
escape.setMargin(margin);
openset.setMargin(margin);
- Dimension butDim = new Dimension(20, 20);
+ int butSize = help.getIcon().getIconHeight() + 5;
+ Dimension butDim = new Dimension(butSize, butSize);
help.setPreferredSize(butDim);
help.setMinimumSize(butDim);
help.setMargin(margin);
diff --git a/src/java/net/sf/jabref/SidePaneComponent.java b/src/java/net/sf/jabref/SidePaneComponent.java
index 2c29ef4..37254d7 100644
--- a/src/java/net/sf/jabref/SidePaneComponent.java
+++ b/src/java/net/sf/jabref/SidePaneComponent.java
@@ -35,7 +35,7 @@ import java.net.URL;
public class SidePaneComponent extends SimpleInternalFrame {
- protected JButton close = new JButton(new ImageIcon(GUIGlobals.closeIconFile));
+ protected JButton close = new JButton(GUIGlobals.getImage("close"));
protected boolean visible = false;
protected SidePaneManager manager;
protected BasePanel panel = null;
diff --git a/src/java/net/sf/jabref/SidePaneHeader.java b/src/java/net/sf/jabref/SidePaneHeader.java
index b71d8a2..fc6776d 100644
--- a/src/java/net/sf/jabref/SidePaneHeader.java
+++ b/src/java/net/sf/jabref/SidePaneHeader.java
@@ -34,7 +34,7 @@ import java.net.URL;
public class SidePaneHeader extends JPanel implements ActionListener {
- private JButton close = new JButton(new ImageIcon(GUIGlobals.close2IconFile));
+ private JButton close = new JButton(GUIGlobals.getImage("close2"));
private JLabel nameLabel, imageIcon;
private SidePaneComponent parent;
private GridBagLayout gbl = new GridBagLayout();
diff --git a/src/java/net/sf/jabref/SplashScreen.java b/src/java/net/sf/jabref/SplashScreen.java
index 4f5b6da..46f06a8 100644
--- a/src/java/net/sf/jabref/SplashScreen.java
+++ b/src/java/net/sf/jabref/SplashScreen.java
@@ -20,7 +20,7 @@ public class SplashScreen extends Window {
public SplashScreen(Frame owner) {
super(owner);
- URL imageURL = SplashScreen.class.getResource("/images/splash-2.1beta.png");
+ URL imageURL = SplashScreen.class.getResource("/images/splash-2.1.png");
splashImage = Toolkit.getDefaultToolkit().createImage(imageURL);
// Load the image
diff --git a/src/java/net/sf/jabref/SplashScreen.java b/src/java/net/sf/jabref/SplashScreen.java~
similarity index 100%
copy from src/java/net/sf/jabref/SplashScreen.java
copy to src/java/net/sf/jabref/SplashScreen.java~
diff --git a/src/java/net/sf/jabref/StringDialog.java b/src/java/net/sf/jabref/StringDialog.java
index 20fd942..826db14 100644
--- a/src/java/net/sf/jabref/StringDialog.java
+++ b/src/java/net/sf/jabref/StringDialog.java
@@ -333,7 +333,7 @@ public class StringDialog extends JDialog {
StringDialog parent;
public NewStringAction(StringDialog parent) {
super("New string",
- new ImageIcon(GUIGlobals.addIconFile));
+ GUIGlobals.getImage("add"));
putValue(SHORT_DESCRIPTION, Globals.lang("New string"));
this.parent = parent;
}
@@ -395,7 +395,7 @@ public class StringDialog extends JDialog {
StringDialog parent;
public StoreContentAction(StringDialog parent) {
super("Store string",
- new ImageIcon(GUIGlobals.addIconFile));
+ GUIGlobals.getImage("add"));
putValue(SHORT_DESCRIPTION, Globals.lang("Store string"));
this.parent = parent;
}
@@ -408,7 +408,7 @@ public class StringDialog extends JDialog {
StringDialog parent;
public RemoveStringAction(StringDialog parent) {
super("Remove selected strings",
- new ImageIcon(GUIGlobals.removeIconFile));
+ GUIGlobals.getImage("remove"));
putValue(SHORT_DESCRIPTION, Globals.lang("Remove selected strings"));
this.parent = parent;
}
@@ -523,7 +523,7 @@ public class StringDialog extends JDialog {
UndoAction undoAction = new UndoAction();
class UndoAction extends AbstractAction {
public UndoAction() {
- super("Undo", new ImageIcon(GUIGlobals.undoIconFile));
+ super("Undo", GUIGlobals.getImage("undo"));
putValue(SHORT_DESCRIPTION, Globals.lang("Undo"));
}
public void actionPerformed(ActionEvent e) {
@@ -536,7 +536,7 @@ public class StringDialog extends JDialog {
RedoAction redoAction = new RedoAction();
class RedoAction extends AbstractAction {
public RedoAction() {
- super("Undo", new ImageIcon(GUIGlobals.redoIconFile));
+ super("Undo", GUIGlobals.getImage("redo"));
putValue(SHORT_DESCRIPTION, Globals.lang("Redo"));
}
public void actionPerformed(ActionEvent e) {
diff --git a/src/java/net/sf/jabref/TabLabelPattern.java b/src/java/net/sf/jabref/TabLabelPattern.java
index 4c1d588..2a2bb5d 100644
--- a/src/java/net/sf/jabref/TabLabelPattern.java
+++ b/src/java/net/sf/jabref/TabLabelPattern.java
@@ -238,7 +238,7 @@ public class TabLabelPattern extends JPanel implements PrefsTab{
con.weighty = 0;
con.anchor = GridBagConstraints.SOUTHEAST;
con.insets = new Insets( 0,5,0,5 );
- JButton hlb = new JButton(new ImageIcon(GUIGlobals.helpSmallIconFile));
+ JButton hlb = new JButton(GUIGlobals.getImage("helpSmall"));
hlb.setToolTipText(Globals.lang("Help on key patterns"));
gbl.setConstraints( hlb, con );
add(hlb);
diff --git a/src/java/net/sf/jabref/TableColumnsTab.java b/src/java/net/sf/jabref/TableColumnsTab.java
index 007737b..7cb8951 100644
--- a/src/java/net/sf/jabref/TableColumnsTab.java
+++ b/src/java/net/sf/jabref/TableColumnsTab.java
@@ -176,7 +176,7 @@ class TableColumnsTab extends JPanel implements PrefsTab {
class DeleteRowAction extends AbstractAction {
public DeleteRowAction() {
- super("Delete row", new ImageIcon(GUIGlobals.delRowIconFile));
+ super("Delete row", GUIGlobals.getImage("remove"));
putValue(SHORT_DESCRIPTION, Globals.lang("Delete rows"));
}
public void actionPerformed(ActionEvent e) {
@@ -200,7 +200,7 @@ class TableColumnsTab extends JPanel implements PrefsTab {
class AddRowAction extends AbstractAction {
public AddRowAction() {
- super("Add row", new ImageIcon(GUIGlobals.addIconFile));
+ super("Add row", GUIGlobals.getImage("add"));
putValue(SHORT_DESCRIPTION, Globals.lang("Insert rows"));
}
public void actionPerformed(ActionEvent e) {
@@ -227,7 +227,7 @@ class TableColumnsTab extends JPanel implements PrefsTab {
class UpdateWidthsAction extends AbstractAction {
public UpdateWidthsAction() {
//super(Globals.lang("Update to current column widths"));
- super(Globals.lang("Update to current column widths"), new ImageIcon(GUIGlobals.sheetIcon));
+ super(Globals.lang("Update to current column widths"));
//putValue(SHORT_DESCRIPTION, Globals.lang("Update to current column widths"));
}
public void actionPerformed(ActionEvent e) {
diff --git a/src/java/net/sf/jabref/about/NewAboutAction.java b/src/java/net/sf/jabref/about/NewAboutAction.java
index c57d4b5..0f358ca 100644
--- a/src/java/net/sf/jabref/about/NewAboutAction.java
+++ b/src/java/net/sf/jabref/about/NewAboutAction.java
@@ -54,7 +54,7 @@ public class NewAboutAction
public NewAboutAction()
{
// This action leads to a dialog asking for entry type.
- super( new ImageIcon( GUIGlobals.helpIconFile ) ) ;
+ super(GUIGlobals.getImage("about")) ;
putValue( NAME, "About JabRef" ) ;
// putValue( ACCELERATOR_KEY, key ) ;
putValue( SHORT_DESCRIPTION, Globals.lang( "About JabRef" ) ) ;
diff --git a/src/java/net/sf/jabref/collab/FileUpdatePanel.java b/src/java/net/sf/jabref/collab/FileUpdatePanel.java
index e35d384..6fd4c0d 100644
--- a/src/java/net/sf/jabref/collab/FileUpdatePanel.java
+++ b/src/java/net/sf/jabref/collab/FileUpdatePanel.java
@@ -19,7 +19,7 @@ public class FileUpdatePanel extends SidePaneComponent implements ActionListener
public FileUpdatePanel(JabRefFrame frame, BasePanel panel,
SidePaneManager manager, File file, ChangeScanner scanner) {
- super(manager, GUIGlobals.saveIconFile, Globals.lang("File changed"));
+ super(manager, GUIGlobals.getIconUrl("save"), Globals.lang("File changed"));
this.panel = panel;
this.frame = frame;
this.manager = manager;
diff --git a/src/java/net/sf/jabref/export/CustomExportDialog.java b/src/java/net/sf/jabref/export/CustomExportDialog.java
index badec9f..add2336 100644
--- a/src/java/net/sf/jabref/export/CustomExportDialog.java
+++ b/src/java/net/sf/jabref/export/CustomExportDialog.java
@@ -34,6 +34,8 @@ import java.io.File;
import net.sf.jabref.JabRefFrame;
import net.sf.jabref.Util;
import net.sf.jabref.Globals;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
+import com.jgoodies.forms.layout.Sizes;
/**
* Dialog for creating or modifying custom exports.
@@ -54,7 +56,7 @@ class CustomExportDialog extends JDialog {
browse = new JButton(Globals.lang("Browse"));
JPanel
main = new JPanel(),
- opt = new JPanel();
+ buttons = new JPanel();
private boolean ok_pressed = false;
private Vector groups;
private int index;
@@ -158,7 +160,6 @@ class CustomExportDialog extends JDialog {
// Layout starts here.
main.setLayout(gbl);
- //opt.setLayout(gbl);
main.setBorder(BorderFactory.createTitledBorder
(BorderFactory.createEtchedBorder(),
Globals.lang("Export properties")));
@@ -203,22 +204,15 @@ class CustomExportDialog extends JDialog {
gbl.setConstraints(extension, con);
main.add(extension);
- // Option buttons:
- con.gridx = GridBagConstraints.RELATIVE;
- con.gridy = GridBagConstraints.RELATIVE;
- con.weightx = 1;
- con.gridwidth = 1;
- con.anchor = GridBagConstraints.EAST;
- con.fill = GridBagConstraints.NONE;
- //gbl.setConstraints(ok, con);
- opt.add(ok);
- con.anchor = GridBagConstraints.WEST;
- con.gridwidth = GridBagConstraints.REMAINDER;
- //gbl.setConstraints(cancel, con);
- opt.add(cancel);
-
+ ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
+ buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+ bb.addGlue();
+ bb.addGridded(ok);
+ bb.addGridded(cancel);
+ bb.addGlue();
+
getContentPane().add(main, BorderLayout.CENTER);
- getContentPane().add(opt, BorderLayout.SOUTH);
+ getContentPane().add(buttons, BorderLayout.SOUTH);
//pack();
setSize(600, 170);
diff --git a/src/java/net/sf/jabref/export/ExportCustomizationDialog.java b/src/java/net/sf/jabref/export/ExportCustomizationDialog.java
index 3cc2aea..a8ed403 100644
--- a/src/java/net/sf/jabref/export/ExportCustomizationDialog.java
+++ b/src/java/net/sf/jabref/export/ExportCustomizationDialog.java
@@ -9,6 +9,9 @@ import java.awt.event.ActionEvent;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableColumnModel;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
+import com.jgoodies.forms.layout.Sizes;
+
/**
* <p>Title: </p>
* <p>Description: </p>
@@ -27,7 +30,7 @@ public class ExportCustomizationDialog extends JDialog {
close = new JButton(Globals.lang("Close")),
help = new JButton(Globals.lang("Help"));
- JPanel options = new JPanel(),
+ JPanel buttons = new JPanel(),
main = new JPanel();
JTable table;
@@ -115,15 +118,19 @@ public class ExportCustomizationDialog extends JDialog {
//am.put("close", closeAction);
main.setLayout(new BorderLayout());
main.add(sp, BorderLayout.CENTER);
- options.add(addExport);
- options.add(modify);
- options.add(remove);
- options.add(close);
- options.add(Box.createHorizontalStrut(5));
- options.add(help);
+ ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
+ buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+ bb.addGlue();
+ bb.addGridded(addExport);
+ bb.addGridded(modify);
+ bb.addGridded(remove);
+ bb.addGridded(close);
+ bb.addUnrelatedGap();
+ bb.addGridded(help);
+ bb.addGlue();
getContentPane().add(main, BorderLayout.CENTER);
- getContentPane().add(options, BorderLayout.SOUTH);
+ getContentPane().add(buttons, BorderLayout.SOUTH);
pack();
Util.placeDialog(this, frame);
new FocusRequester(table);
diff --git a/src/java/net/sf/jabref/export/SaveSession.java b/src/java/net/sf/jabref/export/SaveSession.java
index d91a10c..516f4f1 100644
--- a/src/java/net/sf/jabref/export/SaveSession.java
+++ b/src/java/net/sf/jabref/export/SaveSession.java
@@ -47,6 +47,8 @@ public class SaveSession {
}
public void commit() throws SaveException {
+ if (file == null)
+ return;
if (file.exists() && backup) {
String name = file.getName();
String path = file.getParent();
diff --git a/src/java/net/sf/jabref/export/layout/format/AuthorAbbreviator.java b/src/java/net/sf/jabref/export/layout/format/AuthorAbbreviator.java
index bedf0f3..b77957b 100644
--- a/src/java/net/sf/jabref/export/layout/format/AuthorAbbreviator.java
+++ b/src/java/net/sf/jabref/export/layout/format/AuthorAbbreviator.java
@@ -23,11 +23,16 @@ public class AuthorAbbreviator implements LayoutFormatter {
public String format(String fieldText)
{
- String[] authors = fieldText.split(" and ");
+ // It seems to me that this formatter and AuthorLastFirstAbbreviator
+ // are duplicates. Since the latter was patched to improve handling of
+ // some names, we refer the operation there:
+ return (new AuthorLastFirstAbbreviator()).format(fieldText);
+
+ /*String[] authors = fieldText.split(" and ");
String abbrev = getAbbreviations(authors);
return abbrev;
-
+ */
}
/**
@@ -35,8 +40,7 @@ public class AuthorAbbreviator implements LayoutFormatter {
*
* @param authors List of authors or editors.
* @return the names abbreviated.
- * @throws RequiredOrderException
- *
+ *
*/
private String getAbbreviations(String[] authors)
{
diff --git a/src/java/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviator.java b/src/java/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviator.java
index 9212691..32d3256 100644
--- a/src/java/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviator.java
+++ b/src/java/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviator.java
@@ -1,150 +1,123 @@
-/*
- * Created on 12/10/2004
- */
package net.sf.jabref.export.layout.format;
import net.sf.jabref.export.layout.LayoutFormatter;
/**
- *
- * Uses as input the fields (author or editor) in the LastFirst format.
+ * Uses as input the fields (author or editor) in the LastFirst format.
*
* This formater enables to abbreviate the authors name in the following way:
*
- * Ex: Someone, Van Something will be abbreviated as Someone, V. S.
+ * Ex: Someone, Van Something will be abbreviated as Someone, V.S.
*
* @author Carlos Silla
+ * @author Christopher Oezbek <oezi at oezi.de>
+ *
+ * @version 1.0 Created on 12/10/2004
+ * @version 1.1 Fixed bug
+ * http://sourceforge.net/tracker/index.php?func=detail&aid=1466924&group_id=92314&atid=600306
*/
public class AuthorLastFirstAbbreviator implements LayoutFormatter {
- /* (non-Javadoc)
+ /**
* @see net.sf.jabref.export.layout.LayoutFormatter#format(java.lang.String)
*/
- public String format(String fieldText)
- {
-
- String[] authors = fieldText.split(" and ");
-
- String abbrev = getAbbreviations(authors);
- return (abbrev==null ? "" : abbrev);
-
+ public String format(String fieldText) {
+ try {
+ return getAbbreviations(fieldText.split(" and "));
+ } catch(Exception e){
+ return fieldText;
+ //return "Author names must be formatted \"Last, First\" or \"Last, Jr., First\" before formatting with AuthorLastFirstAbbreviator";
+ }
}
-
+
/**
- * Abbreviates the names in the Last First format.
- *
- * @param authors List of authors or editors.
- * @return the names abbreviated.
- * @throws RequiredOrderException
+ * Abbreviates the names in the Last, First or Last, Jr, First format.
*
+ * @param authors
+ * List of authors.
+ * @return The abbreviated names.
*/
- private String getAbbreviations(String[] authors)
- {
- String s = null;
-
- try
- {
- verifyProperFormat(authors);
-
- String[] authors_abrv = new String[authors.length];
-
- int i = 0;
-
- for(i=0; i<authors.length; i++)
- {
- authors_abrv[i] = getAbbreviation(authors[i]);
- }
-
- //Faz o merge em um "unico string" usando " and "
- StringBuffer sb = new StringBuffer();
+ private String getAbbreviations(String[] authors) {
+ if (authors.length == 0)
+ return "";
- for(i=0; i<authors.length-1; i++)
- {
- sb.append(authors_abrv[i]).append(" and ");
- }
- sb.append(authors_abrv[i]);
+ /*if (!isProperFormat(authors)) {
+ return "Author names must be formatted \"Last, First\" or \"Last, Jr., First\" before formatting with AuthorLastFirstAbbreviator";
+ }*/
- s = new String(sb);
+ for (int i = 0; i < authors.length; i++) {
+ authors[i] = getAbbreviation(authors[i]);
}
- catch(Exception e)
- {
- e.printStackTrace();
- // System.out.println(e);
- //System.exit(-1);
+
+ StringBuffer sb = new StringBuffer();
+
+ for (int i = 0; i < authors.length - 1; i++) {
+ sb.append(authors[i]).append(" and ");
}
-
- return s;
+ sb.append(authors[authors.length - 1]);
+
+ return sb.toString();
}
/**
- * Method that verifies if the author names are in the Last First format.
+ * Method that verifies if the author names are in the Last, First or Last,
+ * Jr, First format.
+ *
+ * If the name contains a space, but does not have the comma it is not in
+ * the appropriate format.
*
- * @param authors List of author or editor names.
- * @throws Exception
+ * @param authors
+ * List of authors to verify
*/
- private void verifyProperFormat(String[] authors) throws Exception
- {
- int i = 0;
-
- for(i=0; i<authors.length; i++)
- {
- //If the name contains a space, but does not have the comma it is not in the
- // appropriate format.
- if((authors[i].indexOf(' ') >= 0) && (authors[i].lastIndexOf(',')==-1))
- {
- System.out.println(": '"+authors[i]+"'");
- Exception e = new Exception("Error: names must be rearranged in Last, First format before formatted with AuthorLastFirstAbbreviator");
- e.printStackTrace();
- throw e;
+ private boolean isProperFormat(String[] authors) {
+ for (int i = 0; i < authors.length; i++) {
+ if ((authors[i].indexOf(' ') >= 0)
+ && (authors[i].indexOf(',') == -1)) {
+ return false;
}
+
}
+ return true;
}
/**
+ * Abbreviates all first names of the author.
*
- * Abbreviates all but the last name of the author.
- *
- * @param string
+ * @param author
* @return
*/
- private String getAbbreviation(String string) {
- String[] author = string.split(", ");
-
- // If there is no comma in the name, we return it as it is:
- if (author.length < 2)
- return string;
-
- char c;
- String s;
- //Gets the name:
- StringBuffer sb = new StringBuffer(author[0] + ", ");
-
- int index = author[1].indexOf(" ");
-
- if(index==-1) {
- //Its a simple name like van Something, Someone or Something, Someone:
- c = author[1].charAt(0);
-// System.out.println("Char c: " + c + " Name: " + author[1]);
- sb.append(c).append(".");
+ private String getAbbreviation(String author) {
+
+ String[] parts = author.split(",");
+
+ String last, first;
+
+ switch (parts.length) {
+ case 1:
+ // If there is no comma in the name, we return it as it is
+ return author;
+ case 2:
+ last = parts[0].trim();
+ first = parts[1].trim();
+ break;
+ case 3:
+ last = parts[0].trim();
+ // jr = author[1];
+ first = parts[2].trim();
+ break;
+ default:
+ throw new IllegalArgumentException("Authorname contained 3 or more commas");
}
- else {
- //Its a "complex" name like van Something, Someone Something
- String[] nameParts = author[1].split(" ");
-
- int i = 0;
-
- for(i=0;i<nameParts.length;i++)
- {
- c = nameParts[i].charAt(0);
- // System.out.println("Char c: " + c + " Name: " + nameParts[i]);
- sb.append(c).append(".");
- }
+
+ StringBuffer sb = new StringBuffer();
+ sb.append(last);
+ sb.append(", ");
+
+ String[] firstNames = first.split(" ");
+ for (int i = 0; i < firstNames.length; i++) {
+ sb.append(firstNames[i].charAt(0));
+ sb.append('.');
}
-
- //Replaces each "part of the name" for the corresponding Letter Dot Space format:
- s = new String(sb);
-
- //System.out.println("The Abbreviated name is: " + s);
- return s;
- }
+ return sb.toString();
+ }
}
diff --git a/src/java/net/sf/jabref/export/layout/format/HTMLChars.java b/src/java/net/sf/jabref/export/layout/format/HTMLChars.java
index e1165f7..f012d60 100644
--- a/src/java/net/sf/jabref/export/layout/format/HTMLChars.java
+++ b/src/java/net/sf/jabref/export/layout/format/HTMLChars.java
@@ -49,7 +49,7 @@ public class HTMLChars implements LayoutFormatter {
//System.out.println("next: "+(char)c);
String combody;
if (c == '{') {
- IntAndString part = getPart(field, i);
+ IntAndString part = getPart(field, i, false);
i += part.i;
combody = part.s;
}
@@ -71,31 +71,62 @@ public class HTMLChars implements LayoutFormatter {
}
else {
- //if (!incommand || ((c!='{') && !Character.isWhitespace(c)))
- testContent: if (!incommand || (!Character.isWhitespace(c) && (c != '{')))
+ String argument = null;
+
+ if (!incommand) {
sb.append((char)c);
- else {
+ }
+ else if (Character.isWhitespace(c) || c == '{') {
// First test if we are already at the end of the string.
- if (i >= field.length()-1)
- break testContent;
-
- if (c == '{') {
-
- String command = currentCommand.toString();
- // Then test if we are dealing with a italics or bold command. If so, handle.
- if (command.equals("emph") || command.equals("textit")) {
- IntAndString part = getPart(field, i);
- i += part.i;
- sb.append("<em>").append(part.s).append("</em>");
- }
- else if (command.equals("textbf")) {
- IntAndString part = getPart(field, i);
- i += part.i;
- sb.append("<b>").append(part.s).append("</b>");
- }
- } else
- sb.append((char)c);
-
+ //if (i >= field.length()-1)
+ // break testContent;
+
+ String command = currentCommand.toString();
+ // Then test if we are dealing with a italics or bold command.
+ // If so, handle.
+ if (command.equals("emph") || command.equals("textit")) {
+ IntAndString part = getPart(field, i, true);
+
+ i += part.i;
+ sb.append("<em>").append(part.s).append("</em>");
+ }
+ else if (command.equals("textbf")) {
+ IntAndString part = getPart(field, i, true);
+ i += part.i;
+ sb.append("<b>").append(part.s).append("</b>");
+ }
+ else {
+ IntAndString part = getPart(field, i, true);
+ i += part.i; argument = part.s;
+ }
+ }
+ else if (c == '}') {
+ argument = "";
+ }
+ else {
+ /* TODO: this point is reached, apparently, if a command is terminated in a
+ * strange way, such as with "$\omega$". Also, the command "\&" causes us
+ * to get here. The former issue is maybe a little difficult to address, since
+ * it involves the LaTeX math mode. We don't have a complete LaTeX parser, so
+ * maybe it's better to ignore these commands?
+ */
+ //System.err.println("Unreachable code?? '"+field+"'");
+ }
+ if (argument != null) {
+ // handle common case of general latex command
+ String command = currentCommand.toString();
+ Object result = Globals.HTMLCHARS.get(command+argument);
+ //System.out.print("command: "+command+", arg: "+argument);
+ //System.out.print(", result: ");
+ // If found, then use translated version. If not, then keep the
+ // text of the parameter intact.
+ if (result != null) {
+ //System.out.println((String)result);
+ sb.append((String)result);
+ } else {
+ //System.out.println(argument);
+ sb.append(argument);
+ }
}
incommand = false;
escaped = false;
@@ -110,18 +141,27 @@ public class HTMLChars implements LayoutFormatter {
return s.replaceAll("&|\\\\&","&").replaceAll("[\\n]{1,}","<p>");//.replaceAll("--", "—");
}
- private IntAndString getPart(String text, int i) {
+ private IntAndString getPart(String text, int i, boolean terminateOnEndBraceOnly) {
char c;
int count = 0;//, i=index;
StringBuffer part = new StringBuffer();
- while ((count >= 0) && (i < text.length())) {
- i++;
+ // advance to first char and skip wihitespace
+ i++;
+ for ( ; i < text.length() ; ++i) {
+ if (!Character.isWhitespace(text.charAt(i)))
+ break;
+ }
+ // then grab whathever is the first token (counting braces)
+ for ( ; i < text.length() ; ++i) {
c = text.charAt(i);
- if (c == '}')
- count--;
+ if (!terminateOnEndBraceOnly && count == 0 && Character.isWhitespace(c)) {
+ i--; // end argument and leave whitespace for further processing
+ break;
+ }
+ if (c == '}' && --count < 0)
+ break;
else if (c == '{')
count++;
-
part.append((char)c);
}
//System.out.println("part: "+part.toString()+"\nformatted: "+format(part.toString()));
diff --git a/src/java/net/sf/jabref/external/ExternalFilePanel.java b/src/java/net/sf/jabref/external/ExternalFilePanel.java
index c6b7689..fc6d0df 100644
--- a/src/java/net/sf/jabref/external/ExternalFilePanel.java
+++ b/src/java/net/sf/jabref/external/ExternalFilePanel.java
@@ -149,23 +149,30 @@ public class ExternalFilePanel extends JPanel {
}
- public void downLoadFile(final String fieldName, final FieldEditor editor, final Component parent) {
- String res =
- JOptionPane.showInputDialog(parent,
+ public void downLoadFile(final String fieldName,
+ final FieldEditor editor, final Component parent) {
+
+ String res = JOptionPane.showInputDialog(parent,
Globals.lang("Enter URL to download"));
if (res != null) {
class Downloader extends Thread {
String res;
+ BibtexEntry targetEntry = null;
public Downloader(String res) {
this.res = res;
+ // If this panel belongs in an entry editor, note which entry is
+ // currently shown:
+ if (entryEditor != null)
+ targetEntry = entryEditor.getEntry();
}
public void run() {
URL url;
String textToSet = editor.getText();
editor.setEnabled(false);
+ boolean updateEditor = true;
try {
editor.setText(Globals.lang("Downloading..."));
url = new URL(res);
@@ -203,6 +210,10 @@ public class ExternalFilePanel extends JPanel {
Globals.logger("Error while downloading " + url.toString());
}
+ // Check if we should update the editor text field, or update the
+ // target entry directly:
+ updateEditor = (entryEditor == null) ||
+ (entryEditor.getEntry() == targetEntry);
output(Globals.lang("Download completed"));
String filename = file.getPath();
@@ -217,19 +228,28 @@ public class ExternalFilePanel extends JPanel {
filename = relPath;
}
textToSet = filename;
- //editor.setText(filename);
- SwingUtilities.invokeLater(new Thread() {
- public void run() {
- if (entryEditor != null)
- entryEditor.updateField(editor);
- }
- });
+ if (updateEditor)
+ SwingUtilities.invokeLater(new Thread() {
+ public void run() {
+ if (entryEditor != null)
+ entryEditor.updateField(editor);
+ }
+ });
+ else {
+ // Editor has probably changed to show a different entry. So
+ // we must update the target entry directly and not set the
+ // text of the editor.
+ targetEntry.setField(fieldName, textToSet);
+ }
} catch (MalformedURLException e1) {
JOptionPane.showMessageDialog(parent, "Invalid URL: "+e1.getMessage(),
"Download file", JOptionPane.ERROR_MESSAGE);
} finally {
- editor.setText(textToSet);
- editor.setEnabled(true);
+ if (updateEditor) {
+ System.out.println("Juuu");
+ editor.setText(textToSet);
+ editor.setEnabled(true);
+ }
}
}
}
diff --git a/src/java/net/sf/jabref/external/PushToEmacs.java b/src/java/net/sf/jabref/external/PushToEmacs.java
index 861983a..420f0bb 100644
--- a/src/java/net/sf/jabref/external/PushToEmacs.java
+++ b/src/java/net/sf/jabref/external/PushToEmacs.java
@@ -28,7 +28,7 @@ public class PushToEmacs implements PushToApplication {
}
public Icon getIcon() {
- return new ImageIcon(GUIGlobals.emacsIcon);
+ return GUIGlobals.getImage("emacs");
}
public String getKeyStrokeName() {
diff --git a/src/java/net/sf/jabref/external/PushToLyx.java b/src/java/net/sf/jabref/external/PushToLyx.java
index 4cf9ff4..88f896a 100644
--- a/src/java/net/sf/jabref/external/PushToLyx.java
+++ b/src/java/net/sf/jabref/external/PushToLyx.java
@@ -63,7 +63,7 @@ public class PushToLyx implements PushToApplication {
}
public Icon getIcon() {
- return new ImageIcon(GUIGlobals.lyxIconFile);
+ return GUIGlobals.getImage("lyx");
}
public String getKeyStrokeName() {
diff --git a/src/java/net/sf/jabref/external/PushToWinEdt.java b/src/java/net/sf/jabref/external/PushToWinEdt.java
index 160f030..3ebbd49 100644
--- a/src/java/net/sf/jabref/external/PushToWinEdt.java
+++ b/src/java/net/sf/jabref/external/PushToWinEdt.java
@@ -30,7 +30,7 @@ public class PushToWinEdt implements PushToApplication {
}
public Icon getIcon() {
- return new ImageIcon(GUIGlobals.winEdtIcon);
+ return GUIGlobals.getImage("winedt");
}
public String getKeyStrokeName() {
diff --git a/src/java/net/sf/jabref/groups/AbstractGroup.java b/src/java/net/sf/jabref/groups/AbstractGroup.java
index 9162d88..a16f135 100644
--- a/src/java/net/sf/jabref/groups/AbstractGroup.java
+++ b/src/java/net/sf/jabref/groups/AbstractGroup.java
@@ -194,7 +194,7 @@ public abstract class AbstractGroup {
}
/** Returns a lengthy textual description of this instance (for
- * the groups editor). */
+ * the groups editor). The text is formatted in HTML. */
public abstract String getDescription();
/**
diff --git a/src/java/net/sf/jabref/groups/EntryTableTransferHandler.java b/src/java/net/sf/jabref/groups/EntryTableTransferHandler.java
index b7a66e9..264d91c 100644
--- a/src/java/net/sf/jabref/groups/EntryTableTransferHandler.java
+++ b/src/java/net/sf/jabref/groups/EntryTableTransferHandler.java
@@ -25,16 +25,46 @@ package net.sf.jabref.groups;
import java.awt.datatransfer.*;
import java.awt.dnd.DnDConstants;
import java.awt.event.InputEvent;
+import java.io.*;
+import java.net.URL;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
import javax.swing.*;
+import net.sf.jabref.Globals;
+import net.sf.jabref.JabRefFrame;
import net.sf.jabref.gui.MainTable;
+import net.sf.jabref.imports.ImportMenuItem;
+import net.sf.jabref.imports.OpenDatabaseAction;
+import net.sf.jabref.imports.ParserResult;
+import net.sf.jabref.net.URLDownload;
public class EntryTableTransferHandler extends TransferHandler {
protected final MainTable entryTable;
+ protected JabRefFrame frame;
+ protected DataFlavor urlFlavor;
+ protected DataFlavor stringFlavor;
+ protected static boolean DROP_ALLOWED = true;
- public EntryTableTransferHandler(MainTable entryTable) {
+ /**
+ * Construct the transfer handler.
+ * @param entryTable The table this transfer handler should operate on. This argument is
+ * allowed to equal @null, in which case the transfer handler can assume that it
+ * works for a JabRef instance with no databases open, attached to the empty tabbed pane.
+ * @param frame The JabRefFrame instance.
+ */
+ public EntryTableTransferHandler(MainTable entryTable, JabRefFrame frame) {
this.entryTable = entryTable;
+ this.frame = frame;
+ stringFlavor = DataFlavor.stringFlavor;
+ try {
+ urlFlavor = new DataFlavor("application/x-java-url; class=java.net.URL");
+ } catch (ClassNotFoundException e) {
+ Globals.logger("Unable to configure drag and drop for main table");
+ e.printStackTrace();
+ }
}
public int getSourceActions(JComponent c) {
@@ -42,18 +72,206 @@ public class EntryTableTransferHandler extends TransferHandler {
}
public Transferable createTransferable(JComponent c) {
+ // This method is called when dragging stuff *from* the table, so we can assume
+ // it will never be called if entryTable==null:
return new TransferableEntrySelection(entryTable.getSelectedEntries());
}
// add-ons -----------------------
+
+ protected boolean handleDropTransfer(String dropStr) throws IOException {
+ if (dropStr.startsWith("file:")) {
+ // This appears to be a dragged file link and not a reference
+ // format. Check if we can map this to a set of files:
+ if (handleDraggedFilenames(dropStr))
+ return true;
+ // If not, handle it in the normal way...
+ } else if (dropStr.startsWith("http:")) {
+ // This is the way URL links are received on OS X and KDE (Gnome?):
+ URL url = new URL(dropStr);
+ //JOptionPane.showMessageDialog(null, "Making URL: "+url.toString());
+ return handleDropTransfer(url);
+ }
+ File tmpfile = java.io.File.createTempFile("jabrefimport", "");
+ tmpfile.deleteOnExit();
+ FileWriter fw = new FileWriter(tmpfile);
+ fw.write(dropStr);
+ fw.close();
+
+ //System.out.println("importing from " + tmpfile.getAbsolutePath());
+
+ ImportMenuItem importer = new ImportMenuItem(frame, false);
+ importer.automatedImport(new String[] { tmpfile.getAbsolutePath() } );
+
+ return true;
+ }
+
+ /**
+ * Handle a String describing a set of files or URLs dragged into JabRef.
+ * @param s String describing a set of files or URLs dragged into JabRef
+ */
+ private boolean handleDraggedFilenames(String s) {
+ // Split into lines:
+ String[] lines = s.replaceAll("\r", "").split("\n");
+ List files = new ArrayList();
+ for (int i = 0; i < lines.length; i++) {
+ String line = lines[i];
+ if (line.startsWith("file:"))
+ line = line.substring(5);
+ else continue;
+ // Under Gnome, the link is given as file:///...., so we
+ // need to strip the extra slashes:
+ if (line.startsWith("//"))
+ line = line.substring(2);
+ File f = new File(line);
+ if (f.exists()) {
+ files.add(f);
+ }
+ }
+ return handleDraggedFiles(files);
+
+ }
+
+ /**
+ * Handle a List containing File objects for a set of files to import.
+ * @param files A List containing File instances pointing to files.
+ */
+ private boolean handleDraggedFiles(List files) {
+ final String[] fileNames = new String[files.size()];
+ int i=0;
+ for (Iterator iterator = files.iterator(); iterator.hasNext();) {
+ File file = (File) iterator.next();
+ fileNames[i] = file.getAbsolutePath();
+ i++;
+ }
+ // Try to load bib files normally, and import the rest into the current database.
+ // This process must be spun off into a background thread:
+ new Thread(new Runnable() {
+ public void run() {
+ loadOrImportFiles(fileNames);
+ }
+ }).start();
+
+ return true;
+ }
+
+ /**
+ * Take a set of filenames. Those with names indicating bib files are opened as such
+ * if possible. All other files we will attempt to import into the current database.
+ * @param fileNames The names of the files to open.
+ */
+ private void loadOrImportFiles(String[] fileNames) {
+
+ OpenDatabaseAction openAction = new OpenDatabaseAction(frame, false);
+ ArrayList notBibFiles = new ArrayList();
+ String encoding = Globals.prefs.get("defaultEncoding");
+ for (int i = 0; i < fileNames.length; i++) {
+ if (fileNames[i].toLowerCase().endsWith(".bib")) {
+ File f = new File(fileNames[i]);
+ try {
+ ParserResult pr = OpenDatabaseAction.loadDatabase
+ (f, encoding);
+ if ((pr == null) || (pr == ParserResult.INVALID_FORMAT)) {
+ notBibFiles.add(fileNames[i]);
+ } else {
+ openAction.addNewDatabase(pr, f, false);
+ }
+ } catch (IOException e) {
+ notBibFiles.add(fileNames[i]);
+ // No error message, since we want to try importing the file?
+ //
+ //Util.showQuickErrorDialog(frame, Globals.lang("Open database"), e);
+ }
+ }
+ else if (fileNames[i].toLowerCase().endsWith(".pdf") ||
+ fileNames[i].toLowerCase().endsWith(".ps")) {
+ // Handle PDF by linking to it from the entry where it was dropped?
+ // Not implemented. We should not try to import the PDF file.
+ }
+ else notBibFiles.add(fileNames[i]);
+ }
+
+ if (notBibFiles.size() > 0) {
+ String[] toImport = new String[notBibFiles.size()];
+ notBibFiles.toArray(toImport);
+
+ // Import into new if entryTable==null, otherwise into current database:
+ ImportMenuItem importer = new ImportMenuItem(frame, (entryTable == null));
+ importer.automatedImport(toImport);
+ }
+ }
+
+ protected boolean handleDropTransfer(URL dropLink) throws IOException {
+ File tmpfile = java.io.File.createTempFile("jabrefimport", "");
+ tmpfile.deleteOnExit();
+
+ //System.out.println("Import url: " + dropLink.toString());
+ //System.out.println("Temp file: "+tmpfile.getAbsolutePath());
+
+ new URLDownload(entryTable, dropLink, tmpfile).download();
+
+ // Import into new if entryTable==null, otherwise into current database:
+ ImportMenuItem importer = new ImportMenuItem(frame, (entryTable == null));
+ importer.automatedImport(new String[] { tmpfile.getAbsolutePath() } );
+
+ return true;
+ }
+
+ /**
+ * Imports the dropped URL or plain text as a new entry in the current database.
+ * @todo It would be nice to support dropping of pdfs onto the table as a way
+ * to link them to the corresponding entries.
+ */
public boolean importData(JComponent comp, Transferable t) {
- // for accepting drags (we don't to that)
+ try {
+
+ if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
+ //JOptionPane.showMessageDialog(null, "Received javaFileListFlavor");
+ // This flavor is used for dragged file links in Windows:
+ List l = (List)t.getTransferData(DataFlavor.javaFileListFlavor);
+ return handleDraggedFiles(l);
+ }
+ if (t.isDataFlavorSupported(urlFlavor)) {
+ URL dropLink = (URL) t.getTransferData(urlFlavor);
+ return handleDropTransfer(dropLink);
+ } else if (t.isDataFlavorSupported(stringFlavor)) {
+
+ String dropStr = (String) t.getTransferData(stringFlavor);
+ //JOptionPane.showMessageDialog(null, "Received stringFlavor: "+dropStr);
+
+ return handleDropTransfer(dropStr);
+ }
+ } catch (IOException ioe) {
+ System.err.println("failed to read dropped data: " + ioe.toString());
+ } catch (UnsupportedFlavorException ufe) {
+ System.err.println("drop type error: " + ufe.toString());
+ }
+
+ // all supported flavors failed
+ System.err.println("can't transfer input: ");
+ DataFlavor inflavs[] = t.getTransferDataFlavors();
+ for (int i = 0; i < inflavs.length; i++) {
+ System.out.println(" " + inflavs[i].toString());
+ }
+
return false;
}
+
public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
- // for accepting drags (we don't to that)
+ if (!DROP_ALLOWED) return false;
+
+
+ // accept this if any input flavor matches any of our supported flavors
+ for (int i = 0; i < transferFlavors.length; i++) {
+ DataFlavor inflav = transferFlavors[i];
+ if (inflav.match(urlFlavor) || inflav.match(stringFlavor)
+ || inflav.match(DataFlavor.javaFileListFlavor)) return true;
+ }
+
+ //System.out.println("drop type forbidden");
+ // nope, never heard of this type
return false;
}
diff --git a/src/java/net/sf/jabref/groups/GroupSelector.java b/src/java/net/sf/jabref/groups/GroupSelector.java
index 1c3ab2c..f498f0f 100644
--- a/src/java/net/sf/jabref/groups/GroupSelector.java
+++ b/src/java/net/sf/jabref/groups/GroupSelector.java
@@ -42,12 +42,12 @@ import net.sf.jabref.undo.NamedCompound;
public class GroupSelector extends SidePaneComponent implements
TreeSelectionListener, ActionListener, ErrorMessageDisplay {
- JButton newButton = new JButton(new ImageIcon(GUIGlobals.newSmallIconFile)),
+ JButton newButton = new JButton(GUIGlobals.getImage("new")),
helpButton = new JButton(
- new ImageIcon(GUIGlobals.helpSmallIconFile)),
+ GUIGlobals.getImage("help")),
refresh = new JButton(
- new ImageIcon(GUIGlobals.refreshSmallIconFile)),
- autoGroup = new JButton(new ImageIcon(GUIGlobals.autoGroupIcon)),
+ GUIGlobals.getImage("refresh")),
+ autoGroup = new JButton(GUIGlobals.getImage("autoGroup")),
openset = new JButton(Globals.lang("Settings"));
Color bgColor = Color.white;
GroupsTree groupsTree;
@@ -78,8 +78,8 @@ public class GroupSelector extends SidePaneComponent implements
ButtonGroup bgr = new ButtonGroup();
ButtonGroup visMode = new ButtonGroup();
ButtonGroup nonHits = new ButtonGroup();
- JButton expand = new JButton(new ImageIcon(GUIGlobals.downIconFile)),
- reduce = new JButton(new ImageIcon(GUIGlobals.upIconFile));
+ JButton expand = new JButton(GUIGlobals.getImage("down")),
+ reduce = new JButton(GUIGlobals.getImage("up"));
SidePaneManager manager;
@@ -87,11 +87,10 @@ public class GroupSelector extends SidePaneComponent implements
* The first element for each group defines which field to use for the
* quicksearch. The next two define the name and regexp for the group.
*
- * @param groupData
- * The group meta data in raw format.
+ *
*/
public GroupSelector(JabRefFrame frame, SidePaneManager manager) {
- super(manager, GUIGlobals.groupsIconFile, Globals.lang("Groups"));
+ super(manager, GUIGlobals.getIconUrl("toggleGroups"), Globals.lang("Groups"));
this.groupsRoot = new GroupTreeNode(new AllEntriesGroup());
this.manager = manager;
@@ -212,8 +211,11 @@ public class GroupSelector extends SidePaneComponent implements
Globals.prefs.putInt("groupsVisibleRows", i);
}
});
- Dimension butDim = new Dimension(20, 20);
- Dimension butDim2 = new Dimension(40, 20);
+
+ int butSize = newButton.getIcon().getIconHeight() + 5;
+ Dimension butDim = new Dimension(butSize, butSize);
+ //Dimension butDimSmall = new Dimension(20, 20);
+
newButton.setPreferredSize(butDim);
newButton.setMinimumSize(butDim);
refresh.setPreferredSize(butDim);
@@ -222,8 +224,8 @@ public class GroupSelector extends SidePaneComponent implements
helpButton.setMinimumSize(butDim);
autoGroup.setPreferredSize(butDim);
autoGroup.setMinimumSize(butDim);
- openset.setPreferredSize(butDim2);
- openset.setMinimumSize(butDim2);
+ openset.setPreferredSize(butDim);
+ openset.setMinimumSize(butDim);
expand.setPreferredSize(butDim);
expand.setMinimumSize(butDim);
reduce.setPreferredSize(butDim);
diff --git a/src/java/net/sf/jabref/groups/GroupTreeCellRenderer.java b/src/java/net/sf/jabref/groups/GroupTreeCellRenderer.java
index 0108ddb..81d91cc 100644
--- a/src/java/net/sf/jabref/groups/GroupTreeCellRenderer.java
+++ b/src/java/net/sf/jabref/groups/GroupTreeCellRenderer.java
@@ -42,6 +42,12 @@ public class GroupTreeCellRenderer extends DefaultTreeCellRenderer {
protected Object[] highlight3Cells = null;
protected Object highlightBorderCell = null;
+ public static ImageIcon
+ groupRefiningIcon = GUIGlobals.getImage("groupRefining"),
+ groupIncludingIcon = GUIGlobals.getImage("groupIncluding"),
+ groupRegularIcon = null;
+
+
public Component getTreeCellRendererComponent(JTree tree, Object value,
boolean selected, boolean expanded, boolean leaf, int row,
boolean hasFocus) {
@@ -105,16 +111,16 @@ public class GroupTreeCellRenderer extends DefaultTreeCellRenderer {
if (Globals.prefs.getBoolean("groupShowIcons")) {
switch (group.getHierarchicalContext()) {
case AbstractGroup.REFINING:
- if (label.getIcon() != GUIGlobals.groupRefiningIcon)
- label.setIcon(GUIGlobals.groupRefiningIcon);
+ if (label.getIcon() != groupRefiningIcon)
+ label.setIcon(groupRefiningIcon);
break;
case AbstractGroup.INCLUDING:
- if (label.getIcon() != GUIGlobals.groupIncludingIcon)
- label.setIcon(GUIGlobals.groupIncludingIcon);
+ if (label.getIcon() != groupIncludingIcon)
+ label.setIcon(groupIncludingIcon);
break;
default:
- if (label.getIcon() != GUIGlobals.groupRegularIcon)
- label.setIcon(GUIGlobals.groupRegularIcon);
+ if (label.getIcon() != groupRegularIcon)
+ label.setIcon(groupRegularIcon);
break;
}
} else {
diff --git a/src/java/net/sf/jabref/groups/GroupsPrefsTab.java b/src/java/net/sf/jabref/groups/GroupsPrefsTab.java
index 0a8dcd9..ca6f518 100644
--- a/src/java/net/sf/jabref/groups/GroupsPrefsTab.java
+++ b/src/java/net/sf/jabref/groups/GroupsPrefsTab.java
@@ -45,7 +45,7 @@ public class GroupsPrefsTab extends JPanel implements PrefsTab {
}
});
- FormLayout layout = new FormLayout("9dlu, 500px",
+ FormLayout layout = new FormLayout("9dlu, pref", //500px",
"p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, " +
"p, 3dlu, p");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
diff --git a/src/java/net/sf/jabref/groups/SearchGroup.java b/src/java/net/sf/jabref/groups/SearchGroup.java
index 74f85ae..ddd3fe9 100644
--- a/src/java/net/sf/jabref/groups/SearchGroup.java
+++ b/src/java/net/sf/jabref/groups/SearchGroup.java
@@ -322,8 +322,8 @@ public class SearchGroup extends AbstractGroup implements SearchRule {
node = node.getNextSibling();
final int type = node.getType();
node = node.getNextSibling();
- final String term = node.getText();
- final String fieldSpec = regExpFieldSpec ? Globals.lang(
+ final String termQuoted = Util.quoteForHTML(node.getText());
+ final String fieldSpecQuoted = regExpFieldSpec ? Globals.lang(
"any field that matches the regular expression <b>%0</b>",
Util.quoteForHTML(field)) : Globals.lang("the field <b>%0</b>",
Util.quoteForHTML(field));
@@ -333,41 +333,41 @@ public class SearchGroup extends AbstractGroup implements SearchRule {
if (regExp)
return not ? Globals.lang(
"%0 doesn't contain the Regular Expression <b>%1</b>",
- Util.quoteForHTML(fieldSpec), Util.quoteForHTML(term))
+ fieldSpecQuoted, termQuoted)
: Globals.lang(
"%0 contains the Regular Expression <b>%1</b>",
- Util.quoteForHTML(fieldSpec), Util.quoteForHTML(term));
+ fieldSpecQuoted, termQuoted);
return not ? Globals.lang(
- "%0 doesn't contain the term <b>%1</b>", Util.quoteForHTML(fieldSpec),
- Util.quoteForHTML(term)) : Globals.lang("%0 contains the term <b>%1</b>",
- Util.quoteForHTML(fieldSpec), Util.quoteForHTML(term));
+ "%0 doesn't contain the term <b>%1</b>", fieldSpecQuoted,
+ termQuoted) : Globals.lang("%0 contains the term <b>%1</b>",
+ fieldSpecQuoted, termQuoted);
case SearchExpressionTreeParserTokenTypes.LITERAL_matches:
case SearchExpressionTreeParserTokenTypes.EEQUAL:
if (regExp)
return not ? Globals.lang(
"%0 doesn't match the Regular Expression <b>%1</b>",
- Util.quoteForHTML(fieldSpec), Util.quoteForHTML(term))
+ fieldSpecQuoted, termQuoted)
: Globals.lang(
"%0 matches the Regular Expression <b>%1</b>",
- Util.quoteForHTML(fieldSpec), Util.quoteForHTML(term));
+ fieldSpecQuoted, termQuoted);
return not ? Globals.lang(
"%0 doesn't match the term <b>%1</b>",
- Util.quoteForHTML(fieldSpec), Util.quoteForHTML(term))
+ fieldSpecQuoted, termQuoted)
: Globals.lang("%0 matches the term <b>%1</b>",
- Util.quoteForHTML(fieldSpec),
- Util.quoteForHTML(term));
+ fieldSpecQuoted,
+ termQuoted);
case SearchExpressionTreeParserTokenTypes.NEQUAL:
if (regExp)
return not ? Globals.lang(
"%0 contains the Regular Expression <b>%1</b>",
- Util.quoteForHTML(fieldSpec), Util.quoteForHTML(term))
+ fieldSpecQuoted, termQuoted)
: Globals.lang(
"%0 doesn't contain the Regular Expression <b>%1</b>",
- Util.quoteForHTML(fieldSpec), Util.quoteForHTML(term));
+ fieldSpecQuoted, termQuoted);
return not ? Globals.lang("%0 contains the term <b>%1</b>",
- Util.quoteForHTML(fieldSpec), Util.quoteForHTML(term)) : Globals.lang(
- "%0 doesn't contain the term <b>%1</b>", Util.quoteForHTML(fieldSpec),
- Util.quoteForHTML(term));
+ fieldSpecQuoted, termQuoted) : Globals.lang(
+ "%0 doesn't contain the term <b>%1</b>", fieldSpecQuoted,
+ termQuoted);
default:
return "Internal error: Unknown AST node type. "
+ "Please report this on www.sf.net/projects/jabref";
diff --git a/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java b/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
index 0d7bd58..8e05780 100644
--- a/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
+++ b/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
@@ -22,6 +22,8 @@ import java.util.Iterator;
import java.util.Set;
import javax.swing.event.ListDataListener;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
+
/**
* NOTAT:
* * S?rg for at ting oppdateres riktig ved tillegg av ny type. (velge, unng? at det blir feil innhold i listene).
@@ -92,10 +94,14 @@ public class EntryCustomizationDialog2 extends JDialog implements ListSelectionL
ok.addActionListener(this);
apply.addActionListener(this);
cancel.addActionListener(this);
- buttons.add(ok);
- buttons.add(apply);
- buttons.add(cancel);
-
+ ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
+ buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+ bb.addGlue();
+ bb.addGridded(ok);
+ bb.addGridded(apply);
+ bb.addGridded(cancel);
+ bb.addGlue();
+
//con.fill = GridBagConstraints.BOTH;
//con.weightx = 0.3;
diff --git a/src/java/net/sf/jabref/gui/FieldSetComponent.java b/src/java/net/sf/jabref/gui/FieldSetComponent.java
index 3fb74f0..6154b31 100644
--- a/src/java/net/sf/jabref/gui/FieldSetComponent.java
+++ b/src/java/net/sf/jabref/gui/FieldSetComponent.java
@@ -90,8 +90,8 @@ public class FieldSetComponent extends JPanel implements ActionListener/*, ItemL
con.gridwidth = 1;
if (arrows) {
con.weightx = 0;
- up = new JButton(new ImageIcon(GUIGlobals.upIconFile));
- down = new JButton(new ImageIcon(GUIGlobals.downIconFile));
+ up = new JButton(GUIGlobals.getImage("up"));
+ down = new JButton(GUIGlobals.getImage("down"));
up.addActionListener(this);
down.addActionListener(this);
up.setToolTipText(Globals.lang("Move up"));
diff --git a/src/java/net/sf/jabref/gui/GenFieldsCustomizer.java b/src/java/net/sf/jabref/gui/GenFieldsCustomizer.java
index 6126346..a1e347f 100644
--- a/src/java/net/sf/jabref/gui/GenFieldsCustomizer.java
+++ b/src/java/net/sf/jabref/gui/GenFieldsCustomizer.java
@@ -7,6 +7,9 @@ import javax.swing.border.*;
import java.awt.event.*;
import java.util.Iterator;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
+import com.jgoodies.forms.layout.Sizes;
+
/**
* <p>Title: </p>
* <p>Description: </p>
@@ -17,7 +20,7 @@ import java.util.Iterator;
*/
public class GenFieldsCustomizer extends JDialog {
- JPanel jPanel2 = new JPanel();
+ JPanel buttons = new JPanel();
JButton ok = new JButton();
JButton cancel = new JButton();
JButton helpBut = new JButton();
@@ -41,7 +44,7 @@ public class GenFieldsCustomizer extends JDialog {
parent = frame;
//this.diag = diag;
help = new HelpAction(parent.helpDiag, GUIGlobals.generalFieldsHelp,
- "Help", GUIGlobals.helpSmallIconFile);
+ "Help", GUIGlobals.getIconUrl("helpSmall"));
helpBut = new JButton(Globals.lang("Help"));
helpBut.addActionListener(help);
try {
@@ -58,7 +61,7 @@ public class GenFieldsCustomizer extends JDialog {
ok.addActionListener(new GenFieldsCustomizer_ok_actionAdapter(this));
cancel.setText(Globals.lang("Cancel"));
cancel.addActionListener(new GenFieldsCustomizer_cancel_actionAdapter(this));
- //jPanel2.setBackground(GUIGlobals.lightGray);
+ //buttons.setBackground(GUIGlobals.lightGray);
jLabel1.setText(Globals.lang("Delimit fields with semicolon, ex.")+": url;pdf;note");
jPanel3.setLayout(gridBagLayout2);
jPanel4.setBorder(BorderFactory.createEtchedBorder());
@@ -71,12 +74,17 @@ public class GenFieldsCustomizer extends JDialog {
//jPanel3.setBackground(GUIGlobals.lightGray);
revert.setText(Globals.lang("Default"));
revert.addActionListener(new GenFieldsCustomizer_revert_actionAdapter(this));
- this.getContentPane().add(jPanel2, BorderLayout.SOUTH);
- jPanel2.add(ok, null);
- jPanel2.add(revert, null);
- jPanel2.add(cancel, null);
- jPanel2.add(Box.createHorizontalStrut(10));
- jPanel2.add(helpBut, null);
+ this.getContentPane().add(buttons, BorderLayout.SOUTH);
+ ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
+ buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+ bb.addGlue();
+ bb.addGridded(ok);
+ bb.addGridded(revert);
+ bb.addGridded(cancel);
+ bb.addStrut(Sizes.DLUX5);
+ bb.addGridded(helpBut);
+ bb.addGlue();
+
this.getContentPane().add(jPanel3, BorderLayout.CENTER);
jPanel3.add(jLabel1, new GridBagConstraints(0, 1, 1, 1, 1.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
@@ -89,8 +97,8 @@ public class GenFieldsCustomizer extends JDialog {
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
// Key bindings:
- ActionMap am = jPanel2.getActionMap();
- InputMap im = jPanel2.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+ ActionMap am = buttons.getActionMap();
+ InputMap im = buttons.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
im.put(Globals.prefs.getKey("Close dialog"), "close");
am.put("close", new AbstractAction() {
public void actionPerformed(ActionEvent e) {
diff --git a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
index d0c21f0..1930fd4 100644
--- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
+++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
@@ -75,10 +75,10 @@ public class ImportInspectionDialog extends JDialog {
private Map groupAdditions = new HashMap();
private JCheckBox autoGenerate = new JCheckBox(Globals.lang("Generate keys"), Globals.prefs.getBoolean("generateKeysAfterInspection"));
private JLabel
- duplLabel = new JLabel(new ImageIcon(GUIGlobals.duplicateIcon)),
- pdfLabel = new JLabel(new ImageIcon(GUIGlobals.pdfIcon)),
- psLabel = new JLabel(new ImageIcon(GUIGlobals.psIcon)),
- urlLabel = new JLabel(new ImageIcon(GUIGlobals.wwwIcon));
+ duplLabel = new JLabel(GUIGlobals.getImage("duplicate")),
+ pdfLabel = new JLabel(GUIGlobals.getImage("pdfSmall")),
+ psLabel = new JLabel(GUIGlobals.getImage("psSmall")),
+ urlLabel = new JLabel(GUIGlobals.getImage("wwwSmall"));
private final int
DUPL_COL = 1,
@@ -235,8 +235,11 @@ public class ImportInspectionDialog extends JDialog {
BibtexEntry entry = (BibtexEntry) i.next();
// We exploit the entry's search status for indicating "Keep" status:
entry.setSearchHit(defaultSelected);
- // We exploit the entry's group status for indicating duplicate status:
- if ((panel != null) && (Util.containsDuplicate(panel.database(), entry) != null)) {
+ // We exploit the entry's group status for indicating duplicate status.
+ // Checking duplicates means both checking against the background database (if
+ // applicable) and against entries already in the table.
+ if (((panel != null) && (Util.containsDuplicate(panel.database(), entry) != null))
+ || (internalDuplicate(this.entries, entry) != null)) {
entry.setGroupHit(true);
}
this.entries.getReadWriteLock().writeLock().lock();
@@ -246,6 +249,24 @@ public class ImportInspectionDialog extends JDialog {
}
/**
+ * Checks if there are duplicates to the given entry in the Collection. Does not
+ * report the entry as duplicate of itself if it is in the Collection.
+ * @param entries A Collection of BibtexEntry instances.
+ * @param entry The entry to search for duplicates of.
+ * @return A possible duplicate, if any, or null if none were found.
+ */
+ protected BibtexEntry internalDuplicate(Collection entries, BibtexEntry entry) {
+ for (Iterator iterator = entries.iterator(); iterator.hasNext();) {
+ BibtexEntry othEntry = (BibtexEntry) iterator.next();
+ if (othEntry == entry)
+ continue; // Don't compare the entry to itself
+ if (Util.isDuplicate(entry, othEntry, Globals.duplicateThreshold))
+ return othEntry;
+ }
+ return null;
+ }
+
+ /**
* Removes all selected entries from the table. Synchronizes on this.entries to prevent
* conflict with addition of new entries.
*/
@@ -628,7 +649,7 @@ public class ImportInspectionDialog extends JDialog {
class DeleteListener extends AbstractAction implements ActionListener {
public DeleteListener() {
- super(Globals.lang("Delete"), new ImageIcon(GUIGlobals.removeIconFile));
+ super(Globals.lang("Delete"), GUIGlobals.getImage("delete"));
}
public void actionPerformed(ActionEvent event) {
@@ -732,8 +753,11 @@ public class ImportInspectionDialog extends JDialog {
if ((col == DUPL_COL) && (glTable.getValueAt(row, col) != null)) {
BibtexEntry first = (BibtexEntry)sortedList.get(row);
BibtexEntry other = Util.containsDuplicate(panel.database(), first);
- if (other != null) { // This should be true since the icon is displayed...
- DuplicateResolverDialog diag = new DuplicateResolverDialog(frame, other, first, DuplicateResolverDialog.INSPECTION);
+ if (other != null) {
+ // This will be true if the duplicate is in the existing
+ // database.
+ DuplicateResolverDialog diag = new DuplicateResolverDialog
+ (ImportInspectionDialog.this, other, first, DuplicateResolverDialog.INSPECTION);
Util.placeDialog(diag, ImportInspectionDialog.this);
diag.setVisible(true);
ImportInspectionDialog.this.toFront();
@@ -759,6 +783,20 @@ public class ImportInspectionDialog extends JDialog {
entries.getReadWriteLock().writeLock().unlock();
}
}
+ // Check if the duplicate is of another entry in the import:
+ other = internalDuplicate(entries, first);
+ if (other != null) {
+ int answer = DuplicateResolverDialog.resolveDuplicate
+ (ImportInspectionDialog.this, first, other);
+ if (answer == DuplicateResolverDialog.KEEP_UPPER) {
+ entries.remove(other);
+ first.setGroupHit(false);
+ } else if (answer == DuplicateResolverDialog.KEEP_LOWER) {
+ entries.remove(first);
+ } else if (answer == DuplicateResolverDialog.KEEP_BOTH) {
+ first.setGroupHit(false);
+ }
+ }
}
}
}
diff --git a/src/java/net/sf/jabref/gui/MainTable.java b/src/java/net/sf/jabref/gui/MainTable.java
index 7bea404..5a08a95 100644
--- a/src/java/net/sf/jabref/gui/MainTable.java
+++ b/src/java/net/sf/jabref/gui/MainTable.java
@@ -55,7 +55,7 @@ public class MainTable extends JTable {
updateRenderers();
}
- public MainTable(MainTableFormat tableFormat, EventList list) {
+ public MainTable(MainTableFormat tableFormat, EventList list, JabRefFrame frame) {
super();
this.tableFormat = tableFormat;
// This SortedList has a Comparator controlled by the TableComparatorChooser
@@ -90,7 +90,9 @@ public class MainTable extends JTable {
// enable DnD
setDragEnabled(true);
- setTransferHandler(new EntryTableTransferHandler(this));
+ TransferHandler xfer = new EntryTableTransferHandler(this, frame);
+ setTransferHandler(xfer);
+ pane.setTransferHandler(xfer);
setupComparatorChooser();
refreshSorting();
@@ -258,6 +260,12 @@ public class MainTable extends JTable {
return (BibtexEntry[]) getSelected().toArray(BE_ARRAY);
}
+ /**
+ * This method sets up what Comparators are used for the various table columns.
+ * The ComparatorChooser enables and disables such Comparators as the user clicks
+ * columns, but this is where the Comparators are defined. Also, the ComparatorChooser
+ * is initialized with the sort order defined in Preferences.
+ */
private void setupComparatorChooser() {
// First column:
java.util.List comparators = comparatorChooser.getComparatorsForColumn(0);
diff --git a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
index 78b6f0b..6903b69 100644
--- a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
+++ b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
@@ -95,7 +95,7 @@ public class AppendDatabaseAction extends BaseAction {
BibtexDatabase fromDatabase = pr.getDatabase();
ArrayList appendedEntries = new ArrayList();
ArrayList originalEntries = new ArrayList();
- BibtexDatabase database = panel.database();
+ BibtexDatabase database = panel.database();
BibtexEntry originalEntry;
NamedCompound ce = new NamedCompound(Globals.lang("Append database"));
MetaData meta = new MetaData(pr.getMetaData(), pr.getDatabase());
diff --git a/src/java/net/sf/jabref/imports/BibtexParser.java b/src/java/net/sf/jabref/imports/BibtexParser.java
index b8dff0d..808fcc2 100644
--- a/src/java/net/sf/jabref/imports/BibtexParser.java
+++ b/src/java/net/sf/jabref/imports/BibtexParser.java
@@ -52,7 +52,7 @@ public class BibtexParser
}
_in = new PushbackReader(in);
-
+
}
/**
diff --git a/src/java/net/sf/jabref/imports/CiteSeerFetcher.java b/src/java/net/sf/jabref/imports/CiteSeerFetcher.java
index da20310..2be2189 100644
--- a/src/java/net/sf/jabref/imports/CiteSeerFetcher.java
+++ b/src/java/net/sf/jabref/imports/CiteSeerFetcher.java
@@ -66,7 +66,7 @@ public class CiteSeerFetcher extends SidePaneComponent {
public CiteSeerFetcher(SidePaneManager p0) {
- super(p0, GUIGlobals.wwwCiteSeerIcon, Globals.lang("CiteSeer Transfer"));
+ super(p0, GUIGlobals.getIconUrl("citeseer"), Globals.lang("CiteSeer Transfer"));
sidePaneManager = p0;
progressBar = new JProgressBar();
diff --git a/src/java/net/sf/jabref/imports/CiteSeerFetcherPanel.java b/src/java/net/sf/jabref/imports/CiteSeerFetcherPanel.java
index c0d2e05..a5411e9 100644
--- a/src/java/net/sf/jabref/imports/CiteSeerFetcherPanel.java
+++ b/src/java/net/sf/jabref/imports/CiteSeerFetcherPanel.java
@@ -39,12 +39,12 @@ public class CiteSeerFetcherPanel extends SidePaneComponent implements ActionLis
AuthorDialog authorDialog;
JFrame jFrame; // invisible dialog holder
JButton go = new JButton(Globals.lang("Fetch")),
- helpBut = new JButton(new ImageIcon(GUIGlobals.helpIconFile));
+ helpBut = new JButton(GUIGlobals.getImage("helpSmall"));
HelpAction help;
CiteSeerFetcherPanel ths = this;
public CiteSeerFetcherPanel(SidePaneManager p0, final CiteSeerFetcher fetcher) {
- super(p0, GUIGlobals.wwwCiteSeerIcon, Globals.lang("Fetch CiteSeer"));
+ super(p0, GUIGlobals.getIconUrl("citeseer"), Globals.lang("Fetch CiteSeer"));
help = new HelpAction(Globals.helpDiag, GUIGlobals.citeSeerHelp, "Help");
diff --git a/src/java/net/sf/jabref/imports/GeneralFetcher.java b/src/java/net/sf/jabref/imports/GeneralFetcher.java
index d2f5fb3..9aa3514 100644
--- a/src/java/net/sf/jabref/imports/GeneralFetcher.java
+++ b/src/java/net/sf/jabref/imports/GeneralFetcher.java
@@ -28,7 +28,7 @@ public class GeneralFetcher extends SidePaneComponent implements ActionListener
GridBagLayout gbl = new GridBagLayout();
GridBagConstraints con = new GridBagConstraints();
JButton go = new JButton(Globals.lang("Fetch")),
- helpBut = new JButton(new ImageIcon(GUIGlobals.helpIconFile));
+ helpBut = new JButton(GUIGlobals.getImage("helpSmall"));
HelpAction help;
EntryFetcher fetcher;
SidePaneManager sidePaneManager;
diff --git a/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java b/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java
index c4116b3..82a207a 100644
--- a/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java
+++ b/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java
@@ -87,7 +87,7 @@ public class IEEEXploreFetcher implements Runnable, EntryFetcher {
public URL getIcon() {
- return GUIGlobals.wwwIcon;
+ return GUIGlobals.getIconUrl("www");
}
public String getHelpPage() {
diff --git a/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java b/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
index f170726..24719a9 100644
--- a/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
+++ b/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
@@ -39,6 +39,9 @@ import java.util.zip.ZipFile;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableColumnModel;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
+import com.jgoodies.forms.layout.Sizes;
+
/**
* Dialog to manage custom importers.
*/
@@ -52,16 +55,16 @@ public class ImportCustomizationDialog extends JDialog {
private JButton closeButton = new JButton(Globals.lang("Close"));
private JButton helpButton = new JButton(Globals.lang("Help"));
- private JPanel optionsPanel = new JPanel();
+ private JPanel buttons = new JPanel();
private JPanel mainPanel = new JPanel();
private JTable customImporterTable;
private JabRefPreferences prefs = Globals.prefs;
private ImportCustomizationDialog importCustomizationDialog;
-
+
/*
- * (non-Javadoc)
- * @see java.awt.Component#getSize()
- */
+ * (non-Javadoc)
+ * @see java.awt.Component#getSize()
+ */
public Dimension getSize() {
int width = GUIGlobals.IMPORT_DIALOG_COL_0_WIDTH
+ GUIGlobals.IMPORT_DIALOG_COL_1_WIDTH
@@ -69,7 +72,7 @@ public class ImportCustomizationDialog extends JDialog {
+ GUIGlobals.IMPORT_DIALOG_COL_3_WIDTH;
return new Dimension(width, width/2);
}
-
+
/**
* Converts a path relative to a base-path into a class name.
*
@@ -85,9 +88,9 @@ public class ImportCustomizationDialog extends JDialog {
path = path.getParentFile();
}
className = className.substring(0, className.lastIndexOf('.'));
- return className;
+ return className;
}
-
+
/**
* Adds an importer to the model that underlies the custom importers.
*
@@ -98,7 +101,7 @@ public class ImportCustomizationDialog extends JDialog {
Globals.importFormatReader.resetImportFormats();
((ImportTableModel)customImporterTable.getModel()).fireTableDataChanged();
}
-
+
/**
*
* @param frame_
@@ -108,10 +111,10 @@ public class ImportCustomizationDialog extends JDialog {
super(frame_, Globals.lang("Manage custom imports"), false);
this.importCustomizationDialog = this;
frame = frame_;
-
+
addFromFolderButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- CustomImportList.Importer importer = prefs.customImports.new Importer();
+ CustomImportList.Importer importer = prefs.customImports.new Importer();
importer.setBasePath( Globals.getNewDir(frame, new File(prefs.get("workingDirectory")), "",
Globals.lang("Select Classpath of New Importer"), JFileChooser.CUSTOM_DIALOG, false) );
String chosenFileStr = Globals.getNewFile(frame, importer.getBasePath(), ".class",
@@ -121,12 +124,12 @@ public class ImportCustomizationDialog extends JDialog {
importer.setClassName( pathToClass(importer.getBasePath(), new File(chosenFileStr)) );
importer.setName( importer.getInstance().getFormatName() );
importer.setCliId( importer.getInstance().getCLIId() );
- } catch (Exception exc) {
+ } catch (Exception exc) {
exc.printStackTrace();
JOptionPane.showMessageDialog(frame, Globals.lang("Could not instantiate %0 %1", chosenFileStr + ":\n", exc.getMessage()));
} catch (NoClassDefFoundError exc) {
exc.printStackTrace();
- JOptionPane.showMessageDialog(frame, Globals.lang("Could not instantiate %0 %1. Have you chosen the correct package path?", chosenFileStr + ":\n", exc.getMessage()));
+ JOptionPane.showMessageDialog(frame, Globals.lang("Could not instantiate %0 %1. Have you chosen the correct package path?", chosenFileStr + ":\n", exc.getMessage()));
}
addOrReplaceImporter(importer);
@@ -148,16 +151,16 @@ public class ImportCustomizationDialog extends JDialog {
zipFile = new ZipFile(new File(basePath), ZipFile.OPEN_READ);
} catch (IOException exc) {
exc.printStackTrace();
- JOptionPane.showMessageDialog(frame, Globals.lang("Could not open %0 %1", basePath + ":\n", exc.getMessage())
+ JOptionPane.showMessageDialog(frame, Globals.lang("Could not open %0 %1", basePath + ":\n", exc.getMessage())
+ "\n" + Globals.lang("Have you chosen the correct package path?"));
- return;
+ return;
} catch (NoClassDefFoundError exc) {
exc.printStackTrace();
JOptionPane.showMessageDialog(frame, Globals.lang("Could not instantiate %0 %1", basePath + ":\n", exc.getMessage())
- + "\n" + Globals.lang("Have you chosen the correct package path?"));
+ + "\n" + Globals.lang("Have you chosen the correct package path?"));
}
}
-
+
if (zipFile != null) {
ZipFileChooser zipFileChooser = new ZipFileChooser(importCustomizationDialog, zipFile);
zipFileChooser.setVisible(true);
@@ -168,7 +171,7 @@ public class ImportCustomizationDialog extends JDialog {
}
});
addFromJarButton.setToolTipText(Globals.lang("Add a (compiled) custom ImportFormat class from a Zip-archive.\nThe Zip-archive need not be on the classpath of JabRef."));
-
+
showDescButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
int row = customImporterTable.getSelectedRow();
@@ -177,7 +180,7 @@ public class ImportCustomizationDialog extends JDialog {
try {
ImportFormat importFormat = importer.getInstance();
JOptionPane.showMessageDialog(frame, importFormat.getDescription());
- } catch (Exception exc) {
+ } catch (Exception exc) {
exc.printStackTrace();
JOptionPane.showMessageDialog(frame, Globals.lang("Could not instantiate %0 %1", importer.getName() + ":\n", exc.getMessage()));
}
@@ -186,7 +189,7 @@ public class ImportCustomizationDialog extends JDialog {
}
}
});
-
+
removeButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
int row = customImporterTable.getSelectedRow();
@@ -236,16 +239,20 @@ public class ImportCustomizationDialog extends JDialog {
am.put("close", closeAction);
mainPanel.setLayout(new BorderLayout());
mainPanel.add(sp, BorderLayout.CENTER);
- optionsPanel.add(addFromFolderButton);
- optionsPanel.add(addFromJarButton);
- optionsPanel.add(showDescButton);
- optionsPanel.add(removeButton);
- optionsPanel.add(closeButton);
- optionsPanel.add(Box.createHorizontalStrut(5));
- optionsPanel.add(helpButton);
+ ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
+ buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+ bb.addGlue();
+ bb.addGridded(addFromFolderButton);
+ bb.addGridded(addFromJarButton);
+ bb.addGridded(showDescButton);
+ bb.addGridded(removeButton);
+ bb.addGridded(closeButton);
+ bb.addUnrelatedGap();
+ bb.addGridded(helpButton);
+ bb.addGlue();
getContentPane().add(mainPanel, BorderLayout.CENTER);
- getContentPane().add(optionsPanel, BorderLayout.SOUTH);
+ getContentPane().add(buttons, BorderLayout.SOUTH);
this.setSize(getSize());
pack();
Util.placeDialog(this, frame);
@@ -257,12 +264,12 @@ public class ImportCustomizationDialog extends JDialog {
*/
class ImportTableModel extends AbstractTableModel {
private String[] columnNames = new String[] {
- Globals.lang("Import name"),
+ Globals.lang("Import name"),
Globals.lang("Command line id"),
Globals.lang("ImportFormat class"),
Globals.lang("Contained in")
};
-
+
public Object getValueAt(int rowIndex, int columnIndex) {
Object value = null;
CustomImportList.Importer importer = getImporter(rowIndex);
@@ -277,7 +284,7 @@ public class ImportCustomizationDialog extends JDialog {
}
return value;
}
-
+
public int getColumnCount() {
return columnNames.length;
}
@@ -293,7 +300,7 @@ public class ImportCustomizationDialog extends JDialog {
public CustomImportList.Importer getImporter(int rowIndex) {
CustomImportList.Importer[] importers = (CustomImportList.Importer[])Globals.prefs.customImports.toArray(new CustomImportList.Importer[] {});
return importers[rowIndex];
- }
+ }
}
}
diff --git a/src/java/net/sf/jabref/imports/ImportFormatReader.java b/src/java/net/sf/jabref/imports/ImportFormatReader.java
index 03406f5..5893798 100644
--- a/src/java/net/sf/jabref/imports/ImportFormatReader.java
+++ b/src/java/net/sf/jabref/imports/ImportFormatReader.java
@@ -472,6 +472,7 @@ public class ImportFormatReader {
bestResult = entryCount;
usedFormat = imFo.getFormatName();
entryList = entries;
+ //System.out.println("Looks good: "+imFo.getFormatName());
}
} catch (IOException ex) {
//ex.printStackTrace();
diff --git a/src/java/net/sf/jabref/imports/ImportMenuItem.java b/src/java/net/sf/jabref/imports/ImportMenuItem.java
index 9442e4f..7c7e4ab 100644
--- a/src/java/net/sf/jabref/imports/ImportMenuItem.java
+++ b/src/java/net/sf/jabref/imports/ImportMenuItem.java
@@ -3,6 +3,7 @@ package net.sf.jabref.imports;
import net.sf.jabref.*;
import net.sf.jabref.undo.NamedCompound;
import net.sf.jabref.undo.UndoableInsertEntry;
+import net.sf.jabref.undo.UndoableRemoveEntry;
import net.sf.jabref.gui.ImportInspectionDialog;
import javax.swing.*;
@@ -15,6 +16,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.HashMap;
+// TODO: could separate the "menu item" functionality from the importing functionality
public class ImportMenuItem extends JMenuItem implements ActionListener {
JabRefFrame frame;
@@ -41,6 +43,21 @@ public class ImportMenuItem extends JMenuItem implements ActionListener {
worker.getWorker().run();
worker.getCallBack().update();
}
+
+ /**
+ * Automatically imports the files given as arguments
+ * @param filenames List of files to import
+ */
+ public void automatedImport(String filenames[]) {
+ // replace the work of the init step:
+ MyWorker worker = new MyWorker();
+ worker.fileOk = true;
+ worker.filenames = filenames;
+
+ worker.getWorker().run();
+ worker.getCallBack().update();
+ }
+
class MyWorker extends AbstractWorker implements ImportInspectionDialog.CallBack {
String[] filenames = null, formatName = null;
@@ -61,10 +78,9 @@ public class ImportMenuItem extends JMenuItem implements ActionListener {
frame.output(Globals.lang("Starting import"));
//frame.output(Globals.lang("Importing file") + ": '" + filename + "'");
fileOk = true;
-
+
Globals.prefs.put("workingDirectory", filenames[0]);
}
-
}
public void run() {
@@ -86,13 +102,11 @@ public class ImportMenuItem extends JMenuItem implements ActionListener {
else
// Unknown format:
imports.add(Globals.importFormatReader.importUnknownFormat(filename));
-
}
// Ok, done. Then try to gather in all we have found. Since we might have found
// one or more bibtex results, it's best to gather them in a BibtexDatabase.
bibtexResult = mergeImportResults(imports);
-
}
public void update() {
@@ -126,8 +140,26 @@ public class ImportMenuItem extends JMenuItem implements ActionListener {
i.hasNext();) {
BibtexEntry entry = (BibtexEntry) i.next();
try {
- toAddTo.insertEntry(entry);
- ce.addEdit(new UndoableInsertEntry(toAddTo, entry, panel));
+ // Check if the entry is a duplicate of an existing one:
+ boolean keepEntry = true;
+ BibtexEntry duplicate = Util.containsDuplicate(toAddTo, entry);
+ if (duplicate != null) {
+ int answer = DuplicateResolverDialog.resolveDuplicateInImport
+ (frame, duplicate, entry);
+ // The upper entry is the
+ if (answer == DuplicateResolverDialog.DO_NOT_IMPORT)
+ keepEntry = false;
+ if (answer == DuplicateResolverDialog.IMPORT_AND_DELETE_OLD) {
+ // Remove the old one and import the new one.
+ toAddTo.removeEntry(duplicate.getId());
+ ce.addEdit(new UndoableRemoveEntry(toAddTo, duplicate, panel));
+ }
+ }
+ // Add the entry, if we are supposed to:
+ if (keepEntry) {
+ toAddTo.insertEntry(entry);
+ ce.addEdit(new UndoableInsertEntry(toAddTo, entry, panel));
+ }
} catch (KeyCollisionException e) {
e.printStackTrace();
}
@@ -184,7 +216,7 @@ public class ImportMenuItem extends JMenuItem implements ActionListener {
}
*/
- if (worker.bibtexResult != null) {
+ if ((worker != null) && (worker.bibtexResult != null)) {
frame.output(Globals.lang("Imported entries") + ": " + entriesImported);
// + " " + Globals.lang("Format used") + ": " + worker.formatName);
}
@@ -215,6 +247,7 @@ public class ImportMenuItem extends JMenuItem implements ActionListener {
if (o[1] instanceof List) {
List entries = (List) o[1];
anythingUseful = anythingUseful | (entries.size() > 0);
+ Util.setAutomaticFields(entries); // set timestamp and owner
for (Iterator j = entries.iterator(); j.hasNext();) {
BibtexEntry entry = (BibtexEntry) j.next();
try {
diff --git a/src/java/net/sf/jabref/imports/IsiImporter.java b/src/java/net/sf/jabref/imports/IsiImporter.java
index 5a6d8a5..c64454d 100644
--- a/src/java/net/sf/jabref/imports/IsiImporter.java
+++ b/src/java/net/sf/jabref/imports/IsiImporter.java
@@ -11,6 +11,7 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Iterator;
import java.util.regex.Pattern;
import net.sf.jabref.BibtexFields;
@@ -201,8 +202,19 @@ public class IsiImporter extends ImportFormat {
BibtexEntry b =
new BibtexEntry(BibtexFields.DEFAULT_BIBTEXENTRY_ID, Globals.getEntryType(Type)); // id assumes an existing database so don't
- // create one here
- b.setField(hm);
+ // Remove empty fields:
+ ArrayList toRemove = new ArrayList();
+ for (Iterator it = hm.keySet().iterator(); it.hasNext();) {
+ Object key = it.next();
+ String content = (String)hm.get(key);
+ if ((content == null) || (content.trim().length() == 0))
+ toRemove.add(key);
+ }
+ for (Iterator iterator = toRemove.iterator(); iterator.hasNext();) {
+ hm.remove(iterator.next());
+
+ }
+ b.setField(hm);
bibitems.add(b);
}
diff --git a/src/java/net/sf/jabref/imports/MedlineFetcher.java b/src/java/net/sf/jabref/imports/MedlineFetcher.java
index 358b4ac..f74e480 100644
--- a/src/java/net/sf/jabref/imports/MedlineFetcher.java
+++ b/src/java/net/sf/jabref/imports/MedlineFetcher.java
@@ -70,11 +70,11 @@ public class MedlineFetcher extends SidePaneComponent implements Runnable,
AuthorDialog authorDialog;
JFrame jFrame; // invisible dialog holder
JButton go = new JButton(Globals.lang("Fetch")),
- helpBut = new JButton(new ImageIcon(GUIGlobals.helpIconFile));
+ helpBut = new JButton(GUIGlobals.getImage("helpSmall"));
HelpAction help;
public MedlineFetcher(SidePaneManager p0) {
- super(p0, GUIGlobals.fetchMedlineIcon, Globals.lang("Fetch Medline"));
+ super(p0, GUIGlobals.getIconUrl("medline"), Globals.lang("Fetch Medline"));
help = new HelpAction(Globals.helpDiag, GUIGlobals.medlineHelp, "Help");
helpBut.addActionListener(help);
diff --git a/src/java/net/sf/jabref/imports/OpenDatabaseAction.java b/src/java/net/sf/jabref/imports/OpenDatabaseAction.java
index d60e803..d804edc 100644
--- a/src/java/net/sf/jabref/imports/OpenDatabaseAction.java
+++ b/src/java/net/sf/jabref/imports/OpenDatabaseAction.java
@@ -15,7 +15,7 @@ public class OpenDatabaseAction extends MnemonicAwareAction {
private JabRefFrame frame;
public OpenDatabaseAction(JabRefFrame frame, boolean showDialog) {
- super(new ImageIcon(GUIGlobals.openIconFile));
+ super(GUIGlobals.getImage("open"));
this.frame = frame;
this.showDialog = showDialog;
putValue(NAME, "Open database");
@@ -31,8 +31,10 @@ public class OpenDatabaseAction extends MnemonicAwareAction {
String[] chosen = Globals.getMultipleFiles(frame, new File(Globals.prefs.get("workingDirectory")), ".bib",
true);
- if (chosen != null) for (int i=0; i<chosen.length; i++)
- filesToOpen.add(new File(chosen[i]));
+ if (chosen != null) for (int i=0; i<chosen.length; i++) {
+ if (chosen[i] != null)
+ filesToOpen.add(new File(chosen[i]));
+ }
/*
String chosenFile = Globals.getNewFile(frame,
@@ -76,6 +78,7 @@ public class OpenDatabaseAction extends MnemonicAwareAction {
public void run() {
frame.addTab(bp, file, raisePanel);
+
}
}
@@ -88,87 +91,15 @@ public class OpenDatabaseAction extends MnemonicAwareAction {
// Should this be done _after_ we know it was successfully opened?
String encoding = Globals.prefs.get("defaultEncoding");
ParserResult pr = loadDatabase(file, encoding);
- if ((pr == null) || (pr == ParserResult.INVALID_FORMAT)) {
- JOptionPane.showMessageDialog(null, Globals.lang("Error opening file"+" '"+fileName+"'"),
- Globals.lang("Error"),
- JOptionPane.ERROR_MESSAGE);
-
- return;
- }
-
- BibtexDatabase db = pr.getDatabase();
- HashMap meta = pr.getMetaData();
-
- if (pr.hasWarnings()) {
- final String[] wrns = pr.warnings();
- (new Thread() {
- public void run() {
- StringBuffer wrn = new StringBuffer();
- for (int i = 0; i < wrns.length; i++)
- wrn.append(i + 1).append(". ").append(wrns[i]).append("\n");
-
- if (wrn.length() > 0)
- wrn.deleteCharAt(wrn.length() - 1);
- // Note to self or to someone else: The following line causes an
- // ArrayIndexOutOfBoundsException in situations with a large number of
- // warnings; approx. 5000 for the database I opened when I observed the problem
- // (duplicate key warnings). I don't think this is a big problem for normal situations,
- // and it may possibly be a bug in the Swing code.
- JOptionPane.showMessageDialog(frame, wrn.toString(),
- Globals.lang("Warnings"),
- JOptionPane.WARNING_MESSAGE);
- }
- }).start();
- }
-
- BasePanel bp = new BasePanel(frame, db, file, meta, pr.getEncoding());
-
- /*
- if (Globals.prefs.getBoolean("autoComplete")) {
- db.setCompleters(autoCompleters);
- }
- */
-
- // file is set to null inside the EventDispatcherThread
- SwingUtilities.invokeLater(new OpenItSwingHelper(bp, file, raisePanel));
-
- // See if any custom entry types were imported, but disregard those we already know:
- for (Iterator i = pr.getEntryTypes().keySet().iterator(); i.hasNext();) {
- String typeName = ((String) i.next()).toLowerCase();
- if (BibtexEntryType.ALL_TYPES.get(typeName) != null)
- i.remove();
- }
- if (pr.getEntryTypes().size() > 0) {
-
+ if ((pr == null) || (pr == ParserResult.INVALID_FORMAT)) {
+ JOptionPane.showMessageDialog(null, Globals.lang("Error opening file" + " '" + fileName + "'"),
+ Globals.lang("Error"),
+ JOptionPane.ERROR_MESSAGE);
- StringBuffer sb = new StringBuffer(Globals.lang("Custom entry types found in file") + ": ");
- Object[] types = pr.getEntryTypes().keySet().toArray();
- Arrays.sort(types);
- for (int i = 0; i < types.length; i++) {
- sb.append(types[i].toString()).append(", ");
- }
- String s = sb.toString();
- int answer = JOptionPane.showConfirmDialog(frame,
- s.substring(0, s.length() - 2) + ".\n"
- + Globals.lang("Remember these entry types?"),
- Globals.lang("Custom entry types"),
- JOptionPane.YES_NO_OPTION,
- JOptionPane.QUESTION_MESSAGE);
- if (answer == JOptionPane.YES_OPTION) {
- // Import
- HashMap et = pr.getEntryTypes();
- for (Iterator i = et.keySet().iterator(); i.hasNext();) {
- BibtexEntryType typ = (BibtexEntryType) et.get(i.next());
- //System.out.println(":"+typ.getName()+"\n"+typ.toString());
- BibtexEntryType.ALL_TYPES.put(typ.getName().toLowerCase(), typ);
- }
-
- }
+ return;
}
- frame.output(Globals.lang("Opened database") + " '" + fileName +
- "' " + Globals.lang("with") + " " +
- db.getEntryCount() + " " + Globals.lang("entries") + ".");
+ addNewDatabase(pr, file, raisePanel);
} catch (Exception ex) {
//ex.printStackTrace();
@@ -182,6 +113,84 @@ public class OpenDatabaseAction extends MnemonicAwareAction {
}
}
+ public void addNewDatabase(ParserResult pr, File file,
+ boolean raisePanel) {
+
+ String fileName = file.getPath();
+ BibtexDatabase db = pr.getDatabase();
+ HashMap meta = pr.getMetaData();
+
+ if (pr.hasWarnings()) {
+ final String[] wrns = pr.warnings();
+ (new Thread() {
+ public void run() {
+ StringBuffer wrn = new StringBuffer();
+ for (int i = 0; i < wrns.length; i++)
+ wrn.append(i + 1).append(". ").append(wrns[i]).append("\n");
+
+ if (wrn.length() > 0)
+ wrn.deleteCharAt(wrn.length() - 1);
+ // Note to self or to someone else: The following line causes an
+ // ArrayIndexOutOfBoundsException in situations with a large number of
+ // warnings; approx. 5000 for the database I opened when I observed the problem
+ // (duplicate key warnings). I don't think this is a big problem for normal situations,
+ // and it may possibly be a bug in the Swing code.
+ JOptionPane.showMessageDialog(frame, wrn.toString(),
+ Globals.lang("Warnings"),
+ JOptionPane.WARNING_MESSAGE);
+ }
+ }).start();
+ }
+ BasePanel bp = new BasePanel(frame, db, file, meta, pr.getEncoding());
+ /*
+ if (Globals.prefs.getBoolean("autoComplete")) {
+ db.setCompleters(autoCompleters);
+ }
+ */
+
+ // file is set to null inside the EventDispatcherThread
+ SwingUtilities.invokeLater(new OpenItSwingHelper(bp, file, raisePanel));
+
+ // See if any custom entry types were imported, but disregard those we already know:
+ for (Iterator i = pr.getEntryTypes().keySet().iterator(); i.hasNext();) {
+ String typeName = ((String) i.next()).toLowerCase();
+ if (BibtexEntryType.ALL_TYPES.get(typeName) != null)
+ i.remove();
+ }
+ if (pr.getEntryTypes().size() > 0) {
+
+
+ StringBuffer sb = new StringBuffer(Globals.lang("Custom entry types found in file") + ": ");
+ Object[] types = pr.getEntryTypes().keySet().toArray();
+ Arrays.sort(types);
+ for (int i = 0; i < types.length; i++) {
+ sb.append(types[i].toString()).append(", ");
+ }
+ String s = sb.toString();
+ int answer = JOptionPane.showConfirmDialog(frame,
+ s.substring(0, s.length() - 2) + ".\n"
+ + Globals.lang("Remember these entry types?"),
+ Globals.lang("Custom entry types"),
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE);
+ if (answer == JOptionPane.YES_OPTION) {
+ // Import
+ HashMap et = pr.getEntryTypes();
+ for (Iterator i = et.keySet().iterator(); i.hasNext();) {
+ BibtexEntryType typ = (BibtexEntryType) et.get(i.next());
+ //System.out.println(":"+typ.getName()+"\n"+typ.toString());
+ BibtexEntryType.ALL_TYPES.put(typ.getName().toLowerCase(), typ);
+ }
+
+ }
+ }
+
+ frame.output(Globals.lang("Opened database") + " '" + fileName +
+ "' " + Globals.lang("with") + " " +
+ db.getEntryCount() + " " + Globals.lang("entries") + ".");
+
+ }
+
public static ParserResult loadDatabase(File fileToOpen, String encoding)
throws IOException {
diff --git a/src/java/net/sf/jabref/imports/RisImporter.java b/src/java/net/sf/jabref/imports/RisImporter.java
index b8ceb71..d66455c 100644
--- a/src/java/net/sf/jabref/imports/RisImporter.java
+++ b/src/java/net/sf/jabref/imports/RisImporter.java
@@ -7,6 +7,8 @@ import java.io.IOException;
import java.util.List;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
+
import net.sf.jabref.BibtexEntry;
import net.sf.jabref.Globals;
import net.sf.jabref.AuthorList;
@@ -191,6 +193,19 @@ public class RisImporter extends ImportFormat {
hm.put("pages", StartPage + "--" + EndPage);
BibtexEntry b = new BibtexEntry(BibtexFields.DEFAULT_BIBTEXENTRY_ID, Globals
.getEntryType(Type)); // id assumes an existing database so don't
+
+ // Remove empty fields:
+ ArrayList toRemove = new ArrayList();
+ for (Iterator it = hm.keySet().iterator(); it.hasNext();) {
+ Object key = it.next();
+ String content = (String)hm.get(key);
+ if ((content == null) || (content.trim().length() == 0))
+ toRemove.add(key);
+ }
+ for (Iterator iterator = toRemove.iterator(); iterator.hasNext();) {
+ hm.remove(iterator.next());
+
+ }
// create one here
b.setField(hm);
diff --git a/src/java/net/sf/jabref/journals/ManageJournalsPanel.java b/src/java/net/sf/jabref/journals/ManageJournalsPanel.java
index e733bba..51f1905 100644
--- a/src/java/net/sf/jabref/journals/ManageJournalsPanel.java
+++ b/src/java/net/sf/jabref/journals/ManageJournalsPanel.java
@@ -50,14 +50,14 @@ public class ManageJournalsPanel extends JPanel{
JRadioButton newFile = new JRadioButton(Globals.lang("New file")),
oldFile = new JRadioButton(Globals.lang("Existing file"));
- JButton add = new JButton(new ImageIcon(GUIGlobals.addIconFile)),
- remove = new JButton(new ImageIcon(GUIGlobals.removeIconFile)),
+ JButton add = new JButton(GUIGlobals.getImage("add")),
+ remove = new JButton(GUIGlobals.getImage("remove")),
ok = new JButton(Globals.lang("Ok")),
cancel = new JButton(Globals.lang("Cancel")),
help = new JButton(Globals.lang("Help")),
browseOld = new JButton(Globals.lang("Browse")),
browseNew = new JButton(Globals.lang("Browse")),
- addExt = new JButton(new ImageIcon(GUIGlobals.addIconFile));
+ addExt = new JButton(GUIGlobals.getImage("add"));
public ManageJournalsPanel(final JabRefFrame frame) {
@@ -79,8 +79,6 @@ public class ManageJournalsPanel extends JPanel{
CellConstraints cc = new CellConstraints();
- JPanel pan = new JPanel();
-
/*JLabel description = new JLabel("<HTML>"+Globals.lang("JabRef can switch journal names between "
+"abbreviated and full form. Since it knows only a limited number of journal names, "
+"you may need to add your own definitions.")+"</HTML>");*/
@@ -119,7 +117,7 @@ public class ManageJournalsPanel extends JPanel{
bb.addGlue();
bb.addGridded(ok);
bb.addGridded(cancel);
- bb.addGridded((JComponent)Box.createHorizontalStrut(10));
+ bb.addUnrelatedGap();
bb.addGridded(help);
bb.addGlue();
bb.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -197,7 +195,8 @@ public class ManageJournalsPanel extends JPanel{
});
//dialog.pack();
- dialog.setSize(600,700);
+ int xSize = getPreferredSize().width;
+ dialog.setSize(xSize+10,700);
}
public JDialog getDialog() {
@@ -238,6 +237,7 @@ public class ManageJournalsPanel extends JPanel{
JScrollPane pane = new JScrollPane(builder.getPanel());
pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
externalFilesPanel.setMinimumSize(new Dimension(400,400));
+ externalFilesPanel.setPreferredSize(new Dimension(400,400));
externalFilesPanel.removeAll();
externalFilesPanel.add(pane, BorderLayout.CENTER);
externalFilesPanel.revalidate();
@@ -534,7 +534,7 @@ public class ManageJournalsPanel extends JPanel{
private JTextField tf;
private JButton browse = new JButton(Globals.lang("Browse")),
view = new JButton(Globals.lang("Preview")),
- clear = new JButton(new ImageIcon(GUIGlobals.removeIconFile)),
+ clear = new JButton(GUIGlobals.getImage("delete")),
download = new JButton(Globals.lang("Download"));
public ExternalFileEntry() {
tf = new JTextField();
diff --git a/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java b/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java
index 958e7d7..10b314e 100644
--- a/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java
+++ b/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java
@@ -39,7 +39,7 @@ public class LabelPatternUtil {
* where the fields are the (required) fields of a BibTex entry. The string is split
* into firlds and spacers by recognizing the [ and ].
*
- * @param keyPattern a <code>String</code>
+ * @param labelPattern a <code>String</code>
* @return an <code>ArrayList</code> The first item of the list
* is a string representation of the key pattern (the parameter),
* the second item is the spacer character (a <code>String</code>).
@@ -298,7 +298,8 @@ public class LabelPatternUtil {
// Abbreviate - that is,
//System.out.println(_sbvalue.toString());
StringBuffer abbr = new StringBuffer();
- String[] words = _sbvalue.toString().split("\\b");
+ String[] words = _sbvalue.toString().replaceAll("[\\{\\}]","")
+ .split("[ \r\n]");//split("\\b");
for (int word=0; word<words.length; word++)
if (words[word].length() > 0)
abbr.append(words[word].charAt(0));
@@ -537,7 +538,7 @@ public class LabelPatternUtil {
/**
* Gets the surnames of the first N authors and appends EtAl if there are more than N authors
* @param authorField a <code>String</code>
- * @param int n the number of desired authors
+ * @param n the number of desired authors
* @return Gets the surnames of the first N authors and appends EtAl if there are more than N authors
*/
private static String NAuthors(String authorField, int n) {
diff --git a/src/java/net/sf/jabref/net/URLDownload.java b/src/java/net/sf/jabref/net/URLDownload.java
index 7140f3a..bec7097 100644
--- a/src/java/net/sf/jabref/net/URLDownload.java
+++ b/src/java/net/sf/jabref/net/URLDownload.java
@@ -5,6 +5,8 @@
package net.sf.jabref.net;
import java.awt.Component;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -31,8 +33,8 @@ public class URLDownload {
}
public void download() throws IOException {
- InputStream input = source.openStream();
- FileOutputStream output = new FileOutputStream(dest);
+ InputStream input = new BufferedInputStream(source.openStream());
+ OutputStream output = new BufferedOutputStream(new FileOutputStream(dest));
try
{
@@ -57,19 +59,14 @@ public class URLDownload {
public void copy(InputStream in, OutputStream out) throws IOException
{
- ProgressMonitorInputStream _in = new ProgressMonitorInputStream(parent, "Downloading " + source.toString(), in);
- byte[] buffer = new byte[256];
- synchronized(in)
- {
- synchronized(out)
- {
- while(true)
- {
- int bytesRead = _in.read(buffer);
- if(bytesRead == -1) break;
- out.write(buffer, 0, bytesRead);
- }
- }
- }
- }
+ InputStream _in = new ProgressMonitorInputStream(parent, "Downloading " + source.toString(), in);
+ byte[] buffer = new byte[512];
+ int reps=0;
+ while(true)
+ {
+ int bytesRead = _in.read(buffer);
+ if(bytesRead == -1) break;
+ out.write(buffer, 0, bytesRead);
+ }
+ }
}
diff --git a/src/java/net/sf/jabref/wizard/auximport/AuxSubGenerator.java b/src/java/net/sf/jabref/wizard/auximport/AuxSubGenerator.java
index f50fd80..4a8d3a2 100644
--- a/src/java/net/sf/jabref/wizard/auximport/AuxSubGenerator.java
+++ b/src/java/net/sf/jabref/wizard/auximport/AuxSubGenerator.java
@@ -69,7 +69,7 @@ public class AuxSubGenerator
private BibtexDatabase auxDB ; // contains only the bibtex keys who found in aux file
private int nestedAuxCounter ; // counts the nested aux files
-
+ private int crossreferencedEntriesCount = 0; // counts entries pulled in due to crossref
public AuxSubGenerator(BibtexDatabase refDBase)
{
@@ -283,31 +283,56 @@ public class AuxSubGenerator
notFoundList.add(str) ;
} else
{
- try
- {
- auxDB.insertEntry( entry ) ;
- }
- catch (Exception e) {}
+ insertEntry(auxDB, entry);
+ // Check if the entry we just found references another entry which
+ // we don't already have in our list of entries to include. If so,
+ // pull in that entry as well:
+ String crossref = (String)entry.getField("crossref");
+ if ((crossref != null) && (!mySet.contains(crossref))) {
+ BibtexEntry refEntry = db.getEntryByKey(crossref);
+ if (entry == null) {
+ notFoundList.add(crossref);
+ } else {
+ insertEntry(auxDB, refEntry);
+ crossreferencedEntriesCount++;
+ }
+ }
+
}
}
}
- /**
- * generate
- * Shortcut methode for easy generation.
- *
- * @param auxFileName String
- * @param bibDB BibtexDatabase - reference database
- * @return Vector - contains all not resolved bibtex entries
- */
- public final Vector generate(String auxFileName, BibtexDatabase bibDB)
- {
- setReferenceDatabase(bibDB);
- parseAuxFile(auxFileName) ;
- resolveTags();
+ /**
+ * Insert a clone of the given entry. The clone is given a new unique ID.
+ * @param auxDB The database to insert into.
+ * @param entry The entry to insert a copy of.
+ */
+ private void insertEntry(BibtexDatabase auxDB, BibtexEntry entry) {
+ try {
+ BibtexEntry clonedEntry = (BibtexEntry)entry.clone();
+ clonedEntry.setId(Util.createNeutralId());
+ auxDB.insertEntry(clonedEntry);
+ } catch (KeyCollisionException e) {
+ e.printStackTrace();
+ }
+ }
- return notFoundList ;
- }
+ /**
+ * generate
+ * Shortcut methode for easy generation.
+ *
+ * @param auxFileName String
+ * @param bibDB BibtexDatabase - reference database
+ * @return Vector - contains all not resolved bibtex entries
+ */
+ public final Vector generate(String auxFileName, BibtexDatabase bibDB)
+ {
+ setReferenceDatabase(bibDB);
+ parseAuxFile(auxFileName) ;
+ resolveTags();
+
+ return notFoundList ;
+ }
public BibtexDatabase getGeneratedDatabase()
{
@@ -324,7 +349,7 @@ public class AuxSubGenerator
public final int getResolvedKeysCount()
{
- return auxDB.getEntryCount() ;
+ return auxDB.getEntryCount() - crossreferencedEntriesCount;
}
public final int getNotResolvedKeysCount()
@@ -332,11 +357,22 @@ public class AuxSubGenerator
return notFoundList.size() ;
}
+ /**
+ * Query the number of extra entries pulled in due to crossrefs from other
+ * entries.
+ * @return The number of additional entries pulled in due to crossref
+ */
+ public final int getCrossreferencedEntriesCount()
+ {
+ return crossreferencedEntriesCount;
+ }
+
/** reset all used datastructures */
public final void clear()
{
mySet.clear() ;
notFoundList.clear();
+ crossreferencedEntriesCount = 0;
// db = null ; ???
}
diff --git a/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java b/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
index dbdd407..4156d79 100644
--- a/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
+++ b/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
@@ -46,11 +46,13 @@ import net.sf.jabref.wizard.auximport.* ;
import java.net.URL ;
import java.io.IOException ;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
+
public class FromAuxDialog
extends JDialog
{
private JPanel statusPanel = new JPanel() ;
- private JPanel optionsPanel = new JPanel() ;
+ private JPanel buttons = new JPanel() ;
private JButton okButton = new JButton() ;
private JButton cancelButton = new JButton() ;
private JButton generateButton = new JButton() ;
@@ -107,11 +109,15 @@ public class FromAuxDialog
initStatusPanel() ;
// insert the buttons
- JPanel buttonPanel = new JPanel() ;
- buttonPanel.add( generateButton, null ) ;
- buttonPanel.add( okButton, null ) ;
- buttonPanel.add( cancelButton, null ) ;
-
+ ButtonBarBuilder bb = new ButtonBarBuilder();
+ JPanel buttonPanel = bb.getPanel();
+ buttonPanel.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+
+ bb.addGlue();
+ bb.addGridded( generateButton ) ;
+ bb.addGridded( okButton ); ;
+ bb.addGridded( cancelButton ); ;
+ bb.addGlue();
this.setModal( true ) ;
this.setResizable( false ) ;
this.setTitle( Globals.lang( "AUX file import" ) ) ;
@@ -125,7 +131,7 @@ public class FromAuxDialog
panel1.add( buttonPanel, BorderLayout.SOUTH ) ;
JPanel centerPane = new JPanel( new BorderLayout() ) ;
- centerPane.add( optionsPanel, BorderLayout.NORTH ) ;
+ centerPane.add( buttons, BorderLayout.NORTH ) ;
centerPane.add( statusPanel, BorderLayout.CENTER ) ;
@@ -133,7 +139,7 @@ public class FromAuxDialog
}
else // generate a view without the "short info" area
{
- panel1.add( optionsPanel, BorderLayout.NORTH ) ;
+ panel1.add( buttons, BorderLayout.NORTH ) ;
panel1.add( buttonPanel, BorderLayout.SOUTH ) ;
panel1.add( statusPanel, BorderLayout.CENTER ) ;
}
@@ -170,17 +176,17 @@ public class FromAuxDialog
TitledBorder border = new TitledBorder( BorderFactory.createLineBorder(
new Color( 153, 153, 153 ), 2 ),
Globals.lang( "Options" ) ) ;
- optionsPanel.setBorder( border ) ;
- optionsPanel.setLayout( gbl ) ;
+ buttons.setBorder( border ) ;
+ buttons.setLayout( gbl ) ;
// Database
JLabel lab1 = new JLabel( Globals.lang( "Reference database" ) + ":" ) ;
lab1.setHorizontalAlignment( SwingConstants.LEFT ) ;
gbl.setConstraints( lab1, con ) ;
- optionsPanel.add( lab1 ) ;
+ buttons.add( lab1 ) ;
con.gridwidth = GridBagConstraints.REMAINDER ;
gbl.setConstraints( dbChooser, con ) ;
- optionsPanel.add( dbChooser ) ;
+ buttons.add( dbChooser ) ;
// AUX
con.gridwidth = 1 ;
@@ -190,11 +196,11 @@ public class FromAuxDialog
lab1 = new JLabel( Globals.lang( "LaTeX AUX file" ) + ":" ) ;
lab1.setHorizontalAlignment( SwingConstants.LEFT ) ;
gbl.setConstraints( lab1, con ) ;
- optionsPanel.add( lab1 ) ;
+ buttons.add( lab1 ) ;
con.weightx = 1 ;
auxFileField = new JTextField( "", 25 ) ;
gbl.setConstraints( auxFileField, con ) ;
- optionsPanel.add( auxFileField ) ;
+ buttons.add( auxFileField ) ;
con.weightx = 0 ;
con.insets = new Insets( 5, 10, 15, 2 ) ;
browseAuxFileButton = new JButton( Globals.lang( "Browse" ) ) ;
@@ -202,7 +208,7 @@ public class FromAuxDialog
auxFileField,
parent ) ) ;
gbl.setConstraints( browseAuxFileButton, con ) ;
- optionsPanel.add( browseAuxFileButton ) ;
+ buttons.add( browseAuxFileButton ) ;
}
@@ -334,6 +340,9 @@ public class FromAuxDialog
auxParser.getResolvedKeysCount() ) ;
statusInfos.append( "\n" + Globals.lang( "not found" ) + " " +
auxParser.getNotResolvedKeysCount() ) ;
+ statusInfos.append( "\n" + Globals.lang( "crossreferenced entries included" ) + " " +
+ auxParser.getCrossreferencedEntriesCount() ) ;
+
int nested = auxParser.getNestedAuxCounter() ;
if ( nested > 0 )
diff --git a/src/java/net/sf/jabref/wizard/integrity/gui/IntegrityMessagePanel.java b/src/java/net/sf/jabref/wizard/integrity/gui/IntegrityMessagePanel.java
index a996752..b19eb04 100644
--- a/src/java/net/sf/jabref/wizard/integrity/gui/IntegrityMessagePanel.java
+++ b/src/java/net/sf/jabref/wizard/integrity/gui/IntegrityMessagePanel.java
@@ -198,10 +198,10 @@ public class IntegrityMessagePanel
// ---------------------------------------------------------------------------
class IntegrityListRenderer extends DefaultListCellRenderer
{
- final ImageIcon warnIcon = new ImageIcon( GUIGlobals.integrityWarn ) ;
- final ImageIcon infoIcon = new ImageIcon( GUIGlobals.integrityInfo ) ;
- final ImageIcon failIcon = new ImageIcon( GUIGlobals.integrityFail ) ;
- final ImageIcon fixedIcon = new ImageIcon( GUIGlobals.completeTagIcon) ;
+ final ImageIcon warnIcon = GUIGlobals.getImage("integrityWarn");
+ final ImageIcon infoIcon = GUIGlobals.getImage("integrityInfo");
+ final ImageIcon failIcon = GUIGlobals.getImage("integrityFail");
+ final ImageIcon fixedIcon = GUIGlobals.getImage("complete");
public Component getListCellRendererComponent(
JList list,
diff --git a/src/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java b/src/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java
index 51ebd42..31554cb 100644
--- a/src/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java
+++ b/src/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java
@@ -63,6 +63,7 @@ import javax.swing.text.* ;
import net.sf.jabref.* ;
import net.sf.jabref.wizard.integrity.gui.* ;
import net.sf.jabref.wizard.text.* ;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
public class TextInputDialog
extends JDialog implements ActionListener
@@ -71,7 +72,7 @@ public class TextInputDialog
private JButton cancelButton = new JButton() ;
private JButton insertButton = new JButton() ;
private JPanel panel1 = new JPanel() ;
- private JPanel buttonPanel = new JPanel() ;
+ private JPanel buttons = new JPanel() ;
private JPanel rawPanel = new JPanel() ;
private JPanel sourcePanel = new JPanel() ;
private IntegrityMessagePanel warnPanel;
@@ -87,7 +88,7 @@ public class TextInputDialog
private JTextPane textPane ;
private JTextArea preview ;
- private boolean inputChanged ; // input changed, fired by insert button
+ private boolean inputChanged ; // input changed, fired by insert buttons
private TagToMarkedTextStore marked ;
@@ -173,12 +174,12 @@ public class TextInputDialog
con.fill = GridBagConstraints.BOTH;
//gbl.setConstraints( tabbed, con ) ;
panel1.add( tabbed, BorderLayout.CENTER ) ;
- //gbl.setConstraints( buttonPanel, con ) ;
- panel1.add( buttonPanel, BorderLayout.SOUTH ) ;
+ //gbl.setConstraints( buttons, con ) ;
+ panel1.add( buttons, BorderLayout.SOUTH ) ;
// Key bindings:
- ActionMap am = buttonPanel.getActionMap() ;
- InputMap im = buttonPanel.getInputMap( JComponent.WHEN_IN_FOCUSED_WINDOW ) ;
+ ActionMap am = buttons.getActionMap() ;
+ InputMap im = buttons.getInputMap( JComponent.WHEN_IN_FOCUSED_WINDOW ) ;
im.put( parent.prefs().getKey( "Close dialog" ), "close" ) ;
am.put( "close", new AbstractAction()
{
@@ -277,7 +278,7 @@ public class TextInputDialog
//fieldScroller.setPreferredSize( new Dimension( 180, 190 ) ) ;
//fieldScroller.setMinimumSize( new Dimension( 180, 190 ) ) ;
- // insert button
+ // insert buttons
insertButton.setText( Globals.lang( "Insert" ) ) ;
insertButton.addActionListener( this ) ;
@@ -378,29 +379,19 @@ public class TextInputDialog
private void initButtonPanel()
{
- // Panel Layout
- GridBagLayout gbl = new GridBagLayout() ;
- GridBagConstraints con = new GridBagConstraints() ;
- con.weightx = 0 ;
- con.insets = new Insets( 5, 10, 0, 10 ) ;
- con.fill = GridBagConstraints.HORIZONTAL ;
-// buttonPanel.setLayout(gbl) ;
-
- // Buttons
okButton.setText( Globals.lang( "Accept" ) ) ;
-// okButton.setEnabled(false);
okButton.addActionListener( this ) ;
cancelButton.setText( Globals.lang( "Cancel" ) ) ;
cancelButton.addActionListener( this ) ;
- // insert Buttons
- con.gridwidth = GridBagConstraints.REMAINDER ;
- gbl.setConstraints( okButton, con ) ;
- buttonPanel.add( okButton ) ;
+ ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
+ buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+ bb.addGlue();
+ bb.addGridded(okButton);
+ bb.addGridded(cancelButton);
+ bb.addGlue();
- gbl.setConstraints( cancelButton, con ) ;
- buttonPanel.add( cancelButton ) ;
}
// ---------------------------------------------------------------------------
@@ -520,7 +511,7 @@ public class TextInputDialog
// ---------------------------------------------------------------------------
// ActionListener
-// handling of button-click actions
+// handling of buttons-click actions
public void actionPerformed( ActionEvent e )
{
Object source = e.getSource() ;
@@ -601,7 +592,7 @@ public class TextInputDialog
{
public PasteAction()
{
- super( "Paste", "Paste from clipboard", GUIGlobals.pasteIconFile ) ;
+ super( "Paste", "Paste from clipboard", GUIGlobals.getIconUrl("paste")) ;
}
public void actionPerformed( ActionEvent e )
@@ -632,7 +623,7 @@ public class TextInputDialog
{
public LoadAction()
{
- super( "Open", "Open_file", GUIGlobals.openIconFile ) ;
+ super( "Open", "Open_file", GUIGlobals.getIconUrl("open")) ;
}
public void actionPerformed( ActionEvent e )
@@ -666,7 +657,7 @@ public class TextInputDialog
{
public ClearAction()
{
- super( "Clear", "Clear_inputarea", GUIGlobals.clearInputArea ) ;
+ super( "Clear", "Clear_inputarea", GUIGlobals.getIconUrl("new")) ;
}
public void actionPerformed( ActionEvent e )
@@ -734,8 +725,8 @@ public class TextInputDialog
{
private Font baseFont ;
private Font usedFont ;
- private ImageIcon okIcon = new ImageIcon( GUIGlobals.completeTagIcon ) ;
- private ImageIcon needIcon = new ImageIcon( GUIGlobals.wrongTagIcon ) ;
+ private ImageIcon okIcon = GUIGlobals.getImage("complete");
+ private ImageIcon needIcon = GUIGlobals.getImage("wrong");
public SimpleCellRenderer( Font normFont )
{
diff --git a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
index 406a2fc..8d0e61b 100644
--- a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
+++ b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
@@ -9,6 +9,7 @@ import junit.framework.TestCase;
* formater AuthorLastFirstAbbreviator.
*
* @author Carlos Silla
+ * @author Christopher Oezbek <oezi at oezi.de>
*/
public class AuthorLastFirstAbbreviatorTester extends TestCase {
@@ -75,13 +76,25 @@ public class AuthorLastFirstAbbreviatorTester extends TestCase {
*
* Ex: Lastname, Name Middlename
*/
- //TODO: Verify how to tell this test that it should pass if fail.
-/* public void testTwoAuthorsBadFormating() {
- String name = new String("Lastname, Name Middlename and Nome Nomedomeio Sobrenome");
+ public void testTwoAuthorsBadFormating() {
+ // String name = new String("Lastname, Name Middlename and Nome Nomedomeio Sobrenome");
- AuthorLastFirstAbbreviator ab = new AuthorLastFirstAbbreviator();
-
- String result = ab.format(name);
- }*/
+ fail();
+ // @TODO: How should a Formatter fail?
+ // assertEquals("Author names must be formatted \"Last, First\" or \"Last, Jr., First\" before formatting with AuthorLastFirstAbbreviator", abbreviate(name));
+ }
+
+ /**
+ * Testcase for
+ * http://sourceforge.net/tracker/index.php?func=detail&aid=1466924&group_id=92314&atid=600306
+ */
+ public void testJrAuthor(){
+ String name = "Other, Jr., Anthony N.";
+ assertEquals("Other, A.N.", abbreviate(name));
+ }
+
+ protected String abbreviate(String name) {
+ return (new AuthorLastFirstAbbreviator()).format(name);
+ }
}
diff --git a/src/resource/Icons.properties b/src/resource/Icons.properties
new file mode 100644
index 0000000..e1f3c04
--- /dev/null
+++ b/src/resource/Icons.properties
@@ -0,0 +1,67 @@
+jabrefIcon=JabRef-icon.png
+
+new=filenew.png
+open=fileopen.png
+save=document-save.png
+saveAs=document-save-as.png
+edit=editor.png
+undo=edit-undo.png
+redo=edit-redo.png
+editPreamble=preamble.png
+copy=edit-copy.png
+paste=edit-paste.png
+cut=edit-cut.png
+about=help-about.png
+loadSession=user-home.png
+preferences=preferences.png
+help=help-browser.png
+helpSmall=help-browser.png
+helpContents=contents.png
+delete=edit-delete.png
+markEntries=mark.png
+unmarkEntries=unmark.png
+search=search.png
+incSearch=search.png
+toggleSearch=search.png
+editStrings=strings.png
+toggleGroups=grouping_morten.png
+togglePreview=edit-find.png
+makeKey=wizard.png
+openFile=pdf-new.png
+openUrl=emblem-web.png
+pdfSmall=pdf.png
+www=emblem-web.png
+wwwSmall=emblem-web-small.png
+citeseer=wwwciteseer.png
+doiSmall=doismall.png
+psSmall=postscript.png
+groupsHighlightAny=groupsHighlightAny.png
+groupsHighlightAll=groupsHighlightAll.png
+add=add.png
+remove=remove.png
+close=fileclose.png
+close2=fileclose2.png
+integrityCheck=integrity.png
+medline=emblem-web.png
+left=go-previous.png
+right=go-next.png
+up=go-up.png
+down=go-down.png
+required=reqIcon.png
+optional=optIcon.png
+general=genIcon.png
+abstract=absIcon.png
+source=viewsource.gif
+duplicate=duplicate.png
+emacs=emacs.png
+lyx=lyx2.png
+winedt=winedt.png
+refresh=view-refresh.png
+autoGroup=preferences.png
+integrityWarn=messageWarn.png
+integrityFail=messageFail.png
+integrityInfo=messageInfo.png
+complete=completeItem.png
+wrong=wrongItem.png
+groupIncluding=groupIncluding.png
+groupRefining=groupRefining.png
diff --git a/src/resource/JabRef_de.properties b/src/resource/JabRef_de.properties
index e5a16a3..8487e74 100644
--- a/src/resource/JabRef_de.properties
+++ b/src/resource/JabRef_de.properties
@@ -2083,10 +2083,25 @@ You_must_set_both_BibTeX_key_and_%0_directory=Sie_m\u00FCssen_sowohl_den_BibTeX-
You_must_set_both_bibtex_key_and_PDF_directory=Sie_m\u00fcssen_sowohl_den_BibTeX-Key,_als_auch_das_PDF-Verzeichnis_angeben
Your_new_key_bindings_have_been_stored.=Ihre_neuen_Tastenk\u00FCrzel_wurden_gespeichert.
-Float_marked_entries=
-Starting_import=
-Output=
-Exceptions=
-Program_output=
-grouping_may_not_work_for_this_entry=
+Float_marked_entries=Markierte_Eintr\u00E4ge_zuoberst_anzeigen
+
+Starting_import=Starte_Import
+
+Output=Ausgabe
+
+Exceptions=Ausnahmen
+
+Program_output=Programmausgabe
+
+grouping_may_not_work_for_this_entry=Dieser_Eintrag_unterst\u00FCtzt_m\u00F6glicherweise_keine_Gruppierung
+
+crossreferenced_entries_included=Inklusive_querverwiesenen_Eintr\u00E4gen
+
+Display_version=Version_anzeigen
+
+Override_default_font_settings=Standardschrifteinstellungen_\u00FCberschreiben
+
+Mac_file_dialog=Mac_Dateidialog
+
+Use_native_file_dialog=Plattformabh\u00E4ngigen_Dateidialog_verwenden
\ No newline at end of file
diff --git a/src/resource/JabRef_en.properties b/src/resource/JabRef_en.properties
index 2343649..6df36fd 100644
--- a/src/resource/JabRef_en.properties
+++ b/src/resource/JabRef_en.properties
@@ -4,9 +4,9 @@
!This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area._After_that,_you_can_mark_text_and_assign_it_to_a_bibtex_field.=!This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area._After_that,_you_can_mark_text_and_assign_it_to_a_bibtex_field.
-%0_contains_the_Regular_Expression_<b>%1</b>=%0_contains_the_Regular_Expression_<b>%1</b>
+%0_contains_the_Regular_Expression_<b>%1</b>=%0%0 contains_the_Regular_Expression_<b>%1</b>
-%0_contains_the_term_<b>%1</b>=%0_contains_the_term_<b>%1</b>
+%0_contains_the_term_<b>%1</b>=%0 contains_the_term_<b>%1</b>
%0_doesn't_contain_the_Regular_Expression_<b>%1</b>=%0_doesn't_contain_the_Regular_Expression_<b>%1</b>
@@ -94,7 +94,7 @@ Added_new=Added_new
Added_string=Added_string
-Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_can_be_assigned_manually_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._This_process_adds_the_term_<b>%1</b>_to_each_entry's_<b>%0</b>_field._Entries_can_be_removed_manually_from_this_group_by_selecting_them_then_using_the_context_menu._This_process_removes_the_term_<b>%1</b>_from_each_entry's_<b>%0</b>_field.=Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_ [...]
+Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_can_be_assigned_manually_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._This_process_adds_the_term_<b>%1</b>_to_each_entry's_<b>%0</b>_field._Entries_can_be_removed_manually_from_this_group_by_selecting_them_then_using_the_context_menu._This_process_removes_the_term_<b>%1</b>_from_each_entry's_<b>%0</b>_field.=Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>& [...]
Advanced=Advanced
@@ -114,7 +114,7 @@ Allow_editing_in_table_cells=Allow_editing_in_table_cells
Always_save_database_ordered_by_author_name=Always_save_database_ordered_by_author_name
-and=and
+and= and
and_the_class_must_be_available_in_your_classpath_next_time_you_start_JabRef.=and_the_class_must_be_available_in_your_classpath_next_time_you_start_JabRef.
@@ -1909,13 +1909,13 @@ This_group_contains_entries_based_on_manual_assignment._Entries_can_be_assigned_
This_group_contains_entries_in_which=This_group_contains_entries_in_which
-This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<b>%0</b>=This_group_contains_entries_in_which_any_field_contains_the_Regular_Expression_<b>%0</b>
+This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<b>%0</b>=This_group_contains_entries_in_which_any_field_contains_the_Regular_Expression_<b>%0</b>
-This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>
+This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>
-This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>
+This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>
-This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_Regular_Expression_<b>%1</b>
+This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_Regular_Expression_<b>%1</b>
This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area._After_that,_you_can_mark_text_and_assign_it_to_a_bibtex_field.=This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area._After_that,_you_can_mark_text_and_assign_it_to_a_bibtex_field.
@@ -2085,4 +2085,9 @@ Output=Output
Exceptions=Exceptions
Program_output=Program_output
-grouping_may_not_work_for_this_entry=grouping_may_not_work_for_this_entry
\ No newline at end of file
+grouping_may_not_work_for_this_entry=grouping_may_not_work_for_this_entry
+
+crossreferenced_entries_included=crossreferenced_entries_included
+Display_version=Display_version
+
+Override_default_font_settings=Override_default_font_settings
diff --git a/src/resource/JabRef_fr.properties b/src/resource/JabRef_fr.properties
index ff0ce79..601e806 100644
--- a/src/resource/JabRef_fr.properties
+++ b/src/resource/JabRef_fr.properties
@@ -3,8 +3,8 @@
#! encoding:ISO-8859-1
!This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area._After_that,_you_can_mark_text_and_assign_it_to_a_bibtex_field.=!Ceci_est_simplement_une_fen\u00eatre_de_copier-coller._Commencez_par_charger_ou_coller_du_texte_dans_la_zone_de_saisie_de_texte._Ensuite,_vous_pouvez_s\u00e9lectionner_des_portions_de_texte_et_les_attribuer_\u00e0_des_champs_BibTeX.
-%0_contains_the_Regular_Expression_<b>%1</b>=%0_contient_l'expression_r\u00e9guli\u00e8re_<b>%1</b>
-%0_contains_the_term_<b>%1</b>=%0_contient_le_terme_<b>%1</b>
+%0_contains_the_Regular_Expression_<b>%1</b>=%0 contient_l'expression_r\u00e9guli\u00e8re_<b>%1</b>
+%0_contains_the_term_<b>%1</b>=%0 contient_le_terme_<b>%1</b>
%0_doesn't_contain_the_Regular_Expression_<b>%1</b>=%0_ne_contient_pas_l'expression_r\u00e9guli\u00e8re_<b>%1</b>
%0_doesn't_contain_the_term_<b>%1</b>=%0_ne_contient_pas_le_terme_<b>%1</b>
%0_doesn't_match_the_Regular_Expression_<b>%1</b>=%0_ne_correspond_pas_\u00e0_l'expression_r\u00e9guli\u00e8re_<b>%1</b>
@@ -49,7 +49,7 @@ Added_group=Groupe_ajout\u00e9
Added_group_"%0".=Groupe_"%0"_ajout\u00e9.
Added_new=Nouvel_ajout
Added_string=Cha\u00EEne_ajout\u00E9e
-Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_can_be_assigned_manually_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._This_process_adds_the_term_<b>%1</b>_to_each_entry's_<b>%0</b>_field._Entries_can_be_removed_manually_from_this_group_by_selecting_them_then_using_the_context_menu._This_process_removes_the_term_<b>%1</b>_from_each_entry's_<b>%0</b>_field.=De_plus,_des_entr\u00e9es_dont_le_champ_<b>%0</b>_ne_contient_pas_<b>%1 [...]
+Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_can_be_assigned_manually_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._This_process_adds_the_term_<b>%1</b>_to_each_entry's_<b>%0</b>_field._Entries_can_be_removed_manually_from_this_group_by_selecting_them_then_using_the_context_menu._This_process_removes_the_term_<b>%1</b>_from_each_entry's_<b>%0</b>_field.=De_plus,_des_entr\u00e9es_dont_le_champ_<b>%0</b>_ne_contient_pas_<b>%1 [...]
Advanced=Avanc\u00E9
Advanced_options_for_setting...=Options_avanc\u00e9es_pour_la_configuration...
All_Entries=Toutes_les_entr\u00e9es
@@ -59,7 +59,7 @@ All_fields=Tous_les_champs
All_subgroups_(recursively)=Tous_les_sous-groupes_(r\u00e9cursivement)
Allow_editing_in_table_cells=Autoriser_l'\u00E9dition_dans_les_cellules_de_la_table
Always_save_database_ordered_by_author_name=Toujours_enregistrer_la_base_avec_l'ordre_auteur_nom
-and=et
+and= et
and_the_class_must_be_available_in_your_classpath_next_time_you_start_JabRef.=et_la_classe_doit_\u00EAtre_disponible_dans_votre_chemin_de_classe_la_prochaine_fois_que_vous_d\u00E9marrez_JabRef.
any_field_that_matches_the_regular_expression_<b>%0</b>=tout_champ_qui_correspond_\u00e0_l'expression_r\u00e9guli\u00e8re_<b>%0</b>
Appearance=Aspect
@@ -116,7 +116,7 @@ BibTeXML_File=BibTeXML
Binding=Affectation
Broken_link=Lien_rompu
Browse=Explorer
-by=par
+by=par_
Calling_external_viewer...=Lancement_de_l'afficheur_externe...
Cancel=Annuler
Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Les_entr\u00e9es_ne_peuvent_pas_\u00eatre_ajout\u00e9es_au_groupe_sans_g\u00e9n\u00e9rer_des_clefs._Voulez-vous_g\u00e9n\u00e9rer_des_clefs_maintenant_?
@@ -150,7 +150,7 @@ Check_links=V\u00e9rifier_les_liens
Choose_the_URL_to_download._The_default_value_points_to_a_list_provided_by_the_JabRef_developers.=Choisir_l'URL_de_t\u00e9l\u00e9chargement._La_valeur_par_d\u00e9faut_pointe_vers_une_liste_fournie_par_les_d\u00e9veloppeurs_de_JabRef
Citation_import_from_CiteSeer_failed.=L'importation_des_citations_depuis_CiteSeer_a_\u00E9chou\u00E9e.
-Cite_command_(for_Emacs/WinEdt)=Commande_de_citation_(pour_Emacs/WinEdt)
+Cite_command_(for_Emacs/WinEdt)=Commande_de_citation_(pour_Emacs/WinEdt)_
CiteSeer_Error=Erreur_CiteSeer
CiteSeer_Fetch_Error=Erreur_de_recherche_sur_CiteSeer
CiteSeer_import_entries=Entr\u00E9es_d'importation_depuis_CiteSeer
@@ -236,11 +236,11 @@ Cut_pr=Couper
Database_encoding=Encodage_de_la_base_de_donn\u00e9es
Database_has_changed._Do_you_want_to_save_before_closing?=Base_modifi\u00E9e._Voulez-vous_la_sauvegarder_avant_de_fermer_?
Database_properties=Propri\u00E9t\u00E9s_de_la_base_de_donn\u00e9es
-Date_format=Format_de_date
+Date_format=Format_de_date_
Default=D\u00E9faut
Default_encoding=Encodage_par_d\u00E9faut_
Default_grouping_field=Champ_par_d\u00E9faut_pour_les_groupes_
-Default_look_and_feel=Apparence_par_d\u00E9faut
+Default_look_and_feel=Apparence_par_d\u00E9faut_
Default_owner=Propri\u00E9taire_par_d\u00E9faut
Default_pattern=Mod\u00E8le_par_d\u00E9faut
Default_sort_criteria=Crit\u00e8re_de_tri_par_d\u00e9faut
@@ -275,7 +275,7 @@ Do_not_autoset=Ne_pas_d\u00e9finir_automatiquement.
Do_not_import_entry=Ne_pas_importer_l'entr\u00e9e
Do_not_open_any_files_at_startup=N'ouvrir_aucun_fichier_au_d\u00E9marrage
Do_not_overwrite_existing_keys=Ne_pas_\u00e9craser_de_clefs_existantes
-Do_not_wrap_the_following_fields_when_saving=Ne_pas_renvoyer_\u00e0_la_ligne_les_champs_suivants_lors_de_la_sauvegarde
+Do_not_wrap_the_following_fields_when_saving=Ne_pas_renvoyer_\u00e0_la_ligne_les_champs_suivants_lors_de_la_sauvegarde_
Docbook=Docbook
Done=Termin\u00E9
Down=Bas
@@ -385,7 +385,7 @@ Fetching_Medline_by_term_...=Recherche_sur_Medline_par_terme...
Field=Champ
field=Champ
Field_content=Contenu_du_champ
-Field_name=Nom_de_champ
+Field_name=Nom_du_champ_
Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=Les_noms_de_champ_ne_peuvent_pas_contenir_d'espace_et_les_caract\u00E8res_suivants
Field_sizes=Tailles_des_champs
Field_to_group_by=Champ_\u00E0_grouper_par
@@ -407,7 +407,7 @@ Find_duplicates=Chercher_les_doublons
Finished_autosetting_%0_field._Entries_changed:_%1.=Auto-param\u00e9trage_du_champ_%0_termin\u00e9._Entr\u00e9es_chang\u00e9es_:_%1.
Finished_synchronizing_%0_links._Entries_changed%c_%1.=Synchronisation_des_liens_%0_termin\u00e9e._Entr\u00e9es_modifi\u00e9es%c_%1.
First_select_the_entries_you_want_keys_to_be_generated_for.=Commencez_par_s\u00E9lectionner_les_entr\u00E9es_pour_lesquelles_vous_voulez_que_des_clefs_soient_g\u00E9n\u00E9r\u00E9es.
-Fit_table_horizontally_on_screen=Ajuster_la_table_horizontalement_\u00E0_l'\u00E9cran
+Fit_table_horizontally_on_screen=Ajuster_horizontalement_la_table_\u00E0_l'\u00E9cran
Float=Flottante
Font_Family=Famille_de_police
Font_Preview=Pr\u00E9visualisation_de_la_police
@@ -549,7 +549,7 @@ Left=Gauche
License=Licence
Limit_to_fields=Restreindre_aux_champs
Limit_to_selected_entries=Restreindre_aux_seules_entr\u00E9es_s\u00E9lectionn\u00E9es
-Listen_for_remote_operation_on_port=Ecouter_le_port_pour_des_op\u00e9rations_\u00e0_distance
+Listen_for_remote_operation_on_port=Ecouter_le_port_pour_des_op\u00e9rations_\u00e0_distance_
Load_session=Charger_la_session
Loading_session...=Chargement_de_la_session...
Look_and_feel=Apparence
@@ -638,7 +638,7 @@ No_GUI._Only_process_command_line_options.=Pas_d'interface_utilisateur._Traiteme
No_journal_names_could_be_abbreviated.=Aucun_nom_de_journal_n'a_pu_\u00eatre_abr\u00e9g\u00e9.
No_journal_names_could_be_unabbreviated.=Aucun_nom_de_journal_n'a_pu_\u00eatre_d\u00e9velopp\u00e9.
No_Medline_entries_found.=Pas_d'entr\u00e9es_Medline_trouv\u00e9es
-No_pdf_or_ps_defined,_and_no_file_matching_Bibtex_key_found=PDF_ou_PS_non_d\u00E9fini_et_fichier_correspondant_\u00E0_la_clef_BibTeX_non_trouv\u00E9.
+No_pdf_or_ps_defined,_and_no_file_matching_Bibtex_key_found=PDF_ou_PS_non_d\u00E9fini_et_fichier_correspondant_\u00E0_la_clef_BibTeX_non_trouv\u00E9
No_references_found=Aucune_r\u00E9f\u00E9rence_trouv\u00E9e
No_saved_session_found.=Pas_trouv\u00E9_de_session_sauvegard\u00E9e.
No_url_defined=Pas_d'URL_d\u00E9finie
@@ -789,7 +789,7 @@ Removed_string=Cha\u00EEne_supprim\u00E9e
Renamed_string=Cha\u00eene_renomm\u00e9e
Repeat_incremental_search=R\u00E9p\u00E9ter_la_recherche_incr\u00E9mentale
Replace=Remplacer
-Replace_(regular_expression)=Remplacer_(expression_r\u00e9guli\u00e8re)
+Replace_(regular_expression)=Remplacer_(expression_r\u00e9guli\u00e8re)_
Replace_string=Remplacer_la_cha\u00EEne
Replace_with=Remplacer_par
Replaced=Remplac\u00E9
@@ -913,7 +913,7 @@ Store=Enregistrer
Store_fields_with_double_braces,_and_remove_extra_braces_when_loading.<BR>Double_braces_signal_that_BibTeX_should_preserve_character_case.=Enregistrer_les_champs_avec_des_doubles_accolades_et_supprimer_les_accolades_suppl\u00e9mentaires_au_chargement._<BR>Les_doubles_accolades_signalent_que_BibTeX_doit_pr\u00e9server_la_casse_des_caract\u00e8res.
Store_journal_abbreviations=Stocker_les_abr\u00e9viations_de_journaux
Store_string=Enregistrer_la_cha\u00EEne
-Store_the_following_fields_with_braces_around_capital_letters=Stocker_les_champs_suivants_avec_des_accolades_autour_des_lettres_capitales
+Store_the_following_fields_with_braces_around_capital_letters=Stocker_les_champs_suivants_avec_des_accolades_autour_des_lettres_capitales_
Stored_definition_for_type=D\u00E9finition_pour_le_type_enregistr\u00E9
Stored_entry=Entr\u00E9e_enregistr\u00E9e
Stored_entry.=Entr\u00E9e_stock\u00E9e.
@@ -963,10 +963,10 @@ This_entry_is_incomplete=Cette_entr\u00E9e_est_incompl\u00E8te
This_entry_type_cannot_be_removed.=Ce_type_d'entr\u00E9e_ne_peut_pas_\u00EAtre_supprim\u00E9.
This_group_contains_entries_based_on_manual_assignment._Entries_can_be_assigned_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._Entries_can_be_removed_from_this_group_by_selecting_them_then_using_the_context_menu._Every_entry_assigned_to_this_group_must_have_a_unique_key._The_key_may_be_changed_at_any_time_as_long_as_it_remains_unique.=Ce_groupe_contient_des_entr\u00e9es_bas\u00e9es_sur_un_ajout_manuel._Des_entr\u00e9es_peuvent_\u00eatre_ajout\u00e9es [...]
This_group_contains_entries_in_which=Ce_groupe_contient_des_entr\u00e9es_pour_lesquelles
-This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<b>%0</b>=Ce_groupe_contient_des_entr\u00e9es_dans_lesquelles_un_champ_contient_l'expression_r\u00e9guli\u00e8re_<b>%0</b>
-This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Ce_groupe_contient_des_entr\u00e9es_dans_lesquelles_un_champ_contient_le_terme_<b>%0</b>
-This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Ce_groupe_contient_des_entr\u00e9es_dont_le_champ_<b>%0</b>_contient_le_mot-clef_<b>%1</b>
-This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Ce_groupe_contient_des_entr\u00e9es_dont_le_champ_<b>%0</b>_contient_l'expression_r\u00e9guli\u00e8re_<b>%1</b>
+This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<b>%0</b>=Ce_groupe_contient_des_entr\u00e9es_dans_lesquelles_un_champ_contient_l'expression_r\u00e9guli\u00e8re_<b>%0</b>
+This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Ce_groupe_contient_des_entr\u00e9es_dans_lesquelles_un_champ_contient_le_terme_<b>%0</b>
+This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Ce_groupe_contient_des_entr\u00e9es_dont_le_champ_<b>%0</b>_contient_le_mot-clef_<b>%1</b>
+This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Ce_groupe_contient_des_entr\u00e9es_dont_le_champ_<b>%0</b>_contient_l'expression_r\u00e9guli\u00e8re_<b>%1</b>
This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area._After_that,_you_can_mark_text_and_assign_it_to_a_bibtex_field.=Cette_fen\u00EAtre_fonctionne_par_copier-coller._Commencer_par_charger_ou_coller_du_texte_dans_la_zone_de_saisie_du_texte._Ensuite,_vous_pouvez_s\u00E9lectionner_le_texte_et_attribuer_\u00E0_un_champ_BibTeX.
This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Ceci_est_simplement_une_fen\u00eatre_de_copier-coller_pour_importer_certains_champs_\u00e0_partir_d'un_texte_normal
This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Cela_conduit_JabRef_\u00e0_tester_chaque_lien_%0_et_\u00e0_v\u00e9rifier_si_le_fichier_existe._Dans_la_n\u00e9gative,_des_options_vous_seront_propos\u00e9es<BR>pour_r\u00e9soudre_le_probl\u00e8me.
@@ -1033,7 +1033,7 @@ Warnings=Messages_d'avertissement
web_link=Lien_internet
What_do_you_want_to_do?=Que_voulez-vous_faire_?
-When_adding/removing_keywords,_separate_them_by=Lors_de_l'ajout/suppression_de_mots-clef,_les_s\u00e9parer_avec
+When_adding/removing_keywords,_separate_them_by=Lors_de_l'ajout/suppression_de_mots-clef,_les_s\u00e9parer_avec_
with=avec
Word=Mot
Wrong_file_format=Format_de_fichier_incorrect
@@ -1056,3 +1056,12 @@ Exceptions=Exceptions
Program_output=Sortie_du_programme
grouping_may_not_work_for_this_entry=Les_groupes_pourraient_ne_pas_fonctionner_pour_cette_entr\u00e9e.
+
+crossreferenced_entries_included=Entr\u00e9es_avec_r\u00e9f\u00e9rences_crois\u00e9es_incluses
+
+Display_version=Afficher_la_version
+
+Override_default_font_settings=Se_substituer_aux_param\u00e8tres_de_police_par_d\u00e9faut
+
+Mac_file_dialog=S\u00e9lectionneur_de_fichiers_Mac
+Use_native_file_dialog=Utiliser_le_s\u00e9lectionneur_de_fichiers_natif
diff --git a/src/resource/JabRef_it.properties b/src/resource/JabRef_it.properties
index ae49d76..d30263c 100644
--- a/src/resource/JabRef_it.properties
+++ b/src/resource/JabRef_it.properties
@@ -49,7 +49,7 @@ Added_group_"%0".=Aggiunto_gruppo_"%0".
Added_new=Aggiunto_nuovo
Added_string=Aggiunta_stringa
Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_can_be_assigned_manually_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._This_process_adds_the_term_<b>%1</b>_to_each_entry's_<b>%0</b>_field._Entries_can_be_removed_manually_from_this_group_by_selecting_them_then_using_the_context_menu._This_process_removes_the_term_<b>%1</b>_from_each_entry's_<b>%0</b>_field.=Inoltre,_le_voci_il_cui_campo_<b>%0</b>_non_contiene_<b>%1</b>_possono_ [...]
-Advanced=Avanzato
+Advanced=Avanzate
Advanced_options_for_setting...=Opzioni_di_configurazione_avanzate...
All_Entries=Tutte_le_voci
All_entries=Tutte_le_voci
@@ -212,7 +212,7 @@ Could_not_import_entry_types=Non_\u00e8_possibile_l'importazione_dei_tipi_di_voc
Could_not_import_preferences=Impossibile_importare_le_preferenze
Could_not_instantiate_%0_%1=Impossibile_inizializzare_%0_%1
Could_not_instantiate_%0_%1._Have_you_chosen_the_correct_package_path?=Impossibile_inizializzare_%0_%1._Verificare_il_"package_path".
-Could_not_parse_number_of_hits=
+Could_not_parse_number_of_hits=Impossibile_determinare_il_numero_di_risultati
Could_not_resolve_import_format=Impossibile_decodificare_il_formato_di_importazione
Could_not_run_the_'gnuclient'_program._Make_sure_you_have_the_gnuserv/gnuclient_programs_installed.=Impossibile_eseguire_il_programma_'gnuclient'._Assicurarsi_che_i_programmi_gnuserv/gnuclient_siano_installati.
Could_not_save_file=Impossibile_salvare_il_file
@@ -268,7 +268,7 @@ Disable_entry_editor_when_multiple_entries_are_selected=Disabilita_la_modifica_i
Disable_this_confirmation_dialog=Disabilita_la_richiesta_di_conferma
Disable_this_warning_dialog=Disabilita_questo_messaggio_di_avvertimento
Display_all_entries_belonging_to_one_or_more_of_the_selected_groups.=Mostra_tutte_le_voci_appartenenti_a_uno_o_pi\u00f9_gruppi_tra_quelli_selezionati.
-Display_all_error_messages=
+Display_all_error_messages=Mostra_tutti_i_messaggi_di_errore
Display_help_on_command_line_options=Mostra_l'aiuto_sulle_opzioni_della_riga_di_comando
Display_imported_entries_in_an_inspection_window_before_they_are_added.=Mostra_le_voci_importate_in_una_finestra_d'anteprima_prima_di_aggiungerle.
Display_only_entries_belonging_to_all_selected_groups.=Mostra_solo_le_voci_appartenenti_a_tutti_i_gruppi_selezionati.
@@ -346,7 +346,7 @@ EOF_in_mid-string=EOF_nella_stringa
Error=Errore
Error_in_field=Errore_nel_campo
Error_in_line=Errore_nella_linea
-Error_messages=
+Error_messages=Messaggi_di_errore
Error_opening_file=Errore_all'apertura_del_file
Error_setting_field=Errore_nell'impostazione_del_campo
Existing_file=File_esistente
@@ -421,7 +421,7 @@ Font_Size=Dimensione_font
Font_Style=Stile_font
FontSelector=Selettore_dei_font
for=per
-Format_of_author_and_editor_names=Formato_dei_nomi_di_autori_e_editori
+Format_of_author_and_editor_names=Formato_dei_nomi_di_autori_e_curatori
Format_used=Formato_utilizzato
Formatter_not_found=Formattazione_non_trovata
found=trovato
@@ -432,7 +432,7 @@ General_fields=Campi_generali
Generate=Genera
Generate_BibTeX_key=Genera_la_chiave_BibTeX
Generate_keys=Genera_le_chiavi
-Generate_keys_before_saving_(for_entries_without_a_key)=
+Generate_keys_before_saving_(for_entries_without_a_key)=Genera_le_chiavi_prima_di_salvare_(per_le_voci_senza_chiave)
Generate_now=Genera_ora
Generated_BibTeX_key_for=Generata_la_chiave_BibTeX_per
Generating_BibTeX_key_for=Generazione_in_corso_della_chiave_BibTeX_per
@@ -499,7 +499,7 @@ Importing=Importazione_in_corso
Importing_file=Importazione_del_file_in_corso
Importing_in_unknown_format=Importazione_in_formato_sconosciuto
In_JabRef,_use_pairs_of_#_characters_to_indicate_a_string.=In_JabRef,_utilizzare_una_coppia_di_caratteri_#_per_delimitare_una_stringa.
-Include_abstracts=
+Include_abstracts=Includi_il_riassunto
Include_subgroups=Includi_i_sottogruppi
Include_subgroups\:_When_selected,_view_entries_contained_in_this_group_or_its_subgroups=Includi_i_sottogruppi:_Quando_selezionato,_mostra_le_voci_contenute_in_questo_gruppo_e_nei_suoi_sottogruppi
Incremental=Incrementale
@@ -639,8 +639,8 @@ No_entries_found._Please_make_sure_you_are_using_the_correct_import_filter.=Ness
No_entries_imported.=Nessuna_voce_importata
No_entries_or_multiple_entries_selected.=Nessuna_voce_selezionata_o_voci_multiple_selezionate.
No_entries_selected=Nessuna_voce_selezionata
-No_exceptions_have_ocurred.=
-No_file_extension._Could_not_find_viewer_for_file.=
+No_exceptions_have_ocurred.=Non_si_\u00e8_verificata_nessuna_eccezione
+No_file_extension._Could_not_find_viewer_for_file.=Nessuna_estensione_del_file._Impossibile_trovare_un'applicazione_per_visualizzare_il_file
No_GUI._Only_process_command_line_options.=Senza_interfaccia_grafica._Elaborate_solo_le_opzioni_della_riga_di_comando.
No_journal_names_could_be_abbreviated.=Nessun_nome_di_rivista_pu\u00f2_essere_abbreviato.
No_journal_names_could_be_unabbreviated.=Nessuna_abbreviazione_di_rivista_pu\u00f2_essere_estesa.
@@ -685,7 +685,7 @@ Output_or_export_file=File_di_salvataggio_o_esportazione
Overlapping_groups=Gruppi_con_voci_in_comune
##_check
Override=Sovrascrivi
-Override_default_file_directories=
+Override_default_file_directories=Alternative_alle_cartelle_di_file_predefinite
##_check
override_the_bibtex_key_by_the_selected_text=Sovrascrivi_la_chiave_BibTeX_con_il_testo_selezionato
##_check
@@ -703,7 +703,7 @@ Path_to_PDF_viewer=Percorso_per_il_visualizzatore_PDF
Path_to_PS_viewer=Percorso_per_il_visualizzatore_PS
Path_to_WinEdt.exe=Percorso_per_WinEdt.exe
Paths_to_external_programs=Percorsi_per_programmi_esterni
-PDF_directory=
+PDF_directory=Cartella_dei_file_PDF
PDF_links=Collegamenti_PDF
Personal_journal_list=Lista_di_riviste_personale
Pick_titles=Scegli_titoli
@@ -737,13 +737,13 @@ Previous_entry=Voce_precedente
Previous_tab=Scheda_precedente
Primary_sort_criterion=Criterio_di_ordinamento_principale
Problem_with_parsing_entry=Problema_di_analisi_di_una_voce
-PS_directory=
+PS_directory=Cartella_dei_file_PS
PS_links=Collegamenti_PS
Push_selection_to_Emacs=Invia_la_selezione_a_Emacs
-push_selection_to_lyx=
+push_selection_to_lyx=Invia_la_selezione_a_LyX
Push_selection_to_LyX/Kile=Invia_la_selezione_a_LyX/Kile
Push_selection_to_WinEdt=Invia_la_selezione_a_WinEdt
-Push_to_LatexEditor=
+Push_to_LatexEditor=Invia_a_LaTeXEditor
Push_to_LyX=Invia_a_LyX
Push_to_WinEdt=Invia_a_WinEdt
Pushed_citations_to_Emacs=Citazioni_inviate_a_Emacs
@@ -756,7 +756,7 @@ Quit_synchronization=Chiudi_sincronizzazione
##check
Raw_source=Solo_testo
Really_delete_the_selected=Sicuri_di_voler_cancellare:_
-Rearrange_tabs_alphabetically_by_title=
+Rearrange_tabs_alphabetically_by_title=Ordina_alfabeticamente_le_schede
Recent_files=File_recenti
Redo=Ripeti
Refer/Endnote=Refer/Endnote
@@ -819,12 +819,12 @@ Save=Salva
Save_before_closing=Salva_prima_di_chiudere
Save_database=Salva_il_database
Save_database_as_...=Salva_il_database_come...
-Save_entries_in_their_original_order=
+Save_entries_in_their_original_order=Salva_le_voci_nel_loro_ordine_originale
Save_failed=Salvataggio_fallito
Save_failed_during_backup_creation=Salvataggio_fallito_durante_la_creazione_della_copia_di_backup
Save_failed_while_committing_changes=Salvataggio_fallito_nel_rendere_definitivi_i_cambiamenti
-Save_in_default_table_sort_order=
-Save_ordered_by_author/editor/year=
+Save_in_default_table_sort_order=Salvare_nell'ordine_predefinito_per_la_tabella
+Save_ordered_by_author/editor/year=Salvare_in_ordine_per_author/editor/year
Save_selected_as_...=Salva_la_selezione_come...
Save_session=Salva_sessione
Saved_database=Database_salvato
@@ -843,14 +843,14 @@ Search_expression=Espressione_di_ricerca
Search_for=Ricerca
Search_General_Fields=Ricerca_nei_campi_generali
Search_general_fields=Ricerca_nei_campi_generali
-Search_IEEEXplore=
+Search_IEEEXplore=Ricerca_IEEEXplore
Search_Optional_Fields=Ricerca_nei_campi_opzionali
Search_optional_fields=Ricerca_nei_campi_opzionali
Search_Required_Fields=Ricerca_nei_campi_obbligatori
Search_required_fields=Ricerca_nei_campi_obbligatori
Search_Specified_Field(s)=Ricerca_nei_campi_specificati
Search_term=Ricerca_il_termine
-Searched_database._Global_number_of_hits=
+Searched_database._Global_number_of_hits=Ricerca_effettuata._Numero_totale_di_risultati
Searched_database._Number_of_hits=Ricerca_effettuata._Numero_di_risultati_trovati
Searching_for_%0_file=Ricerca_file_%0
Searching_for_duplicates...=Ricerca_di_duplicati_in_corso...
@@ -888,7 +888,7 @@ Show_BibTeX_source_panel=Mostra_la_scheda_"Sorgente_BibTeX"
Show_CiteSeer_column=Mostra_Colonna_CiteSeer
Show_confirmation_dialog_when_deleting_entries=Chiedere_conferma_della_cancellazione_di_una_voce
Show_description=Mostra_descrizione
-Show_dynamic_groups_in_<i>italics</i>=Mostra_gruppi_dinamici_in_<i>italico</i>
+Show_dynamic_groups_in_<i>italics</i>=Mostra_gruppi_dinamici_in_<i>corsivo</i>
Show_entries_*not*_in_group_selection=Mostra_le_voci_*non*_comprese_nei_gruppi_selezionati
Show_general_fields=Mostra_i_campi_generali
##check
@@ -991,8 +991,8 @@ This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_t
This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Questo_\u00e8_un_semplice_dialogo_taglia_e_copia_per_importare_dei_campi_da_testo_normale
This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Questo_fa_in_modo_che_JabRef_verifichi_ciascuno_dei_%0_collegamenti_per_l'esistenza_del_file._In_caso_negativo_verranno_proposte_delle_opzioni_<BR>per_risolvere_il_problema.
This_operation_cannot_work_on_multiple_rows.=Questa_operazione_non_pu\u00f2_essere_effettuata_su_righe_multiple
-This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=
-This_operation_requires_one_or_more_entries_to_be_selected.=
+This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Per_questa_operazione_\u00e8_necessario_che_tutte_le_voci_selezionate_abbiano_la_chiave_BibTeX_definita
+This_operation_requires_one_or_more_entries_to_be_selected.=Per_questa_operazione_una_o_pi\u00f9_voci_devono_essere_selezionate
To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=Per_configurare_vedi_<B>Strumenti_->_Gestisci_le_abbreviazioni_delle_riviste</B>
Toggle_abbreviation=Mostra/Nascondi_l'abbreviazione
Toggle_entry_preview=Mostra/Nascondi_l'anteprima
@@ -1056,7 +1056,7 @@ Warnings=Avvertimenti
web_link=Collegamenti_Internet
-What_do_you_want_to_do?=
+What_do_you_want_to_do?=Cosa_vuoi_fare?
When_adding/removing_keywords,_separate_them_by=All'aggiunta/rimozione_di_keyword_separarle_con
with=con
Word=Parola
@@ -1073,10 +1073,18 @@ You_must_select_at_least_one_row_to_perform_this_operation.=Selezionare_almeno_u
You_must_set_both_BibTeX_key_and_%0_directory=Definire_sia_la_chiave_BibTex,_sia_la_cartella_%0
You_must_set_both_bibtex_key_and_PDF_directory=Definire_sia_la_chiave_BibTex,_sia_la_cartella_PDF
Your_new_key_bindings_have_been_stored.=La_nuova_assegnazione_di_tasti_\u00e8_stata_salvata.
-Float_marked_entries=
-Starting_import=
-Output=
-Exceptions=
-Program_output=
+Float_marked_entries=Voci_evidenziate_sempre_in_alto
+Starting_import=Inizio_importazione
+Output=Output
+Exceptions=Eccezioni
+Program_output=Output_del_programma
-grouping_may_not_work_for_this_entry=
\ No newline at end of file
+grouping_may_not_work_for_this_entry=Il_raggruppamento_potrebbe_non_funzionare_per_queste_voci
+crossreferenced_entries_included=Incluse_le_voci_con_riferimenti_incrociati
+Grouping_may_not_work_for_this_entry.=Il_raggruppamento_potrebbe_non_funzionare_per_queste_voci
+
+Display_version=Versione
+Override_default_font_settings=Ignora_le_impostazioni_dei_font_predefinite
+
+Mac_file_dialog=
+Use_native_file_dialog=
diff --git a/src/resource/JabRef_no.properties b/src/resource/JabRef_no.properties
index 52319c3..814da71 100644
--- a/src/resource/JabRef_no.properties
+++ b/src/resource/JabRef_no.properties
@@ -307,7 +307,7 @@ Edit_group=Rediger_gruppe
Edit_journal=Rediger_journal
Edit_preamble=Rediger_'preamble'
Edit_strings=Rediger_strenger
-empty_BibTeX_key=tom_BibTeX-n\u00F8kkeldfasdfdsafads
+empty_BibTeX_key=tom_BibTeX-n\u00F8kkel
Empty_BibTeX_key.=Tom_BibTeX-n\u00F8kkel
Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Tom_BibTeX-n\u00F8kkel._Gruppering_kan_feile_for_denne_enheten.
Empty_database=Empty_database
@@ -1049,10 +1049,19 @@ You_must_select_at_least_one_row_to_perform_this_operation.=Du_m\u00E5_velge_min
You_must_set_both_BibTeX_key_and_%0_directory=Du_m\u00E5_sette_b\u00E5de_BibTeX-n\u00F8kkel_og_%0-katalog
You_must_set_both_bibtex_key_and_PDF_directory=You_must_set_both_bibtex_key_and_PDF_directory
Your_new_key_bindings_have_been_stored.=Dine_nye_hurtigtaster_har_blitt_lagret.
-Float_marked_entries=
-Starting_import=
-Output=
-Exceptions=
-Program_output=
+Float_marked_entries=Sorter_merkede_enheter_\u00F8verst
+Starting_import=Starter_import
+Output=Output
+Exceptions=Feilinformasjon
+Program_output=Output_fra_program
grouping_may_not_work_for_this_entry=gruppering_kan_feile_for_denne_enheten
+
+crossreferenced_entries_included=refererte_enheter_inkludert
+
+Display_version=Vis_versjonsnummer
+
+Override_default_font_settings=Overstyr_standardfonter
+
+Mac_file_dialog=
+Use_native_file_dialog=
diff --git a/src/resource/Menu_fr.properties b/src/resource/Menu_fr.properties
index e290ceb..a56e1e6 100644
--- a/src/resource/Menu_fr.properties
+++ b/src/resource/Menu_fr.properties
@@ -92,4 +92,4 @@ Web_search=&Recherche_internet
Import_into_new_database=Importer_dans_une_nouvelle_base
Import_into_current_database=Importer_dans_la_base_courante
-Scan_database...=
\ No newline at end of file
+Scan_database...=Parcours_de_la_base_de_donn\u00E9es...
diff --git a/src/resource/Menu_it.properties b/src/resource/Menu_it.properties
index 0b78da1..d2ab839 100644
--- a/src/resource/Menu_it.properties
+++ b/src/resource/Menu_it.properties
@@ -13,7 +13,7 @@ Copy_\\cite{BibTeX_key}=Co&pia_\\cite{chiave_BibTeX}
Copy_BibTeX_key=C&opia_chiave
Custom_export=Es&portazione_personalizzata
Custom_importers=&Filtri_di_importazione_personalizzati
-Customize_entry_types=Personalizza_i_&tipi_di_righe
+Customize_entry_types=Personalizza_i_&tipi_di_voci
Cut=&Taglia
Database_properties=P&ropriet\u00e0_del_database
Delete=&Elimina
@@ -30,7 +30,7 @@ Fetch_Medline=Recupera_da_&Medline
# Menu names
File=&File
-Find_And_Fix=
+Find_And_Fix=Ricerca_e_ri¶
Find_and_remove_exact_duplicates=Ricerca_e_rimuovi_d&uplicati_identici
Find_duplicates=Ricerca_&duplicati
Help=&Aiuto
@@ -79,11 +79,11 @@ Save_selected_as_...=Sal&va_la_selezione_come_...
Save_session=Salva_sessi&one
# Tools
Search=&Ricerca
-Search_IEEEXplore=
+Search_IEEEXplore=Ricerca_IEEEXplore
Select_all=Sele&ziona_tutto
Set_up_general_fields=Configura_i_campi_generali
-Show_error_console=
-Sort_tabs=
+Show_error_console=Mostra_la_console_d'errore
+Sort_tabs=Ordina_le_schede
Switch_preview_layout=S&cambia_layout_anteprima
Synchronize_PDF_links=Sincronizza_i_link_PD&F
Synchronize_PS_links=Sincronizza_i_link_P&S
@@ -99,8 +99,7 @@ Unmark_all=Rim&uovi_tutte_le_evidenziazioni
Unmark_entries=&Rimuovi_evidenziazione
Unpack_EndNote_filter_set=Decompattare_l'insieme_di_filtri_&EndNote
View=&Visualizza
-Web_search=
-Import_into_new_database=
-Import_into_current_database=
-
-Scan_database...=
\ No newline at end of file
+Web_search=&Internet
+Import_into_new_database=Importa_in_un_nuo&vo_database
+Import_into_current_database=Importa_nel_database_&corrente
+Scan_database...=Scansione_del_database...
diff --git a/src/resource/build.properties b/src/resource/build.properties
index d3d36ea..1172524 100644
--- a/src/resource/build.properties
+++ b/src/resource/build.properties
@@ -1,3 +1,3 @@
-builddate=June 29 2006
-build=99
-version=2.1 beta 2
\ No newline at end of file
+builddate=August 9 2006
+build=569
+version=2.1
\ No newline at end of file
diff --git a/src/resource/journalList.txt b/src/resource/journalList.txt
deleted file mode 100644
index 3b7d81b..0000000
--- a/src/resource/journalList.txt
+++ /dev/null
@@ -1,1556 +0,0 @@
-#############################################################################
-##
-## Last update: December 4, 2005
-##
-## Journal abbreviations list readable by JabRef. JabRef versions
-## from 2.0 and upward can download and use this list for automatically
-## abbreviating and unabbreviating journal names. To access this function,
-## choose Tools -> Manage journal abbreviations.
-##
-#############################################################################
-Accounts of Chemical Research=Acc. Chem. Res.;ACHRE4;M
-ACS Symposium Series=ACS Symp. Ser.;ACSMC8;IRR
-Acta Biochimica Polonica=Acta Biochim. Pol.;ABPLAF;Q
-Acta Chimica Slovenica=Acta Chim. Slov.;ACSLE7;Q
-Acta Crystallographica, Section A: Foundations of Crystallography=Acta Crystallogr., Sect. A: Found. Crystallogr.;ACACEQ;BM
-Acta Crystallographica, Section B: Structural Science=Acta Crystallogr., Sect. B: Struct. Sci.;ASBSDK;BM
-Acta Crystallographica, Section C: Crystal Structure Communications=Acta Crystallogr., Sect. C: Cryst. Struct. Commun.;ACSCEE;M
-Acta Crystallographica, Section D: Biological Crystallography=Acta Crystallogr., Sect. D: Biol. Crystallogr.;ABCRE6;M
-Acta Crystallographica, Section E: Structure Reports Online=Acta Crystallogr., Sect. E: Struct. Rep. Online;ACSEBH;M
-Acta Crystallographica, Section F: Structural Biology and Crystallization Communications=Acta Crystallogr., Sect. F: Struct. Biol. Cryst. Commun.;ACSFCL;M
-Acta Hydrochimica et Hydrobiologica=Acta Hydrochim. Hydrobiol.;AHCBAU;BM
-Acta Materialia=Acta Mater.;ACMAFD;20/YR
-Acta Pharmaceutica (Zagreb, Croatia)=Acta Pharm. (Zagreb, Croatia);ACPHEE;Q
-Acta Pharmacologica Sinica=Acta Pharmacol. Sin.;APSCG5;M
-Acta Physica Polonica, A=Acta Phys. Pol., A;ATPLB6;M
-Acta Physica Polonica, B=Acta Phys. Pol., B;APOBBB;M
-Acta Physiologica Scandinavica=Acta Physiol. Scand.;APSCAX;M
-Adsorption=Adsorption;ADSOFO;Q
-Adsorption Science & Technology=Adsorpt. Sci. Technol.;ASTEEZ;10/YR
-Advanced Drug Delivery Reviews=Adv. Drug Delivery Rev.;ADDREP;15/YR
-Advanced Functional Materials=Adv. Funct. Mater.;AFMDC6;M
-Advanced Materials (Weinheim, Germany)=Adv. Mater. (Weinheim, Ger.);ADVMEW;SM
-Advanced Synthesis & Catalysis=Adv. Synth. Catal.;ASCAF7;15/YR
-Advances in Applied Ceramics=Adv. Appl. Ceram.;AACDCN;BM
-Advances in Atomic, Molecular, and Optical Physics=Adv. At., Mol., Opt. Phys.;AAMPE9;IRR
-Advances in Chemical Physics=Adv. Chem. Phys.;ADCPAA;IRR
-Advances in Chromatography (New York, NY, United States)=Adv. Chromatogr. (N. Y., NY, U. S.);ADCYA3;IRR
-Advances in Colloid and Interface Science=Adv. Colloid Interface Sci.;ACISB9;24/YR
-Advances in Electrochemical Science and Engineering=Adv. Electrochem. Sci. Eng.;AESEEY;IRR
-Advances in Inorganic Chemistry=Adv. Inorg. Chem.;AICHEP;IRR
-Advances in Polymer Science=Adv. Polym. Sci.;APSIDK;IRR
-Advances in Polymer Technology=Adv. Polym. Technol.;APTYD5;Q
-Advances in Quantum Chemistry=Adv. Quantum Chem.;AQCHA9;IRR
-Advances in X-Ray Analysis=Adv. X-Ray Anal.;AXRAAA;A
-Aerosol Science and Technology=Aerosol Sci. Technol.;ASTYDQ;M
-Afinidad=Afinidad;AFINAE;BM
-Aging Cell=Aging Cell;ACGECQ;BM
-AIChE Journal=AIChE J.;AICEAC;M
-American Ceramic Society Bulletin=Am. Ceram. Soc. Bull.;ACSBA7;M
-American Journal of Clinical Nutrition=Am. J. Clin. Nutr.;AJCNAC;M
-American Journal of Human Genetics=Am. J. Hum. Genet.;AJHGAG;M
-American Journal of Physiology=Am. J. Physiol.;AJPHAP;M
-American Journal of Respiratory Cell and Molecular Biology=Am. J. Respir. Cell Mol. Biol.;AJRBEL;M
-American Mineralogist=Am. Mineral.;AMMIAY;8/YR
-Amino Acids=Amino Acids;AACIE6;8/YR
-Analyst (Cambridge, United Kingdom)=Analyst (Cambridge, U. K.);ANALAO;M
-Analytica Chimica Acta=Anal. Chim. Acta;ACACAM;52/YR
-Analytical and Bioanalytical Chemistry=Anal. Bioanal. Chem.;ABCNBP;SM
-Analytical Biochemistry=Anal. Biochem.;ANBCA2;SM
-Analytical Chemistry=Anal. Chem.;ANCHAM;SM
-Analytical Letters=Anal. Lett.;ANALBP;15/YR
-Analytical Sciences=Anal. Sci.;ANSCEN;M
-Angewandte Chemie, International Edition=Angew. Chem., Int. Ed.;ACIEF5;W
-Animal Welfare=Anim. Welfare;ANWEEF;4/YR
-Animal Welfare Information Center Bulletin=Anim. Welfare Inf. Cent. Bull.;AWICAW;Q
-Annales de Chimie (Cachan, France)=Ann. Chim. (Cachan, Fr.);ANCPAC;6/YR
-Annales Pharmaceutiques Francaises=Ann. Pharm. Fr.;APFRAD;BM
-Annali di Chimica (Rome, Italy)=Ann. Chim. (Rome, Italy);ANCRAI;BM
-Annals of Nuclear Energy=Ann. Nucl. Energy;ANENDJ;18/YR
-Annals of Nutrition & Metabolism=Ann. Nutr. Metab.;ANUMDS;BM
-Annals of Physics (San Diego, CA, United States)=Ann. Phys. (San Diego, CA, U. S.);APNYA6;M
-Annexins=Annexins;ANNEC2;Q
-Annual Reports in Medicinal Chemistry=Annu. Rep. Med. Chem.;ARMCBI;A
-Annual Reports on NMR Spectroscopy=Annu. Rep. NMR Spectrosc.;NMRPAJ;IRR
-Annual Reports on the Progress of Chemistry, Section A: Inorganic Chemistry=Annu. Rep. Prog. Chem., Sect. A: Inorg. Chem.;APCCDO;A
-Annual Reports on the Progress of Chemistry, Section B: Organic Chemistry=Annu. Rep. Prog. Chem., Sect. B: Org. Chem.;CACBB4;A
-Annual Reports on the Progress of Chemistry, Section C: Physical Chemistry=Annu. Rep. Prog. Chem., Sect. C: Phys. Chem.;ACPCDW;A
-Annual Review of Biochemistry=Annu. Rev. Biochem.;ARBOAW;A
-Annual Review of Biomedical Engineering=Annu. Rev. Biomed. Eng.;ARBEF7;A
-Annual Review of Biophysics and Biomolecular Structure=Annu. Rev. Biophys. Biomol. Struct.;ABBSE4;A
-Annual Review of Cell and Developmental Biology=Annu. Rev. Cell Dev. Biol.;ARDBF8;A
-Annual Review of Earth and Planetary Sciences=Annu. Rev. Earth Planet. Sci.;AREPCI;A
-Annual Review of Entomology=Annu. Rev. Entomol.;ARENAA;A
-Annual Review of Genetics=Annu. Rev. Genet.;ARVGB7;A
-Annual Review of Genomics and Human Genetics=Annu. Rev. Genomics Hum. Genet.;ARGHC4;A
-Annual Review of Immunology=Annu. Rev. Immunol.;ARIMDU;A
-Annual Review of Materials Research=Annu. Rev. Mater. Res.;ARMRCU;A
-Annual Review of Medicine=Annu. Rev. Med.;ARMCAH;A
-Annual Review of Microbiology=Annu. Rev. Microbiol.;ARMIAZ;A
-Annual Review of Neuroscience=Annu. Rev. Neurosci.;ARNSD5;A
-Annual Review of Nuclear and Particle Science=Annu. Rev. Nucl. Part. Sci.;ARPSDF;A
-Annual Review of Nutrition=Annu. Rev. Nutr.;ARNTD8;A
-Annual Review of Pharmacology and Toxicology=Annu. Rev. Pharmacol. Toxicol.;ARPTDI;A
-Annual Review of Physical Chemistry=Annu. Rev. Phys. Chem.;ARPLAP;A
-Annual Review of Physiology=Annu. Rev. Physiol.;ARPHAD;A
-Annual Review of Phytopathology=Annu. Rev. Phytopathol.;APPYAG;A
-Annual Review of Plant Biology=Annu. Rev. Plant Biol.;ARPBDW;A
-Anti-Cancer Drugs=Anti-Cancer Drugs;ANTDEV;10/YR
-Antibiotiki i Khimioterapiya=Antibiot. Khimioter.;ANKHEW;M
-Antimicrobial Agents and Chemotherapy=Antimicrob. Agents Chemother.;AMACCQ;M
-Antioxidants & Redox Signaling=Antioxid. Redox Signaling;ARSIF2;BM
-Antiviral Chemistry & Chemotherapy=Antiviral Chem. Chemother.;ACCHEH;BM
-Antiviral Research=Antiviral Res.;ARSRDR;M
-Applied and Environmental Microbiology=Appl. Environ. Microbiol.;AEMIDF;M
-Applied Biochemistry and Biotechnology=Appl. Biochem. Biotechnol.;ABIBDL;24/YR
-Applied Biochemistry and Microbiology=Appl. Biochem. Microbiol.;APBMAC;BM
-Applied Catalysis, A: General=Appl. Catal., A;ACAGE4;36/YR
-Applied Catalysis, B: Environmental=Appl. Catal., B;ACBEE3;28/YR
-Applied Clay Science=Appl. Clay Sci.;ACLSER;BM
-Applied Geochemistry=Appl. Geochem.;APPGEY;M
-Applied Microbiology and Biotechnology=Appl. Microbiol. Biotechnol.;AMBIDG;18/YR
-Applied Organometallic Chemistry=Appl. Organomet. Chem.;AOCHEX;M
-Applied Physics A: Materials Science & Processing=Appl. Phys. A: Mater. Sci. Process.;APAMFC;16/YR
-Applied Physics B: Lasers and Optics=Appl. Phys. B: Lasers Opt.;APBOEM;16/YR
-Applied Physics Letters=Appl. Phys. Lett.;APPLAB;W
-Applied Radiation and Isotopes=Appl. Radiat. Isot.;ARISEF;M
-Applied Spectroscopy=Appl. Spectrosc.;APSPA4;M
-Applied Surface Science=Appl. Surf. Sci.;ASUSEE;19/YR
-Aquatic Toxicology=Aquat. Toxicol.;AQTODG;20/YR
-Archaea=Archaea;ARCHCI;IRR
-Archiv der Pharmazie (Weinheim, Germany)=Arch. Pharm. (Weinheim, Ger.);ARPMAS;M
-Archives of Biochemistry and Biophysics=Arch. Biochem. Biophys.;ABBIA4;SM
-Archives of Environmental Contamination and Toxicology=Arch. Environ. Contam. Toxicol.;AECTCV;8/YR
-Archives of Insect Biochemistry and Physiology=Arch. Insect Biochem. Physiol.;AIBPEA;M
-Archives of Microbiology=Arch. Microbiol.;AMICCW;M
-Archives of Pharmacal Research=Arch. Pharmacal Res.;APHRDQ;M
-Archives of Physiology and Biochemistry=Arch. Physiol. Biochem.;APBIF5;5/YR
-Archives of Toxicology=Arch. Toxicol.;ARTODN;12/YR
-Archives of Virology=Arch. Virol.;ARVIDF;12/YR
-Archivum Combustionis=Arch. Combust.;ACOMEO;Q
-ARKIVOC (Gainesville, FL, United States)=ARKIVOC (Gainesville, FL, U. S.);AGFUAR;IRR
-Arteriosclerosis, Thrombosis, and Vascular Biology=Arterioscler., Thromb., Vasc. Biol.;ATVBFA;M
-Arzneimittel Forschung=Arzneim. Forsch.;ARZNAD;M
-Asian Journal of Chemistry=Asian J. Chem.;AJCHEW;Q
-Assay and Drug Development Technologies=Assay Drug Dev. Technol.;ADDTAR;BM
-Atherosclerosis (Amsterdam, Netherlands)=Atherosclerosis (Amsterdam, Neth.);ATHSBL;M
-ATLA, Alternatives to Laboratory Animals=ATLA, Altern. Lab. Anim.;AALADQ;BM
-Atmospheric Chemistry and Physics=Atmos. Chem. Phys.;ACPTCE;12/YR
-Atmospheric Environment=Atmos. Environ.;AENVEQ;40/YR
-Atomic Energy (New York, NY, United States)=At. Energy (N. Y., NY, U. S.);AENYEZ;M
-Atomic Spectroscopy=At. Spectrosc.;ASPND7;BM
-Australian Journal of Chemistry=Aust. J. Chem.;AJCHAS;M
-Autonomic & Autacoid Pharmacology=Auton. Autacoid Pharmacol.;AAPUC3;Q
-Azerbaidzhanskii Khimicheskii Zhurnal=Azerb. Khim. Zh.;AZKZAU;Q
-Basic & Clinical Pharmacology & Toxicology=Basic Clin. Pharmacol. Toxicol.;BCPTBO;M
-Beilstein Journal of Organic Chemistry=Beilstein J. Org. Chem.;BJOCBH;IRR
-Biocatalysis and Biotransformation=Biocatal. Biotransform.;BOBOEQ;BM
-Biochemical and Biophysical Research Communications=Biochem. Biophys. Res. Commun.;BBRCA9;50/YR
-Biochemical Genetics=Biochem. Genet.;BIGEBA;BM
-Biochemical Journal=Biochem. J.;BIJOAK;SM
-Biochemical Pharmacology=Biochem. Pharmacol.;BCPCA6;SM
-Biochemical Society Transactions=Biochem. Soc. Trans.;BCSTB5;6/YR
-Biochemical Systematics and Ecology=Biochem. Syst. Ecol.;BSECBU;M
-Biochemistry=Biochemistry;BICHAW;W
-Biochemistry (Moscow)=Biochemistry (Moscow);BIORAK;M
-Biochemistry and Cell Biology=Biochem. Cell Biol.;BCBIEQ;BM
-Biochemistry and Molecular Biology Education=Biochem. Mol. Biol. Educ.;BMBECE;BM
-Biochimica et Biophysica Acta=Biochim. Biophys. Acta;BBACAQ;
-Biochimica et Biophysica Acta, Bioenergetics=Biochim. Biophys. Acta, Bioenerg.;BBBEB4;15/YR
-Biochimica et Biophysica Acta, Biomembranes=Biochim. Biophys. Acta, Biomembr.;BBBMBS;20/YR
-Biochimica et Biophysica Acta, Biophysics Including Photosynthesis=Biochim. Biophys. Acta, Biophys. Incl. Photosynth.;BBABER;
-Biochimica et Biophysica Acta, Enzymology=Biochim. Biophys. Acta, Enzymol.;BBEZAD;
-Biochimica et Biophysica Acta, Enzymology and Biological Oxidation=Biochim. Biophys. Acta, Enzymol. Biol. Oxid.;BBAECY;
-Biochimica et Biophysica Acta, Gene Structure and Expression=Biochim. Biophys. Acta, Gene Struct. Expression;BBGSD5;18/YR
-Biochimica et Biophysica Acta, General Subjects=Biochim. Biophys. Acta, Gen. Subj.;BBGSB3;18/YR
-Biochimica et Biophysica Acta, Lipids and Lipid Metabolism=Biochim. Biophys. Acta, Lipids Lipid Metab.;BBLLA6;18/YR
-Biochimica et Biophysica Acta, Molecular and Cell Biology of Lipids=Biochim. Biophys. Acta, Mol. Cell Biol. Lipids;BBMLFG;18/YR
-Biochimica et Biophysica Acta, Molecular Basis of Disease=Biochim. Biophys. Acta, Mol. Basis Dis.;BBADEX;9/YR
-Biochimica et Biophysica Acta, Molecular Cell Research=Biochim. Biophys. Acta, Mol. Cell Res.;BBAMCO;15/YR
-Biochimica et Biophysica Acta, Mucoproteins and Mucopolysaccharides=Biochim. Biophys. Acta, Mucoproteins Mucopolysaccharides;BBAMFR;
-Biochimica et Biophysica Acta, Protein Structure=Biochim. Biophys. Acta, Protein Struct.;BBPTBH;
-Biochimica et Biophysica Acta, Protein Structure and Molecular Enzymology=Biochim. Biophys. Acta, Protein Struct. Mol. Enzymol.;BBAEDZ;16/YR
-Biochimica et Biophysica Acta, Proteins and Proteomics=Biochim. Biophys. Acta, Proteins Proteomics;BBAPBW;16/YR
-Biochimica et Biophysica Acta, Reviews on Bioenergetics=Biochim. Biophys. Acta, Rev. Bioenerg.;BRBECF;
-Biochimica et Biophysica Acta, Reviews on Biomembranes=Biochim. Biophys. Acta, Rev. Biomembr.;BRBMC5;3/YR
-Biochimica et Biophysica Acta, Reviews on Cancer=Biochim. Biophys. Acta, Rev. Cancer;BBACEU;4/YR
-Biochimica et Biophysica Acta, Specialized Section on Biophysical Subjects=Biochim. Biophys. Acta, Spec. Sect. Biophys. Subj.;BBASEA;
-Biochimica et Biophysica Acta, Specialized Section on Enzymological Subjects=Biochim. Biophys. Acta, Spec. Sect. Enzymol. Subj.;BBASD9;
-Biochimica et Biophysica Acta, Specialized Section on Lipids and Related Subjects=Biochim. Biophys. Acta, Spec. Sect. Lipids Relat. Subj.;BBASC8;
-Mucopolysaccharides Biochimica et Biophysica Acta, Specialized Section on Mucoproteins and Mucopolysaccharides=Biochim. Biophys. Acta, Spec. Sect. Mucoproteins;BBASFB;
-Subj. Biochimica et Biophysica Acta, Specialized Section on Nucleic Acids and Related Subjects=Biochim. Biophys. Acta, Spec. Sect. Nucleic Acids Relat.;BBASB7;
-Biochimie=Biochimie;BICMBE;M
-Bioconjugate Chemistry=Bioconjugate Chem.;BCCHES;BM
-Bioelectrochemistry=Bioelectrochemistry;BIOEFK;6/YR
-BioFactors=BioFactors;BIFAEU;12/YR
-Biofizika=Biofizika;BIOFAI;BM
-Biogenic Amines=Biog. Amines;BIAME7;6/YR
-Bioinformatics=Bioinformatics;BOINFP;24/YR
-Bioinorganic Chemistry and Applications=Bioinorg. Chem. Appl.;BCAIAH;4/YR
-Biological & Pharmaceutical Bulletin=Biol. Pharm. Bull.;BPBLEO;M
-Biological Chemistry=Biol. Chem.;BICHF3;M
-Biological Trace Element Research=Biol. Trace Elem. Res.;BTERDG;18/YR
-Biologicheskie Membrany=Biol. Membr.;BIMEE9;BM
-Biology of Reproduction=Biol. Reprod.;BIREBV;13/YR
-Biomacromolecules=Biomacromolecules;BOMAF6;BM
-Biomarkers=Biomarkers;BIOMFA;BM
-Biomaterials=Biomaterials;BIMADU;36/YR
-Biomedical Chromatography=Biomed. Chromatogr.;BICHE2;8/YR
-Biomedical Research=Biomed. Res.;BRESD5;BM
-Biomeditsinskaya Khimiya=Biomed. Khim.;BKIHA8;BM
-BioMetals=BioMetals;BOMEEH;BM
-Biomolecular Engineering=Biomol. Eng.;BIENFV;6/YR
-Bioorganic & Medicinal Chemistry=Bioorg. Med. Chem.;BMECEP;SM
-Bioorganic & Medicinal Chemistry Letters=Bioorg. Med. Chem. Lett.;BMCLE8;SM
-Bioorganic Chemistry=Bioorg. Chem.;BOCMBM;BM
-Biopharmaceutics & Drug Disposition=Biopharm. Drug Dispos.;BDDID8;9/YR
-Biophysical Chemistry=Biophys. Chem.;BICIAZ;21/YR
-Biophysical Journal=Biophys. J.;BIOJAU;M
-Biopolymers=Biopolymers;BIPMAA;24/YR
-Bioprocess and Biosystems Engineering=Bioprocess Biosyst. Eng.;BBEIBV;6/YR
-Bioresource Technology=Bioresour. Technol.;BIRTEB;18/YR
-Bioscience Reports=Biosci. Rep.;BRPTDT;BM
-Bioscience, Biotechnology, and Biochemistry=Biosci., Biotechnol., Biochem.;BBBIEJ;M
-Biosensors & Bioelectronics=Biosens. Bioelectron.;BBIOE4;M
-BioTechniques=BioTechniques;BTNQDO;M
-Biotechnology and Applied Biochemistry=Biotechnol. Appl. Biochem.;BABIEC;BM
-Biotechnology and Bioengineering=Biotechnol. Bioeng.;BIBIAU;28/YR
-Biotechnology and Bioprocess Engineering=Biotechnol. Bioprocess Eng.;BBEIAU;BM
-Biotechnology Letters=Biotechnol. Lett.;BILED3;SM
-Biotechnology Progress=Biotechnol. Prog.;BIPRET;BM
-Birth Defects Research, Part A: Clinical and Molecular Teratology=Birth Defects Res., Part A;BDRPBT;M
-Birth Defects Research, Part B: Developmental and Reproductive Toxicology=Birth Defects Res., Part B;BDRPCU;BM
-Birth Defects Research, Part C: Embryo Today--Reviews=Birth Defects Res., Part C;BDRPDV;Q
-Bitamin=Bitamin;BTMNA7;M
-Blood=Blood;BLOOAW;25/YR
-Bopuxue Zazhi=Bopuxue Zazhi;BOZAE2;Q
-Brain Research=Brain Res.;BRREAP;72/YR
-British Journal of Nutrition=Br. J. Nutr.;BJNUAV;M
-British Journal of Pharmacology=Br. J. Pharmacol.;BJPCBM;SM
-Bulgarian Chemical Communications=Bulg. Chem. Commun.;BCHCE4;Q
-Bulletin of Electrochemistry=Bull. Electrochem.;BUELE6;M
-Bulletin of Environmental Contamination and Toxicology=Bull. Environ. Contam. Toxicol.;BECTA6;M
-Bulletin of Materials Science=Bull. Mater. Sci.;BUMSDW;BM
-Bulletin of the Chemical Society of Japan=Bull. Chem. Soc. Jpn.;BCSJA8;M
-Bulletin of the Korean Chemical Society=Bull. Korean Chem. Soc.;BKCSDE;M
-Bunseki Kagaku=Bunseki Kagaku;BNSKAK;M
-Cailiao Rechuli Xuebao=Cailiao Rechuli Xuebao;CRXAAK;BM
-Calcified Tissue International=Calcif. Tissue Int.;CTINDZ;M
-CALPHAD: Computer Coupling of Phase Diagrams and Thermochemistry=CALPHAD: Comput. Coupling Phase Diagrams Thermochem.;CCCTD6;Q
-Canadian Journal of Analytical Sciences and Spectroscopy=Can. J. Anal. Sci. Spectrosc.;CJASFA;BM
-Canadian Journal of Chemical Engineering=Can. J. Chem. Eng.;CJCEA7;BM
-Canadian Journal of Chemistry=Can. J. Chem.;CJCHAG;M
-Canadian Journal of Microbiology=Can. J. Microbiol.;CJMIAZ;M
-Canadian Journal of Physics=Can. J. Phys.;CJPHAD;M
-Canadian Journal of Physiology and Pharmacology=Can. J. Physiol. Pharmacol.;CJPPA3;M
-Canadian Metallurgical Quarterly=Can. Metall. Q.;CAMQAU;Q
-Canadian Mineralogist=Can. Mineral.;CAMIA6;BM
-Cancer Cell=Cancer Cell;CCAECI;M
-Cancer Gene Therapy=Cancer Gene Ther.;CGTHEG;M
-Cancer Genomics & Proteomics=Cancer Genomics Proteomics;CGPAC7;BM
-Cancer Letters (Amsterdam, Netherlands)=Cancer Lett. (Amsterdam, Neth.);CALEDQ;28/YR
-Cancer Research=Cancer Res.;CNREA8;SM
-Cancer Science=Cancer Sci.;CSACCM;M
-Carbohydrate Polymers=Carbohydr. Polym.;CAPOD8;16/YR
-Carbohydrate Research=Carbohydr. Res.;CRBRAT;18/YR
-Carbon=Carbon;CRBNAH;15/YR
-Carcinogenesis=Carcinogenesis;CRNGDP;M
-Cardiovascular Research=Cardiovasc. Res.;CVREAU;14/YR
-Catalysis Communications=Catal. Commun.;CCAOAC;M
-Catalysis Letters=Catal. Lett.;CALEER;28/YR
-Catalysis Reviews - Science and Engineering=Catal. Rev. - Sci. Eng.;CRSEC9;Q
-Catalysis Today=Catal. Today;CATTEA;44/YR
-Cell (Cambridge, MA, United States)=Cell (Cambridge, MA, U. S.);CELLB5;BW
-Cell Biochemistry and Biophysics=Cell Biochem. Biophys.;CBBIFV;6/YR
-Cell Biochemistry and Function=Cell Biochem. Funct.;CBFUDH;6/YR
-Cell Calcium=Cell Calcium;CECADV;M
-Cell Cycle=Cell Cycle;CCEYAS;M
-Cell Metabolism=Cell Metab.;CMEEB5;M
-Cellular and Molecular Biology (Paris, France, Online)=Cell. Mol. Biol. (Paris, Fr., Online);CMBPBN;IRR
-Cellular and Molecular Biology (Sarreguemines, France, Print)=Cell. Mol. Biol. (Sarreguemines, Fr., Print);CMOBEF;8/YR
-Cellular and Molecular Life Sciences=Cell. Mol. Life Sci.;CMLSFI;24/YR
-Cellular Immunology=Cell. Immunol.;CLIMB8;M
-Cellular Microbiology=Cell. Microbiol.;CEMIF5;M
-Cellular Physiology and Biochemistry=Cell. Physiol. Biochem.;CEPBEW;6/YR
-Cellular Polymers=Cell. Polym.;CELPDJ;BM
-Cellulose Chemistry and Technology=Cellul. Chem. Technol.;CECTAH;BM
-Cement & Concrete Composites=Cem. Concr. Compos.;CCOCEG;10/YR
-Cement and Concrete Research=Cem. Concr. Res.;CCNRAI;M
-Ceramics International=Ceram. Int.;CINNDH;8/YR
-Ceramics-Silikaty=Ceram.-Silik.;CERSEP;Q
-Cereal Chemistry=Cereal Chem.;CECHAF;BM
-Ceska a Slovenska Farmacie=Ceska Slov. Farm.;CSLFEK;BM
-ChemBioChem=ChemBioChem;CBCHFX;M
-Chemia Analityczna (Warsaw, Poland)=Chem. Anal. (Warsaw, Pol.);CANWAJ;BM
-Chemical & Pharmaceutical Bulletin=Chem. Pharm. Bull.;CPBTAL;M
-Chemical and Biochemical Engineering Quarterly=Chem. Biochem. Eng. Q.;CBEQEZ;Q
-Chemical Communications (Cambridge, United Kingdom)=Chem. Commun. (Cambridge, U. K.);CHCOFS;48/YR
-Chemical Engineering & Technology=Chem. Eng. Technol.;CETEER;M
-Chemical Engineering and Processing=Chem. Eng. Process.;CENPEU;M
-Chemical Engineering Communications=Chem. Eng. Commun.;CEGCAK;M
-Chemical Engineering Journal (Amsterdam, Netherlands)=Chem. Eng. J. (Amsterdam, Neth.);CMEJAJ;27/YR
-Chemical Engineering Progress=Chem. Eng. Prog.;CEPRA8;M
-Chemical Engineering Research and Design=Chem. Eng. Res. Des.;CERDEE;M
-Chemical Engineering Science=Chem. Eng. Sci.;CESCAC;SM
-Chemical Geology=Chem. Geol.;CHGEAD;44/YR
-Chemical Papers=Chem. Pap.;CHPAEG;6/YR
-Chemical Physics=Chem. Phys.;CMPHC2;33/YR
-Chemical Physics Letters=Chem. Phys. Lett.;CHPLBC;W
-Chemical Record=Chem. Rec.;CRHEAK;BM
-Chemical Research in Chinese Universities=Chem. Res. Chin. Univ.;CRCUED;BM
-Chemical Research in Toxicology=Chem. Res. Toxicol.;CRTOEC;M
-Chemical Reviews (Washington, DC, United States)=Chem. Rev. (Washington, DC, U. S.);CHREAY;M
-Chemical Society Reviews=Chem. Soc. Rev.;CSRVBR;12/YR
-Chemical Speciation and Bioavailability=Chem. Speciation Bioavailability;CHSBEY;Q
-Chemical Vapor Deposition=Chem. Vap. Deposition;CVDEFX;M
-Chemicke Listy=Chem. Listy;CHLSAC;M
-Chemico-Biological Interactions=Chem.-Biol. Interact.;CBINA8;18/YR
-Chemie der Erde=Chem. Erde;CERDAA;4/YR
-Chemie Ingenieur Technik=Chem. Ing. Tech.;CITEAH;M
-Chemija=Chemija;CHMJES;4/YR
-Chemistry & Biodiversity=Chem. Biodiversity;CBHIAM;M
-Chemistry & Biology (Cambridge, MA, United States)=Chem. Biol. (Cambridge, MA, U. S.);CBOLE2;M
-Chemistry & Industry (London, United Kingdom)=Chem. Ind. (London, U. K.);CHINAG;SM
-Chemistry and Physics of Lipids=Chem. Phys. Lipids;CPLIA4;M
-Chemistry and Technology of Fuels and Oils=Chem. Technol. Fuels Oils;CTFOAK;BM
-Chemistry Letters=Chem. Lett.;CMLTAG;M
-Chemistry of Heterocyclic Compounds (New York, NY, United States)=Chem. Heterocycl. Compd. (N. Y., NY, U. S.);CHCCAL;M
-Chemistry of Materials=Chem. Mater.;CMATEX;BW
-Chemistry of Natural Compounds=Chem. Nat. Compd.;CHNCA8;BM
-Chemistry--A European Journal=Chem.--Eur. J.;CEUJED;SM
-Chemometrics and Intelligent Laboratory Systems=Chemom. Intell. Lab. Syst.;CILSEN;9/YR
-Chemosphere=Chemosphere;CMSHAF;44/YR
-Chemotherapy (Basel, Switzerland)=Chemotherapy (Basel, Switz.);CHTHBK;BM
-ChemPhysChem=ChemPhysChem;CPCHFT;12/YR
-Chemtracts=Chemtracts;CHEMFW;12/YR
-Chimia=Chimia;CHIMAD;M
-Chimica e l'Industria (Milan, Italy)=Chim. Ind. (Milan, Italy);CINMAB;10/YR
-Chinese Chemical Letters=Chin. Chem. Lett.;CCLEE7;M
-Chinese Journal of Chemical Engineering=Chin. J. Chem. Eng.;CJCEEB;BM
-Chinese Journal of Chemistry=Chin. J. Chem.;CJOCEV;M
-Chinese Journal of Geochemistry=Chin. J. Geochem.;CJGEEV;Q
-Chinese Journal of Polymer Science=Chin. J. Polym. Sci.;CJPSEG;BM
-Chirality=Chirality;CHRLEP;10/YR
-Chromatographia=Chromatographia;CHRGB7;M
-Chromosome Research=Chromosome Res.;CRRSEE;8/YR
-Circulation Research=Circ. Res.;CIRUAL;SM
-Clay Minerals=Clay Miner.;CLMIAF;Q
-Clays and Clay Minerals=Clays Clay Miner.;CLCMAB;BM
-Clinica Chimica Acta=Clin. Chim. Acta;CCATAR;M
-Clinical and Diagnostic Laboratory Immunology=Clin. Diagn. Lab. Immunol.;CDIMEN;M
-Clinical and Experimental Pharmacology and Physiology=Clin. Exp. Pharmacol. Physiol.;CEXPB9;M
-Clinical Chemistry (Washington, DC, United States)=Clin. Chem. (Washington, DC, U. S.);CLCHAU;M
-Clinical Chemistry and Laboratory Medicine=Clin. Chem. Lab. Med.;CCLMFW;M
-Clinical Immunology (San Diego, CA, United States)=Clin. Immunol. (San Diego, CA, U. S.);CLIIFY;M
-Clinical Proteomics=Clin. Proteomics;CPLRCX;4/YR
-Cloning and Stem Cells=Cloning Stem Cells;CSCLBO;Q
-Coal Preparation (Philadelphia, PA, United States)=Coal Prep. (Philadelphia, PA, U. S.);COAPDY;6/YR
-Collection of Czechoslovak Chemical Communications=Collect. Czech. Chem. Commun.;CCCCAK;M
-Colloid and Polymer Science=Colloid Polym. Sci.;CPMSB6;M
-Colloid Journal=Colloid J.;CJRSEQ;BM
-Colloids and Surfaces, A: Physicochemical and Engineering Aspects=Colloids Surf., A;CPEAEH;24/YR
-Colloids and Surfaces, B: Biointerfaces=Colloids Surf., B;CSBBEQ;28/YR
-Coloration Technology=Color. Technol.;CTOEAZ;BM
-Combinatorial Chemistry and High Throughput Screening=Comb. Chem. High Throughput Screening;CCHSFU;8/YR
-Combustion and Flame=Combust. Flame;CBFMAO;M
-Combustion Science and Technology=Combust. Sci. Technol.;CBSTB9;M
-Comments on Inorganic Chemistry=Comments Inorg. Chem.;COICDZ;BM
-Communications in Soil Science and Plant Analysis=Commun. Soil Sci. Plant Anal.;CSOSA2;20/YR
-Comparative and Functional Genomics=Comp. Funct. Genomics;CFGOAT;8/YR
-Comparative Biochemistry and Physiology, Part A: Molecular & Integrative Physiology=Comp. Biochem. Physiol., Part A: Mol. Integr. Physiol.;CBPAB5;M
-Comparative Biochemistry and Physiology, Part B: Biochemistry & Molecular Biology=Comp. Biochem. Physiol., Part B: Biochem. Mol. Biol.;CBPBB8;M
-Comparative Biochemistry and Physiology, Part C: Toxicology & Pharmacology=Comp. Biochem. Physiol., Part C: Toxicol. Pharmacol.;CBPPFK;M
-Comparative Medicine=Comp. Med.;COMEFT;BM
-Comptes Rendus Chimie=C. R. Chim.;CRCOCR;M
-Comptes Rendus Physique=C. R. Phys.;CRPOBN;10/YR
-Computational Biology and Chemistry=Comput. Biol. Chem.;CBCOCH;BM
-Computer Physics Communications=Comput. Phys. Commun.;CPHCBZ;SM
-Computers & Chemical Engineering=Comput. Chem. Eng.;CCENDW;M
-Comunicaciones presentadas a las Jornadas del Comite Espanol de la Detergencia=Comun. Jorn. Com. Esp. Deterg.;CJCDD7;A
-Contemporary Topics in Laboratory Animal Science=Contemp. Top. Lab. Anim. Sci.;CTLAA8;BM
-Contributions to Mineralogy and Petrology=Contrib. Mineral. Petrol.;CMPEAP;M
-Coordination Chemistry Reviews=Coord. Chem. Rev.;CCHRAM;M
-Corrosion (Houston, TX, United States)=Corrosion (Houston, TX, U. S.);CORRAK;M
-Corrosion Engineering, Science and Technology=Corros. Eng., Sci. Technol.;CESTBU;Q
-Corrosion Reviews=Corros. Rev.;CORVE2;Q
-Corrosion Science=Corros. Sci.;CRRSAA;M
-Critical Reviews in Analytical Chemistry=Crit. Rev. Anal. Chem.;CCACBB;Q
-Critical Reviews in Solid State and Materials Sciences=Crit. Rev. Solid State Mater. Sci.;CCRSDA;Q
-Croatica Chemica Acta=Croat. Chem. Acta;CCACAA;Q
-Cryogenics=Cryogenics;CRYOAX;M
-Crystal Growth & Design=Cryst. Growth Des.;CGDEFU;BM
-Crystal Research and Technology=Cryst. Res. Technol.;CRTEDF;12/YR
-Crystallography Reports=Crystallogr. Rep.;CYSTE3;BM
-CrystEngComm=CrystEngComm;CRECF4;IRR
-Cuihua Xuebao=Cuihua Xuebao;THHPD3;M
-Current Alzheimer Research=Curr. Alzheimer Res.;CARUBY;5/YR
-Current Analytical Chemistry=Curr. Anal. Chem.;CACUBR;3/YR
-Current Biology=Curr. Biol.;CUBLE2;SM
-Current Cancer Drug Targets=Curr. Cancer Drug Targets;CCDTB9;8/YR
-Current Computer-Aided Drug Design=Curr. Comput.-Aided Drug Des.;CCDDAS;4/YR
-Current Drug Delivery=Curr. Drug Delivery;CDDUBJ;4/YR
-Current Drug Discovery Technologies=Curr. Drug Discovery Technol.;CDDTAF;4/YR
-Current Drug Metabolism=Curr. Drug Metab.;CDMUBU;BM
-Current Drug Targets=Curr. Drug Targets;CDTUAU;8/YR
-Current Drug Targets: Cardiovascular & Haematological Disorders=Curr. Drug Targets: Cardiovasc. & Haematol. Disord.;CDTCBB;6/YR
-Current Drug Targets: CNS & Neurological Disorders=Curr. Drug Targets: CNS Neurol. Disord.;CDTCCC;6/YR
-Current Drug Targets: Immune, Endocrine and Metabolic Disorders=Curr. Drug Targets: Immune, Endocr. Metab. Disord.;CDTIBT;4/YR
-Current Drug Targets: Infectious Disorders=Curr. Drug Targets: Infect. Disord.;CDTIAS;Q
-Current Drug Targets: Inflammation & Allergy=Curr. Drug Targets: Inflammation Allergy;CDTICU;BM
-Current Enzyme Inhibition=Curr. Enzyme Inhib.;CEIUAG;3/YR
-Current Gene Therapy=Curr. Gene Ther.;CGTUAH;6/YR
-Current Genetics=Curr. Genet.;CUGED5;M
-Current Genomics=Curr. Genomics;CGUEA8;8/YR
-Current HIV Research=Curr. HIV Res.;CHRUBF;4/YR
-Current Immunology Reviews=Curr. Immunol. Rev.;CIRUBM;3/YR
-Current Medicinal Chemistry=Curr. Med. Chem.;CMCHE7;26/YR
-Current Medicinal Chemistry: Anti-Cancer Agents=Curr. Med. Chem.: Anti-Cancer Agents;CMCACI;BM
-Current Medicinal Chemistry: Anti-Infective Agents=Curr. Med. Chem.: Anti-Infect. Agents;CMCAFL;4/YR
-Current Medicinal Chemistry: Anti-Inflammatory & Anti-Allergy Agents=Curr. Med. Chem.: Anti-Inflammatory Anti-Allergy Agents;CMCAGM;6/YR
-Current Medicinal Chemistry: Cardiovascular & Hematological Agents=Curr. Med. Chem.: Cardiovasc. Hematol. Agents;CMCCDP;4/YR
-Current Medicinal Chemistry: Central Nervous System Agents=Curr. Med. Chem.: Cent. Nerv. Syst. Agents;CMCCCO;Q
-Current Medicinal Chemistry: Immunology, Endocrine & Metabolic Agents=Curr. Med. Chem.: Immunol., Endocr. Metab. Agents;CMCIC8;6/YR
-Current Microbiology=Curr. Microbiol.;CUMIDD;M
-Current Molecular Medicine=Curr. Mol. Med.;CMMUBP;8/yr
-Current Neuropharmacology=Curr. Neuropharmacol.;CNUEAN;Q
-Current Opinion in Biotechnology=Curr. Opin. Biotechnol.;CUOBE3;BM
-Current Opinion in Cell Biology=Curr. Opin. Cell Biol.;COCBE3;BM
-Current Opinion in Chemical Biology=Curr. Opin. Chem. Biol.;COCBF4;BM
-Current Opinion in Colloid & Interface Science=Curr. Opin. Colloid Interface Sci.;COCSFL;BM
-Current Opinion in Drug Discovery & Development=Curr. Opin. Drug Discovery Dev.;CODDFF;BM
-Current Opinion in Genetics & Development=Curr. Opin. Genet. Dev.;COGDET;BM
-Current Opinion in Immunology=Curr. Opin. Immunol.;COPIEL;BM
-Current Opinion in Lipidology=Curr. Opin. Lipidol.;COPLEU;BM
-Current Opinion in Neurobiology=Curr. Opin. Neurobiol.;COPUEN;BM
-Current Opinion in Pharmacology=Curr. Opin. Pharmacol.;COPUBK;BM
-Current Opinion in Structural Biology=Curr. Opin. Struct. Biol.;COSBEF;BM
-Current Organic Chemistry=Curr. Org. Chem.;CORCFE;18/YR
-Current Organic Synthesis=Curr. Org. Synth.;COSUC2;4/YR
-Current Pharmaceutical Analysis=Curr. Pharm. Anal.;CPAUBK;3/YR
-Current Pharmaceutical Biotechnology=Curr. Pharm. Biotechnol.;CPBUBP;BM
-Current Pharmaceutical Design=Curr. Pharm. Des.;CPDEFP;32/YR
-Current Pharmacogenomics=Curr. Pharmacogenomics;CPUHAC;Q
-Current Protein and Peptide Science=Curr. Protein Pept. Sci.;CPPSCM;BM
-Current Proteomics=Curr. Proteomics;CPURCA;4/YR
-Current Separations=Curr. Sep.;CUSEEW;IRR
-Current Topics in Medicinal Chemistry (Sharjah, United Arab Emirates)=Curr. Top. Med. Chem. (Sharjah, United Arab Emirates);CTMCCL;16/YR
-Current Vascular Pharmacology=Curr. Vasc. Pharmacol.;CVPUAY;4/YR
-Cytokine & Growth Factor Reviews=Cytokine Growth Factor Rev.;CGFRFB;BM
-Cytokine+=Cytokine+;CYTIE9;24/YR
-Dalton Transactions=Dalton Trans.;DTARAF;24/YR
-Desalination=Desalination;DSLNAH;36/YR
-Designed Monomers and Polymers=Des. Monomers Polym.;DMPOF3;6/YR
-Development (Cambridge, United Kingdom)=Development (Cambridge, U. K.);DEVPED;SM
-Developmental Biology (San Diego, CA, United States)=Dev. Biol. (San Diego, CA, U. S.);DEBIAO;SM
-Developmental Brain Research=Dev. Brain Res.;DBRRDB;14/YR
-Developmental Cell=Dev. Cell;DCEEBE;M
-Developmental Neuroscience (Basel, Switzerland)=Dev. Neurosci. (Basel, Switz.);DENED7;BM
-Developments in Biologicals (Basel, Switzerland)=Dev. Biol. (Basel, Switz.);DBEIAI;IRR
-Diabetes=Diabetes;DIAEAZ;M
-Diamond and Related Materials=Diamond Relat. Mater.;DRMTE3;M
-Dianhuaxue=Dianhuaxue;DIANFX;Q
-Differentiation (Malden, MA, United States)=Differentiation (Malden, MA, U. S.);DFFNAW;10/YR
-Diffusion and Defect Data--Solid State Data, Pt. A: Defect and Diffusion Forum=Diffus. Defect Data, Pt. A;DDAFE7;12/YR
-Diffusion and Defect Data--Solid State Data, Pt. B: Solid State Phenomena=Diffus. Defect Data, Pt. B;DDBPE8;6/YR
-Diqiu Huaxue=Diqiu Huaxue;TCHHCB;BM
-DNA and Cell Biology=DNA Cell Biol.;DCEBE8;M
-DNA Repair=DNA Repair;DRNEAR;M
-DNA Research=DNA Res.;DARSE8;6/YR
-DNA Sequence=DNA Sequence;DNSEES;BM
-Doklady Biochemistry and Biophysics=Dokl. Biochem. Biophys.;DBBOAL;BM
-Doklady Chemistry=Dokl. Chem.;DKCHAY;M
-Doklady Earth Sciences=Dokl. Earth Sci.;DESOAP;9/YR
-Doklady Physical Chemistry=Dokl. Phys. Chem.;DKPCAG;M
-Doklady Physics=Dokl. Phys.;DOPHFU;M
-Dopovidi Natsional'noi Akademii Nauk Ukraini=Dopov. Nats. Akad. Nauk Ukr.;DNAUFL;M
-Drug and Chemical Toxicology (1977)=Drug Chem. Toxicol. (1977);DCTODJ;Q
-Drug Delivery=Drug Delivery;DDELEB;BM
-Drug Development and Industrial Pharmacy=Drug Dev. Ind. Pharm.;DDIPD8;10/YR
-Drug Development Research=Drug Dev. Res.;DDREDK;M
-Drug Metabolism and Disposition=Drug Metab. Dispos.;DMDSAI;M
-Drug Metabolism and Drug Interactions=Drug Metab. Drug Interact.;DMDIEQ;Q
-Drug Metabolism and Pharmacokinetics=Drug Metab. Pharmacokinet.;DMPRB8;BM
-Dyes and Pigments=Dyes Pigm.;DYPIDX;M
-Earth and Planetary Science Letters=Earth Planet. Sci. Lett.;EPSLA2;48/YR
-Economic Geology=Econ. Geol.;EGCEA8;8/YR
-Ecotoxicology and Environmental Safety=Ecotoxicol. Environ. Saf.;EESADV;9/YR
-Ekotekhnologii i Resursosberezhenie=Ekotekhnol. Resursosberezhenie;ERKTE4;BM
-Eksperimental'naya i Klinicheskaya Farmakologiya=Eksp. Klin. Farmakol.;EKFAE9;BM
-Electroanalysis=Electroanalysis;ELANEU;24/YR
-Electrochemical and Solid-State Letters=Electrochem. Solid-State Lett.;ESLEF6;M
-Electrochemical Society Interface=Electrochem. Soc. Interface;ELSIE3;Q
-Electrochemistry (Tokyo, Japan)=Electrochemistry (Tokyo, Jpn.);EECTFA;M
-Electrochemistry Communications=Electrochem. Commun.;ECCMF9;M
-Electrochimica Acta=Electrochim. Acta;ELCAAV;SM
-Electrophoresis=Electrophoresis;ELCTDN;24/YR
-EMBO Journal=EMBO J.;EMJODG;SM
-EMBO Reports=EMBO Rep.;ERMEAX;M
-Endocrine=Endocrine;EOCRE5;9/YR
-Endocrinology=Endocrinology;ENDOAO;M
-Energy & Fuels=Energy Fuels;ENFUEM;BM
-Engineering in Life Sciences=Eng. Life Sci.;ELSNAE;BM
-Environment Protection Engineering=Environ. Prot. Eng.;EPEND9;Q
-Environmental and Molecular Mutagenesis=Environ. Mol. Mutagen.;EMMUEG;9/YR
-Environmental Chemistry=Environ. Chem.;ECNHAA;4/YR
-Environmental Chemistry Letters=Environ. Chem. Lett.;ECLNBJ;4/YR
-Environmental Engineering Science=Environ. Eng. Sci.;EESCF5;BM
-Environmental Geochemistry and Health=Environ. Geochem. Health;EGHEE3;BM
-Environmental Pollution (Amsterdam, Netherlands)=Environ. Pollut. (Amsterdam, Neth.);ENPOEK;18/YR
-Environmental Progress=Environ. Prog.;ENVPDI;4/YR
-Environmental Research=Environ. Res.;ENVRAL;9/YR
-Environmental Science and Technology=Environ. Sci. Technol.;ESTHAG;SM
-Environmental Technology=Environ. Technol.;ENVTEV;M
-Environmental Toxicology=Environ. Toxicol.;ETOXFH;BM
-Environmental Toxicology and Chemistry=Environ. Toxicol. Chem.;ETOCDK;M
-Environmental Toxicology and Pharmacology=Environ. Toxicol. Pharmacol.;ETOPFR;6/YR
-Enzyme and Microbial Technology=Enzyme Microb. Technol.;EMTED2;M
-Erdoel, Erdgas, Kohle=Erdoel, Erdgas, Kohle;EEKOEY;M
-Eukaryotic Cell=Eukaryotic Cell;ECUEA2;M
-European Cytokine Network=Eur. Cytokine Network;ECYNEJ;4/YR
-European Food Research and Technology=Eur. Food Res. Technol.;EFRTFO;M
-European Journal of Cell Biology=Eur. J. Cell Biol.;EJCBDN;M
-European Journal of Drug Metabolism and Pharmacokinetics=Eur. J. Drug Metab. Pharmacokinet.;EJDPD2;Q
-European Journal of Endocrinology=Eur. J. Endocrinol.;EJOEEP;M
-European Journal of Immunology=Eur. J. Immunol.;EJIMAF;M
-European Journal of Inorganic Chemistry=Eur. J. Inorg. Chem.;EJICFO;SM
-European Journal of Lipid Science and Technology=Eur. J. Lipid Sci. Technol.;EJLTFM;M
-European Journal of Mass Spectrometry=Eur. J. Mass Spectrom.;EJMSCL;6/YR
-European Journal of Medicinal Chemistry=Eur. J. Med. Chem.;EJMCA5;M
-European Journal of Mineralogy=Eur. J. Mineral.;EJMIER;BM
-European Journal of Organic Chemistry=Eur. J. Org. Chem.;EJOCFK;SM
-European Journal of Pharmaceutical Sciences=Eur. J. Pharm. Sci.;EPSCED;15/YR
-European Journal of Pharmacology=Eur. J. Pharmacol.;EJPHAZ;72/YR
-European Neuropsychopharmacology=Eur. Neuropsychopharmacol.;EURNE8;BM
-European Physical Journal A: Hadrons and Nuclei=Eur. Phys. J. A;EPJAFV;M
-European Physical Journal B: Condensed Matter Physics=Eur. Phys. J. B;EPJBFY;SM
-European Physical Journal C: Particles and Fields=Eur. Phys. J. C;EPCFFB;16/YR
-European Physical Journal D: Atomic, Molecular and Optical Physics=Eur. Phys. J. D;EPJDF6;M
-European Physical Journal E: Soft Matter=Eur. Phys. J. E;EPJSFH;M
-European Polymer Journal=Eur. Polym. J.;EUPJAG;M
-Europhysics Letters=Europhys. Lett.;EULEEJ;SM
-Experimental and Clinical Endocrinology & Diabetes=Exp. Clin. Endocrinol. Diabetes;ECEDFQ;10/YR
-Experimental and Molecular Medicine=Exp. Mol. Med.;EMMEF3;BM
-Experimental and Molecular Pathology=Exp. Mol. Pathol.;EXMPA6;BM
-Experimental Animals=Exp. Anim.;JIDOAA;Q
-Experimental Biology and Medicine (Maywood, NJ, United States)=Exp. Biol. Med. (Maywood, NJ, U. S.);EBMMBE;11/YR
-Experimental Cell Research=Exp. Cell Res.;ECREAL;20/YR
-Experimental Eye Research=Exp. Eye Res.;EXERA6;M
-Expert Opinion on Investigational Drugs=Expert Opin. Invest. Drugs;EOIDER;M
-Expert Opinion on Therapeutic Patents=Expert Opin. Ther. Pat.;EOTPEG;M
-Faraday Discussions=Faraday Discuss.;FDISE6;3/YR
-Farmaco=Farmaco;FRMCE8;M
-FASEB Journal=FASEB J.;FAJOEC;15/YR
-FEBS Journal=FEBS J.;FJEOAC;SM
-FEBS Letters=FEBS Lett.;FEBLAL;BW
-FEMS Immunology and Medical Microbiology=FEMS Immunol. Med. Microbiol.;FIMIEV;9/YR
-FEMS Microbiology Ecology=FEMS Microbiol. Ecol.;FMECEZ;M
-FEMS Microbiology Letters=FEMS Microbiol. Lett.;FMLED7;SM
-FEMS Microbiology Reviews=FEMS Microbiol. Rev.;FMREE4;5/YR
-FEMS Yeast Research=FEMS Yeast Res.;FYREAG;M
-Fenxi Huaxue=Fenxi Huaxue;FHHHDT;M
-Fenzi Cuihua=Fenzi Cuihua;FECUEN;BM
-Ferroelectrics=Ferroelectrics;FEROA8;16/YR
-Ferroelectrics, Letters Section=Ferroelectr., Lett. Sect.;FELEDJ;BM
-Fibre Chemistry=Fibre Chem.;FICYAP;BM
-Fire and Materials=Fire Mater.;FMATDV;BM
-Fish Physiology and Biochemistry=Fish Physiol. Biochem.;FPBIEP;4/YR
-Fisheries Science (Carlton, Australia)=Fish. Sci. (Carlton, Aust.);FSCIEH;BM
-Fizika Goreniya i Vzryva=Fiz. Goreniya Vzryva;FGVZA7;BM
-Fizika i Khimiya Obrabotki Materialov=Fiz. Khim. Obrab. Mater.;FKOMAT;BM
-Fizika Metallov i Metallovedenie=Fiz. Met. Metalloved.;FMMTAK;M
-Fluid Phase Equilibria=Fluid Phase Equilib.;FPEQDT;15/YR
-Folia Microbiologica (Prague, Czech Republic)=Folia Microbiol. (Prague, Czech Repub.);FOMIAZ;BM
-Food Additives & Contaminants=Food Addit. Contam.;FACOEB;M
-Food and Chemical Toxicology=Food Chem. Toxicol.;FCTOD7;M
-Food Chemistry=Food Chem.;FOCHDJ;20/YR
-Food Hydrocolloids=Food Hydrocolloids;FOHYES;BM
-Free Radical Biology & Medicine=Free Radical Biol. Med.;FRBMEH;24/YR
-Free Radical Research=Free Radical Res.;FRARER;M
-Fresenius Environmental Bulletin=Fresenius Environ. Bull.;FENBEL;M
-Fuel=Fuel;FUELAC;15/YR
-Fuel Cells (Weinheim, Germany)=Fuel Cells (Weinheim, Ger.);FUCEFK;4/YR
-Fuel Processing Technology=Fuel Process. Technol.;FPTEDY;15/YR
-Fullerenes, Nanotubes, and Carbon Nanostructures=Fullerenes, Nanotubes, Carbon Nanostruct.;FNCNAR;Q
-Functional & Integrative Genomics=Funct. Integr. Genomics;FIGUBY;Q
-Fundamental & Clinical Pharmacology=Fundam. Clin. Pharmacol.;FCPHEZ;BM
-Funtai oyobi Funmatsu Yakin=Funtai oyobi Funmatsu Yakin;FOFUA2;M
-Fusion Engineering and Design=Fusion Eng. Des.;FEDEEE;24/YR
-Fusion Science and Technology=Fusion Sci. Technol.;FSTUCY;7/YR
-Ganguang Kexue Yu Guang Huaxue=Ganguang Kexue Yu Guang Huaxue;GKKHE9;BM
-Gaodeng Xuexiao Huaxue Xuebao=Gaodeng Xuexiao Huaxue Xuebao;KTHPDM;M
-Gaofenzi Cailiao Kexue Yu Gongcheng=Gaofenzi Cailiao Kexue Yu Gongcheng;GCKGEI;BM
-Gaofenzi Xuebao=Gaofenzi Xuebao;GAXUE9;BM
-Gaoneng Wuli Yu Hewuli=Gaoneng Wuli Yu Hewuli;KNWLD9;M
-Gaoxiao Huaxue Gongcheng Xuebao=Gaoxiao Huaxue Gongcheng Xuebao;GHGXEG;BM
-Gene=Gene;GENED6;42/YR
-Gene Expression Patterns=Gene Expression Patterns;GEPEAD;6/YR
-Gene Therapy=Gene Ther.;GETHEC;SM
-Gene Therapy and Regulation=Gene Ther. Regul.;GTREBR;IRR
-General and Comparative Endocrinology=Gen. Comp. Endocrinol.;GCENA5;15/YR
-Genes & Development=Genes Dev.;GEDEEP;SM
-Genes to Cells=Genes Cells;GECEFL;M
-Genes, Chromosomes & Cancer=Genes, Chromosomes Cancer;GCCAES;12/YR
-Genome Research=Genome Res.;GEREFS;M
-Genomics=Genomics;GNMCEP;M
-Geochemical Journal=Geochem. J.;GEJOBE;BM
-Geochimica et Cosmochimica Acta=Geochim. Cosmochim. Acta;GCACAK;SM
-Geokhimiya=Geokhimiya;GEOKAQ;M
-Glass Physics and Chemistry=Glass Phys. Chem.;GPHCEE;BM
-Glass Science and Technology (Offenbach, Germany)=Glass Sci. Technol. (Offenbach, Ger.);GSTEEX;BM
-Glass Technology=Glass Technol.;GLSTAK;BM
-GlassResearcher=GlassResearcher;GRESER;SA
-Global Biogeochemical Cycles=Global Biogeochem. Cycles;GBCYEP;Q
-Glycobiology=Glycobiology;GLYCE3;M
-Glycoconjugate Journal=Glycoconjugate J.;GLJOEW;9/YR
-Gongneng Gaofenzi Xuebao=Gongneng Gaofenzi Xuebao;GGXUEH;Q
-Ground Water=Ground Water;GRWAAP;BM
-Growth Factors=Growth Factors;GRFAEC;Q
-Guangpuxue Yu Guangpu Fenxi=Guangpuxue Yu Guangpu Fenxi;GYGFED;M
-Guijinshu=Guijinshu;GUIJE7;Q
-Guisuanyan Xuebao=Guisuanyan Xuebao;KSYHA5;M
-Guocheng Gongcheng Xuebao=Guocheng Gongcheng Xuebao;CJPEB5;BM
-Health Physics=Health Phys.;HLTPAO;M
-Heat Transfer Engineering=Heat Transfer Eng.;HTEND2;8/YR
-Hecheng Xiangjiao Gongye=Hecheng Xiangjiao Gongye;HXGOEA;BM
-Helvetica Chimica Acta=Helv. Chim. Acta;HCACAV;M
-Hemoglobin=Hemoglobin;HEMOD8;Q
-Heteroatom Chemistry=Heteroat. Chem.;HETCE8;7/YR
-Heterocycles=Heterocycles;HTCYAM;14/YR
-Heterocyclic Communications=Heterocycl. Commun.;HCOMEX;BM
-High Energy Chemistry=High Energy Chem.;HIECAP;BM
-High Performance Polymers=High Perform. Polym.;HPPOEX;Q
-High Temperature=High Temp.;HITEA4;BM
-High Temperature Materials and Processes (London, United Kingdom)=High Temp. Mater. Processes (London, U. K.);HTMPEF;6/YR
-High Temperatures - High Pressures=High Temp. - High Pressures;HTHPAK;BM
-Histochemistry and Cell Biology=Histochem. Cell Biol.;HCBIFP;M
-Holzforschung=Holzforschung;HOLZAZ;BM
-Hormone and Metabolic Research=Horm. Metab. Res.;HMMRA2;M
-Hormone Research=Horm. Res.;HRMRA3;M
-Huadong Ligong Daxue Xuebao, Ziran Kexueban=Huadong Ligong Daxue Xuebao, Ziran Kexueban;HLIXEV;BM
-Huagong Xuebao (Chinese Edition)=Huagong Xuebao (Chin. Ed.);HUKHAI;M
-Huanjing Huaxue=Huanjing Huaxue;HUHUDB;BM
-Huanjing Kexue Xuebao=Huanjing Kexue Xuebao;HKXUDL;M
-Huaxue=Huaxue;HUHSA2;Q
-Huaxue Fanying Gongcheng Yu Gongyi=Huaxue Fanying Gongcheng Yu Gongyi;HFGGEU;BM
-Huaxue Shiji=Huaxue Shiji;HUSHDR;M
-Huaxue Tongbao=Huaxue Tongbao;HHTPAU;M
-Huaxue Wuli Xuebao=Huaxue Wuli Xuebao;HWXUE4;BM
-Huaxue Xuebao=Huaxue Xuebao;HHHPA4;SM
-Human Gene Therapy=Hum. Gene Ther.;HGTHE3;M
-Human Molecular Genetics=Hum. Mol. Genet.;HMGEE5;26/YR
-Hungarian Journal of Industrial Chemistry=Hung. J. Ind. Chem.;HJICAI;4/YR
-Hwahak Konghak=Hwahak Konghak;HHKHAT;BM
-Hydrometallurgy=Hydrometallurgy;HYDRDA;M
-Hyperfine Interactions=Hyperfine Interact.;HYINDN;28/YR
-Hypertension=Hypertension;HPRTDN;M
-IEEE Journal of Quantum Electronics=IEEE J. Quantum Electron.;IEJQA7;M
-IEEE Journal of Selected Topics in Quantum Electronics=IEEE J. Sel. Top. Quantum Electron.;IJSQEN;BM
-ILAR Journal=ILAR J.;IJLOAC;Q
-Immunity=Immunity;IUNIEH;M
-Immunobiology=Immunobiology;IMMND4;IRR
-Immunology=Immunology;IMMUAM;M
-Immunology Letters=Immunol. Lett.;IMLED6;15/YR
-Indian Chemical Engineer=Indian Chem. Eng.;ICENFW;Q
-Indian Journal of Biochemistry & Biophysics=Indian J. Biochem. Biophys.;IJBBBQ;BM
-Indian Journal of Chemical Technology=Indian J. Chem. Technol.;ICHTEU;BM
-Anal. Chem. Indian Journal of Chemistry, Section A: Inorganic, Bio-inorganic, Physical, Theoretical & Analytical Chemistry=Indian J. Chem., Sect. A: Inorg., Bio-inorg., Phys., Theor.;ICACEC;M
-Indian Journal of Chemistry, Section B: Organic Chemistry Including Medicinal Chemistry=Indian J. Chem., Sect. B: Org. Chem. Incl. Med. Chem.;IJSBDB;M
-Indian Journal of Fibre & Textile Research=Indian J. Fibre Text. Res.;IJFRET;Q
-Indian Journal of Heterocyclic Chemistry=Indian J. Heterocycl. Chem.;IJCHEI;Q
-Indian Journal of Physics=Indian J. Phys.;IJPNCV;M
-Indian Journal of Pure and Applied Physics=Indian J. Pure Appl. Phys.;IJOPAU;M
-Industrial & Engineering Chemistry Research=Ind. Eng. Chem. Res.;IECRED;BW
-Infection and Immunity=Infect. Immun.;INFIBR;M
-Inflammation Research=Inflammation Res.;INREFB;M
-Inhalation Toxicology=Inhalation Toxicol.;INHTE5;14/YR
-Inorganic Chemistry=Inorg. Chem.;INOCAJ;BW
-Inorganic Chemistry Communications=Inorg. Chem. Commun.;ICCOFP;M
-Inorganic Materials=Inorg. Mater.;INOMAF;M
-Inorganic Reaction Mechanisms (Philadelphia, PA, United States)=Inorg. React. Mech. (Philadelphia, PA, U. S.);IRMEFE;4/YR
-Inorganica Chimica Acta=Inorg. Chim. Acta;ICHAA3;15/YR
-Insect Biochemistry and Molecular Biology=Insect Biochem. Mol. Biol.;IBMBES;M
-Insect Molecular Biology=Insect Mol. Biol.;IMBIE3;BM
-Instrumentation Science & Technology=Instrum. Sci. Technol.;ISCTEF;6/YR
-Intermetallics=Intermetallics;IERME5;M
-International DATA Series, Selected Data on Mixtures, Series A: Thermodynamic Properties of Non-Reacting Binary Systems of Organic Substances=Int. DATA Ser., Sel. Data Mixtures, Ser. A;ISDMAT;Q
-International Immunology=Int. Immunol.;INIMEN;M
-International Immunopharmacology=Int. Immunopharmacol.;IINMBA;M
-International Journal for Vitamin and Nutrition Research=Int. J. Vitam. Nutr. Res.;IJVNAP;BM
-International Journal of Adhesion and Adhesives=Int. J. Adhes. Adhes.;IJAADK;BM
-International Journal of Antimicrobial Agents=Int. J. Antimicrob. Agents;IAAGEA;M
-International Journal of Applied Ceramic Technology=Int. J. Appl. Ceram. Technol.;IJACCP;BM
-International Journal of Biochemistry & Cell Biology=Int. J. Biochem. Cell Biol.;IJBBFU;M
-International Journal of Biological Macromolecules=Int. J. Biol. Macromol.;IJBMDR;9/YR
-International Journal of Cancer=Int. J. Cancer;IJCNAW;30/YR
-International Journal of Chemical Kinetics=Int. J. Chem. Kinet.;IJCKBO;M
-International Journal of Chemistry=Int. J. Chem.;INJCEW;Q
-International Journal of Coal Geology=Int. J. Coal Geol.;IJCGDE;M
-International Journal of Environment and Pollution=Int. J. Environ. Pollut.;IJVLEN;12/YR
-International Journal of Environmental Analytical Chemistry=Int. J. Environ. Anal. Chem.;IJEAA3;15/YR
-International Journal of Food Science and Technology=Int. J. Food Sci. Technol.;IJFTEZ;10/YR
-International Journal of Hydrogen Energy=Int. J. Hydrogen Energy;IJHEDX;15/YR
-International Journal of Immunogenetics=Int. J. Immunogenet.;IJINCU;BM
-International Journal of Mass Spectrometry=Int. J. Mass Spectrom.;IMSPF8;SM
-International Journal of Mineral Processing=Int. J. Miner. Process.;IJMPBL;M
-International Journal of Multiphase Flow=Int. J. Multiphase Flow;IJMFBP;M
-International Journal of Nanoscience=Int. J. Nanosci.;IJNNAJ;BM
-International Journal of Non-Equilibrium Processing=Int. J. Non-Equilib. Process.;IJNPFU;IRR
-International Journal of Peptide Research and Therapeutics=Int. J. Pept. Res. Ther.;IJPRFC;Q
-International Journal of Pharmaceutics=Int. J. Pharm.;IJPHDE;38/YR
-International Journal of PIXE=Int. J. PIXE;IJPXET;2/YR
-International Journal of Polymer Analysis and Characterization=Int. J. Polym. Anal. Charact.;IPACEZ;BM
-International Journal of Polymeric Materials=Int. J. Polym. Mater.;IJPMCS;M
-International Journal of Powder Metallurgy (Princeton, New Jersey)=Int. J. Powder Metall. (Princeton, N. J.);IPMTEA;BM
-International Journal of Quantum Chemistry=Int. J. Quantum Chem.;IJQCB2;30/YR
-International Journal of Radiation Biology=Int. J. Radiat. Biol.;IJRBE7;M
-International Journal of Refractory Metals & Hard Materials=Int. J. Refract. Met. Hard Mater.;IRMME3;BM
-International Journal of Thermophysics=Int. J. Thermophys.;IJTHDY;BM
-International Materials Reviews=Int. Mater. Rev.;INMREO;BM
-International Polymer Processing=Int. Polym. Process.;IPPREJ;Q
-International Reviews in Physical Chemistry=Int. Rev. Phys. Chem.;IRPCDL;Q
-Ionics=Ionics;IONIFA;BM
-Ironmaking and Steelmaking=Ironmaking Steelmaking;IMKSB7;BM
-ISIJ International=ISIJ Int.;IINTEY;M
-Isotopes in Environmental and Health Studies=Isot. Environ. Health Stud.;IEHSF8;4/YR
-Israel Journal of Chemistry=Isr. J. Chem.;ISJCAT;Q
-Italian Journal of Biochemistry=Ital. J. Biochem.;IJBIAC;Q
-IUBMB Life=IUBMB Life;IULIF8;M
-Izvestiya Natsional'noi Akademii Nauk Respubliki Kazakhstan, Seriya Khimicheskaya=Izv. Nats. Akad. Nauk Resp. Kaz., Ser. Khim.;INANDJ;BM
-Izvestiya Rossiiskoi Akademii Nauk, Seriya Fizicheskaya=Izv. Ross. Akad. Nauk, Ser. Fiz.;IRAFEO;M
-Izvestiya Vysshikh Uchebnykh Zavedenii, Khimiya i Khimicheskaya Tekhnologiya=Izv. Vyssh. Uchebn. Zaved., Khim. Khim. Tekhnol.;IVUKAR;9/YR
-Izvestiya Vysshikh Uchebnykh Zavedenii, Tsvetnaya Metallurgiya=Izv. Vyssh. Uchebn. Zaved., Tsvetn. Metall.;IVUTAK;6/YR
-JAMA, the Journal of the American Medical Association=JAMA, J. Am. Med. Assoc.;JAMAAP;48/YR
-Japanese Journal of Applied Physics, Part 1: Regular Papers, Brief Communications & Review Papers=Jpn. J. Appl. Phys., Part 1;JAPNDE;M
-Japanese Journal of Applied Physics, Part 2: Letters & Express Letters=Jpn. J. Appl. Phys., Part 2;JAPLD8;SM
-JBIC, Journal of Biological Inorganic Chemistry=JBIC, J. Biol. Inorg. Chem.;JJBCFA;8/YR
-JCT Research=JCT Res.;JRCEB5;Q
-JETP Letters=JETP Lett.;JTPLA2;SM
-Jiegou Huaxue=Jiegou Huaxue;JHUADF;M
-Jinshu Xuebao=Jinshu Xuebao;CHSPA4;M
-Jisuanji Yu Yingyong Huaxue=Jisuanji Yu Yingyong Huaxue;JYYHE6;M
-Journal - American Water Works Association=J. - Am. Water Works Assoc.;JAWWA5;M
-Journal de Pharmacie de Belgique=J. Pharm. Belg.;JPBEAJ;4/YR
-Journal of Adhesion=J. Adhes.;JADNAJ;M
-Journal of Adhesion Science and Technology=J. Adhes. Sci. Technol.;JATEE8;16/YR
-Journal of Advances in Chemical Physics=J. Adv. Chem. Phys.;JACPCM;M
-Journal of Aerosol Science=J. Aerosol Sci.;JALSB7;13/YR
-Journal of Agricultural and Food Chemistry=J. Agric. Food Chem.;JAFCAU;BW
-Journal of Alloys and Compounds=J. Alloys Compd.;JALCEU;36/YR
-Journal of Analytical and Applied Pyrolysis=J. Anal. Appl. Pyrolysis;JAAPDD;BM
-Journal of Analytical Atomic Spectrometry=J. Anal. At. Spectrom.;JASPE2;M
-Journal of Analytical Chemistry=J. Anal. Chem.;JACTE2;M
-Journal of Analytical Toxicology=J. Anal. Toxicol.;JATOD3;8/YR
-Journal of Animal Science (Savoy, IL, United States)=J. Anim. Sci. (Savoy, IL, U. S.);JANSAG;M
-Journal of Antibiotics=J. Antibiot.;JANTAJ;M
-Journal of Antimicrobial Chemotherapy=J. Antimicrob. Chemother.;JACHDX;M
-Journal of AOAC International=J. AOAC Int.;JAINEE;BM
-Journal of Applied Animal Welfare Science=J. Appl. Anim. Welfare Sci.;JAAWAV;Q
-Journal of Applied Crystallography=J. Appl. Crystallogr.;JACGAR;BM
-Journal of Applied Electrochemistry=J. Appl. Electrochem.;JAELBJ;M
-Journal of Applied Physics=J. Appl. Phys.;JAPIAU;SM
-Journal of Applied Polymer Science=J. Appl. Polym. Sci.;JAPNAB;SM
-Journal of Applied Spectroscopy=J. Appl. Spectrosc.;JASYAP;BM
-Journal of Applied Toxicology=J. Appl. Toxicol.;JJATDK;BM
-Journal of Atmospheric Chemistry=J. Atmos. Chem.;JATCE2;9/YR
-Journal of Automated Methods & Management in Chemistry=J. Autom. Methods Manage. Chem.;JAMCF2;BM
-Journal of Bacteriology=J. Bacteriol.;JOBAAY;SM
-Journal of Biochemical and Biophysical Methods=J. Biochem. Biophys. Methods;JBBMDG;M
-Journal of Biochemical and Molecular Toxicology=J. Biochem. Mol. Toxicol.;JBMTFQ;BM
-Journal of Biochemistry (Tokyo, Japan)=J. Biochem. (Tokyo, Jpn.);JOBIAO;M
-Journal of Biochemistry and Molecular Biology=J. Biochem. Mol. Biol.;JBMBE5;BM
-Journal of Bioenergetics and Biomembranes=J. Bioenerg. Biomembr.;JBBID4;BM
-Journal of Biological Chemistry=J. Biol. Chem.;JBCHA3;W
-Journal of Biomaterials Science, Polymer Edition=J. Biomater. Sci., Polym. Ed.;JBSEEA;M
-Journal of Biomedical Materials Research, Part A=J. Biomed. Mater. Res., Part A;JBMRCH;16/YR
-Journal of Biomedical Materials Research, Part B: Applied Biomaterials=J. Biomed. Mater. Res., Part B;JBMRGL;8/YR
-Journal of Biomedical Nanotechnology=J. Biomed. Nanotechnol.;JBNOAB;Q
-Journal of Biomolecular NMR=J. Biomol. NMR;JBNME9;M
-Journal of Biomolecular Structure & Dynamics=J. Biomol. Struct. Dyn.;JBSDD6;BM
-Journal of Bioscience and Bioengineering=J. Biosci. Bioeng.;JBBIF6;M
-Journal of Biotechnology=J. Biotechnol.;JBITD4;SM
-Journal of Capillary Electrophoresis and Microchip Technology=J. Capillary Electrophor. Microchip Technol.;JCEMF6;6/YR
-Journal of Carbohydrate Chemistry=J. Carbohydr. Chem.;JCACDM;9/YR
-Journal of Cardiovascular Pharmacology=J. Cardiovasc. Pharmacol.;JCPCDT;M
-Journal of Catalysis=J. Catal.;JCTLA5;16/YR
-Journal of Cell Biology=J. Cell Biol.;JCLBA3;BW
-Journal of Cell Science=J. Cell Sci.;JNCSAI;24/YR
-Journal of Cellular Biochemistry=J. Cell. Biochem.;JCEBD5;18/YR
-Journal of Cellular Physiology=J. Cell. Physiol.;JCLLAX;M
-Journal of Chemical and Engineering Data=J. Chem. Eng. Data;JCEAAX;BM
-Journal of Chemical Crystallography=J. Chem. Crystallogr.;JCCYEV;M
-Journal of Chemical Ecology=J. Chem. Ecol.;JCECD8;M
-Journal of Chemical Education=J. Chem. Educ.;JCEDA8;M
-Journal of Chemical Engineering of Japan=J. Chem. Eng. Jpn.;JCEJAQ;M
-Journal of Chemical Information and Modeling=J. Chem. Inf. Model.;JCISD8;BM
-Journal of Chemical Physics=J. Chem. Phys.;JCPSA6;48/YR
-Journal of Chemical Research=J. Chem. Res.;JCROA4;M
-Journal of Chemical Sciences (Bangalore, India)=J. Chem. Sci. (Bangalore, India);JCSBB5;BM
-Journal of Chemical Technology and Biotechnology=J. Chem. Technol. Biotechnol.;JCTBED;M
-Journal of Chemical Theory and Computation=J. Chem. Theory Comput.;JCTCCE;BM
-Journal of Chemical Thermodynamics=J. Chem. Thermodyn.;JCTDAF;M
-Journal of Chemometrics=J. Chemom.;JOCHEU;M
-Journal of Chromatographic Science=J. Chromatogr. Sci.;JCHSBZ;10/YR
-Journal of Chromatography, A=J. Chromatogr., A;JCRAEY;78/YR
-Journal of Chromatography, B: Analytical Technologies in the Biomedical and Life Sciences=J. Chromatogr., B: Anal. Technol. Biomed. Life Sci.;JCBAAI;23/YR
-Journal of Clinical Endocrinology and Metabolism=J. Clin. Endocrinol. Metab.;JCEMAZ;M
-Journal of Clinical Investigation=J. Clin. Invest.;JCINAO;M
-Journal of Cluster Science=J. Cluster Sci.;JCSCEB;Q
-Journal of Colloid and Interface Science=J. Colloid Interface Sci.;JCISA5;SM
-Journal of Combinatorial Chemistry=J. Comb. Chem.;JCCHFF;BM
-Journal of Computational and Theoretical Nanoscience=J. Comput. Theor. Nanosci.;JCTNAB;4/YR
-Journal of Computational Biology=J. Comput. Biol.;JCOBEM;10/yr
-Journal of Computational Chemistry=J. Comput. Chem.;JCCHDD;16/YR
-Journal of Computer Chemistry, Japan=J. Comput. Chem., Jpn.;JCCJAG;Q
-Journal of Computer-Aided Molecular Design=J. Comput.-Aided Mol. Des.;JCADEQ;M
-Journal of Contaminant Hydrology=J. Contam. Hydrol.;JCOHE6;32/YR
-Journal of Controlled Release=J. Controlled Release;JCREEC;24/yr
-Journal of Coordination Chemistry=J. Coord. Chem.;JCCMBQ;18/YR
-Journal of Crystal Growth=J. Cryst. Growth;JCRGAE;SM
-Journal of Dairy Research=J. Dairy Res.;JDRSAN;Q
-Journal of Dairy Science=J. Dairy Sci.;JDSCAE;M
-Journal of Dispersion Science and Technology=J. Dispersion Sci. Technol.;JDTEDS;BM
-Journal of Drug Targeting=J. Drug Targeting;JDTAEH;10/YR
-Journal of Electroanalytical Chemistry=J. Electroanal. Chem.;JECHES;26/YR
-Journal of Electron Spectroscopy and Related Phenomena=J. Electron Spectrosc. Relat. Phenom.;JESRAW;21/YR
-Journal of Electronic Materials=J. Electron. Mater.;JECMA5;M
-Journal of Endocrinology=J. Endocrinol.;JOENAK;M
-Journal of Endotoxin Research=J. Endotoxin Res.;JENREB;BM
-Journal of Energetic Materials=J. Energ. Mater.;JOEMDK;Q
-Journal of Environmental Engineering (Reston, VA, United States)=J. Environ. Eng. (Reston, VA, U. S.);JOEEDU;M
-Journal of Environmental Monitoring=J. Environ. Monit.;JEMOFW;M
-Journal of Environmental Quality=J. Environ. Qual.;JEVQAA;BM
-Journal of Environmental Radioactivity=J. Environ. Radioact.;JERAEE;21/YR
-Journal of Environmental Science & Engineering=J. Environ. Sci. Eng.;JESEAR;Q
-Environ. Eng. Journal of Environmental Science and Health, Part A: Toxic/Hazardous Substances & Environmental Engineering=J. Environ. Sci. Health, Part A: Toxic/Hazard. Subst.;JATEF9;M
-Journal of Environmental Science and Health, Part B: Pesticides, Food Contaminants, and Agricultural Wastes=J. Environ. Sci. Health, Part B;JPFCD2;BM
-Journal of Enzyme Inhibition and Medicinal Chemistry=J. Enzyme Inhib. Med. Chem.;JEIMAZ;BM
-Journal of Experimental and Theoretical Physics=J. Exp. Theor. Phys.;JTPHES;M
-Journal of Experimental Animal Science=J. Exp. Anim. Sci.;JEXSEU;4/YR
-Journal of Experimental Botany=J. Exp. Bot.;JEBOA6;M
-Journal of Experimental Medicine=J. Exp. Med.;JEMEAV;SM
-Journal of Fluorine Chemistry=J. Fluorine Chem.;JFLCAR;M
-Journal of Food Science=J. Food Sci.;JFDSAZ;9/YR
-Journal of Fusion Energy=J. Fusion Energy;JFENDS;Q
-Journal of General and Applied Microbiology=J. Gen. Appl. Microbiol.;JGAMA9;BM
-Journal of General Virology=J. Gen. Virol.;JGVIAY;M
-Journal of Genome Science and Technology=J. Genome Sci. Technol.;JGSTAI;Q
-Journal of Geochemical Exploration=J. Geochem. Explor.;JGCEAT;BM
-Journal of Hazardous Materials=J. Hazard. Mater.;JHMAD9;21/YR
-Journal of Heterocyclic Chemistry=J. Heterocycl. Chem.;JHTCAD;BM
-Journal of Histochemistry and Cytochemistry=J. Histochem. Cytochem.;JHCYAS;M
-Journal of Hypertension=J. Hypertens.;JOHYD3;M
-Journal of Imaging Science and Technology=J. Imaging Sci. Technol.;JIMTE6;BM
-Journal of Immunoassay & Immunochemistry=J. Immunoassay Immunochem.;JIIOAZ;Q
-Journal of Immunological Methods=J. Immunol. Methods;JIMMBG;M
-Journal of Immunology=J. Immunol.;JOIMA3;SM
-Journal of Inclusion Phenomena and Macrocyclic Chemistry=J. Inclusion Phenom. Macrocyclic Chem.;JIPCF5;M
-Journal of Industrial and Engineering Chemistry (Seoul, Republic of Korea)=J. Ind. Eng. Chem. (Seoul, Repub. Korea);JIECFI;BM
-Journal of Industrial Microbiology & Biotechnology=J. Ind. Microbiol. Biotechnol.;JIMBFL;M
-Journal of Inorganic and Organometallic Polymers and Materials=J. Inorg. Organomet. Polym. Mater.;JIOPAY;Q
-Journal of Inorganic Biochemistry=J. Inorg. Biochem.;JIBIDJ;M
-Journal of Insect Physiology=J. Insect Physiol.;JIPHAF;M
-Journal of Interferon & Cytokine Research=J. Interferon Cytokine Res.;JICRFJ;M
-Journal of Investigative Dermatology=J. Invest. Dermatol.;JIDEAE;M
-Journal of Labelled Compounds & Radiopharmaceuticals=J. Labelled Compd. Radiopharm.;JLCRD4;14/YR
-Journal of Leukocyte Biology=J. Leukocyte Biol.;JLBIE7;M
-Journal of Lipid Research=J. Lipid Res.;JLPRAW;M
-Journal of Liquid Chromatography & Related Technologies=J. Liq. Chromatogr. Relat. Technol.;JLCTFC;20/YR
-Journal of Low Temperature Physics=J. Low Temp. Phys.;JLTPAC;M
-Journal of Luminescence=J. Lumin.;JLUMA8;20/YR
-Journal of Macromolecular Science, Part A: Pure and Applied Chemistry=J. Macromol. Sci., Part A: Pure Appl. Chem.;JSPCE6;M
-Journal of Macromolecular Science, Part B: Physics=J. Macromol. Sci., Part B: Phys.;JMAPBR;BM
-Journal of Macromolecular Science, Polymer Reviews=J. Macromol. Sci., Polym. Rev.;JMSPCG;Q
-Journal of Magnetic Resonance=J. Magn. Reson.;JMARF3;M
-Journal of Magnetism and Magnetic Materials=J. Magn. Magn. Mater.;JMMMDC;45/YR
-Journal of Mass Spectrometry=J. Mass Spectrom.;JMSPFJ;M
-Journal of Materials Chemistry=J. Mater. Chem.;JMACEP;48/YR
-Journal of Materials Engineering and Performance=J. Mater. Eng. Perform.;JMEPEG;BM
-Journal of Materials Research=J. Mater. Res.;JMREEE;M
-Journal of Materials Science=J. Mater. Sci.;JMTSAS;SM
-Journal of Materials Science: Materials in Electronics=J. Mater. Sci.: Mater. Electron.;JSMEEV;M
-Journal of Materials Science: Materials in Medicine=J. Mater. Sci.: Mater. Med.;JSMMEL;M
-Journal of Mathematical Chemistry=J. Math. Chem.;JMCHEG;8/YR
-Journal of Medicinal Chemistry=J. Med. Chem.;JMCMAR;BW
-Journal of Membrane Biology=J. Membr. Biol.;JMBBBO;18/YR
-Journal of Membrane Science=J. Membr. Sci.;JMESDO;36/YR
-Journal of Microencapsulation=J. Microencapsulation;JOMIEF;8/YR
-Journal of Molecular and Cellular Cardiology=J. Mol. Cell. Cardiol.;JMCDAY;M
-Journal of Molecular Biology=J. Mol. Biol.;JMOBAK;50/YR
-Journal of Molecular Catalysis A: Chemical=J. Mol. Catal. A: Chem.;JMCCF2;SM
-Journal of Molecular Catalysis B: Enzymatic=J. Mol. Catal. B: Enzym.;JMCEF8;8/YR
-Journal of Molecular Endocrinology=J. Mol. Endocrinol.;JMLEEI;BM
-Journal of Molecular Evolution=J. Mol. Evol.;JMEVAU;M
-Journal of Molecular Graphics & Modelling=J. Mol. Graphics Modell.;JMGMFI;BM
-Journal of Molecular Liquids=J. Mol. Liq.;JMLIDT;21/YR
-Journal of Molecular Microbiology and Biotechnology=J. Mol. Microbiol. Biotechnol.;JMMBFF;8/YR
-Journal of Molecular Neuroscience=J. Mol. Neurosci.;JMNEES;BM
-Journal of Molecular Recognition=J. Mol. Recognit.;JMORE4;BM
-Journal of Molecular Spectroscopy=J. Mol. Spectrosc.;JMOSA3;M
-Journal of Molecular Structure=J. Mol. Struct.;JMOSB4;66/YR
-Journal of Nanoscience and Nanotechnology=J. Nanosci. Nanotechnol.;JNNOAR;M
-Journal of Natural Gas Chemistry=J. Nat. Gas Chem.;JGCHE8;Q
-Journal of Natural Products=J. Nat. Prod.;JNPRDF;M
-Journal of Near Infrared Spectroscopy=J. Near Infrared Spectrosc.;JNISEI;BM
-Journal of Neurochemistry=J. Neurochem.;JONRA9;SM
-Journal of Neuroendocrinology=J. Neuroendocrinol.;JOUNE2;M
-Journal of Neuroimmunology=J. Neuroimmunol.;JNRIDW;24/YR
-Journal of Neuroscience=J. Neurosci.;JNRSDS;W
-Journal of Neuroscience Research=J. Neurosci. Res.;JNREDK;SM
-Journal of Non-Crystalline Solids=J. Non-Cryst. Solids;JNCSBJ;54/YR
-Journal of Non-Newtonian Fluid Mechanics=J. Non-Newtonian Fluid Mech.;JNFMDI;24/YR
-Journal of Nuclear Materials=J. Nucl. Mater.;JNUMAM;36/YR
-Journal of Nuclear Science and Technology (Tokyo, Japan)=J. Nucl. Sci. Technol. (Tokyo, Jpn.);JNSTAX;M
-Journal of Nutrition=J. Nutr.;JONUAI;M
-Journal of Nutritional Biochemistry=J. Nutr. Biochem.;JNBIEL;M
-Journal of Nutritional Science and Vitaminology=J. Nutr. Sci. Vitaminol.;JNSVA5;BM
-Journal of Ocular Pharmacology and Therapeutics=J. Ocul. Pharmacol. Ther.;JOPTFU;BM
-Journal of Oleo Science=J. Oleo Sci.;JOSOAP;M
-Journal of Organic Chemistry=J. Org. Chem.;JOCEAH;BW
-Journal of Organometallic Chemistry=J. Organomet. Chem.;JORCAI;BW
-Journal of Peptide Research=J. Pept. Res.;JPERFA;M
-Journal of Peptide Science=J. Pept. Sci.;JPSIEI;M
-Journal of Petroleum Science & Engineering=J. Pet. Sci. Eng.;JPSEE6;8/YR
-Journal of Petrology=J. Petrol.;JPTGAD;M
-Journal of Pharmaceutical and Biomedical Analysis=J. Pharm. Biomed. Anal.;JPBADA;15/YR
-Journal of Pharmaceutical Sciences=J. Pharm. Sci.;JPMSAE;M
-Journal of Pharmacological and Toxicological Methods=J. Pharmacol. Toxicol. Methods;JPTMEZ;BM
-Journal of Pharmacological Sciences (Tokyo, Japan)=J. Pharmacol. Sci. (Tokyo, Jpn.);JPSTGJ;M
-Journal of Pharmacology and Experimental Therapeutics=J. Pharmacol. Exp. Ther.;JPETAB;M
-Journal of Pharmacy and Pharmacology=J. Pharm. Pharmacol.;JPPMAB;M
-Journal of Phase Equilibria and Diffusion=J. Phase Equilib. Diffus.;JPEDAV;BM
-Journal of Photochemistry and Photobiology, A: Chemistry=J. Photochem. Photobiol., A;JPPCEJ;30/YR
-Journal of Photochemistry and Photobiology, B: Biology=J. Photochem. Photobiol., B;JPPBEG;M
-Journal of Photochemistry and Photobiology, C: Photochemistry Reviews=J. Photochem. Photobiol., C;JPPCAF;4/YR
-Journal of Photopolymer Science and Technology=J. Photopolym. Sci. Technol.;JSTEEW;5/YR
-Journal of Physical and Chemical Reference Data=J. Phys. Chem. Ref. Data;JPCRBU;Q
-Journal of Physical Chemistry A=J. Phys. Chem. A;JPCAFH;W
-Journal of Physical Chemistry B=J. Phys. Chem. B;JPCBFK;W
-Journal of Physical Organic Chemistry=J. Phys. Org. Chem.;JPOCEE;M
-Journal of Physics and Chemistry of Solids=J. Phys. Chem. Solids;JPCSAW;M
-Journal of Physics B: Atomic, Molecular and Optical Physics=J. Phys. B: At., Mol. Opt. Phys.;JPAPEH;SM
-Journal of Physics D: Applied Physics=J. Phys. D: Appl. Phys.;JPAPBE;SM
-Journal of Physics G: Nuclear and Particle Physics=J. Phys. G: Nucl. Part. Phys.;JPGPED;M
-Journal of Physics: Condensed Matter=J. Phys.: Condens. Matter;JCOMEL;50/YR
-Journal of Physiology (Oxford, United Kingdom)=J. Physiol. (Oxford, U. K.);JPHYA7;SM
-Journal of Pineal Research=J. Pineal Res.;JPRSE9;8/YR
-Journal of Planar Chromatography--Modern TLC=J. Planar Chromatogr.--Mod. TLC;JPCTE5;BM
-Journal of Plant Growth Regulation=J. Plant Growth Regul.;JPGRDI;Q
-Journal of Plant Nutrition=J. Plant Nutr.;JPNUDS;M
-Journal of Plant Nutrition and Soil Science=J. Plant Nutr. Soil Sci.;JNSSFZ;BM
-Journal of Plant Physiology=J. Plant Physiol.;JPPHEY;M
-Journal of Polymer Materials=J. Polym. Mater.;JOPME8;Q
-Journal of Polymer Research=J. Polym. Res.;JPOREP;Q
-Journal of Polymer Science, Part A: Polymer Chemistry=J. Polym. Sci., Part A: Polym. Chem.;JPACEC;SM
-Journal of Polymer Science, Part B: Polymer Physics=J. Polym. Sci., Part B: Polym. Phys.;JPBPEM;SM
-Journal of Polymers and the Environment=J. Polym. Environ.;JPENFW;Q
-Journal of Porphyrins and Phthalocyanines=J. Porphyrins Phthalocyanines;JPPHFZ;M
-Journal of Power Sources=J. Power Sources;JPSODZ;24/YR
-Journal of Process Control=J. Process Control;JPCOEO;8/YR
-Journal of Proteome Research=J. Proteome Res.;JPROBS;BM
-Journal of Pulp and Paper Science=J. Pulp Pap. Sci.;JPUSDN;Q
-Journal of Quantitative Spectroscopy & Radiative Transfer=J. Quant. Spectrosc. Radiat. Transfer;JQSRAE;28/YR
-Journal of Radioanalytical and Nuclear Chemistry=J. Radioanal. Nucl. Chem.;JRNCDM;M
-Journal of Raman Spectroscopy=J. Raman Spectrosc.;JRSPAF;M
-Journal of Receptors and Signal Transduction=J. Recept. Signal Transduction;JRSTCT;Q
-Journal of Reinforced Plastics and Composites=J. Reinf. Plast. Compos.;JRPCDW;18/YR
-Journal of Rheology (New York, NY, United States)=J. Rheol. (N. Y., NY, U. S.);JORHD2;BM
-Journal of Separation Science=J. Sep. Sci.;JSSCCJ;18/YR
-Journal of Sol-Gel Science and Technology=J. Sol-Gel Sci. Technol.;JSGTEC;12/YR
-Journal of Solid State Chemistry=J. Solid State Chem.;JSSCBI;12/YR
-Journal of Solid State Electrochemistry=J. Solid State Electrochem.;JSSEFS;12/YR
-Journal of Solution Chemistry=J. Solution Chem.;JSLCAG;M
-Journal of Steroid Biochemistry and Molecular Biology=J. Steroid Biochem. Mol. Biol.;JSBBEZ;SM
-Journal of Structural and Functional Genomics=J. Struct. Funct. Genomics;JSFGAW;Q
-Journal of Structural Chemistry=J. Struct. Chem.;JSTCAM;BM
-Journal of Sulfur Chemistry=J. Sulfur Chem.;JSCOFC;BM
-Journal of Superconductivity=J. Supercond.;JOUSEH;BM
-Journal of Supercritical Fluids=J. Supercrit. Fluids;JSFLEH;9/yr
-Journal of Surfactants and Detergents=J. Surfactants Deterg.;JSDEFL;Q
-Journal of the American Ceramic Society=J. Am. Ceram. Soc.;JACTAW;M
-Journal of the American Chemical Society=J. Am. Chem. Soc.;JACSAT;W
-Journal of the American Oil Chemists' Society=J. Am. Oil Chem. Soc.;JAOCA7;M
-Journal of the American Society for Mass Spectrometry=J. Am. Soc. Mass Spectrom.;JAMSEF;M
-Journal of the American Society of Brewing Chemists=J. Am. Soc. Brew. Chem.;JSBCD3;Q
-Journal of the Argentine Chemical Society=J. Argent. Chem. Soc.;JACSFY;2/YR
-Journal of the Brazilian Chemical Society=J. Braz. Chem. Soc.;JOCSET;BM
-Journal of the Ceramic Society of Japan=J. Ceram. Soc. Jpn.;JCSJEW;M
-Journal of the Chemical Society of Pakistan=J. Chem. Soc. Pak.;JCSPDF;Q
-Journal of the Chilean Chemical Society=J. Chil. Chem. Soc.;JCCSCB;Q
-Journal of the Chinese Chemical Society (Taipei, Taiwan)=J. Chin. Chem. Soc. (Taipei, Taiwan);JCCTAC;BM
-Journal of the Chinese Institute of Chemical Engineers=J. Chin. Inst. Chem. Eng.;JCICAP;BM
-Journal of the Electrochemical Society=J. Electrochem. Soc.;JESOAN;M
-Journal of the Electrochemical Society of India=J. Electrochem. Soc. India;JESIA5;Q
-Journal of the Energy Institute=J. Energy Inst.;JEIOB8;4/YR
-Journal of the European Ceramic Society=J. Eur. Ceram. Soc.;JECSER;16/YR
-Journal of the Indian Chemical Society=J. Indian Chem. Soc.;JICSAH;M
-Journal of the Institution of Chemists (India)=J. Inst. Chem. (India);JOICA7;BM
-Journal of the Japan Petroleum Institute=J. Jpn. Pet. Inst.;JJPIAP;BM
-Journal of the Korean Ceramic Society=J. Korean Ceram. Soc.;JKCSBW;M
-Journal of the Korean Chemical Society=J. Korean Chem. Soc.;JKCSEZ;BM
-Journal of the Optical Society of America B: Optical Physics=J. Opt. Soc. Am. B;JOBPDE;M
-Journal of the Physical Society of Japan=J. Phys. Soc. Jpn.;JUPSAU;M
-Journal of the Science of Food and Agriculture=J. Sci. Food Agric.;JSFAAE;15/YR
-Journal of the Serbian Chemical Society=J. Serb. Chem. Soc.;JSCSEN;M
-Journal of the Society of Inorganic Materials, Japan=J. Soc. Inorg. Mater., Jpn.;JSIJFR;BM
-Journal of Theoretical & Computational Chemistry=J. Theor. Comput. Chem.;JTCCAC;Q
-Journal of Thermal Analysis and Calorimetry=J. Therm. Anal. Calorim.;JTACF7;M
-Journal of Thermophysics and Heat Transfer=J. Thermophys. Heat Transfer;JTHTEO;Q
-Journal of Toxicology and Environmental Health, Part A=J. Toxicol. Environ. Health, Part A;JTEHF8;SM
-Journal of Toxicology and Environmental Health, Part B: Critical Reviews=J. Toxicol. Environ. Health, Part B;JTECFR;BM
-Journal of Vacuum Science & Technology, A: Vacuum, Surfaces, and Films=J. Vac. Sci. Technol., A;JVTAD6;BM
-Struct.--Process., Meas., Phenom. Journal of Vacuum Science & Technology, B: Microelectronics and Nanometer Structures--Processing, Measurement, and Phenomena=J. Vac. Sci. Technol., B: Microelectron. Nanometer;JVSTBM;BM
-Journal of Vinyl & Additive Technology=J. Vinyl Addit. Technol.;JVATF4;Q
-Journal of Virological Methods=J. Virol. Methods;JVMEDH;16/yr
-Journal of Virology=J. Virol.;JOVIAM;SM
-Journal of Volcanology and Geothermal Research=J. Volcanol. Geotherm. Res.;JVGRDQ;40/YR
-Journal of Wood Chemistry and Technology=J. Wood Chem. Technol.;JWCTDJ;4/YR
-Kagaku Kogaku=Kagaku Kogaku;KKGKA4;M
-Kagaku Kogaku Ronbunshu=Kagaku Kogaku Ronbunshu;KKRBAW;BM
-Kemija u Industriji=Kem. Ind.;KJUIAR;M
-KGK, Kautschuk Gummi Kunststoffe=KGK, Kautsch. Gummi Kunstst.;KKGKB5;10/YR
-Khimicheskaya Promyshlennost (St. Petersburg, Russian Federation)=Khim. Prom-st. (St. Petersburg, Russ. Fed.);KPRMAW;M
-Khimicheskaya Promyshlennost Segodnya=Khim. Prom-st. Segodnya;KPSHBN;M
-Khimiya i Tekhnologiya Vody=Khim. Tekhnol. Vody;KTVODL;BM
-Khimiya Tverdogo Topliva (Moscow, Russian Federation)=Khim. Tverd. Topl. (Moscow, Russ. Fed.);KTVTBY;BM
-Khimiya v Interesakh Ustoichivogo Razvitiya=Khim. Interesakh Ustoich. Razvit.;KIURFI;BM
-Kinetics and Catalysis=Kinet. Catal.;KICAA8;BM
-Kobunshi Ronbunshu=Kobunshi Ronbunshu;KBRBA3;M
-Koks i Khimiya=Koks Khim.;KOKKAI;M
-Korean Journal of Chemical Engineering=Korean J. Chem. Eng.;KJCHE6;BM
-Lab on a Chip=Lab Chip;LCAHAM;12/YR
-Laboratory Animals=Lab. Anim.;LBANAX;Q
-Langmuir=Langmuir;LANGD5;BW
-Laser and Particle Beams=Laser Part. Beams;LPBEDA;Q
-Latvijas Kimijas Zurnals=Latv. Kim. Z.;LKZUE8;Q
-LCGC North America=LCGC North Am.;LNACBH;M
-Letters in Drug Design & Discovery=Lett. Drug Des. Discovery;LDDDAW;8/YR
-Letters in Organic Chemistry=Lett. Org. Chem.;LOCEC7;8/YR
-Life Sciences=Life Sci.;LIFSAK;W
-Linchan Huaxue Yu Gongye=Linchan Huaxue Yu Gongye;LHYGD7;Q
-Lipids=Lipids;LPDSAP;M
-Liquid Crystals=Liq. Cryst.;LICRE6;M
-Lithos=Lithos;LITHAN;28/YR
-LWT--Food Science and Technology=LWT--Food Sci. Technol.;LSTWB3;8/YR
-Macromolecular Bioscience=Macromol. Biosci.;MBAIBU;M
-Macromolecular Chemistry and Physics=Macromol. Chem. Phys.;MCHPES;SM
-Macromolecular Materials and Engineering=Macromol. Mater. Eng.;MMENFA;M
-Macromolecular Rapid Communications=Macromol. Rapid Commun.;MRCOE3;24/YR
-Macromolecular Research=Macromol. Res.;MRAECT;BM
-Macromolecular Symposia=Macromol. Symp.;MSYMEC;IRR
-Macromolecular Theory and Simulations=Macromol. Theory Simul.;MTHSEK;9/YR
-Macromolecules=Macromolecules;MAMOBX;BW
-Magnesium Research=Magnesium Res.;MAGREF;Q
-Magnetic Resonance in Chemistry=Magn. Reson. Chem.;MRCHEG;M
-Magyar Kemiai Folyoirat, Kemiai Kozlemenyek=Magy. Kem. Foly., Kem. Kozl.;MKFKAL;Q
-Main Group Metal Chemistry=Main Group Met. Chem.;MGMCE8;BM
-Marine Biotechnology=Mar. Biotechnol.;MABIFW;BM
-Marine Chemistry=Mar. Chem.;MRCHBD;20/YR
-Marine Environmental Research=Mar. Environ. Res.;MERSDW;10/YR
-Marine Pollution Bulletin=Mar. Pollut. Bull.;MPNBAZ;IRR
-Materials and Corrosion=Mater. Corros.;MTCREQ;M
-Materials and Manufacturing Processes=Mater. Manuf. Processes;MMAPET;BM
-Materials Characterization=Mater. Charact.;MACHEX;10/YR
-Materials Chemistry and Physics=Mater. Chem. Phys.;MCHPDR;M
-Materials Forum=Mater. Forum;MFOREM;A
-Materials Letters=Mater. Lett.;MLETDJ;SM
-Materials Research Bulletin=Mater. Res. Bull.;MRBUAC;15/YR
-Materials Research Innovations=Mater. Res. Innovations;MRINFV;6/YR
-Materials Research Society Symposium Proceedings=Mater. Res. Soc. Symp. Proc.;MRSPDH;IRR
-Materials Science & Engineering, A: Structural Materials: Properties, Microstructure and Processing=Mater. Sci. Eng., A;MSAPE3;46/YR
-Materials Science & Engineering, B: Solid-State Materials for Advanced Technology=Mater. Sci. Eng., B;MSBTEK;30/YR
-Materials Science & Engineering, C: Biomimetic and Supramolecular Systems=Mater. Sci. Eng., C;MSCEEE;8/YR
-Materials Science and Technology=Mater. Sci. Technol.;MSCTEP;M
-Materials Science in Semiconductor Processing=Mater. Sci. Semicond. Process.;MSSPFQ;BM
-Materials Transactions=Mater. Trans.;MTARCE;M
-Matrix Biology=Matrix Biol.;MTBOEC;8/YR
-Measurement Science and Technology=Meas. Sci. Technol.;MSTCEP;M
-Mechanisms of Development=Mech. Dev.;MEDVE6;M
-Medicinal Chemistry=Med. Chem.;MCEHAJ;6/YR
-Medicinal Chemistry Research=Med. Chem. Res.;MCREEB;9/YR
-Mendeleev Communications=Mendeleev Commun.;MENCEX;BM
-Metabolic Engineering=Metab. Eng.;MEENFM;BM
-Metabolism, Clinical and Experimental=Metab., Clin. Exp.;METAAJ;M
-Metal Science and Heat Treatment=Met. Sci. Heat Treat.;MHTRAN;BM
-Metallofizika i Noveishie Tekhnologii=Metallofiz. Noveishie Tekhnol.;MNTEEU;M
-Metallurgical and Materials Transactions A: Physical Metallurgy and Materials Science=Metall. Mater. Trans. A;MMTAEB;M
-Metallurgical and Materials Transactions B: Process Metallurgy and Materials Processing Science=Metall. Mater. Trans. B;MTBSEO;BM
-Metally=Metally;MEALET;BM
-Meteoritics & Planetary Science=Meteorit. Planet. Sci.;MPSCFY;M
-Methods (San Diego, CA, United States)=Methods (San Diego, CA, U. S.);MTHDE9;M
-Microbiology (New York, NY, United States)=Microbiology (N. Y., NY, U. S.);MIBLAO;BM
-Microbiology (Reading, United Kingdom)=Microbiology (Reading, U. K.);MROBEO;M
-Microbiology and Immunology=Microbiol. Immunol.;MIIMDV;M
-Microchemical Journal=Microchem. J.;MICJAN;BM
-Microchimica Acta=Microchim. Acta;MIACAQ;12/YR
-Microelectronic Engineering=Microelectron. Eng.;MIENEF;8/YR
-Microporous and Mesoporous Materials=Microporous Mesoporous Mater.;MIMMFJ;30/YR
-Microscopy and Microanalysis=Microsc. Microanal.;MIMIF7;BM
-Milchwissenschaft=Milchwissenschaft;MILCAD;4/YR
-Mineralium Deposita=Miner. Deposita;MIDEBE;8/YR
-Mineralogical Magazine=Mineral. Mag.;MNLMBB;BM
-Mineralogy and Petrology=Mineral. Petrol.;MIPEE9;12/YR
-Minerals & Metallurgical Processing=Miner. Metall. Process.;MMPRE8;Q
-Minerals Engineering=Miner. Eng.;MENGEB;15/YR
-Mini-Reviews in Medicinal Chemistry=Mini-Rev. Med. Chem.;MMCIAE;12/YR
-Mini-Reviews in Organic Chemistry=Mini-Rev. Org. Chem.;MOCIBT;4/YR
-Mitochondrion=Mitochondrion;MITOCN;BM
-Modern Physics Letters B=Mod. Phys. Lett. B;MPLBET;30/YR
-Molecular and Biochemical Parasitology=Mol. Biochem. Parasitol.;MBIPDP;M
-Molecular and Cellular Biochemistry=Mol. Cell. Biochem.;MCBIB8;26/YR
-Molecular and Cellular Biology=Mol. Cell. Biol.;MCEBD4;SM
-Molecular and Cellular Endocrinology=Mol. Cell. Endocrinol.;MCEND6;30/YR
-Molecular and Cellular Neuroscience=Mol. Cell. Neurosci.;MOCNED;M
-Molecular and Cellular Probes=Mol. Cell. Probes;MCPRE6;BM
-Molecular and Cellular Proteomics=Mol. Cell. Proteomics;MCPOBS;M
-Molecular Biology (New York, NY, United States, English Edition)=Mol. Biol. (N. Y., NY, U. S., Engl. Ed.);MOLBBJ;BM
-Molecular Biology and Evolution=Mol. Biol. Evol.;MBEVEO;M
-Molecular Biology of the Cell=Mol. Biol. Cell;MBCEEV;M
-Molecular Biology Reports=Mol. Biol. Rep.;MLBRBU;4/YR
-Molecular BioSystems=Mol. BioSyst.;MBOIBW;6/YR
-Molecular Biotechnology=Mol. Biotechnol.;MLBOEO;9/YR
-Molecular Brain Research=Mol. Brain Res.;MBREE4;22/YR
-Molecular Cancer Research=Mol. Cancer Res.;MCROC5;M
-Molecular Cancer Therapeutics=Mol. Cancer Ther.;MCTOCF;M
-Molecular Carcinogenesis=Mol. Carcinog.;MOCAE8;M
-Molecular Cell=Mol. Cell;MOCEFL;SM
-Molecular Crystals and Liquid Crystals=Mol. Cryst. Liq. Cryst.;MCLCD8;18/YR
-Molecular Diversity=Mol. Diversity;MODIF4;4/YR
-Molecular Endocrinology=Mol. Endocrinol.;MOENEN;M
-Molecular Genetics and Genomics=Mol. Genet. Genomics;MGGOAA;M
-Molecular Genetics and Metabolism=Mol. Genet. Metab.;MGMEFF;M
-Molecular Immunology=Mol. Immunol.;MOIMD5;M
-Molecular Membrane Biology=Mol. Membr. Biol.;MMEBE7;BM
-Molecular Microbiology=Mol. Microbiol.;MOMIEE;23/YR
-Molecular Neurobiology=Mol. Neurobiol.;MONBEW;BM
-Molecular Pharmaceutics=Mol. Pharm.;MPOHBP;BM
-Molecular Pharmacology=Mol. Pharmacol.;MOPMA3;M
-Molecular Physics=Mol. Phys.;MOPHAM;SM
-Molecular Plant-Microbe Interactions=Mol. Plant-Microbe Interact.;MPMIEL;M
-Molecular Reproduction and Development=Mol. Reprod. Dev.;MREDEE;M
-Molecular Simulation=Mol. Simul.;MOSIEA;15/YR
-Molecular Therapy=Mol. Ther.;MTOHCK;M
-Molecules=Molecules;MOLEFW;M
-Molecules and Cells=Mol. Cells;MOCEEK;BM
-Monatshefte fuer Chemie=Monatsh. Chem.;MOCMB7;M
-Mutagenesis=Mutagenesis;MUTAEX;BM
-Mutation Research=Mutat. Res.;MUREAV;18/YR
-Nano Letters=Nano Lett.;NALEFD;M
-NanoBiotechnology=NanoBiotechnology;NANOCG;4/YR
-Nanomedicine=Nanomedicine;NANOBF;Q
-Natural Product Reports=Nat. Prod. Rep.;NPRRDF;BM
-Natural Product Research=Nat. Prod. Res.;NPRAAT;8/YR
-Natural Product Sciences=Nat. Prod. Sci.;NPSCFB;Q
-Nature (London, United Kingdom)=Nature (London, U. K.);NATUAS;W
-Nature Biotechnology=Nat. Biotechnol.;NABIF9;M
-Nature Cell Biology=Nat. Cell Biol.;NCBIFN;M
-Nature Chemical Biology=Nat. Chem. Biol.;NCBABT;M
-Nature Genetics=Nat. Genet.;NGENEC;M
-Nature Immunology=Nat. Immunol.;NIAMCZ;M
-Nature Materials=Nat. Mater.;NMAACR;M
-Nature Medicine (New York, NY, United States)=Nat. Med. (N. Y., NY, U. S.);NAMEFI;M
-Nature Methods=Nat. Methods;NMAEA3;M
-Nature Neuroscience=Nat. Neurosci.;NANEFN;M
-Nature Reviews Cancer=Nat. Rev. Cancer;NRCAC4;M
-Nature Reviews Drug Discovery=Nat. Rev. Drug Discovery;NRDDAG;M
-Nature Reviews Genetics=Nat. Rev. Genet.;NRGAAM;M
-Nature Reviews Immunology=Nat. Rev. Immunol.;NRIABX;M
-Nature Reviews Microbiology=Nat. Rev. Microbiol.;NRMACK;M
-Nature Reviews Molecular Cell Biology=Nat. Rev. Mol. Cell Biol.;NRMCBP;M
-Nature Reviews Neuroscience=Nat. Rev. Neurosci.;NRNAAN;M
-Nature Structural & Molecular Biology=Nat. Struct. Mol. Biol.;NSMBCU;M
-Naturwissenschaften=Naturwissenschaften;NATWAY;M
-Naunyn-Schmiedeberg's Archives of Pharmacology=Naunyn-Schmiedeberg's Arch. Pharmacol.;NSAPCC;M
-Neftekhimiya=Neftekhimiya;NEFTAH;BM
-Neues Jahrbuch fuer Mineralogie, Abhandlungen=Neues Jahrb. Mineral., Abh.;NJMIAK;IRR
-Neurochemical Research=Neurochem. Res.;NEREDZ;M
-Neurochemistry International=Neurochem. Int.;NEUIDS;16/YR
-Neuroendocrinology=Neuroendocrinology;NUNDAJ;M
-NeuroImmunoModulation=NeuroImmunoModulation;NROIEM;BM
-NeuroMolecular Medicine=NeuroMol. Med.;NMEEAN;6/YR
-Neuron=Neuron;NERNET;SM
-Neuropeptides (Amsterdam, Netherlands)=Neuropeptides (Amsterdam, Neth.);NRPPDD;BM
-Neuropharmacology=Neuropharmacology;NEPHBW;16/YR
-Neuroscience (Oxford, United Kingdom)=Neuroscience (Oxford, U. K.);NRSCDN;28/YR
-Neuroscience Letters=Neurosci. Lett.;NELED5;57/YR
-Neurosignals=Neurosignals;NEURIQ;BM
-Neurotoxicology and Teratology=Neurotoxicol. Teratol.;NETEEC;BM
-New Diamond and Frontier Carbon Technology=New Diamond Front. Carbon Technol.;NDFTFF;6/YR
-New England Journal of Medicine=N. Engl. J. Med.;NEJMAG;W
-New Journal of Chemistry=New J. Chem.;NJCHE5;M
-Nihon Reoroji Gakkaishi=Nihon Reoroji Gakkaishi;NRGIAC;IRR
-Nippon Kinzoku Gakkaishi=Nippon Kinzoku Gakkaishi;NIKGAV;M
-Nitric Oxide=Nitric Oxide;NIOXF5;8/YR
-Nordic Pulp & Paper Research Journal=Nord. Pulp Pap. Res. J.;NPPJEG;Q
-Nuclear Engineering and Design=Nucl. Eng. Des.;NEDEAU;24/YR
-Nuclear Fusion=Nucl. Fusion;NUFUAU;M
-Nuclear Instruments & Methods in Physics Research, Section A: Accelerators, Spectrometers, Detectors, and Associated Equipment=Nucl. Instrum. Methods Phys. Res., Sect. A;NIMAER;36/YR
-Nuclear Instruments & Methods in Physics Research, Section B: Beam Interactions with Materials and Atoms=Nucl. Instrum. Methods Phys. Res., Sect. B;NIMBEU;21/YR
-Nuclear Medicine and Biology=Nucl. Med. Biol.;NMBIEO;8/YR
-Nuclear Physics A=Nucl. Phys. A;NUPABL;68/YR
-Nuclear Physics B=Nucl. Phys. B;NUPBBO;84/yr
-Nuclear Physics B, Proceedings Supplements=Nucl. Phys. B, Proc. Suppl.;NPBSE7;IRR
-Nuclear Science and Engineering=Nucl. Sci. Eng.;NSENAO;9/YR
-Nuclear Technology=Nucl. Technol.;NUTYBB;M
-Nucleic Acids Research=Nucleic Acids Res.;NARHAD;SM
-Nucleic Acids Research Supplement=Nucleic Acids Res. Suppl.;NARSCE;A
-Nucleosides, Nucleotides & Nucleic Acids=Nucleosides, Nucleotides Nucleic Acids;NNNAFY;M
-Nukleonika=Nukleonika;NUKLAS;Q
-Nutrition Research (New York, NY, United States)=Nutr. Res. (N. Y., NY, U. S.);NTRSDC;M
-O'zbekiston Kimyo Jurnali=O'zb. Kim. J.;OKJZA6;BM
-Oil, Gas (Hamburg, Germany)=Oil, Gas (Hamburg, Ger.);OGEMDJ;Q
-Oligonucleotides=Oligonucleotides;OLIGAJ;Q
-OMICS=OMICS;OMICAE;Q
-Oncogene=Oncogene;ONCNES;58/YR
-Optics and Spectroscopy=Opt. Spectrosc.;OPSUA3;M
-Optics Communications=Opt. Commun.;OPCOB8;84/YR
-Organic & Biomolecular Chemistry=Org. Biomol. Chem.;OBCRAK;24/YR
-Organic Geochemistry=Org. Geochem.;ORGEDE;M
-Organic Letters=Org. Lett.;ORLEF7;BW
-Organic Preparations and Procedures International=Org. Prep. Proced. Int.;OPPIAK;BM
-Organic Process Research & Development=Org. Process Res. Dev.;OPRDFK;BM
-Organic Syntheses=Org. Synth.;ORSYAT;A
-Organometallics=Organometallics;ORGND7;BW
-Oriental Journal of Chemistry=Orient. J. Chem.;OJCHEG;3/YR
-Oxidation Communications=Oxid. Commun.;OXCODW;4/YR
-Oxidation of Metals=Oxid. Met.;OXMEAF;BM
-Oyo Yakuri=Oyo Yakuri;OYYAA2;BM
-Ozone: Science & Engineering=Ozone: Sci. Eng.;OZSEDS;BM
-Particulate Science and Technology=Part. Sci. Technol.;PTCHDS;Q
-Peptides (New York, NY, United States)=Peptides (N. Y., NY, U. S.);PPTDD5;M
-Pest Management Science=Pest Manage. Sci.;PMSCFC;M
-Pesticide Biochemistry and Physiology=Pestic. Biochem. Physiol.;PCBPBS;9/YR
-Petroleum Science and Technology=Pet. Sci. Technol.;PSTEFV;M
-Pfluegers Archiv=Pfluegers Arch.;PFLABK;M
-Pharmaceutical Chemistry Journal=Pharm. Chem. J.;PCJOAU;M
-Pharmaceutical Development and Technology=Pharm. Dev. Technol.;PDTEFS;Q
-Pharmaceutical Research=Pharm. Res.;PHREEB;M
-Pharmacogenetics and Genomics=Pharmacogenet. Genomics;PGHEAI;M
-Pharmacogenomics Journal=Pharmacogenomics J.;PJHOAZ;BM
-Pharmacology=Pharmacology;PHMGBN;12/YR
-Pharmacology & Therapeutics=Pharmacol. Ther.;PHTHDT;M
-Pharmacology, Biochemistry and Behavior=Pharmacol., Biochem. Behav.;PBBHAU;M
-Pharmazie=Pharmazie;PHARAT;M
-Phase Transitions=Phase Transitions;PHTRDP;M
-Philosophical Magazine=Philos. Mag.;PMHABF;36/YR
-Philosophical Magazine Letters=Philos. Mag. Lett.;PMLEEG;M
-Phosphorus, Sulfur and Silicon and the Related Elements=Phosphorus, Sulfur Silicon Relat. Elem.;PSSLEC;M
-Photochemical & Photobiological Sciences=Photochem. Photobiol. Sci.;PPSHCB;M
-Photochemistry and Photobiology=Photochem. Photobiol.;PHCBAP;BM
-Photosynthesis Research=Photosynth. Res.;PHRSDI;M
-Physica B: Condensed Matter (Amsterdam, Netherlands)=Physica B (Amsterdam, Neth.);PHYBE3;16/YR
-Physica C: Superconductivity and Its Applications (Amsterdam, Netherlands)=Physica C (Amsterdam, Neth.);PHYCE6;68/YR
-Physica Scripta=Phys. Scr.;PHSTBO;M
-Physica Scripta, T=Phys. Scr., T;PHSTER;IRR
-Physica Status Solidi A: Applications and Materials Science=Phys. Status Solidi A;PSSABA;15/YR
-Physica Status Solidi B: Basic Solid State Physics=Phys. Status Solidi B;PSSBBD;15/YR
-Physica Status Solidi C: Conferences and Critical Reviews=Phys. Status Solidi C;PSSCGL;12/YR
-Physical Chemistry Chemical Physics=Phys. Chem. Chem. Phys.;PPCPFQ;SM
-Physical Review A: Atomic, Molecular, and Optical Physics=Phys. Rev. A: At., Mol., Opt. Phys.;PLRAAN;M
-Physical Review B: Condensed Matter and Materials Physics=Phys. Rev. B: Condens. Matter Mater. Phys.;PRBMDO;48/YR
-Physical Review C: Nuclear Physics=Phys. Rev. C: Nucl. Phys.;PRVCAN;M
-Physical Review D: Particles and Fields=Phys. Rev. D: Part. Fields;PRVDAQ;SM
-Physical Review E: Statistical, Nonlinear, and Soft Matter Physics=Phys. Rev. E: Stat., Nonlinear, Soft Matter Phys.;PRESCM;M
-Physical Review Letters=Phys. Rev. Lett.;PRLTAO;W
-Physics and Chemistry of Glasses=Phys. Chem. Glasses;PCGLA6;BM
-Physics and Chemistry of Liquids=Phys. Chem. Liq.;PCLQAC;6/YR
-Physics and Chemistry of Minerals=Phys. Chem. Miner.;PCMIDU;10/YR
-Physics Letters A=Phys. Lett. A;PYLAAG;84/YR
-Physics Letters B=Phys. Lett. B;PYLBAJ;W
-Physics of Atomic Nuclei=Phys. At. Nucl.;PANUEO;M
-Physics of Fluids=Phys. Fluids;PHFLE6;M
-Physics of Plasmas=Phys. Plasmas;PHPAEN;M
-Physics of the Solid State=Phys. Solid State;PSOSED;M
-Physiologia Plantarum=Physiol. Plant.;PHPLAI;M
-Physiology & Behavior=Physiol. Behav.;PHBHA4;15/YR
-Phytochemical Analysis=Phytochem. Anal.;PHANEL;BM
-Phytochemistry (Elsevier)=Phytochemistry (Elsevier);PYTCAS;SM
-Phytochemistry Reviews=Phytochem. Rev.;PRHEBS;3/YR
-Plant and Cell Physiology=Plant Cell Physiol.;PCPHA5;M
-Plant and Soil=Plant Soil;PLSOA2;20/YR
-Plant Cell=Plant Cell;PLCEEW;M
-Plant Cell Reports=Plant Cell Rep.;PCRPD8;12/YR
-Plant Growth Regulation=Plant Growth Regul.;PGRED3;9/YR
-Plant Journal=Plant J.;PLJUED;24/YR
-Plant Molecular Biology=Plant Mol. Biol.;PMBIDB;18/YR
-Plant Physiology=Plant Physiol.;PLPHAY;M
-Plant Physiology and Biochemistry (Amsterdam, Netherlands)=Plant Physiol. Biochem. (Amsterdam, Neth.);PPBIEX;M
-Plant Science (Amsterdam, Netherlands)=Plant Sci. (Amsterdam, Neth.);PLSCE4;M
-Planta=Planta;PLANAB;M
-Planta Medica=Planta Med.;PLMEAA;M
-Plasma Chemistry and Plasma Processing=Plasma Chem. Plasma Process.;PCPPDW;BM
-Plasma Processes and Polymers=Plasma Processes Polym.;PPPLA6;9/YR
-Plasmid=Plasmid;PLSMDX;BM
-Plasticheskie Massy=Plast. Massy;PLMSAI;IRR
-Plastics, Rubber and Composites=Plast., Rubber Compos.;PRUCFN;10/YR
-Platelets=Platelets;PLTEEF;8/YR
-PLoS Biology=PLoS Biol.;PBLIBG;M
-PLoS Computational Biology=PLoS Comput. Biol.;PCBLBG;M
-PLoS Genetics=PLoS Genet.;PGLEB5;M
-PMSE Preprints=PMSE Prepr.;PPMRA9;SA
-Polish Journal of Chemistry=Pol. J. Chem.;PJCHDQ;M
-Polycyclic Aromatic Compounds=Polycyclic Aromat. Compd.;PARCEO;5/YR
-Polyhedron=Polyhedron;PLYHDE;18/YR
-Polymer=Polymer;POLMAG;BW
-Polymer (Korea)=Polymer (Korea);POLLDG;BM
-Polymer Bulletin (Heidelberg, Germany)=Polym. Bull. (Heidelberg, Ger.);POBUDR;M
-Polymer Composites=Polym. Compos.;PCOMDI;BM
-Polymer Degradation and Stability=Polym. Degrad. Stab.;PDSTDW;M
-Polymer Engineering and Science=Polym. Eng. Sci.;PYESAZ;M
-Polymer International=Polym. Int.;PLYIEI;M
-Polymer Journal (Tokyo, Japan)=Polym. J. (Tokyo, Jpn.);POLJB8;M
-Polymer Preprints (American Chemical Society, Division of Polymer Chemistry)=Polym. Prepr. (Am. Chem. Soc., Div. Polym. Chem.);ACPPAY;SA
-Polymer Testing=Polym. Test.;POTEDZ;8/YR
-Polymer-Plastics Technology and Engineering=Polym.-Plast. Technol. Eng.;PPTEC7;9/YR
-Polymers & Polymer Composites=Polym. Polym. Compos.;PPOCEC;8/YR
-Polymers for Advanced Technologies=Polym. Adv. Technol.;PADTE5;M
-Poverkhnost=Poverkhnost;PFKMDJ;M
-Powder Diffraction=Powder Diffr.;PODIE2;Q
-Powder Metallurgy=Powder Metall.;PWMTAU;Q
-Powder Metallurgy and Metal Ceramics=Powder Metall. Met. Ceram.;PMMCEF;BM
-Powder Technology=Powder Technol.;POTEBX;33/YR
-Practical Spectroscopy=Pract. Spectrosc.;PSPED9;IRR
-Precambrian Research=Precambrian Res.;PCBRBY;32/YR
-Preparative Biochemistry & Biotechnology=Prep. Biochem. Biotechnol.;PBBIF4;Q
-Preprints - American Chemical Society, Division of Petroleum Chemistry=Prepr. - Am. Chem. Soc., Div. Pet. Chem.;ACPCAT;4/YR
-Environ. Chem. Preprints of Extended Abstracts presented at the ACS National Meeting, American Chemical Society, Division of Environmental Chemistry=Prepr. Ext. Abstr. ACS Natl. Meet., Am. Chem. Soc., Div.;PEACF2;SA
-Preprints of Symposia - American Chemical Society, Division of Fuel Chemistry=Prepr. Symp. - Am. Chem. Soc., Div. Fuel Chem.;PSADFZ;2/YR
-Proceedings - Electrochemical Society=Proc. - Electrochem. Soc.;PESODO;IRR
-Proceedings of the Estonian Academy of Sciences, Chemistry=Proc. Est. Acad. Sci., Chem.;PESCFO;Q
-Proceedings of the National Academy of Sciences of the United States of America=Proc. Natl. Acad. Sci. U. S. A.;PNASA6;W
-Process Biochemistry (Oxford, United Kingdom)=Process Biochem. (Oxford, U. K.);PBCHE5;12/YR
-Process Safety and Environmental Protection=Process Saf. Environ. Prot.;PSEPEM;6/YR
-Progress in Colloid & Polymer Science=Prog. Colloid Polym. Sci.;PCPSD7;IRR
-Progress in Crystal Growth and Characterization of Materials=Prog. Cryst. Growth Charact. Mater.;PCGMED;BM
-Progress in Inorganic Chemistry=Prog. Inorg. Chem.;PIOCAR;IRR
-Progress in Nuclear Magnetic Resonance Spectroscopy=Prog. Nucl. Magn. Reson. Spectrosc.;PNMRAT;8/YR
-Progress in Organic Coatings=Prog. Org. Coat.;POGCAT;12/YR
-Progress in Polymer Science=Prog. Polym. Sci.;PRPSB8;M
-Progress in Reaction Kinetics and Mechanism=Prog. React. Kinet. Mech.;PRKMF3;4/YR
-Progress in Solid State Chemistry=Prog. Solid State Chem.;PSSTAW;Q
-Progress in Surface Science=Prog. Surf. Sci.;PSSFBP;SM
-Propellants, Explosives, Pyrotechnics=Propellants, Explos., Pyrotech.;PEPYD5;BM
-Prostaglandins & Other Lipid Mediators=Prostaglandins Other Lipid Mediators;POLMFL;3/yr
-Prostaglandins, Leukotrienes and Essential Fatty Acids=Prostaglandins, Leukotrienes Essent. Fatty Acids;PLEAEU;M
-Protection of Metals=Prot. Met.;PTNMAR;BM
-Protein and Peptide Letters=Protein Pept. Lett.;PPELEN;8/YR
-Protein Engineering, Design & Selection=Protein Eng., Des. Sel.;PEDSBR;M
-Protein Expression and Purification=Protein Expression Purif.;PEXPEJ;M
-Protein Journal=Protein J.;PJROAH;8/YR
-Protein Science=Protein Sci.;PRCIEI;M
-Proteins: Structure, Function, and Bioinformatics=Proteins: Struct., Funct., Bioinf.;PSFBAF;16/YR
-Proteomics=Proteomics;PROTC7;18/YR
-Przemysl Chemiczny=Przem. Chem.;PRCHAB;M
-Psychopharmacology (Berlin, Germany)=Psychopharmacology (Berlin, Ger.);PSCHDL;SM
-Pteridines=Pteridines;PTRDEO;Q
-Pulmonary Pharmacology & Therapeutics=Pulm. Pharmacol. Ther.;PPTHFJ;BM
-Pure and Applied Chemistry=Pure Appl. Chem.;PACHAS;M
-Purinergic Signalling=Purinergic Signalling;PSUIA9;Q
-QSAR & Combinatorial Science=QSAR Comb. Sci.;QCSSAU;10/YR
-Quantum Electronics=Quantum Electron.;QUELEZ;M
-Quimica Nova=Quim. Nova;QUNODK;BM
-Radiation Effects and Defects in Solids=Radiat. Eff. Defects Solids;REDSEI;M
-Radiation Measurements=Radiat. Meas.;RMEAEP;BM
-Radiation Physics and Chemistry=Radiat. Phys. Chem.;RPCHDM;18/YR
-Radiation Research=Radiat. Res.;RAREAE;M
-Radiochemistry (New York, NY, United States)=Radiochemistry (N. Y., NY, U. S.);RDIOEO;BM
-Radiochimica Acta=Radiochim. Acta;RAACAP;12/YR
-Radioprotection=Radioprotection;RAPRBA;Q
-Ranliao Huaxue Xuebao=Ranliao Huaxue Xuebao;RHXUD8;BM
-Rapid Communications in Mass Spectrometry=Rapid Commun. Mass Spectrom.;RCMSEF;SM
-Rare Metals (Beijing, China)=Rare Met. (Beijing, China);RARME8;Q
-Rasplavy=Rasplavy;RASPEM;BM
-Reaction Kinetics and Catalysis Letters=React. Kinet. Catal. Lett.;RKCLAU;6/YR
-Reactive & Functional Polymers=React. Funct. Polym.;RFPOF6;12/YR
-Regulatory Peptides=Regul. Pept.;REPPDY;21/YR
-Rengong Jingti Xuebao=Rengong Jingti Xuebao;RJXUEN;BM
-Reproduction (Bristol, United Kingdom)=Reproduction (Bristol, U. K.);RCUKBS;M
-Reproductive Toxicology=Reprod. Toxicol.;REPTED;BM
-Research Communications in Biochemistry and Cell & Molecular Biology=Res. Commun. Biochem. Cell Mol. Biol.;RCBBFC;Q
-Research Communications in Molecular Pathology and Pharmacology=Res. Commun. Mol. Pathol. Pharmacol.;RCMPE6;IRR
-Research Communications in Pharmacology and Toxicology=Res. Commun. Pharmacol. Toxicol.;RCPTFY;Q
-Research on Chemical Intermediates=Res. Chem. Intermed.;RCINEE;9/YR
-Review of Scientific Instruments=Rev. Sci. Instrum.;RSINAK;M
-Reviews in Analytical Chemistry=Rev. Anal. Chem.;RACYAX;4/YR
-Reviews in Inorganic Chemistry=Rev. Inorg. Chem.;RICHD7;Q
-Revista de Chimie (Bucharest, Romania)=Rev. Chim. (Bucharest, Rom.);RCBUAU;M
-Revista de la Sociedad Quimica del Peru=Rev. Soc. Quim. Peru;RSQPAW;Q
-Revista Mexicana de Ingenieria Quimica=Rev. Mex. Ing. Quim.;RMIQBM;3/YR
-Revista Romana de Materiale=Rev. Rom. Mater.;RRMEB7;Q
-Revue Roumaine de Chimie=Rev. Roum. Chim.;RRCHAX;M
-Rheologica Acta=Rheol. Acta;RHEAAK;BM
-RNA=RNA;RNARFU;M
-RNA Biology=RNA Biol.;RBNIBE;BM
-Romanian Journal of Physics=Rom. J. Phys.;RJPHEC;10/YR
-Rossiiskii Khimicheskii Zhurnal=Ross. Khim. Zh.;RKZHEZ;BM
-Rubber Chemistry and Technology=Rubber Chem. Technol.;RCTEA4;5/YR
-Russian Chemical Bulletin=Russ. Chem. Bull.;RCBUEY;M
-Russian Chemical Reviews=Russ. Chem. Rev.;RCRVAB;M
-Russian Journal of Applied Chemistry=Russ. J. Appl. Chem.;RJACEO;M
-Russian Journal of Bioorganic Chemistry=Russ. J. Bioorg. Chem.;RJBCET;BM
-Russian Journal of Coordination Chemistry=Russ. J. Coord. Chem.;RJCCEY;M
-Russian Journal of Electrochemistry=Russ. J. Electrochem.;RJELE3;M
-Russian Journal of General Chemistry=Russ. J. Gen. Chem.;RJGCEK;M
-Russian Journal of Genetics=Russ. J. Genet.;RJGEEQ;M
-Russian Journal of Organic Chemistry=Russ. J. Org. Chem.;RJOCEQ;M
-Russian Journal of Physical Chemistry=Russ. J. Phys. Chem.;RJPCAR;M
-Russian Journal of Plant Physiology=Russ. J. Plant Physiol.;RJPPE2;BM
-SAR and QSAR in Environmental Research=SAR QSAR Environ. Res.;SQERED;BM
-Scandinavian Journal of Laboratory Animal Science=Scand. J. Lab. Anim. Sci.;SJLSE2;Q
-Scandinavian Journal of Metallurgy=Scand. J. Metall.;SJMLAG;BM
-Science (Washington, DC, United States)=Science (Washington, DC, U. S.);SCIEAS;W
-Science in China, Series B: Chemistry=Sci. China, Ser. B: Chem.;SCBCFQ;BM
-Science of the Total Environment=Sci. Total Environ.;STENDL;36/YR
-Scripta Materialia=Scr. Mater.;SCMAF7;SM
-Seibutsu Kogaku Kaishi=Seibutsu Kogaku Kaishi;SEKAEA;M
-Semiconductor Science and Technology=Semicond. Sci. Technol.;SSTEET;M
-Semiconductors=Semiconductors;SMICES;M
-Sensors and Actuators, A: Physical=Sens. Actuators, A;SAAPEB;16/yr
-Sensors and Actuators, B: Chemical=Sens. Actuators, B;SABCEB;BW
-Separation and Purification Technology=Sep. Purif. Technol.;SPUTFP;18/yr
-Separation Science and Technology=Sep. Sci. Technol.;SSTEDS;16/YR
-Sepu=Sepu;SEPUER;BM
-Shiyou Huagong=Shiyou Huagong;SHHUE8;M
-Shiyou Xuebao, Shiyou Jiagong=Shiyou Xuebao, Shiyou Jiagong;SXSHEY;BM
-Shuichuli Jishu=Shuichuli Jishu;SHJIEG;M
-Signal Transduction=Signal Transduction;STIRCI;6/YR
-Silicon Chemistry=Silicon Chem.;SCIHB4;BM
-Small=Small;SMALBC;12/YR
-Soft Matter=Soft Matter;SMOABF;6/YR
-Soil Biology & Biochemistry=Soil Biol. Biochem.;SBIOAH;M
-Soil Science=Soil Sci.;SOSCAK;M
-Soil Science Society of America Journal=Soil Sci. Soc. Am. J.;SSSJD4;BM
-Solar Energy Materials & Solar Cells=Sol. Energy Mater. Sol. Cells;SEMCEQ;20/YR
-Solid State Communications=Solid State Commun.;SSCOA4;48/YR
-Solid State Ionics=Solid State Ionics;SSIOD3;40/YR
-Solid State Nuclear Magnetic Resonance=Solid State Nucl. Magn. Reson.;SSNRE4;8/YR
-Solid State Sciences=Solid State Sci.;SSSCFJ;M
-Solid-State Electronics=Solid-State Electron.;SSELA5;M
-Solvent Extraction and Ion Exchange=Solvent Extr. Ion Exch.;SEIEDB;BM
-Solvent Extraction Research and Development, Japan=Solvent Extr. Res. Dev., Jpn.;SERDEK;A
-Somatic Cell and Molecular Genetics=Somatic Cell Mol. Genet.;SCMGDN;BM
-South African Journal of Chemistry=S. Afr. J. Chem.;SAJCDG;IRR
-SPE Production & Facilities=SPE Prod. Facil.;SPRFEZ;Q
-SPE Reservoir Evaluation & Engineering=SPE Reservoir Eval. Eng.;SREEFG;BM
-Spectrochimica Acta, Part A: Molecular and Biomolecular Spectroscopy=Spectrochim. Acta, Part A;SAMCAS;14/YR
-Spectrochimica Acta, Part B: Atomic Spectroscopy=Spectrochim. Acta, Part B;SAASBH;M
-Spectroscopy (Amsterdam, Netherlands)=Spectroscopy (Amsterdam, Neth.);SPIJDZ;6/YR
-Spectroscopy Letters=Spectrosc. Lett.;SPLEBX;6/YR
-STAL, Sciences et Techniques de l'Animal de Laboratoire=STAL, Sci. Tech. Anim. Lab.;STALDT;Q
-Starch/Staerke=Starch/Staerke;STARDD;M
-Steel Research International=Steel Res. Int.;SRITB9;M
-Steroids=Steroids;STEDAM;M
-Structural Chemistry=Struct. Chem.;STCHES;BM
-Structure (Cambridge, MA, United States)=Structure (Cambridge, MA, U. S.);STRUE6;M
-Superconductor Science and Technology=Supercond. Sci. Technol.;SUSTEF;M
-Superlattices and Microstructures=Superlattices Microstruct.;SUMIEK;M
-Supramolecular Chemistry=Supramol. Chem.;SCHEER;8/YR
-Surface and Coatings Technology=Surf. Coat. Technol.;SCTEEJ;39/YR
-Surface and Interface Analysis=Surf. Interface Anal.;SIANDQ;13/YR
-Surface Engineering=Surf. Eng.;SUENET;6/YR
-Surface Review and Letters=Surf. Rev. Lett.;SRLEFH;BM
-Surface Science=Surf. Sci.;SUSCAS;36/YR
-Surface Science Reports=Surf. Sci. Rep.;SSREDI;32/YR
-Synapse (New York, NY, United States)=Synapse (N. Y., NY, U. S.);SYNAET;16/YR
-Synlett=Synlett;SYNLES;20/YR
-Synthesis=Synthesis;SYNTBF;20/YR
-Synthesis and Reactivity in Inorganic, Metal-Organic, and Nano-Metal Chemistry=Synth. React. Inorg., Met.-Org., Nano-Met. Chem.;SRIMDO;10/YR
-Synthetic Communications=Synth. Commun.;SYNCAV;SM
-Synthetic Lubrication=Synth. Lubr.;SYLUEB;Q
-Synthetic Metals=Synth. Met.;SYMEDZ;24/YR
-Taehan Kumsok, Chaeryo Hakhoechi=Taehan Kumsok, Chaeryo Hakhoechi;TKHABB;M
-Talanta=Talanta;TLNTA2;M
-Tappi Journal=Tappi J.;TAJODT;M
-Technical Physics=Tech. Phys.;TEPHEX;M
-Technical Physics Letters=Tech. Phys. Lett.;TPLEED;M
-Tenside, Surfactants, Detergents=Tenside, Surfactants, Deterg.;TSDEES;BM
-Tetrahedron=Tetrahedron;TETRAB;W
-Tetrahedron Letters=Tetrahedron Lett.;TELEAY;W
-Tetrahedron: Asymmetry=Tetrahedron: Asymmetry;TASYE3;SM
-Tetsu to Hagane=Tetsu to Hagane;TEHAA2;M
-Textile Research Journal=Text. Res. J.;TRJOA9;M
-THEOCHEM=THEOCHEM;THEODJ;72/YR
-Theoretical and Experimental Chemistry=Theor. Exp. Chem.;TEXCAK;BM
-Theoretical Chemistry Accounts=Theor. Chem. Acc.;TCACFW;10/YR
-Theoretical Foundations of Chemical Engineering=Theor. Found. Chem. Eng.;TFCEAU;BM
-Thermochimica Acta=Thermochim. Acta;THACAS;SM
-Thin Solid Films=Thin Solid Films;THSFAP;46/YR
-Thrombosis and Haemostasis=Thromb. Haemostasis;THHADQ;M
-Thrombosis Research=Thromb. Res.;THBRAA;M
-Topics in Catalysis=Top. Catal.;TOCAFI;20/YR
-Toxicological and Environmental Chemistry=Toxicol. Environ. Chem.;TECSDY;BM
-Toxicological Sciences=Toxicol. Sci.;TOSCF2;M
-Toxicology=Toxicology;TXCYAC;42/YR
-Toxicology and Applied Pharmacology=Toxicol. Appl. Pharmacol.;TXAPA9;SM
-Toxicology in Vitro=Toxicol. in Vitro;TIVIEQ;8/YR
-Toxicology Letters=Toxicol. Lett.;TOLED5;24/YR
-Toxicology Mechanisms and Methods=Toxicol. Mech. Methods;TMMOCP;BM
-Toxicon=Toxicon;TOXIA6;16/YR
-TrAC, Trends in Analytical Chemistry=TrAC, Trends Anal. Chem.;TTAEDJ;11/YR
-Traffic (Oxford, United Kingdom)=Traffic (Oxford, U. K.);TRAFFA;M
-Transactions of the Indian Ceramic Society=Trans. Indian Ceram. Soc.;TICSAP;Q
-Transactions of the Institute of Metal Finishing=Trans. Inst. Met. Finish.;TIMFA2;BM
-Transactions of the SAEST=Trans. SAEST;TSETA6;Q
-Transgenic Research=Transgenic Res.;TRSEES;BM
-Transition Metal Chemistry (Dordrecht, Netherlands)=Transition Met. Chem. (Dordrecht, Neth.);TMCHDN;8/YR
-Trends in Biochemical Sciences=Trends Biochem. Sci.;TBSCDB;M
-Trends in Biotechnology=Trends Biotechnol.;TRBIDM;M
-Trends in Endocrinology and Metabolism=Trends Endocrinol. Metab.;TENME4;10/YR
-Trends in Food Science & Technology=Trends Food Sci. Technol.;TFTEEH;M
-Trends in Genetics=Trends Genet.;TRGEE2;M
-Trends in Immunology=Trends Immunol.;TIRMAE;M
-Trends in Microbiology=Trends Microbiol.;TRMIEA;M
-Trends in Neurosciences=Trends Neurosci.;TNSCDR;M
-Trends in Pharmacological Sciences=Trends Pharmacol. Sci.;TPHSDY;M
-Trends in Plant Science=Trends Plant Sci.;TPSCF9;M
-Tribology Transactions=Tribol. Trans.;TRTRE4;Q
-Turkish Journal of Chemistry=Turk. J. Chem.;TJCHE3;6/YR
-Ukrains'kii Biokhimichnii Zhurnal=Ukr. Biokhim. Zh.;UBZKAA;BM
-Ukrains'kii Fizichnii Zhurnal=Ukr. Fiz. Zh.;UFZHFY;M
-Ukrainskii Khimicheskii Zhurnal (Russian Edition)=Ukr. Khim. Zh. (Russ. Ed.);UKZHAU;6/YR
-Ultramicroscopy=Ultramicroscopy;ULTRD6;16/YR
-Ultrasonics Sonochemistry=Ultrason. Sonochem.;ULSOER;BM
-Vacuum=Vacuum;VACUAV;16/yr
-Vascular Pharmacology=Vasc. Pharmacol.;VPAHAJ;M
-Vestnik Moskovskogo Universiteta, Seriya 2: Khimiya=Vestn. Mosk. Univ., Ser. 2: Khim.;VMUKA5;BM
-Vestnik Sankt-Peterburgskogo Universiteta, Seriya 4: Fizika, Khimiya=Vestn. S.-Peterb. Univ., Ser. 4: Fiz., Khim.;VSUKEH;Q
-Vestsi Natsyyanal'nai Akademii Navuk Belarusi, Seryya Khimichnykh Navuk=Vestsi Nats. Akad. Navuk Belarusi, Ser. Khim. Navuk;VNBNFX;Q
-Vibrational Spectroscopy=Vib. Spectrosc.;VISPEK;BM
-Viral Immunology=Viral Immunol.;VIIMET;Q
-Virology=Virology;VIRLAX;26/YR
-Virus Genes=Virus Genes;VIGEET;BM
-Virus Research=Virus Res.;VIREDF;M
-Vysokomolekulyarnye Soedineniya, Seriya A i Seriya B=Vysokomol. Soedin., Ser. A Ser. B;VSSBEE;M
-Water Environment Research=Water Environ. Res.;WAERED;7/YR
-Water Quality Research Journal of Canada=Water Qual. Res. J. Can.;WQRCFA;Q
-Water Research=Water Res.;WATRAG;20/YR
-Water Resources=Water Resour.;WARED4;BM
-Water, Air, & Soil Pollution=Water, Air, Soil Pollut.;WAPLAC;36/YR
-Wear=Wear;WEARAH;M
-Weed Science=Weed Sci.;WEESA6;BM
-Wood and Fiber Science=Wood Fiber Sci.;WFSCD4;Q
-Wood Science and Technology=Wood Sci. Technol.;WOSTBE;8/YR
-Wuji Huaxue Xuebao=Wuji Huaxue Xuebao;WHUXEO;M
-Wuli Huaxue Xuebao=Wuli Huaxue Xuebao;WHXUEU;M
-Wuli Xuebao=Wuli Xuebao;WLHPAR;M
-X-Ray Spectrometry=X-Ray Spectrom.;XRSPAX;BM
-X-Ray Structure Analysis Online=X-Ray Struct. Anal. Online;XSAOAF;IRR
-Xenobiotica=Xenobiotica;XENOBH;M
-Yakhak Hoechi=Yakhak Hoechi;YAHOA3;BM
-Yakugaku Zasshi=Yakugaku Zasshi;YKKZAJ;M
-Yeast=Yeast;YESTE3;16/YR
-Yingyong Huaxue=Yingyong Huaxue;YIHUED;M
-Yosetsu Gakkai Ronbunshu=Yosetsu Gakkai Ronbunshu;YGRODU;Q
-Youji Huaxue=Youji Huaxue;YCHHDX;M
-Yuki Gosei Kagaku Kyokaishi=Yuki Gosei Kagaku Kyokaishi;YGKKAE;M
-Zeitschrift fuer Anorganische und Allgemeine Chemie=Z. Anorg. Allg. Chem.;ZAACAB;M
-Zeitschrift fuer Kristallographie=Z. Kristallogr.;ZEKRDZ;12/YR
-Zeitschrift fuer Kristallographie - New Crystal Structures=Z. Kristallogr. - New Cryst. Struct.;ZKNSFT;4/YR
-Zeitschrift fuer Metallkunde=Z. Metallkd.;ZEMTAE;M
-Zeitschrift fuer Naturforschung, A: Physical Sciences=Z. Naturforsch., A: Phys. Sci.;ZNASEI;M
-Zeitschrift fuer Naturforschung, B: Chemical Sciences=Z. Naturforsch., B: Chem. Sci.;ZNBSEN;M
-Zeitschrift fuer Naturforschung, C: Journal of Biosciences=Z. Naturforsch., C: J. Biosci.;ZNCBDA;BM
-Zeitschrift fuer Physikalische Chemie (Muenchen, Germany)=Z. Phys. Chem. (Muenchen, Ger.);ZPCFAX;12/YR
-Zhipu Xuebao=Zhipu Xuebao;ZXHUBO;Q
-Zhongguo Shengwu Huaxue Yu Fenzi Shengwu Xuebao=Zhongguo Shengwu Huaxue Yu Fenzi Shengwu Xuebao;ZSHXF2;BM
-Zhurnal Neorganicheskoi Khimii=Zh. Neorg. Khim.;ZNOKAQ;M
-Zhurnal Organichnoi ta Farmatsevtichnoi Khimii=Zh. Org. Farm. Khim.;ZOFKAM;4/YR
diff --git a/src/resource/log4j.properties b/src/resource/log4j.properties
deleted file mode 100644
index c596db8..0000000
--- a/src/resource/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#Uncomment next line for debugging
-#log4j.rootCategory=ALL,stderr
-log4j.rootCategory=WARN,stderr
-log4j.appender.stderr=org.apache.log4j.ConsoleAppender
-log4j.appender.stderr.target=System.err
-log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
-log4j.appender.stderr.layout.ConversionPattern=[%d{ABSOLUTE}] <%t> %5p (%c{2}:%L) %m%n
\ No newline at end of file
diff --git a/src/txt/README b/src/txt/README
index 87b9af5..85f3c8b 100644
--- a/src/txt/README
+++ b/src/txt/README
@@ -1,6 +1,6 @@
-JabRef 2.1 beta 2
------------------
+JabRef 2.1
+----------
Introduction:
@@ -80,9 +80,27 @@ If you choose languages other than English, some or all help pages may
appear in your chosen languages.
Change log:
+2.1 - Added capability to drag files and WWW links into JabRef. BibTeX files will be
+ opened normally, other files imported, and WWW links downloaded and imported.
+ - The -v command line option now makes the application only print version number
+ and quit immediately.
+ - Duplicates within a set of imported entries are now found and shown in the
+ import inspection window.
+ - Mac users can now choose between native and Swing file chooser under
+ Preferences -> Advanced.
+ - Fixed missing duplicate warning when importing without import inspection window.
+ - Fixed error in ISI import which allowed empty fields to be set, causing errors
+ when saving and reloading entries.
+ - Fixed missing time and owner stamps when importing entries (only in 2.1b/2.1b2).
+ - Fixed erroneous updates in entry editor if user switches to a different entry
+ while downloading PDF/PS file.
+ - Fixed bug (only in 2.1b2) in calling file open/save dialog on Mac OS X.
+ - Fixed bug that made duplicate resolver dialog pop under import inspection dialog.
2.1b2 - Added option to toggle floating of marked entries to the top of the table.
- Added option to open, append and import multiple BibTeX files.
- Improved support for LaTeX special characters in HTML and RTF representations.
+ - Improved generation of subdatabase from AUX file. Crossreferenced entries are
+ now included automatically.
- Fixed bug that made entry selection get lost when an edit modifies the entry's
position in the main table.
- Fixed bug in BibTeXML export (entry type name missing in tag).
diff --git a/src/txt/README~ b/src/txt/README~
deleted file mode 100644
index a24343c..0000000
--- a/src/txt/README~
+++ /dev/null
@@ -1,478 +0,0 @@
-
-JabRef 2.1 beta
----------------
-
-
-Introduction:
-
-JabRef is a graphical Java application for editing bibtex (.bib)
-databases. JabRef lets you organize your entries into overlapping
-logical groups, and with a single click limit your view to a single
-group or an intersection or union of several groups. You can customize
-the entry information shown in the main window, and sort by any of the
-standard Bibtex fields. JabRef can autogenerate bibtex keys for your
-entries. JabRef also lets you easily link to PDF or web sources for your
-reference entries.
-
-JabRef can import from and export to several formats, and you can
-customize export filters. JabRef can be run as a command line application
-to convert from any import format to any export format.
-
-
-License:
-JabRef is free open source software, distributed under the GNU General
-Public Licence. See the enclosed text file 'gpl.txt', or the About
-dialog, for details about the GPL.
-
-JabRef also uses libraries distributed by other porties; see the About
-box for details.
-
-
-Requirements:
-JabRef runs on any system equipped with the Java Virtual Machine
-(1.4.2 or newer), which can be downloaded at no cost from
-http://java.sun.com. If you do not plan to compile JabRef, the Java
-Runtime Environment may be a better choice than the Java Development
-Kit.
-
-
-Installing and running, Windows:
-JabRef is available in Windows Installer (.msi) format. To install,
-double-click the .msi file. A shortcut to JabRef will be added to your
-start menu.
-
-The Windows installation was made by Dale Visser, using the following open-source tools:
-JSmooth (.exe wrapper for Java apps), available at http://jsmooth.sf.net/
-Wix (tool for compiling MSI files from an XML specification), available at http://wix.sf.net/
-
-
-Installing and running, general:
-JabRef can be downloaded as an executable .jar file. Run the
-program as follows:
-If you are using the Java Development Kit:
- java -jar <path to jar>
-or, if you are using the Java Runtime Environment:
- jre -new -jar <path to jar> or
- jrew -new -jar <path to jar>
-
-We recommend running JabRef under the Java 5.0 JRE. If you do, you should add
-the option "-Dswing.aatext=true" before the "-jar" option, to activate
-antialiased text throughout the application.
-
-
-The jar file containing JabRef can be unpacked with the command:
- jar xf <path to jar>
-or jar xf <path to jar> <list of files to extract>
-Unpacking the jar file is not necessary to run the program.
-
-
-
-Building JabRef from source:
-Please see the INSTALL file for instructions for building from source.
-
-Documentation:
-JabRef comes with an online help function, accessed by pressing F1 or
-clicking on a question mark icon. The help files are probably not
-exhaustive enough to satisfy everyone yet, but they should help sort
-out the most important issues about using the program. The help files
-can also be viewed outside the program with a standard HTML browser.
-If you choose languages other than English, some or all help pages may
-appear in your chosen languages.
-
-Change log:
-2.1b2 - Added option to toggle floating of marked entries to the top of the table.
- - Added option to open, append and import multiple BibTeX files.
- - Improved support for LaTeX special characters in HTML and RTF representations.
- - Fixed bug that made entry selection get lost when an edit modifies the entry's
- position in the main table.
- - Fixed bug in BibTeXML export (entry type name missing in tag).
- - Fixed name handling in (non-compliant) Endnote files giving all author names
- on the same line.
- - Fixed problem with keyword handling in Medline import.
- - Fixed (harmless) NullPointerException when medline fetch is cancelled.
- - Fixed bug in parser that made {"} illegal in fields quoted with ".
-2.1b - Known issue: font sizes cannot be changed, but should follow OS settings on
- Windows and Mac.
- - Known issue: some HTML may be handled inappropriately when downloading from
- IEEEXplore.
- - Changed Paste function so timestamp and owner fields are updated.
- - Added "Other" item to the "New entry ..." menu.
- - Changed sorting order so marked entries are displayed at the top of the table.
- - Added IEEEXplore search and download feature.
- - Added option to store entries in their original order. Unsorted table view now
- shows entries in their original order.
- - Added option to autogenerate keys for entries with missing keys before each save.
- - Improved handling of external URLs to prevent problems with special characters.
- - Medline and Endnote imports no longer automatically add curly braces around capital
- letters in title.
- - Float search now scrolls table to the top.
- - Fixed lockup problem in preview with uneven number of # characters in fields.
- - Fixed problem with default content selector fields reappearing after removal.
- - Fixed problem with unsupported character encodings being selectable and causing
- unreported save errors.
- - Fixed bug that blocked last line in table columns setup from being removed.
- - Fixed missing export formats from command line.
- - Fixed bug that made Review tab impossible to remove from entry editor.
- - Fixed bug in Medline XML import that assigned wrong PMID for some entries.
- - Fixed bug in custom export that collapsed sequences of two or more backslashes
- into a single backslash in output.
- - Fixed bug (misspelled formatter name) in Harvard RTF export.
-2.0.1: - Fixed bug that made a hidden entry editor under some circumstances store a
- field value to the wrong entry.
- - Fixed synchronization bug that made the opening of a new database sometimes fail.
- - Fixed bug in setting external journal lists when no personal list is set.
-2.0: - Changed sorting selection interface for main table for more intuitive
- operation.
- - Made import operation update "working directory".
- - Removed hard-coded author/editor name rearrangement in OpenOffice and
- OpenDocument exports.
- - Fixed hangup when parsing RIS files from Nature.
- - Fixed NullPointerException when generating database from AUX file on Mac OS X.
- - Fixed bug in routine for adding braces around capital letters.
- - Fixed bug in switching preview layouts.
- - Fixed bug in link handling in entry preview.
-2.0b2: - Changed field order in OpenDocument export to comply with bibliography requirement.
- - Added support for inserting citations into Emacs using gnuserv/gnuclient.
- - Added option to set a regular expression replace operation on generated bibtex keys.
- - Added support for custom importers inside a jar file.
- - Fixed bug in opening URLs containing '&' on Windows.
-2.0b: - Added a system for registering custom import formats in the form of Java classes.
- - Added export option for OpenDocument spreadsheet.
- - Added new options for name formatting in main table.
- - Added REPEC-NEP import filter.
- - Added option for non-field parameters for export formatters. If the parameters does not start with the
- backslash character, it will be passed unchanged to the formatter in place of any field value.
- - Added export formatter CurrentDate, which returns the current date, and takes a format string as
- parameter.
- - Added customization of table colors, accessible from Tools -> Preferences -> Entry table.
- - Added new Appearance tab to preferences dialog to gather appearance related options.
- - Added toggling of abbreviated and full journal names. The list of journals is realized as
- an external file, but editable from a Manage Journal Abbreviations panel. Secondary lists can also
- be linked, but not edited. There is a download option to quickly get a list available on the internet,
- and we will provide one or more lists for download from the SourceForge web server.
- - Added functionality for new JabRef instances to detect a running instance, and send
- command line parameters to the running instance for processing.
- - Added handling of HTML links in preview panel.
- - Added confirmation dialog when database is saved and the chosen encoding doesn't support all characters.
- Gives options to save, cancel or try a different encoding.
- - The encoding used when opening a database is now remembered, and used when database is stored.
- - Added review field for research comments, paper reviews, etc.
- - Added option to disable wrapping for certain fields. Wrapping of pdf, ps, doi and url is disabled by
- default.
- - Antialiasing option now affects entry editor text fields as well as table text.
- - Changed to monospaced font in source editor field.
- - Removed option to put double braces around BibTeX fields, but retained option to remove double braces
- when loading. Added option to put braces around capital letters of a chosen set of fields.
- - Improved Ovid import.
- - Fixed problem with ordering of BibTeX strings that are referred to by other strings.
- - Fixed problem with loading 16-bit encoded bib files with 8-bit encoding as default, and vice versa.
- - Fixed multiplying authors bug when author/editor field appears both in Required and Optional tabs.
- - Fixed startup freeze when trying to load certain malformed bib files.
- - Fixed bug related to multi-line fields in RIS import.
- - Fixed bug related to looking up a fully qualified DOI
- - Included review field to preview panel 1, which shows the abstract
- - Fixed bug where booktitle field was not displayed in preview
- for conference proceedings, similar to journal field
- - By default preserve capitalization on the following fields: title;journal;booktitle;review;abstract
-1.8.1: - Added automatic timestamp with configurable format for entries.
- - Added new key generator modifier ":abbr" to abbreviate field contents.
- - Added Help button in Preferences -> Entry preview
- - Added Big5, Big5_HKSCS and GBK encodings for Chinese.
- - Improved marking feature. Username is now used for marking, so different users can mark
- entries separately without interference.
- - Improved handling of names such as "Firstname de la Lastname jr.", with different handling
- for presentation and sorting purposes. Key generation now should always use the genuine last
- name, and not produce keys like "de2001".
- - Removed duplicate warning from inspection dialog for non-selected entries.
- - Fixed setting of sheet name in OpenOffice.org Calc export.
- - Fixed bug that prevented PDF/PS opening by F4 from automatically finding files in
- subdirectories below the main PDF/PS dir.
- - Fixed BibTeX parser bug that made it choke on short comment strings.
- - Fixed bug that made regexp search fail for fields containing newline characters.
- - Fixed platform-dependent handling of newline characters.
- - Fixed bug that prevented command line import with explicit format.
- - Fixed bug that made it impossible to disable table antialiasing.
- - Fixed AuthorAndsCommaReplacer.
-1.8: - Search panel now starts visible if it was visible at last shutdown.
- - Added option to disable import inspection window when only one entry is being imported.
- - Fixed parser bug that caused problems for bib files containing extra characters after the
- last entry.
- - Fixed missing month in JStor import.
- - Fixed some bugs in "new from plain-text" wizard
-1.8b2: - Changed handling of external updates so the notification is suppressed when there are
- no actual changes.
- - Changed autodetecting import so BibTeX files are handled more similarly to other formats.
- - Enabled sorting by icon columns.
- - Added option to remove BibTeX source panel from entry editor.
- - Added command line option to not load any files at startup. Will override any autoloading
- or other command line options that normally load or import files.
- - Added handling of duplicates to import inspection window.
- - Made entry preview be updated whenever the selection is expanded by one row, to make
- it more useful while selecting a set of entries.
- - Changed BibTeX field parsing to avoid inserting line breaks at wrong places.
- - Improved handling of page numbers in Medline import.
- - Fixed import of file links when importing SixPack files.
- - Fixed bug that prevented closing of search interface when no databases are open.
- - Fixed OpenOffice Calc export to be compatible with OpenOffice.org 2.0 beta.
- - Fixed bugs in Refer/Endnote import filter.
- - Fixed bug that caused changes to be lost in some cases when the same field is present
- in multiple entry editor tabs.
- - Fixed bug that prevented command line autodetecting import from working with BibTeX files.
- - Fixed minor bug in routine for removing double braces.
-1.8b: - Added option to store bib file with double braces.
- - Follow @input tags in aux files to indicate nested aux files for
- generating subdatabases.
- - Improved wrapping and formatting of bib files, to preserve paragraph separator (empty line).
- - Added test buttons for customization of preview layouts.
- - Added inspection dialog for previewing and generating keys for imported entries,
- and deciding which ones to keep and discard. The dialog allows inspection during long import
- processes such as Medline search.
- - Restructured layout to use a common side pane with all tabs.
- - Added import filter for Cambridge Scientific Abstracts (CSA) format.
- - Added PS directory with similar options as PDF.
- - Added [authshort] and [edtrshort] key field markers. Patch submitted by
- Kolja Brix.
- - Made the program remember preview enable setting.
- - Improved handling of illegal regular expressions in search.
- - Removed options to search only Required, Optional and/or General fields,
- in order to simplify search interface.
- - Changed keys for Next and Previous tab to CTRL-PGDN and CTRL-PGUP to match shortcuts in a
- certain popular web browser.
- - Minor change to Preferences -> Table columns to enable insertion of column in position 2.
- - Fixed parser bug that caused problems for files with >10000 entries.
- - Fixed bug in entry editor that caused the source edit panel to remove marking from entries.
- - Fixed export bug that made "\begin" tags fail if encountered immediately after an "\end" tag.
- - Fixed export bug that made whitespace disappear after empty field values.
- - Fixed ISI import bug that handled SO fields with line breaks wrong.
- - Fixed bug occuring when choosing not to import duplicate imported entry.
- - Fixed problem with detecting popup trigger on Mac OSX with one button mouse.
- - Fixed erroneous relative paths for PDF files when PDF directory is not set.
- - Fixed entry preview to resolve string references.
-1.7.1 - Removed unnecessary stack traces when opening external viewer.
- - Fixed bug that made Ctrl-E destroy current edit in entry editor.
- - Fixed problem when copying modified BibTeX key gave old value.
- - Fixed missing 'booktitle' import in CONF entries in RIS import.
- - Fixed bug that made group tree disappear for certain keyword expressions.
- - Fixed bug that made standard BibTeX fields be saved without line wrapping.
-1.7 - When fetching from Medline or CiteSeer, fetched entry is now opened in editor.
- - Added French translations of help files.
- - Added color highlighting of focused text field in entry editor.
- - Added option in context menu of entry editor for changing capitalization
- of field contents.
- - Added name conversion "Smith, RA" -> "Smith, R. A." to Medline import.
- - Fixed bug that left some search settings items disabled when they shouldn't be.
- - Fixed bug that caused requirement for restart to register change in default
- key pattern.
- - Fixed bug that caused crash some times after adding/removing field content selectors.
- - Fixed bug in recognizing custom entry types when reading bib files.
- - Fixed bug that allowed a deleted entry to stay visible in the entry editor.
-1.7b2: - Made side pane resizable.
- - Replaced entry customization dialog with improved interface.
- - Added standard entry type "conference", similar to "inproceedings".
- - Added default key pattern to avoid the need to set similar patterns manually.
- - Added line wrapping to metadata in saved .bib file to avoid long lines.
- - Added "bibtexkey" as implicit fourth sort criterion, to minimize problem with almost
- similar entries swapping places.
- - Added OpenOffice.org Calc export filter that exports spreadsheet compatible with the
- OpenOffice.org bibliography feature.
- - Added a couple of previously unsupported publication types in SciFinder.
- - Added extra shortcuts CTRL-+ and CTRL-- for switching tabs in entry editor, since
- original shortcuts CTRL[-SHIFT]-TAB is used by some window managers.
- - Updated Endnote export filter.
- - Fixed focus and key binding problems for switching tabs/entries in entry editor
- - Fixed bug that prevented required fields tab from appearing for entries with only bibtex key
- as required field.
- - Fixed bug that prevented the user from changing the default encoding.
- - Fixed bugs in RIS import.
- - Fixed bug 1112050; freeze when reading certain author fields with mismatched braces.
-1.7b: - Changed routine for rearranging author names (Lastname, Firstname) so bracketed
- expressions are treated as units.
- - Grouping controls now allow group hierarchies, and now allow explicit and search
- expression groups as well as keyword groups.
- - Added full customization of general fields tabs
- - Added option to preserve formatting for non-BibTeX fields.
- - Added integrity check for database.
- - Added export filters EndNote and Harvard RTF.
- - Added automatic import format chooser for import (same as wildcard import below).
- - Added wildcard (*) option for command-line import, to try to automatically
- determine the correct format.
- - Improved layout of Preferences dialog.
- - Improved several import filters.
- - Added authIniN/edtrIniN key formatters.
- - Marked entries now float to the top when no searching or grouping reordering is active.
- - Fixed problem with opening file dialog on Win NT - AWT dialog is now opened if
- Swing dialog fails.
-1.6: - Improved handling of entry selection in various ways. E.g. selected entry is now scrolled
- into view when opening entry editor and entry is kept selected when importing CiteSeer
- fields.
- - Fixed update bug between autogenerated bibtex key and source panel.
- - Fixed missing . at the end of last author name in RIS import.
- - Fixed NullPointerException on certain special characters when exporting to BibTeXML.
- - Fixed bug that sometimes prevented the unmarking of entries.
- - Fixed problem with formatting one-name authors.
-1.6b: - Added mnemonic keys to menus and menu items.
- - Added MODS and tab-separated file export
- - Added facility for detecting and handling external changes to open bib files.
- - Added scan option for exact duplicates with automatic removal.
- - Bibtex strings are now sorted automatically.
- - Bibtex strings are now resolved when exporting database.
- - Fixed problem with field content selector getting too wide. Limited width.
- - Fixed PDF/PS view routine to remove problems with filenames
- containing spaces.
- - Fixed bug that interfered with Fetch Medline by ID, and fixed
- parsing problem with certain Medline entries.
- - Fixed bug that interfered with Push to WinEdt.
- - Fixed HTML output so \c{c} is handled correctly.
- - command line option for generating a sub-database from LaTex aux file
- entries
- - simple copy/paste menu in entry editor
- - experimental: text-input-area with underlying infotext in plaintext import dialog
-1.55: - Made method for opening PDF files robust with regard to file separators (/ and \),
- so bib files can easier be used across platforms.
- - Improved Medline fetcher. Can now fetch entries based on a search expression.
- - Added features for fetching fields and referring publications from the CiteSeer
- database.
- - Added option to always save database ordered by author/editor/year, and made this
- the default setting.
- - When a single entry is selected, right-click menu now shows a checkbox menu for group
- memberships instead of the regular "Add to" and "Remove from" menus.
- - Improved [shorttitle] and [veryshorttitle] special key pattern fields.
- - Added dialog box for conveniently setting the fields of an entry from a
- plain text description.
- - Added formatter "ResolvePDF" to create correct PDF/PS links in HTML export when
- relative file names are used.
- - Added Abstract panel in entry editor.
- - Added alternate preview with abstract, and made both previews configurable.
- - Added the option to create a subset of a database based on an .aux file.
- - Added 'Cancel' button to duplicate resolver dialog, so the process can be stopped.
- - Added check for spaces in custom entry type names.
- - Added several new key pattern markers.
- - Added toolbar buttons for Mark/Unmark to improve discoverability.
- - Fixed bug that made export filters ignore the chosen character encoding.
- - Fixed bug that interfered with author name formatting.
- - Fixed various bugs in import filters.
- - Fixed bug that prevented confirmation dialog when deleting entry from the entry editor.
- - Fixed bug that made the next entry be opened instead of the current, when pressing
- Enter in table.
- - Fixed bug that made it possible to leave a source edit when the source didn't validate
- properly. Also made it impossible to change table selection until source validates.
-1.5: - Enabled selection of default encoding, and started storing encoding information in
- saved .bib files, which is used when reopening.
- - Added Highlight and select options to the group interface, and made it possible
- to change the number of visible lines in the list.
- - Added option to allow or disallow direct table editing.
- - Added optional confirmation dialog for deleting entries.
- - Added optional warning dialog for duplicate BibTeX keys.
- - Added warnings to bibtex parser, and prevented failure to load files with
- duplicate string definitions.
- - Added JStor import filter.
- - Changed the look and feel to JGoodies Forms on non-Macintosh platforms.
- - Optimized performance in several areas.
- - Numerous usability improvements.
- - Fixed RIS import bug caused by short lines.
- - Fixed bug in SciFinder import.
- - Fixed bug that made entire field get cleared when removing from group.
-1.4: - Added advanced search feature.
- - Added facility for using custom export formats.
- - Added command line options for importing/exporting files, importing/exporting
- user preferences, loading session and for suppressing the GUI (using RitOpt for
- parsing options).
- - Added automatic stripping of \url{} when opening url.
- - Improved export filters.
- - Fixed focus bug which sometimes interfered with cut/copy/paste.
-1.3.1: - Bugfix.
-1.3: - Added entry preview.
- - Added detection of duplicate entries.
- - Added possibility to mark entries persistently.
- - Added import filter for Sixpack and Biblioscape Tag files.
- - Added option to use a standard directory for PDFs. PDFs placed in or below this directory
- and named after an entry's BibTeX key can be automatically found.
- - Added optional columns showing clickable icons for pdf/ps and url/doi links.
- - Added menu and toolbar actions for open pdf/ps and url/doi.
- - Added web lookup of DOI.
- - Added several new special field markers to the key autogenerator.
- - Added BibTeXML and simple HTML export.
- - Changed browsing of entries. Entry editor now shows the selected entry.
- - Improved HTML export for several entry types.
- - Improved compatibility with Mac OS X.
- - Made it possible to set custom secondary and tertiary sort fields.
- - Made the entry number column width customizable.
- - Fixed bug that caused database to always be marked as changed after viewing source.
- - Fixed bug in selector word removal.
- - Fixed bug that made the file chooser unable to interpret Mac OS X aliases.
-1.2: - Replaced the icon set.
- - Added support for French language.
- - Added customization of key generation.
- - Improved HTML export.
- - Added Replace string feature.
- - Made a couple of adaptations for Mac OS X users.
- - Added option in Table Preferences to set current column widths as default.
- - Added import filter for BibTeXML.
- - Fixed bug that allowed non-lowercase grouping field, leading to problems.
- - Fixed bug that made selector words added in the dialog to be lowercased.
- - Fixed bug relating to translated help files.
-1.19: - Entry editor is now opened for an entry that causes an error when saving.
- - Added options to display names in harmonised format in the main table.
- - Added Docbook and (experimental) HTML export.
- - Enabled 'doi' and 'pii' fields for Medline import.
- - Enabled antialiasing fonts.
- - Added the Kunststoff look&feel to give a more pleasant user interface.
- - Added font selector for the main table.
- - Improved table column customization.
- - Added word selector feature for selected fields (keywords, journal).
- - Added support for German and Norwegian language.
- - Generalized copy cite key features for multiple entries.
- - Added quick load/save session feature.
- - Fixed issue/number bug in ISI import.
- - Added "Open pdf/ps" item in right-click menu.
- - Fixed bug causing external viewer to only work in General fields.
- - Added functionality for using Browse buttons for file-related fields
- (ps, pdf, etc.).
- - Added Browse buttons to External programs tab in Preferences.
- - Fixed bug related to Save database and Source field which caused changes
- to disappear.
-1.1: - Added bibtex key uniqueness checking, and prevented autogeneration
- from generating non-unique keys.
- - Added command line option to load file on startup.
- - Fixed problem with autogeneration creating invalid keys.
- - Improved Refer/Endnote import.
- - Added feature for importing entries and/or strings and/or group
- definitions from another BibTeX database.
- - Added menu choices to import into open database.
- - Added toolbar button for closing current database.
- - Fixed shortcut key for "Store field" in entry editor, and fixed
- problem that made shortcut for "Save database" unavailable from
- entry editor.
- - Added option to fetch Medline entries automatically by
- ID, based on a patch submitted by Mike Smoot.
- - Fixed bug in RIS import.
- - Added options to copy key and copy "\cite{key}" to right-click menu.
- - Fixed bug that caused some General fields not to get displayed.
- - Enabled customization of General fields.
- - Enabled customization of existing entry types, and definition of
- new types.
-1.0: First release.
-
-
-Bug reports, suggestions, other feedback:
-We are thankful for any bug reports or other feedback. If there are
-features you want included in JabRef, tell us!
-
-
-JabRef homepage:
-http://jabref.sourceforge.net
-
-You can always get the very latest version of the program from our CVS
-repository; instructions for downloading are found on the
-homepage. Note that the CVS version may contain untested features, or
-have other stability issues. Unless you're feeling extremely lucky, go
-for the version in the HEAD branch of the module 'jabref'.
-
-
-Bug submission and Open Discussions and Help forums are found at:
-http://sourceforge.net/projects/jabref
-
-
-Corresponding authors:
-mortenalver _ users.sourceforge.net
-nbatada _ users.sourceforge.net
diff --git a/src/txt/apache-license.txt b/src/txt/apache-license.txt
deleted file mode 100644
index 06b8fa5..0000000
--- a/src/txt/apache-license.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * $Header: /cvsroot/jabref/jabref/src/txt/apache-license.txt,v 1.1 2004/12/11 23:18:30 mortenalver Exp $
- * $Revision: 1.1 $
- * $Date: 2004/12/11 23:18:30 $
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache at apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * [Additional notices, if required by prior licensing conditions]
- *
- */
diff --git a/src/txt/cpl-v10.html b/src/txt/cpl-v10.html
deleted file mode 100644
index 36aa208..0000000
--- a/src/txt/cpl-v10.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-<HEAD>
-<TITLE>Common Public License - v 1.0</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF" VLINK="#800000">
-
-
-<P ALIGN="CENTER"><B>Common Public License - v 1.0</B>
-<P><B></B><FONT SIZE="3"></FONT>
-<P><FONT SIZE="3"></FONT><FONT SIZE="2">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>1. DEFINITIONS</B></FONT>
-<P><FONT SIZE="2">"Contribution" means:</FONT>
-
-<UL><FONT SIZE="2">a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and<BR CLEAR="LEFT">
-b) in the case of each subsequent Contributor:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i) changes to the Program, and</FONT></UL>
-
-
-<UL><FONT SIZE="2">ii) additions to the Program;</FONT></UL>
-
-
-<UL><FONT SIZE="2">where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. </FONT><FONT SIZE="2">A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. </FONT><FONT SIZE="2">Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their ow [...]
-
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Contributor" means any person or entity that distributes the Program.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. </FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">"Program" means the Contributions distributed in accordance with this Agreement.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.</FONT>
-<P><FONT SIZE="2"><B></B></FONT>
-<P><FONT SIZE="2"><B>2. GRANT OF RIGHTS</B></FONT>
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a) </FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object [...]
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b) Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of th [...]
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and [...]
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. </FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2"><B>3. REQUIREMENTS</B></FONT>
-<P><FONT SIZE="2"><B></B>A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:</FONT>
-
-<UL><FONT SIZE="2">a) it complies with the terms and conditions of this Agreement; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">b) its license agreement:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i) effectively disclaims</FONT><FONT SIZE="2"> on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; </FONT></UL>
-
-
-<UL><FONT SIZE="2">ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL>
-
-
-<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2"> states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL>
-
-
-<UL><FONT SIZE="2" COLOR="#FF0000"></FONT><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2">When the Program is made available in source code form:</FONT>
-
-<UL><FONT SIZE="2">a) it must be made available under this Agreement; and </FONT></UL>
-
-
-<UL><FONT SIZE="2">b) a copy of this Agreement must be included with each copy of the Program. </FONT></UL>
-
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT><FONT SIZE="2">Contributors may not remove or alter any copyright notices contained within the Program. </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>4. COMMERCIAL DISTRIBUTION</B></FONT>
-<P><FONT SIZE="2">Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contrib [...]
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to thos [...]
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"></FONT><FONT SIZE="2"><B>5. NO WARRANTY</B></FONT>
-<P><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is</FONT><FONT SIZE="2"> solely responsible for determining the appropriateness of using and distributing </FONT><FONT SIZE="2">the Program</FONT><FONT [...]
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"><B>6. DISCLAIMER OF LIABILITY</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES </FONT><FONT SIZE="2">(INCLUDING WITHOUT LIMITATION LOST PROFITS),</FONT><FONT SIZE="2"> HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR [...]
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>7. GENERAL</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program i [...]
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any lice [...]
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to </FONT><FONT SIZE="2">publish new versions (including revisions) of this Agreement from time to </FONT><FONT SIZE="2">time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initia [...]
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git
More information about the pkg-java-commits
mailing list