only show details pane, when cache is selected
This commit is contained in:
@@ -26,10 +26,8 @@
|
||||
package de.geofroggerfx.ui.details;
|
||||
|
||||
import com.lynden.gmapsfx.GoogleMapView;
|
||||
import com.lynden.gmapsfx.MapComponentInitializedListener;
|
||||
import com.lynden.gmapsfx.javascript.object.*;
|
||||
import de.geofroggerfx.application.SessionContext;
|
||||
import de.geofroggerfx.application.SessionContextListener;
|
||||
import de.geofroggerfx.model.Attribute;
|
||||
import de.geofroggerfx.model.Cache;
|
||||
import de.geofroggerfx.model.Log;
|
||||
@@ -68,6 +66,9 @@ public class DetailsController extends FXMLController {
|
||||
@Autowired
|
||||
private SessionContext sessionContext;
|
||||
|
||||
@FXML
|
||||
private BorderPane detailsPane;
|
||||
|
||||
@FXML
|
||||
private Label cacheName;
|
||||
|
||||
@@ -107,24 +108,18 @@ public class DetailsController extends FXMLController {
|
||||
|
||||
@Override
|
||||
public void initialize(URL location, ResourceBundle resources) {
|
||||
detailsPane.setVisible(false);
|
||||
setCacheListener();
|
||||
initializeMap();
|
||||
setLogLinkButton();
|
||||
}
|
||||
|
||||
private void setCacheListener() {
|
||||
sessionContext.addListener(CURRENT_CACHE, new SessionContextListener() {
|
||||
@Override
|
||||
public void sessionContextChanged() {
|
||||
fillContent();
|
||||
}
|
||||
});
|
||||
sessionContext.addListener(CURRENT_CACHE, () -> fillContent());
|
||||
}
|
||||
|
||||
private void initializeMap() {
|
||||
mapView.addMapInializedListener(new MapComponentInitializedListener() {
|
||||
@Override
|
||||
public void mapInitialized() {
|
||||
mapView.addMapInializedListener(() -> {
|
||||
//Set the initial properties of the map.
|
||||
MapOptions mapOptions = new MapOptions();
|
||||
mapOptions.center(new LatLong(47.6097, -122.3331))
|
||||
@@ -145,7 +140,6 @@ public class DetailsController extends FXMLController {
|
||||
marker = new Marker(options);
|
||||
map.addMarker(marker);
|
||||
map.setCenter(latLong);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -232,32 +226,35 @@ public class DetailsController extends FXMLController {
|
||||
|
||||
private void fillContent() {
|
||||
Cache cache = (Cache) sessionContext.getData(CURRENT_CACHE);
|
||||
|
||||
if (cache != null) {
|
||||
detailsPane.setVisible(true);
|
||||
cacheName.setText(cache.getName());
|
||||
cacheDifficulty.setText(getStarsAsString(cache.getDifficulty()));
|
||||
cacheTerrain.setText(getStarsAsString(cache.getTerrain()));
|
||||
|
||||
String shortDescription = cache.getShortDescription();
|
||||
if (!cache.getLongDescriptionHtml()) {
|
||||
shortDescription = shortDescription.replaceAll("\n","</br>");
|
||||
shortDescription = shortDescription.replaceAll("\n", "</br>");
|
||||
}
|
||||
|
||||
String longDescription = cache.getLongDescription();
|
||||
if (!cache.getLongDescriptionHtml()) {
|
||||
longDescription = longDescription.replaceAll("\n","</br>");
|
||||
longDescription = longDescription.replaceAll("\n", "</br>");
|
||||
}
|
||||
|
||||
String description = "<html><body><p>"+shortDescription+"</p><p>"+longDescription+"</p></body></html>";
|
||||
String description = "<html><body><p>" + shortDescription + "</p><p>" + longDescription + "</p></body></html>";
|
||||
final WebEngine webEngine = this.description.getEngine();
|
||||
webEngine.loadContent(description);
|
||||
|
||||
attributeList.getChildren().clear();
|
||||
for (Attribute attribute: cache.getAttributes()) {
|
||||
for (Attribute attribute : cache.getAttributes()) {
|
||||
attributeList.getChildren().add(MaterialDesignIconFactory.get().createIcon(GeocachingIcons.getIcon(attribute)));
|
||||
}
|
||||
|
||||
logList.getChildren().clear();
|
||||
int maxRow = Math.min(4, cache.getLogs().size());
|
||||
for (int row=0; row<maxRow; row++) {
|
||||
for (int row = 0; row < maxRow; row++) {
|
||||
setLogIcon(row);
|
||||
setLogText(row, cache.getLogs().get(row));
|
||||
}
|
||||
@@ -274,6 +271,9 @@ public class DetailsController extends FXMLController {
|
||||
map.addMarker(marker);
|
||||
map.setCenter(latLong);
|
||||
mapView.requestLayout();
|
||||
} else {
|
||||
detailsPane.setVisible(false);
|
||||
}
|
||||
}
|
||||
|
||||
private void setLogIcon(int row) {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<?import javafx.scene.layout.*?>
|
||||
<?import javafx.scene.web.WebView?>
|
||||
<?import java.net.URL?>
|
||||
<BorderPane layoutX="10.0" layoutY="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="600" minWidth="400" style="-fx-background-color: #ffffff;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8.0.40" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<BorderPane fx:id="detailsPane" layoutX="10.0" layoutY="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="600" minWidth="400" style="-fx-background-color: #ffffff;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8.0.40" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<right>
|
||||
<VBox minWidth="200.0" prefHeight="200.0" spacing="8.0" BorderPane.alignment="CENTER">
|
||||
<children>
|
||||
|
||||
Reference in New Issue
Block a user