Skip to content
Snippets Groups Projects
Commit e5e8baed authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

- User name added in logs (EXPDATA-127)

- Respect java naming convention
parent 574a61d3
No related branches found
No related tags found
No related merge requests found
......@@ -594,6 +594,7 @@ public class DataBrowser extends JPanel {
}
public static void main(final String... args) {
LOGGER.info("DataBrowser launched by " + System.getProperty("user.name"));
Options options = new Options();
OptionBuilder.withLongOpt(COMMAND_HELP_LONG_OPTION);
......
......@@ -100,12 +100,12 @@ public class CDMADataSourceBrowser extends AbstractDataSourceProducerBrowser {
private CDMADataSourceBrowser(final IFactory factory) {
super(CDMADataSourceFactory.class);
this.factory = factory;
dimensionMap = new HashMap<ITreeNode, List<IKey>>();
dimensionMap = new HashMap<>();
}
private void initFactoryKeyMap() {
if (keyFactoryMap == null) {
keyFactoryMap = new HashMap<String, CDMAKeyFactory>();
keyFactoryMap = new HashMap<>();
CDMAKeyFactory physicalKeyFactory = new CDMAKeyFactory();
physicalKeyFactory.enableMode(BrowsingMode.PHYSICAL);
......@@ -154,7 +154,7 @@ public class CDMADataSourceBrowser extends AbstractDataSourceProducerBrowser {
private void initDataSourceBrowserList() {
Set<Class<? extends IDataSourceSeeker>> implementationSeekerSet = getDataSourceSeekerImplementations();
Map<String, IDataSourceSeeker> tmpSeekerMap = new HashMap<String, IDataSourceSeeker>();
Map<String, IDataSourceSeeker> tmpSeekerMap = new HashMap<>();
IDataSourceSeeker tmpSeeker = null;
for (Class<? extends IDataSourceSeeker> implementation : implementationSeekerSet) {
......@@ -427,7 +427,7 @@ public class CDMADataSourceBrowser extends AbstractDataSourceProducerBrowser {
{
infoMap = super.getInformations(key);
if (infoMap == null) {
infoMap = new HashMap<String, String>();
infoMap = new HashMap<>();
}
infoMap.put(LABEL_INFO + "Rank", String.valueOf(getRank(key)));
infoMap.put(LABEL_INFO + "Shape", Arrays.toString(getShape(key)));
......@@ -440,14 +440,14 @@ public class CDMADataSourceBrowser extends AbstractDataSourceProducerBrowser {
view = FLAT_VIEW;
}
if (infoMap == null) {
infoMap = new HashMap<String, String>();
infoMap = new HashMap<>();
}
infoMap.put(LABEL_INFO + "Logical view", view);
}
}
if (infoMap == null) {
infoMap = new HashMap<String, String>();
infoMap = new HashMap<>();
}
Map<String, String> attributeMap = getAttributes(key);
......@@ -459,7 +459,7 @@ public class CDMADataSourceBrowser extends AbstractDataSourceProducerBrowser {
}
private Map<String, String> getAttributes(final IKey key) {
Map<String, String> infoMap = new HashMap<String, String>();
Map<String, String> infoMap = new HashMap<>();
if ((key instanceof CDMAKey) && (producer != null)) {
CDMAKeyFactory keyFactory = getKeyFactory(((CDMAKey) key));
if (keyFactory != null) {
......@@ -751,7 +751,7 @@ public class CDMADataSourceBrowser extends AbstractDataSourceProducerBrowser {
CDMAKey cdmaKey = keyFactory.generateKeyItemList(uri, path);
String[] itemList = getStringArrayValue(cdmaKey);
String pluginId = keyFactory.getPluginRestriction();
boolean isMamboPlugin = DBDataSourceSeeker.MamboSoleilPluginId.equals(pluginId);
boolean isMamboPlugin = DBDataSourceSeeker.MAMBO_SOLEIL_PLUGIN_ID.equals(pluginId);
if (itemList != null) {
ItemTreeNode child = null;
CDMAKey keyNode = null;
......
......@@ -45,7 +45,7 @@ public class DBDataSourceSeeker extends AbstractCDMADataSourceSeeker {
private static final String END_ATTRIBUTE = "endDate";
private static final String SAMPLING_ATTRIBUTE = "samplingType";
private static final String FACTOR_ATTRIBUTE = "samplingFactor";
public static final String MamboSoleilPluginId = "MamboSoleil";
public static final String MAMBO_SOLEIL_PLUGIN_ID = "MamboSoleil";
public DBDataSourceSeeker() {
super(null);
......@@ -53,7 +53,7 @@ public class DBDataSourceSeeker extends AbstractCDMADataSourceSeeker {
@Override
public String getDataSourceBrowserId() {
return MamboSoleilPluginId;
return MAMBO_SOLEIL_PLUGIN_ID;
}
private void initPanel() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment