Skip to content

Commit 0ccb57e

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 7718571 + 15f11dd commit 0ccb57e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/main/java/db/MongoDBManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ enum AppCollection {
6868
PAST_WEATHER("measureswpast", ReadConcern.LOCAL, WriteConcern.W2.withJournal(true), ReadPreference.nearest()),
6969
FORECAST_WEATHER("measureswfor", ReadConcern.LOCAL, WriteConcern.W2.withJournal(true), ReadPreference.nearest()),
7070
POLLUTION("measurespoll", ReadConcern.LOCAL, WriteConcern.W2.withJournal(true), ReadPreference.nearest()),
71-
USERS("users", ReadConcern.MAJORITY, WriteConcern.MAJORITY.withJournal(false), ReadPreference.primary());
71+
USERS("users", ReadConcern.MAJORITY, WriteConcern.MAJORITY.withJournal(false), ReadPreference.nearest());
7272

7373
private final String name;
7474
private final ReadConcern rc;

src/main/resources/measurementsDialog.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<?import javafx.scene.text.Text?>
1010
<ScrollPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8"
1111
fx:controller="main.java.gui.PopupController"
12-
stylesheets="@gridPane.css" fitToWidth="true"
12+
stylesheets="@gridPane.css" fitToWidth="true" maxWidth="1200" maxHeight="700"
1313
>
1414
<VBox>
1515
<Label fx:id="measurementsDialogTitle" styleClass="title" text="Welcome"/>

0 commit comments

Comments
 (0)