Skip to content

Use path object so file separator is not needed, default to install p… #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jwlodek wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use path object so file separator is not needed, default to install p… #26

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ac55a8
Use path object so file separator is not needed, default to install p…
jwlodek Nov 18, 2024
ae2d996
Remove unused import
jwlodek Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions ImageJ/EPICS_areaDetector/EPICS_NTNDA_Viewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
Expand Down Expand Up @@ -829,17 +832,22 @@ private void logMessage(String message, boolean logDisplay, boolean logFile)

private void readProperties()
{
String temp, path = null;
String temp = null;
Path path = Paths.get(System.getProperty("user.home"), ".config");
try
{
String fileSep = System.getProperty("file.separator");
path = System.getProperty("user.home") + fileSep + propertyFile;
FileInputStream file = new FileInputStream(path);
// If the .config directory does not exist, move back up to the home dir
if (!Files.exists(path)){
path = path.getParent();
}
path = Paths.get(path.toString(), propertyFile);

FileInputStream file = new FileInputStream(path.toString());
properties.load(file);
file.close();
temp = properties.getProperty("channelName");
if (temp != null) channelName = temp;
IJ.log("Read properties file: " + path + " channelName= " + channelName);
IJ.log("Read properties file: " + path.toString() + " channelName= " + channelName);
}
catch (Exception ex)
{
Expand All @@ -849,16 +857,20 @@ private void readProperties()

private void writeProperties()
{
String path;
Path path = Paths.get(System.getProperty("user.home"), ".config");
try
{
String fileSep = System.getProperty("file.separator");
path = System.getProperty("user.home") + fileSep + propertyFile;
// If the .config directory does not exist, move back up to the home dir
if (!Files.exists(path)){
path = path.getParent();
}
path = Paths.get(path.toString(), propertyFile);

properties.setProperty("channelName", channelName);
FileOutputStream file = new FileOutputStream(path);
FileOutputStream file = new FileOutputStream(path.toString());
properties.store(file, "EPICS_NTNDA_Viewer Properties");
file.close();
logMessage("Wrote properties file: " + path, true, true);
logMessage("Wrote properties file: " + path.toString(), true, true);
}
catch (Exception ex)
{
Expand Down