Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
DropSnorz committed Dec 14, 2018
2 parents aaaa718 + d7dac1c commit eb266cb
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 27 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.dropsnorz</groupId>
<artifactId>owlplug</artifactId>
<version>0.4.2-beta</version>
<version>0.5.0-beta</version>
<packaging>jar</packaging>

<name>owlplug</name>
Expand Down Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>com.jfoenix</groupId>
<artifactId>jfoenix</artifactId>
<version>9.0.4</version>
<version>9.0.8</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,11 @@ public void createAccountAndAuth() throws AuthentificationException {
prefs.putLong(ApplicationDefaults.SELECTED_ACCOUNT_KEY, userAccount.getId());

} catch (GeneralSecurityException | IOException e) {

log.error("Error during authentification", e);
throw new AuthentificationException(e);
} finally {
//Delete accounts without complete setup
userAccountDAO.deleteInvalidAccounts();
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@ public synchronized void refreshView(Iterable<StoreProduct> newProducts) {
if (shouldRefreshProducts(newProducts)) {
this.masonryPane.getChildren().clear();
this.masonryPane.requestLayout();

//Tempoprary fix for issue #2 Memory leaks in StoreView MasonryPane
clearMasonryPaneAnimationMap(masonryPane);

loadedStoreProducts = newProducts;
loadedProductPartitions = Iterables.partition(loadedStoreProducts, PARTITION_SIZE);
Expand Down Expand Up @@ -258,24 +255,5 @@ public void requestLayout() {
masonryPane.requestLayout();
scrollPane.requestLayout();
}

/**
* Clear the masonryPane animation map.
* Temporary fix for issue #2 Memory leaks in StoreView MasonryPane.
*/
private void clearMasonryPaneAnimationMap(JFXMasonryPane masonryPane) {

try {
Field f = masonryPane.getClass().getDeclaredField("animationMap");
f.setAccessible(true);
HashMap<Region, Transition> animationMap = (HashMap<Region, Transition>) f.get(masonryPane);
if (animationMap != null) {
animationMap.clear();
}
} catch (Exception e) {
log.error("An error occured while clearing the masonryPane animation map", e);
}

}

}
4 changes: 2 additions & 2 deletions src/main/resources/fxml/dialogs/WelcomeView.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<VBox>
<children>
<Label text="Hi ! It's looks like this is the first time you are using OwlPlug. " wrapText="true" />
<Label text="Fill the directory path where your plugins are installed.You can always change this later." wrapText="true" />
<Label text="Tell us where to find your plugins. You can always change this later." wrapText="true" />
</children>
</VBox>
<HBox alignment="BASELINE_LEFT" prefWidth="500.0">
<children>
<JFXTextField fx:id="directoryTextField" HBox.hgrow="ALWAYS" />
<JFXTextField fx:id="directoryTextField" HBox.hgrow="ALWAYS" promptText="/path/to/your/plugins" />
<JFXButton fx:id="openDirectoryButton" text="...." />
</children>
</HBox>
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/owlplug.css
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ JFXComboBox{
-fx-text-fill: white ;
}

#accountComboBox {
-fx-prompt-text-fill: transparent;
}

JFXCheckBox {
-fx-text-fill: white;
}
Expand Down

0 comments on commit eb266cb

Please sign in to comment.