Commit a19fb560 authored by amccaskey's avatar amccaskey
Browse files

Removing all System.out.println's - changed to logger.info.


Signed-off-by: default avataramccaskey <mccaskeyaj@ornl.gov>
parent 7b337a47
......@@ -12,6 +12,8 @@
*******************************************************************************/
package org.eclipse.ice.caebat.batml.ui;
import javax.xml.bind.annotation.XmlTransient;
import org.eclipse.ice.client.widgets.ICEFormEditor;
import org.eclipse.ice.datastructures.ICEObject.Component;
import org.eclipse.ice.datastructures.ICEObject.ListComponent;
......@@ -19,6 +21,7 @@ import org.eclipse.ice.datastructures.form.DataComponent;
import org.eclipse.ice.datastructures.form.ResourceComponent;
import org.eclipse.ice.datastructures.form.emf.EMFComponent;
import org.eclipse.ui.PartInitException;
import org.slf4j.Logger;
/**
* The custom form editor for the reflectivity model. Should be used instead of
......@@ -46,7 +49,7 @@ public class BatMLFormEditor extends ICEFormEditor {
// same process as for the regular ICEFormEditor
for (Component i : iceDataForm.getComponents()) {
//logger.info
System.out.println("ICEFormEditor Message: Adding component "
logger.info("ICEFormEditor Message: Adding component "
+ i.getName() + " " + i.getId());
i.accept(this);
}
......
......@@ -15,6 +15,8 @@ package org.eclipse.ice.caebat.batml.ui;
import org.eclipse.ice.client.widgets.IFormWidgetBuilder;
import org.eclipse.ice.iclient.uiwidgets.IFormWidget;
import org.eclipse.ice.viz.service.IVizServiceFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* This class provides the declarative service that registers the Reflectivity
......@@ -27,6 +29,11 @@ import org.eclipse.ice.viz.service.IVizServiceFactory;
*/
public class BatMLFormWidgetBuilder implements IFormWidgetBuilder {
/**
* Logger for handling event messages and other information.
*/
protected final Logger logger = LoggerFactory.getLogger(getClass());
/**
* The name of the items/forms used to create {@link ReflectivityFormEditor}
* s. This should be the same as the name in the ReflectivityModel item
......@@ -69,7 +76,7 @@ public class BatMLFormWidgetBuilder implements IFormWidgetBuilder {
* The factory service available through OSGi.
*/
public void setVizServiceFactory(IVizServiceFactory factory) {
System.out.println("ReflectivityFormWidgetBuilder: Setting Viz Service");
logger.info("ReflectivityFormWidgetBuilder: Setting Viz Service");
this.vizServiceFactory = factory;
}
......
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
......@@ -17,6 +17,8 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.ice.client.widgets.IFormWidgetBuilder;
import org.eclipse.ice.iclient.uiwidgets.IFormWidget;
import org.eclipse.ice.viz.service.IVizServiceFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* This class provides the declarative service that registers the MOOSE
......@@ -35,6 +37,7 @@ public class MOOSEFormWidgetBuilder implements IFormWidgetBuilder {
*/
public static final String name = "MOOSE Workflow";
protected final Logger logger = LoggerFactory.getLogger(getClass());
/**
* This class consumes (references) the {@link IVizServiceFactory} OSGi
* service. The factory should be passed down to the MOOSEFormEditor.
......@@ -74,10 +77,9 @@ public class MOOSEFormWidgetBuilder implements IFormWidgetBuilder {
IConfigurationElement[] elements = Platform.getExtensionRegistry()
.getConfigurationElementsFor("org.eclipse.ice.viz.service.IVizServiceFactory");
System.out.println("This is in MOOSEFormwidgetBUilder");
System.out.println("Available configuration elements");
logger.info("MOOSEFormWidgetBuilder: Available configuration elements");
for(IConfigurationElement element : elements){
System.out.println(element.getName());
logger.info(element.getName());
}
return;
......
......@@ -28,14 +28,12 @@ public class Activator implements BundleActivator {
@Override
public void start(BundleContext context) throws Exception {
System.out.println("Starting test thread.");
launcher = new GridViewerLauncher();
launcher.start();
}
@Override
public void stop(BundleContext context) throws Exception {
System.out.println("Stopping test thread.");
launcher.stopThread();
launcher.join();
}
......
......@@ -118,10 +118,10 @@ public class ReactorFormWidgetBuilder implements IFormWidgetBuilder {
IConfigurationElement[] elements = Platform.getExtensionRegistry()
.getConfigurationElementsFor(
"org.eclipse.ice.client.widgets.reactoreditor.ireactoreditorregistry");
System.out.println(
logger.info(
"Available configuration elements(in org.eclipse.ice.client.widgets.reactoreditor.ReactorFormInputFactory.java):");
for (IConfigurationElement element : elements) {
System.out.println(
logger.info(
element.getNamespaceIdentifier() + " " + element.getName());
}
......
......@@ -85,10 +85,10 @@ public class EclipseUIWidgetFactory implements IWidgetFactory {
IConfigurationElement[] elements = Platform.getExtensionRegistry()
.getConfigurationElementsFor(
"org.eclipse.ice.client.widgets.iformwidgetbuilder");
System.out.println(
logger.info(
"Available configuration elements(in org.eclipse.ice.client.widgets.EclipseUIWdigetFactory.java):");
for (IConfigurationElement element : elements) {
System.out.println(
logger.info(
element.getNamespaceIdentifier() + " " + element.getName());
}
......
......@@ -220,10 +220,9 @@ public class ICEFormEditor extends SharedHeaderFormEditor
IConfigurationElement[] elements = Platform.getExtensionRegistry()
.getConfigurationElementsFor(
"org.eclipse.ice.viz.service.IVizServiceFactory");
System.out.println("This is in ICEFormEditor");
System.out.println("Available configuration elements");
staticLogger.info("ICEFormEditor: Available configuration elements");
for (IConfigurationElement element : elements) {
System.out.println(element.getName());
staticLogger.info(element.getName());
}
return;
}
......@@ -869,10 +868,12 @@ public class ICEFormEditor extends SharedHeaderFormEditor
} else if (input instanceof FileEditorInput) {
// Grab the file and load the form
IFile formFile = ((FileEditorInput) input).getFile();
System.out.println("FILE: " + formFile.getLocation().toOSString());
try {
IClient client = IClient.getClient();
iceDataForm = client.loadItem(formFile);
logger.info("IClient and Form loaded.");
System.out.println("LOADED FORM");
} catch (CoreException e) {
// Complain
logger.error("Unable to get IClient instance!", e);
......
......@@ -514,8 +514,6 @@ public class ICEResourcePage extends ICEFormPage
try {
event.getDelta().accept(new IResourceDeltaVisitor() {
public boolean visit(IResourceDelta delta) throws CoreException {
// System.out.println("Name: " +
// delta.getResource().getName());
for (ICEResource r : ICEResourcePage.this.resourceComponent.getResources()) {
if (delta.getResource().getName().equals(r.getName())) {
ICEResourcePage.this.update(r);
......
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8
......@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Core
Bundle-SymbolicName: org.eclipse.ice.core;singleton:=true
Bundle-Version: 2.1.7.20150825
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.ice.core.iCore,
org.eclipse.ice.core.launcher
Import-Package: com.google.gson;version="2.2.4",
......@@ -30,7 +30,6 @@ Import-Package: com.google.gson;version="2.2.4",
org.osgi.service.component;version="1.1.0",
org.osgi.service.http;version="1.2.1",
org.slf4j;version="1.7.2"
Service-Component: OSGI-INF/component.xml
Require-Bundle: org.eclipse.equinox.http.jetty;bundle-version="2.0.100",
javax.servlet;bundle-version="2.5.0",
org.eclipse.equinox.http.registry;bundle-version="1.1.100",
......
......@@ -301,7 +301,7 @@ public class Core extends Application implements ICore, BundleActivator {
startHttpService();
// Check the currently registered extensions
debugCheckExtensions();
//debugCheckExtensions();
// Register this class as a service with the framework.
registration = context.registerService(ICore.class, this, null);
......@@ -339,18 +339,18 @@ public class Core extends Application implements ICore, BundleActivator {
for (String extensionPointName : extensionPoints) {
IExtensionPoint point = Platform.getExtensionRegistry()
.getExtensionPoint(extensionPointName);
System.out.println(
logger.debug(
"##### Extensions for: " + extensionPointName + " #####");
if (point != null) {
IExtension[] extensions = point.getExtensions();
for (IExtension extension : extensions) {
System.out.println("--" + extension.getSimpleIdentifier());
logger.debug("--" + extension.getSimpleIdentifier());
}
} else {
System.out.println("Point does not exist");
logger.debug("Point does not exist");
}
System.out.println("##### end of " + extensionPointName + " #####");
logger.debug("##### end of " + extensionPointName + " #####");
}
}
......
......@@ -246,7 +246,7 @@ public class EMFComponent extends ICEObject implements Component {
if (xmlResource != null && xmlResource.getContents().size() > 0) {
documentRoot = xmlResource.getContents().get(0);
} else {
System.out.println("EMFComponent Error: Could not find document root for " + file.getAbsolutePath());
logger.error("EMFComponent Error: Could not find document root for " + file.getAbsolutePath());
return false;
}
......
......@@ -62,9 +62,9 @@ public class AbstractModelBuilder extends AbstractItemBuilder {
.getConfigurationElementsFor(
"org.eclipse.ice.item.IMaterialsDatabase");
System.out.println("Available configuration elements:");
logger.info("Available configuration elements:");
for (IConfigurationElement element : elements) {
System.out.println("Name" + element.getName());
logger.info("Name" + element.getName());
}
......
......@@ -84,10 +84,9 @@ public class ReflectivityFormWidgetBuilder implements IFormWidgetBuilder {
IConfigurationElement[] elements = Platform.getExtensionRegistry()
.getConfigurationElementsFor("org.eclipse.ice.viz.service.IVizServiceFactory");
System.out.println("This is in Reflectivity");
System.out.println("Available configuration elements");
logger.info("ReflectivityFormWidgetBuilder: Available configuration elements");
for(IConfigurationElement element : elements){
System.out.println(element.getName());
logger.info(element.getName());
}
return;
......
......@@ -127,7 +127,6 @@ public class EntryCellEditingSupport extends EditingSupport {
if (contentProvider.requiresCombo(element)) {
VizEntry entry = (VizEntry) element;
System.out.println("ENTRYCELLEDITING: Trying to get file combo celle ditor");
boolean isExecutable = entry.getValueType() == VizAllowedValueType.Executable;
if (isExecutable) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment