Fixed mandatory field coloring

JabRef · Aug 17, 2016 · 46a4415 · 46a4415
1 parent a70d9f5
commit 46a4415
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 102 deletions.
diff --git a/src/main/java/net/sf/jabref/gui/maintable/MainTable.java b/src/main/java/net/sf/jabref/gui/maintable/MainTable.java
@@ -271,13 +271,12 @@ else if (column == 0) {
  }
  renderer.setHorizontalAlignment(JLabel.CENTER);
  } else if (tableColorCodes || tableResolvedColorCodes) {
- CellRendererMode status = getCellStatus(row, column);
-
- if (tableColorCodes && (status == CellRendererMode.REQUIRED)) {
+ CellRendererMode status = getCellStatus(row, column, tableResolvedColorCodes);
+ if (status == CellRendererMode.REQUIRED) {
  renderer = MainTable.reqRenderer;
- } else if (tableColorCodes && (status == CellRendererMode.OPTIONAL)) {
+ } else if (status == CellRendererMode.OPTIONAL) {
  renderer = MainTable.optRenderer;
- } else if (tableResolvedColorCodes && (status == CellRendererMode.RESOLVED)) {
+ } else if (status == CellRendererMode.RESOLVED) {
  renderer = MainTable.resolvedRenderer;
  }
  }
@@ -460,10 +459,10 @@ private void setupComparatorChooser() {
 
  }
 
- private CellRendererMode getCellStatus(int row, int col) {
+ private CellRendererMode getCellStatus(int row, int col, boolean checkResolved) {
  try {
  BibEntry be = getEntryAt(row);
- if (tableFormat.getTableColumn(col).isResolved(be)) {
+ if (checkResolved && tableFormat.getTableColumn(col).isResolved(be)) {
  return CellRendererMode.RESOLVED;
  }
  Optional<EntryType> type = EntryTypes.getType(be.getType(), panel.getBibDatabaseContext().getMode());

diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
@@ -2464,6 +2464,5 @@ You_must_enter_at_least_one_field_name=Sie_müssen_mindestens_einen_Feldnamen_an
 Non-ASCII_encoded_character_found=Nicht_ASCII-kodiertes_Zeichen_gefunden
 
 Toggle_web_search_interface=
-Non-ASCII_encoded_character_found=
 Background_color_for_resolved_fields=
 Color_codes_for_resolved_fields=
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
@@ -1701,53 +1701,6 @@ You_must_enter_at_least_one_field_name=Vous_devez_entrer_au_moins_un_nom_de_cham
 Non-ASCII_encoded_character_found=Caractère_ayant_un_encodage_non-ASCII_trouvé
 
 Toggle_web_search_interface=
-Connection=
-Host=
-Port=
-Database=
-User=
-Connection_error=
-Driver_error=
-Connection_to_%0_server_stablished.=
-Required_field_"%0"_is_empty.=
-Corrupt_shared_database_structure.=
-Integrity_check_failed._Fixing...=
-
-%0_driver_not_available.=
-
-The_connection_to_the_server_has_been_determinated.=
-
-Connection_lost.=
-Reconnect=
-Work_offline=
-
-Working_offline.=
-
-Update_refused.=
-Update_refused=
-Local_entry=
-Shared_entry=
-Update_could_not_be_performed_due_to_existing_change_conflicts.=
-You_are_not_working_on_the_newest_version_of_BibEntry.=
-Local_version\:_%0=
-Shared_version\:_%0=
-Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
-Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
-The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
-Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
-New_technical_report=
-
-%0_file=
-Custom_layout_file=
-Protected_terms_file=
-Style_file=
-
-Open_OpenOffice/LibreOffice_connection=
-
-You_must_enter_at_least_one_field_name=
-
-
-Non-ASCII_encoded_character_found=
 
 Background_color_for_resolved_fields=
 Color_codes_for_resolved_fields=
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
@@ -1613,7 +1613,6 @@ You_must_enter_at_least_one_field_name=Du_måste_ange_minst_ett_fältnamn
 Non-ASCII_encoded_character_found=Bokstäver_som_inte_är_ASCII-kodade_hittades
 
 Toggle_web_search_interface=
-Non-ASCII_encoded_character_found=
 
 Background_color_for_resolved_fields=Bakgrundsfärg_för_uppslagna_fält
 Color_codes_for_resolved_fields=Färgkodning_av_uppslagna_fält
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
@@ -1686,52 +1686,6 @@ You_must_enter_at_least_one_field_name=En_az_bir_alan_adı_girmelisiniz
 Non-ASCII_encoded_character_found=ASCII_koduyla_kodlanmamış_karakter_bulundu
 
 Toggle_web_search_interface=
-Connection=
-Host=
-Database=
-User=
-Connection_error=
-Driver_error=
-Connection_to_%0_server_stablished.=
-Required_field_"%0"_is_empty.=
-Corrupt_shared_database_structure.=
-Integrity_check_failed._Fixing...=
-
-%0_driver_not_available.=
-
-The_connection_to_the_server_has_been_determinated.=
-
-Connection_lost.=
-Reconnect=
-Work_offline=
-
-Working_offline.=
-
-Update_refused.=
-Update_refused=
-Local_entry=
-Shared_entry=
-Update_could_not_be_performed_due_to_existing_change_conflicts.=
-You_are_not_working_on_the_newest_version_of_BibEntry.=
-Local_version\:_%0=
-Shared_version\:_%0=
-Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
-Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
-The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
-Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
-New_technical_report=
-
-%0_file=
-Custom_layout_file=
-Protected_terms_file=
-Style_file=
-
-Open_OpenOffice/LibreOffice_connection=
-
-You_must_enter_at_least_one_field_name=
-
-
-Non-ASCII_encoded_character_found=
 
 Background_color_for_resolved_fields=
 Color_codes_for_resolved_fields=