Skip to content

Commit 2f39aa0

Browse files
katysaintinkatysaintin
committed
Keep indentation from previous commit
1 parent 9450512 commit 2f39aa0

File tree

1 file changed

+58
-67
lines changed
  • app/databrowser/src/main/java/org/csstudio/trends/databrowser3/preferences

1 file changed

+58
-67
lines changed

‎app/databrowser/src/main/java/org/csstudio/trends/databrowser3/preferences/Preferences.java‎

Lines changed: 58 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -22,156 +22,147 @@
2222
import org.phoebus.util.time.TimeParser;
2323
import org.phoebus.util.time.TimeRelativeInterval;
2424

25-
/**
26-
* Helper for reading preference settings
25+
/** Helper for reading preference settings
2726
*
28-
* @author Kay Kasemir
27+
* @author Kay Kasemir
2928
*/
3029
@SuppressWarnings("nls")
31-
public class Preferences {
32-
/**
33-
* Preference tags.
34-
* For explanation of the settings see preferences.ini
30+
public class Preferences
31+
{
32+
/** Preference tags.
33+
* For explanation of the settings see preferences.ini
3534
*/
36-
final private static String PROMPT_FOR_RAW_DATA = "prompt_for_raw_data_request",
37-
PROMPT_FOR_VISIBILITY = "prompt_for_visibility";
35+
final private static String
36+
PROMPT_FOR_RAW_DATA = "prompt_for_raw_data_request",
37+
PROMPT_FOR_VISIBILITY = "prompt_for_visibility";
3838

3939
/** Predefined time range */
40-
public static class TimePreset {
40+
public static class TimePreset
41+
{
4142
/** Label */
4243
public final String label;
4344
/** Time range */
4445
public final TimeRelativeInterval range;
4546

46-
TimePreset(final String label, final TimeRelativeInterval range) {
47+
TimePreset(final String label, final TimeRelativeInterval range)
48+
{
4749
this.label = label;
4850
this.range = range;
4951
}
5052
}
5153

5254
/** Setting */
53-
@Preference
54-
public static int archive_fetch_delay;
55+
@Preference public static int archive_fetch_delay;
5556
/** Setting */
56-
@Preference
57-
public static int concurrent_requests;
57+
@Preference public static int concurrent_requests;
5858
/** Setting */
59-
@Preference
60-
public static ArchiveRescale archive_rescale;
59+
@Preference public static ArchiveRescale archive_rescale;
6160
/** Setting */
6261
public static List<ArchiveDataSource> archive_urls;
6362
/** Setting */
6463
public static List<ArchiveDataSource> archives;
6564
/** Setting */
66-
@Preference
67-
public static boolean automatic_history_refresh;
65+
@Preference public static boolean automatic_history_refresh;
6866
/** Setting */
69-
@Preference
70-
public static int live_buffer_size;
67+
@Preference public static int live_buffer_size;
7168
/** Setting */
72-
@Preference
73-
public static int line_width;
69+
@Preference public static int line_width;
7470
/** Setting */
75-
@Preference
76-
public static int opacity;
71+
@Preference public static int opacity;
7772
/** Setting */
78-
@Preference
79-
public static int plot_bins;
73+
@Preference public static int plot_bins;
8074
/** Setting */
81-
@Preference
82-
public static double scan_period;
75+
@Preference public static double scan_period;
8376
/** Setting */
8477
public static Duration scroll_step;
8578
/** Setting */
8679
public static Duration time_span;
8780
/** Setting */
88-
@Preference
89-
public static TraceType trace_type;
81+
@Preference public static TraceType trace_type;
9082
/** Setting */
91-
@Preference
92-
public static double update_period;
83+
@Preference public static double update_period;
9384
/** Setting */
94-
@Preference
95-
public static boolean use_auto_scale;
85+
@Preference public static boolean use_auto_scale;
9686
/** Setting */
97-
@Preference
98-
public static boolean use_default_archives;
87+
@Preference public static boolean use_default_archives;
9988
/** Setting */
100-
@Preference
101-
public static boolean drop_failed_archives;
89+
@Preference public static boolean drop_failed_archives;
10290
/** Setting */
10391
@Deprecated
104-
@Preference
105-
public static String[] equivalent_pv_prefixes;
92+
@Preference public static String[] equivalent_pv_prefixes;
10693
/** Setting */
107-
@Preference
108-
public static boolean use_trace_names;
94+
@Preference public static boolean use_trace_names;
10995
/** Setting */
110-
@Preference
111-
public static boolean prompt_for_raw_data_request;
96+
@Preference public static boolean prompt_for_raw_data_request;
11297
/** Setting */
113-
@Preference
114-
public static boolean prompt_for_visibility;
98+
@Preference public static boolean prompt_for_visibility;
11599
/** Setting */
116100
public static final List<TimePreset> time_presets = new ArrayList<>();
117101
/** Setting */
118-
@Preference
119-
public static boolean config_dialog_supported;
102+
@Preference public static boolean config_dialog_supported;
120103

121104
@Preference
122105
public static boolean assign_pvs_from_clipboard_to_the_same_axis_by_default;
123106

107+
124108
@Preference
125109
public static String value_axis_label_policy;
126110

127-
static {
128-
final PreferencesReader prefs = AnnotatedPreferences.initialize(Activator.class, Preferences.class,
129-
"/databrowser_preferences.properties");
111+
112+
static
113+
{
114+
final PreferencesReader prefs = AnnotatedPreferences.initialize(Activator.class, Preferences.class, "/databrowser_preferences.properties");
130115

131116
// Allow at least one at a time
132117
if (concurrent_requests < 1)
133-
concurrent_requests = 1;
118+
concurrent_requests = 1;
134119

135120
archive_urls = parseArchives(prefs.get("urls"));
136121
archives = parseArchives(prefs.get("archives"));
137122

138-
scroll_step = Duration.ofSeconds(Math.max(1, prefs.getInt("scroll_step")));
139-
time_span = Duration.ofSeconds(Math.round(Math.max(prefs.getDouble("time_span"), 1.0)));
123+
scroll_step = Duration.ofSeconds( Math.max(1, prefs.getInt("scroll_step")) );
124+
time_span = Duration.ofSeconds( Math.round( Math.max(prefs.getDouble("time_span"), 1.0) ) );
140125

141-
for (String preset : prefs.get("time_span_shortcuts").split("\\|")) {
126+
for (String preset : prefs.get("time_span_shortcuts").split("\\|"))
127+
{
142128
final String[] label_span = preset.split(",");
143-
time_presets.add(new TimePreset(label_span[0],
144-
TimeRelativeInterval.startsAt(TimeParser.parseTemporalAmount(label_span[1]))));
129+
time_presets.add(new TimePreset(label_span[0], TimeRelativeInterval.startsAt(TimeParser.parseTemporalAmount(label_span[1]))));
145130
}
146131
}
147132

148133
/** @param show Display warning regarding raw data? */
149-
public static void setRawDataPrompt(final boolean show) {
134+
public static void setRawDataPrompt(final boolean show)
135+
{
150136
prompt_for_raw_data_request = show;
151137
update(PROMPT_FOR_RAW_DATA, show);
152138
}
153139

154140
/** @param show Display warning regarding trace visiblity? */
155-
public static void setVisibilityPrompt(final boolean show) {
141+
public static void setVisibilityPrompt(final boolean show)
142+
{
156143
prompt_for_visibility = show;
157144
update(PROMPT_FOR_VISIBILITY, show);
158145
}
159146

160-
private static void update(final String setting, final boolean value) {
147+
private static void update(final String setting, final boolean value)
148+
{
161149
final java.util.prefs.Preferences prefs = java.util.prefs.Preferences.userNodeForPackage(Activator.class);
162150
prefs.putBoolean(setting, value);
163-
try {
151+
try
152+
{
164153
prefs.flush();
165-
} catch (Exception ex) {
154+
}
155+
catch (Exception ex)
156+
{
166157
Activator.logger.log(Level.WARNING, "Cannot write preferences", ex);
167158
}
168159
}
169160

170-
/**
171-
* @param setting Text with list of archives, separated by 'pipe' symbol
172-
* @return List of parsed data sources
161+
/** @param setting Text with list of archives, separated by 'pipe' symbol
162+
* @return List of parsed data sources
173163
*/
174-
public static List<ArchiveDataSource> parseArchives(final String setting) {
164+
public static List<ArchiveDataSource> parseArchives(final String setting)
165+
{
175166
final List<ArchiveDataSource> urls = new ArrayList<>();
176167
//When settings is empty do not search for a archive datasource
177168
if (setting != null && !setting.trim().isEmpty()) {

0 commit comments

Comments
 (0)