Commit 3ab60a27 authored by James Hughes's avatar James Hughes
Browse files

Misc changes

parent 06de78c0

Demo1/.classpath

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
			<attribute name="maven.pomderived" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">

		<attributes>

			<attribute name="maven.pomderived" value="true"/>

		</attributes>

Demo1/.settings/org.eclipse.jdt.core.prefs

+4 −3
Original line number Diff line number Diff line 
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.problem.forbiddenReference=warning

org.eclipse.jdt.core.compiler.source=1.7
 
org.eclipse.jdt.core.compiler.source=1.8

Demo1/src/com/jim/Dial.java

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ import javax.swing.BoxLayout; 
import javax.swing.JButton;

import javax.swing.JFrame;

import javax.swing.JPanel;

import javax.swing.JTextArea;

import javax.swing.Timer;



import org.jfree.chart.ChartPanel;

Demo1/src/com/jim/KineticBench.java

+14 −2
Original line number Diff line number Diff line
@@ -120,11 +120,23 @@ public class KineticBench extends SwingWorker<Object, Object> { 
			String host = dev.inet4.get(0);

			ClientConfiguration cc = new ClientConfiguration();

			cc.setHost(host);

			cc.setPort(dev.port);

			log.info("Connecting to " + host);

			c = AdvancedKineticClientFactory.createAdvancedClientInstance(cc);

			log.info("Connected  to " + host);

			if (c == null)

				throw new Error("really?");

			

			// TODO make sure that the WWN is as expected. 

//			AdminClientConfiguration acc = new AdminClientConfiguration();

//			acc.setHost(host);

//			acc.setPort(dev.tlsPort);

//			KineticAdminClient ac = KineticAdminClientFactory.createInstance(acc);

//			

//			List<KineticLogType> logs = new ArrayList<KineticLogType>(1);

//			logs.add(KineticLogType.CONFIGURATION);

//			KineticLog log = ac.getLog(logs);

//			

//			kinetic.admin.Configuration conf = log.getConfiguration();

//			conf.



			loop = 0;

			prev = 2; // this can not be 0 or 1.

Demo1/src/com/jim/KineticDemo1.java

+25 −13
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ import java.util.logging.Level; 
import java.util.logging.Logger;



import javax.swing.SwingWorker;

import javax.swing.UIManager;

import javax.swing.UIManager.LookAndFeelInfo;



/**

 * A demonstration application showing a time series chart where you can
@@ -17,11 +19,13 @@ import javax.swing.SwingWorker; 
 */

class KineticDemo1 {



	static Logger log = MyLogger.get(Level.INFO, Level.INFO);

	static Logger log = MyLogger.get(Level.FINEST, Level.INFO);



	// added to allow increasing the worker threads. 

	@SuppressWarnings("restriction")

	public static void main(String[] args) throws Exception {



		{

			// The following code was suggested from

			// http://stackoverflow.com/questions/8356784/whats-the-maximum-number-of-swing-worker-threads-that-can-be-run

			final int corePoolSize = 100;
@@ -29,11 +33,19 @@ class KineticDemo1 { 
			final long keepAliveTime = 100000;

			final TimeUnit unit = TimeUnit.SECONDS;

			final BlockingQueue<Runnable> workQueue = new ArrayBlockingQueue<>(maximumPoolSize);

		sun.awt.AppContext.getAppContext().put(SwingWorker.class,

		                 new ThreadPoolExecutor(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue));

			sun.awt.AppContext.getAppContext().put(SwingWorker.class, new ThreadPoolExecutor(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue));

		}

		

		// Choose a L&F

		for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {

			log.finest(()->{return "Installed L&F: " + info.getName();});

			if ("Mac OS X".equals(info.getName())) {

				UIManager.setLookAndFeel(info.getClassName());

			}

		}



		Map<String, Stat> stats = new HashMap<String, Stat>();

		new Dial("asdf", stats);

		new Dial("System Throughput", stats);

		KineticDiscovery.findAll(stats);



	}