diff
stringlengths 262
553k
| is_single_chunk
bool 2
classes | is_single_function
bool 1
class | buggy_function
stringlengths 20
391k
| fixed_function
stringlengths 0
392k
|
|---|---|---|---|---|
diff --git a/filter2-impl/src/main/java/org/cytoscape/filter/internal/FilterSettingsManager.java b/filter2-impl/src/main/java/org/cytoscape/filter/internal/FilterSettingsManager.java
index 47ad76807..ea8f04e07 100644
--- a/filter2-impl/src/main/java/org/cytoscape/filter/internal/FilterSettingsManager.java
+++ b/filter2-impl/src/main/java/org/cytoscape/filter/internal/FilterSettingsManager.java
@@ -1,95 +1,95 @@
package org.cytoscape.filter.internal;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.cytoscape.filter.internal.view.FilterPanel;
import org.cytoscape.filter.internal.view.FilterPanelController;
import org.cytoscape.filter.internal.view.TransformerPanel;
import org.cytoscape.filter.internal.view.TransformerPanelController;
import org.cytoscape.session.events.SessionAboutToBeSavedEvent;
import org.cytoscape.session.events.SessionAboutToBeSavedListener;
import org.cytoscape.session.events.SessionLoadedEvent;
import org.cytoscape.session.events.SessionLoadedListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FilterSettingsManager implements SessionAboutToBeSavedListener, SessionLoadedListener {
static final Logger logger = LoggerFactory.getLogger(FilterSettingsManager.class);
static final String SESSION_NAMESPACE = "org.cytoscape.filter";
final FilterPanel filterPanel;
final TransformerPanel transformerPanel;
private FilterIO filterIo;
public FilterSettingsManager(FilterPanel filterPanel, TransformerPanel transformerPanel, FilterIO filterIo) {
this.filterPanel = filterPanel;
this.transformerPanel = transformerPanel;
this.filterIo = filterIo;
}
@Override
public void handleEvent(SessionLoadedEvent event) {
List<File> files = event.getLoadedSession().getAppFileListMap().get(SESSION_NAMESPACE);
if (files == null) {
return;
}
FilterPanelController filterPanelController = filterPanel.getController();
filterPanelController.reset();
TransformerPanelController transformerPanelController = transformerPanel.getController();
transformerPanelController.reset();
for (File file : files) {
try {
if (file.getName().equals("filters.json")) {
filterIo.readTransformers(file, filterPanel);
} else if (file.getName().equals("filterChains.json")) {
filterIo.readTransformers(file, transformerPanel);
}
} catch (IOException e) {
logger.error("Unexpected error", e);
}
}
- if (filterPanelController.getElementCount() == 1) {
+ if (filterPanelController.getElementCount() == 0) {
filterPanelController.addNewElement("Default filter");
}
- if (transformerPanelController.getElementCount() == 1) {
+ if (transformerPanelController.getElementCount() == 0) {
transformerPanelController.addNewElement("Default chain");
}
}
@Override
public void handleEvent(SessionAboutToBeSavedEvent event) {
FilterPanelController filterPanelController = filterPanel.getController();
TransformerPanelController transformerPanelController = transformerPanel.getController();
List<File> files = new ArrayList<File>();
try {
File root = File.createTempFile(SESSION_NAMESPACE, ".temp");
root.delete();
root.mkdir();
root.deleteOnExit();
File filtersFile = new File(root, "filters.json");
filterIo.writeFilters(filtersFile, filterPanelController.getNamedTransformers());
files.add(filtersFile);
File filterChainsFile = new File(root, "filterChains.json");
filterIo.writeFilters(filterChainsFile, transformerPanelController.getNamedTransformers());
files.add(filterChainsFile);
for (File file : files) {
file.deleteOnExit();
}
event.addAppFiles(SESSION_NAMESPACE, files);
} catch (Exception e) {
logger.error("Unexpected error", e);
}
}
}
| false | true | public void handleEvent(SessionLoadedEvent event) {
List<File> files = event.getLoadedSession().getAppFileListMap().get(SESSION_NAMESPACE);
if (files == null) {
return;
}
FilterPanelController filterPanelController = filterPanel.getController();
filterPanelController.reset();
TransformerPanelController transformerPanelController = transformerPanel.getController();
transformerPanelController.reset();
for (File file : files) {
try {
if (file.getName().equals("filters.json")) {
filterIo.readTransformers(file, filterPanel);
} else if (file.getName().equals("filterChains.json")) {
filterIo.readTransformers(file, transformerPanel);
}
} catch (IOException e) {
logger.error("Unexpected error", e);
}
}
if (filterPanelController.getElementCount() == 1) {
filterPanelController.addNewElement("Default filter");
}
if (transformerPanelController.getElementCount() == 1) {
transformerPanelController.addNewElement("Default chain");
}
}
| public void handleEvent(SessionLoadedEvent event) {
List<File> files = event.getLoadedSession().getAppFileListMap().get(SESSION_NAMESPACE);
if (files == null) {
return;
}
FilterPanelController filterPanelController = filterPanel.getController();
filterPanelController.reset();
TransformerPanelController transformerPanelController = transformerPanel.getController();
transformerPanelController.reset();
for (File file : files) {
try {
if (file.getName().equals("filters.json")) {
filterIo.readTransformers(file, filterPanel);
} else if (file.getName().equals("filterChains.json")) {
filterIo.readTransformers(file, transformerPanel);
}
} catch (IOException e) {
logger.error("Unexpected error", e);
}
}
if (filterPanelController.getElementCount() == 0) {
filterPanelController.addNewElement("Default filter");
}
if (transformerPanelController.getElementCount() == 0) {
transformerPanelController.addNewElement("Default chain");
}
}
|
diff --git a/uk.ac.diamond.scisoft.analysis/test/uk/ac/diamond/scisoft/analysis/fitting/OptimizerTest.java b/uk.ac.diamond.scisoft.analysis/test/uk/ac/diamond/scisoft/analysis/fitting/OptimizerTest.java
index fe3a7b4eb..557a9a7eb 100644
--- a/uk.ac.diamond.scisoft.analysis/test/uk/ac/diamond/scisoft/analysis/fitting/OptimizerTest.java
+++ b/uk.ac.diamond.scisoft.analysis/test/uk/ac/diamond/scisoft/analysis/fitting/OptimizerTest.java
@@ -1,112 +1,112 @@
/*-
* Copyright 2013 Diamond Light Source Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package uk.ac.diamond.scisoft.analysis.fitting;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import uk.ac.diamond.scisoft.analysis.dataset.AbstractDataset;
import uk.ac.diamond.scisoft.analysis.dataset.DoubleDataset;
import uk.ac.diamond.scisoft.analysis.dataset.IDataset;
import uk.ac.diamond.scisoft.analysis.fitting.functions.APeak;
import uk.ac.diamond.scisoft.analysis.fitting.functions.Add;
import uk.ac.diamond.scisoft.analysis.fitting.functions.Gaussian;
import uk.ac.diamond.scisoft.analysis.fitting.functions.IOperator;
import uk.ac.diamond.scisoft.analysis.fitting.functions.IdentifiedPeak;
import uk.ac.diamond.scisoft.analysis.fitting.functions.Offset;
import uk.ac.diamond.scisoft.analysis.optimize.AbstractOptimizer;
import uk.ac.diamond.scisoft.analysis.optimize.ApacheOptimizer;
import uk.ac.diamond.scisoft.analysis.optimize.ApacheOptimizer.Optimizer;
public class OptimizerTest {
static final long SEED = 12357L;
public AbstractOptimizer createOptimizer(Optimizer o) {
ApacheOptimizer opt = new ApacheOptimizer(o);
opt.seed = SEED;
return opt;
}
@Test
public void testOptimizer() {
DoubleDataset gaussian = Generic1DDatasetCreator.createGaussianDataset();
List<IdentifiedPeak> peaks = Generic1DFitter.parseDataDerivative(Generic1DDatasetCreator.xAxis, gaussian, Generic1DDatasetCreator.smoothing);
IdentifiedPeak iniPeak = peaks.get(0);
int[] start = { iniPeak .getIndexOfDatasetAtMinPos() };
int[] stop = { iniPeak.getIndexOfDatasetAtMaxPos() + 1 };
int[] step = { 1 };
AbstractDataset y = gaussian.getSlice(start, stop, step);
AbstractDataset x = Generic1DDatasetCreator.xAxis.getSlice(start, stop, step);
double lowOffset = y.min().doubleValue();
double highOffset = (Double) y.mean();
Offset baseline = new Offset(lowOffset, highOffset);
APeak localPeak = new Gaussian(iniPeak);
IOperator comp = new Add();
comp.addFunction(localPeak);
comp.addFunction(baseline);
AbstractOptimizer opt = createOptimizer(Optimizer.SIMPLEX_MD);
try {
opt.optimize(new IDataset[] {x}, y, comp);
} catch (Exception e) {
System.err.println("Problem: " + e);
}
double[] parameters = opt.getParameterValues();
for (int ind = 0; ind < parameters.length; ind++) {
double v = parameters[ind];
double dv = v * 1e-5;
double od = evalDiff(parameters, ind, v, dv, opt);
double nd = 0;
System.err.printf("Difference is %g for %g\n", od, dv);
dv *= 0.25;
for (int i = 0; i < 20; i++) {
// System.err.println(Arrays.toString(parameters));
nd = evalDiff(parameters, ind, v, dv, opt);
System.err.printf("Difference is %g for %g\n", nd, dv);
if (Math.abs(nd - od) < 1e-15*Math.max(1, Math.abs(od))) {
break;
}
od = nd;
dv *= 0.25;
}
parameters[ind] = v;
double pd = opt.calculateResidualDerivative(opt.getParameters().get(ind), parameters);
System.err.println(nd + " cf " + pd);
- Assert.assertEquals(nd, pd, 1e-3*Math.abs(pd));
+ Assert.assertEquals(nd, pd, 5e-3*Math.abs(pd));
}
}
private double evalDiff(double[] parameters, int ind, double v, double dv, AbstractOptimizer opt) {
parameters[ind] = v + dv;
opt.setParameterValues(parameters);
double r = opt.calculateResidual();
parameters[ind] = v - dv;
opt.setParameterValues(parameters);
r -= opt.calculateResidual();
return (r * 0.5) / dv;
}
}
| true | true | public void testOptimizer() {
DoubleDataset gaussian = Generic1DDatasetCreator.createGaussianDataset();
List<IdentifiedPeak> peaks = Generic1DFitter.parseDataDerivative(Generic1DDatasetCreator.xAxis, gaussian, Generic1DDatasetCreator.smoothing);
IdentifiedPeak iniPeak = peaks.get(0);
int[] start = { iniPeak .getIndexOfDatasetAtMinPos() };
int[] stop = { iniPeak.getIndexOfDatasetAtMaxPos() + 1 };
int[] step = { 1 };
AbstractDataset y = gaussian.getSlice(start, stop, step);
AbstractDataset x = Generic1DDatasetCreator.xAxis.getSlice(start, stop, step);
double lowOffset = y.min().doubleValue();
double highOffset = (Double) y.mean();
Offset baseline = new Offset(lowOffset, highOffset);
APeak localPeak = new Gaussian(iniPeak);
IOperator comp = new Add();
comp.addFunction(localPeak);
comp.addFunction(baseline);
AbstractOptimizer opt = createOptimizer(Optimizer.SIMPLEX_MD);
try {
opt.optimize(new IDataset[] {x}, y, comp);
} catch (Exception e) {
System.err.println("Problem: " + e);
}
double[] parameters = opt.getParameterValues();
for (int ind = 0; ind < parameters.length; ind++) {
double v = parameters[ind];
double dv = v * 1e-5;
double od = evalDiff(parameters, ind, v, dv, opt);
double nd = 0;
System.err.printf("Difference is %g for %g\n", od, dv);
dv *= 0.25;
for (int i = 0; i < 20; i++) {
// System.err.println(Arrays.toString(parameters));
nd = evalDiff(parameters, ind, v, dv, opt);
System.err.printf("Difference is %g for %g\n", nd, dv);
if (Math.abs(nd - od) < 1e-15*Math.max(1, Math.abs(od))) {
break;
}
od = nd;
dv *= 0.25;
}
parameters[ind] = v;
double pd = opt.calculateResidualDerivative(opt.getParameters().get(ind), parameters);
System.err.println(nd + " cf " + pd);
Assert.assertEquals(nd, pd, 1e-3*Math.abs(pd));
}
}
| public void testOptimizer() {
DoubleDataset gaussian = Generic1DDatasetCreator.createGaussianDataset();
List<IdentifiedPeak> peaks = Generic1DFitter.parseDataDerivative(Generic1DDatasetCreator.xAxis, gaussian, Generic1DDatasetCreator.smoothing);
IdentifiedPeak iniPeak = peaks.get(0);
int[] start = { iniPeak .getIndexOfDatasetAtMinPos() };
int[] stop = { iniPeak.getIndexOfDatasetAtMaxPos() + 1 };
int[] step = { 1 };
AbstractDataset y = gaussian.getSlice(start, stop, step);
AbstractDataset x = Generic1DDatasetCreator.xAxis.getSlice(start, stop, step);
double lowOffset = y.min().doubleValue();
double highOffset = (Double) y.mean();
Offset baseline = new Offset(lowOffset, highOffset);
APeak localPeak = new Gaussian(iniPeak);
IOperator comp = new Add();
comp.addFunction(localPeak);
comp.addFunction(baseline);
AbstractOptimizer opt = createOptimizer(Optimizer.SIMPLEX_MD);
try {
opt.optimize(new IDataset[] {x}, y, comp);
} catch (Exception e) {
System.err.println("Problem: " + e);
}
double[] parameters = opt.getParameterValues();
for (int ind = 0; ind < parameters.length; ind++) {
double v = parameters[ind];
double dv = v * 1e-5;
double od = evalDiff(parameters, ind, v, dv, opt);
double nd = 0;
System.err.printf("Difference is %g for %g\n", od, dv);
dv *= 0.25;
for (int i = 0; i < 20; i++) {
// System.err.println(Arrays.toString(parameters));
nd = evalDiff(parameters, ind, v, dv, opt);
System.err.printf("Difference is %g for %g\n", nd, dv);
if (Math.abs(nd - od) < 1e-15*Math.max(1, Math.abs(od))) {
break;
}
od = nd;
dv *= 0.25;
}
parameters[ind] = v;
double pd = opt.calculateResidualDerivative(opt.getParameters().get(ind), parameters);
System.err.println(nd + " cf " + pd);
Assert.assertEquals(nd, pd, 5e-3*Math.abs(pd));
}
}
|
diff --git a/modules/org.restlet.test/src/org/restlet/test/LuceneTestCase.java b/modules/org.restlet.test/src/org/restlet/test/LuceneTestCase.java
index e40380966..a67926f81 100644
--- a/modules/org.restlet.test/src/org/restlet/test/LuceneTestCase.java
+++ b/modules/org.restlet.test/src/org/restlet/test/LuceneTestCase.java
@@ -1,68 +1,68 @@
/**
* Copyright 2005-2009 Noelios Technologies.
*
* The contents of this file are subject to the terms of the following open
* source licenses: LGPL 3.0 or LGPL 2.1 or CDDL 1.0 (the "Licenses"). You can
* select the license that you prefer but you may not use this file except in
* compliance with one of these Licenses.
*
* You can obtain a copy of the LGPL 3.0 license at
* http://www.gnu.org/licenses/lgpl-3.0.html
*
* You can obtain a copy of the LGPL 2.1 license at
* http://www.gnu.org/licenses/lgpl-2.1.html
*
* You can obtain a copy of the CDDL 1.0 license at
* http://www.sun.com/cddl/cddl.html
*
* See the Licenses for the specific language governing permissions and
* limitations under the Licenses.
*
* Alternatively, you can obtain a royalty free commercial license with less
* limitations, transferable or non-transferable, directly at
* http://www.noelios.com/products/restlet-engine
*
* Restlet is a registered trademark of Noelios Technologies.
*/
package org.restlet.test;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
import junit.framework.TestCase;
import org.apache.tika.parser.rtf.RTFParser;
import org.restlet.Client;
import org.restlet.ext.lucene.TikaRepresentation;
import org.restlet.resource.Representation;
/**
* Unit tests for the Lucene extension.
*
* @author Jerome Louvel
*/
public class LuceneTestCase extends TestCase {
public void testTika() throws Exception {
Client clapClient = new Client("clap");
Representation rtfSample = clapClient.get(
"clap://system/org/restlet/test/LuceneTestCase.rtf")
.getEntity();
// rtfSample.write(System.out);
// Prepare a SAX content handler
SAXTransformerFactory factory = ((SAXTransformerFactory) TransformerFactory
.newInstance());
TransformerHandler transform = factory.newTransformerHandler();
transform.setResult(new StreamResult(System.out));
// Analyze the RTF representation
TikaRepresentation tr = new TikaRepresentation(rtfSample);
- tr.setTikeParser(new RTFParser());
+ tr.setTikaParser(new RTFParser());
tr.parse(transform);
}
}
| true | true | public void testTika() throws Exception {
Client clapClient = new Client("clap");
Representation rtfSample = clapClient.get(
"clap://system/org/restlet/test/LuceneTestCase.rtf")
.getEntity();
// rtfSample.write(System.out);
// Prepare a SAX content handler
SAXTransformerFactory factory = ((SAXTransformerFactory) TransformerFactory
.newInstance());
TransformerHandler transform = factory.newTransformerHandler();
transform.setResult(new StreamResult(System.out));
// Analyze the RTF representation
TikaRepresentation tr = new TikaRepresentation(rtfSample);
tr.setTikeParser(new RTFParser());
tr.parse(transform);
}
| public void testTika() throws Exception {
Client clapClient = new Client("clap");
Representation rtfSample = clapClient.get(
"clap://system/org/restlet/test/LuceneTestCase.rtf")
.getEntity();
// rtfSample.write(System.out);
// Prepare a SAX content handler
SAXTransformerFactory factory = ((SAXTransformerFactory) TransformerFactory
.newInstance());
TransformerHandler transform = factory.newTransformerHandler();
transform.setResult(new StreamResult(System.out));
// Analyze the RTF representation
TikaRepresentation tr = new TikaRepresentation(rtfSample);
tr.setTikaParser(new RTFParser());
tr.parse(transform);
}
|
diff --git a/servicemix-beanflow/src/main/java/org/apache/servicemix/beanflow/AbstractActivity.java b/servicemix-beanflow/src/main/java/org/apache/servicemix/beanflow/AbstractActivity.java
index ea341db0e..30cf81ec9 100644
--- a/servicemix-beanflow/src/main/java/org/apache/servicemix/beanflow/AbstractActivity.java
+++ b/servicemix-beanflow/src/main/java/org/apache/servicemix/beanflow/AbstractActivity.java
@@ -1,191 +1,191 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.servicemix.beanflow;
import org.apache.servicemix.beanflow.support.FieldIntrospector;
import org.apache.servicemix.beanflow.support.Introspector;
import java.util.Iterator;
import java.util.concurrent.CountDownLatch;
/**
* A useful base class which allows simple bean activities to be written easily.
* When this activity is started it will listen to all the state values which
* can be found by the introspector (such as all the fields by default) calling
* the {@link run} method when the state changes so that the activity can be
* evaluted.
*
* @version $Revision: $
*/
public abstract class AbstractActivity implements Runnable, Activity {
private State<Transitions> state = new DefaultState<Transitions>(Transitions.Initialised);
private Introspector introspector = new FieldIntrospector();
private String failedReason;
private Throwable failedException;
/**
* Starts the activity
*/
public void start() {
if (state.compareAndSet(Transitions.Initialised, Transitions.Starting)) {
doStart();
state.set(Transitions.Started);
}
}
/**
* Stops the activity
*/
public void stop() {
if (! state.isAny(Transitions.Stopped, Transitions.Failed)) {
state.set(Transitions.Stopped);
doStop();
}
}
/**
* Stops the activity with a failed state, giving the reason for the failure
*/
public void fail(String reason) {
this.failedReason = reason;
state.set(Transitions.Failed);
doStop();
}
/**
* Stops the activity with a failed state with the given reason and
* exception.
*/
public void fail(String message, Throwable e) {
fail(message);
this.failedException = e;
}
/**
* Returns the current running state of this activity
*/
public State<Transitions> getState() {
return state;
}
public boolean isStopped() {
return state.isAny(Transitions.Stopped, Transitions.Failed);
}
public boolean isFailed() {
return state.is(Transitions.Failed);
}
/**
* Returns the reason for the failure
*/
public String getFailedReason() {
return failedReason;
}
/**
* Returns the exception which caused the failure
*/
public Throwable getFailedException() {
return failedException;
}
/**
* A helper method to add a task to fire when the activity is completed
*/
public void onStop(final Runnable runnable) {
getState().addRunnable(new Runnable() {
public void run() {
if (isStopped()) {
runnable.run();
}
}
});
}
/**
* A helper method to add a task to fire when the activity fails
*/
public void onFailure(final Runnable runnable) {
getState().addRunnable(new Runnable() {
public void run() {
if (isFailed()) {
runnable.run();
}
}
});
}
/**
* A helper method to block the calling thread until the activity completes
*/
public void join() {
+ final CountDownLatch latch = new CountDownLatch(1);
+ onStop(new Runnable() {
+ public void run() {
+ latch.countDown();
+ }
+ });
while (!isStopped()) {
- final CountDownLatch latch = new CountDownLatch(1);
- onStop(new Runnable() {
- public void run() {
- latch.countDown();
- }
- });
try {
latch.await();
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
}
// Implementation methods
// -------------------------------------------------------------------------
protected void doStart() {
addListeners(this);
}
protected void doStop() {
removeListeners(this);
}
protected Introspector getIntrospector() {
return introspector;
}
protected void setIntrospector(Introspector introspector) {
this.introspector = introspector;
}
protected void addListeners(Runnable listener) {
if (introspector != null) {
Iterator<State> iter = introspector.iterator(this);
while (iter.hasNext()) {
iter.next().addRunnable(listener);
}
}
}
protected void removeListeners(Runnable listener) {
if (introspector != null) {
Iterator<State> iter = introspector.iterator(this);
while (iter.hasNext()) {
iter.next().removeRunnable(listener);
}
}
}
}
| false | true | public void join() {
while (!isStopped()) {
final CountDownLatch latch = new CountDownLatch(1);
onStop(new Runnable() {
public void run() {
latch.countDown();
}
});
try {
latch.await();
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
}
| public void join() {
final CountDownLatch latch = new CountDownLatch(1);
onStop(new Runnable() {
public void run() {
latch.countDown();
}
});
while (!isStopped()) {
try {
latch.await();
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
}
|
diff --git a/calendar-webapp/src/main/java/org/exoplatform/calendar/webui/UIFormDateTimePicker.java b/calendar-webapp/src/main/java/org/exoplatform/calendar/webui/UIFormDateTimePicker.java
index e72e9f02..e35e1de0 100644
--- a/calendar-webapp/src/main/java/org/exoplatform/calendar/webui/UIFormDateTimePicker.java
+++ b/calendar-webapp/src/main/java/org/exoplatform/calendar/webui/UIFormDateTimePicker.java
@@ -1,189 +1,189 @@
/**
* Copyright (C) 2003-2008 eXo Platform SAS.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
* as published by the Free Software Foundation; either version 3
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see<http://www.gnu.org/licenses/>.
**/
package org.exoplatform.calendar.webui;
import java.io.Writer;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Locale;
import org.exoplatform.web.application.RequireJS;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.form.UIFormInputBase;
/**
* Created by The eXo Platform SAS
* Author : Pham Tuan
* [email protected]
* Feb 29, 2008
*/
public class UIFormDateTimePicker extends UIFormInputBase<String> {
/**
* The DateFormat
*/
// private DateFormat dateFormat_ ;
/**
* Whether to display the full time (with hours, minutes and seconds), not only the date
*/
private String dateStyle_ = "MM/dd/yyyy" ;
private String timeStyle_ = "HH:mm:ss" ;
private Date date_ ;
private boolean isDisplayTime_ ;
private Locale locale_ ;
public UIFormDateTimePicker(String name, String bindField, Date date, boolean isDisplayTime) {
super(name, bindField, String.class) ;
date_ = date ;
isDisplayTime_ = isDisplayTime ;
if(date != null) value_ = getFormater().format(date) ;
if(date != null) value_ = getFormater().format(date) ;
}
public UIFormDateTimePicker(String name, String bindField, Date date, boolean isDisplayTime, Locale locale) {
super(name, bindField, String.class) ;
date_ = date ;
isDisplayTime_ = isDisplayTime ;
locale_ = locale ;
if(date != null) value_ = getFormater().format(date) ;
if(date != null) value_ = getFormater().format(date) ;
}
public UIFormDateTimePicker(String name, String bindField, Date date, boolean isDisplayTime, String dateStyle) {
super(name, bindField, String.class) ;
dateStyle_ = dateStyle ;
isDisplayTime_ = isDisplayTime ;
date_ = date ;
if(date != null) value_ = getFormater().format(date) ;
}
public UIFormDateTimePicker(String name, String bindField, Date date, boolean isDisplayTime, String dateStyle, String timeStyle) {
super(name, bindField, String.class) ;
dateStyle_ = dateStyle ;
timeStyle_ = timeStyle ;
date_ = date ;
isDisplayTime_ = isDisplayTime ;
if(date != null) value_ = getFormater().format(date) ;
}
public UIFormDateTimePicker(String name, String bindField, Date date) {
this(name, bindField, date, true) ;
}
public UIFormDateTimePicker(String name, String bindField, Date date, String dateStyle) {
this(name, bindField, date, false, dateStyle) ;
}
public UIFormDateTimePicker(String name, String bindField, Date date, String dateStyle, String timeStyle) {
this(name, bindField, date, true, dateStyle, timeStyle) ;
}
public void setDisplayTime(boolean isDisplayTime) {
isDisplayTime_ = isDisplayTime;
}
public void setCalendar(Calendar date) {
date_ = date.getTime() ;
value_ = getFormater().format(date.getTime()) ;
}
public Calendar getCalendar() {
try {
Calendar calendar = new GregorianCalendar() ;
calendar.setTime(getFormater().parse(value_ + " 0:0:0")) ;
return calendar ;
} catch (ParseException e) {
return null;
}
}
public Date getDateValue() {
try {
Calendar calendar = new GregorianCalendar() ;
calendar.setTime(getFormater().parse(value_ + " 0:0:0")) ;
return calendar.getTime() ;
} catch (ParseException e) {
return null;
}
}
public void setDateFormatStyle(String dateStyle) {
dateStyle_ = dateStyle ;
value_ = getFormater().format(date_) ;
}
public void setTimeFormatStyle(String timeStyle) {
timeStyle_ = timeStyle ;
value_ = getFormater().format(date_) ;
}
@SuppressWarnings("unused")
public void decode(Object input, WebuiRequestContext context) throws Exception {
if(input != null) value_ = ((String)input).trim();
}
public String getFormatStyle() {
if(isDisplayTime_) return dateStyle_ + " " + timeStyle_ ;
return dateStyle_ ;
}
private String getLang() {
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance() ;
Locale locale = context.getParentAppRequestContext().getLocale() ;
return locale.getLanguage();
}
private DateFormat getFormater() {
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance() ;
Locale locale = context.getParentAppRequestContext().getLocale() ;
if(locale_ == null) locale_ = locale ;
return new SimpleDateFormat(getFormatStyle(), locale_) ;
}
public void processRender(WebuiRequestContext context) throws Exception {
Locale locale = context.getParentAppRequestContext().getLocale() ;
locale_ = locale ;
//context.getJavascriptManager().loadScriptResource("eXo.cs.UIDateTimePicker");
String input_id = "DateTimePicker-"+context.getJavascriptManager().generateUUID();
Writer w = context.getWriter();
/*
//w.write("<input lang='"+getLang()+"' monthsName='"+ getMonthsName()+"' daysName='"+getDaysName()+"' format='" + getFormatStyle() + "' type='text' onfocus='eXo.cs.UIDateTimePicker.init(this,") ;
w.write("<input id='"+input_id+"' lang='"+getLang()+"' format='" + getFormatStyle() + "' type='text' onfocus='eXo.cs.UIDateTimePicker.init(this,") ;
w.write(String.valueOf(isDisplayTime_));
w.write(");' onkeyup='eXo.cs.UIDateTimePicker.show();' name='") ;
w.write(getName()) ; w.write('\'') ;
if(value_ != null && value_.length() > 0) {
w.write(" value='"+value_+"\'");
}
w.write(" onmousedown='event.cancelBubble = true' />") ;
*/
w.write("<input id='"+input_id+"' lang='"+getLang()+"' format='" + getFormatStyle() + "' type='text'") ;
w.write("name='") ;
w.write(getName()) ; w.write('\'') ;
if(value_ != null && value_.length() > 0) {
w.write(" value='"+value_+"\'");
}
w.write("/>") ;
RequireJS requirejs = context.getJavascriptManager().getRequireJS();
requirejs.require("SHARED/csResources","cs");
requirejs.require("SHARED/jquery","gj");
String obj = "input#"+input_id;
- String onfocus_function = "cs.UIDateTimePicker.init(this,"+String.valueOf(isDisplayTime_)+");";
- String onkeyup_function = "cs.UIDateTimePicker.show();";
- String onmousedown_function = "event.cancelBubble = true";
+ String onfocusFunc = "cs.UIDateTimePicker.init(this,"+String.valueOf(isDisplayTime_)+");";
+ String onkeyupFunc = "cs.UIDateTimePicker.show();";
+ String onmousedownFunc = "event.cancelBubble = true";
- requirejs.addScripts("gj('"+obj+"').focus(function(){"+onfocus_function+"});");
- requirejs.addScripts("gj('"+obj+"').keyup(function(){"+onkeyup_function+"});");
- requirejs.addScripts("gj('"+obj+"').focus(function(){"+onmousedown_function+"});");
+ requirejs.addScripts("gj('"+obj+"').focus(function(){"+onfocusFunc+"});");
+ requirejs.addScripts("gj('"+obj+"').keyup(function(){"+onkeyupFunc+"});");
+ requirejs.addScripts("gj('"+obj+"').focus(function(){"+onmousedownFunc+"});");
}
}
| false | true | public void processRender(WebuiRequestContext context) throws Exception {
Locale locale = context.getParentAppRequestContext().getLocale() ;
locale_ = locale ;
//context.getJavascriptManager().loadScriptResource("eXo.cs.UIDateTimePicker");
String input_id = "DateTimePicker-"+context.getJavascriptManager().generateUUID();
Writer w = context.getWriter();
/*
//w.write("<input lang='"+getLang()+"' monthsName='"+ getMonthsName()+"' daysName='"+getDaysName()+"' format='" + getFormatStyle() + "' type='text' onfocus='eXo.cs.UIDateTimePicker.init(this,") ;
w.write("<input id='"+input_id+"' lang='"+getLang()+"' format='" + getFormatStyle() + "' type='text' onfocus='eXo.cs.UIDateTimePicker.init(this,") ;
w.write(String.valueOf(isDisplayTime_));
w.write(");' onkeyup='eXo.cs.UIDateTimePicker.show();' name='") ;
w.write(getName()) ; w.write('\'') ;
if(value_ != null && value_.length() > 0) {
w.write(" value='"+value_+"\'");
}
w.write(" onmousedown='event.cancelBubble = true' />") ;
*/
w.write("<input id='"+input_id+"' lang='"+getLang()+"' format='" + getFormatStyle() + "' type='text'") ;
w.write("name='") ;
w.write(getName()) ; w.write('\'') ;
if(value_ != null && value_.length() > 0) {
w.write(" value='"+value_+"\'");
}
w.write("/>") ;
RequireJS requirejs = context.getJavascriptManager().getRequireJS();
requirejs.require("SHARED/csResources","cs");
requirejs.require("SHARED/jquery","gj");
String obj = "input#"+input_id;
String onfocus_function = "cs.UIDateTimePicker.init(this,"+String.valueOf(isDisplayTime_)+");";
String onkeyup_function = "cs.UIDateTimePicker.show();";
String onmousedown_function = "event.cancelBubble = true";
requirejs.addScripts("gj('"+obj+"').focus(function(){"+onfocus_function+"});");
requirejs.addScripts("gj('"+obj+"').keyup(function(){"+onkeyup_function+"});");
requirejs.addScripts("gj('"+obj+"').focus(function(){"+onmousedown_function+"});");
}
| public void processRender(WebuiRequestContext context) throws Exception {
Locale locale = context.getParentAppRequestContext().getLocale() ;
locale_ = locale ;
//context.getJavascriptManager().loadScriptResource("eXo.cs.UIDateTimePicker");
String input_id = "DateTimePicker-"+context.getJavascriptManager().generateUUID();
Writer w = context.getWriter();
/*
//w.write("<input lang='"+getLang()+"' monthsName='"+ getMonthsName()+"' daysName='"+getDaysName()+"' format='" + getFormatStyle() + "' type='text' onfocus='eXo.cs.UIDateTimePicker.init(this,") ;
w.write("<input id='"+input_id+"' lang='"+getLang()+"' format='" + getFormatStyle() + "' type='text' onfocus='eXo.cs.UIDateTimePicker.init(this,") ;
w.write(String.valueOf(isDisplayTime_));
w.write(");' onkeyup='eXo.cs.UIDateTimePicker.show();' name='") ;
w.write(getName()) ; w.write('\'') ;
if(value_ != null && value_.length() > 0) {
w.write(" value='"+value_+"\'");
}
w.write(" onmousedown='event.cancelBubble = true' />") ;
*/
w.write("<input id='"+input_id+"' lang='"+getLang()+"' format='" + getFormatStyle() + "' type='text'") ;
w.write("name='") ;
w.write(getName()) ; w.write('\'') ;
if(value_ != null && value_.length() > 0) {
w.write(" value='"+value_+"\'");
}
w.write("/>") ;
RequireJS requirejs = context.getJavascriptManager().getRequireJS();
requirejs.require("SHARED/csResources","cs");
requirejs.require("SHARED/jquery","gj");
String obj = "input#"+input_id;
String onfocusFunc = "cs.UIDateTimePicker.init(this,"+String.valueOf(isDisplayTime_)+");";
String onkeyupFunc = "cs.UIDateTimePicker.show();";
String onmousedownFunc = "event.cancelBubble = true";
requirejs.addScripts("gj('"+obj+"').focus(function(){"+onfocusFunc+"});");
requirejs.addScripts("gj('"+obj+"').keyup(function(){"+onkeyupFunc+"});");
requirejs.addScripts("gj('"+obj+"').focus(function(){"+onmousedownFunc+"});");
}
|
diff --git a/src/cli/src/main/java/org/geogit/cli/plumbing/MergeBase.java b/src/cli/src/main/java/org/geogit/cli/plumbing/MergeBase.java
index 99f137f0..c2d3de06 100644
--- a/src/cli/src/main/java/org/geogit/cli/plumbing/MergeBase.java
+++ b/src/cli/src/main/java/org/geogit/cli/plumbing/MergeBase.java
@@ -1,64 +1,64 @@
/* Copyright (c) 2013 OpenPlans. All rights reserved.
* This code is licensed under the BSD New License, available at the root
* application directory.
*/
package org.geogit.cli.plumbing;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import jline.console.ConsoleReader;
import org.geogit.api.GeoGIT;
import org.geogit.api.RevCommit;
import org.geogit.api.RevObject;
import org.geogit.api.plumbing.FindCommonAncestor;
import org.geogit.api.plumbing.RevObjectParse;
import org.geogit.cli.AbstractCommand;
import org.geogit.cli.CLICommand;
import org.geogit.cli.GeogitCLI;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.base.Optional;
/**
* Outputs the common ancestor of 2 commits
*
*/
@Parameters(commandNames = "merge-base", commandDescription = "Outputs the common ancestor of 2 commits")
public class MergeBase extends AbstractCommand implements CLICommand {
/**
* The commits to use for computing the common ancestor
*
*/
@Parameter(description = "<commit> <commit>")
private List<String> commits = new ArrayList<String>();
@Override
public void runInternal(GeogitCLI cli) throws IOException {
checkParameter(commits.size() == 2, "Two commit references must be provided");
ConsoleReader console = cli.getConsole();
GeoGIT geogit = cli.getGeogit();
Optional<RevObject> left = geogit.command(RevObjectParse.class).setRefSpec(commits.get(0))
.call();
checkParameter(left.isPresent(), commits.get(0) + " does not resolve to any object.");
checkParameter(left.get() instanceof RevCommit, commits.get(0)
+ " does not resolve to a commit");
- Optional<RevObject> right = geogit.command(RevObjectParse.class).setRefSpec(commits.get(0))
+ Optional<RevObject> right = geogit.command(RevObjectParse.class).setRefSpec(commits.get(1))
.call();
- checkParameter(right.isPresent(), commits.get(0) + " does not resolve to any object.");
- checkParameter(right.get() instanceof RevCommit, commits.get(0)
+ checkParameter(right.isPresent(), commits.get(1) + " does not resolve to any object.");
+ checkParameter(right.get() instanceof RevCommit, commits.get(1)
+ " does not resolve to a commit");
Optional<RevCommit> ancestor = geogit.command(FindCommonAncestor.class)
.setLeft((RevCommit) left.get()).setRight((RevCommit) right.get()).call();
checkParameter(ancestor.isPresent(), "No common ancestor was found.");
console.print(ancestor.get().getId().toString());
}
}
| false | true | public void runInternal(GeogitCLI cli) throws IOException {
checkParameter(commits.size() == 2, "Two commit references must be provided");
ConsoleReader console = cli.getConsole();
GeoGIT geogit = cli.getGeogit();
Optional<RevObject> left = geogit.command(RevObjectParse.class).setRefSpec(commits.get(0))
.call();
checkParameter(left.isPresent(), commits.get(0) + " does not resolve to any object.");
checkParameter(left.get() instanceof RevCommit, commits.get(0)
+ " does not resolve to a commit");
Optional<RevObject> right = geogit.command(RevObjectParse.class).setRefSpec(commits.get(0))
.call();
checkParameter(right.isPresent(), commits.get(0) + " does not resolve to any object.");
checkParameter(right.get() instanceof RevCommit, commits.get(0)
+ " does not resolve to a commit");
Optional<RevCommit> ancestor = geogit.command(FindCommonAncestor.class)
.setLeft((RevCommit) left.get()).setRight((RevCommit) right.get()).call();
checkParameter(ancestor.isPresent(), "No common ancestor was found.");
console.print(ancestor.get().getId().toString());
}
| public void runInternal(GeogitCLI cli) throws IOException {
checkParameter(commits.size() == 2, "Two commit references must be provided");
ConsoleReader console = cli.getConsole();
GeoGIT geogit = cli.getGeogit();
Optional<RevObject> left = geogit.command(RevObjectParse.class).setRefSpec(commits.get(0))
.call();
checkParameter(left.isPresent(), commits.get(0) + " does not resolve to any object.");
checkParameter(left.get() instanceof RevCommit, commits.get(0)
+ " does not resolve to a commit");
Optional<RevObject> right = geogit.command(RevObjectParse.class).setRefSpec(commits.get(1))
.call();
checkParameter(right.isPresent(), commits.get(1) + " does not resolve to any object.");
checkParameter(right.get() instanceof RevCommit, commits.get(1)
+ " does not resolve to a commit");
Optional<RevCommit> ancestor = geogit.command(FindCommonAncestor.class)
.setLeft((RevCommit) left.get()).setRight((RevCommit) right.get()).call();
checkParameter(ancestor.isPresent(), "No common ancestor was found.");
console.print(ancestor.get().getId().toString());
}
|
diff --git a/android/src/fq/router2/feedback/HandleAlertIntent.java b/android/src/fq/router2/feedback/HandleAlertIntent.java
index a73d59b..d3647ff 100644
--- a/android/src/fq/router2/feedback/HandleAlertIntent.java
+++ b/android/src/fq/router2/feedback/HandleAlertIntent.java
@@ -1,93 +1,100 @@
package fq.router2.feedback;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import fq.router2.R;
import fq.router2.utils.IOUtils;
import fq.router2.utils.LogUtils;
import fq.router2.utils.LoggedBroadcastReceiver;
import fq.router2.utils.ShellUtils;
import java.io.File;
public class HandleAlertIntent extends Intent {
public final static String ALERT_TYPE_ABNORMAL_EXIT = "AbnormalExit";
public final static String ALERT_TYPE_HOSTS_MODIFIED = "HostsModified";
public final static String ALERT_TYPE_RUN_NEEDS_SU = "RunNeedsSu";
private final static String ACTION_HANDLE_ALERT = "HandleAlert";
public HandleAlertIntent(String alertType) {
setAction(ACTION_HANDLE_ALERT);
putExtra("alertType", alertType);
}
public static void register(final Handler handler) {
Context context = handler.getBaseContext();
context.registerReceiver(new LoggedBroadcastReceiver() {
@Override
protected void handle(Context context, Intent intent) {
String alertType = intent.getStringExtra("alertType");
if (ALERT_TYPE_ABNORMAL_EXIT.equals(alertType)) {
showAbnormalExitAlert(context);
} else if (ALERT_TYPE_HOSTS_MODIFIED.equals(alertType)) {
showHostsModifiedAlert(context);
} else if (ALERT_TYPE_RUN_NEEDS_SU.equals(alertType)) {
showRunNeedsSuAlert(context);
}
}
}, new IntentFilter(ACTION_HANDLE_ALERT));
}
private static void showAbnormalExitAlert(Context context) {
new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setTitle(R.string.abnormal_exit_alert_title)
.setMessage(R.string.abnormal_exit_alert_message)
.setPositiveButton(R.string.abnormal_exit_alert_ok, null)
.show();
}
private static void showHostsModifiedAlert(Context context) {
final File ignoredFile = new File("/data/data/fq.router2/etc/hosts-modified-alert-ignored");
if (ignoredFile.exists()) {
return;
}
new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setTitle(R.string.hosts_modified_alert_title)
.setMessage(R.string.hosts_modified_alert_message)
.setPositiveButton(R.string.hosts_modified_alert_revert, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
- try {
- ShellUtils.sudo(ShellUtils.BUSYBOX_FILE + " rm /system/etc/hosts");
- } catch (Exception e) {
- LogUtils.e("failed to delete hosts file", e);
- }
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ ShellUtils.sudo(ShellUtils.BUSYBOX_FILE + " mount -o remount,rw /system");
+ ShellUtils.sudo(ShellUtils.BUSYBOX_FILE + " rm /system/etc/hosts");
+ ShellUtils.sudo(ShellUtils.BUSYBOX_FILE + " mount -o remount,ro /system");
+ } catch (Exception e) {
+ LogUtils.e("failed to delete hosts file", e);
+ }
+ }
+ }).start();
}
})
.setNegativeButton(R.string.hosts_modified_alert_ignore, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
IOUtils.writeToFile(ignoredFile, "OK");
}
})
.show();
}
private static void showRunNeedsSuAlert(Context context) {
new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setTitle(R.string.run_needs_su_alert_title)
.setMessage(R.string.run_needs_su_alert_message)
.setPositiveButton(R.string.run_needs_su_alert_ok, null)
.show();
}
public static interface Handler {
Context getBaseContext();
}
}
| true | true | private static void showHostsModifiedAlert(Context context) {
final File ignoredFile = new File("/data/data/fq.router2/etc/hosts-modified-alert-ignored");
if (ignoredFile.exists()) {
return;
}
new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setTitle(R.string.hosts_modified_alert_title)
.setMessage(R.string.hosts_modified_alert_message)
.setPositiveButton(R.string.hosts_modified_alert_revert, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
try {
ShellUtils.sudo(ShellUtils.BUSYBOX_FILE + " rm /system/etc/hosts");
} catch (Exception e) {
LogUtils.e("failed to delete hosts file", e);
}
}
})
.setNegativeButton(R.string.hosts_modified_alert_ignore, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
IOUtils.writeToFile(ignoredFile, "OK");
}
})
.show();
}
| private static void showHostsModifiedAlert(Context context) {
final File ignoredFile = new File("/data/data/fq.router2/etc/hosts-modified-alert-ignored");
if (ignoredFile.exists()) {
return;
}
new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setTitle(R.string.hosts_modified_alert_title)
.setMessage(R.string.hosts_modified_alert_message)
.setPositiveButton(R.string.hosts_modified_alert_revert, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
new Thread(new Runnable() {
@Override
public void run() {
try {
ShellUtils.sudo(ShellUtils.BUSYBOX_FILE + " mount -o remount,rw /system");
ShellUtils.sudo(ShellUtils.BUSYBOX_FILE + " rm /system/etc/hosts");
ShellUtils.sudo(ShellUtils.BUSYBOX_FILE + " mount -o remount,ro /system");
} catch (Exception e) {
LogUtils.e("failed to delete hosts file", e);
}
}
}).start();
}
})
.setNegativeButton(R.string.hosts_modified_alert_ignore, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
IOUtils.writeToFile(ignoredFile, "OK");
}
})
.show();
}
|
diff --git a/cogroo-base/src/main/java/br/ccsl/cogroo/util/TextUtils.java b/cogroo-base/src/main/java/br/ccsl/cogroo/util/TextUtils.java
index 722547d..fde32c6 100644
--- a/cogroo-base/src/main/java/br/ccsl/cogroo/util/TextUtils.java
+++ b/cogroo-base/src/main/java/br/ccsl/cogroo/util/TextUtils.java
@@ -1,105 +1,105 @@
package br.ccsl.cogroo.util;
import java.util.Arrays;
import java.util.List;
import br.ccsl.cogroo.config.Analyzers;
import br.ccsl.cogroo.text.Document;
import br.ccsl.cogroo.text.Sentence;
import br.ccsl.cogroo.text.Token;
import br.ccsl.cogroo.text.impl.TokenImpl;
/**
* The <code>TextUtils</code> class deals with the code prints.
*/
public class TextUtils {
public static String[] tokensToString(List<Token> tokens) {
String[] tokensString = new String[tokens.size()];
for (int i = 0; i < tokens.size(); i++) {
tokensString[i] = tokens.get(i).getLexeme();
}
return tokensString;
}
public static String[][] additionalContext(List<Token> tokens,
List<Analyzers> analyzers) {
String[][] additionalContext = new String[tokens.size()][analyzers.size()];
for (int i = 0; i < analyzers.size(); i++) {
for (int j = 0; j < tokens.size(); j++) {
Object object = ((TokenImpl) tokens.get(j))
.getAdditionalContext(analyzers.get(i));
if (object == null)
additionalContext[j][i] = null;
else
additionalContext[j][i] = (String) object;
}
}
return additionalContext;
}
/**
* @return the <code>String</code> to be printed
*/
public static String nicePrint(Document document) {
StringBuilder output = new StringBuilder();
output.append("Entered text: ").append(document.getText()).append("\n\n");
if (document.getSentences() != null) {
int cont = 0;
for (Sentence sentence : document.getSentences()) {
cont++;
output.append(" Sentence ").append(cont).append(": ")
.append(sentence.getText())
.append("\n");
List<Token> tokens = sentence.getTokens();
if (tokens != null) {
output.append(" Tokens: [");
for (Token token : tokens) {
output.append(" ").append(token.getLexeme());
if (token.getPOSTag() != null) {
output.append("(").append(token.getPOSTag()).append(")");
}
if (token.getFeatures() != null) {
output.append("{").append(token.getFeatures()).append("}");
}
String[] lemmas = token.getLemmas();
if (lemmas != null) {
output.append("[");
for (int i = 0; i < lemmas.length; i++) {
- output.append(lemmas[i]);
+ output.append(lemmas[i]).append(",");
}
output.append("]");
}
output.append(" ");
}
output.append("]\n\n");
}
String[][] addcontext = TextUtils.additionalContext(tokens,
Arrays.asList(Analyzers.CONTRACTION_FINDER, Analyzers.NAME_FINDER));
for (String[] strings : addcontext) {
output.append(Arrays.toString(strings)).append("\n");
}
}
}
return output.toString();
}
}
| true | true | public static String nicePrint(Document document) {
StringBuilder output = new StringBuilder();
output.append("Entered text: ").append(document.getText()).append("\n\n");
if (document.getSentences() != null) {
int cont = 0;
for (Sentence sentence : document.getSentences()) {
cont++;
output.append(" Sentence ").append(cont).append(": ")
.append(sentence.getText())
.append("\n");
List<Token> tokens = sentence.getTokens();
if (tokens != null) {
output.append(" Tokens: [");
for (Token token : tokens) {
output.append(" ").append(token.getLexeme());
if (token.getPOSTag() != null) {
output.append("(").append(token.getPOSTag()).append(")");
}
if (token.getFeatures() != null) {
output.append("{").append(token.getFeatures()).append("}");
}
String[] lemmas = token.getLemmas();
if (lemmas != null) {
output.append("[");
for (int i = 0; i < lemmas.length; i++) {
output.append(lemmas[i]);
}
output.append("]");
}
output.append(" ");
}
output.append("]\n\n");
}
String[][] addcontext = TextUtils.additionalContext(tokens,
Arrays.asList(Analyzers.CONTRACTION_FINDER, Analyzers.NAME_FINDER));
for (String[] strings : addcontext) {
output.append(Arrays.toString(strings)).append("\n");
}
}
}
return output.toString();
}
| public static String nicePrint(Document document) {
StringBuilder output = new StringBuilder();
output.append("Entered text: ").append(document.getText()).append("\n\n");
if (document.getSentences() != null) {
int cont = 0;
for (Sentence sentence : document.getSentences()) {
cont++;
output.append(" Sentence ").append(cont).append(": ")
.append(sentence.getText())
.append("\n");
List<Token> tokens = sentence.getTokens();
if (tokens != null) {
output.append(" Tokens: [");
for (Token token : tokens) {
output.append(" ").append(token.getLexeme());
if (token.getPOSTag() != null) {
output.append("(").append(token.getPOSTag()).append(")");
}
if (token.getFeatures() != null) {
output.append("{").append(token.getFeatures()).append("}");
}
String[] lemmas = token.getLemmas();
if (lemmas != null) {
output.append("[");
for (int i = 0; i < lemmas.length; i++) {
output.append(lemmas[i]).append(",");
}
output.append("]");
}
output.append(" ");
}
output.append("]\n\n");
}
String[][] addcontext = TextUtils.additionalContext(tokens,
Arrays.asList(Analyzers.CONTRACTION_FINDER, Analyzers.NAME_FINDER));
for (String[] strings : addcontext) {
output.append(Arrays.toString(strings)).append("\n");
}
}
}
return output.toString();
}
|
diff --git a/src/java/CommandLineInterpreter.java b/src/java/CommandLineInterpreter.java
index aee7cc8..9e44154 100644
--- a/src/java/CommandLineInterpreter.java
+++ b/src/java/CommandLineInterpreter.java
@@ -1,213 +1,213 @@
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Scanner;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
public class CommandLineInterpreter
{
private static Scanner input;
/**
* Use GNU Parser
* Interprets commands given and carries out the proper functions.
* If you want to add a command, add it here as an if statement and
* in the constructGnuOptions function for the program to recognize it.
* @param commandLineArguments
* @throws SQLException
* @throws ClassNotFoundException
*/
public static String useGnuParser(final String[] commandLineArguments) throws ClassNotFoundException, SQLException{
final CommandLineParser cmdLineGnuParser = new GnuParser();
final Options gnuOptions = new CommandLineConstructors().getCommands();
CommandLine commandLine;
String result = "";
try{
commandLine = cmdLineGnuParser.parse(gnuOptions, commandLineArguments);
if (commandLine.hasOption("updiv")){
result = uploadCommand(commandLineArguments, commandLine, "updiv");
}
if (commandLine.hasOption("upano")){
result = uploadCommand(commandLineArguments, commandLine, "upano");
}
//allows for three arguments, afs(vcfname, filename, filtername)
if (commandLine.hasOption("asf")){
String[] args = commandLine.getOptionValues("asf");
Command command = null;
if(args.length == 1) command = new AFSCommand(args[0], "");
if(args.length == 2) command = new AFSCommand(args[0], args[1]);
result = command.execute();
}
//Allow for two optional arguments
if (commandLine.hasOption("filterWrite")){
String[] args = commandLine.getOptionValues("filterWrite");
Command command = null;
if(args.length == 3) command = new FilterWriteApplier(args[0], args[1], args[2]);
result = command.execute();
}
if (commandLine.hasOption("filterStore")){
String[] args = commandLine.getOptionValues("filterStore");
Command command = null;
if(args.length == 2) command = new FilterStoreApplier(args[0], args[1]);
result = command.execute();
}
if(commandLine.hasOption("createfilter")){
String[] args = commandLine.getOptionValues("createfilter");
FilterCreator filter = null;
- if(args == null){
+ if(args.length == 1){
input = new Scanner(System.in);
ArrayList<String> additionalArguments = new ArrayList<String>();
System.out.println("Please input additional arguments for creating a filter. Enter 'done' or hit enter twice when finished.");
while(true){
System.out.print(">> ");
String line = input.nextLine().trim();
if(line.equals("done") || line.equals("")){
break;
}
System.out.println(line);
additionalArguments.add(line);
}
String[] arguments = new String[additionalArguments.size()];
arguments = additionalArguments.toArray(arguments);
filter = new FilterCreator(args[0],arguments);
}else{
String[] additionalArguments = new String[args.length-1];
for(int i = 0; i < additionalArguments.length; i++){
additionalArguments[i] = args[i+1];
}
filter = new FilterCreator(args[0],additionalArguments);
}
filter.uploadEntries();
}
if (commandLine.hasOption("sum")){
String[] stringNumbers = commandLine.getOptionValues("sum");
int sum = 0;
for(int i = 0; i < stringNumbers.length; i++){
sum += Integer.parseInt(stringNumbers[i]);
}
System.out.println(sum);
}
if (commandLine.hasOption("help")){
/*
* Expand to a more general help function
*/
System.out.println("hello\nn <arg>\nsum <arg0> <arg1> <arg2> ...");
}
}
catch (ParseException parsingException){
System.err.println("Could not find argument: " + parsingException.getMessage());
}
return result;
}
/**
* Uploads either divergence file or annotation file
* @param commandLineArguments
* @param commandLine
* @param type
* @return the name of the upload
*/
public static String uploadCommand(final String[] commandLineArguments, CommandLine commandLine, String type){
String[] args;
Command command = null;
args = commandLine.getOptionValues(type);
String result = "";
if(args == null){
result = "Please input arguments";
}else if(args.length == 1){
if(type=="updiv")command = new UploadDivergenceCommand(args[0], null,"");
if(type=="upano")command = new UploadAnnotationCommand(args[0], null,"");
result = command.execute();
}else if(args.length == 2){
if(type=="updiv")command = new UploadDivergenceCommand(args[0], null,args[1]);
if(type=="upano")command = new UploadAnnotationCommand(args[0], null,args[1]);
result = command.execute();
}else{
result = "Incorrect number of arguments";
}
return result;
}
/**
* Prints out the commands the user input.
*/
public static void displayInput(final String[] commandLineArguments){
int length = commandLineArguments.length;
String output = "";
for(int i = 0; i < length; i++){
output += commandLineArguments[i];
output += " ";
}
System.out.println(output);
}
/**
* This is the method that should be called by outside methods and classes
* to run all commands.
* @throws SQLException
* @throws ClassNotFoundException
*/
public static String interpreter(String[] commandLineArguments) throws ClassNotFoundException, SQLException{
if (commandLineArguments.length < 1)
{
System.out.println("Please input help");
}
displayInput(commandLineArguments);
System.out.println("");
return useGnuParser(commandLineArguments);
}
/**
* Main executable method used to demonstrate Apache Commons CLI.
*
* @param commandLineArguments Commmand-line arguments.
* @throws SQLException
* @throws ClassNotFoundException
*/
public static void main(final String[] commandLineInput) throws ClassNotFoundException, SQLException{
System.out.println("Test Parser");
System.out.println("Developed for the Gene-E project\n");
interpreter(commandLineInput);
}
}
| true | true | public static String useGnuParser(final String[] commandLineArguments) throws ClassNotFoundException, SQLException{
final CommandLineParser cmdLineGnuParser = new GnuParser();
final Options gnuOptions = new CommandLineConstructors().getCommands();
CommandLine commandLine;
String result = "";
try{
commandLine = cmdLineGnuParser.parse(gnuOptions, commandLineArguments);
if (commandLine.hasOption("updiv")){
result = uploadCommand(commandLineArguments, commandLine, "updiv");
}
if (commandLine.hasOption("upano")){
result = uploadCommand(commandLineArguments, commandLine, "upano");
}
//allows for three arguments, afs(vcfname, filename, filtername)
if (commandLine.hasOption("asf")){
String[] args = commandLine.getOptionValues("asf");
Command command = null;
if(args.length == 1) command = new AFSCommand(args[0], "");
if(args.length == 2) command = new AFSCommand(args[0], args[1]);
result = command.execute();
}
//Allow for two optional arguments
if (commandLine.hasOption("filterWrite")){
String[] args = commandLine.getOptionValues("filterWrite");
Command command = null;
if(args.length == 3) command = new FilterWriteApplier(args[0], args[1], args[2]);
result = command.execute();
}
if (commandLine.hasOption("filterStore")){
String[] args = commandLine.getOptionValues("filterStore");
Command command = null;
if(args.length == 2) command = new FilterStoreApplier(args[0], args[1]);
result = command.execute();
}
if(commandLine.hasOption("createfilter")){
String[] args = commandLine.getOptionValues("createfilter");
FilterCreator filter = null;
if(args == null){
input = new Scanner(System.in);
ArrayList<String> additionalArguments = new ArrayList<String>();
System.out.println("Please input additional arguments for creating a filter. Enter 'done' or hit enter twice when finished.");
while(true){
System.out.print(">> ");
String line = input.nextLine().trim();
if(line.equals("done") || line.equals("")){
break;
}
System.out.println(line);
additionalArguments.add(line);
}
String[] arguments = new String[additionalArguments.size()];
arguments = additionalArguments.toArray(arguments);
filter = new FilterCreator(args[0],arguments);
}else{
String[] additionalArguments = new String[args.length-1];
for(int i = 0; i < additionalArguments.length; i++){
additionalArguments[i] = args[i+1];
}
filter = new FilterCreator(args[0],additionalArguments);
}
filter.uploadEntries();
}
if (commandLine.hasOption("sum")){
String[] stringNumbers = commandLine.getOptionValues("sum");
int sum = 0;
for(int i = 0; i < stringNumbers.length; i++){
sum += Integer.parseInt(stringNumbers[i]);
}
System.out.println(sum);
}
if (commandLine.hasOption("help")){
/*
* Expand to a more general help function
*/
System.out.println("hello\nn <arg>\nsum <arg0> <arg1> <arg2> ...");
}
}
catch (ParseException parsingException){
System.err.println("Could not find argument: " + parsingException.getMessage());
}
return result;
}
| public static String useGnuParser(final String[] commandLineArguments) throws ClassNotFoundException, SQLException{
final CommandLineParser cmdLineGnuParser = new GnuParser();
final Options gnuOptions = new CommandLineConstructors().getCommands();
CommandLine commandLine;
String result = "";
try{
commandLine = cmdLineGnuParser.parse(gnuOptions, commandLineArguments);
if (commandLine.hasOption("updiv")){
result = uploadCommand(commandLineArguments, commandLine, "updiv");
}
if (commandLine.hasOption("upano")){
result = uploadCommand(commandLineArguments, commandLine, "upano");
}
//allows for three arguments, afs(vcfname, filename, filtername)
if (commandLine.hasOption("asf")){
String[] args = commandLine.getOptionValues("asf");
Command command = null;
if(args.length == 1) command = new AFSCommand(args[0], "");
if(args.length == 2) command = new AFSCommand(args[0], args[1]);
result = command.execute();
}
//Allow for two optional arguments
if (commandLine.hasOption("filterWrite")){
String[] args = commandLine.getOptionValues("filterWrite");
Command command = null;
if(args.length == 3) command = new FilterWriteApplier(args[0], args[1], args[2]);
result = command.execute();
}
if (commandLine.hasOption("filterStore")){
String[] args = commandLine.getOptionValues("filterStore");
Command command = null;
if(args.length == 2) command = new FilterStoreApplier(args[0], args[1]);
result = command.execute();
}
if(commandLine.hasOption("createfilter")){
String[] args = commandLine.getOptionValues("createfilter");
FilterCreator filter = null;
if(args.length == 1){
input = new Scanner(System.in);
ArrayList<String> additionalArguments = new ArrayList<String>();
System.out.println("Please input additional arguments for creating a filter. Enter 'done' or hit enter twice when finished.");
while(true){
System.out.print(">> ");
String line = input.nextLine().trim();
if(line.equals("done") || line.equals("")){
break;
}
System.out.println(line);
additionalArguments.add(line);
}
String[] arguments = new String[additionalArguments.size()];
arguments = additionalArguments.toArray(arguments);
filter = new FilterCreator(args[0],arguments);
}else{
String[] additionalArguments = new String[args.length-1];
for(int i = 0; i < additionalArguments.length; i++){
additionalArguments[i] = args[i+1];
}
filter = new FilterCreator(args[0],additionalArguments);
}
filter.uploadEntries();
}
if (commandLine.hasOption("sum")){
String[] stringNumbers = commandLine.getOptionValues("sum");
int sum = 0;
for(int i = 0; i < stringNumbers.length; i++){
sum += Integer.parseInt(stringNumbers[i]);
}
System.out.println(sum);
}
if (commandLine.hasOption("help")){
/*
* Expand to a more general help function
*/
System.out.println("hello\nn <arg>\nsum <arg0> <arg1> <arg2> ...");
}
}
catch (ParseException parsingException){
System.err.println("Could not find argument: " + parsingException.getMessage());
}
return result;
}
|
diff --git a/src/FE_SRC_COMMON/com/ForgeEssentials/playerLogger/types/blockChangeLog.java b/src/FE_SRC_COMMON/com/ForgeEssentials/playerLogger/types/blockChangeLog.java
index 476eb8b02..5ae4fab30 100644
--- a/src/FE_SRC_COMMON/com/ForgeEssentials/playerLogger/types/blockChangeLog.java
+++ b/src/FE_SRC_COMMON/com/ForgeEssentials/playerLogger/types/blockChangeLog.java
@@ -1,88 +1,88 @@
package com.ForgeEssentials.playerLogger.types;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import javax.sql.rowset.serial.SerialBlob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import com.ForgeEssentials.api.json.JSONObject;
import com.ForgeEssentials.api.snooper.TextFormatter;
import com.ForgeEssentials.playerLogger.ModulePlayerLogger;
import com.ForgeEssentials.util.OutputHandler;
public class blockChangeLog extends logEntry
{
public blockChangeLog(blockChangeLogCategory cat, EntityPlayer player, String block, int X, int Y, int Z, TileEntity te)
{
super();
SerialBlob teBlob = null;
if (te != null)
{
NBTTagCompound nbt = new NBTTagCompound();
te.writeToNBT(nbt);
try
{
teBlob = new SerialBlob(new JSONObject().put(te.getClass().getName(), TextFormatter.toJSONnbtComp(nbt).toString()).toString().getBytes());
}
catch (Exception e)
{
OutputHandler.severe(e);
e.printStackTrace();
}
}
try
{
PreparedStatement ps = ModulePlayerLogger.getConnection().prepareStatement(getprepareStatementSQL());
ps.setString(1, player.username);
ps.setString(2, cat.toString());
ps.setString(3, block);
ps.setInt(4, player.dimension);
- ps.setInt(5, Y);
+ ps.setInt(5, X);
ps.setInt(6, Y);
ps.setInt(7, Z);
ps.setTimestamp(8, time);
ps.setBlob(9, teBlob);
ps.execute();
ps.clearParameters();
ps.close();
}
catch (SQLException e)
{
e.printStackTrace();
}
}
public blockChangeLog()
{
super();
}
@Override
public String getName()
{
return "blockChange";
}
@Override
public String getTableCreateSQL()
{
return "CREATE TABLE IF NOT EXISTS " + getName() + "(id INT UNSIGNED NOT NULL AUTO_INCREMENT,PRIMARY KEY (id), player VARCHAR(32), category VARCHAR(32), block VARCHAR(32), Dim INT, X INT, Y INT, Z INT, time DATETIME, te LONGBLOB)";
}
@Override
public String getprepareStatementSQL()
{
return "INSERT INTO " + getName() + " (player, category, block, Dim, X, Y, Z, time, te) VALUES (?,?,?,?,?,?,?,?,?);";
}
public enum blockChangeLogCategory
{
broke, placed
}
}
| true | true | public blockChangeLog(blockChangeLogCategory cat, EntityPlayer player, String block, int X, int Y, int Z, TileEntity te)
{
super();
SerialBlob teBlob = null;
if (te != null)
{
NBTTagCompound nbt = new NBTTagCompound();
te.writeToNBT(nbt);
try
{
teBlob = new SerialBlob(new JSONObject().put(te.getClass().getName(), TextFormatter.toJSONnbtComp(nbt).toString()).toString().getBytes());
}
catch (Exception e)
{
OutputHandler.severe(e);
e.printStackTrace();
}
}
try
{
PreparedStatement ps = ModulePlayerLogger.getConnection().prepareStatement(getprepareStatementSQL());
ps.setString(1, player.username);
ps.setString(2, cat.toString());
ps.setString(3, block);
ps.setInt(4, player.dimension);
ps.setInt(5, Y);
ps.setInt(6, Y);
ps.setInt(7, Z);
ps.setTimestamp(8, time);
ps.setBlob(9, teBlob);
ps.execute();
ps.clearParameters();
ps.close();
}
catch (SQLException e)
{
e.printStackTrace();
}
}
| public blockChangeLog(blockChangeLogCategory cat, EntityPlayer player, String block, int X, int Y, int Z, TileEntity te)
{
super();
SerialBlob teBlob = null;
if (te != null)
{
NBTTagCompound nbt = new NBTTagCompound();
te.writeToNBT(nbt);
try
{
teBlob = new SerialBlob(new JSONObject().put(te.getClass().getName(), TextFormatter.toJSONnbtComp(nbt).toString()).toString().getBytes());
}
catch (Exception e)
{
OutputHandler.severe(e);
e.printStackTrace();
}
}
try
{
PreparedStatement ps = ModulePlayerLogger.getConnection().prepareStatement(getprepareStatementSQL());
ps.setString(1, player.username);
ps.setString(2, cat.toString());
ps.setString(3, block);
ps.setInt(4, player.dimension);
ps.setInt(5, X);
ps.setInt(6, Y);
ps.setInt(7, Z);
ps.setTimestamp(8, time);
ps.setBlob(9, teBlob);
ps.execute();
ps.clearParameters();
ps.close();
}
catch (SQLException e)
{
e.printStackTrace();
}
}
|
diff --git a/src/cn/iver/controller/TopicController.java b/src/cn/iver/controller/TopicController.java
index 62c1788..004d159 100644
--- a/src/cn/iver/controller/TopicController.java
+++ b/src/cn/iver/controller/TopicController.java
@@ -1,70 +1,70 @@
package cn.iver.controller;
import cn.iver.interceptor.AdminInterceptor;
import cn.iver.interceptor.LoginInterceptor;
import cn.iver.validator.PostValidator;
import cn.iver.validator.TopicValidator;
import cn.iver.model.Post;
import cn.iver.model.Topic;
import com.jfinal.aop.Before;
import cn.iver.ext.jfinal.Controller;
/**
* Created with IntelliJ IDEA.
* Author: iver
* Date: 13-3-28
*/
public class TopicController extends Controller {
public void index(){
forwardAction("/post/" + getParaToInt(0));
}
public void module(){
setAttr("topicPage", Topic.dao.getPageForModule(getParaToInt(0), getParaToInt(1, 1)));
setAttr("actionUrl", "/topic/module/" + getParaToInt(0) + "-");
render("/common/index.html");
}
public void hot(){
setAttr("topicPage", Topic.dao.getHotPage(getParaToInt(0, 1)));
setAttr("actionUrl", "/topic/hot/");
render("/common/index.html");
}
public void nice(){
setAttr("topicPage", Topic.dao.getNicePage(getParaToInt(0, 1)));
setAttr("actionUrl", "/topic/nice/");
render("/common/index.html");
}
@Before(LoginInterceptor.class)
public void add(){
render("/topic/add.html");
}
@Before({LoginInterceptor.class, TopicValidator.class, PostValidator.class})
public void save(){
Topic topic = getModel(Topic.class);
- topic.set("userID", getSessionAttr("userID")).set("topicID", null);
+ topic.set("userID", getSessionAttr("userID"));
Post post = getModel(Post.class);
post.set("userID", getSessionAttr("userID"));
topic.save(post);
redirect("/post/" + topic.getInt("id"));
}
@Before(AdminInterceptor.class)
public void edit(){
Topic topic = Topic.dao.get(getParaToInt(0));
setAttr("topic", topic);
render("/topic/edit.html");
}
@Before({AdminInterceptor.class, TopicValidator.class})
public void update(){
getModel(Topic.class, "id", "content", "moduleID").myUpdate();
redirect("/post/" + getParaToInt("topic.id"));
}
@Before(AdminInterceptor.class)
public void delete(){
Topic.dao.deleteByID(getParaToInt(0));
forwardAction("/admin/topicList/" + getParaToInt(1));
}
}
| true | true | public void save(){
Topic topic = getModel(Topic.class);
topic.set("userID", getSessionAttr("userID")).set("topicID", null);
Post post = getModel(Post.class);
post.set("userID", getSessionAttr("userID"));
topic.save(post);
redirect("/post/" + topic.getInt("id"));
}
| public void save(){
Topic topic = getModel(Topic.class);
topic.set("userID", getSessionAttr("userID"));
Post post = getModel(Post.class);
post.set("userID", getSessionAttr("userID"));
topic.save(post);
redirect("/post/" + topic.getInt("id"));
}
|
diff --git a/x10.compiler/src/x10c/ExtensionInfo.java b/x10.compiler/src/x10c/ExtensionInfo.java
index 610147385..4acc353d0 100644
--- a/x10.compiler/src/x10c/ExtensionInfo.java
+++ b/x10.compiler/src/x10c/ExtensionInfo.java
@@ -1,185 +1,187 @@
/*
* This file is part of the X10 project (http://x10-lang.org).
*
* This file is licensed to You under the Eclipse Public License (EPL);
* You may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.opensource.org/licenses/eclipse-1.0.php
*
* (C) Copyright IBM Corporation 2006-2010.
*/
package x10c;
import java.util.ArrayList;
import java.util.List;
import polyglot.ast.NodeFactory;
import polyglot.frontend.Compiler;
import polyglot.frontend.Goal;
import polyglot.frontend.Job;
import polyglot.frontend.Scheduler;
import polyglot.frontend.SourceGoal_c;
import polyglot.main.Options;
import polyglot.types.TypeSystem;
import polyglot.util.ErrorQueue;
import polyglot.visit.PostCompiled;
import x10.X10CompilerOptions;
import x10.visit.X10Translator;
import x10c.ast.X10CNodeFactory_c;
import x10c.types.X10CTypeSystem_c;
import x10c.visit.AsyncInitializer;
import x10c.visit.CastRemover;
import x10c.visit.ClosureRemover;
import x10c.visit.ClosuresToStaticMethods;
import x10c.visit.Desugarer;
import x10c.visit.ExpressionFlattenerForAtExpr;
import x10c.visit.InlineHelper;
import x10c.visit.JavaCaster;
import x10c.visit.RailInLoopOptimizer;
import x10c.visit.StaticInitializer;
import x10c.visit.RailInLoopOptimizer;
import x10c.visit.VarsBoxer;
public class ExtensionInfo extends x10.ExtensionInfo {
@Override
protected Scheduler createScheduler() {
return new X10CScheduler(this);
}
@Override
protected NodeFactory createNodeFactory() {
return new X10CNodeFactory_c(this);
}
@Override
protected TypeSystem createTypeSystem() {
return new X10CTypeSystem_c();
}
@Override
protected Options createOptions() {
return new X10CCompilerOptions(this);
}
public static class X10CScheduler extends X10Scheduler {
public X10CScheduler(ExtensionInfo extInfo) {
super(extInfo);
}
@Override
public List<Goal> goals(Job job) {
List<Goal> superGoals = super.goals(job);
ArrayList<Goal> goals = new ArrayList<Goal>(superGoals.size()+10);
for (Goal g : superGoals) {
if (g == Desugarer(job)) {
goals.add(ExpressionFlattenerForAtExpr(job));
goals.add(VarsBoxer(job));
}
if (g == CodeGenerated(job)) {
goals.add(JavaCodeGenStart(job));
-// goals.add(ClosuresToStaticMethods(job));
+ // TODO reenable XTENLANG-2061 (comment out the following)
+ goals.add(ClosuresToStaticMethods(job));
goals.add(StaticInitializer(job));
goals.add(AsyncInitializer(job));
- goals.add(ClosureRemoved(job));
+ // TODO reenable XTENLANG-2061 (uncomment the following)
+// goals.add(ClosureRemoved(job));
goals.add(RailInLoopOptimizer(job));
goals.add(CastsRemoved(job));
goals.add(JavaCaster(job));
goals.add(InlineHelped(job));
}
goals.add(g);
}
return goals;
}
protected Goal codegenPrereq(Job job) {
return InlineHelped(job);
}
@Override
public Goal Desugarer(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("Desugarer", job, new Desugarer(job, ts, nf)).intern(this);
}
@Override
protected Goal PostCompiled() {
return new PostCompiled(extInfo) {
protected boolean invokePostCompiler(Options options, Compiler compiler, ErrorQueue eq) {
if (System.getProperty("x10.postcompile", "TRUE").equals("FALSE"))
return true;
return X10Translator.postCompile((X10CompilerOptions)options, compiler, eq);
}
}.intern(this);
}
public Goal JavaCodeGenStart(Job job) {
Goal cg = new SourceGoal_c("JavaCodeGenStart", job) { // Is this still necessary?
private static final long serialVersionUID = 1L;
public boolean runTask() { return true; }
};
return cg.intern(this);
}
public Goal ClosuresToStaticMethods(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("ClosuresToStaticMethods", job, new ClosuresToStaticMethods(job, ts, nf)).intern(this);
}
public Goal ClosureRemoved(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("ClosureRemoved", job, new ClosureRemover(job, ts, nf)).intern(this);
}
private Goal RailInLoopOptimizer(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("RailInLoopOptimized", job, new RailInLoopOptimizer(job, ts, nf)).intern(this);
}
private Goal JavaCaster(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("JavaCasted", job, new JavaCaster(job, ts, nf)).intern(this);
}
private Goal CastsRemoved(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("CastsRemoved", job, new CastRemover(job, ts, nf)).intern(this);
}
private Goal InlineHelped(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("InlineHelped", job, new InlineHelper(job, ts, nf)).intern(this);
}
private Goal AsyncInitializer(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("AsyncInitialized", job, new AsyncInitializer(job, ts, nf)).intern(this);
}
private Goal StaticInitializer(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("StaticInitialized", job, new StaticInitializer(job, ts, nf)).intern(this);
}
private Goal VarsBoxer(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("VarsBoxed", job, new VarsBoxer(job, ts, nf)).intern(this);
}
private Goal ExpressionFlattenerForAtExpr(Job job) {
TypeSystem ts = extInfo.typeSystem();
NodeFactory nf = extInfo.nodeFactory();
return new ValidatingVisitorGoal("ExpressionFlattenerForAtExpr", job, new ExpressionFlattenerForAtExpr(job, ts, nf)).intern(this);
}
}
}
| false | true | public List<Goal> goals(Job job) {
List<Goal> superGoals = super.goals(job);
ArrayList<Goal> goals = new ArrayList<Goal>(superGoals.size()+10);
for (Goal g : superGoals) {
if (g == Desugarer(job)) {
goals.add(ExpressionFlattenerForAtExpr(job));
goals.add(VarsBoxer(job));
}
if (g == CodeGenerated(job)) {
goals.add(JavaCodeGenStart(job));
// goals.add(ClosuresToStaticMethods(job));
goals.add(StaticInitializer(job));
goals.add(AsyncInitializer(job));
goals.add(ClosureRemoved(job));
goals.add(RailInLoopOptimizer(job));
goals.add(CastsRemoved(job));
goals.add(JavaCaster(job));
goals.add(InlineHelped(job));
}
goals.add(g);
}
return goals;
}
| public List<Goal> goals(Job job) {
List<Goal> superGoals = super.goals(job);
ArrayList<Goal> goals = new ArrayList<Goal>(superGoals.size()+10);
for (Goal g : superGoals) {
if (g == Desugarer(job)) {
goals.add(ExpressionFlattenerForAtExpr(job));
goals.add(VarsBoxer(job));
}
if (g == CodeGenerated(job)) {
goals.add(JavaCodeGenStart(job));
// TODO reenable XTENLANG-2061 (comment out the following)
goals.add(ClosuresToStaticMethods(job));
goals.add(StaticInitializer(job));
goals.add(AsyncInitializer(job));
// TODO reenable XTENLANG-2061 (uncomment the following)
// goals.add(ClosureRemoved(job));
goals.add(RailInLoopOptimizer(job));
goals.add(CastsRemoved(job));
goals.add(JavaCaster(job));
goals.add(InlineHelped(job));
}
goals.add(g);
}
return goals;
}
|
diff --git a/src/org/bombusim/lime/activity/ChatActivity.java b/src/org/bombusim/lime/activity/ChatActivity.java
index 493a3eb..e64c580 100644
--- a/src/org/bombusim/lime/activity/ChatActivity.java
+++ b/src/org/bombusim/lime/activity/ChatActivity.java
@@ -1,629 +1,630 @@
/*
* Copyright (c) 2005-2011, Eugene Stahov ([email protected]),
* http://bombus-im.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package org.bombusim.lime.activity;
import java.security.InvalidParameterException;
import org.bombusim.lime.Lime;
import org.bombusim.lime.R;
import org.bombusim.lime.data.Chat;
import org.bombusim.lime.data.ChatHistoryDbAdapter;
import org.bombusim.lime.data.Contact;
import org.bombusim.lime.data.Message;
import org.bombusim.lime.data.Roster;
import org.bombusim.lime.service.XmppService;
import org.bombusim.lime.service.XmppServiceBinding;
import org.bombusim.lime.widgets.ChatEditText;
import org.bombusim.xmpp.handlers.ChatStates;
import org.bombusim.xmpp.handlers.MessageDispatcher;
import org.bombusim.xmpp.stanza.XmppPresence;
import org.bombusim.xmpp.stanza.XmppMessage;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.TypedArray;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.ClipboardManager;
import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.TextWatcher;
import android.text.format.Time;
import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.text.util.Linkify;
import android.view.ContextMenu;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnCreateContextMenuListener;
import android.view.ViewGroup;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.View.OnClickListener;
import android.view.View.OnKeyListener;
import android.view.Window;
import android.view.inputmethod.EditorInfo;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.BaseAdapter;
import android.widget.CursorAdapter;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast;
public class ChatActivity extends Activity {
public static final String MY_JID = "fromJid";
public static final String TO_JID = "toJid";
private String jid;
private String rJid;
private ChatEditText messageBox;
private ImageButton sendButton;
private ListView chatListView;
private View contactHead;
private XmppServiceBinding serviceBinding;
Contact visavis;
Chat chat;
String sentChatState;
protected String visavisNick;
protected String myNick;
/*
* called when android:launchMode="singleTop"
* single-chat mode, replaces existing chat;
* @see android.app.Activity#onNewIntent(android.content.Intent)
*/
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
attachToChat(intent);
}
private void attachToChat(Intent intent){
jid = intent.getStringExtra(TO_JID);
rJid = intent.getStringExtra(MY_JID);
if (jid == null || rJid ==null) throw new InvalidParameterException("No parameters specified for ChatActivity");
//TODO: move into ChatFactory
visavis = Lime.getInstance().getRoster().findContact(jid, rJid);
chat = Lime.getInstance().getChatFactory().getChat(jid, rJid);
updateContactBar();
contactHead.requestFocus(); //stealing focus from messageBox
}
private void updateContactBar() {
ImageView vAvatar = (ImageView) findViewById(R.id.rit_photo);
Bitmap avatar = visavis.getLazyAvatar(true);
if (avatar != null) {
vAvatar.setImageBitmap(avatar);
} else {
vAvatar.setImageResource(R.drawable.ic_contact_picture);
}
((TextView) findViewById(R.id.rit_jid))
.setText(visavis.getScreenName());
((TextView) findViewById(R.id.rit_presence))
.setText(visavis.getStatusMessage());
TypedArray si = getResources().obtainTypedArray(R.array.statusIcons);
Drawable std = si.getDrawable(visavis.getPresence());
((ImageView) findViewById(R.id.rit_statusIcon))
.setImageDrawable(std);
((ImageView) findViewById(R.id.composing))
.setVisibility( (chat.isComposing()) ? View.VISIBLE : View.GONE );
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.chat);
serviceBinding = new XmppServiceBinding(this);
contactHead = findViewById(R.id.contact_head);
messageBox = (ChatEditText) findViewById(R.id.messageBox);
sendButton = (ImageButton) findViewById(R.id.sendButton);
chatListView = (ListView) findViewById(R.id.chatListView);
registerForContextMenu(chatListView);
enableTrackballTraversing();
attachToChat(getIntent());
sendButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) { sendMessage(); }
});
//TODO: optional
messageBox.setOnKeyListener(new OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (event.getAction() != KeyEvent.ACTION_DOWN) return false; //filtering only KEY_DOWN
if (keyCode != KeyEvent.KEYCODE_ENTER) return false;
//if (event.isShiftPressed()) return false; //typing multiline messages with SHIFT+ENTER
sendMessage();
return true; //Key was processed
}
});
messageBox.addTextChangedListener(new TextWatcher() {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
@Override
public void afterTextChanged(Editable s) {
- sendChatState(ChatStates.COMPOSING);
+ if (s.length()>0)
+ sendChatState(ChatStates.COMPOSING);
}
});
//TODO: optional behavior
//messageBox.setImeActionLabel("Send", EditorInfo.IME_ACTION_SEND); //Keeps IME opened
messageBox.setImeActionLabel(getString(R.string.sendMessage), EditorInfo.IME_ACTION_DONE); //Closes IME
messageBox.setOnEditorActionListener(new OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
switch (actionId) {
case EditorInfo.IME_ACTION_SEND:
sendMessage();
return true;
case EditorInfo.IME_ACTION_DONE:
sendMessage();
return false; //let IME to be closed
}
return false;
}
});
}
@Override
public boolean onCreateOptionsMenu(android.view.Menu menu) {
getMenuInflater().inflate(R.menu.chat_menu, menu);
//TODO: enable items available only if logged in
return true;
};
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.closeChat:
Lime.getInstance().getChatFactory().closeChat(chat);
finish();
break;
case R.id.addSmile: messageBox.showAddSmileDialog(); break;
case R.id.addMe: messageBox.addMe(); break;
default: return true; // on submenu
}
return false;
}
@Override
public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo);
menu.setHeaderTitle(R.string.messageMenuTitle);
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.message_menu, menu);
}
@Override
public boolean onContextItemSelected(MenuItem item) {
AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
switch (item.getItemId()) {
case R.id.cmdCopy:
try {
String s = ((MessageView)(info.targetView)).toString();
// Gets a handle to the clipboard service.
ClipboardManager clipboard = (ClipboardManager)
getSystemService(Context.CLIPBOARD_SERVICE);
// Set the clipboard's primary clip.
clipboard.setText(s);
} catch (Exception e) {}
return true;
case R.id.cmdDelete:
chatListView.setVisibility(View.GONE);
chat.removeFromHistory(info.id);
refreshVisualContent();
return true;
default:
return super.onContextItemSelected(item);
}
}
private void enableTrackballTraversing() {
//TODO: http://stackoverflow.com/questions/2679948/focusable-edittext-inside-listview
chatListView.setItemsCanFocus(true);
}
private class ChatListAdapter extends CursorAdapter {
public ChatListAdapter(Context context, Cursor c) {
super(context, c);
}
@Override
public void bindView(View view, Context context, Cursor cursor) {
MessageView sv = (MessageView) view;
// TODO Auto-generated method stub
Message m = ChatHistoryDbAdapter.getMessageFromCursor(cursor);
String sender = (m.type == Message.TYPE_MESSAGE_OUT)? myNick : visavisNick ;
sv.setText(m.timestamp, sender, m.messageBody, m.type);
sv.setUnread(m.unread);
}
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
View v = new MessageView(context);
bindView(v, context, cursor);
return v;
}
}
// Time formatter
private Time tf=new Time(Time.getCurrentTimezone());
private final static long MS_PER_DAY = 1000*60*60*24;
private class MessageView extends LinearLayout {
public MessageView(Context context) {
super(context);
this.setOrientation(VERTICAL);
mMessageBody = new TextView(context);
//TODO: available in API 11
//mMessageBody.setTextIsSelectable(true);
addView(mMessageBody, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
}
public void setUnread(boolean unread) {
setBackgroundColor(Message.getBkColor(unread));
}
public void setText(long time, String sender, String message, int messageType) {
//TODO: smart time formatting
// 1 minute ago,
// hh:mm (after 1 hour)
// etc...
long delay = System.currentTimeMillis() - time;
String fmt = "%H:%M ";
if (delay > MS_PER_DAY) {
fmt = "%d.%m.%Y %H:%M ";
}
tf.set(time);
String tm=tf.format(fmt);
SpannableStringBuilder ss = new SpannableStringBuilder(tm);
int addrEnd=0;
if (message.startsWith("/me ")) {
message = "*" + message.replaceAll("(/me)(?:\\s|$)", sender+' ');;
} else {
ss.append('<').append(sender).append("> ");
}
addrEnd = ss.length()-1;
int color= Message.getColor(messageType);
ss.setSpan(new ForegroundColorSpan(color), 0, addrEnd, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
SpannableString msg = new SpannableString(message);
Linkify.addLinks(msg, Linkify.EMAIL_ADDRESSES | Linkify.WEB_URLS);
Lime.getInstance().getSmilify().addSmiles(msg);
ss.append(msg);
mMessageBody.setText(ss);
mMessageBody.setMovementMethod(LinkMovementMethod.getInstance());
}
@Override
public String toString() {
return mMessageBody.getText().toString();
}
private TextView mMessageBody;
}
protected void sendMessage() {
String text = messageBox.getText().toString();
//avoid sending of empty messages
if (text.length() == 0) return;
String to = visavis.getJid();
Message out = new Message(Message.TYPE_MESSAGE_OUT, to, text);
chat.addMessage(out);
//TODO: resource magic
XmppMessage msg = new XmppMessage(to, text, null, false);
msg.setAttribute("id", String.valueOf(out.getId()) );
//TODO: optional delivery confirmation request
msg.addChildNs("request", MessageDispatcher.URN_XMPP_RECEIPTS);
//TODO: optional chat state notifications
msg.addChildNs(ChatStates.ACTIVE, ChatStates.XMLNS_CHATSTATES);
sentChatState = ChatStates.ACTIVE;
//TODO: message queue
if ( serviceBinding.sendStanza(visavis.getRosterJid(), msg) ) {
//clear box after success sending
messageBox.setText("");
if (visavis.getPresence() == XmppPresence.PRESENCE_OFFLINE) {
Toast.makeText(this, R.string.chatSentOffline, Toast.LENGTH_LONG).show();
}
} else {
Toast.makeText(this, R.string.shouldBeLoggedIn, Toast.LENGTH_LONG).show();
//not sent - removing from history
chat.removeFromHistory(out.getId());
}
refreshVisualContent();
}
protected void sendChatState(String state) {
//TODO: optional chat state notifications
if (!chat.acceptComposingEvents()) return;
if (state.equals(sentChatState)) return; //no duplicates
//state machine check: composing->paused
if (state.equals(ChatStates.PAUSED))
if (!ChatStates.COMPOSING.equals(sentChatState)) return;
if ( visavis.getPresence() == XmppPresence.PRESENCE_OFFLINE ) return;
String to = visavis.getJid();
//TODO: resource magic
XmppMessage msg = new XmppMessage(to);
//msg.setAttribute("id", "chatState");
msg.addChildNs(state, ChatStates.XMLNS_CHATSTATES);
sentChatState = state;
serviceBinding.sendStanza(visavis.getRosterJid(), msg);
}
private class ChatBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
refreshVisualContent();
}
}
private class DeliveredReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
Toast.makeText(ChatActivity.this, R.string.messageDelivered, Toast.LENGTH_SHORT).show();
}
}
private class PresenceReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
String jid = intent.getStringExtra("param");
if (jid==null || visavis.getJid().equals(jid) ) {
updateContactBar();
}
}
}
private PresenceReceiver bcPresence;
private ChatBroadcastReceiver bcUpdateChat;
private DeliveredReceiver bcDelivered;
@Override
protected void onResume() {
//TODO: refresh message list, focus to last unread
serviceBinding.doBindService();
visavisNick = visavis.getScreenName();
//TODO: get my nick
myNick = "Me"; //serviceBinding.getXmppStream(visavis.getRosterJid()).jid;
refreshVisualContent();
BaseAdapter ca = (BaseAdapter) (chatListView.getAdapter());
chatListView.setSelection(ca.getCount()-1);
bcUpdateChat = new ChatBroadcastReceiver();
//TODO: presence receiver
registerReceiver(bcUpdateChat, new IntentFilter(Chat.UPDATE_CHAT));
bcDelivered = new DeliveredReceiver();
registerReceiver(bcDelivered, new IntentFilter(Chat.DELIVERED));
bcPresence = new PresenceReceiver();
registerReceiver(bcPresence, new IntentFilter(Roster.UPDATE_CONTACT));
String s = chat.getSuspendedText();
if (s!=null) {
messageBox.setText(s);
}
messageBox.setDialogHostActivity(this);
super.onResume();
}
public void refreshVisualContent() {
chatListView.setVisibility(View.GONE);
Cursor c = chat.getCursor();
CursorAdapter ca = (CursorAdapter) (chatListView.getAdapter());
if (ca == null) {
ca = new ChatListAdapter(this, c);
chatListView.setAdapter(ca);
startManagingCursor(c);
} else {
//TODO: detach old cursor
ca.changeCursor(c);
startManagingCursor(c);
ca.notifyDataSetChanged();
chatListView.invalidate();
}
chatListView.setVisibility(View.VISIBLE);
//Move focus to last message is now provided with transcript mode
//chatListView.setSelection(chatSize-1);
}
@Override
protected void onPause() {
chat.saveSuspendedText(messageBox.getText().toString());
sendChatState(ChatStates.PAUSED);
serviceBinding.doUnbindService();
unregisterReceiver(bcUpdateChat);
unregisterReceiver(bcDelivered);
unregisterReceiver(bcPresence);
markAllRead();
//avoid memory leak
messageBox.setDialogHostActivity(null);
super.onPause();
}
private void markAllRead() {
synchronized(visavis) {
int unreadCount = visavis.getUnread();
visavis.setUnread(0);
CursorAdapter ca = (CursorAdapter) chatListView.getAdapter();
Cursor cursor = ca.getCursor();
if (cursor.moveToLast()) do {
Message m = ChatHistoryDbAdapter.getMessageFromCursor(cursor);
if (m.unread) {
chat.markRead(m.getId());
Lime.getInstance().notificationMgr().cancelChatNotification(m.getId());
unreadCount--;
}
} while ( (unreadCount != 0) && cursor.moveToPrevious());
}
}
}
| true | true | protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.chat);
serviceBinding = new XmppServiceBinding(this);
contactHead = findViewById(R.id.contact_head);
messageBox = (ChatEditText) findViewById(R.id.messageBox);
sendButton = (ImageButton) findViewById(R.id.sendButton);
chatListView = (ListView) findViewById(R.id.chatListView);
registerForContextMenu(chatListView);
enableTrackballTraversing();
attachToChat(getIntent());
sendButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) { sendMessage(); }
});
//TODO: optional
messageBox.setOnKeyListener(new OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (event.getAction() != KeyEvent.ACTION_DOWN) return false; //filtering only KEY_DOWN
if (keyCode != KeyEvent.KEYCODE_ENTER) return false;
//if (event.isShiftPressed()) return false; //typing multiline messages with SHIFT+ENTER
sendMessage();
return true; //Key was processed
}
});
messageBox.addTextChangedListener(new TextWatcher() {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
@Override
public void afterTextChanged(Editable s) {
sendChatState(ChatStates.COMPOSING);
}
});
//TODO: optional behavior
//messageBox.setImeActionLabel("Send", EditorInfo.IME_ACTION_SEND); //Keeps IME opened
messageBox.setImeActionLabel(getString(R.string.sendMessage), EditorInfo.IME_ACTION_DONE); //Closes IME
messageBox.setOnEditorActionListener(new OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
switch (actionId) {
case EditorInfo.IME_ACTION_SEND:
sendMessage();
return true;
case EditorInfo.IME_ACTION_DONE:
sendMessage();
return false; //let IME to be closed
}
return false;
}
});
}
| protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.chat);
serviceBinding = new XmppServiceBinding(this);
contactHead = findViewById(R.id.contact_head);
messageBox = (ChatEditText) findViewById(R.id.messageBox);
sendButton = (ImageButton) findViewById(R.id.sendButton);
chatListView = (ListView) findViewById(R.id.chatListView);
registerForContextMenu(chatListView);
enableTrackballTraversing();
attachToChat(getIntent());
sendButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) { sendMessage(); }
});
//TODO: optional
messageBox.setOnKeyListener(new OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (event.getAction() != KeyEvent.ACTION_DOWN) return false; //filtering only KEY_DOWN
if (keyCode != KeyEvent.KEYCODE_ENTER) return false;
//if (event.isShiftPressed()) return false; //typing multiline messages with SHIFT+ENTER
sendMessage();
return true; //Key was processed
}
});
messageBox.addTextChangedListener(new TextWatcher() {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
@Override
public void afterTextChanged(Editable s) {
if (s.length()>0)
sendChatState(ChatStates.COMPOSING);
}
});
//TODO: optional behavior
//messageBox.setImeActionLabel("Send", EditorInfo.IME_ACTION_SEND); //Keeps IME opened
messageBox.setImeActionLabel(getString(R.string.sendMessage), EditorInfo.IME_ACTION_DONE); //Closes IME
messageBox.setOnEditorActionListener(new OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
switch (actionId) {
case EditorInfo.IME_ACTION_SEND:
sendMessage();
return true;
case EditorInfo.IME_ACTION_DONE:
sendMessage();
return false; //let IME to be closed
}
return false;
}
});
}
|
diff --git a/src/com/android/bluetooth/pan/PanService.java b/src/com/android/bluetooth/pan/PanService.java
index 5184517..e851433 100755
--- a/src/com/android/bluetooth/pan/PanService.java
+++ b/src/com/android/bluetooth/pan/PanService.java
@@ -1,559 +1,560 @@
/*
* Copyright (C) 2012 Google Inc.
*/
package com.android.bluetooth.pan;
import android.app.Service;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothTetheringDataTracker;
import android.bluetooth.IBluetooth;
import android.bluetooth.IBluetoothPan;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Resources.NotFoundException;
import android.net.ConnectivityManager;
import android.net.InterfaceConfiguration;
import android.net.LinkAddress;
import android.net.NetworkUtils;
import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.Handler;
import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.provider.Settings;
import android.util.Log;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.ProfileService;
/**
* Provides Bluetooth Pan Device profile, as a service in
* the Bluetooth application.
* @hide
*/
public class PanService extends ProfileService {
private static final String TAG = "PanService";
private static final boolean DBG = true;
private static final String BLUETOOTH_IFACE_ADDR_START= "192.168.44.1";
private static final int BLUETOOTH_MAX_PAN_CONNECTIONS = 5;
private static final int BLUETOOTH_PREFIX_LENGTH = 24;
private HashMap<BluetoothDevice, BluetoothPanDevice> mPanDevices;
private ArrayList<String> mBluetoothIfaceAddresses;
private int mMaxPanDevices;
private String mPanIfName;
private boolean mNativeAvailable;
private static final int MESSAGE_CONNECT = 1;
private static final int MESSAGE_DISCONNECT = 2;
private static final int MESSAGE_CONNECT_STATE_CHANGED = 11;
private boolean mTetherOn = false;
static {
classInitNative();
}
protected String getName() {
return TAG;
}
public IProfileServiceBinder initBinder() {
return new BluetoothPanBinder(this);
}
protected boolean start() {
mPanDevices = new HashMap<BluetoothDevice, BluetoothPanDevice>();
mBluetoothIfaceAddresses = new ArrayList<String>();
try {
mMaxPanDevices = getResources().getInteger(
com.android.internal.R.integer.config_max_pan_devices);
} catch (NotFoundException e) {
mMaxPanDevices = BLUETOOTH_MAX_PAN_CONNECTIONS;
}
initializeNative();
mNativeAvailable=true;
return true;
}
protected boolean stop() {
mHandler.removeCallbacksAndMessages(null);
return true;
}
protected boolean cleanup() {
if (mNativeAvailable) {
cleanupNative();
mNativeAvailable=false;
}
if(mPanDevices != null) {
List<BluetoothDevice> DevList = getConnectedDevices();
for(BluetoothDevice dev : DevList) {
handlePanDeviceStateChange(dev, mPanIfName, BluetoothProfile.STATE_DISCONNECTED,
BluetoothPan.LOCAL_PANU_ROLE, BluetoothPan.REMOTE_NAP_ROLE);
}
mPanDevices.clear();
mPanDevices = null;
}
if(mBluetoothIfaceAddresses != null) {
mBluetoothIfaceAddresses.clear();
mBluetoothIfaceAddresses = null;
}
if(mPanIfName != null)
mPanIfName = null;
return true;
}
private final Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
case MESSAGE_CONNECT:
{
BluetoothDevice device = (BluetoothDevice) msg.obj;
if (!connectPanNative(Utils.getByteAddress(device), BluetoothPan.LOCAL_PANU_ROLE, BluetoothPan.REMOTE_NAP_ROLE)) {
handlePanDeviceStateChange(device, null, BluetoothProfile.STATE_CONNECTING,
BluetoothPan.LOCAL_PANU_ROLE, BluetoothPan.REMOTE_NAP_ROLE);
handlePanDeviceStateChange(device, null, BluetoothProfile.STATE_DISCONNECTED,
BluetoothPan.LOCAL_PANU_ROLE, BluetoothPan.REMOTE_NAP_ROLE);
break;
}
}
break;
case MESSAGE_DISCONNECT:
{
BluetoothDevice device = (BluetoothDevice) msg.obj;
if (!disconnectPanNative(Utils.getByteAddress(device)) ) {
handlePanDeviceStateChange(device, mPanIfName, BluetoothProfile.STATE_DISCONNECTING,
BluetoothPan.LOCAL_PANU_ROLE, BluetoothPan.REMOTE_NAP_ROLE);
handlePanDeviceStateChange(device, mPanIfName, BluetoothProfile.STATE_DISCONNECTED,
BluetoothPan.LOCAL_PANU_ROLE, BluetoothPan.REMOTE_NAP_ROLE);
break;
}
}
break;
case MESSAGE_CONNECT_STATE_CHANGED:
{
ConnectState cs = (ConnectState)msg.obj;
BluetoothDevice device = getDevice(cs.addr);
// TBD get iface from the msg
if (DBG) log("MESSAGE_CONNECT_STATE_CHANGED: " + device + " state: " + cs.state);
handlePanDeviceStateChange(device, mPanIfName /* iface */, convertHalState(cs.state),
cs.local_role, cs.remote_role);
}
break;
}
}
};
/**
* Handlers for incoming service calls
*/
private static class BluetoothPanBinder extends IBluetoothPan.Stub implements IProfileServiceBinder {
private PanService mService;
public BluetoothPanBinder(PanService svc) {
mService = svc;
}
public boolean cleanup() {
mService = null;
return true;
}
private PanService getService() {
if (mService != null && mService.isAvailable()) {
return mService;
}
return null;
}
public boolean connect(BluetoothDevice device) {
PanService service = getService();
if (service == null) return false;
return service.connect(device);
}
public boolean disconnect(BluetoothDevice device) {
PanService service = getService();
if (service == null) return false;
return service.disconnect(device);
}
public int getConnectionState(BluetoothDevice device) {
PanService service = getService();
if (service == null) return BluetoothPan.STATE_DISCONNECTED;
return service.getConnectionState(device);
}
private boolean isPanNapOn() {
PanService service = getService();
if (service == null) return false;
return service.isPanNapOn();
}
private boolean isPanUOn() {
if(DBG) Log.d(TAG, "isTetheringOn call getPanLocalRoleNative");
PanService service = getService();
return service.isPanUOn();
}
public boolean isTetheringOn() {
// TODO(BT) have a variable marking the on/off state
PanService service = getService();
if (service == null) return false;
return service.isTetheringOn();
}
public void setBluetoothTethering(boolean value) {
PanService service = getService();
if (service == null) return;
if(DBG) Log.d(TAG, "setBluetoothTethering: " + value +", mTetherOn: " + service.mTetherOn);
service.setBluetoothTethering(value);
}
public List<BluetoothDevice> getConnectedDevices() {
PanService service = getService();
if (service == null) return new ArrayList<BluetoothDevice>(0);
return service.getConnectedDevices();
}
public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
PanService service = getService();
if (service == null) return new ArrayList<BluetoothDevice>(0);
return service.getDevicesMatchingConnectionStates(states);
}
};
boolean connect(BluetoothDevice device) {
enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
if (getConnectionState(device) != BluetoothProfile.STATE_DISCONNECTED) {
Log.e(TAG, "Pan Device not disconnected: " + device);
return false;
}
Message msg = mHandler.obtainMessage(MESSAGE_CONNECT,device);
mHandler.sendMessage(msg);
return true;
}
boolean disconnect(BluetoothDevice device) {
enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
Message msg = mHandler.obtainMessage(MESSAGE_DISCONNECT,device);
mHandler.sendMessage(msg);
return true;
}
int getConnectionState(BluetoothDevice device) {
BluetoothPanDevice panDevice = mPanDevices.get(device);
if (panDevice == null) {
return BluetoothPan.STATE_DISCONNECTED;
}
return panDevice.mState;
}
boolean isPanNapOn() {
if(DBG) Log.d(TAG, "isTetheringOn call getPanLocalRoleNative");
return (getPanLocalRoleNative() & BluetoothPan.LOCAL_NAP_ROLE) != 0;
}
boolean isPanUOn() {
if(DBG) Log.d(TAG, "isTetheringOn call getPanLocalRoleNative");
return (getPanLocalRoleNative() & BluetoothPan.LOCAL_PANU_ROLE) != 0;
}
boolean isTetheringOn() {
// TODO(BT) have a variable marking the on/off state
return mTetherOn;
}
void setBluetoothTethering(boolean value) {
if(DBG) Log.d(TAG, "setBluetoothTethering: " + value +", mTetherOn: " + mTetherOn);
enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");
if(mTetherOn != value) {
//drop any existing panu or pan-nap connection when changing the tethering state
mTetherOn = value;
List<BluetoothDevice> DevList = getConnectedDevices();
for(BluetoothDevice dev : DevList)
disconnect(dev);
}
}
List<BluetoothDevice> getConnectedDevices() {
enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
List<BluetoothDevice> devices = getDevicesMatchingConnectionStates(
new int[] {BluetoothProfile.STATE_CONNECTED});
return devices;
}
List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
List<BluetoothDevice> panDevices = new ArrayList<BluetoothDevice>();
for (BluetoothDevice device: mPanDevices.keySet()) {
int panDeviceState = getConnectionState(device);
for (int state : states) {
if (state == panDeviceState) {
panDevices.add(device);
break;
}
}
}
return panDevices;
}
static protected class ConnectState {
public ConnectState(byte[] address, int state, int error, int local_role, int remote_role) {
this.addr = address;
this.state = state;
this.error = error;
this.local_role = local_role;
this.remote_role = remote_role;
}
byte[] addr;
int state;
int error;
int local_role;
int remote_role;
};
private void onConnectStateChanged(byte[] address, int state, int error, int local_role, int remote_role) {
if (DBG) log("onConnectStateChanged: " + state + ", local role:" + local_role + ", remote_role: " + remote_role);
Message msg = mHandler.obtainMessage(MESSAGE_CONNECT_STATE_CHANGED);
msg.obj = new ConnectState(address, state, error, local_role, remote_role);
mHandler.sendMessage(msg);
}
private void onControlStateChanged(int local_role, int state, int error, String ifname) {
if (DBG)
log("onControlStateChanged: " + state + ", error: " + error + ", ifname: " + ifname);
if(error == 0)
mPanIfName = ifname;
}
private static int convertHalState(int halState) {
switch (halState) {
case CONN_STATE_CONNECTED:
return BluetoothProfile.STATE_CONNECTED;
case CONN_STATE_CONNECTING:
return BluetoothProfile.STATE_CONNECTING;
case CONN_STATE_DISCONNECTED:
return BluetoothProfile.STATE_DISCONNECTED;
case CONN_STATE_DISCONNECTING:
return BluetoothProfile.STATE_DISCONNECTING;
default:
Log.e(TAG, "bad pan connection state: " + halState);
return BluetoothProfile.STATE_DISCONNECTED;
}
}
void handlePanDeviceStateChange(BluetoothDevice device,
String iface, int state, int local_role, int remote_role) {
if(DBG) Log.d(TAG, "handlePanDeviceStateChange: device: " + device + ", iface: " + iface +
", state: " + state + ", local_role:" + local_role + ", remote_role:" + remote_role);
int prevState;
String ifaceAddr = null;
BluetoothPanDevice panDevice = mPanDevices.get(device);
if (panDevice == null) {
prevState = BluetoothProfile.STATE_DISCONNECTED;
} else {
prevState = panDevice.mState;
ifaceAddr = panDevice.mIfaceAddr;
}
Log.d(TAG, "handlePanDeviceStateChange preState: " + prevState + " state: " + state);
if (prevState == state) return;
if (remote_role == BluetoothPan.LOCAL_PANU_ROLE) {
- Log.d(TAG, "handlePanDeviceStateChange LOCAL_NAP_ROLE:REMOTE_PANU_ROLE");
if (state == BluetoothProfile.STATE_CONNECTED) {
- if(!mTetherOn) {
- Log.d(TAG, "handlePanDeviceStateChange bluetooth tethering is off, drop the connection");
+ if((!mTetherOn)||(local_role == BluetoothPan.LOCAL_PANU_ROLE)){
+ Log.d(TAG,"handlePanDeviceStateChange BT tethering is off/Local role is PANU "+
+ "drop the connection");
disconnectPanNative(Utils.getByteAddress(device));
return;
}
+ Log.d(TAG, "handlePanDeviceStateChange LOCAL_NAP_ROLE:REMOTE_PANU_ROLE");
ifaceAddr = enableTethering(iface);
if (ifaceAddr == null) Log.e(TAG, "Error seting up tether interface");
} else if (state == BluetoothProfile.STATE_DISCONNECTED) {
if (ifaceAddr != null) {
mBluetoothIfaceAddresses.remove(ifaceAddr);
ifaceAddr = null;
}
}
} else {
// PANU Role = reverse Tether
Log.d(TAG, "handlePanDeviceStateChange LOCAL_PANU_ROLE:REMOTE_NAP_ROLE");
if (state == BluetoothProfile.STATE_CONNECTED) {
if(DBG) Log.d(TAG, "handlePanDeviceStateChange: panu STATE_CONNECTED, startReverseTether");
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
INetworkManagementService service = INetworkManagementService.Stub.asInterface(b);
Log.d(TAG, "call INetworkManagementService.startReverseTethering()");
try {
service.startReverseTethering(iface);
} catch (Exception e) {
Log.e(TAG, "Cannot start reverse tethering: " + e);
return;
}
} else if (state == BluetoothProfile.STATE_DISCONNECTED &&
(prevState == BluetoothProfile.STATE_CONNECTED ||
prevState == BluetoothProfile.STATE_DISCONNECTING)) {
if(DBG) Log.d(TAG, "handlePanDeviceStateChange: stopReverseTether, panDevice.mIface: "
+ panDevice.mIface);
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
INetworkManagementService service = INetworkManagementService.Stub.asInterface(b);
try {
service.stopReverseTethering();
} catch(Exception e) {
Log.e(TAG, "Cannot stop reverse tethering: " + e);
return;
}
}
}
if (panDevice == null) {
panDevice = new BluetoothPanDevice(state, ifaceAddr, iface, local_role);
mPanDevices.put(device, panDevice);
} else {
panDevice.mState = state;
panDevice.mIfaceAddr = ifaceAddr;
panDevice.mLocalRole = local_role;
panDevice.mIface = iface;
}
/* Notifying the connection state change of the profile before sending the intent for
connection state change, as it was causing a race condition, with the UI not being
updated with the correct connection state. */
if (DBG) Log.d(TAG, "Pan Device state : device: " + device + " State:" +
prevState + "->" + state);
notifyProfileConnectionStateChanged(device, BluetoothProfile.PAN, state, prevState);
Intent intent = new Intent(BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
intent.putExtra(BluetoothPan.EXTRA_PREVIOUS_STATE, prevState);
intent.putExtra(BluetoothPan.EXTRA_STATE, state);
intent.putExtra(BluetoothPan.EXTRA_LOCAL_ROLE, local_role);
sendBroadcast(intent, BLUETOOTH_PERM);
}
// configured when we start tethering
private String enableTethering(String iface) {
if (DBG) Log.d(TAG, "updateTetherState:" + iface);
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
INetworkManagementService service = INetworkManagementService.Stub.asInterface(b);
ConnectivityManager cm =
(ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
String[] bluetoothRegexs = cm.getTetherableBluetoothRegexs();
// bring toggle the interfaces
String[] currentIfaces = new String[0];
try {
currentIfaces = service.listInterfaces();
} catch (Exception e) {
Log.e(TAG, "Error listing Interfaces :" + e);
return null;
}
boolean found = false;
for (String currIface: currentIfaces) {
if (currIface.equals(iface)) {
found = true;
break;
}
}
if (!found) return null;
String address = createNewTetheringAddressLocked();
if (address == null) return null;
InterfaceConfiguration ifcg = null;
try {
ifcg = service.getInterfaceConfig(iface);
if (ifcg != null) {
InetAddress addr = null;
LinkAddress linkAddr = ifcg.getLinkAddress();
if (linkAddr == null || (addr = linkAddr.getAddress()) == null ||
addr.equals(NetworkUtils.numericToInetAddress("0.0.0.0")) ||
addr.equals(NetworkUtils.numericToInetAddress("::0"))) {
addr = NetworkUtils.numericToInetAddress(address);
}
ifcg.setInterfaceUp();
ifcg.setLinkAddress(new LinkAddress(addr, BLUETOOTH_PREFIX_LENGTH));
ifcg.clearFlag("running");
// TODO(BT) ifcg.interfaceFlags = ifcg.interfaceFlags.replace(" "," ");
service.setInterfaceConfig(iface, ifcg);
if (cm.tether(iface) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {
Log.e(TAG, "Error tethering "+iface);
}
}
} catch (Exception e) {
Log.e(TAG, "Error configuring interface " + iface + ", :" + e);
return null;
}
return address;
}
private String createNewTetheringAddressLocked() {
if (getConnectedPanDevices().size() == mMaxPanDevices) {
if (DBG) Log.d(TAG, "Max PAN device connections reached");
return null;
}
String address = BLUETOOTH_IFACE_ADDR_START;
while (true) {
if (mBluetoothIfaceAddresses.contains(address)) {
String[] addr = address.split("\\.");
Integer newIp = Integer.parseInt(addr[2]) + 1;
address = address.replace(addr[2], newIp.toString());
} else {
break;
}
}
mBluetoothIfaceAddresses.add(address);
return address;
}
private List<BluetoothDevice> getConnectedPanDevices() {
List<BluetoothDevice> devices = new ArrayList<BluetoothDevice>();
for (BluetoothDevice device: mPanDevices.keySet()) {
if (getPanDeviceConnectionState(device) == BluetoothProfile.STATE_CONNECTED) {
devices.add(device);
}
}
return devices;
}
private int getPanDeviceConnectionState(BluetoothDevice device) {
BluetoothPanDevice panDevice = mPanDevices.get(device);
if (panDevice == null) {
return BluetoothProfile.STATE_DISCONNECTED;
}
return panDevice.mState;
}
private class BluetoothPanDevice {
private int mState;
private String mIfaceAddr;
private String mIface;
private int mLocalRole; // Which local role is this PAN device bound to
BluetoothPanDevice(int state, String ifaceAddr, String iface, int localRole) {
mState = state;
mIfaceAddr = ifaceAddr;
mIface = iface;
mLocalRole = localRole;
}
}
// Constants matching Hal header file bt_hh.h
// bthh_connection_state_t
private final static int CONN_STATE_CONNECTED = 0;
private final static int CONN_STATE_CONNECTING = 1;
private final static int CONN_STATE_DISCONNECTED = 2;
private final static int CONN_STATE_DISCONNECTING = 3;
private native static void classInitNative();
private native void initializeNative();
private native void cleanupNative();
private native boolean connectPanNative(byte[] btAddress, int local_role, int remote_role);
private native boolean disconnectPanNative(byte[] btAddress);
private native boolean enablePanNative(int local_role);
private native int getPanLocalRoleNative();
}
| false | true | void handlePanDeviceStateChange(BluetoothDevice device,
String iface, int state, int local_role, int remote_role) {
if(DBG) Log.d(TAG, "handlePanDeviceStateChange: device: " + device + ", iface: " + iface +
", state: " + state + ", local_role:" + local_role + ", remote_role:" + remote_role);
int prevState;
String ifaceAddr = null;
BluetoothPanDevice panDevice = mPanDevices.get(device);
if (panDevice == null) {
prevState = BluetoothProfile.STATE_DISCONNECTED;
} else {
prevState = panDevice.mState;
ifaceAddr = panDevice.mIfaceAddr;
}
Log.d(TAG, "handlePanDeviceStateChange preState: " + prevState + " state: " + state);
if (prevState == state) return;
if (remote_role == BluetoothPan.LOCAL_PANU_ROLE) {
Log.d(TAG, "handlePanDeviceStateChange LOCAL_NAP_ROLE:REMOTE_PANU_ROLE");
if (state == BluetoothProfile.STATE_CONNECTED) {
if(!mTetherOn) {
Log.d(TAG, "handlePanDeviceStateChange bluetooth tethering is off, drop the connection");
disconnectPanNative(Utils.getByteAddress(device));
return;
}
ifaceAddr = enableTethering(iface);
if (ifaceAddr == null) Log.e(TAG, "Error seting up tether interface");
} else if (state == BluetoothProfile.STATE_DISCONNECTED) {
if (ifaceAddr != null) {
mBluetoothIfaceAddresses.remove(ifaceAddr);
ifaceAddr = null;
}
}
} else {
// PANU Role = reverse Tether
Log.d(TAG, "handlePanDeviceStateChange LOCAL_PANU_ROLE:REMOTE_NAP_ROLE");
if (state == BluetoothProfile.STATE_CONNECTED) {
if(DBG) Log.d(TAG, "handlePanDeviceStateChange: panu STATE_CONNECTED, startReverseTether");
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
INetworkManagementService service = INetworkManagementService.Stub.asInterface(b);
Log.d(TAG, "call INetworkManagementService.startReverseTethering()");
try {
service.startReverseTethering(iface);
} catch (Exception e) {
Log.e(TAG, "Cannot start reverse tethering: " + e);
return;
}
} else if (state == BluetoothProfile.STATE_DISCONNECTED &&
(prevState == BluetoothProfile.STATE_CONNECTED ||
prevState == BluetoothProfile.STATE_DISCONNECTING)) {
if(DBG) Log.d(TAG, "handlePanDeviceStateChange: stopReverseTether, panDevice.mIface: "
+ panDevice.mIface);
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
INetworkManagementService service = INetworkManagementService.Stub.asInterface(b);
try {
service.stopReverseTethering();
} catch(Exception e) {
Log.e(TAG, "Cannot stop reverse tethering: " + e);
return;
}
}
}
if (panDevice == null) {
panDevice = new BluetoothPanDevice(state, ifaceAddr, iface, local_role);
mPanDevices.put(device, panDevice);
} else {
panDevice.mState = state;
panDevice.mIfaceAddr = ifaceAddr;
panDevice.mLocalRole = local_role;
panDevice.mIface = iface;
}
/* Notifying the connection state change of the profile before sending the intent for
connection state change, as it was causing a race condition, with the UI not being
updated with the correct connection state. */
if (DBG) Log.d(TAG, "Pan Device state : device: " + device + " State:" +
prevState + "->" + state);
notifyProfileConnectionStateChanged(device, BluetoothProfile.PAN, state, prevState);
Intent intent = new Intent(BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
intent.putExtra(BluetoothPan.EXTRA_PREVIOUS_STATE, prevState);
intent.putExtra(BluetoothPan.EXTRA_STATE, state);
intent.putExtra(BluetoothPan.EXTRA_LOCAL_ROLE, local_role);
sendBroadcast(intent, BLUETOOTH_PERM);
}
| void handlePanDeviceStateChange(BluetoothDevice device,
String iface, int state, int local_role, int remote_role) {
if(DBG) Log.d(TAG, "handlePanDeviceStateChange: device: " + device + ", iface: " + iface +
", state: " + state + ", local_role:" + local_role + ", remote_role:" + remote_role);
int prevState;
String ifaceAddr = null;
BluetoothPanDevice panDevice = mPanDevices.get(device);
if (panDevice == null) {
prevState = BluetoothProfile.STATE_DISCONNECTED;
} else {
prevState = panDevice.mState;
ifaceAddr = panDevice.mIfaceAddr;
}
Log.d(TAG, "handlePanDeviceStateChange preState: " + prevState + " state: " + state);
if (prevState == state) return;
if (remote_role == BluetoothPan.LOCAL_PANU_ROLE) {
if (state == BluetoothProfile.STATE_CONNECTED) {
if((!mTetherOn)||(local_role == BluetoothPan.LOCAL_PANU_ROLE)){
Log.d(TAG,"handlePanDeviceStateChange BT tethering is off/Local role is PANU "+
"drop the connection");
disconnectPanNative(Utils.getByteAddress(device));
return;
}
Log.d(TAG, "handlePanDeviceStateChange LOCAL_NAP_ROLE:REMOTE_PANU_ROLE");
ifaceAddr = enableTethering(iface);
if (ifaceAddr == null) Log.e(TAG, "Error seting up tether interface");
} else if (state == BluetoothProfile.STATE_DISCONNECTED) {
if (ifaceAddr != null) {
mBluetoothIfaceAddresses.remove(ifaceAddr);
ifaceAddr = null;
}
}
} else {
// PANU Role = reverse Tether
Log.d(TAG, "handlePanDeviceStateChange LOCAL_PANU_ROLE:REMOTE_NAP_ROLE");
if (state == BluetoothProfile.STATE_CONNECTED) {
if(DBG) Log.d(TAG, "handlePanDeviceStateChange: panu STATE_CONNECTED, startReverseTether");
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
INetworkManagementService service = INetworkManagementService.Stub.asInterface(b);
Log.d(TAG, "call INetworkManagementService.startReverseTethering()");
try {
service.startReverseTethering(iface);
} catch (Exception e) {
Log.e(TAG, "Cannot start reverse tethering: " + e);
return;
}
} else if (state == BluetoothProfile.STATE_DISCONNECTED &&
(prevState == BluetoothProfile.STATE_CONNECTED ||
prevState == BluetoothProfile.STATE_DISCONNECTING)) {
if(DBG) Log.d(TAG, "handlePanDeviceStateChange: stopReverseTether, panDevice.mIface: "
+ panDevice.mIface);
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
INetworkManagementService service = INetworkManagementService.Stub.asInterface(b);
try {
service.stopReverseTethering();
} catch(Exception e) {
Log.e(TAG, "Cannot stop reverse tethering: " + e);
return;
}
}
}
if (panDevice == null) {
panDevice = new BluetoothPanDevice(state, ifaceAddr, iface, local_role);
mPanDevices.put(device, panDevice);
} else {
panDevice.mState = state;
panDevice.mIfaceAddr = ifaceAddr;
panDevice.mLocalRole = local_role;
panDevice.mIface = iface;
}
/* Notifying the connection state change of the profile before sending the intent for
connection state change, as it was causing a race condition, with the UI not being
updated with the correct connection state. */
if (DBG) Log.d(TAG, "Pan Device state : device: " + device + " State:" +
prevState + "->" + state);
notifyProfileConnectionStateChanged(device, BluetoothProfile.PAN, state, prevState);
Intent intent = new Intent(BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
intent.putExtra(BluetoothPan.EXTRA_PREVIOUS_STATE, prevState);
intent.putExtra(BluetoothPan.EXTRA_STATE, state);
intent.putExtra(BluetoothPan.EXTRA_LOCAL_ROLE, local_role);
sendBroadcast(intent, BLUETOOTH_PERM);
}
|
diff --git a/crawler/src/main/java/tv/notube/crawler/requester/request/TwitterRequest.java b/crawler/src/main/java/tv/notube/crawler/requester/request/TwitterRequest.java
index 9616611..bfa2465 100644
--- a/crawler/src/main/java/tv/notube/crawler/requester/request/TwitterRequest.java
+++ b/crawler/src/main/java/tv/notube/crawler/requester/request/TwitterRequest.java
@@ -1,76 +1,80 @@
package tv.notube.crawler.requester.request;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.scribe.builder.ServiceBuilder;
import org.scribe.builder.api.TwitterApi;
import org.scribe.model.OAuthRequest;
import org.scribe.model.Response;
import org.scribe.model.Token;
import org.scribe.model.Verb;
import org.scribe.oauth.OAuthService;
import tv.notube.commons.model.auth.OAuthAuth;
import tv.notube.crawler.requester.DefaultRequest;
import tv.notube.crawler.requester.RequestException;
import tv.notube.crawler.requester.ServiceResponse;
import tv.notube.crawler.requester.request.twitter.TwitterResponse;
import tv.notube.crawler.requester.request.twitter.TwitterResponseAdapter;
import java.io.IOException;
import java.io.InputStreamReader;
/**
* <a href="http://twitter.com>twitter.com</a> specific implementation of
* {@link tv.notube.crawler.requester.DefaultRequest}.
*
* @author Davide Palmisano ( [email protected] )
*/
public class TwitterRequest extends DefaultRequest {
private Gson gson;
public TwitterRequest() {
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(
TwitterResponse.class,
new TwitterResponseAdapter()
);
gson = builder.create();
}
/**
*
* @return
* @throws tv.notube.crawler.requester.RequestException
*/
public ServiceResponse call() throws RequestException {
String serviceEndpoint = service.getEndpoint().toString();
OAuthAuth oaa = (OAuthAuth) auth;
OAuthService twitterOAuth = new ServiceBuilder()
.provider(TwitterApi.class)
.apiKey(service.getApikey())
.apiSecret(service.getSecret())
.build();
OAuthRequest request = new OAuthRequest(
Verb.GET, serviceEndpoint);
request.addQuerystringParameter("include_entities","true");
twitterOAuth.signRequest(
new Token(oaa.getSession(), oaa.getSecret()),
request
);
Response response = request.send();
InputStreamReader reader = new InputStreamReader(response.getStream());
try {
- return gson.fromJson(reader, TwitterResponse.class);
+ ServiceResponse g = gson.fromJson(reader, TwitterResponse.class);
+ return g;
+ }catch(Exception ex){
+ System.err.println("ERROR - failed to parse json "+ex);
+ return null;
} finally {
try {
reader.close();
} catch (IOException e) {
throw new RequestException("Error while closing reader", e);
}
}
}
}
| true | true | public ServiceResponse call() throws RequestException {
String serviceEndpoint = service.getEndpoint().toString();
OAuthAuth oaa = (OAuthAuth) auth;
OAuthService twitterOAuth = new ServiceBuilder()
.provider(TwitterApi.class)
.apiKey(service.getApikey())
.apiSecret(service.getSecret())
.build();
OAuthRequest request = new OAuthRequest(
Verb.GET, serviceEndpoint);
request.addQuerystringParameter("include_entities","true");
twitterOAuth.signRequest(
new Token(oaa.getSession(), oaa.getSecret()),
request
);
Response response = request.send();
InputStreamReader reader = new InputStreamReader(response.getStream());
try {
return gson.fromJson(reader, TwitterResponse.class);
} finally {
try {
reader.close();
} catch (IOException e) {
throw new RequestException("Error while closing reader", e);
}
}
}
| public ServiceResponse call() throws RequestException {
String serviceEndpoint = service.getEndpoint().toString();
OAuthAuth oaa = (OAuthAuth) auth;
OAuthService twitterOAuth = new ServiceBuilder()
.provider(TwitterApi.class)
.apiKey(service.getApikey())
.apiSecret(service.getSecret())
.build();
OAuthRequest request = new OAuthRequest(
Verb.GET, serviceEndpoint);
request.addQuerystringParameter("include_entities","true");
twitterOAuth.signRequest(
new Token(oaa.getSession(), oaa.getSecret()),
request
);
Response response = request.send();
InputStreamReader reader = new InputStreamReader(response.getStream());
try {
ServiceResponse g = gson.fromJson(reader, TwitterResponse.class);
return g;
}catch(Exception ex){
System.err.println("ERROR - failed to parse json "+ex);
return null;
} finally {
try {
reader.close();
} catch (IOException e) {
throw new RequestException("Error while closing reader", e);
}
}
}
|
diff --git a/src/main/java/org/jblas/Singular.java b/src/main/java/org/jblas/Singular.java
index 424eb12..8195b88 100644
--- a/src/main/java/org/jblas/Singular.java
+++ b/src/main/java/org/jblas/Singular.java
@@ -1,193 +1,193 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package org.jblas;
import static org.jblas.util.Functions.min;
/**
*
*/
public class Singular {
/**
* Compute a singular-value decomposition of A.
*
* @return A DoubleMatrix[3] array of U, S, V such that A = U * diag(S) * V'
*/
public static DoubleMatrix[] fullSVD(DoubleMatrix A) {
int m = A.rows;
int n = A.columns;
DoubleMatrix U = new DoubleMatrix(m, m);
DoubleMatrix S = new DoubleMatrix(min(m, n));
DoubleMatrix V = new DoubleMatrix(n, n);
NativeBlas.dgesvd('A', 'A', m, n, A.dup().data, 0, m, S.data, 0, U.data, 0, m, V.data, 0, n);
return new DoubleMatrix[]{U, S, V.transpose()};
}
/**
* Compute a singular-value decomposition of A (sparse variant).
* Sparse means that the matrices U and V are not square but
* only have as many columns (or rows) as possible.
*
* @param A
* @return A DoubleMatrix[3] array of U, S, V such that A = U * diag(S) * V'
*/
public static DoubleMatrix[] sparseSVD(DoubleMatrix A) {
int m = A.rows;
int n = A.columns;
DoubleMatrix U = new DoubleMatrix(m, min(m, n));
DoubleMatrix S = new DoubleMatrix(min(m, n));
DoubleMatrix V = new DoubleMatrix(min(m, n), n);
NativeBlas.dgesvd('S', 'S', m, n, A.dup().data, 0, m, S.data, 0, U.data, 0, m, V.data, 0, min(m, n));
return new DoubleMatrix[]{U, S, V.transpose()};
}
public static ComplexDoubleMatrix[] sparseSVD(ComplexDoubleMatrix A) {
int m = A.rows;
int n = A.columns;
ComplexDoubleMatrix U = new ComplexDoubleMatrix(m, min(m, n));
DoubleMatrix S = new DoubleMatrix(min(m, n));
ComplexDoubleMatrix V = new ComplexDoubleMatrix(min(m, n), n);
double[] rwork = new double[5*min(m,n)];
NativeBlas.zgesvd('S', 'S', m, n, A.dup().data, 0, m, S.data, 0, U.data, 0, m, V.data, 0, min(m, n), rwork, 0);
- return new ComplexDoubleMatrix[]{U, new ComplexDoubleMatrix(S), V.transpose()};
+ return new ComplexDoubleMatrix[]{U, new ComplexDoubleMatrix(S), V.hermitian()};
}
/**
* Compute the singular values of a matrix.
*
* @param A DoubleMatrix of dimension m * n
* @return A min(m, n) vector of singular values.
*/
public static DoubleMatrix SVDValues(DoubleMatrix A) {
int m = A.rows;
int n = A.columns;
DoubleMatrix S = new DoubleMatrix(min(m, n));
NativeBlas.dgesvd('N', 'N', m, n, A.dup().data, 0, m, S.data, 0, null, 0, 1, null, 0, 1);
return S;
}
/**
* Compute the singular values of a complex matrix.
*
* @param A ComplexDoubleMatrix of dimension m * n
* @return A real-valued (!) min(m, n) vector of singular values.
*/
public static DoubleMatrix SVDValues(ComplexDoubleMatrix A) {
int m = A.rows;
int n = A.columns;
DoubleMatrix S = new DoubleMatrix(min(m, n));
double[] rwork = new double[5*min(m,n)];
NativeBlas.zgesvd('N', 'N', m, n, A.dup().data, 0, m, S.data, 0, null, 0, 1, null, 0, min(m,n), rwork, 0);
return S;
}
//BEGIN
// The code below has been automatically generated.
// DO NOT EDIT!
/**
* Compute a singular-value decomposition of A.
*
* @return A FloatMatrix[3] array of U, S, V such that A = U * diag(S) * V'
*/
public static FloatMatrix[] fullSVD(FloatMatrix A) {
int m = A.rows;
int n = A.columns;
FloatMatrix U = new FloatMatrix(m, m);
FloatMatrix S = new FloatMatrix(min(m, n));
FloatMatrix V = new FloatMatrix(n, n);
NativeBlas.sgesvd('A', 'A', m, n, A.dup().data, 0, m, S.data, 0, U.data, 0, m, V.data, 0, n);
return new FloatMatrix[]{U, S, V.transpose()};
}
/**
* Compute a singular-value decomposition of A (sparse variant).
* Sparse means that the matrices U and V are not square but
* only have as many columns (or rows) as possible.
*
* @param A
* @return A FloatMatrix[3] array of U, S, V such that A = U * diag(S) * V'
*/
public static FloatMatrix[] sparseSVD(FloatMatrix A) {
int m = A.rows;
int n = A.columns;
FloatMatrix U = new FloatMatrix(m, min(m, n));
FloatMatrix S = new FloatMatrix(min(m, n));
FloatMatrix V = new FloatMatrix(min(m, n), n);
NativeBlas.sgesvd('S', 'S', m, n, A.dup().data, 0, m, S.data, 0, U.data, 0, m, V.data, 0, min(m, n));
return new FloatMatrix[]{U, S, V.transpose()};
}
public static ComplexFloatMatrix[] sparseSVD(ComplexFloatMatrix A) {
int m = A.rows;
int n = A.columns;
ComplexFloatMatrix U = new ComplexFloatMatrix(m, min(m, n));
FloatMatrix S = new FloatMatrix(min(m, n));
ComplexFloatMatrix V = new ComplexFloatMatrix(min(m, n), n);
float[] rwork = new float[5*min(m,n)];
NativeBlas.cgesvd('S', 'S', m, n, A.dup().data, 0, m, S.data, 0, U.data, 0, m, V.data, 0, min(m, n), rwork, 0);
return new ComplexFloatMatrix[]{U, new ComplexFloatMatrix(S), V.transpose()};
}
/**
* Compute the singular values of a matrix.
*
* @param A FloatMatrix of dimension m * n
* @return A min(m, n) vector of singular values.
*/
public static FloatMatrix SVDValues(FloatMatrix A) {
int m = A.rows;
int n = A.columns;
FloatMatrix S = new FloatMatrix(min(m, n));
NativeBlas.sgesvd('N', 'N', m, n, A.dup().data, 0, m, S.data, 0, null, 0, 1, null, 0, 1);
return S;
}
/**
* Compute the singular values of a complex matrix.
*
* @param A ComplexFloatMatrix of dimension m * n
* @return A real-valued (!) min(m, n) vector of singular values.
*/
public static FloatMatrix SVDValues(ComplexFloatMatrix A) {
int m = A.rows;
int n = A.columns;
FloatMatrix S = new FloatMatrix(min(m, n));
float[] rwork = new float[5*min(m,n)];
NativeBlas.cgesvd('N', 'N', m, n, A.dup().data, 0, m, S.data, 0, null, 0, 1, null, 0, min(m,n), rwork, 0);
return S;
}
//END
}
| true | true | public static ComplexDoubleMatrix[] sparseSVD(ComplexDoubleMatrix A) {
int m = A.rows;
int n = A.columns;
ComplexDoubleMatrix U = new ComplexDoubleMatrix(m, min(m, n));
DoubleMatrix S = new DoubleMatrix(min(m, n));
ComplexDoubleMatrix V = new ComplexDoubleMatrix(min(m, n), n);
double[] rwork = new double[5*min(m,n)];
NativeBlas.zgesvd('S', 'S', m, n, A.dup().data, 0, m, S.data, 0, U.data, 0, m, V.data, 0, min(m, n), rwork, 0);
return new ComplexDoubleMatrix[]{U, new ComplexDoubleMatrix(S), V.transpose()};
}
| public static ComplexDoubleMatrix[] sparseSVD(ComplexDoubleMatrix A) {
int m = A.rows;
int n = A.columns;
ComplexDoubleMatrix U = new ComplexDoubleMatrix(m, min(m, n));
DoubleMatrix S = new DoubleMatrix(min(m, n));
ComplexDoubleMatrix V = new ComplexDoubleMatrix(min(m, n), n);
double[] rwork = new double[5*min(m,n)];
NativeBlas.zgesvd('S', 'S', m, n, A.dup().data, 0, m, S.data, 0, U.data, 0, m, V.data, 0, min(m, n), rwork, 0);
return new ComplexDoubleMatrix[]{U, new ComplexDoubleMatrix(S), V.hermitian()};
}
|
diff --git a/src/main/java/eu/europeana/portal2/web/controllers/TimelineController.java b/src/main/java/eu/europeana/portal2/web/controllers/TimelineController.java
index e6f07a47..59ec848b 100644
--- a/src/main/java/eu/europeana/portal2/web/controllers/TimelineController.java
+++ b/src/main/java/eu/europeana/portal2/web/controllers/TimelineController.java
@@ -1,115 +1,115 @@
package eu.europeana.portal2.web.controllers;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Logger;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView;
import eu.europeana.corelib.definitions.solr.beans.BriefBean;
import eu.europeana.corelib.definitions.solr.model.Query;
import eu.europeana.corelib.solr.service.SearchService;
import eu.europeana.portal2.services.Configuration;
import eu.europeana.portal2.web.presentation.PortalPageInfo;
import eu.europeana.portal2.web.presentation.SearchPageEnum;
import eu.europeana.portal2.web.presentation.model.BriefBeanView;
import eu.europeana.portal2.web.presentation.model.SearchPage;
import eu.europeana.portal2.web.util.ClickStreamLogger;
import eu.europeana.portal2.web.util.ControllerUtil;
import eu.europeana.portal2.web.util.SearchUtils;
@Controller
public class TimelineController {
@Resource private SearchService searchService;
@Resource private ClickStreamLogger clickStreamLogger;
@Resource(name="configurationService") private Configuration config;
private final Logger log = Logger.getLogger(getClass().getName());
@RequestMapping("/timeline.html")
public ModelAndView timelineHtml(
@RequestParam(value = "query", required = false) String query,
@RequestParam(value = "embedded", required = false) String embedded,
@RequestParam(value = "start", required = false, defaultValue = "1") int start,
@RequestParam(value = "startPage", required = false, defaultValue = "1") int startPage,
@RequestParam(value = "qf", required = false) String[] qf,
@RequestParam(value = "rq", required = false) String rq,
@RequestParam(value = "theme", required = false, defaultValue="") String theme,
HttpServletRequest request,
HttpServletResponse response,
Locale locale)
throws Exception {
config.registerBaseObjects(request, response, locale);
SearchPage model = new SearchPage();
model.setCurrentSearch(SearchPageEnum.TIMELINE);
model.setEmbedded(StringUtils.equalsIgnoreCase(embedded, "true"));
model.setQuery(query);
model.setStart(start);
model.setStartPage(startPage);
model.setRefinements(qf);
model.setRefineKeyword(StringUtils.trimToNull(rq));
config.injectProperties(model);
ModelAndView page = ControllerUtil.createModelAndViewPage(model, locale, PortalPageInfo.TIMELINE);
config.postHandle(this, page);
clickStreamLogger.logUserAction(request, ClickStreamLogger.UserAction.TIMELINE, page);
return page;
}
@RequestMapping(value = {"/search.json"})
public ModelAndView searchJson(
@RequestParam(value = "query", required = false, defaultValue = "") String q,
@RequestParam(value = "startFrom", required = false, defaultValue = "1") int start,
@RequestParam(value = "rows", required = false, defaultValue = "1000") int rows,
HttpServletRequest request,
HttpServletResponse response,
Locale locale)
throws Exception {
config.registerBaseObjects(request, response, locale);
SearchPage model = new SearchPage();
model.setCurrentSearch(SearchPageEnum.TIMELINE);
config.injectProperties(model);
Map<String, String[]> params = (Map<String, String[]>)request.getParameterMap();
// TODO Add filter to defaultFilters when hierarchical objects are
// introduced...
// final String[] defaultFilters = new String[]{"YEAR:[* TO *]",
// "title:[* TO *]", "-YEAR:0000", "europeana_object:[* TO *]"};
final String[] defaultFilters = new String[]{"YEAR:[* TO *]", "-YEAR:0000"};
String[] filters = (params.containsKey("qf"))
? (String[]) ArrayUtils.addAll((String[])params.get("qf"), defaultFilters)
: defaultFilters;
// TODO: handle rq
Query query = new Query(q)
.setRefinements(filters)
.setPageSize(rows)
.setStart(start-1) // Solr starts from 0
.setParameter("f.YEAR.facet.mincount", "1");
- BriefBeanView briefBeanView = SearchUtils.createResults(searchService, BriefBean.class, "portal", query, start, rows, params);
+ BriefBeanView briefBeanView = SearchUtils.createResults(searchService, BriefBean.class, "standard", query, start, rows, params);
model.setBriefBeanView(briefBeanView);
model.setQuery(briefBeanView.getPagination().getPresentationQuery().getUserSubmittedQuery());
ModelAndView page = ControllerUtil.createModelAndViewPage(model, PortalPageInfo.TIMELINE_JSON);
clickStreamLogger.logBriefResultView(request, briefBeanView, query, page);
config.postHandle(this, page);
return page;
}
}
| true | true | public ModelAndView searchJson(
@RequestParam(value = "query", required = false, defaultValue = "") String q,
@RequestParam(value = "startFrom", required = false, defaultValue = "1") int start,
@RequestParam(value = "rows", required = false, defaultValue = "1000") int rows,
HttpServletRequest request,
HttpServletResponse response,
Locale locale)
throws Exception {
config.registerBaseObjects(request, response, locale);
SearchPage model = new SearchPage();
model.setCurrentSearch(SearchPageEnum.TIMELINE);
config.injectProperties(model);
Map<String, String[]> params = (Map<String, String[]>)request.getParameterMap();
// TODO Add filter to defaultFilters when hierarchical objects are
// introduced...
// final String[] defaultFilters = new String[]{"YEAR:[* TO *]",
// "title:[* TO *]", "-YEAR:0000", "europeana_object:[* TO *]"};
final String[] defaultFilters = new String[]{"YEAR:[* TO *]", "-YEAR:0000"};
String[] filters = (params.containsKey("qf"))
? (String[]) ArrayUtils.addAll((String[])params.get("qf"), defaultFilters)
: defaultFilters;
// TODO: handle rq
Query query = new Query(q)
.setRefinements(filters)
.setPageSize(rows)
.setStart(start-1) // Solr starts from 0
.setParameter("f.YEAR.facet.mincount", "1");
BriefBeanView briefBeanView = SearchUtils.createResults(searchService, BriefBean.class, "portal", query, start, rows, params);
model.setBriefBeanView(briefBeanView);
model.setQuery(briefBeanView.getPagination().getPresentationQuery().getUserSubmittedQuery());
ModelAndView page = ControllerUtil.createModelAndViewPage(model, PortalPageInfo.TIMELINE_JSON);
clickStreamLogger.logBriefResultView(request, briefBeanView, query, page);
config.postHandle(this, page);
return page;
}
| public ModelAndView searchJson(
@RequestParam(value = "query", required = false, defaultValue = "") String q,
@RequestParam(value = "startFrom", required = false, defaultValue = "1") int start,
@RequestParam(value = "rows", required = false, defaultValue = "1000") int rows,
HttpServletRequest request,
HttpServletResponse response,
Locale locale)
throws Exception {
config.registerBaseObjects(request, response, locale);
SearchPage model = new SearchPage();
model.setCurrentSearch(SearchPageEnum.TIMELINE);
config.injectProperties(model);
Map<String, String[]> params = (Map<String, String[]>)request.getParameterMap();
// TODO Add filter to defaultFilters when hierarchical objects are
// introduced...
// final String[] defaultFilters = new String[]{"YEAR:[* TO *]",
// "title:[* TO *]", "-YEAR:0000", "europeana_object:[* TO *]"};
final String[] defaultFilters = new String[]{"YEAR:[* TO *]", "-YEAR:0000"};
String[] filters = (params.containsKey("qf"))
? (String[]) ArrayUtils.addAll((String[])params.get("qf"), defaultFilters)
: defaultFilters;
// TODO: handle rq
Query query = new Query(q)
.setRefinements(filters)
.setPageSize(rows)
.setStart(start-1) // Solr starts from 0
.setParameter("f.YEAR.facet.mincount", "1");
BriefBeanView briefBeanView = SearchUtils.createResults(searchService, BriefBean.class, "standard", query, start, rows, params);
model.setBriefBeanView(briefBeanView);
model.setQuery(briefBeanView.getPagination().getPresentationQuery().getUserSubmittedQuery());
ModelAndView page = ControllerUtil.createModelAndViewPage(model, PortalPageInfo.TIMELINE_JSON);
clickStreamLogger.logBriefResultView(request, briefBeanView, query, page);
config.postHandle(this, page);
return page;
}
|
diff --git a/src/webapp/src/java/org/wyona/yanel/servlet/SessionCounter.java b/src/webapp/src/java/org/wyona/yanel/servlet/SessionCounter.java
index 66169b651..701c21460 100644
--- a/src/webapp/src/java/org/wyona/yanel/servlet/SessionCounter.java
+++ b/src/webapp/src/java/org/wyona/yanel/servlet/SessionCounter.java
@@ -1,42 +1,42 @@
package org.wyona.yanel.servlet;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionListener;
import javax.servlet.http.HttpSessionEvent;
import java.util.HashMap;
import org.apache.log4j.Logger;
/**
*
*/
public class SessionCounter implements HttpSessionListener {
private static Logger log = Logger.getLogger(SessionCounter.class);
private static HashMap activeSessions = new HashMap();
/**
*
*/
public void sessionCreated(HttpSessionEvent event) {
activeSessions.put(event.getSession().getId(), event.getSession());
- log.warn("New session created! Current number of active sessions: " + activeSessions.size());
+ log.info("New session created! Current number of active sessions: " + activeSessions.size());
}
/**
*
*/
public void sessionDestroyed(HttpSessionEvent event) {
activeSessions.remove(event.getSession().getId());
log.warn("Session destroyed! Current number of active sessions: " + activeSessions.size());
}
/**
*
*/
public static HttpSession[] getActiveSessions() {
return (HttpSession[]) activeSessions.values().toArray(new HttpSession[activeSessions.size()]);
}
}
| true | true | public void sessionCreated(HttpSessionEvent event) {
activeSessions.put(event.getSession().getId(), event.getSession());
log.warn("New session created! Current number of active sessions: " + activeSessions.size());
}
| public void sessionCreated(HttpSessionEvent event) {
activeSessions.put(event.getSession().getId(), event.getSession());
log.info("New session created! Current number of active sessions: " + activeSessions.size());
}
|
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/PreCompilerBuilder.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/PreCompilerBuilder.java
index ae5583d7..eb8fc53b 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/PreCompilerBuilder.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/PreCompilerBuilder.java
@@ -1,1049 +1,1049 @@
/*
* Copyright (C) 2007 The Android Open Source Project
*
* Licensed under the Eclipse Public License, Version 1.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.eclipse.org/org/documents/epl-v10.php
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.ide.eclipse.adt.internal.build;
import com.android.ide.eclipse.adt.AdtConstants;
import com.android.ide.eclipse.adt.AdtPlugin;
import com.android.ide.eclipse.adt.AndroidConstants;
import com.android.ide.eclipse.adt.internal.project.AndroidManifestParser;
import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper;
import com.android.ide.eclipse.adt.internal.project.FixLaunchConfig;
import com.android.ide.eclipse.adt.internal.project.XmlErrorHandler.BasicXmlErrorListener;
import com.android.ide.eclipse.adt.internal.sdk.Sdk;
import com.android.sdklib.AndroidVersion;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.SdkConstants;
import com.android.sdklib.xml.ManifestConstants;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Pre Java Compiler.
* This incremental builder performs 2 tasks:
* <ul>
* <li>compiles the resources located in the res/ folder, along with the
* AndroidManifest.xml file into the R.java class.</li>
* <li>compiles any .aidl files into a corresponding java file.</li>
* </ul>
*
*/
public class PreCompilerBuilder extends BaseBuilder {
public static final String ID = "com.android.ide.eclipse.adt.PreCompilerBuilder"; //$NON-NLS-1$
private static final String PROPERTY_PACKAGE = "manifestPackage"; //$NON-NLS-1$
private static final String PROPERTY_COMPILE_RESOURCES = "compileResources"; //$NON-NLS-1$
private static final String PROPERTY_COMPILE_AIDL = "compileAidl"; //$NON-NLS-1$
/**
* Single line aidl error<br>
* "<path>:<line>: <error>"
* or
* "<path>:<line> <error>"
*/
private static Pattern sAidlPattern1 = Pattern.compile("^(.+?):(\\d+):?\\s(.+)$"); //$NON-NLS-1$
/**
* Data to temporarly store aidl source file information
*/
static class AidlData {
IFile aidlFile;
IFolder sourceFolder;
AidlData(IFolder sourceFolder, IFile aidlFile) {
this.sourceFolder = sourceFolder;
this.aidlFile = aidlFile;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj instanceof AidlData) {
AidlData file = (AidlData)obj;
return aidlFile.equals(file.aidlFile) && sourceFolder.equals(file.sourceFolder);
}
return false;
}
}
/**
* Resource Compile flag. This flag is reset to false after each successful compilation, and
* stored in the project persistent properties. This allows the builder to remember its state
* when the project is closed/opened.
*/
private boolean mMustCompileResources = false;
/** List of .aidl files found that are modified or new. */
private final ArrayList<AidlData> mAidlToCompile = new ArrayList<AidlData>();
/** List of .aidl files that have been removed. */
private final ArrayList<AidlData> mAidlToRemove = new ArrayList<AidlData>();
/** cache of the java package defined in the manifest */
private String mManifestPackage;
/** Output folder for generated Java File. Created on the Builder init
* @see #startupOnInitialize()
*/
private IFolder mGenFolder;
/**
* Progress monitor used at the end of every build to refresh the content of the 'gen' folder
* and set the generated files as derived.
*/
private DerivedProgressMonitor mDerivedProgressMonitor;
/**
* Progress monitor waiting the end of the process to set a persistent value
* in a file. This is typically used in conjunction with <code>IResource.refresh()</code>,
* since this call is asysnchronous, and we need to wait for it to finish for the file
* to be known by eclipse, before we can call <code>resource.setPersistentProperty</code> on
* a new file.
*/
private static class DerivedProgressMonitor implements IProgressMonitor {
private boolean mCancelled = false;
private final ArrayList<IFile> mFileList = new ArrayList<IFile>();
private boolean mDone = false;
public DerivedProgressMonitor() {
}
void addFile(IFile file) {
mFileList.add(file);
}
void reset() {
mFileList.clear();
mDone = false;
}
public void beginTask(String name, int totalWork) {
}
public void done() {
if (mDone == false) {
mDone = true;
for (IFile file : mFileList) {
if (file.exists()) {
try {
file.setDerived(true);
} catch (CoreException e) {
// This really shouldn't happen since we check that the resource exist.
// Worst case scenario, the resource isn't marked as derived.
}
}
}
}
}
public void internalWorked(double work) {
}
public boolean isCanceled() {
return mCancelled;
}
public void setCanceled(boolean value) {
mCancelled = value;
}
public void setTaskName(String name) {
}
public void subTask(String name) {
}
public void worked(int work) {
}
}
public PreCompilerBuilder() {
super();
}
// build() returns a list of project from which this project depends for future compilation.
@SuppressWarnings("unchecked")
@Override
protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
throws CoreException {
try {
mDerivedProgressMonitor.reset();
// First thing we do is go through the resource delta to not
// lose it if we have to abort the build for any reason.
// get the project objects
IProject project = getProject();
// Top level check to make sure the build can move forward.
abortOnBadSetup(project);
IJavaProject javaProject = JavaCore.create(project);
IAndroidTarget projectTarget = Sdk.getCurrent().getTarget(project);
// now we need to get the classpath list
ArrayList<IPath> sourceFolderPathList = BaseProjectHelper.getSourceClasspaths(
javaProject);
PreCompilerDeltaVisitor dv = null;
String javaPackage = null;
String minSdkVersion = null;
if (kind == FULL_BUILD) {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Start_Full_Pre_Compiler);
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
} else {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Start_Inc_Pre_Compiler);
// Go through the resources and see if something changed.
// Even if the mCompileResources flag is true from a previously aborted
// build, we need to go through the Resource delta to get a possible
// list of aidl files to compile/remove.
IResourceDelta delta = getDelta(project);
if (delta == null) {
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
} else {
dv = new PreCompilerDeltaVisitor(this, sourceFolderPathList);
delta.accept(dv);
// record the state
mMustCompileResources |= dv.getCompileResources();
if (dv.getForceAidlCompile()) {
buildAidlCompilationList(project, sourceFolderPathList);
} else {
// handle aidl modification, and update mMustCompileAidl
mergeAidlFileModifications(dv.getAidlToCompile(),
dv.getAidlToRemove());
}
// get the java package from the visitor
javaPackage = dv.getManifestPackage();
minSdkVersion = dv.getMinSdkVersion();
}
}
// store the build status in the persistent storage
saveProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES , mMustCompileResources);
// if there was some XML errors, we just return w/o doing
// anything since we've put some markers in the files anyway.
if (dv != null && dv.mXmlError) {
AdtPlugin.printErrorToConsole(project, Messages.Xml_Error);
// This interrupts the build. The next builders will not run.
stopBuild(Messages.Xml_Error);
}
// get the manifest file
IFile manifest = AndroidManifestParser.getManifest(project);
if (manifest == null) {
String msg = String.format(Messages.s_File_Missing,
AndroidConstants.FN_ANDROID_MANIFEST);
AdtPlugin.printErrorToConsole(project, msg);
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
// TODO: document whether code below that uses manifest (which is now guaranteed
// to be null) will actually be executed or not.
}
// lets check the XML of the manifest first, if that hasn't been done by the
// resource delta visitor yet.
if (dv == null || dv.getCheckedManifestXml() == false) {
BasicXmlErrorListener errorListener = new BasicXmlErrorListener();
AndroidManifestParser parser = BaseProjectHelper.parseManifestForError(manifest,
errorListener);
if (errorListener.mHasXmlError == true) {
// there was an error in the manifest, its file has been marked,
// by the XmlErrorHandler.
// We return;
String msg = String.format(Messages.s_Contains_Xml_Error,
AndroidConstants.FN_ANDROID_MANIFEST);
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project, msg);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
}
// get the java package from the parser
javaPackage = parser.getPackage();
minSdkVersion = parser.getApiLevelRequirement();
}
if (minSdkVersion != null) {
int minSdkValue = -1;
try {
minSdkValue = Integer.parseInt(minSdkVersion);
} catch (NumberFormatException e) {
// it's ok, it means minSdkVersion contains a (hopefully) valid codename.
}
AndroidVersion projectVersion = projectTarget.getVersion();
if (minSdkValue != -1) {
String codename = projectVersion.getCodename();
if (codename != null) {
// integer minSdk when the target is a preview => fatal error
String msg = String.format(
"Platform %1$s is a preview and requires appication manifests to set %2$s to '%1$s'",
codename, ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
} else if (minSdkValue < projectVersion.getApiLevel()) {
// integer minSdk is not high enough for the target => warning
String msg = String.format(
"Manifest min SDK version (%1$s) is lower than project target API level (%2$d)",
minSdkVersion, projectVersion.getApiLevel());
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_WARNING);
}
} else {
// looks like the min sdk is a codename, check it matches the codename
// of the platform
String codename = projectVersion.getCodename();
if (codename == null) {
// platform is not a preview => fatal error
String msg = String.format(
"Manifest attribute '%1$s' is set to '%2$s'. Integer is expected.",
- ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, codename);
+ ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, minSdkVersion);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
} else if (codename.equals(minSdkVersion) == false) {
// platform and manifest codenames don't match => fatal error.
String msg = String.format(
"Value of manifest attribute '%1$s' does not match platform codename '%2$s'",
ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, codename);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
}
}
} else if (projectTarget.getVersion().isPreview()) {
// else the minSdkVersion is not set but we are using a preview target.
// Display an error
String codename = projectTarget.getVersion().getCodename();
String msg = String.format(
"Platform %1$s is a preview and requires appication manifests to set %2$s to '%1$s'",
codename, ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
}
if (javaPackage == null || javaPackage.length() == 0) {
// looks like the AndroidManifest file isn't valid.
String msg = String.format(Messages.s_Doesnt_Declare_Package_Error,
AndroidConstants.FN_ANDROID_MANIFEST);
AdtPlugin.printErrorToConsole(project, msg);
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
// TODO: document whether code below that uses javaPackage (which is now guaranteed
// to be null) will actually be executed or not.
}
// at this point we have the java package. We need to make sure it's not a different
// package than the previous one that were built.
if (javaPackage != null && javaPackage.equals(mManifestPackage) == false) {
// The manifest package has changed, the user may want to update
// the launch configuration
if (mManifestPackage != null) {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Checking_Package_Change);
FixLaunchConfig flc = new FixLaunchConfig(project, mManifestPackage,
javaPackage);
flc.start();
}
// now we delete the generated classes from their previous location
deleteObsoleteGeneratedClass(AndroidConstants.FN_RESOURCE_CLASS,
mManifestPackage);
deleteObsoleteGeneratedClass(AndroidConstants.FN_MANIFEST_CLASS,
mManifestPackage);
// record the new manifest package, and save it.
mManifestPackage = javaPackage;
saveProjectStringProperty(PROPERTY_PACKAGE, mManifestPackage);
}
if (mMustCompileResources) {
// we need to figure out where to store the R class.
// get the parent folder for R.java and update mManifestPackageSourceFolder
IFolder packageFolder = getGenManifestPackageFolder(project);
// get the resource folder
IFolder resFolder = project.getFolder(AndroidConstants.WS_RESOURCES);
// get the file system path
IPath outputLocation = mGenFolder.getLocation();
IPath resLocation = resFolder.getLocation();
IPath manifestLocation = manifest == null ? null : manifest.getLocation();
// those locations have to exist for us to do something!
if (outputLocation != null && resLocation != null
&& manifestLocation != null) {
String osOutputPath = outputLocation.toOSString();
String osResPath = resLocation.toOSString();
String osManifestPath = manifestLocation.toOSString();
// remove the aapt markers
removeMarkersFromFile(manifest, AndroidConstants.MARKER_AAPT_COMPILE);
removeMarkersFromContainer(resFolder, AndroidConstants.MARKER_AAPT_COMPILE);
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Preparing_Generated_Files);
// since the R.java file may be already existing in read-only
// mode we need to make it readable so that aapt can overwrite
// it
IFile rJavaFile = packageFolder.getFile(AndroidConstants.FN_RESOURCE_CLASS);
// do the same for the Manifest.java class
IFile manifestJavaFile = packageFolder.getFile(
AndroidConstants.FN_MANIFEST_CLASS);
// we actually need to delete the manifest.java as it may become empty and
// in this case aapt doesn't generate an empty one, but instead doesn't
// touch it.
manifestJavaFile.delete(true, null);
// launch aapt: create the command line
ArrayList<String> array = new ArrayList<String>();
array.add(projectTarget.getPath(IAndroidTarget.AAPT));
array.add("package"); //$NON-NLS-1$
array.add("-m"); //$NON-NLS-1$
if (AdtPlugin.getBuildVerbosity() == AdtConstants.BUILD_VERBOSE) {
array.add("-v"); //$NON-NLS-1$
}
array.add("-J"); //$NON-NLS-1$
array.add(osOutputPath);
array.add("-M"); //$NON-NLS-1$
array.add(osManifestPath);
array.add("-S"); //$NON-NLS-1$
array.add(osResPath);
array.add("-I"); //$NON-NLS-1$
array.add(projectTarget.getPath(IAndroidTarget.ANDROID_JAR));
if (AdtPlugin.getBuildVerbosity() == AdtConstants.BUILD_VERBOSE) {
StringBuilder sb = new StringBuilder();
for (String c : array) {
sb.append(c);
sb.append(' ');
}
String cmd_line = sb.toString();
AdtPlugin.printToConsole(project, cmd_line);
}
// launch
int execError = 1;
try {
// launch the command line process
Process process = Runtime.getRuntime().exec(
array.toArray(new String[array.size()]));
// list to store each line of stderr
ArrayList<String> results = new ArrayList<String>();
// get the output and return code from the process
execError = grabProcessOutput(process, results);
// attempt to parse the error output
boolean parsingError = parseAaptOutput(results, project);
// if we couldn't parse the output we display it in the console.
if (parsingError) {
if (execError != 0) {
AdtPlugin.printErrorToConsole(project, results.toArray());
} else {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_NORMAL,
project, results.toArray());
}
}
if (execError != 0) {
// if the exec failed, and we couldn't parse the error output
// (and therefore not all files that should have been marked,
// were marked), we put a generic marker on the project and abort.
if (parsingError) {
markProject(AdtConstants.MARKER_ADT, Messages.Unparsed_AAPT_Errors,
IMarker.SEVERITY_ERROR);
}
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.AAPT_Error);
// abort if exec failed.
// This interrupts the build. The next builders will not run.
stopBuild(Messages.AAPT_Error);
}
} catch (IOException e1) {
// something happen while executing the process,
// mark the project and exit
String msg = String.format(Messages.AAPT_Exec_Error, array.get(0));
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
} catch (InterruptedException e) {
// we got interrupted waiting for the process to end...
// mark the project and exit
String msg = String.format(Messages.AAPT_Exec_Error, array.get(0));
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
}
// if the return code was OK, we refresh the folder that
// contains R.java to force a java recompile.
if (execError == 0) {
// now add the R.java/Manifest.java to the list of file to be marked
// as derived.
mDerivedProgressMonitor.addFile(rJavaFile);
mDerivedProgressMonitor.addFile(manifestJavaFile);
// build has been done. reset the state of the builder
mMustCompileResources = false;
// and store it
saveProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES,
mMustCompileResources);
}
}
} else {
// nothing to do
}
// now handle the aidl stuff.
boolean aidlStatus = handleAidl(projectTarget, sourceFolderPathList, monitor);
if (aidlStatus == false && mMustCompileResources == false) {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Nothing_To_Compile);
}
} finally {
// refresh the 'gen' source folder. Once this is done with the custom progress
// monitor to mark all new files as derived
mGenFolder.refreshLocal(IResource.DEPTH_INFINITE, mDerivedProgressMonitor);
}
return null;
}
@Override
protected void clean(IProgressMonitor monitor) throws CoreException {
super.clean(monitor);
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, getProject(),
Messages.Removing_Generated_Classes);
// remove all the derived resources from the 'gen' source folder.
removeDerivedResources(mGenFolder, monitor);
}
@Override
protected void startupOnInitialize() {
super.startupOnInitialize();
mDerivedProgressMonitor = new DerivedProgressMonitor();
IProject project = getProject();
// load the previous IFolder and java package.
mManifestPackage = loadProjectStringProperty(PROPERTY_PACKAGE);
// get the source folder in which all the Java files are created
mGenFolder = project.getFolder(SdkConstants.FD_GEN_SOURCES);
// Load the current compile flags. We ask for true if not found to force a
// recompile.
mMustCompileResources = loadProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES, true);
boolean mustCompileAidl = loadProjectBooleanProperty(PROPERTY_COMPILE_AIDL, true);
// if we stored that we have to compile some aidl, we build the list that will compile them
// all
if (mustCompileAidl) {
IJavaProject javaProject = JavaCore.create(project);
ArrayList<IPath> sourceFolderPathList = BaseProjectHelper.getSourceClasspaths(
javaProject);
buildAidlCompilationList(project, sourceFolderPathList);
}
}
/**
* Delete the a generated java class associated with the specified java package.
* @param filename Name of the generated file to remove.
* @param javaPackage the old java package
*/
private void deleteObsoleteGeneratedClass(String filename, String javaPackage) {
if (javaPackage == null) {
return;
}
IPath packagePath = getJavaPackagePath(javaPackage);
IPath iPath = packagePath.append(filename);
// Find a matching resource object.
IResource javaFile = mGenFolder.findMember(iPath);
if (javaFile != null && javaFile.exists() && javaFile.getType() == IResource.FILE) {
try {
// delete
javaFile.delete(true, null);
// refresh parent
javaFile.getParent().refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
} catch (CoreException e) {
// failed to delete it, the user will have to delete it manually.
String message = String.format(Messages.Delete_Obsolete_Error,
javaFile.getFullPath());
IProject project = getProject();
AdtPlugin.printErrorToConsole(project, message);
AdtPlugin.printErrorToConsole(project, e.getMessage());
}
}
}
/**
* Creates a relative {@link IPath} from a java package.
* @param javaPackageName the java package.
*/
private IPath getJavaPackagePath(String javaPackageName) {
// convert the java package into path
String[] segments = javaPackageName.split(AndroidConstants.RE_DOT);
StringBuilder path = new StringBuilder();
for (String s : segments) {
path.append(AndroidConstants.WS_SEP_CHAR);
path.append(s);
}
return new Path(path.toString());
}
/**
* Returns an {@link IFolder} (located inside the 'gen' source folder), that matches the
* package defined in the manifest. This {@link IFolder} may not actually exist
* (aapt will create it anyway).
* @param project The project.
* @return the {@link IFolder} that will contain the R class or null if the folder was not found.
* @throws CoreException
*/
private IFolder getGenManifestPackageFolder(IProject project)
throws CoreException {
// get the path for the package
IPath packagePath = getJavaPackagePath(mManifestPackage);
// get a folder for this path under the 'gen' source folder, and return it.
// This IFolder may not reference an actual existing folder.
return mGenFolder.getFolder(packagePath);
}
/**
* Compiles aidl files into java. This will also removes old java files
* created from aidl files that are now gone.
* @param projectTarget Target of the project
* @param sourceFolders the list of source folders, relative to the workspace.
* @param monitor the projess monitor
* @returns true if it did something
* @throws CoreException
*/
private boolean handleAidl(IAndroidTarget projectTarget, ArrayList<IPath> sourceFolders,
IProgressMonitor monitor) throws CoreException {
if (mAidlToCompile.size() == 0 && mAidlToRemove.size() == 0) {
return false;
}
// create the command line
String[] command = new String[4 + sourceFolders.size()];
int index = 0;
command[index++] = projectTarget.getPath(IAndroidTarget.AIDL);
command[index++] = "-p" + Sdk.getCurrent().getTarget(getProject()).getPath( //$NON-NLS-1$
IAndroidTarget.ANDROID_AIDL);
// since the path are relative to the workspace and not the project itself, we need
// the workspace root.
IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
for (IPath p : sourceFolders) {
IFolder f = wsRoot.getFolder(p);
command[index++] = "-I" + f.getLocation().toOSString(); //$NON-NLS-1$
}
// list of files that have failed compilation.
ArrayList<AidlData> stillNeedCompilation = new ArrayList<AidlData>();
// if an aidl file is being removed before we managed to compile it, it'll be in
// both list. We *need* to remove it from the compile list or it'll never go away.
for (AidlData aidlFile : mAidlToRemove) {
int pos = mAidlToCompile.indexOf(aidlFile);
if (pos != -1) {
mAidlToCompile.remove(pos);
}
}
// loop until we've compile them all
for (AidlData aidlData : mAidlToCompile) {
// Remove the AIDL error markers from the aidl file
removeMarkersFromFile(aidlData.aidlFile, AndroidConstants.MARKER_AIDL);
// get the path of the source file.
IPath sourcePath = aidlData.aidlFile.getLocation();
String osSourcePath = sourcePath.toOSString();
IFile javaFile = getGenDestinationFile(aidlData, true /*createFolders*/, monitor);
// finish to set the command line.
command[index] = osSourcePath;
command[index + 1] = javaFile.getLocation().toOSString();
// launch the process
if (execAidl(command, aidlData.aidlFile) == false) {
// aidl failed. File should be marked. We add the file to the list
// of file that will need compilation again.
stillNeedCompilation.add(aidlData);
// and we move on to the next one.
continue;
} else {
// make sure the file will be marked as derived once we refresh the 'gen' source
// folder.
mDerivedProgressMonitor.addFile(javaFile);
}
}
// change the list to only contains the file that have failed compilation
mAidlToCompile.clear();
mAidlToCompile.addAll(stillNeedCompilation);
// Remove the java files created from aidl files that have been removed.
for (AidlData aidlData : mAidlToRemove) {
IFile javaFile = getGenDestinationFile(aidlData, false /*createFolders*/, monitor);
if (javaFile.exists()) {
// This confirms the java file was generated by the builder,
// we can delete the aidlFile.
javaFile.delete(true, null);
// Refresh parent.
javaFile.getParent().refreshLocal(IResource.DEPTH_ONE, monitor);
}
}
mAidlToRemove.clear();
// store the build state. If there are any files that failed to compile, we will
// force a full aidl compile on the next project open. (unless a full compilation succeed
// before the project is closed/re-opened.)
// TODO: Optimize by saving only the files that need compilation
saveProjectBooleanProperty(PROPERTY_COMPILE_AIDL , mAidlToCompile.size() > 0);
return true;
}
/**
* Returns the {@link IFile} handle to the destination file for a given aild source file
* ({@link AidlData}).
* @param aidlData the data for the aidl source file.
* @param createFolders whether or not the parent folder of the destination should be created
* if it does not exist.
* @param monitor the progress monitor
* @return the handle to the destination file.
* @throws CoreException
*/
private IFile getGenDestinationFile(AidlData aidlData, boolean createFolders,
IProgressMonitor monitor) throws CoreException {
// build the destination folder path.
// Use the path of the source file, except for the path leading to its source folder,
// and for the last segment which is the filename.
int segmentToSourceFolderCount = aidlData.sourceFolder.getFullPath().segmentCount();
IPath packagePath = aidlData.aidlFile.getFullPath().removeFirstSegments(
segmentToSourceFolderCount).removeLastSegments(1);
Path destinationPath = new Path(packagePath.toString());
// get an IFolder for this path. It's relative to the 'gen' folder already
IFolder destinationFolder = mGenFolder.getFolder(destinationPath);
// create it if needed.
if (destinationFolder.exists() == false && createFolders) {
createFolder(destinationFolder, monitor);
}
// Build the Java file name from the aidl name.
String javaName = aidlData.aidlFile.getName().replaceAll(AndroidConstants.RE_AIDL_EXT,
AndroidConstants.DOT_JAVA);
// get the resource for the java file.
IFile javaFile = destinationFolder.getFile(javaName);
return javaFile;
}
/**
* Creates the destination folder. Because
* {@link IFolder#create(boolean, boolean, IProgressMonitor)} only works if the parent folder
* already exists, this goes and ensure that all the parent folders actually exist, or it
* creates them as well.
* @param destinationFolder The folder to create
* @param monitor the {@link IProgressMonitor},
* @throws CoreException
*/
private void createFolder(IFolder destinationFolder, IProgressMonitor monitor)
throws CoreException {
// check the parent exist and create if necessary.
IContainer parent = destinationFolder.getParent();
if (parent.getType() == IResource.FOLDER && parent.exists() == false) {
createFolder((IFolder)parent, monitor);
}
// create the folder.
destinationFolder.create(true /*force*/, true /*local*/,
new SubProgressMonitor(monitor, 10));
}
/**
* Execute the aidl command line, parse the output, and mark the aidl file
* with any reported errors.
* @param command the String array containing the command line to execute.
* @param file The IFile object representing the aidl file being
* compiled.
* @return false if the exec failed, and build needs to be aborted.
*/
private boolean execAidl(String[] command, IFile file) {
// do the exec
try {
Process p = Runtime.getRuntime().exec(command);
// list to store each line of stderr
ArrayList<String> results = new ArrayList<String>();
// get the output and return code from the process
int result = grabProcessOutput(p, results);
// attempt to parse the error output
boolean error = parseAidlOutput(results, file);
// If the process failed and we couldn't parse the output
// we pring a message, mark the project and exit
if (result != 0 && error == true) {
// display the message in the console.
AdtPlugin.printErrorToConsole(getProject(), results.toArray());
// mark the project and exit
markProject(AdtConstants.MARKER_ADT, Messages.Unparsed_AIDL_Errors,
IMarker.SEVERITY_ERROR);
return false;
}
} catch (IOException e) {
// mark the project and exit
String msg = String.format(Messages.AIDL_Exec_Error, command[0]);
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
return false;
} catch (InterruptedException e) {
// mark the project and exit
String msg = String.format(Messages.AIDL_Exec_Error, command[0]);
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
return false;
}
return true;
}
/**
* Goes through the build paths and fills the list of aidl files to compile
* ({@link #mAidlToCompile}).
* @param project The project.
* @param sourceFolderPathList The list of source folder paths.
*/
private void buildAidlCompilationList(IProject project,
ArrayList<IPath> sourceFolderPathList) {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
for (IPath sourceFolderPath : sourceFolderPathList) {
IFolder sourceFolder = root.getFolder(sourceFolderPath);
// we don't look in the 'gen' source folder as there will be no source in there.
if (sourceFolder.exists() && sourceFolder.equals(mGenFolder) == false) {
scanFolderForAidl(sourceFolder, sourceFolder);
}
}
}
/**
* Scans a folder and fills the list of aidl files to compile.
* @param sourceFolder the root source folder.
* @param folder The folder to scan.
*/
private void scanFolderForAidl(IFolder sourceFolder, IFolder folder) {
try {
IResource[] members = folder.members();
for (IResource r : members) {
// get the type of the resource
switch (r.getType()) {
case IResource.FILE:
// if this a file, check that the file actually exist
// and that it's an aidl file
if (r.exists() &&
AndroidConstants.EXT_AIDL.equalsIgnoreCase(r.getFileExtension())) {
mAidlToCompile.add(new AidlData(sourceFolder, (IFile)r));
}
break;
case IResource.FOLDER:
// recursively go through children
scanFolderForAidl(sourceFolder, (IFolder)r);
break;
default:
// this would mean it's a project or the workspace root
// which is unlikely to happen. we do nothing
break;
}
}
} catch (CoreException e) {
// Couldn't get the members list for some reason. Just return.
}
}
/**
* Parse the output of aidl and mark the file with any errors.
* @param lines The output to parse.
* @param file The file to mark with error.
* @return true if the parsing failed, false if success.
*/
private boolean parseAidlOutput(ArrayList<String> lines, IFile file) {
// nothing to parse? just return false;
if (lines.size() == 0) {
return false;
}
Matcher m;
for (int i = 0; i < lines.size(); i++) {
String p = lines.get(i);
m = sAidlPattern1.matcher(p);
if (m.matches()) {
// we can ignore group 1 which is the location since we already
// have a IFile object representing the aidl file.
String lineStr = m.group(2);
String msg = m.group(3);
// get the line number
int line = 0;
try {
line = Integer.parseInt(lineStr);
} catch (NumberFormatException e) {
// looks like the string we extracted wasn't a valid
// file number. Parsing failed and we return true
return true;
}
// mark the file
BaseProjectHelper.addMarker(file, AndroidConstants.MARKER_AIDL, msg, line,
IMarker.SEVERITY_ERROR);
// success, go to the next line
continue;
}
// invalid line format, flag as error, and bail
return true;
}
return false;
}
/**
* Merge the current list of aidl file to compile/remove with the new one.
* @param toCompile List of file to compile
* @param toRemove List of file to remove
*/
private void mergeAidlFileModifications(ArrayList<AidlData> toCompile,
ArrayList<AidlData> toRemove) {
// loop through the new toRemove list, and add it to the old one,
// plus remove any file that was still to compile and that are now
// removed
for (AidlData r : toRemove) {
if (mAidlToRemove.indexOf(r) == -1) {
mAidlToRemove.add(r);
}
int index = mAidlToCompile.indexOf(r);
if (index != -1) {
mAidlToCompile.remove(index);
}
}
// now loop through the new files to compile and add it to the list.
// Also look for them in the remove list, this would mean that they
// were removed, then added back, and we shouldn't remove them, just
// recompile them.
for (AidlData r : toCompile) {
if (mAidlToCompile.indexOf(r) == -1) {
mAidlToCompile.add(r);
}
int index = mAidlToRemove.indexOf(r);
if (index != -1) {
mAidlToRemove.remove(index);
}
}
}
}
| true | true | protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
throws CoreException {
try {
mDerivedProgressMonitor.reset();
// First thing we do is go through the resource delta to not
// lose it if we have to abort the build for any reason.
// get the project objects
IProject project = getProject();
// Top level check to make sure the build can move forward.
abortOnBadSetup(project);
IJavaProject javaProject = JavaCore.create(project);
IAndroidTarget projectTarget = Sdk.getCurrent().getTarget(project);
// now we need to get the classpath list
ArrayList<IPath> sourceFolderPathList = BaseProjectHelper.getSourceClasspaths(
javaProject);
PreCompilerDeltaVisitor dv = null;
String javaPackage = null;
String minSdkVersion = null;
if (kind == FULL_BUILD) {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Start_Full_Pre_Compiler);
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
} else {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Start_Inc_Pre_Compiler);
// Go through the resources and see if something changed.
// Even if the mCompileResources flag is true from a previously aborted
// build, we need to go through the Resource delta to get a possible
// list of aidl files to compile/remove.
IResourceDelta delta = getDelta(project);
if (delta == null) {
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
} else {
dv = new PreCompilerDeltaVisitor(this, sourceFolderPathList);
delta.accept(dv);
// record the state
mMustCompileResources |= dv.getCompileResources();
if (dv.getForceAidlCompile()) {
buildAidlCompilationList(project, sourceFolderPathList);
} else {
// handle aidl modification, and update mMustCompileAidl
mergeAidlFileModifications(dv.getAidlToCompile(),
dv.getAidlToRemove());
}
// get the java package from the visitor
javaPackage = dv.getManifestPackage();
minSdkVersion = dv.getMinSdkVersion();
}
}
// store the build status in the persistent storage
saveProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES , mMustCompileResources);
// if there was some XML errors, we just return w/o doing
// anything since we've put some markers in the files anyway.
if (dv != null && dv.mXmlError) {
AdtPlugin.printErrorToConsole(project, Messages.Xml_Error);
// This interrupts the build. The next builders will not run.
stopBuild(Messages.Xml_Error);
}
// get the manifest file
IFile manifest = AndroidManifestParser.getManifest(project);
if (manifest == null) {
String msg = String.format(Messages.s_File_Missing,
AndroidConstants.FN_ANDROID_MANIFEST);
AdtPlugin.printErrorToConsole(project, msg);
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
// TODO: document whether code below that uses manifest (which is now guaranteed
// to be null) will actually be executed or not.
}
// lets check the XML of the manifest first, if that hasn't been done by the
// resource delta visitor yet.
if (dv == null || dv.getCheckedManifestXml() == false) {
BasicXmlErrorListener errorListener = new BasicXmlErrorListener();
AndroidManifestParser parser = BaseProjectHelper.parseManifestForError(manifest,
errorListener);
if (errorListener.mHasXmlError == true) {
// there was an error in the manifest, its file has been marked,
// by the XmlErrorHandler.
// We return;
String msg = String.format(Messages.s_Contains_Xml_Error,
AndroidConstants.FN_ANDROID_MANIFEST);
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project, msg);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
}
// get the java package from the parser
javaPackage = parser.getPackage();
minSdkVersion = parser.getApiLevelRequirement();
}
if (minSdkVersion != null) {
int minSdkValue = -1;
try {
minSdkValue = Integer.parseInt(minSdkVersion);
} catch (NumberFormatException e) {
// it's ok, it means minSdkVersion contains a (hopefully) valid codename.
}
AndroidVersion projectVersion = projectTarget.getVersion();
if (minSdkValue != -1) {
String codename = projectVersion.getCodename();
if (codename != null) {
// integer minSdk when the target is a preview => fatal error
String msg = String.format(
"Platform %1$s is a preview and requires appication manifests to set %2$s to '%1$s'",
codename, ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
} else if (minSdkValue < projectVersion.getApiLevel()) {
// integer minSdk is not high enough for the target => warning
String msg = String.format(
"Manifest min SDK version (%1$s) is lower than project target API level (%2$d)",
minSdkVersion, projectVersion.getApiLevel());
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_WARNING);
}
} else {
// looks like the min sdk is a codename, check it matches the codename
// of the platform
String codename = projectVersion.getCodename();
if (codename == null) {
// platform is not a preview => fatal error
String msg = String.format(
"Manifest attribute '%1$s' is set to '%2$s'. Integer is expected.",
ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, codename);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
} else if (codename.equals(minSdkVersion) == false) {
// platform and manifest codenames don't match => fatal error.
String msg = String.format(
"Value of manifest attribute '%1$s' does not match platform codename '%2$s'",
ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, codename);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
}
}
} else if (projectTarget.getVersion().isPreview()) {
// else the minSdkVersion is not set but we are using a preview target.
// Display an error
String codename = projectTarget.getVersion().getCodename();
String msg = String.format(
"Platform %1$s is a preview and requires appication manifests to set %2$s to '%1$s'",
codename, ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
}
if (javaPackage == null || javaPackage.length() == 0) {
// looks like the AndroidManifest file isn't valid.
String msg = String.format(Messages.s_Doesnt_Declare_Package_Error,
AndroidConstants.FN_ANDROID_MANIFEST);
AdtPlugin.printErrorToConsole(project, msg);
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
// TODO: document whether code below that uses javaPackage (which is now guaranteed
// to be null) will actually be executed or not.
}
// at this point we have the java package. We need to make sure it's not a different
// package than the previous one that were built.
if (javaPackage != null && javaPackage.equals(mManifestPackage) == false) {
// The manifest package has changed, the user may want to update
// the launch configuration
if (mManifestPackage != null) {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Checking_Package_Change);
FixLaunchConfig flc = new FixLaunchConfig(project, mManifestPackage,
javaPackage);
flc.start();
}
// now we delete the generated classes from their previous location
deleteObsoleteGeneratedClass(AndroidConstants.FN_RESOURCE_CLASS,
mManifestPackage);
deleteObsoleteGeneratedClass(AndroidConstants.FN_MANIFEST_CLASS,
mManifestPackage);
// record the new manifest package, and save it.
mManifestPackage = javaPackage;
saveProjectStringProperty(PROPERTY_PACKAGE, mManifestPackage);
}
if (mMustCompileResources) {
// we need to figure out where to store the R class.
// get the parent folder for R.java and update mManifestPackageSourceFolder
IFolder packageFolder = getGenManifestPackageFolder(project);
// get the resource folder
IFolder resFolder = project.getFolder(AndroidConstants.WS_RESOURCES);
// get the file system path
IPath outputLocation = mGenFolder.getLocation();
IPath resLocation = resFolder.getLocation();
IPath manifestLocation = manifest == null ? null : manifest.getLocation();
// those locations have to exist for us to do something!
if (outputLocation != null && resLocation != null
&& manifestLocation != null) {
String osOutputPath = outputLocation.toOSString();
String osResPath = resLocation.toOSString();
String osManifestPath = manifestLocation.toOSString();
// remove the aapt markers
removeMarkersFromFile(manifest, AndroidConstants.MARKER_AAPT_COMPILE);
removeMarkersFromContainer(resFolder, AndroidConstants.MARKER_AAPT_COMPILE);
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Preparing_Generated_Files);
// since the R.java file may be already existing in read-only
// mode we need to make it readable so that aapt can overwrite
// it
IFile rJavaFile = packageFolder.getFile(AndroidConstants.FN_RESOURCE_CLASS);
// do the same for the Manifest.java class
IFile manifestJavaFile = packageFolder.getFile(
AndroidConstants.FN_MANIFEST_CLASS);
// we actually need to delete the manifest.java as it may become empty and
// in this case aapt doesn't generate an empty one, but instead doesn't
// touch it.
manifestJavaFile.delete(true, null);
// launch aapt: create the command line
ArrayList<String> array = new ArrayList<String>();
array.add(projectTarget.getPath(IAndroidTarget.AAPT));
array.add("package"); //$NON-NLS-1$
array.add("-m"); //$NON-NLS-1$
if (AdtPlugin.getBuildVerbosity() == AdtConstants.BUILD_VERBOSE) {
array.add("-v"); //$NON-NLS-1$
}
array.add("-J"); //$NON-NLS-1$
array.add(osOutputPath);
array.add("-M"); //$NON-NLS-1$
array.add(osManifestPath);
array.add("-S"); //$NON-NLS-1$
array.add(osResPath);
array.add("-I"); //$NON-NLS-1$
array.add(projectTarget.getPath(IAndroidTarget.ANDROID_JAR));
if (AdtPlugin.getBuildVerbosity() == AdtConstants.BUILD_VERBOSE) {
StringBuilder sb = new StringBuilder();
for (String c : array) {
sb.append(c);
sb.append(' ');
}
String cmd_line = sb.toString();
AdtPlugin.printToConsole(project, cmd_line);
}
// launch
int execError = 1;
try {
// launch the command line process
Process process = Runtime.getRuntime().exec(
array.toArray(new String[array.size()]));
// list to store each line of stderr
ArrayList<String> results = new ArrayList<String>();
// get the output and return code from the process
execError = grabProcessOutput(process, results);
// attempt to parse the error output
boolean parsingError = parseAaptOutput(results, project);
// if we couldn't parse the output we display it in the console.
if (parsingError) {
if (execError != 0) {
AdtPlugin.printErrorToConsole(project, results.toArray());
} else {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_NORMAL,
project, results.toArray());
}
}
if (execError != 0) {
// if the exec failed, and we couldn't parse the error output
// (and therefore not all files that should have been marked,
// were marked), we put a generic marker on the project and abort.
if (parsingError) {
markProject(AdtConstants.MARKER_ADT, Messages.Unparsed_AAPT_Errors,
IMarker.SEVERITY_ERROR);
}
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.AAPT_Error);
// abort if exec failed.
// This interrupts the build. The next builders will not run.
stopBuild(Messages.AAPT_Error);
}
} catch (IOException e1) {
// something happen while executing the process,
// mark the project and exit
String msg = String.format(Messages.AAPT_Exec_Error, array.get(0));
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
} catch (InterruptedException e) {
// we got interrupted waiting for the process to end...
// mark the project and exit
String msg = String.format(Messages.AAPT_Exec_Error, array.get(0));
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
}
// if the return code was OK, we refresh the folder that
// contains R.java to force a java recompile.
if (execError == 0) {
// now add the R.java/Manifest.java to the list of file to be marked
// as derived.
mDerivedProgressMonitor.addFile(rJavaFile);
mDerivedProgressMonitor.addFile(manifestJavaFile);
// build has been done. reset the state of the builder
mMustCompileResources = false;
// and store it
saveProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES,
mMustCompileResources);
}
}
} else {
// nothing to do
}
// now handle the aidl stuff.
boolean aidlStatus = handleAidl(projectTarget, sourceFolderPathList, monitor);
if (aidlStatus == false && mMustCompileResources == false) {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Nothing_To_Compile);
}
} finally {
// refresh the 'gen' source folder. Once this is done with the custom progress
// monitor to mark all new files as derived
mGenFolder.refreshLocal(IResource.DEPTH_INFINITE, mDerivedProgressMonitor);
}
return null;
}
| protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
throws CoreException {
try {
mDerivedProgressMonitor.reset();
// First thing we do is go through the resource delta to not
// lose it if we have to abort the build for any reason.
// get the project objects
IProject project = getProject();
// Top level check to make sure the build can move forward.
abortOnBadSetup(project);
IJavaProject javaProject = JavaCore.create(project);
IAndroidTarget projectTarget = Sdk.getCurrent().getTarget(project);
// now we need to get the classpath list
ArrayList<IPath> sourceFolderPathList = BaseProjectHelper.getSourceClasspaths(
javaProject);
PreCompilerDeltaVisitor dv = null;
String javaPackage = null;
String minSdkVersion = null;
if (kind == FULL_BUILD) {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Start_Full_Pre_Compiler);
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
} else {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Start_Inc_Pre_Compiler);
// Go through the resources and see if something changed.
// Even if the mCompileResources flag is true from a previously aborted
// build, we need to go through the Resource delta to get a possible
// list of aidl files to compile/remove.
IResourceDelta delta = getDelta(project);
if (delta == null) {
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
} else {
dv = new PreCompilerDeltaVisitor(this, sourceFolderPathList);
delta.accept(dv);
// record the state
mMustCompileResources |= dv.getCompileResources();
if (dv.getForceAidlCompile()) {
buildAidlCompilationList(project, sourceFolderPathList);
} else {
// handle aidl modification, and update mMustCompileAidl
mergeAidlFileModifications(dv.getAidlToCompile(),
dv.getAidlToRemove());
}
// get the java package from the visitor
javaPackage = dv.getManifestPackage();
minSdkVersion = dv.getMinSdkVersion();
}
}
// store the build status in the persistent storage
saveProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES , mMustCompileResources);
// if there was some XML errors, we just return w/o doing
// anything since we've put some markers in the files anyway.
if (dv != null && dv.mXmlError) {
AdtPlugin.printErrorToConsole(project, Messages.Xml_Error);
// This interrupts the build. The next builders will not run.
stopBuild(Messages.Xml_Error);
}
// get the manifest file
IFile manifest = AndroidManifestParser.getManifest(project);
if (manifest == null) {
String msg = String.format(Messages.s_File_Missing,
AndroidConstants.FN_ANDROID_MANIFEST);
AdtPlugin.printErrorToConsole(project, msg);
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
// TODO: document whether code below that uses manifest (which is now guaranteed
// to be null) will actually be executed or not.
}
// lets check the XML of the manifest first, if that hasn't been done by the
// resource delta visitor yet.
if (dv == null || dv.getCheckedManifestXml() == false) {
BasicXmlErrorListener errorListener = new BasicXmlErrorListener();
AndroidManifestParser parser = BaseProjectHelper.parseManifestForError(manifest,
errorListener);
if (errorListener.mHasXmlError == true) {
// there was an error in the manifest, its file has been marked,
// by the XmlErrorHandler.
// We return;
String msg = String.format(Messages.s_Contains_Xml_Error,
AndroidConstants.FN_ANDROID_MANIFEST);
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project, msg);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
}
// get the java package from the parser
javaPackage = parser.getPackage();
minSdkVersion = parser.getApiLevelRequirement();
}
if (minSdkVersion != null) {
int minSdkValue = -1;
try {
minSdkValue = Integer.parseInt(minSdkVersion);
} catch (NumberFormatException e) {
// it's ok, it means minSdkVersion contains a (hopefully) valid codename.
}
AndroidVersion projectVersion = projectTarget.getVersion();
if (minSdkValue != -1) {
String codename = projectVersion.getCodename();
if (codename != null) {
// integer minSdk when the target is a preview => fatal error
String msg = String.format(
"Platform %1$s is a preview and requires appication manifests to set %2$s to '%1$s'",
codename, ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
} else if (minSdkValue < projectVersion.getApiLevel()) {
// integer minSdk is not high enough for the target => warning
String msg = String.format(
"Manifest min SDK version (%1$s) is lower than project target API level (%2$d)",
minSdkVersion, projectVersion.getApiLevel());
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_WARNING);
}
} else {
// looks like the min sdk is a codename, check it matches the codename
// of the platform
String codename = projectVersion.getCodename();
if (codename == null) {
// platform is not a preview => fatal error
String msg = String.format(
"Manifest attribute '%1$s' is set to '%2$s'. Integer is expected.",
ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, minSdkVersion);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
} else if (codename.equals(minSdkVersion) == false) {
// platform and manifest codenames don't match => fatal error.
String msg = String.format(
"Value of manifest attribute '%1$s' does not match platform codename '%2$s'",
ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, codename);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
}
}
} else if (projectTarget.getVersion().isPreview()) {
// else the minSdkVersion is not set but we are using a preview target.
// Display an error
String codename = projectTarget.getVersion().getCodename();
String msg = String.format(
"Platform %1$s is a preview and requires appication manifests to set %2$s to '%1$s'",
codename, ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
}
if (javaPackage == null || javaPackage.length() == 0) {
// looks like the AndroidManifest file isn't valid.
String msg = String.format(Messages.s_Doesnt_Declare_Package_Error,
AndroidConstants.FN_ANDROID_MANIFEST);
AdtPlugin.printErrorToConsole(project, msg);
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
// TODO: document whether code below that uses javaPackage (which is now guaranteed
// to be null) will actually be executed or not.
}
// at this point we have the java package. We need to make sure it's not a different
// package than the previous one that were built.
if (javaPackage != null && javaPackage.equals(mManifestPackage) == false) {
// The manifest package has changed, the user may want to update
// the launch configuration
if (mManifestPackage != null) {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Checking_Package_Change);
FixLaunchConfig flc = new FixLaunchConfig(project, mManifestPackage,
javaPackage);
flc.start();
}
// now we delete the generated classes from their previous location
deleteObsoleteGeneratedClass(AndroidConstants.FN_RESOURCE_CLASS,
mManifestPackage);
deleteObsoleteGeneratedClass(AndroidConstants.FN_MANIFEST_CLASS,
mManifestPackage);
// record the new manifest package, and save it.
mManifestPackage = javaPackage;
saveProjectStringProperty(PROPERTY_PACKAGE, mManifestPackage);
}
if (mMustCompileResources) {
// we need to figure out where to store the R class.
// get the parent folder for R.java and update mManifestPackageSourceFolder
IFolder packageFolder = getGenManifestPackageFolder(project);
// get the resource folder
IFolder resFolder = project.getFolder(AndroidConstants.WS_RESOURCES);
// get the file system path
IPath outputLocation = mGenFolder.getLocation();
IPath resLocation = resFolder.getLocation();
IPath manifestLocation = manifest == null ? null : manifest.getLocation();
// those locations have to exist for us to do something!
if (outputLocation != null && resLocation != null
&& manifestLocation != null) {
String osOutputPath = outputLocation.toOSString();
String osResPath = resLocation.toOSString();
String osManifestPath = manifestLocation.toOSString();
// remove the aapt markers
removeMarkersFromFile(manifest, AndroidConstants.MARKER_AAPT_COMPILE);
removeMarkersFromContainer(resFolder, AndroidConstants.MARKER_AAPT_COMPILE);
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Preparing_Generated_Files);
// since the R.java file may be already existing in read-only
// mode we need to make it readable so that aapt can overwrite
// it
IFile rJavaFile = packageFolder.getFile(AndroidConstants.FN_RESOURCE_CLASS);
// do the same for the Manifest.java class
IFile manifestJavaFile = packageFolder.getFile(
AndroidConstants.FN_MANIFEST_CLASS);
// we actually need to delete the manifest.java as it may become empty and
// in this case aapt doesn't generate an empty one, but instead doesn't
// touch it.
manifestJavaFile.delete(true, null);
// launch aapt: create the command line
ArrayList<String> array = new ArrayList<String>();
array.add(projectTarget.getPath(IAndroidTarget.AAPT));
array.add("package"); //$NON-NLS-1$
array.add("-m"); //$NON-NLS-1$
if (AdtPlugin.getBuildVerbosity() == AdtConstants.BUILD_VERBOSE) {
array.add("-v"); //$NON-NLS-1$
}
array.add("-J"); //$NON-NLS-1$
array.add(osOutputPath);
array.add("-M"); //$NON-NLS-1$
array.add(osManifestPath);
array.add("-S"); //$NON-NLS-1$
array.add(osResPath);
array.add("-I"); //$NON-NLS-1$
array.add(projectTarget.getPath(IAndroidTarget.ANDROID_JAR));
if (AdtPlugin.getBuildVerbosity() == AdtConstants.BUILD_VERBOSE) {
StringBuilder sb = new StringBuilder();
for (String c : array) {
sb.append(c);
sb.append(' ');
}
String cmd_line = sb.toString();
AdtPlugin.printToConsole(project, cmd_line);
}
// launch
int execError = 1;
try {
// launch the command line process
Process process = Runtime.getRuntime().exec(
array.toArray(new String[array.size()]));
// list to store each line of stderr
ArrayList<String> results = new ArrayList<String>();
// get the output and return code from the process
execError = grabProcessOutput(process, results);
// attempt to parse the error output
boolean parsingError = parseAaptOutput(results, project);
// if we couldn't parse the output we display it in the console.
if (parsingError) {
if (execError != 0) {
AdtPlugin.printErrorToConsole(project, results.toArray());
} else {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_NORMAL,
project, results.toArray());
}
}
if (execError != 0) {
// if the exec failed, and we couldn't parse the error output
// (and therefore not all files that should have been marked,
// were marked), we put a generic marker on the project and abort.
if (parsingError) {
markProject(AdtConstants.MARKER_ADT, Messages.Unparsed_AAPT_Errors,
IMarker.SEVERITY_ERROR);
}
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.AAPT_Error);
// abort if exec failed.
// This interrupts the build. The next builders will not run.
stopBuild(Messages.AAPT_Error);
}
} catch (IOException e1) {
// something happen while executing the process,
// mark the project and exit
String msg = String.format(Messages.AAPT_Exec_Error, array.get(0));
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
} catch (InterruptedException e) {
// we got interrupted waiting for the process to end...
// mark the project and exit
String msg = String.format(Messages.AAPT_Exec_Error, array.get(0));
markProject(AdtConstants.MARKER_ADT, msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
}
// if the return code was OK, we refresh the folder that
// contains R.java to force a java recompile.
if (execError == 0) {
// now add the R.java/Manifest.java to the list of file to be marked
// as derived.
mDerivedProgressMonitor.addFile(rJavaFile);
mDerivedProgressMonitor.addFile(manifestJavaFile);
// build has been done. reset the state of the builder
mMustCompileResources = false;
// and store it
saveProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES,
mMustCompileResources);
}
}
} else {
// nothing to do
}
// now handle the aidl stuff.
boolean aidlStatus = handleAidl(projectTarget, sourceFolderPathList, monitor);
if (aidlStatus == false && mMustCompileResources == false) {
AdtPlugin.printBuildToConsole(AdtConstants.BUILD_VERBOSE, project,
Messages.Nothing_To_Compile);
}
} finally {
// refresh the 'gen' source folder. Once this is done with the custom progress
// monitor to mark all new files as derived
mGenFolder.refreshLocal(IResource.DEPTH_INFINITE, mDerivedProgressMonitor);
}
return null;
}
|
diff --git a/sandbox/camp/src/test/java/io/brooklyn/camp/brooklyn/YamlLauncher.java b/sandbox/camp/src/test/java/io/brooklyn/camp/brooklyn/YamlLauncher.java
index 260596f54..afaf247c6 100644
--- a/sandbox/camp/src/test/java/io/brooklyn/camp/brooklyn/YamlLauncher.java
+++ b/sandbox/camp/src/test/java/io/brooklyn/camp/brooklyn/YamlLauncher.java
@@ -1,84 +1,84 @@
package io.brooklyn.camp.brooklyn;
import io.brooklyn.camp.CampServer;
import io.brooklyn.camp.brooklyn.spi.creation.BrooklynAssemblyTemplateInstantiator;
import io.brooklyn.camp.brooklyn.spi.lookup.BrooklynUrlLookup;
import io.brooklyn.camp.spi.Assembly;
import io.brooklyn.camp.spi.AssemblyTemplate;
import io.brooklyn.camp.spi.PlatformRootSummary;
import java.io.Reader;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.BrooklynProperties;
import brooklyn.entity.Entity;
import brooklyn.entity.basic.BrooklynTasks;
import brooklyn.entity.basic.Entities;
import brooklyn.launcher.BrooklynLauncher;
import brooklyn.management.ManagementContext;
import brooklyn.management.Task;
import brooklyn.util.ResourceUtils;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.stream.Streams;
public class YamlLauncher {
private static final Logger log = LoggerFactory.getLogger(YamlLauncher.class);
private ManagementContext brooklynMgmt;
private BrooklynCampPlatform platform;
public void launchPlatform() {
BrooklynLauncher launcher = BrooklynLauncher.newInstance()
.start();
((BrooklynProperties)launcher.getServerDetails().getManagementContext().getConfig()).
put(BrooklynUrlLookup.BROOKLYN_ROOT_URL, launcher.getServerDetails().getWebServerUrl());
brooklynMgmt = launcher.getServerDetails().getManagementContext();
platform = new BrooklynCampPlatform(
PlatformRootSummary.builder().name("Brooklyn CAMP Platform").build(),
brooklynMgmt);
new CampServer(platform, "").start();
}
public void launchAppYaml(String filename) {
try {
Reader input = Streams.reader(new ResourceUtils(this).getResourceFromUrl(filename));
AssemblyTemplate at = platform.pdp().registerDeploymentPlan(input);
Assembly assembly = at.getInstantiator().newInstance().instantiate(at, platform);
Entity app = brooklynMgmt.getEntityManager().getEntity(assembly.getId());
log.info("Launching "+app);
Set<Task<?>> tasks = BrooklynTasks.getTasksInEntityContext(brooklynMgmt.getExecutionManager(), app);
log.info("Waiting on "+tasks.size()+" task(s)");
for (Task<?> t: tasks) t.blockUntilEnded();
- log.info("App started:");
+ log.info("Application started from YAML file "+filename+": "+app);
Entities.dumpInfo(app);
} catch (Exception e) {
throw Exceptions.propagate(e);
}
}
public static void main(String[] args) {
BrooklynAssemblyTemplateInstantiator.TARGET_LOCATION =
"localhost"
//"named:hpcloud-compute-us-west-az1"
//"aws-ec2:us-west-2"
;
YamlLauncher l = new YamlLauncher();
l.launchPlatform();
// l.launchAppYaml("java-web-app-and-db-with-function.yaml");
// l.launchAppYaml("java-web-app-and-memsql.yaml");
// l.launchAppYaml("memsql.yaml");
l.launchAppYaml("playing.yaml");
}
}
| true | true | public void launchAppYaml(String filename) {
try {
Reader input = Streams.reader(new ResourceUtils(this).getResourceFromUrl(filename));
AssemblyTemplate at = platform.pdp().registerDeploymentPlan(input);
Assembly assembly = at.getInstantiator().newInstance().instantiate(at, platform);
Entity app = brooklynMgmt.getEntityManager().getEntity(assembly.getId());
log.info("Launching "+app);
Set<Task<?>> tasks = BrooklynTasks.getTasksInEntityContext(brooklynMgmt.getExecutionManager(), app);
log.info("Waiting on "+tasks.size()+" task(s)");
for (Task<?> t: tasks) t.blockUntilEnded();
log.info("App started:");
Entities.dumpInfo(app);
} catch (Exception e) {
throw Exceptions.propagate(e);
}
}
| public void launchAppYaml(String filename) {
try {
Reader input = Streams.reader(new ResourceUtils(this).getResourceFromUrl(filename));
AssemblyTemplate at = platform.pdp().registerDeploymentPlan(input);
Assembly assembly = at.getInstantiator().newInstance().instantiate(at, platform);
Entity app = brooklynMgmt.getEntityManager().getEntity(assembly.getId());
log.info("Launching "+app);
Set<Task<?>> tasks = BrooklynTasks.getTasksInEntityContext(brooklynMgmt.getExecutionManager(), app);
log.info("Waiting on "+tasks.size()+" task(s)");
for (Task<?> t: tasks) t.blockUntilEnded();
log.info("Application started from YAML file "+filename+": "+app);
Entities.dumpInfo(app);
} catch (Exception e) {
throw Exceptions.propagate(e);
}
}
|
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java
index d6ebfd2a6..3701990cd 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java
@@ -1,170 +1,170 @@
package net.aufdemrand.denizen.scripts.commands.core;
import net.aufdemrand.denizen.exceptions.CommandExecutionException;
import net.aufdemrand.denizen.exceptions.InvalidArgumentsException;
import net.aufdemrand.denizen.objects.Element;
import net.aufdemrand.denizen.objects.dScript;
import net.aufdemrand.denizen.scripts.ScriptEntry;
import net.aufdemrand.denizen.scripts.commands.AbstractCommand;
import net.aufdemrand.denizen.scripts.containers.core.InteractScriptHelper;
import net.aufdemrand.denizen.objects.Duration;
import net.aufdemrand.denizen.objects.aH;
import net.aufdemrand.denizen.utilities.debugging.dB;
import net.aufdemrand.denizen.utilities.debugging.dB.Messages;
import org.bukkit.event.Listener;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* <p>Changes a Player's current step for a script. Reminder: ZAP does NOT trigger anything. It merely
* tells Denizen's ScriptEngine which step should be used WHEN interacting.</p>
*
* <b>dScript Usage:</b><br>
* <pre>ZAP [#|STEP:step_name] (SCRIPT:script_name{current_script}) (DURATION:#{0})</pre>
*
* <ol><tt>Arguments: [] - Required () - Optional {} - Default</ol></tt>
*
* <ol><tt>[#|STEP:step_name]</tt><br>
* The name of the step that should be enabled. If using numbered steps, an plain integer will
* suffice.</ol>
*
* <ol><tt>(SCRIPT:script_name{current_script})</tt><br>
* Specifies which script should be affected. If not specified, the current interact script will
* be used.</ol>
*
* <ol><tt>(DURATION:#{0})</tt><br>
* Optional. If not specified, no duration is used. If specified, after the duration period,
* Denizen will automatically reset the step to the original step. Note: If another ZAP command
* is utilized for the same Player and Script during a duration period, the reset in progress
* is cancelled.</ol>
*
* <br><b>Example Usage:</b><br>
* <ol><tt>
* - ZAP SCRIPT:OtherScript 6<br>
* - ZAP 'STEP:Just for a minute' DURATION:1m<br>
* </ol></tt>
*
* @author Jeremy Schroeder
*/
public class ZapCommand extends AbstractCommand implements Listener{
@Override
public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) {
// If the scripter uses the 'script:step' format, handle it.
if (!scriptEntry.hasObject("script")
&& !scriptEntry.hasObject("step")
&& arg.hasPrefix()
&& arg.getPrefix().matchesArgumentType(dScript.class)) {
scriptEntry.addObject("script", arg.getPrefix().asType(dScript.class));
scriptEntry.addObject("step", arg.asElement());
}
// If a script is found, use that to ZAP
else if (!scriptEntry.hasObject("script")
&& arg.matchesArgumentType(dScript.class)
&& !arg.matchesPrefix("step"))
scriptEntry.addObject("script", arg.asType(dScript.class));
// Add argument as step
else if (!scriptEntry.hasObject("step"))
scriptEntry.addObject("step", arg.asElement());
// Lastly duration
else if (!scriptEntry.hasObject("duration")
&& arg.matchesArgumentType(Duration.class))
scriptEntry.addObject("duration", arg.asType(Duration.class));
}
// Add default script if none was specified.
scriptEntry.defaultObject("script", scriptEntry.getScript());
// Check if player is valid
if (!scriptEntry.hasPlayer() || !scriptEntry.getPlayer().isValid())
throw new InvalidArgumentsException("Must have player context!");
}
//"PlayerName,ScriptName", TaskID
private static Map<String, Integer> durations = new ConcurrentHashMap<String, Integer>(8, 0.9f, 1);
@Override
public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException {
final dScript script = (dScript) scriptEntry.getObject("script");
Duration duration = (Duration) scriptEntry.getObject("duration");
dB.report(getName(), scriptEntry.getPlayer().debug() + script.debug()
+ (scriptEntry.hasObject("step")
? scriptEntry.getElement("step").debug() : aH.debugObj("step", "++ (inc)"))
+ (duration != null ? duration.debug() : ""));
String step = scriptEntry.hasObject("step") ? scriptEntry.getElement("step").asString() : null;
// Let's get the current step for reference.
String currentStep = InteractScriptHelper.getCurrentStep(scriptEntry.getPlayer(), script.getName());
// Special-case for backwards compatibility: ability to use ZAP to count up steps.
if (step == null) {
// Okay, no step was identified.. that means we should count up,
// ie. if currentStep = 1, new step should = 2
// If the currentStep is a number, increment it. If not, set it
// to '1' so it can be incremented next time.
if (aH.matchesInteger(currentStep)) {
step = String.valueOf(aH.getIntegerFrom(currentStep) + 1);
} else step = "1";
}
// If the durationsMap already contains an entry for this player/script combination,
// cancel the task since it's probably not desired to change back anymore if another
// ZAP for this script is taking place.
if (durations.containsKey(scriptEntry.getPlayer().getName() + "," + script.getName()))
try {
denizen.getServer().getScheduler().cancelTask(durations.get(scriptEntry.getPlayer().getName() + "," + script.getName()));
} catch (Exception e) { }
// One last thing... check for duration.
if (duration != null && duration.getSeconds() > 0) {
// If a DURATION is specified, the currentStep should be remembered and
// restored after the duration.
- scriptEntry.addObject("step", currentStep);
+ scriptEntry.addObject("step", new Element(currentStep));
// And let's take away the duration that was set to avoid a re-duration
// inception-ion-ion-ion-ion... ;)
scriptEntry.addObject("duration", Duration.ZERO);
// Now let's add a delayed task to set it back after the duration
// Delays are in ticks, so let's multiply our duration (which is in seconds) by 20.
// 20 ticks per second.
long delay = (long) (duration.getSeconds() * 20);
// Set delayed task and put id in a map
dB.echoDebug(Messages.DEBUG_SETTING_DELAYED_TASK, "RESET ZAP for '" + script + "'");
durations.put(scriptEntry.getPlayer().getName() + "," + script.getName(),
denizen.getServer().getScheduler().scheduleSyncDelayedTask(denizen,
new Runnable() {
@Override
public void run() {
dB.log(Messages.DEBUG_RUNNING_DELAYED_TASK, "RESET ZAP for '" + script.getName() + "'");
try {
durations.remove(scriptEntry.getPlayer().getName() + "," + script.getName().toUpperCase());
execute(scriptEntry);
} catch (CommandExecutionException e) {
dB.echoError("Could not run delayed task!");
if (dB.showStackTraces) e.printStackTrace();
}
}
}, delay));
}
//
// FINALLY! ZAP! Change the step in Saves... your step is now ZAPPED!
// Fun fact: ZAP is named in homage of ZZT-OOPs ZAP command. Google it.
//
denizen.getSaves().set("Players." + scriptEntry.getPlayer().getName() + ".Scripts." + script.getName().toUpperCase() + "." + "Current Step", step);
}
}
| true | true | public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException {
final dScript script = (dScript) scriptEntry.getObject("script");
Duration duration = (Duration) scriptEntry.getObject("duration");
dB.report(getName(), scriptEntry.getPlayer().debug() + script.debug()
+ (scriptEntry.hasObject("step")
? scriptEntry.getElement("step").debug() : aH.debugObj("step", "++ (inc)"))
+ (duration != null ? duration.debug() : ""));
String step = scriptEntry.hasObject("step") ? scriptEntry.getElement("step").asString() : null;
// Let's get the current step for reference.
String currentStep = InteractScriptHelper.getCurrentStep(scriptEntry.getPlayer(), script.getName());
// Special-case for backwards compatibility: ability to use ZAP to count up steps.
if (step == null) {
// Okay, no step was identified.. that means we should count up,
// ie. if currentStep = 1, new step should = 2
// If the currentStep is a number, increment it. If not, set it
// to '1' so it can be incremented next time.
if (aH.matchesInteger(currentStep)) {
step = String.valueOf(aH.getIntegerFrom(currentStep) + 1);
} else step = "1";
}
// If the durationsMap already contains an entry for this player/script combination,
// cancel the task since it's probably not desired to change back anymore if another
// ZAP for this script is taking place.
if (durations.containsKey(scriptEntry.getPlayer().getName() + "," + script.getName()))
try {
denizen.getServer().getScheduler().cancelTask(durations.get(scriptEntry.getPlayer().getName() + "," + script.getName()));
} catch (Exception e) { }
// One last thing... check for duration.
if (duration != null && duration.getSeconds() > 0) {
// If a DURATION is specified, the currentStep should be remembered and
// restored after the duration.
scriptEntry.addObject("step", currentStep);
// And let's take away the duration that was set to avoid a re-duration
// inception-ion-ion-ion-ion... ;)
scriptEntry.addObject("duration", Duration.ZERO);
// Now let's add a delayed task to set it back after the duration
// Delays are in ticks, so let's multiply our duration (which is in seconds) by 20.
// 20 ticks per second.
long delay = (long) (duration.getSeconds() * 20);
// Set delayed task and put id in a map
dB.echoDebug(Messages.DEBUG_SETTING_DELAYED_TASK, "RESET ZAP for '" + script + "'");
durations.put(scriptEntry.getPlayer().getName() + "," + script.getName(),
denizen.getServer().getScheduler().scheduleSyncDelayedTask(denizen,
new Runnable() {
@Override
public void run() {
dB.log(Messages.DEBUG_RUNNING_DELAYED_TASK, "RESET ZAP for '" + script.getName() + "'");
try {
durations.remove(scriptEntry.getPlayer().getName() + "," + script.getName().toUpperCase());
execute(scriptEntry);
} catch (CommandExecutionException e) {
dB.echoError("Could not run delayed task!");
if (dB.showStackTraces) e.printStackTrace();
}
}
}, delay));
}
//
// FINALLY! ZAP! Change the step in Saves... your step is now ZAPPED!
// Fun fact: ZAP is named in homage of ZZT-OOPs ZAP command. Google it.
//
denizen.getSaves().set("Players." + scriptEntry.getPlayer().getName() + ".Scripts." + script.getName().toUpperCase() + "." + "Current Step", step);
}
| public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException {
final dScript script = (dScript) scriptEntry.getObject("script");
Duration duration = (Duration) scriptEntry.getObject("duration");
dB.report(getName(), scriptEntry.getPlayer().debug() + script.debug()
+ (scriptEntry.hasObject("step")
? scriptEntry.getElement("step").debug() : aH.debugObj("step", "++ (inc)"))
+ (duration != null ? duration.debug() : ""));
String step = scriptEntry.hasObject("step") ? scriptEntry.getElement("step").asString() : null;
// Let's get the current step for reference.
String currentStep = InteractScriptHelper.getCurrentStep(scriptEntry.getPlayer(), script.getName());
// Special-case for backwards compatibility: ability to use ZAP to count up steps.
if (step == null) {
// Okay, no step was identified.. that means we should count up,
// ie. if currentStep = 1, new step should = 2
// If the currentStep is a number, increment it. If not, set it
// to '1' so it can be incremented next time.
if (aH.matchesInteger(currentStep)) {
step = String.valueOf(aH.getIntegerFrom(currentStep) + 1);
} else step = "1";
}
// If the durationsMap already contains an entry for this player/script combination,
// cancel the task since it's probably not desired to change back anymore if another
// ZAP for this script is taking place.
if (durations.containsKey(scriptEntry.getPlayer().getName() + "," + script.getName()))
try {
denizen.getServer().getScheduler().cancelTask(durations.get(scriptEntry.getPlayer().getName() + "," + script.getName()));
} catch (Exception e) { }
// One last thing... check for duration.
if (duration != null && duration.getSeconds() > 0) {
// If a DURATION is specified, the currentStep should be remembered and
// restored after the duration.
scriptEntry.addObject("step", new Element(currentStep));
// And let's take away the duration that was set to avoid a re-duration
// inception-ion-ion-ion-ion... ;)
scriptEntry.addObject("duration", Duration.ZERO);
// Now let's add a delayed task to set it back after the duration
// Delays are in ticks, so let's multiply our duration (which is in seconds) by 20.
// 20 ticks per second.
long delay = (long) (duration.getSeconds() * 20);
// Set delayed task and put id in a map
dB.echoDebug(Messages.DEBUG_SETTING_DELAYED_TASK, "RESET ZAP for '" + script + "'");
durations.put(scriptEntry.getPlayer().getName() + "," + script.getName(),
denizen.getServer().getScheduler().scheduleSyncDelayedTask(denizen,
new Runnable() {
@Override
public void run() {
dB.log(Messages.DEBUG_RUNNING_DELAYED_TASK, "RESET ZAP for '" + script.getName() + "'");
try {
durations.remove(scriptEntry.getPlayer().getName() + "," + script.getName().toUpperCase());
execute(scriptEntry);
} catch (CommandExecutionException e) {
dB.echoError("Could not run delayed task!");
if (dB.showStackTraces) e.printStackTrace();
}
}
}, delay));
}
//
// FINALLY! ZAP! Change the step in Saves... your step is now ZAPPED!
// Fun fact: ZAP is named in homage of ZZT-OOPs ZAP command. Google it.
//
denizen.getSaves().set("Players." + scriptEntry.getPlayer().getName() + ".Scripts." + script.getName().toUpperCase() + "." + "Current Step", step);
}
|
diff --git a/java/src/com/android/inputmethod/voice/RecognitionView.java b/java/src/com/android/inputmethod/voice/RecognitionView.java
index 1e99c3cf..7cec0b04 100644
--- a/java/src/com/android/inputmethod/voice/RecognitionView.java
+++ b/java/src/com/android/inputmethod/voice/RecognitionView.java
@@ -1,324 +1,323 @@
/*
* Copyright (C) 2009 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.android.inputmethod.voice;
import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.ShortBuffer;
import java.util.ArrayList;
import java.util.List;
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.CornerPathEffect;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.PathEffect;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup.MarginLayoutParams;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.inputmethod.latin.R;
/**
* The user interface for the "Speak now" and "working" states.
* Displays a recognition dialog (with waveform, voice meter, etc.),
* plays beeps, shows errors, etc.
*/
public class RecognitionView {
private static final String TAG = "RecognitionView";
private Handler mUiHandler; // Reference to UI thread
private View mView;
private Context mContext;
private ImageView mImage;
private TextView mText;
private View mButton;
private TextView mButtonText;
private View mProgress;
private Drawable mInitializing;
private Drawable mError;
private List<Drawable> mSpeakNow;
private float mVolume = 0.0f;
private int mLevel = 0;
private enum State {LISTENING, WORKING, READY}
private State mState = State.READY;
private float mMinMicrophoneLevel;
private float mMaxMicrophoneLevel;
/** Updates the microphone icon to show user their volume.*/
private Runnable mUpdateVolumeRunnable = new Runnable() {
public void run() {
if (mState != State.LISTENING) {
return;
}
final float min = mMinMicrophoneLevel;
final float max = mMaxMicrophoneLevel;
final int maxLevel = mSpeakNow.size() - 1;
int index = (int) ((mVolume - min) / (max - min) * maxLevel);
final int level = Math.min(Math.max(0, index), maxLevel);
if (level != mLevel) {
mImage.setImageDrawable(mSpeakNow.get(level));
mLevel = level;
}
mUiHandler.postDelayed(mUpdateVolumeRunnable, 50);
}
};
public RecognitionView(Context context, OnClickListener clickListener) {
mUiHandler = new Handler();
LayoutInflater inflater = (LayoutInflater) context.getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
mView = inflater.inflate(R.layout.recognition_status, null);
ContentResolver cr = context.getContentResolver();
mMinMicrophoneLevel = SettingsUtil.getSettingsFloat(
cr, SettingsUtil.LATIN_IME_MIN_MICROPHONE_LEVEL, 15.f);
mMaxMicrophoneLevel = SettingsUtil.getSettingsFloat(
cr, SettingsUtil.LATIN_IME_MAX_MICROPHONE_LEVEL, 30.f);
// Pre-load volume level images
Resources r = context.getResources();
mSpeakNow = new ArrayList<Drawable>();
mSpeakNow.add(r.getDrawable(R.drawable.speak_now_level0));
mSpeakNow.add(r.getDrawable(R.drawable.speak_now_level1));
mSpeakNow.add(r.getDrawable(R.drawable.speak_now_level2));
mSpeakNow.add(r.getDrawable(R.drawable.speak_now_level3));
mSpeakNow.add(r.getDrawable(R.drawable.speak_now_level4));
mSpeakNow.add(r.getDrawable(R.drawable.speak_now_level5));
mSpeakNow.add(r.getDrawable(R.drawable.speak_now_level6));
mInitializing = r.getDrawable(R.drawable.mic_slash);
mError = r.getDrawable(R.drawable.caution);
mImage = (ImageView) mView.findViewById(R.id.image);
mButton = mView.findViewById(R.id.button);
mButton.setOnClickListener(clickListener);
mText = (TextView) mView.findViewById(R.id.text);
mButtonText = (TextView) mView.findViewById(R.id.button_text);
mProgress = mView.findViewById(R.id.progress);
mContext = context;
}
public View getView() {
return mView;
}
public void restoreState() {
mUiHandler.post(new Runnable() {
public void run() {
// Restart the spinner
if (mState == State.WORKING) {
((ProgressBar)mProgress).setIndeterminate(false);
((ProgressBar)mProgress).setIndeterminate(true);
}
}
});
}
public void showInitializing() {
mUiHandler.post(new Runnable() {
public void run() {
prepareDialog(false, mContext.getText(R.string.voice_initializing), mInitializing,
mContext.getText(R.string.cancel));
}
});
}
public void showListening() {
mUiHandler.post(new Runnable() {
public void run() {
mState = State.LISTENING;
prepareDialog(false, mContext.getText(R.string.voice_listening), mSpeakNow.get(0),
mContext.getText(R.string.cancel));
}
});
mUiHandler.postDelayed(mUpdateVolumeRunnable, 50);
}
public void updateVoiceMeter(final float rmsdB) {
mVolume = rmsdB;
}
public void showError(final String message) {
mUiHandler.post(new Runnable() {
public void run() {
mState = State.READY;
prepareDialog(false, message, mError, mContext.getText(R.string.ok));
}
});
}
public void showWorking(
final ByteArrayOutputStream waveBuffer,
final int speechStartPosition,
final int speechEndPosition) {
mUiHandler.post(new Runnable() {
public void run() {
mState = State.WORKING;
prepareDialog(true, mContext.getText(R.string.voice_working), null, mContext
.getText(R.string.cancel));
final ShortBuffer buf = ByteBuffer.wrap(waveBuffer.toByteArray()).order(
ByteOrder.nativeOrder()).asShortBuffer();
buf.position(0);
waveBuffer.reset();
showWave(buf, speechStartPosition / 2, speechEndPosition / 2);
}
});
}
private void prepareDialog(boolean spinVisible, CharSequence text, Drawable image,
CharSequence btnTxt) {
if (spinVisible) {
mProgress.setVisibility(View.VISIBLE);
mImage.setVisibility(View.GONE);
} else {
mProgress.setVisibility(View.GONE);
mImage.setImageDrawable(image);
mImage.setVisibility(View.VISIBLE);
}
mText.setText(text);
mButtonText.setText(btnTxt);
}
/**
* @return an average abs of the specified buffer.
*/
private static int getAverageAbs(ShortBuffer buffer, int start, int i, int npw) {
int from = start + i * npw;
int end = from + npw;
int total = 0;
for (int x = from; x < end; x++) {
total += Math.abs(buffer.get(x));
}
return total / npw;
}
/**
* Shows waveform of input audio.
*
* Copied from version in VoiceSearch's RecognitionActivity.
*
* TODO: adjust stroke width based on the size of data.
* TODO: use dip rather than pixels.
*/
private void showWave(ShortBuffer waveBuffer, int startPosition, int endPosition) {
final int w = ((View) mImage.getParent()).getWidth();
final int h = mImage.getHeight();
if (w <= 0 || h <= 0) {
// view is not visible this time. Skip drawing.
return;
}
final Bitmap b = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
final Canvas c = new Canvas(b);
final Paint paint = new Paint();
paint.setColor(0xFFFFFFFF); // 0xAARRGGBB
paint.setAntiAlias(true);
paint.setStyle(Paint.Style.STROKE);
paint.setAlpha(0x90);
final PathEffect effect = new CornerPathEffect(3);
paint.setPathEffect(effect);
final int numSamples = waveBuffer.remaining();
int endIndex;
if (endPosition == 0) {
endIndex = numSamples;
} else {
endIndex = Math.min(endPosition, numSamples);
}
int startIndex = startPosition - 2000; // include 250ms before speech
if (startIndex < 0) {
startIndex = 0;
}
final int numSamplePerWave = 200; // 8KHz 25ms = 200 samples
final float scale = 10.0f / 65536.0f;
final int count = (endIndex - startIndex) / numSamplePerWave;
final float deltaX = 1.0f * w / count;
- int yMax = h / 2 - 10;
+ int yMax = h / 2 - 8;
Path path = new Path();
c.translate(0, yMax);
float x = 0;
path.moveTo(x, 0);
- yMax -= 10;
for (int i = 0; i < count; i++) {
final int avabs = getAverageAbs(waveBuffer, startIndex, i , numSamplePerWave);
int sign = ( (i & 01) == 0) ? -1 : 1;
final float y = Math.min(yMax, avabs * h * scale) * sign;
path.lineTo(x, y);
x += deltaX;
path.lineTo(x, y);
}
if (deltaX > 4) {
paint.setStrokeWidth(3);
} else {
paint.setStrokeWidth(Math.max(1, (int) (deltaX -.05)));
}
c.drawPath(path, paint);
mImage.setImageBitmap(b);
mImage.setVisibility(View.VISIBLE);
MarginLayoutParams mProgressParams = (MarginLayoutParams)mProgress.getLayoutParams();
- mProgressParams.topMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
- -h / 2 - 18, mContext.getResources().getDisplayMetrics());
+ mProgressParams.topMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX,
+ -h , mContext.getResources().getDisplayMetrics());
// Tweak the padding manually to fill out the whole view horizontally.
// TODO: Do this in the xml layout instead.
((View) mImage.getParent()).setPadding(4, ((View) mImage.getParent()).getPaddingTop(), 3,
((View) mImage.getParent()).getPaddingBottom());
mProgress.setLayoutParams(mProgressParams);
}
public void finish() {
mUiHandler.post(new Runnable() {
public void run() {
mState = State.READY;
exitWorking();
}
});
}
private void exitWorking() {
mProgress.setVisibility(View.GONE);
mImage.setVisibility(View.VISIBLE);
}
}
| false | true | private void showWave(ShortBuffer waveBuffer, int startPosition, int endPosition) {
final int w = ((View) mImage.getParent()).getWidth();
final int h = mImage.getHeight();
if (w <= 0 || h <= 0) {
// view is not visible this time. Skip drawing.
return;
}
final Bitmap b = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
final Canvas c = new Canvas(b);
final Paint paint = new Paint();
paint.setColor(0xFFFFFFFF); // 0xAARRGGBB
paint.setAntiAlias(true);
paint.setStyle(Paint.Style.STROKE);
paint.setAlpha(0x90);
final PathEffect effect = new CornerPathEffect(3);
paint.setPathEffect(effect);
final int numSamples = waveBuffer.remaining();
int endIndex;
if (endPosition == 0) {
endIndex = numSamples;
} else {
endIndex = Math.min(endPosition, numSamples);
}
int startIndex = startPosition - 2000; // include 250ms before speech
if (startIndex < 0) {
startIndex = 0;
}
final int numSamplePerWave = 200; // 8KHz 25ms = 200 samples
final float scale = 10.0f / 65536.0f;
final int count = (endIndex - startIndex) / numSamplePerWave;
final float deltaX = 1.0f * w / count;
int yMax = h / 2 - 10;
Path path = new Path();
c.translate(0, yMax);
float x = 0;
path.moveTo(x, 0);
yMax -= 10;
for (int i = 0; i < count; i++) {
final int avabs = getAverageAbs(waveBuffer, startIndex, i , numSamplePerWave);
int sign = ( (i & 01) == 0) ? -1 : 1;
final float y = Math.min(yMax, avabs * h * scale) * sign;
path.lineTo(x, y);
x += deltaX;
path.lineTo(x, y);
}
if (deltaX > 4) {
paint.setStrokeWidth(3);
} else {
paint.setStrokeWidth(Math.max(1, (int) (deltaX -.05)));
}
c.drawPath(path, paint);
mImage.setImageBitmap(b);
mImage.setVisibility(View.VISIBLE);
MarginLayoutParams mProgressParams = (MarginLayoutParams)mProgress.getLayoutParams();
mProgressParams.topMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-h / 2 - 18, mContext.getResources().getDisplayMetrics());
// Tweak the padding manually to fill out the whole view horizontally.
// TODO: Do this in the xml layout instead.
((View) mImage.getParent()).setPadding(4, ((View) mImage.getParent()).getPaddingTop(), 3,
((View) mImage.getParent()).getPaddingBottom());
mProgress.setLayoutParams(mProgressParams);
}
| private void showWave(ShortBuffer waveBuffer, int startPosition, int endPosition) {
final int w = ((View) mImage.getParent()).getWidth();
final int h = mImage.getHeight();
if (w <= 0 || h <= 0) {
// view is not visible this time. Skip drawing.
return;
}
final Bitmap b = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
final Canvas c = new Canvas(b);
final Paint paint = new Paint();
paint.setColor(0xFFFFFFFF); // 0xAARRGGBB
paint.setAntiAlias(true);
paint.setStyle(Paint.Style.STROKE);
paint.setAlpha(0x90);
final PathEffect effect = new CornerPathEffect(3);
paint.setPathEffect(effect);
final int numSamples = waveBuffer.remaining();
int endIndex;
if (endPosition == 0) {
endIndex = numSamples;
} else {
endIndex = Math.min(endPosition, numSamples);
}
int startIndex = startPosition - 2000; // include 250ms before speech
if (startIndex < 0) {
startIndex = 0;
}
final int numSamplePerWave = 200; // 8KHz 25ms = 200 samples
final float scale = 10.0f / 65536.0f;
final int count = (endIndex - startIndex) / numSamplePerWave;
final float deltaX = 1.0f * w / count;
int yMax = h / 2 - 8;
Path path = new Path();
c.translate(0, yMax);
float x = 0;
path.moveTo(x, 0);
for (int i = 0; i < count; i++) {
final int avabs = getAverageAbs(waveBuffer, startIndex, i , numSamplePerWave);
int sign = ( (i & 01) == 0) ? -1 : 1;
final float y = Math.min(yMax, avabs * h * scale) * sign;
path.lineTo(x, y);
x += deltaX;
path.lineTo(x, y);
}
if (deltaX > 4) {
paint.setStrokeWidth(3);
} else {
paint.setStrokeWidth(Math.max(1, (int) (deltaX -.05)));
}
c.drawPath(path, paint);
mImage.setImageBitmap(b);
mImage.setVisibility(View.VISIBLE);
MarginLayoutParams mProgressParams = (MarginLayoutParams)mProgress.getLayoutParams();
mProgressParams.topMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX,
-h , mContext.getResources().getDisplayMetrics());
// Tweak the padding manually to fill out the whole view horizontally.
// TODO: Do this in the xml layout instead.
((View) mImage.getParent()).setPadding(4, ((View) mImage.getParent()).getPaddingTop(), 3,
((View) mImage.getParent()).getPaddingBottom());
mProgress.setLayoutParams(mProgressParams);
}
|
diff --git a/nexus/nexus-proxy/src/main/java/org/sonatype/nexus/proxy/repository/AbstractGroupRepositoryValidator.java b/nexus/nexus-proxy/src/main/java/org/sonatype/nexus/proxy/repository/AbstractGroupRepositoryValidator.java
index 4f578f990..47c789b29 100644
--- a/nexus/nexus-proxy/src/main/java/org/sonatype/nexus/proxy/repository/AbstractGroupRepositoryValidator.java
+++ b/nexus/nexus-proxy/src/main/java/org/sonatype/nexus/proxy/repository/AbstractGroupRepositoryValidator.java
@@ -1,61 +1,62 @@
package org.sonatype.nexus.proxy.repository;
import org.sonatype.nexus.configuration.ExternalConfiguration;
import org.sonatype.nexus.configuration.application.ApplicationConfiguration;
import org.sonatype.nexus.configuration.model.CRepository;
import org.sonatype.nexus.configuration.validator.ApplicationValidationResponse;
import org.sonatype.nexus.configuration.validator.InvalidConfigurationException;
import org.sonatype.nexus.configuration.validator.ValidationMessage;
import org.sonatype.nexus.configuration.validator.ValidationResponse;
import org.sonatype.nexus.proxy.NoSuchRepositoryException;
import org.sonatype.nexus.proxy.registry.ContentClass;
public abstract class AbstractGroupRepositoryValidator
extends AbstractRepositoryValidator
{
@Override
public void doValidate( ApplicationConfiguration configuration, CRepository repo,
ExternalConfiguration externalConfiguration )
throws InvalidConfigurationException
{
super.doValidate( configuration, repo, externalConfiguration );
AbstractGroupRepositoryConfiguration extConf = (AbstractGroupRepositoryConfiguration) externalConfiguration;
for ( String repoId : extConf.getMemberRepositoryIds() )
{
try
{
ContentClass myContentClass =
getRepositoryTypeRegistry().getRepositoryContentClass( repo.getProviderRole(),
repo.getProviderHint() );
Repository member = getRepositoryRegistry().getRepository( repoId );
if ( !myContentClass.isCompatible( member.getRepositoryContentClass() ) )
{
ValidationResponse response = new ApplicationValidationResponse();
ValidationMessage error =
- new ValidationMessage( "repositories", "Repository has incompatible content type",
+ new ValidationMessage( "repositories", "Repository has incompatible content type (needed='"
+ + myContentClass + "', got='" + member.getRepositoryContentClass() + "')",
"Invalid content type" );
response.addValidationError( error );
- throw new InvalidGroupingException( myContentClass, member.getRepositoryContentClass() );
+ throw new InvalidConfigurationException( response );
}
}
catch ( NoSuchRepositoryException e )
{
ValidationResponse response = new ApplicationValidationResponse();
ValidationMessage error =
new ValidationMessage( "repositories", e.getMessage(), "Invalid repository selected" );
response.addValidationError( error );
throw new InvalidConfigurationException( response );
}
}
}
}
| false | true | public void doValidate( ApplicationConfiguration configuration, CRepository repo,
ExternalConfiguration externalConfiguration )
throws InvalidConfigurationException
{
super.doValidate( configuration, repo, externalConfiguration );
AbstractGroupRepositoryConfiguration extConf = (AbstractGroupRepositoryConfiguration) externalConfiguration;
for ( String repoId : extConf.getMemberRepositoryIds() )
{
try
{
ContentClass myContentClass =
getRepositoryTypeRegistry().getRepositoryContentClass( repo.getProviderRole(),
repo.getProviderHint() );
Repository member = getRepositoryRegistry().getRepository( repoId );
if ( !myContentClass.isCompatible( member.getRepositoryContentClass() ) )
{
ValidationResponse response = new ApplicationValidationResponse();
ValidationMessage error =
new ValidationMessage( "repositories", "Repository has incompatible content type",
"Invalid content type" );
response.addValidationError( error );
throw new InvalidGroupingException( myContentClass, member.getRepositoryContentClass() );
}
}
catch ( NoSuchRepositoryException e )
{
ValidationResponse response = new ApplicationValidationResponse();
ValidationMessage error =
new ValidationMessage( "repositories", e.getMessage(), "Invalid repository selected" );
response.addValidationError( error );
throw new InvalidConfigurationException( response );
}
}
}
| public void doValidate( ApplicationConfiguration configuration, CRepository repo,
ExternalConfiguration externalConfiguration )
throws InvalidConfigurationException
{
super.doValidate( configuration, repo, externalConfiguration );
AbstractGroupRepositoryConfiguration extConf = (AbstractGroupRepositoryConfiguration) externalConfiguration;
for ( String repoId : extConf.getMemberRepositoryIds() )
{
try
{
ContentClass myContentClass =
getRepositoryTypeRegistry().getRepositoryContentClass( repo.getProviderRole(),
repo.getProviderHint() );
Repository member = getRepositoryRegistry().getRepository( repoId );
if ( !myContentClass.isCompatible( member.getRepositoryContentClass() ) )
{
ValidationResponse response = new ApplicationValidationResponse();
ValidationMessage error =
new ValidationMessage( "repositories", "Repository has incompatible content type (needed='"
+ myContentClass + "', got='" + member.getRepositoryContentClass() + "')",
"Invalid content type" );
response.addValidationError( error );
throw new InvalidConfigurationException( response );
}
}
catch ( NoSuchRepositoryException e )
{
ValidationResponse response = new ApplicationValidationResponse();
ValidationMessage error =
new ValidationMessage( "repositories", e.getMessage(), "Invalid repository selected" );
response.addValidationError( error );
throw new InvalidConfigurationException( response );
}
}
}
|
diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index 30760d9bf..6f4d7daa2 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -1,3431 +1,3433 @@
package com.fsck.k9.fragment;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Future;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences.Editor;
import android.database.Cursor;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Parcelable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.widget.CursorAdapter;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.format.DateUtils;
import android.text.style.AbsoluteSizeSpan;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.util.TypedValue;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.ListView;
import android.widget.QuickContactBadge;
import android.widget.TextView;
import android.widget.Toast;
import com.actionbarsherlock.app.SherlockFragment;
import com.actionbarsherlock.view.ActionMode;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.view.Window;
import com.fsck.k9.Account;
import com.fsck.k9.Account.SortType;
import com.fsck.k9.AccountStats;
import com.fsck.k9.FontSizes;
import com.fsck.k9.K9;
import com.fsck.k9.Preferences;
import com.fsck.k9.R;
import com.fsck.k9.activity.ActivityListener;
import com.fsck.k9.activity.ChooseFolder;
import com.fsck.k9.activity.FolderInfoHolder;
import com.fsck.k9.activity.MessageReference;
import com.fsck.k9.activity.misc.ContactPictureLoader;
import com.fsck.k9.cache.EmailProviderCache;
import com.fsck.k9.controller.MessagingController;
import com.fsck.k9.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
import com.fsck.k9.helper.MergeCursorWithUniqueId;
import com.fsck.k9.helper.MessageHelper;
import com.fsck.k9.helper.StringUtils;
import com.fsck.k9.helper.Utility;
import com.fsck.k9.mail.Address;
import com.fsck.k9.mail.Flag;
import com.fsck.k9.mail.Folder;
import com.fsck.k9.mail.Folder.OpenMode;
import com.fsck.k9.mail.Message;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.store.LocalStore;
import com.fsck.k9.mail.store.LocalStore.LocalFolder;
import com.fsck.k9.provider.EmailProvider;
import com.fsck.k9.provider.EmailProvider.MessageColumns;
import com.fsck.k9.provider.EmailProvider.SpecialColumns;
import com.fsck.k9.provider.EmailProvider.ThreadColumns;
import com.fsck.k9.search.ConditionsTreeNode;
import com.fsck.k9.search.LocalSearch;
import com.fsck.k9.search.SearchSpecification;
import com.fsck.k9.search.SearchSpecification.SearchCondition;
import com.fsck.k9.search.SearchSpecification.Searchfield;
import com.fsck.k9.search.SqlQueryBuilder;
import com.handmark.pulltorefresh.library.ILoadingLayout;
import com.handmark.pulltorefresh.library.PullToRefreshBase;
import com.handmark.pulltorefresh.library.PullToRefreshListView;
public class MessageListFragment extends SherlockFragment implements OnItemClickListener,
ConfirmationDialogFragmentListener, LoaderCallbacks<Cursor> {
private static final String[] THREADED_PROJECTION = {
MessageColumns.ID,
MessageColumns.UID,
MessageColumns.INTERNAL_DATE,
MessageColumns.SUBJECT,
MessageColumns.DATE,
MessageColumns.SENDER_LIST,
MessageColumns.TO_LIST,
MessageColumns.CC_LIST,
MessageColumns.READ,
MessageColumns.FLAGGED,
MessageColumns.ANSWERED,
MessageColumns.FORWARDED,
MessageColumns.ATTACHMENT_COUNT,
MessageColumns.FOLDER_ID,
MessageColumns.PREVIEW,
ThreadColumns.ROOT,
SpecialColumns.ACCOUNT_UUID,
SpecialColumns.FOLDER_NAME,
SpecialColumns.THREAD_COUNT,
};
private static final int ID_COLUMN = 0;
private static final int UID_COLUMN = 1;
private static final int INTERNAL_DATE_COLUMN = 2;
private static final int SUBJECT_COLUMN = 3;
private static final int DATE_COLUMN = 4;
private static final int SENDER_LIST_COLUMN = 5;
private static final int TO_LIST_COLUMN = 6;
private static final int CC_LIST_COLUMN = 7;
private static final int READ_COLUMN = 8;
private static final int FLAGGED_COLUMN = 9;
private static final int ANSWERED_COLUMN = 10;
private static final int FORWARDED_COLUMN = 11;
private static final int ATTACHMENT_COUNT_COLUMN = 12;
private static final int FOLDER_ID_COLUMN = 13;
private static final int PREVIEW_COLUMN = 14;
private static final int THREAD_ROOT_COLUMN = 15;
private static final int ACCOUNT_UUID_COLUMN = 16;
private static final int FOLDER_NAME_COLUMN = 17;
private static final int THREAD_COUNT_COLUMN = 18;
private static final String[] PROJECTION = Utility.copyOf(THREADED_PROJECTION,
THREAD_COUNT_COLUMN);
public static MessageListFragment newInstance(LocalSearch search, boolean isThreadDisplay, boolean threadedList) {
MessageListFragment fragment = new MessageListFragment();
Bundle args = new Bundle();
args.putParcelable(ARG_SEARCH, search);
args.putBoolean(ARG_IS_THREAD_DISPLAY, isThreadDisplay);
args.putBoolean(ARG_THREADED_LIST, threadedList);
fragment.setArguments(args);
return fragment;
}
/**
* Reverses the result of a {@link Comparator}.
*
* @param <T>
*/
public static class ReverseComparator<T> implements Comparator<T> {
private Comparator<T> mDelegate;
/**
* @param delegate
* Never {@code null}.
*/
public ReverseComparator(final Comparator<T> delegate) {
mDelegate = delegate;
}
@Override
public int compare(final T object1, final T object2) {
// arg1 & 2 are mixed up, this is done on purpose
return mDelegate.compare(object2, object1);
}
}
/**
* Chains comparator to find a non-0 result.
*
* @param <T>
*/
public static class ComparatorChain<T> implements Comparator<T> {
private List<Comparator<T>> mChain;
/**
* @param chain
* Comparator chain. Never {@code null}.
*/
public ComparatorChain(final List<Comparator<T>> chain) {
mChain = chain;
}
@Override
public int compare(T object1, T object2) {
int result = 0;
for (final Comparator<T> comparator : mChain) {
result = comparator.compare(object1, object2);
if (result != 0) {
break;
}
}
return result;
}
}
public static class ReverseIdComparator implements Comparator<Cursor> {
private int mIdColumn = -1;
@Override
public int compare(Cursor cursor1, Cursor cursor2) {
if (mIdColumn == -1) {
mIdColumn = cursor1.getColumnIndex("_id");
}
long o1Id = cursor1.getLong(mIdColumn);
long o2Id = cursor2.getLong(mIdColumn);
return (o1Id > o2Id) ? -1 : 1;
}
}
public static class AttachmentComparator implements Comparator<Cursor> {
@Override
public int compare(Cursor cursor1, Cursor cursor2) {
int o1HasAttachment = (cursor1.getInt(ATTACHMENT_COUNT_COLUMN) > 0) ? 0 : 1;
int o2HasAttachment = (cursor2.getInt(ATTACHMENT_COUNT_COLUMN) > 0) ? 0 : 1;
return o1HasAttachment - o2HasAttachment;
}
}
public static class FlaggedComparator implements Comparator<Cursor> {
@Override
public int compare(Cursor cursor1, Cursor cursor2) {
int o1IsFlagged = (cursor1.getInt(FLAGGED_COLUMN) == 1) ? 0 : 1;
int o2IsFlagged = (cursor2.getInt(FLAGGED_COLUMN) == 1) ? 0 : 1;
return o1IsFlagged - o2IsFlagged;
}
}
public static class UnreadComparator implements Comparator<Cursor> {
@Override
public int compare(Cursor cursor1, Cursor cursor2) {
int o1IsUnread = cursor1.getInt(READ_COLUMN);
int o2IsUnread = cursor2.getInt(READ_COLUMN);
return o1IsUnread - o2IsUnread;
}
}
public static class DateComparator implements Comparator<Cursor> {
@Override
public int compare(Cursor cursor1, Cursor cursor2) {
long o1Date = cursor1.getLong(DATE_COLUMN);
long o2Date = cursor2.getLong(DATE_COLUMN);
if (o1Date < o2Date) {
return -1;
} else if (o1Date == o2Date) {
return 0;
} else {
return 1;
}
}
}
public static class ArrivalComparator implements Comparator<Cursor> {
@Override
public int compare(Cursor cursor1, Cursor cursor2) {
long o1Date = cursor1.getLong(INTERNAL_DATE_COLUMN);
long o2Date = cursor2.getLong(INTERNAL_DATE_COLUMN);
if (o1Date == o2Date) {
return 0;
} else if (o1Date < o2Date) {
return -1;
} else {
return 1;
}
}
}
public static class SubjectComparator implements Comparator<Cursor> {
@Override
public int compare(Cursor cursor1, Cursor cursor2) {
String subject1 = cursor1.getString(SUBJECT_COLUMN);
String subject2 = cursor2.getString(SUBJECT_COLUMN);
return subject1.compareToIgnoreCase(subject2);
}
}
private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1;
private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
private static final String ARG_SEARCH = "searchObject";
private static final String ARG_THREADED_LIST = "threadedList";
private static final String ARG_IS_THREAD_DISPLAY = "isThreadedDisplay";
private static final String STATE_SELECTED_MESSAGES = "selectedMessages";
private static final String STATE_ACTIVE_MESSAGE = "activeMessage";
private static final String STATE_REMOTE_SEARCH_PERFORMED = "remoteSearchPerformed";
private static final String STATE_MESSAGE_LIST = "listState";
/**
* Maps a {@link SortType} to a {@link Comparator} implementation.
*/
private static final Map<SortType, Comparator<Cursor>> SORT_COMPARATORS;
static {
// fill the mapping at class time loading
final Map<SortType, Comparator<Cursor>> map =
new EnumMap<SortType, Comparator<Cursor>>(SortType.class);
map.put(SortType.SORT_ATTACHMENT, new AttachmentComparator());
map.put(SortType.SORT_DATE, new DateComparator());
map.put(SortType.SORT_ARRIVAL, new ArrivalComparator());
map.put(SortType.SORT_FLAGGED, new FlaggedComparator());
map.put(SortType.SORT_SUBJECT, new SubjectComparator());
map.put(SortType.SORT_UNREAD, new UnreadComparator());
// make it immutable to prevent accidental alteration (content is immutable already)
SORT_COMPARATORS = Collections.unmodifiableMap(map);
}
private ListView mListView;
private PullToRefreshListView mPullToRefreshView;
private Parcelable mSavedListState;
private int mPreviewLines = 0;
private MessageListAdapter mAdapter;
private View mFooterView;
private FolderInfoHolder mCurrentFolder;
private LayoutInflater mInflater;
private MessagingController mController;
private Account mAccount;
private String[] mAccountUuids;
private int mUnreadMessageCount = 0;
private Cursor[] mCursors;
private boolean[] mCursorValid;
private int mUniqueIdColumn;
/**
* Stores the name of the folder that we want to open as soon as possible after load.
*/
private String mFolderName;
private boolean mRemoteSearchPerformed = false;
private Future<?> mRemoteSearchFuture = null;
public List<Message> mExtraSearchResults;
private String mTitle;
private LocalSearch mSearch = null;
private boolean mSingleAccountMode;
private boolean mSingleFolderMode;
private MessageListHandler mHandler = new MessageListHandler();
private SortType mSortType = SortType.SORT_DATE;
private boolean mSortAscending = true;
private boolean mSortDateAscending = false;
private boolean mSenderAboveSubject = false;
private boolean mCheckboxes = true;
private int mSelectedCount = 0;
private Set<Long> mSelected = new HashSet<Long>();
private FontSizes mFontSizes = K9.getFontSizes();
private ActionMode mActionMode;
private Boolean mHasConnectivity;
/**
* Relevant messages for the current context when we have to remember the chosen messages
* between user interactions (e.g. selecting a folder for move operation).
*/
private List<Message> mActiveMessages;
/* package visibility for faster inner class access */
MessageHelper mMessageHelper;
private ActionModeCallback mActionModeCallback = new ActionModeCallback();
private MessageListFragmentListener mFragmentListener;
private boolean mThreadedList;
private boolean mIsThreadDisplay;
private Context mContext;
private final ActivityListener mListener = new MessageListActivityListener();
private Preferences mPreferences;
private boolean mLoaderJustInitialized;
private MessageReference mActiveMessage;
/**
* {@code true} after {@link #onCreate(Bundle)} was executed. Used in {@link #updateTitle()} to
* make sure we don't access member variables before initialization is complete.
*/
private boolean mInitialized = false;
private ContactPictureLoader mContactsPictureLoader;
private LocalBroadcastManager mLocalBroadcastManager;
private BroadcastReceiver mCacheBroadcastReceiver;
private IntentFilter mCacheIntentFilter;
/**
* This class is used to run operations that modify UI elements in the UI thread.
*
* <p>We are using convenience methods that add a {@link android.os.Message} instance or a
* {@link Runnable} to the message queue.</p>
*
* <p><strong>Note:</strong> If you add a method to this class make sure you don't accidentally
* perform the operation in the calling thread.</p>
*/
class MessageListHandler extends Handler {
private static final int ACTION_FOLDER_LOADING = 1;
private static final int ACTION_REFRESH_TITLE = 2;
private static final int ACTION_PROGRESS = 3;
private static final int ACTION_REMOTE_SEARCH_FINISHED = 4;
private static final int ACTION_GO_BACK = 5;
private static final int ACTION_RESTORE_LIST_POSITION = 6;
private static final int ACTION_OPEN_MESSAGE = 7;
public void folderLoading(String folder, boolean loading) {
android.os.Message msg = android.os.Message.obtain(this, ACTION_FOLDER_LOADING,
(loading) ? 1 : 0, 0, folder);
sendMessage(msg);
}
public void refreshTitle() {
android.os.Message msg = android.os.Message.obtain(this, ACTION_REFRESH_TITLE);
sendMessage(msg);
}
public void progress(final boolean progress) {
android.os.Message msg = android.os.Message.obtain(this, ACTION_PROGRESS,
(progress) ? 1 : 0, 0);
sendMessage(msg);
}
public void remoteSearchFinished() {
android.os.Message msg = android.os.Message.obtain(this, ACTION_REMOTE_SEARCH_FINISHED);
sendMessage(msg);
}
public void updateFooter(final String message) {
post(new Runnable() {
@Override
public void run() {
MessageListFragment.this.updateFooter(message);
}
});
}
public void goBack() {
android.os.Message msg = android.os.Message.obtain(this, ACTION_GO_BACK);
sendMessage(msg);
}
public void restoreListPosition() {
android.os.Message msg = android.os.Message.obtain(this, ACTION_RESTORE_LIST_POSITION,
mSavedListState);
mSavedListState = null;
sendMessage(msg);
}
public void openMessage(MessageReference messageReference) {
android.os.Message msg = android.os.Message.obtain(this, ACTION_OPEN_MESSAGE,
messageReference);
sendMessage(msg);
}
@Override
public void handleMessage(android.os.Message msg) {
// The following messages don't need an attached activity.
switch (msg.what) {
case ACTION_REMOTE_SEARCH_FINISHED: {
MessageListFragment.this.remoteSearchFinished();
return;
}
}
// Discard messages if the fragment isn't attached to an activity anymore.
Activity activity = getActivity();
if (activity == null) {
return;
}
switch (msg.what) {
case ACTION_FOLDER_LOADING: {
String folder = (String) msg.obj;
boolean loading = (msg.arg1 == 1);
MessageListFragment.this.folderLoading(folder, loading);
break;
}
case ACTION_REFRESH_TITLE: {
updateTitle();
break;
}
case ACTION_PROGRESS: {
boolean progress = (msg.arg1 == 1);
MessageListFragment.this.progress(progress);
break;
}
case ACTION_GO_BACK: {
mFragmentListener.goBack();
break;
}
case ACTION_RESTORE_LIST_POSITION: {
mListView.onRestoreInstanceState((Parcelable) msg.obj);
break;
}
case ACTION_OPEN_MESSAGE: {
MessageReference messageReference = (MessageReference) msg.obj;
mFragmentListener.openMessage(messageReference);
break;
}
}
}
}
/**
* @return The comparator to use to display messages in an ordered
* fashion. Never {@code null}.
*/
protected Comparator<Cursor> getComparator() {
final List<Comparator<Cursor>> chain =
new ArrayList<Comparator<Cursor>>(3 /* we add 3 comparators at most */);
// Add the specified comparator
final Comparator<Cursor> comparator = SORT_COMPARATORS.get(mSortType);
if (mSortAscending) {
chain.add(comparator);
} else {
chain.add(new ReverseComparator<Cursor>(comparator));
}
// Add the date comparator if not already specified
if (mSortType != SortType.SORT_DATE && mSortType != SortType.SORT_ARRIVAL) {
final Comparator<Cursor> dateComparator = SORT_COMPARATORS.get(SortType.SORT_DATE);
if (mSortDateAscending) {
chain.add(dateComparator);
} else {
chain.add(new ReverseComparator<Cursor>(dateComparator));
}
}
// Add the id comparator
chain.add(new ReverseIdComparator());
// Build the comparator chain
return new ComparatorChain<Cursor>(chain);
}
private void folderLoading(String folder, boolean loading) {
if (mCurrentFolder != null && mCurrentFolder.name.equals(folder)) {
mCurrentFolder.loading = loading;
}
updateFooterView();
}
public void updateTitle() {
if (!mInitialized) {
return;
}
setWindowTitle();
if (!mSearch.isManualSearch()) {
setWindowProgress();
}
}
private void setWindowProgress() {
int level = Window.PROGRESS_END;
if (mCurrentFolder != null && mCurrentFolder.loading && mListener.getFolderTotal() > 0) {
int divisor = mListener.getFolderTotal();
if (divisor != 0) {
level = (Window.PROGRESS_END / divisor) * (mListener.getFolderCompleted()) ;
if (level > Window.PROGRESS_END) {
level = Window.PROGRESS_END;
}
}
}
mFragmentListener.setMessageListProgress(level);
}
private void setWindowTitle() {
// regular folder content display
if (!isManualSearch() && mSingleFolderMode) {
Activity activity = getActivity();
String displayName = FolderInfoHolder.getDisplayName(activity, mAccount,
mFolderName);
mFragmentListener.setMessageListTitle(displayName);
String operation = mListener.getOperation(activity);
if (operation.length() < 1) {
mFragmentListener.setMessageListSubTitle(mAccount.getEmail());
} else {
mFragmentListener.setMessageListSubTitle(operation);
}
} else {
// query result display. This may be for a search folder as opposed to a user-initiated search.
if (mTitle != null) {
// This was a search folder; the search folder has overridden our title.
mFragmentListener.setMessageListTitle(mTitle);
} else {
// This is a search result; set it to the default search result line.
mFragmentListener.setMessageListTitle(getString(R.string.search_results));
}
mFragmentListener.setMessageListSubTitle(null);
}
// set unread count
if (mUnreadMessageCount <= 0) {
mFragmentListener.setUnreadCount(0);
} else {
if (!mSingleFolderMode && mTitle == null) {
// The unread message count is easily confused
// with total number of messages in the search result, so let's hide it.
mFragmentListener.setUnreadCount(0);
} else {
mFragmentListener.setUnreadCount(mUnreadMessageCount);
}
}
}
private void progress(final boolean progress) {
mFragmentListener.enableActionBarProgress(progress);
if (mPullToRefreshView != null && !progress) {
mPullToRefreshView.onRefreshComplete();
}
}
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (view == mFooterView) {
if (mCurrentFolder != null && !mSearch.isManualSearch()) {
mController.loadMoreMessages(mAccount, mFolderName, null);
} else if (mCurrentFolder != null && isRemoteSearch() &&
mExtraSearchResults != null && mExtraSearchResults.size() > 0) {
int numResults = mExtraSearchResults.size();
int limit = mAccount.getRemoteSearchNumResults();
List<Message> toProcess = mExtraSearchResults;
if (limit > 0 && numResults > limit) {
toProcess = toProcess.subList(0, limit);
mExtraSearchResults = mExtraSearchResults.subList(limit,
mExtraSearchResults.size());
} else {
mExtraSearchResults = null;
updateFooter("");
}
mController.loadSearchResults(mAccount, mCurrentFolder.name, toProcess, mListener);
}
return;
}
Cursor cursor = (Cursor) parent.getItemAtPosition(position);
if (mSelectedCount > 0) {
toggleMessageSelect(position);
} else {
if (mThreadedList && cursor.getInt(THREAD_COUNT_COLUMN) > 1) {
Account account = getAccountFromCursor(cursor);
long folderId = cursor.getLong(FOLDER_ID_COLUMN);
String folderName = getFolderNameById(account, folderId);
// If threading is enabled and this item represents a thread, display the thread contents.
long rootId = cursor.getLong(THREAD_ROOT_COLUMN);
mFragmentListener.showThread(account, folderName, rootId);
} else {
// This item represents a message; just display the message.
openMessageAtPosition(listViewToAdapterPosition(position));
}
}
}
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
mContext = activity.getApplicationContext();
try {
mFragmentListener = (MessageListFragmentListener) activity;
} catch (ClassCastException e) {
throw new ClassCastException(activity.getClass() +
" must implement MessageListFragmentListener");
}
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Context appContext = getActivity().getApplicationContext();
mPreferences = Preferences.getPreferences(appContext);
mController = MessagingController.getInstance(getActivity().getApplication());
mPreviewLines = K9.messageListPreviewLines();
mCheckboxes = K9.messageListCheckboxes();
if (K9.showContactPicture()) {
mContactsPictureLoader = new ContactPictureLoader(getActivity(),
R.drawable.ic_contact_picture);
}
restoreInstanceState(savedInstanceState);
decodeArguments();
createCacheBroadcastReceiver(appContext);
mInitialized = true;
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mInflater = inflater;
View view = inflater.inflate(R.layout.message_list_fragment, container, false);
initializePullToRefresh(inflater, view);
initializeLayout();
mListView.setVerticalFadingEdgeEnabled(false);
return view;
}
@Override
public void onDestroyView() {
mSavedListState = mListView.onSaveInstanceState();
super.onDestroyView();
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
mMessageHelper = MessageHelper.getInstance(getActivity());
initializeMessageList();
// This needs to be done before initializing the cursor loader below
initializeSortSettings();
mLoaderJustInitialized = true;
LoaderManager loaderManager = getLoaderManager();
int len = mAccountUuids.length;
mCursors = new Cursor[len];
mCursorValid = new boolean[len];
for (int i = 0; i < len; i++) {
loaderManager.initLoader(i, null, this);
mCursorValid[i] = false;
}
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
saveSelectedMessages(outState);
saveListState(outState);
outState.putBoolean(STATE_REMOTE_SEARCH_PERFORMED, mRemoteSearchPerformed);
outState.putParcelable(STATE_ACTIVE_MESSAGE, mActiveMessage);
}
/**
* Restore the state of a previous {@link MessageListFragment} instance.
*
* @see #onSaveInstanceState(Bundle)
*/
private void restoreInstanceState(Bundle savedInstanceState) {
if (savedInstanceState == null) {
return;
}
restoreSelectedMessages(savedInstanceState);
mRemoteSearchPerformed = savedInstanceState.getBoolean(STATE_REMOTE_SEARCH_PERFORMED);
mSavedListState = savedInstanceState.getParcelable(STATE_MESSAGE_LIST);
mActiveMessage = savedInstanceState.getParcelable(STATE_ACTIVE_MESSAGE);
}
/**
* Write the unique IDs of selected messages to a {@link Bundle}.
*/
private void saveSelectedMessages(Bundle outState) {
long[] selected = new long[mSelected.size()];
int i = 0;
for (Long id : mSelected) {
selected[i++] = Long.valueOf(id);
}
outState.putLongArray(STATE_SELECTED_MESSAGES, selected);
}
/**
* Restore selected messages from a {@link Bundle}.
*/
private void restoreSelectedMessages(Bundle savedInstanceState) {
long[] selected = savedInstanceState.getLongArray(STATE_SELECTED_MESSAGES);
for (long id : selected) {
mSelected.add(Long.valueOf(id));
}
}
private void saveListState(Bundle outState) {
if (mSavedListState != null) {
// The previously saved state was never restored, so just use that.
outState.putParcelable(STATE_MESSAGE_LIST, mSavedListState);
} else if (mListView != null) {
outState.putParcelable(STATE_MESSAGE_LIST, mListView.onSaveInstanceState());
}
}
private void initializeSortSettings() {
if (mSingleAccountMode) {
mSortType = mAccount.getSortType();
mSortAscending = mAccount.isSortAscending(mSortType);
mSortDateAscending = mAccount.isSortAscending(SortType.SORT_DATE);
} else {
mSortType = K9.getSortType();
mSortAscending = K9.isSortAscending(mSortType);
mSortDateAscending = K9.isSortAscending(SortType.SORT_DATE);
}
}
private void decodeArguments() {
Bundle args = getArguments();
mThreadedList = args.getBoolean(ARG_THREADED_LIST, false);
mIsThreadDisplay = args.getBoolean(ARG_IS_THREAD_DISPLAY, false);
mSearch = args.getParcelable(ARG_SEARCH);
mTitle = mSearch.getName();
String[] accountUuids = mSearch.getAccountUuids();
mSingleAccountMode = false;
if (accountUuids.length == 1 && !mSearch.searchAllAccounts()) {
mSingleAccountMode = true;
mAccount = mPreferences.getAccount(accountUuids[0]);
}
mSingleFolderMode = false;
if (mSingleAccountMode && (mSearch.getFolderNames().size() == 1)) {
mSingleFolderMode = true;
mFolderName = mSearch.getFolderNames().get(0);
mCurrentFolder = getFolder(mFolderName, mAccount);
}
if (mSingleAccountMode) {
mAccountUuids = new String[] { mAccount.getUuid() };
} else {
if (accountUuids.length == 1 &&
accountUuids[0].equals(SearchSpecification.ALL_ACCOUNTS)) {
Account[] accounts = mPreferences.getAccounts();
mAccountUuids = new String[accounts.length];
for (int i = 0, len = accounts.length; i < len; i++) {
mAccountUuids[i] = accounts[i].getUuid();
}
} else {
mAccountUuids = accountUuids;
}
}
}
private void initializeMessageList() {
mAdapter = new MessageListAdapter();
if (mFolderName != null) {
mCurrentFolder = getFolder(mFolderName, mAccount);
}
if (mSingleFolderMode) {
mListView.addFooterView(getFooterView(mListView));
updateFooterView();
}
mListView.setAdapter(mAdapter);
}
private void createCacheBroadcastReceiver(Context appContext) {
mLocalBroadcastManager = LocalBroadcastManager.getInstance(appContext);
mCacheBroadcastReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
mAdapter.notifyDataSetChanged();
}
};
mCacheIntentFilter = new IntentFilter(EmailProviderCache.ACTION_CACHE_UPDATED);
}
private FolderInfoHolder getFolder(String folder, Account account) {
LocalFolder local_folder = null;
try {
LocalStore localStore = account.getLocalStore();
local_folder = localStore.getFolder(folder);
return new FolderInfoHolder(mContext, local_folder, account);
} catch (Exception e) {
Log.e(K9.LOG_TAG, "getFolder(" + folder + ") goes boom: ", e);
return null;
} finally {
if (local_folder != null) {
local_folder.close();
}
}
}
private String getFolderNameById(Account account, long folderId) {
try {
Folder folder = getFolderById(account, folderId);
if (folder != null) {
return folder.getName();
}
} catch (Exception e) {
Log.e(K9.LOG_TAG, "getFolderNameById() failed.", e);
}
return null;
}
private Folder getFolderById(Account account, long folderId) {
try {
LocalStore localStore = account.getLocalStore();
LocalFolder localFolder = localStore.getFolderById(folderId);
localFolder.open(OpenMode.READ_ONLY);
return localFolder;
} catch (Exception e) {
Log.e(K9.LOG_TAG, "getFolderNameById() failed.", e);
return null;
}
}
@Override
public void onPause() {
super.onPause();
mLocalBroadcastManager.unregisterReceiver(mCacheBroadcastReceiver);
mListener.onPause(getActivity());
mController.removeListener(mListener);
}
/**
* On resume we refresh messages for the folder that is currently open.
* This guarantees that things like unread message count and read status
* are updated.
*/
@Override
public void onResume() {
super.onResume();
Context appContext = getActivity().getApplicationContext();
mSenderAboveSubject = K9.messageListSenderAboveSubject();
if (!mLoaderJustInitialized) {
// Refresh the message list
LoaderManager loaderManager = getLoaderManager();
for (int i = 0; i < mAccountUuids.length; i++) {
loaderManager.restartLoader(i, null, this);
mCursorValid[i] = false;
}
} else {
mLoaderJustInitialized = false;
}
// Check if we have connectivity. Cache the value.
if (mHasConnectivity == null) {
final ConnectivityManager connectivityManager =
(ConnectivityManager) getActivity().getApplication().getSystemService(
Context.CONNECTIVITY_SERVICE);
final NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo();
if (netInfo != null && netInfo.getState() == NetworkInfo.State.CONNECTED) {
mHasConnectivity = true;
} else {
mHasConnectivity = false;
}
}
mLocalBroadcastManager.registerReceiver(mCacheBroadcastReceiver, mCacheIntentFilter);
mListener.onResume(getActivity());
mController.addListener(mListener);
//Cancel pending new mail notifications when we open an account
Account[] accountsWithNotification;
Account account = mAccount;
if (account != null) {
accountsWithNotification = new Account[] { account };
} else {
accountsWithNotification = mPreferences.getAccounts();
}
for (Account accountWithNotification : accountsWithNotification) {
mController.notifyAccountCancel(appContext, accountWithNotification);
}
if (mAccount != null && mFolderName != null && !mSearch.isManualSearch()) {
mController.getFolderUnreadMessageCount(mAccount, mFolderName, mListener);
}
updateTitle();
}
private void initializePullToRefresh(LayoutInflater inflater, View layout) {
mPullToRefreshView = (PullToRefreshListView) layout.findViewById(R.id.message_list);
// Set empty view
View loadingView = inflater.inflate(R.layout.message_list_loading, null);
mPullToRefreshView.setEmptyView(loadingView);
if (isPullToRefreshAllowed()) {
if (mSearch.isManualSearch() && mAccount.allowRemoteSearch()) {
// "Pull to search server"
mPullToRefreshView.setOnRefreshListener(
new PullToRefreshBase.OnRefreshListener<ListView>() {
@Override
public void onRefresh(PullToRefreshBase<ListView> refreshView) {
mPullToRefreshView.onRefreshComplete();
onRemoteSearchRequested();
}
});
ILoadingLayout proxy = mPullToRefreshView.getLoadingLayoutProxy();
proxy.setPullLabel(getString(
R.string.pull_to_refresh_remote_search_from_local_search_pull));
proxy.setReleaseLabel(getString(
R.string.pull_to_refresh_remote_search_from_local_search_release));
} else {
// "Pull to refresh"
mPullToRefreshView.setOnRefreshListener(
new PullToRefreshBase.OnRefreshListener<ListView>() {
@Override
public void onRefresh(PullToRefreshBase<ListView> refreshView) {
checkMail();
}
});
}
}
// Disable pull-to-refresh until the message list has been loaded
setPullToRefreshEnabled(false);
}
/**
* Returns whether or not pull-to-refresh is allowed in this message list.
*/
private boolean isPullToRefreshAllowed() {
return mSingleFolderMode;
}
/**
* Enable or disable pull-to-refresh.
*
* @param enable
* {@code true} to enable. {@code false} to disable.
*/
private void setPullToRefreshEnabled(boolean enable) {
mPullToRefreshView.setMode((enable) ?
PullToRefreshBase.Mode.PULL_FROM_START : PullToRefreshBase.Mode.DISABLED);
}
private void initializeLayout() {
mListView = mPullToRefreshView.getRefreshableView();
mListView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
mListView.setLongClickable(true);
mListView.setFastScrollEnabled(true);
mListView.setScrollingCacheEnabled(false);
mListView.setOnItemClickListener(this);
registerForContextMenu(mListView);
}
public void onCompose() {
if (!mSingleAccountMode) {
/*
* If we have a query string, we don't have an account to let
* compose start the default action.
*/
mFragmentListener.onCompose(null);
} else {
mFragmentListener.onCompose(mAccount);
}
}
public void onReply(Message message) {
mFragmentListener.onReply(message);
}
public void onReplyAll(Message message) {
mFragmentListener.onReplyAll(message);
}
public void onForward(Message message) {
mFragmentListener.onForward(message);
}
public void onResendMessage(Message message) {
mFragmentListener.onResendMessage(message);
}
public void changeSort(SortType sortType) {
Boolean sortAscending = (mSortType == sortType) ? !mSortAscending : null;
changeSort(sortType, sortAscending);
}
/**
* User has requested a remote search. Setup the bundle and start the intent.
*/
public void onRemoteSearchRequested() {
String searchAccount;
String searchFolder;
searchAccount = mAccount.getUuid();
searchFolder = mCurrentFolder.name;
String queryString = mSearch.getRemoteSearchArguments();
mRemoteSearchPerformed = true;
mRemoteSearchFuture = mController.searchRemoteMessages(searchAccount, searchFolder,
queryString, null, null, mListener);
mFragmentListener.remoteSearchStarted();
}
/**
* Change the sort type and sort order used for the message list.
*
* @param sortType
* Specifies which field to use for sorting the message list.
* @param sortAscending
* Specifies the sort order. If this argument is {@code null} the default search order
* for the sort type is used.
*/
// FIXME: Don't save the changes in the UI thread
private void changeSort(SortType sortType, Boolean sortAscending) {
mSortType = sortType;
Account account = mAccount;
if (account != null) {
account.setSortType(mSortType);
if (sortAscending == null) {
mSortAscending = account.isSortAscending(mSortType);
} else {
mSortAscending = sortAscending;
}
account.setSortAscending(mSortType, mSortAscending);
mSortDateAscending = account.isSortAscending(SortType.SORT_DATE);
account.save(mPreferences);
} else {
K9.setSortType(mSortType);
if (sortAscending == null) {
mSortAscending = K9.isSortAscending(mSortType);
} else {
mSortAscending = sortAscending;
}
K9.setSortAscending(mSortType, mSortAscending);
mSortDateAscending = K9.isSortAscending(SortType.SORT_DATE);
Editor editor = mPreferences.getPreferences().edit();
K9.save(editor);
editor.commit();
}
reSort();
}
private void reSort() {
int toastString = mSortType.getToast(mSortAscending);
Toast toast = Toast.makeText(getActivity(), toastString, Toast.LENGTH_SHORT);
toast.show();
LoaderManager loaderManager = getLoaderManager();
for (int i = 0, len = mAccountUuids.length; i < len; i++) {
loaderManager.restartLoader(i, null, this);
}
}
public void onCycleSort() {
SortType[] sorts = SortType.values();
int curIndex = 0;
for (int i = 0; i < sorts.length; i++) {
if (sorts[i] == mSortType) {
curIndex = i;
break;
}
}
curIndex++;
if (curIndex == sorts.length) {
curIndex = 0;
}
changeSort(sorts[curIndex]);
}
private void onDelete(Message message) {
onDelete(Collections.singletonList(message));
}
private void onDelete(List<Message> messages) {
if (mThreadedList) {
mController.deleteThreads(messages);
} else {
mController.deleteMessages(messages, null);
}
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode != Activity.RESULT_OK) {
return;
}
switch (requestCode) {
case ACTIVITY_CHOOSE_FOLDER_MOVE:
case ACTIVITY_CHOOSE_FOLDER_COPY: {
if (data == null) {
return;
}
final String destFolderName = data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER);
final List<Message> messages = mActiveMessages;
if (destFolderName != null) {
mActiveMessages = null; // don't need it any more
// We currently only support copy/move in 'single account mode', so it's okay to
// use mAccount.
mAccount.setLastSelectedFolderName(destFolderName);
switch (requestCode) {
case ACTIVITY_CHOOSE_FOLDER_MOVE:
move(messages, destFolderName);
break;
case ACTIVITY_CHOOSE_FOLDER_COPY:
copy(messages, destFolderName);
break;
}
}
break;
}
}
}
public void onExpunge() {
if (mCurrentFolder != null) {
onExpunge(mAccount, mCurrentFolder.name);
}
}
private void onExpunge(final Account account, String folderName) {
mController.expunge(account, folderName, null);
}
private void showDialog(int dialogId) {
DialogFragment fragment;
switch (dialogId) {
case R.id.dialog_confirm_spam: {
String title = getString(R.string.dialog_confirm_spam_title);
int selectionSize = mActiveMessages.size();
String message = getResources().getQuantityString(
R.plurals.dialog_confirm_spam_message, selectionSize,
Integer.valueOf(selectionSize));
String confirmText = getString(R.string.dialog_confirm_spam_confirm_button);
String cancelText = getString(R.string.dialog_confirm_spam_cancel_button);
fragment = ConfirmationDialogFragment.newInstance(dialogId, title, message,
confirmText, cancelText);
break;
}
default: {
throw new RuntimeException("Called showDialog(int) with unknown dialog id.");
}
}
fragment.setTargetFragment(this, dialogId);
fragment.show(getFragmentManager(), getDialogTag(dialogId));
}
private String getDialogTag(int dialogId) {
return String.format("dialog-%d", dialogId);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int itemId = item.getItemId();
switch (itemId) {
case R.id.set_sort_date: {
changeSort(SortType.SORT_DATE);
return true;
}
case R.id.set_sort_arrival: {
changeSort(SortType.SORT_ARRIVAL);
return true;
}
case R.id.set_sort_subject: {
changeSort(SortType.SORT_SUBJECT);
return true;
}
// case R.id.set_sort_sender: {
// changeSort(SortType.SORT_SENDER);
// return true;
// }
case R.id.set_sort_flag: {
changeSort(SortType.SORT_FLAGGED);
return true;
}
case R.id.set_sort_unread: {
changeSort(SortType.SORT_UNREAD);
return true;
}
case R.id.set_sort_attach: {
changeSort(SortType.SORT_ATTACHMENT);
return true;
}
case R.id.select_all: {
selectAll();
return true;
}
}
if (!mSingleAccountMode) {
// None of the options after this point are "safe" for search results
//TODO: This is not true for "unread" and "starred" searches in regular folders
return false;
}
switch (itemId) {
case R.id.send_messages: {
onSendPendingMessages();
return true;
}
case R.id.expunge: {
if (mCurrentFolder != null) {
onExpunge(mAccount, mCurrentFolder.name);
}
return true;
}
default: {
return super.onOptionsItemSelected(item);
}
}
}
public void onSendPendingMessages() {
mController.sendPendingMessages(mAccount, null);
}
@Override
public boolean onContextItemSelected(android.view.MenuItem item) {
AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
int adapterPosition = listViewToAdapterPosition(info.position);
switch (item.getItemId()) {
case R.id.reply: {
Message message = getMessageAtPosition(adapterPosition);
onReply(message);
break;
}
case R.id.reply_all: {
Message message = getMessageAtPosition(adapterPosition);
onReplyAll(message);
break;
}
case R.id.forward: {
Message message = getMessageAtPosition(adapterPosition);
onForward(message);
break;
}
case R.id.send_again: {
Message message = getMessageAtPosition(adapterPosition);
onResendMessage(message);
mSelectedCount = 0;
break;
}
case R.id.same_sender: {
Cursor cursor = (Cursor) mAdapter.getItem(adapterPosition);
String senderAddress = getSenderAddressFromCursor(cursor);
if (senderAddress != null) {
mFragmentListener.showMoreFromSameSender(senderAddress);
}
break;
}
case R.id.delete: {
Message message = getMessageAtPosition(adapterPosition);
onDelete(message);
break;
}
case R.id.mark_as_read: {
setFlag(adapterPosition, Flag.SEEN, true);
break;
}
case R.id.mark_as_unread: {
setFlag(adapterPosition, Flag.SEEN, false);
break;
}
case R.id.flag: {
setFlag(adapterPosition, Flag.FLAGGED, true);
break;
}
case R.id.unflag: {
setFlag(adapterPosition, Flag.FLAGGED, false);
break;
}
// only if the account supports this
case R.id.archive: {
Message message = getMessageAtPosition(adapterPosition);
onArchive(message);
break;
}
case R.id.spam: {
Message message = getMessageAtPosition(adapterPosition);
onSpam(message);
break;
}
case R.id.move: {
Message message = getMessageAtPosition(adapterPosition);
onMove(message);
break;
}
case R.id.copy: {
Message message = getMessageAtPosition(adapterPosition);
onCopy(message);
break;
}
}
return true;
}
private String getSenderAddressFromCursor(Cursor cursor) {
String fromList = cursor.getString(SENDER_LIST_COLUMN);
Address[] fromAddrs = Address.unpack(fromList);
return (fromAddrs.length > 0) ? fromAddrs[0].getAddress() : null;
}
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo);
AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
Cursor cursor = (Cursor) mListView.getItemAtPosition(info.position);
if (cursor == null) {
return;
}
getActivity().getMenuInflater().inflate(R.menu.message_list_item_context, menu);
Account account = getAccountFromCursor(cursor);
String subject = cursor.getString(SUBJECT_COLUMN);
boolean read = (cursor.getInt(READ_COLUMN) == 1);
boolean flagged = (cursor.getInt(FLAGGED_COLUMN) == 1);
menu.setHeaderTitle(subject);
if (read) {
menu.findItem(R.id.mark_as_read).setVisible(false);
} else {
menu.findItem(R.id.mark_as_unread).setVisible(false);
}
if (flagged) {
menu.findItem(R.id.flag).setVisible(false);
} else {
menu.findItem(R.id.unflag).setVisible(false);
}
if (!mController.isCopyCapable(account)) {
menu.findItem(R.id.copy).setVisible(false);
}
if (!mController.isMoveCapable(account)) {
menu.findItem(R.id.move).setVisible(false);
menu.findItem(R.id.archive).setVisible(false);
menu.findItem(R.id.spam).setVisible(false);
}
if (!account.hasArchiveFolder()) {
menu.findItem(R.id.archive).setVisible(false);
}
if (!account.hasSpamFolder()) {
menu.findItem(R.id.spam).setVisible(false);
}
}
public void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2) {
// Handle right-to-left as an un-select
handleSwipe(e1, false);
}
public void onSwipeLeftToRight(final MotionEvent e1, final MotionEvent e2) {
// Handle left-to-right as a select.
handleSwipe(e1, true);
}
/**
* Handle a select or unselect swipe event.
*
* @param downMotion
* Event that started the swipe
* @param selected
* {@code true} if this was an attempt to select (i.e. left to right).
*/
private void handleSwipe(final MotionEvent downMotion, final boolean selected) {
int x = (int) downMotion.getRawX();
int y = (int) downMotion.getRawY();
Rect headerRect = new Rect();
mListView.getGlobalVisibleRect(headerRect);
// Only handle swipes in the visible area of the message list
if (headerRect.contains(x, y)) {
int[] listPosition = new int[2];
mListView.getLocationOnScreen(listPosition);
int listX = x - listPosition[0];
int listY = y - listPosition[1];
int listViewPosition = mListView.pointToPosition(listX, listY);
toggleMessageSelect(listViewPosition);
}
}
private int listViewToAdapterPosition(int position) {
if (position > 0 && position <= mAdapter.getCount()) {
return position - 1;
}
return AdapterView.INVALID_POSITION;
}
private int adapterToListViewPosition(int position) {
if (position >= 0 && position < mAdapter.getCount()) {
return position + 1;
}
return AdapterView.INVALID_POSITION;
}
class MessageListActivityListener extends ActivityListener {
@Override
public void remoteSearchFailed(Account acct, String folder, final String err) {
mHandler.post(new Runnable() {
@Override
public void run() {
Activity activity = getActivity();
if (activity != null) {
Toast.makeText(activity, R.string.remote_search_error,
Toast.LENGTH_LONG).show();
}
}
});
}
@Override
public void remoteSearchStarted(Account acct, String folder) {
mHandler.progress(true);
mHandler.updateFooter(mContext.getString(R.string.remote_search_sending_query));
}
@Override
public void enableProgressIndicator(boolean enable) {
mHandler.progress(enable);
}
@Override
public void remoteSearchFinished(Account acct, String folder, int numResults, List<Message> extraResults) {
mHandler.progress(false);
mHandler.remoteSearchFinished();
mExtraSearchResults = extraResults;
if (extraResults != null && extraResults.size() > 0) {
mHandler.updateFooter(String.format(mContext.getString(R.string.load_more_messages_fmt), acct.getRemoteSearchNumResults()));
} else {
mHandler.updateFooter("");
}
mFragmentListener.setMessageListProgress(Window.PROGRESS_END);
}
@Override
public void remoteSearchServerQueryComplete(Account account, String folderName, int numResults) {
mHandler.progress(true);
if (account != null && account.getRemoteSearchNumResults() != 0 && numResults > account.getRemoteSearchNumResults()) {
mHandler.updateFooter(mContext.getString(R.string.remote_search_downloading_limited, account.getRemoteSearchNumResults(), numResults));
} else {
mHandler.updateFooter(mContext.getString(R.string.remote_search_downloading, numResults));
}
mFragmentListener.setMessageListProgress(Window.PROGRESS_START);
}
@Override
public void informUserOfStatus() {
mHandler.refreshTitle();
}
@Override
public void synchronizeMailboxStarted(Account account, String folder) {
if (updateForMe(account, folder)) {
mHandler.progress(true);
mHandler.folderLoading(folder, true);
}
super.synchronizeMailboxStarted(account, folder);
}
@Override
public void synchronizeMailboxFinished(Account account, String folder,
int totalMessagesInMailbox, int numNewMessages) {
if (updateForMe(account, folder)) {
mHandler.progress(false);
mHandler.folderLoading(folder, false);
}
super.synchronizeMailboxFinished(account, folder, totalMessagesInMailbox, numNewMessages);
}
@Override
public void synchronizeMailboxFailed(Account account, String folder, String message) {
if (updateForMe(account, folder)) {
mHandler.progress(false);
mHandler.folderLoading(folder, false);
}
super.synchronizeMailboxFailed(account, folder, message);
}
@Override
public void searchStats(AccountStats stats) {
mUnreadMessageCount = stats.unreadMessageCount;
super.searchStats(stats);
}
@Override
public void folderStatusChanged(Account account, String folder, int unreadMessageCount) {
if (updateForMe(account, folder)) {
mUnreadMessageCount = unreadMessageCount;
}
super.folderStatusChanged(account, folder, unreadMessageCount);
}
private boolean updateForMe(Account account, String folder) {
if (account == null || folder == null) {
return false;
}
// FIXME: There could be more than one account and one folder
return ((account.equals(mAccount) && folder.equals(mFolderName)));
}
}
class MessageListAdapter extends CursorAdapter {
private Drawable mAttachmentIcon;
private Drawable mForwardedIcon;
private Drawable mAnsweredIcon;
private Drawable mForwardedAnsweredIcon;
MessageListAdapter() {
super(getActivity(), null, 0);
mAttachmentIcon = getResources().getDrawable(R.drawable.ic_email_attachment_small);
mAnsweredIcon = getResources().getDrawable(R.drawable.ic_email_answered_small);
mForwardedIcon = getResources().getDrawable(R.drawable.ic_email_forwarded_small);
mForwardedAnsweredIcon = getResources().getDrawable(R.drawable.ic_email_forwarded_answered_small);
}
private String recipientSigil(boolean toMe, boolean ccMe) {
if (toMe) {
return getString(R.string.messagelist_sent_to_me_sigil);
} else if (ccMe) {
return getString(R.string.messagelist_sent_cc_me_sigil);
} else {
return "";
}
}
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
View view = mInflater.inflate(R.layout.message_list_item, parent, false);
view.setId(R.layout.message_list_item);
MessageViewHolder holder = new MessageViewHolder();
holder.date = (TextView) view.findViewById(R.id.date);
holder.chip = view.findViewById(R.id.chip);
holder.preview = (TextView) view.findViewById(R.id.preview);
QuickContactBadge contactBadge =
(QuickContactBadge) view.findViewById(R.id.contact_badge);
if (mContactsPictureLoader != null) {
holder.contactBadge = contactBadge;
} else {
contactBadge.setVisibility(View.GONE);
}
if (mSenderAboveSubject) {
holder.from = (TextView) view.findViewById(R.id.subject);
mFontSizes.setViewTextSize(holder.from, mFontSizes.getMessageListSender());
} else {
holder.subject = (TextView) view.findViewById(R.id.subject);
mFontSizes.setViewTextSize(holder.subject, mFontSizes.getMessageListSubject());
}
mFontSizes.setViewTextSize(holder.date, mFontSizes.getMessageListDate());
// 1 preview line is needed even if it is set to 0, because subject is part of the same text view
holder.preview.setLines(Math.max(mPreviewLines,1));
mFontSizes.setViewTextSize(holder.preview, mFontSizes.getMessageListPreview());
holder.threadCount = (TextView) view.findViewById(R.id.thread_count);
holder.selected = (CheckBox) view.findViewById(R.id.selected_checkbox);
if (mCheckboxes) {
holder.selected.setOnCheckedChangeListener(holder);
holder.selected.setVisibility(View.VISIBLE);
} else {
holder.selected.setVisibility(View.GONE);
}
view.setTag(holder);
return view;
}
@Override
public void bindView(View view, Context context, Cursor cursor) {
Account account = getAccountFromCursor(cursor);
String fromList = cursor.getString(SENDER_LIST_COLUMN);
String toList = cursor.getString(TO_LIST_COLUMN);
String ccList = cursor.getString(CC_LIST_COLUMN);
Address[] fromAddrs = Address.unpack(fromList);
Address[] toAddrs = Address.unpack(toList);
Address[] ccAddrs = Address.unpack(ccList);
boolean fromMe = mMessageHelper.toMe(account, fromAddrs);
boolean toMe = mMessageHelper.toMe(account, toAddrs);
boolean ccMe = mMessageHelper.toMe(account, ccAddrs);
CharSequence displayName = mMessageHelper.getDisplayName(account, fromAddrs, toAddrs);
CharSequence displayDate = DateUtils.getRelativeTimeSpanString(context, cursor.getLong(DATE_COLUMN));
String counterpartyAddress = null;
if (fromMe) {
if (toAddrs.length > 0) {
counterpartyAddress = toAddrs[0].getAddress();
} else if (ccAddrs.length > 0) {
counterpartyAddress = ccAddrs[0].getAddress();
}
} else if (fromAddrs.length > 0) {
counterpartyAddress = fromAddrs[0].getAddress();
}
int threadCount = (mThreadedList) ? cursor.getInt(THREAD_COUNT_COLUMN) : 0;
String subject = cursor.getString(SUBJECT_COLUMN);
if (StringUtils.isNullOrEmpty(subject)) {
subject = getString(R.string.general_no_subject);
} else if (threadCount > 1) {
// If this is a thread, strip the RE/FW from the subject. "Be like Outlook."
subject = Utility.stripSubject(subject);
}
boolean read = (cursor.getInt(READ_COLUMN) == 1);
boolean flagged = (cursor.getInt(FLAGGED_COLUMN) == 1);
boolean answered = (cursor.getInt(ANSWERED_COLUMN) == 1);
boolean forwarded = (cursor.getInt(FORWARDED_COLUMN) == 1);
boolean hasAttachments = (cursor.getInt(ATTACHMENT_COUNT_COLUMN) > 0);
MessageViewHolder holder = (MessageViewHolder) view.getTag();
int maybeBoldTypeface = (read) ? Typeface.NORMAL : Typeface.BOLD;
long uniqueId = cursor.getLong(mUniqueIdColumn);
boolean selected = mSelected.contains(uniqueId);
if (!mCheckboxes && selected) {
holder.chip.setBackgroundDrawable(account.getCheckmarkChip().drawable());
} else {
holder.chip.setBackgroundDrawable(account.generateColorChip(read, toMe, ccMe,
fromMe, flagged).drawable());
}
if (mCheckboxes) {
// Set holder.position to -1 to avoid MessageViewHolder.onCheckedChanged() toggling
// the selection state when setChecked() is called below.
holder.position = -1;
// Only set the UI state, don't actually toggle the message selection.
holder.selected.setChecked(selected);
// Now save the position so MessageViewHolder.onCheckedChanged() will know what
// message to (de)select.
holder.position = cursor.getPosition();
}
if (holder.contactBadge != null) {
holder.contactBadge.assignContactFromEmail(counterpartyAddress, true);
if (counterpartyAddress != null) {
/*
* At least in Android 2.2 a different background + padding is used when no
* email address is available. ListView reuses the views but QuickContactBadge
* doesn't reset the padding, so we do it ourselves.
*/
holder.contactBadge.setPadding(0, 0, 0, 0);
mContactsPictureLoader.loadContactPicture(counterpartyAddress, holder.contactBadge);
} else {
holder.contactBadge.setImageResource(R.drawable.ic_contact_picture);
}
}
- // Background indicator
+ // Background color
if (selected || K9.useBackgroundAsUnreadIndicator()) {
int res;
if (selected) {
res = R.attr.messageListSelectedBackgroundColor;
} else if (read) {
res = R.attr.messageListReadItemBackgroundColor;
} else {
res = R.attr.messageListUnreadItemBackgroundColor;
}
TypedValue outValue = new TypedValue();
getActivity().getTheme().resolveAttribute(res, outValue, true);
view.setBackgroundColor(outValue.data);
+ } else {
+ view.setBackgroundColor(Color.TRANSPARENT);
}
if (mActiveMessage != null) {
String uid = cursor.getString(UID_COLUMN);
String folderName = cursor.getString(FOLDER_NAME_COLUMN);
if (account.getUuid().equals(mActiveMessage.accountUuid) &&
folderName.equals(mActiveMessage.folderName) &&
uid.equals(mActiveMessage.uid)) {
int res = R.attr.messageListActiveItemBackgroundColor;
TypedValue outValue = new TypedValue();
getActivity().getTheme().resolveAttribute(res, outValue, true);
view.setBackgroundColor(outValue.data);
}
}
// Thread count
if (threadCount > 1) {
holder.threadCount.setText(Integer.toString(threadCount));
holder.threadCount.setVisibility(View.VISIBLE);
} else {
holder.threadCount.setVisibility(View.GONE);
}
CharSequence beforePreviewText = (mSenderAboveSubject) ? subject : displayName;
String sigil = recipientSigil(toMe, ccMe);
SpannableStringBuilder messageStringBuilder = new SpannableStringBuilder(sigil)
.append(beforePreviewText);
if (mPreviewLines > 0) {
String preview = cursor.getString(PREVIEW_COLUMN);
if (preview != null) {
messageStringBuilder.append(" ").append(preview);
}
}
holder.preview.setText(messageStringBuilder, TextView.BufferType.SPANNABLE);
Spannable str = (Spannable)holder.preview.getText();
// Create a span section for the sender, and assign the correct font size and weight
int fontSize = (mSenderAboveSubject) ?
mFontSizes.getMessageListSubject():
mFontSizes.getMessageListSender();
AbsoluteSizeSpan span = new AbsoluteSizeSpan(fontSize, true);
str.setSpan(span, 0, beforePreviewText.length() + sigil.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
//TODO: make this part of the theme
int color = (K9.getK9Theme() == K9.Theme.LIGHT) ?
Color.rgb(105, 105, 105) :
Color.rgb(160, 160, 160);
// Set span (color) for preview message
str.setSpan(new ForegroundColorSpan(color), beforePreviewText.length() + sigil.length(),
str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
Drawable statusHolder = null;
if (forwarded && answered) {
statusHolder = mForwardedAnsweredIcon;
} else if (answered) {
statusHolder = mAnsweredIcon;
} else if (forwarded) {
statusHolder = mForwardedIcon;
}
if (holder.from != null ) {
holder.from.setTypeface(null, maybeBoldTypeface);
if (mSenderAboveSubject) {
holder.from.setCompoundDrawablesWithIntrinsicBounds(
statusHolder, // left
null, // top
hasAttachments ? mAttachmentIcon : null, // right
null); // bottom
holder.from.setText(displayName);
} else {
holder.from.setText(new SpannableStringBuilder(sigil).append(displayName));
}
}
if (holder.subject != null ) {
if (!mSenderAboveSubject) {
holder.subject.setCompoundDrawablesWithIntrinsicBounds(
statusHolder, // left
null, // top
hasAttachments ? mAttachmentIcon : null, // right
null); // bottom
}
holder.subject.setTypeface(null, maybeBoldTypeface);
holder.subject.setText(subject);
}
holder.date.setText(displayDate);
}
}
class MessageViewHolder implements OnCheckedChangeListener {
public TextView subject;
public TextView preview;
public TextView from;
public TextView time;
public TextView date;
public View chip;
public TextView threadCount;
public CheckBox selected;
public int position = -1;
public QuickContactBadge contactBadge;
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (position != -1) {
toggleMessageSelectWithAdapterPosition(position);
}
}
}
private View getFooterView(ViewGroup parent) {
if (mFooterView == null) {
mFooterView = mInflater.inflate(R.layout.message_list_item_footer, parent, false);
mFooterView.setId(R.layout.message_list_item_footer);
FooterViewHolder holder = new FooterViewHolder();
holder.main = (TextView) mFooterView.findViewById(R.id.main_text);
mFooterView.setTag(holder);
}
return mFooterView;
}
private void updateFooterView() {
if (!mSearch.isManualSearch() && mCurrentFolder != null && mAccount != null) {
if (mCurrentFolder.loading) {
updateFooter(mContext.getString(R.string.status_loading_more));
} else {
String message;
if (!mCurrentFolder.lastCheckFailed) {
if (mAccount.getDisplayCount() == 0) {
message = mContext.getString(R.string.message_list_load_more_messages_action);
} else {
message = String.format(mContext.getString(R.string.load_more_messages_fmt), mAccount.getDisplayCount());
}
} else {
message = mContext.getString(R.string.status_loading_more_failed);
}
updateFooter(message);
}
} else {
updateFooter(null);
}
}
public void updateFooter(final String text) {
if (mFooterView == null) {
return;
}
FooterViewHolder holder = (FooterViewHolder) mFooterView.getTag();
if (text != null) {
holder.main.setText(text);
}
if (holder.main.getText().length() > 0) {
holder.main.setVisibility(View.VISIBLE);
} else {
holder.main.setVisibility(View.GONE);
}
}
static class FooterViewHolder {
public TextView main;
}
/**
* Set selection state for all messages.
*
* @param selected
* If {@code true} all messages get selected. Otherwise, all messages get deselected and
* action mode is finished.
*/
private void setSelectionState(boolean selected) {
if (selected) {
if (mAdapter.getCount() == 0) {
// Nothing to do if there are no messages
return;
}
mSelectedCount = 0;
for (int i = 0, end = mAdapter.getCount(); i < end; i++) {
Cursor cursor = (Cursor) mAdapter.getItem(i);
long uniqueId = cursor.getLong(mUniqueIdColumn);
mSelected.add(uniqueId);
if (mThreadedList) {
int threadCount = cursor.getInt(THREAD_COUNT_COLUMN);
mSelectedCount += (threadCount > 1) ? threadCount : 1;
} else {
mSelectedCount++;
}
}
if (mActionMode == null) {
mActionMode = getSherlockActivity().startActionMode(mActionModeCallback);
}
computeBatchDirection();
updateActionModeTitle();
computeSelectAllVisibility();
} else {
mSelected.clear();
mSelectedCount = 0;
if (mActionMode != null) {
mActionMode.finish();
mActionMode = null;
}
}
mAdapter.notifyDataSetChanged();
}
private void toggleMessageSelect(int listViewPosition) {
int adapterPosition = listViewToAdapterPosition(listViewPosition);
if (adapterPosition == AdapterView.INVALID_POSITION) {
return;
}
toggleMessageSelectWithAdapterPosition(adapterPosition);
}
private void toggleMessageSelectWithAdapterPosition(int adapterPosition) {
Cursor cursor = (Cursor) mAdapter.getItem(adapterPosition);
long uniqueId = cursor.getLong(mUniqueIdColumn);
boolean selected = mSelected.contains(uniqueId);
if (!selected) {
mSelected.add(uniqueId);
} else {
mSelected.remove(uniqueId);
}
int selectedCountDelta = 1;
if (mThreadedList) {
int threadCount = cursor.getInt(THREAD_COUNT_COLUMN);
if (threadCount > 1) {
selectedCountDelta = threadCount;
}
}
if (mActionMode != null) {
if (mSelectedCount == selectedCountDelta && selected) {
mActionMode.finish();
mActionMode = null;
return;
}
} else {
mActionMode = getSherlockActivity().startActionMode(mActionModeCallback);
}
if (selected) {
mSelectedCount -= selectedCountDelta;
} else {
mSelectedCount += selectedCountDelta;
}
computeBatchDirection();
updateActionModeTitle();
// make sure the onPrepareActionMode is called
mActionMode.invalidate();
computeSelectAllVisibility();
mAdapter.notifyDataSetChanged();
}
private void updateActionModeTitle() {
mActionMode.setTitle(String.format(getString(R.string.actionbar_selected), mSelectedCount));
}
private void computeSelectAllVisibility() {
mActionModeCallback.showSelectAll(mSelected.size() != mAdapter.getCount());
}
private void computeBatchDirection() {
boolean isBatchFlag = false;
boolean isBatchRead = false;
for (int i = 0, end = mAdapter.getCount(); i < end; i++) {
Cursor cursor = (Cursor) mAdapter.getItem(i);
long uniqueId = cursor.getLong(mUniqueIdColumn);
if (mSelected.contains(uniqueId)) {
boolean read = (cursor.getInt(READ_COLUMN) == 1);
boolean flagged = (cursor.getInt(FLAGGED_COLUMN) == 1);
if (!flagged) {
isBatchFlag = true;
}
if (!read) {
isBatchRead = true;
}
if (isBatchFlag && isBatchRead) {
break;
}
}
}
mActionModeCallback.showMarkAsRead(isBatchRead);
mActionModeCallback.showFlag(isBatchFlag);
}
private void setFlag(int adapterPosition, final Flag flag, final boolean newState) {
if (adapterPosition == AdapterView.INVALID_POSITION) {
return;
}
Cursor cursor = (Cursor) mAdapter.getItem(adapterPosition);
Account account = mPreferences.getAccount(cursor.getString(ACCOUNT_UUID_COLUMN));
if (mThreadedList && cursor.getInt(THREAD_COUNT_COLUMN) > 1) {
long threadRootId = cursor.getLong(THREAD_ROOT_COLUMN);
mController.setFlagForThreads(account,
Collections.singletonList(Long.valueOf(threadRootId)), flag, newState);
} else {
long id = cursor.getLong(ID_COLUMN);
mController.setFlag(account, Collections.singletonList(Long.valueOf(id)), flag,
newState);
}
computeBatchDirection();
}
private void setFlagForSelected(final Flag flag, final boolean newState) {
if (mSelected.size() == 0) {
return;
}
Map<Account, List<Long>> messageMap = new HashMap<Account, List<Long>>();
Map<Account, List<Long>> threadMap = new HashMap<Account, List<Long>>();
Set<Account> accounts = new HashSet<Account>();
for (int position = 0, end = mAdapter.getCount(); position < end; position++) {
Cursor cursor = (Cursor) mAdapter.getItem(position);
long uniqueId = cursor.getLong(mUniqueIdColumn);
if (mSelected.contains(uniqueId)) {
String uuid = cursor.getString(ACCOUNT_UUID_COLUMN);
Account account = mPreferences.getAccount(uuid);
accounts.add(account);
if (mThreadedList && cursor.getInt(THREAD_COUNT_COLUMN) > 1) {
List<Long> threadRootIdList = threadMap.get(account);
if (threadRootIdList == null) {
threadRootIdList = new ArrayList<Long>();
threadMap.put(account, threadRootIdList);
}
threadRootIdList.add(cursor.getLong(THREAD_ROOT_COLUMN));
} else {
List<Long> messageIdList = messageMap.get(account);
if (messageIdList == null) {
messageIdList = new ArrayList<Long>();
messageMap.put(account, messageIdList);
}
messageIdList.add(cursor.getLong(ID_COLUMN));
}
}
}
for (Account account : accounts) {
List<Long> messageIds = messageMap.get(account);
List<Long> threadRootIds = threadMap.get(account);
if (messageIds != null) {
mController.setFlag(account, messageIds, flag, newState);
}
if (threadRootIds != null) {
mController.setFlagForThreads(account, threadRootIds, flag, newState);
}
}
computeBatchDirection();
}
private void onMove(Message message) {
onMove(Collections.singletonList(message));
}
/**
* Display the message move activity.
*
* @param messages
* Never {@code null}.
*/
private void onMove(List<Message> messages) {
if (!checkCopyOrMovePossible(messages, FolderOperation.MOVE)) {
return;
}
final Folder folder;
if (mIsThreadDisplay) {
folder = messages.get(0).getFolder();
} else if (mSingleFolderMode) {
folder = mCurrentFolder.folder;
} else {
folder = null;
}
Account account = messages.get(0).getFolder().getAccount();
displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_MOVE, account, folder, messages);
}
private void onCopy(Message message) {
onCopy(Collections.singletonList(message));
}
/**
* Display the message copy activity.
*
* @param messages
* Never {@code null}.
*/
private void onCopy(List<Message> messages) {
if (!checkCopyOrMovePossible(messages, FolderOperation.COPY)) {
return;
}
final Folder folder;
if (mIsThreadDisplay) {
folder = messages.get(0).getFolder();
} else if (mSingleFolderMode) {
folder = mCurrentFolder.folder;
} else {
folder = null;
}
displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_COPY, mAccount, folder, messages);
}
/**
* Helper method to manage the invocation of {@link #startActivityForResult(Intent, int)} for a
* folder operation ({@link ChooseFolder} activity), while saving a list of associated messages.
*
* @param requestCode
* If {@code >= 0}, this code will be returned in {@code onActivityResult()} when the
* activity exits.
* @param folder
* The source folder. Never {@code null}.
* @param messages
* Messages to be affected by the folder operation. Never {@code null}.
*
* @see #startActivityForResult(Intent, int)
*/
private void displayFolderChoice(int requestCode, Account account, Folder folder,
List<Message> messages) {
Intent intent = new Intent(getActivity(), ChooseFolder.class);
intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, account.getUuid());
intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, account.getLastSelectedFolderName());
if (folder == null) {
intent.putExtra(ChooseFolder.EXTRA_SHOW_CURRENT, "yes");
} else {
intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, folder.getName());
}
// remember the selected messages for #onActivityResult
mActiveMessages = messages;
startActivityForResult(intent, requestCode);
}
private void onArchive(final Message message) {
onArchive(Collections.singletonList(message));
}
private void onArchive(final List<Message> messages) {
Map<Account, List<Message>> messagesByAccount = groupMessagesByAccount(messages);
for (Entry<Account, List<Message>> entry : messagesByAccount.entrySet()) {
Account account = entry.getKey();
String archiveFolder = account.getArchiveFolderName();
if (!K9.FOLDER_NONE.equals(archiveFolder)) {
move(entry.getValue(), archiveFolder);
}
}
}
private Map<Account, List<Message>> groupMessagesByAccount(final List<Message> messages) {
Map<Account, List<Message>> messagesByAccount = new HashMap<Account, List<Message>>();
for (Message message : messages) {
Account account = message.getFolder().getAccount();
List<Message> msgList = messagesByAccount.get(account);
if (msgList == null) {
msgList = new ArrayList<Message>();
messagesByAccount.put(account, msgList);
}
msgList.add(message);
}
return messagesByAccount;
}
private void onSpam(Message message) {
onSpam(Collections.singletonList(message));
}
/**
* Move messages to the spam folder.
*
* @param messages
* The messages to move to the spam folder. Never {@code null}.
*/
private void onSpam(List<Message> messages) {
if (K9.confirmSpam()) {
// remember the message selection for #onCreateDialog(int)
mActiveMessages = messages;
showDialog(R.id.dialog_confirm_spam);
} else {
onSpamConfirmed(messages);
}
}
private void onSpamConfirmed(List<Message> messages) {
Map<Account, List<Message>> messagesByAccount = groupMessagesByAccount(messages);
for (Entry<Account, List<Message>> entry : messagesByAccount.entrySet()) {
Account account = entry.getKey();
String spamFolder = account.getSpamFolderName();
if (!K9.FOLDER_NONE.equals(spamFolder)) {
move(entry.getValue(), spamFolder);
}
}
}
private static enum FolderOperation {
COPY, MOVE
}
/**
* Display a Toast message if any message isn't synchronized
*
* @param messages
* The messages to copy or move. Never {@code null}.
* @param operation
* The type of operation to perform. Never {@code null}.
*
* @return {@code true}, if operation is possible.
*/
private boolean checkCopyOrMovePossible(final List<Message> messages,
final FolderOperation operation) {
if (messages.size() == 0) {
return false;
}
boolean first = true;
for (final Message message : messages) {
if (first) {
first = false;
// account check
final Account account = message.getFolder().getAccount();
if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(account)) ||
(operation == FolderOperation.COPY && !mController.isCopyCapable(account))) {
return false;
}
}
// message check
if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) ||
(operation == FolderOperation.COPY && !mController.isCopyCapable(message))) {
final Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message,
Toast.LENGTH_LONG);
toast.show();
return false;
}
}
return true;
}
/**
* Copy the specified messages to the specified folder.
*
* @param messages
* List of messages to copy. Never {@code null}.
* @param destination
* The name of the destination folder. Never {@code null}.
*/
private void copy(List<Message> messages, final String destination) {
copyOrMove(messages, destination, FolderOperation.COPY);
}
/**
* Move the specified messages to the specified folder.
*
* @param messages
* The list of messages to move. Never {@code null}.
* @param destination
* The name of the destination folder. Never {@code null}.
*/
private void move(List<Message> messages, final String destination) {
copyOrMove(messages, destination, FolderOperation.MOVE);
}
/**
* The underlying implementation for {@link #copy(List, String)} and
* {@link #move(List, String)}. This method was added mainly because those 2
* methods share common behavior.
*
* @param messages
* The list of messages to copy or move. Never {@code null}.
* @param destination
* The name of the destination folder. Never {@code null}.
* @param operation
* Specifies what operation to perform. Never {@code null}.
*/
private void copyOrMove(List<Message> messages, final String destination,
final FolderOperation operation) {
if (K9.FOLDER_NONE.equalsIgnoreCase(destination) || !mSingleAccountMode) {
return;
}
Account account = mAccount;
Map<String, List<Message>> folderMap = new HashMap<String, List<Message>>();
for (Message message : messages) {
if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) ||
(operation == FolderOperation.COPY && !mController.isCopyCapable(message))) {
Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message,
Toast.LENGTH_LONG).show();
// XXX return meaningful error value?
// message isn't synchronized
return;
}
String folderName = message.getFolder().getName();
if (folderName.equals(destination)) {
// Skip messages already in the destination folder
continue;
}
List<Message> outMessages = folderMap.get(folderName);
if (outMessages == null) {
outMessages = new ArrayList<Message>();
folderMap.put(folderName, outMessages);
}
outMessages.add(message);
}
for (String folderName : folderMap.keySet()) {
List<Message> outMessages = folderMap.get(folderName);
if (operation == FolderOperation.MOVE) {
if (mThreadedList) {
mController.moveMessagesInThread(account, folderName, outMessages, destination);
} else {
mController.moveMessages(account, folderName, outMessages, destination, null);
}
} else {
if (mThreadedList) {
mController.copyMessagesInThread(account, folderName, outMessages, destination);
} else {
mController.copyMessages(account, folderName, outMessages, destination, null);
}
}
}
}
class ActionModeCallback implements ActionMode.Callback {
private MenuItem mSelectAll;
private MenuItem mMarkAsRead;
private MenuItem mMarkAsUnread;
private MenuItem mFlag;
private MenuItem mUnflag;
@Override
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
mSelectAll = menu.findItem(R.id.select_all);
mMarkAsRead = menu.findItem(R.id.mark_as_read);
mMarkAsUnread = menu.findItem(R.id.mark_as_unread);
mFlag = menu.findItem(R.id.flag);
mUnflag = menu.findItem(R.id.unflag);
// we don't support cross account actions atm
if (!mSingleAccountMode) {
// show all
menu.findItem(R.id.move).setVisible(true);
menu.findItem(R.id.archive).setVisible(true);
menu.findItem(R.id.spam).setVisible(true);
menu.findItem(R.id.copy).setVisible(true);
Set<String> accountUuids = getAccountUuidsForSelected();
for (String accountUuid : accountUuids) {
Account account = mPreferences.getAccount(accountUuid);
if (account != null) {
setContextCapabilities(account, menu);
}
}
}
return true;
}
/**
* Get the set of account UUIDs for the selected messages.
*/
private Set<String> getAccountUuidsForSelected() {
int maxAccounts = mAccountUuids.length;
Set<String> accountUuids = new HashSet<String>(maxAccounts);
for (int position = 0, end = mAdapter.getCount(); position < end; position++) {
Cursor cursor = (Cursor) mAdapter.getItem(position);
long uniqueId = cursor.getLong(mUniqueIdColumn);
if (mSelected.contains(uniqueId)) {
String accountUuid = cursor.getString(ACCOUNT_UUID_COLUMN);
accountUuids.add(accountUuid);
if (accountUuids.size() == mAccountUuids.length) {
break;
}
}
}
return accountUuids;
}
@Override
public void onDestroyActionMode(ActionMode mode) {
mActionMode = null;
mSelectAll = null;
mMarkAsRead = null;
mMarkAsUnread = null;
mFlag = null;
mUnflag = null;
setSelectionState(false);
}
@Override
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
MenuInflater inflater = mode.getMenuInflater();
inflater.inflate(R.menu.message_list_context, menu);
// check capabilities
setContextCapabilities(mAccount, menu);
return true;
}
/**
* Disables menu options not supported by the account type or current "search view".
*
* @param account
* The account to query for its capabilities.
* @param menu
* The menu to adapt.
*/
private void setContextCapabilities(Account account, Menu menu) {
if (!mSingleAccountMode) {
// We don't support cross-account copy/move operations right now
menu.findItem(R.id.move).setVisible(false);
menu.findItem(R.id.copy).setVisible(false);
//TODO: we could support the archive and spam operations if all selected messages
// belong to non-POP3 accounts
menu.findItem(R.id.archive).setVisible(false);
menu.findItem(R.id.spam).setVisible(false);
} else {
// hide unsupported
if (!mController.isCopyCapable(account)) {
menu.findItem(R.id.copy).setVisible(false);
}
if (!mController.isMoveCapable(account)) {
menu.findItem(R.id.move).setVisible(false);
menu.findItem(R.id.archive).setVisible(false);
menu.findItem(R.id.spam).setVisible(false);
}
if (!account.hasArchiveFolder()) {
menu.findItem(R.id.archive).setVisible(false);
}
if (!account.hasSpamFolder()) {
menu.findItem(R.id.spam).setVisible(false);
}
}
}
public void showSelectAll(boolean show) {
if (mActionMode != null) {
mSelectAll.setVisible(show);
}
}
public void showMarkAsRead(boolean show) {
if (mActionMode != null) {
mMarkAsRead.setVisible(show);
mMarkAsUnread.setVisible(!show);
}
}
public void showFlag(boolean show) {
if (mActionMode != null) {
mFlag.setVisible(show);
mUnflag.setVisible(!show);
}
}
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
/*
* In the following we assume that we can't move or copy
* mails to the same folder. Also that spam isn't available if we are
* in the spam folder,same for archive.
*
* This is the case currently so safe assumption.
*/
switch (item.getItemId()) {
case R.id.delete: {
List<Message> messages = getCheckedMessages();
onDelete(messages);
mSelectedCount = 0;
break;
}
case R.id.mark_as_read: {
setFlagForSelected(Flag.SEEN, true);
break;
}
case R.id.mark_as_unread: {
setFlagForSelected(Flag.SEEN, false);
break;
}
case R.id.flag: {
setFlagForSelected(Flag.FLAGGED, true);
break;
}
case R.id.unflag: {
setFlagForSelected(Flag.FLAGGED, false);
break;
}
case R.id.select_all: {
selectAll();
break;
}
// only if the account supports this
case R.id.archive: {
List<Message> messages = getCheckedMessages();
onArchive(messages);
mSelectedCount = 0;
break;
}
case R.id.spam: {
List<Message> messages = getCheckedMessages();
onSpam(messages);
mSelectedCount = 0;
break;
}
case R.id.move: {
List<Message> messages = getCheckedMessages();
onMove(messages);
mSelectedCount = 0;
break;
}
case R.id.copy: {
List<Message> messages = getCheckedMessages();
onCopy(messages);
mSelectedCount = 0;
break;
}
}
if (mSelectedCount == 0) {
mActionMode.finish();
}
return true;
}
}
@Override
public void doPositiveClick(int dialogId) {
switch (dialogId) {
case R.id.dialog_confirm_spam: {
onSpamConfirmed(mActiveMessages);
// No further need for this reference
mActiveMessages = null;
break;
}
}
}
@Override
public void doNegativeClick(int dialogId) {
switch (dialogId) {
case R.id.dialog_confirm_spam: {
// No further need for this reference
mActiveMessages = null;
break;
}
}
}
@Override
public void dialogCancelled(int dialogId) {
doNegativeClick(dialogId);
}
public void checkMail() {
mController.synchronizeMailbox(mAccount, mFolderName, mListener, null);
mController.sendPendingMessages(mAccount, mListener);
}
/**
* We need to do some special clean up when leaving a remote search result screen. If no
* remote search is in progress, this method does nothing special.
*/
@Override
public void onStop() {
// If we represent a remote search, then kill that before going back.
if (isRemoteSearch() && mRemoteSearchFuture != null) {
try {
Log.i(K9.LOG_TAG, "Remote search in progress, attempting to abort...");
// Canceling the future stops any message fetches in progress.
final boolean cancelSuccess = mRemoteSearchFuture.cancel(true); // mayInterruptIfRunning = true
if (!cancelSuccess) {
Log.e(K9.LOG_TAG, "Could not cancel remote search future.");
}
// Closing the folder will kill off the connection if we're mid-search.
final Account searchAccount = mAccount;
final Folder remoteFolder = mCurrentFolder.folder;
remoteFolder.close();
// Send a remoteSearchFinished() message for good measure.
mListener.remoteSearchFinished(searchAccount, mCurrentFolder.name, 0, null);
} catch (Exception e) {
// Since the user is going back, log and squash any exceptions.
Log.e(K9.LOG_TAG, "Could not abort remote search before going back", e);
}
}
super.onStop();
}
public ArrayList<MessageReference> getMessageReferences() {
ArrayList<MessageReference> messageRefs = new ArrayList<MessageReference>();
for (int i = 0, len = mAdapter.getCount(); i < len; i++) {
Cursor cursor = (Cursor) mAdapter.getItem(i);
MessageReference ref = new MessageReference();
ref.accountUuid = cursor.getString(ACCOUNT_UUID_COLUMN);
ref.folderName = cursor.getString(FOLDER_NAME_COLUMN);
ref.uid = cursor.getString(UID_COLUMN);
messageRefs.add(ref);
}
return messageRefs;
}
public void selectAll() {
setSelectionState(true);
}
public void onMoveUp() {
int currentPosition = mListView.getSelectedItemPosition();
if (currentPosition == AdapterView.INVALID_POSITION || mListView.isInTouchMode()) {
currentPosition = mListView.getFirstVisiblePosition();
}
if (currentPosition > 0) {
mListView.setSelection(currentPosition - 1);
}
}
public void onMoveDown() {
int currentPosition = mListView.getSelectedItemPosition();
if (currentPosition == AdapterView.INVALID_POSITION || mListView.isInTouchMode()) {
currentPosition = mListView.getFirstVisiblePosition();
}
if (currentPosition < mListView.getCount()) {
mListView.setSelection(currentPosition + 1);
}
}
public boolean openPrevious(MessageReference messageReference) {
int position = getPosition(messageReference);
if (position <= 0) {
return false;
}
openMessageAtPosition(position - 1);
return true;
}
public boolean openNext(MessageReference messageReference) {
int position = getPosition(messageReference);
if (position < 0 || position == mAdapter.getCount() - 1) {
return false;
}
openMessageAtPosition(position + 1);
return true;
}
public boolean isFirst(MessageReference messageReference) {
return mAdapter.isEmpty() || messageReference.equals(getReferenceForPosition(0));
}
public boolean isLast(MessageReference messageReference) {
return mAdapter.isEmpty() || messageReference.equals(getReferenceForPosition(mAdapter.getCount() - 1));
}
private MessageReference getReferenceForPosition(int position) {
Cursor cursor = (Cursor) mAdapter.getItem(position);
MessageReference ref = new MessageReference();
ref.accountUuid = cursor.getString(ACCOUNT_UUID_COLUMN);
ref.folderName = cursor.getString(FOLDER_NAME_COLUMN);
ref.uid = cursor.getString(UID_COLUMN);
return ref;
}
private void openMessageAtPosition(int position) {
// Scroll message into view if necessary
int listViewPosition = adapterToListViewPosition(position);
if (listViewPosition != AdapterView.INVALID_POSITION &&
(listViewPosition < mListView.getFirstVisiblePosition() ||
listViewPosition > mListView.getLastVisiblePosition())) {
mListView.setSelection(listViewPosition);
}
MessageReference ref = getReferenceForPosition(position);
// For some reason the mListView.setSelection() above won't do anything when we call
// onOpenMessage() (and consequently mAdapter.notifyDataSetChanged()) right away. So we
// defer the call using MessageListHandler.
mHandler.openMessage(ref);
}
private int getPosition(MessageReference messageReference) {
for (int i = 0, len = mAdapter.getCount(); i < len; i++) {
Cursor cursor = (Cursor) mAdapter.getItem(i);
String accountUuid = cursor.getString(ACCOUNT_UUID_COLUMN);
String folderName = cursor.getString(FOLDER_NAME_COLUMN);
String uid = cursor.getString(UID_COLUMN);
if (accountUuid.equals(messageReference.accountUuid) &&
folderName.equals(messageReference.folderName) &&
uid.equals(messageReference.uid)) {
return i;
}
}
return -1;
}
public interface MessageListFragmentListener {
void enableActionBarProgress(boolean enable);
void setMessageListProgress(int level);
void showThread(Account account, String folderName, long rootId);
void showMoreFromSameSender(String senderAddress);
void onResendMessage(Message message);
void onForward(Message message);
void onReply(Message message);
void onReplyAll(Message message);
void openMessage(MessageReference messageReference);
void setMessageListTitle(String title);
void setMessageListSubTitle(String subTitle);
void setUnreadCount(int unread);
void onCompose(Account account);
boolean startSearch(Account account, String folderName);
void remoteSearchStarted();
void goBack();
void updateMenu();
}
public void onReverseSort() {
changeSort(mSortType);
}
private Message getSelectedMessage() {
int listViewPosition = mListView.getSelectedItemPosition();
int adapterPosition = listViewToAdapterPosition(listViewPosition);
return getMessageAtPosition(adapterPosition);
}
private int getAdapterPositionForSelectedMessage() {
int listViewPosition = mListView.getSelectedItemPosition();
return listViewToAdapterPosition(listViewPosition);
}
private Message getMessageAtPosition(int adapterPosition) {
if (adapterPosition == AdapterView.INVALID_POSITION) {
return null;
}
Cursor cursor = (Cursor) mAdapter.getItem(adapterPosition);
String uid = cursor.getString(UID_COLUMN);
Account account = getAccountFromCursor(cursor);
long folderId = cursor.getLong(FOLDER_ID_COLUMN);
Folder folder = getFolderById(account, folderId);
try {
return folder.getMessage(uid);
} catch (MessagingException e) {
Log.e(K9.LOG_TAG, "Something went wrong while fetching a message", e);
}
return null;
}
private List<Message> getCheckedMessages() {
List<Message> messages = new ArrayList<Message>(mSelected.size());
for (int position = 0, end = mAdapter.getCount(); position < end; position++) {
Cursor cursor = (Cursor) mAdapter.getItem(position);
long uniqueId = cursor.getLong(mUniqueIdColumn);
if (mSelected.contains(uniqueId)) {
messages.add(getMessageAtPosition(position));
}
}
return messages;
}
public void onDelete() {
Message message = getSelectedMessage();
if (message != null) {
onDelete(Collections.singletonList(message));
}
}
public void toggleMessageSelect() {
toggleMessageSelect(mListView.getSelectedItemPosition());
}
public void onToggleFlagged() {
onToggleFlag(Flag.FLAGGED, FLAGGED_COLUMN);
}
public void onToggleRead() {
onToggleFlag(Flag.SEEN, READ_COLUMN);
}
private void onToggleFlag(Flag flag, int flagColumn) {
int adapterPosition = getAdapterPositionForSelectedMessage();
if (adapterPosition == ListView.INVALID_POSITION) {
return;
}
Cursor cursor = (Cursor) mAdapter.getItem(adapterPosition);
boolean flagState = (cursor.getInt(flagColumn) == 1);
setFlag(adapterPosition, flag, !flagState);
}
public void onMove() {
Message message = getSelectedMessage();
if (message != null) {
onMove(message);
}
}
public void onArchive() {
Message message = getSelectedMessage();
if (message != null) {
onArchive(message);
}
}
public void onCopy() {
Message message = getSelectedMessage();
if (message != null) {
onCopy(message);
}
}
public boolean isOutbox() {
return (mFolderName != null && mFolderName.equals(mAccount.getOutboxFolderName()));
}
public boolean isErrorFolder() {
return K9.ERROR_FOLDER_NAME.equals(mFolderName);
}
public boolean isRemoteFolder() {
if (mSearch.isManualSearch() || isOutbox() || isErrorFolder()) {
return false;
}
if (!mController.isMoveCapable(mAccount)) {
// For POP3 accounts only the Inbox is a remote folder.
return (mFolderName != null && !mFolderName.equals(mAccount.getInboxFolderName()));
}
return true;
}
public boolean isManualSearch() {
return mSearch.isManualSearch();
}
public boolean isAccountExpungeCapable() {
try {
return (mAccount != null && mAccount.getRemoteStore().isExpungeCapable());
} catch (Exception e) {
return false;
}
}
public void onRemoteSearch() {
// Remote search is useless without the network.
if (mHasConnectivity) {
onRemoteSearchRequested();
} else {
Toast.makeText(getActivity(), getText(R.string.remote_search_unavailable_no_network),
Toast.LENGTH_SHORT).show();
}
}
public boolean isRemoteSearch() {
return mRemoteSearchPerformed;
}
public boolean isRemoteSearchAllowed() {
if (!mSearch.isManualSearch() || mRemoteSearchPerformed || !mSingleFolderMode) {
return false;
}
boolean allowRemoteSearch = false;
final Account searchAccount = mAccount;
if (searchAccount != null) {
allowRemoteSearch = searchAccount.allowRemoteSearch();
}
return allowRemoteSearch;
}
public boolean onSearchRequested() {
String folderName = (mCurrentFolder != null) ? mCurrentFolder.name : null;
return mFragmentListener.startSearch(mAccount, folderName);
}
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
String accountUuid = mAccountUuids[id];
Account account = mPreferences.getAccount(accountUuid);
String threadId = getThreadId(mSearch);
Uri uri;
String[] projection;
boolean needConditions;
if (threadId != null) {
uri = Uri.withAppendedPath(EmailProvider.CONTENT_URI, "account/" + accountUuid + "/thread/" + threadId);
projection = PROJECTION;
needConditions = false;
} else if (mThreadedList) {
uri = Uri.withAppendedPath(EmailProvider.CONTENT_URI, "account/" + accountUuid + "/messages/threaded");
projection = THREADED_PROJECTION;
needConditions = true;
} else {
uri = Uri.withAppendedPath(EmailProvider.CONTENT_URI, "account/" + accountUuid + "/messages");
projection = PROJECTION;
needConditions = true;
}
StringBuilder query = new StringBuilder();
List<String> queryArgs = new ArrayList<String>();
if (needConditions) {
SqlQueryBuilder.buildWhereClause(account, mSearch.getConditions(), query, queryArgs);
}
String selection = query.toString();
String[] selectionArgs = queryArgs.toArray(new String[0]);
String sortOrder = buildSortOrder();
return new CursorLoader(getActivity(), uri, projection, selection, selectionArgs,
sortOrder);
}
private String getThreadId(LocalSearch search) {
for (ConditionsTreeNode node : search.getLeafSet()) {
SearchCondition condition = node.mCondition;
if (condition.field == Searchfield.THREAD_ID) {
return condition.value;
}
}
return null;
}
private String buildSortOrder() {
String sortColumn = MessageColumns.ID;
switch (mSortType) {
case SORT_ARRIVAL: {
sortColumn = MessageColumns.INTERNAL_DATE;
break;
}
case SORT_ATTACHMENT: {
sortColumn = "(" + MessageColumns.ATTACHMENT_COUNT + " < 1)";
break;
}
case SORT_FLAGGED: {
sortColumn = "(" + MessageColumns.FLAGGED + " != 1)";
break;
}
// case SORT_SENDER: {
// //FIXME
// sortColumn = MessageColumns.SENDER_LIST;
// break;
// }
case SORT_SUBJECT: {
sortColumn = MessageColumns.SUBJECT + " COLLATE NOCASE";
break;
}
case SORT_UNREAD: {
sortColumn = MessageColumns.READ;
break;
}
case SORT_DATE:
default: {
sortColumn = MessageColumns.DATE;
}
}
String sortDirection = (mSortAscending) ? " ASC" : " DESC";
String secondarySort;
if (mSortType == SortType.SORT_DATE || mSortType == SortType.SORT_ARRIVAL) {
secondarySort = "";
} else {
secondarySort = MessageColumns.DATE + ((mSortDateAscending) ? " ASC, " : " DESC, ");
}
String sortOrder = sortColumn + sortDirection + ", " + secondarySort +
MessageColumns.ID + " DESC";
return sortOrder;
}
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
if (mIsThreadDisplay && data.getCount() == 0) {
mHandler.goBack();
return;
}
// Remove the "Loading..." view
mPullToRefreshView.setEmptyView(null);
// Enable pull-to-refresh if allowed
if (isPullToRefreshAllowed()) {
setPullToRefreshEnabled(true);
}
final int loaderId = loader.getId();
mCursors[loaderId] = data;
mCursorValid[loaderId] = true;
Cursor cursor;
if (mCursors.length > 1) {
cursor = new MergeCursorWithUniqueId(mCursors, getComparator());
mUniqueIdColumn = cursor.getColumnIndex("_id");
} else {
cursor = data;
mUniqueIdColumn = ID_COLUMN;
}
if (mIsThreadDisplay) {
if (cursor.moveToFirst()) {
mTitle = cursor.getString(SUBJECT_COLUMN);
mTitle = Utility.stripSubject(mTitle);
if (StringUtils.isNullOrEmpty(mTitle)) {
mTitle = getString(R.string.general_no_subject);
}
updateTitle();
} else {
//TODO: empty thread view -> return to full message list
}
}
cleanupSelected(cursor);
mAdapter.swapCursor(cursor);
resetActionMode();
computeBatchDirection();
if (isLoadFinished()) {
if (mSavedListState != null) {
mHandler.restoreListPosition();
}
mFragmentListener.updateMenu();
}
}
public boolean isLoadFinished() {
if (mCursorValid == null) {
return false;
}
boolean loadFinished = true;
for (int i = 0; i < mCursorValid.length; i++) {
loadFinished &= mCursorValid[i];
}
return loadFinished;
}
private void cleanupSelected(Cursor cursor) {
if (mSelected.size() == 0) {
return;
}
Set<Long> selected = new HashSet<Long>();
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
long uniqueId = cursor.getLong(mUniqueIdColumn);
if (mSelected.contains(uniqueId)) {
selected.add(uniqueId);
}
}
mSelected = selected;
}
/**
* Starts or finishes the action mode when necessary.
*/
private void resetActionMode() {
if (mSelected.size() == 0) {
if (mActionMode != null) {
mActionMode.finish();
}
return;
}
if (mActionMode == null) {
mActionMode = getSherlockActivity().startActionMode(mActionModeCallback);
}
recalculateSelectionCount();
updateActionModeTitle();
}
/**
* Recalculates the selection count.
*
* <p>
* For non-threaded lists this is simply the number of visibly selected messages. If threaded
* view is enabled this method counts the number of messages in the selected threads.
* </p>
*/
private void recalculateSelectionCount() {
if (!mThreadedList) {
mSelectedCount = mSelected.size();
return;
}
mSelectedCount = 0;
for (int i = 0, end = mAdapter.getCount(); i < end; i++) {
Cursor cursor = (Cursor) mAdapter.getItem(i);
long uniqueId = cursor.getLong(mUniqueIdColumn);
if (mSelected.contains(uniqueId)) {
int threadCount = cursor.getInt(THREAD_COUNT_COLUMN);
mSelectedCount += (threadCount > 1) ? threadCount : 1;
}
}
}
@Override
public void onLoaderReset(Loader<Cursor> loader) {
mSelected.clear();
mAdapter.swapCursor(null);
}
private Account getAccountFromCursor(Cursor cursor) {
String accountUuid = cursor.getString(ACCOUNT_UUID_COLUMN);
return mPreferences.getAccount(accountUuid);
}
private void remoteSearchFinished() {
mRemoteSearchFuture = null;
}
/**
* Mark a message as 'active'.
*
* <p>
* The active message is the one currently displayed in the message view portion of the split
* view.
* </p>
*
* @param messageReference
* {@code null} to not mark any message as being 'active'.
*/
public void setActiveMessage(MessageReference messageReference) {
mActiveMessage = messageReference;
if (mAdapter != null) {
mAdapter.notifyDataSetChanged();
}
}
public boolean isSingleAccountMode() {
return mSingleAccountMode;
}
public boolean isSingleFolderMode() {
return mSingleFolderMode;
}
public boolean isInitialized() {
return mInitialized;
}
}
| false | true | public void bindView(View view, Context context, Cursor cursor) {
Account account = getAccountFromCursor(cursor);
String fromList = cursor.getString(SENDER_LIST_COLUMN);
String toList = cursor.getString(TO_LIST_COLUMN);
String ccList = cursor.getString(CC_LIST_COLUMN);
Address[] fromAddrs = Address.unpack(fromList);
Address[] toAddrs = Address.unpack(toList);
Address[] ccAddrs = Address.unpack(ccList);
boolean fromMe = mMessageHelper.toMe(account, fromAddrs);
boolean toMe = mMessageHelper.toMe(account, toAddrs);
boolean ccMe = mMessageHelper.toMe(account, ccAddrs);
CharSequence displayName = mMessageHelper.getDisplayName(account, fromAddrs, toAddrs);
CharSequence displayDate = DateUtils.getRelativeTimeSpanString(context, cursor.getLong(DATE_COLUMN));
String counterpartyAddress = null;
if (fromMe) {
if (toAddrs.length > 0) {
counterpartyAddress = toAddrs[0].getAddress();
} else if (ccAddrs.length > 0) {
counterpartyAddress = ccAddrs[0].getAddress();
}
} else if (fromAddrs.length > 0) {
counterpartyAddress = fromAddrs[0].getAddress();
}
int threadCount = (mThreadedList) ? cursor.getInt(THREAD_COUNT_COLUMN) : 0;
String subject = cursor.getString(SUBJECT_COLUMN);
if (StringUtils.isNullOrEmpty(subject)) {
subject = getString(R.string.general_no_subject);
} else if (threadCount > 1) {
// If this is a thread, strip the RE/FW from the subject. "Be like Outlook."
subject = Utility.stripSubject(subject);
}
boolean read = (cursor.getInt(READ_COLUMN) == 1);
boolean flagged = (cursor.getInt(FLAGGED_COLUMN) == 1);
boolean answered = (cursor.getInt(ANSWERED_COLUMN) == 1);
boolean forwarded = (cursor.getInt(FORWARDED_COLUMN) == 1);
boolean hasAttachments = (cursor.getInt(ATTACHMENT_COUNT_COLUMN) > 0);
MessageViewHolder holder = (MessageViewHolder) view.getTag();
int maybeBoldTypeface = (read) ? Typeface.NORMAL : Typeface.BOLD;
long uniqueId = cursor.getLong(mUniqueIdColumn);
boolean selected = mSelected.contains(uniqueId);
if (!mCheckboxes && selected) {
holder.chip.setBackgroundDrawable(account.getCheckmarkChip().drawable());
} else {
holder.chip.setBackgroundDrawable(account.generateColorChip(read, toMe, ccMe,
fromMe, flagged).drawable());
}
if (mCheckboxes) {
// Set holder.position to -1 to avoid MessageViewHolder.onCheckedChanged() toggling
// the selection state when setChecked() is called below.
holder.position = -1;
// Only set the UI state, don't actually toggle the message selection.
holder.selected.setChecked(selected);
// Now save the position so MessageViewHolder.onCheckedChanged() will know what
// message to (de)select.
holder.position = cursor.getPosition();
}
if (holder.contactBadge != null) {
holder.contactBadge.assignContactFromEmail(counterpartyAddress, true);
if (counterpartyAddress != null) {
/*
* At least in Android 2.2 a different background + padding is used when no
* email address is available. ListView reuses the views but QuickContactBadge
* doesn't reset the padding, so we do it ourselves.
*/
holder.contactBadge.setPadding(0, 0, 0, 0);
mContactsPictureLoader.loadContactPicture(counterpartyAddress, holder.contactBadge);
} else {
holder.contactBadge.setImageResource(R.drawable.ic_contact_picture);
}
}
// Background indicator
if (selected || K9.useBackgroundAsUnreadIndicator()) {
int res;
if (selected) {
res = R.attr.messageListSelectedBackgroundColor;
} else if (read) {
res = R.attr.messageListReadItemBackgroundColor;
} else {
res = R.attr.messageListUnreadItemBackgroundColor;
}
TypedValue outValue = new TypedValue();
getActivity().getTheme().resolveAttribute(res, outValue, true);
view.setBackgroundColor(outValue.data);
}
if (mActiveMessage != null) {
String uid = cursor.getString(UID_COLUMN);
String folderName = cursor.getString(FOLDER_NAME_COLUMN);
if (account.getUuid().equals(mActiveMessage.accountUuid) &&
folderName.equals(mActiveMessage.folderName) &&
uid.equals(mActiveMessage.uid)) {
int res = R.attr.messageListActiveItemBackgroundColor;
TypedValue outValue = new TypedValue();
getActivity().getTheme().resolveAttribute(res, outValue, true);
view.setBackgroundColor(outValue.data);
}
}
// Thread count
if (threadCount > 1) {
holder.threadCount.setText(Integer.toString(threadCount));
holder.threadCount.setVisibility(View.VISIBLE);
} else {
holder.threadCount.setVisibility(View.GONE);
}
CharSequence beforePreviewText = (mSenderAboveSubject) ? subject : displayName;
String sigil = recipientSigil(toMe, ccMe);
SpannableStringBuilder messageStringBuilder = new SpannableStringBuilder(sigil)
.append(beforePreviewText);
if (mPreviewLines > 0) {
String preview = cursor.getString(PREVIEW_COLUMN);
if (preview != null) {
messageStringBuilder.append(" ").append(preview);
}
}
holder.preview.setText(messageStringBuilder, TextView.BufferType.SPANNABLE);
Spannable str = (Spannable)holder.preview.getText();
// Create a span section for the sender, and assign the correct font size and weight
int fontSize = (mSenderAboveSubject) ?
mFontSizes.getMessageListSubject():
mFontSizes.getMessageListSender();
AbsoluteSizeSpan span = new AbsoluteSizeSpan(fontSize, true);
str.setSpan(span, 0, beforePreviewText.length() + sigil.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
//TODO: make this part of the theme
int color = (K9.getK9Theme() == K9.Theme.LIGHT) ?
Color.rgb(105, 105, 105) :
Color.rgb(160, 160, 160);
// Set span (color) for preview message
str.setSpan(new ForegroundColorSpan(color), beforePreviewText.length() + sigil.length(),
str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
Drawable statusHolder = null;
if (forwarded && answered) {
statusHolder = mForwardedAnsweredIcon;
} else if (answered) {
statusHolder = mAnsweredIcon;
} else if (forwarded) {
statusHolder = mForwardedIcon;
}
if (holder.from != null ) {
holder.from.setTypeface(null, maybeBoldTypeface);
if (mSenderAboveSubject) {
holder.from.setCompoundDrawablesWithIntrinsicBounds(
statusHolder, // left
null, // top
hasAttachments ? mAttachmentIcon : null, // right
null); // bottom
holder.from.setText(displayName);
} else {
holder.from.setText(new SpannableStringBuilder(sigil).append(displayName));
}
}
if (holder.subject != null ) {
if (!mSenderAboveSubject) {
holder.subject.setCompoundDrawablesWithIntrinsicBounds(
statusHolder, // left
null, // top
hasAttachments ? mAttachmentIcon : null, // right
null); // bottom
}
holder.subject.setTypeface(null, maybeBoldTypeface);
holder.subject.setText(subject);
}
holder.date.setText(displayDate);
}
| public void bindView(View view, Context context, Cursor cursor) {
Account account = getAccountFromCursor(cursor);
String fromList = cursor.getString(SENDER_LIST_COLUMN);
String toList = cursor.getString(TO_LIST_COLUMN);
String ccList = cursor.getString(CC_LIST_COLUMN);
Address[] fromAddrs = Address.unpack(fromList);
Address[] toAddrs = Address.unpack(toList);
Address[] ccAddrs = Address.unpack(ccList);
boolean fromMe = mMessageHelper.toMe(account, fromAddrs);
boolean toMe = mMessageHelper.toMe(account, toAddrs);
boolean ccMe = mMessageHelper.toMe(account, ccAddrs);
CharSequence displayName = mMessageHelper.getDisplayName(account, fromAddrs, toAddrs);
CharSequence displayDate = DateUtils.getRelativeTimeSpanString(context, cursor.getLong(DATE_COLUMN));
String counterpartyAddress = null;
if (fromMe) {
if (toAddrs.length > 0) {
counterpartyAddress = toAddrs[0].getAddress();
} else if (ccAddrs.length > 0) {
counterpartyAddress = ccAddrs[0].getAddress();
}
} else if (fromAddrs.length > 0) {
counterpartyAddress = fromAddrs[0].getAddress();
}
int threadCount = (mThreadedList) ? cursor.getInt(THREAD_COUNT_COLUMN) : 0;
String subject = cursor.getString(SUBJECT_COLUMN);
if (StringUtils.isNullOrEmpty(subject)) {
subject = getString(R.string.general_no_subject);
} else if (threadCount > 1) {
// If this is a thread, strip the RE/FW from the subject. "Be like Outlook."
subject = Utility.stripSubject(subject);
}
boolean read = (cursor.getInt(READ_COLUMN) == 1);
boolean flagged = (cursor.getInt(FLAGGED_COLUMN) == 1);
boolean answered = (cursor.getInt(ANSWERED_COLUMN) == 1);
boolean forwarded = (cursor.getInt(FORWARDED_COLUMN) == 1);
boolean hasAttachments = (cursor.getInt(ATTACHMENT_COUNT_COLUMN) > 0);
MessageViewHolder holder = (MessageViewHolder) view.getTag();
int maybeBoldTypeface = (read) ? Typeface.NORMAL : Typeface.BOLD;
long uniqueId = cursor.getLong(mUniqueIdColumn);
boolean selected = mSelected.contains(uniqueId);
if (!mCheckboxes && selected) {
holder.chip.setBackgroundDrawable(account.getCheckmarkChip().drawable());
} else {
holder.chip.setBackgroundDrawable(account.generateColorChip(read, toMe, ccMe,
fromMe, flagged).drawable());
}
if (mCheckboxes) {
// Set holder.position to -1 to avoid MessageViewHolder.onCheckedChanged() toggling
// the selection state when setChecked() is called below.
holder.position = -1;
// Only set the UI state, don't actually toggle the message selection.
holder.selected.setChecked(selected);
// Now save the position so MessageViewHolder.onCheckedChanged() will know what
// message to (de)select.
holder.position = cursor.getPosition();
}
if (holder.contactBadge != null) {
holder.contactBadge.assignContactFromEmail(counterpartyAddress, true);
if (counterpartyAddress != null) {
/*
* At least in Android 2.2 a different background + padding is used when no
* email address is available. ListView reuses the views but QuickContactBadge
* doesn't reset the padding, so we do it ourselves.
*/
holder.contactBadge.setPadding(0, 0, 0, 0);
mContactsPictureLoader.loadContactPicture(counterpartyAddress, holder.contactBadge);
} else {
holder.contactBadge.setImageResource(R.drawable.ic_contact_picture);
}
}
// Background color
if (selected || K9.useBackgroundAsUnreadIndicator()) {
int res;
if (selected) {
res = R.attr.messageListSelectedBackgroundColor;
} else if (read) {
res = R.attr.messageListReadItemBackgroundColor;
} else {
res = R.attr.messageListUnreadItemBackgroundColor;
}
TypedValue outValue = new TypedValue();
getActivity().getTheme().resolveAttribute(res, outValue, true);
view.setBackgroundColor(outValue.data);
} else {
view.setBackgroundColor(Color.TRANSPARENT);
}
if (mActiveMessage != null) {
String uid = cursor.getString(UID_COLUMN);
String folderName = cursor.getString(FOLDER_NAME_COLUMN);
if (account.getUuid().equals(mActiveMessage.accountUuid) &&
folderName.equals(mActiveMessage.folderName) &&
uid.equals(mActiveMessage.uid)) {
int res = R.attr.messageListActiveItemBackgroundColor;
TypedValue outValue = new TypedValue();
getActivity().getTheme().resolveAttribute(res, outValue, true);
view.setBackgroundColor(outValue.data);
}
}
// Thread count
if (threadCount > 1) {
holder.threadCount.setText(Integer.toString(threadCount));
holder.threadCount.setVisibility(View.VISIBLE);
} else {
holder.threadCount.setVisibility(View.GONE);
}
CharSequence beforePreviewText = (mSenderAboveSubject) ? subject : displayName;
String sigil = recipientSigil(toMe, ccMe);
SpannableStringBuilder messageStringBuilder = new SpannableStringBuilder(sigil)
.append(beforePreviewText);
if (mPreviewLines > 0) {
String preview = cursor.getString(PREVIEW_COLUMN);
if (preview != null) {
messageStringBuilder.append(" ").append(preview);
}
}
holder.preview.setText(messageStringBuilder, TextView.BufferType.SPANNABLE);
Spannable str = (Spannable)holder.preview.getText();
// Create a span section for the sender, and assign the correct font size and weight
int fontSize = (mSenderAboveSubject) ?
mFontSizes.getMessageListSubject():
mFontSizes.getMessageListSender();
AbsoluteSizeSpan span = new AbsoluteSizeSpan(fontSize, true);
str.setSpan(span, 0, beforePreviewText.length() + sigil.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
//TODO: make this part of the theme
int color = (K9.getK9Theme() == K9.Theme.LIGHT) ?
Color.rgb(105, 105, 105) :
Color.rgb(160, 160, 160);
// Set span (color) for preview message
str.setSpan(new ForegroundColorSpan(color), beforePreviewText.length() + sigil.length(),
str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
Drawable statusHolder = null;
if (forwarded && answered) {
statusHolder = mForwardedAnsweredIcon;
} else if (answered) {
statusHolder = mAnsweredIcon;
} else if (forwarded) {
statusHolder = mForwardedIcon;
}
if (holder.from != null ) {
holder.from.setTypeface(null, maybeBoldTypeface);
if (mSenderAboveSubject) {
holder.from.setCompoundDrawablesWithIntrinsicBounds(
statusHolder, // left
null, // top
hasAttachments ? mAttachmentIcon : null, // right
null); // bottom
holder.from.setText(displayName);
} else {
holder.from.setText(new SpannableStringBuilder(sigil).append(displayName));
}
}
if (holder.subject != null ) {
if (!mSenderAboveSubject) {
holder.subject.setCompoundDrawablesWithIntrinsicBounds(
statusHolder, // left
null, // top
hasAttachments ? mAttachmentIcon : null, // right
null); // bottom
}
holder.subject.setTypeface(null, maybeBoldTypeface);
holder.subject.setText(subject);
}
holder.date.setText(displayDate);
}
|
diff --git a/srcj/com/sun/electric/tool/logicaleffort/LENetlister1.java b/srcj/com/sun/electric/tool/logicaleffort/LENetlister1.java
index 182d25a8f..da9031379 100644
--- a/srcj/com/sun/electric/tool/logicaleffort/LENetlister1.java
+++ b/srcj/com/sun/electric/tool/logicaleffort/LENetlister1.java
@@ -1,681 +1,681 @@
/* -*- tab-width: 4 -*-
*
* Electric(tm) VLSI Design System
*
* File: LENetlister1.java
* Written by Jonathan Gainsley, Sun Microsystems.
*
* Copyright (c) 2003 Sun Microsystems and Static Free Software
*
* Electric(tm) is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* Electric(tm) is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Electric(tm); see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, Mass 02111-1307, USA.
*
* Created on November 11, 2003, 3:56 PM
*/
package com.sun.electric.tool.logicaleffort;
import com.sun.electric.database.hierarchy.Cell;
import com.sun.electric.database.hierarchy.Export;
import com.sun.electric.database.hierarchy.HierarchyEnumerator;
import com.sun.electric.database.hierarchy.Nodable;
import com.sun.electric.database.network.Netlist;
import com.sun.electric.database.prototype.PortCharacteristic;
import com.sun.electric.database.prototype.PortProto;
import com.sun.electric.database.text.TextUtils;
import com.sun.electric.database.topology.NodeInst;
import com.sun.electric.database.variable.VarContext;
import com.sun.electric.database.variable.Variable;
import com.sun.electric.technology.PrimitiveNode;
import com.sun.electric.technology.technologies.Schematics;
import com.sun.electric.tool.Job;
import com.sun.electric.tool.Tool;
import com.sun.electric.tool.user.ErrorLogger;
import com.sun.electric.tool.user.ui.MessagesWindow;
import com.sun.electric.tool.user.ui.TopLevel;
import java.io.OutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* Creates a logical effort netlist to be sized by LESizer.
* This is so the LESizer is independent of Electric's Database,
* and can match George Chen's C++ version being developed for
* PNP.
*
* @author gainsley
*/
public class LENetlister1 extends HierarchyEnumerator.Visitor implements LENetlister {
// ALL GATES SAME DELAY
/** global step-up */ private float su;
/** wire to gate cap ratio */ private float wireRatio;
/** convergence criteron */ private float epsilon;
/** max number of iterations */ private int maxIterations;
/** gate cap, in fF/lambda */ private float gateCap;
/** ratio of diffusion to gate cap */ private float alpha;
/** ratio of keeper to driver size */ private float keeperRatio;
/** all networks */ private HashMap allNets;
/** all instances (LEGATES, not loads) */ private HashMap allInstances;
/** Sizer */ private LESizer sizer;
/** Job we are part of */ private Job job;
/** Where to direct output */ private PrintStream out;
/** Mapping between NodeInst and Instance */private List instancesMap;
/** True if we got aborted */ private boolean aborted;
/** for logging errors */ private ErrorLogger errorLogger;
/** record definition errors so no multiple warnings */ private HashMap lePortError;
private static final boolean DEBUG = false;
/** Creates a new instance of LENetlister */
public LENetlister1(Job job) {
// get preferences for this package
Tool leTool = Tool.findTool("logical effort");
su = (float)LETool.getGlobalFanout();
epsilon = (float)LETool.getConvergenceEpsilon();
maxIterations = LETool.getMaxIterations();
gateCap = (float)LETool.getGateCapacitance();
wireRatio = (float)LETool.getWireRatio();
alpha = (float)LETool.getDiffAlpha();
keeperRatio = (float)LETool.getKeeperRatio();
allNets = new HashMap();
allInstances = new HashMap();
this.job = job;
this.instancesMap = new ArrayList();
this.lePortError = new HashMap();
this.out = new PrintStream((OutputStream)System.out);
errorLogger = null;
aborted = false;
}
// Entry point: This netlists the cell
public void netlist(Cell cell, VarContext context) {
//ArrayList connectedPorts = new ArrayList();
//connectedPorts.add(Schematics.tech.resistorNode.getPortsList());
if (errorLogger != null) errorLogger.delete();
errorLogger = ErrorLogger.newInstance("LE Netlister");
Netlist netlist = cell.getNetlist(true);
// read schematic-specific sizing options
for (Iterator instIt = cell.getNodes(); instIt.hasNext();) {
NodeInst ni = (NodeInst)instIt.next();
if (ni.getVar("ATTR_LESETTINGS") != null) {
useLESettings(ni, context); // get settings from object
break;
}
}
HierarchyEnumerator.enumerateCell(cell, context, netlist, this);
}
/**
* Size the netlist.
* @return true on success, false otherwise.
*/
public boolean size(LESizer.Alg algorithm) {
//lesizer.printDesign();
boolean verbose = false;
// create a new sizer
sizer = new LESizer(algorithm, this, job, errorLogger);
boolean success = sizer.optimizeLoops(epsilon, maxIterations, verbose, alpha, keeperRatio);
//out.println("---------After optimization:------------");
//lesizer.printDesign();
// get rid of the sizer
sizer = null;
return success;
}
/**
* Updates the size of all Logical Effort gates
*/
public void updateSizes() {
// iterator over all LEGATEs
Set allEntries = allInstances.entrySet();
for (Iterator it = allEntries.iterator(); it.hasNext();) {
Map.Entry entry = (Map.Entry)it.next();
Instance inst = (Instance)entry.getValue();
Nodable no = inst.getNodable();
NodeInst ni = no.getNodeInst();
if (ni != null) no = ni;
if (!inst.isLeGate()) continue;
String varName = "LEDRIVE_" + inst.getName();
no.newVar(varName, new Float(inst.getLeX()));
if (inst.getLeX() < 1.0f) {
String msg = "WARNING: Instance "+ni.describe()+" has size "+TextUtils.formatDouble(inst.getLeX(), 3)+" less than 1 ("+inst.getName()+")";
System.out.println(msg);
if (ni != null) {
ErrorLogger.MessageLog log = errorLogger.logWarning(msg, ni.getParent(), 2);
log.addGeom(ni, true, ni.getParent(), inst.getContext());
}
}
}
printStatistics();
done();
}
public void done() {
errorLogger.termLogging(true);
errorLogger = null;
}
/** NodeInst should be an LESettings instance */
private void useLESettings(NodeInst ni, VarContext context) {
Variable var;
if ((var = ni.getVar("ATTR_su")) != null) su = VarContext.objectToFloat(context.evalVar(var), su);
if ((var = ni.getVar("ATTR_wire_ratio")) != null) wireRatio = VarContext.objectToFloat(context.evalVar(var), wireRatio);
if ((var = ni.getVar("ATTR_epsilon")) != null) epsilon = VarContext.objectToFloat(context.evalVar(var), epsilon);
if ((var = ni.getVar("ATTR_max_iter")) != null) maxIterations = VarContext.objectToInt(context.evalVar(var), maxIterations);
if ((var = ni.getVar("ATTR_gate_cap")) != null) gateCap = VarContext.objectToFloat(context.evalVar(var), gateCap);
if ((var = ni.getVar("ATTR_alpha")) != null) alpha = VarContext.objectToFloat(context.evalVar(var), alpha);
if ((var = ni.getVar("ATTR_keeper_ratio")) != null) keeperRatio = VarContext.objectToFloat(context.evalVar(var), keeperRatio);
}
/**
* Add new instance to design
* @param name name of the instance
* param leGate true if this is an LEGate
* @param leX size
* @param pins list of pins on instance
*
* @return the new instance added, null if error
*/
protected Instance addInstance(String name, Instance.Type type, float leSU,
float leX, ArrayList pins, Nodable no)
{
if (allInstances.containsKey(name)) {
out.println("Error: Instance "+name+" already exists.");
return null;
}
// create instance
Instance instance = new Instance(name, type, leSU, leX, no);
// create each net if necessary, from pin.
Iterator iter = pins.iterator();
while (iter.hasNext()) {
Pin pin = (Pin)iter.next();
String netname = pin.getNetName();
// check to see if net had already been added to the design
Net net = (Net)allNets.get(netname);
if (net != null) {
pin.setNet(net);
pin.setInstance(instance);
net.addPin(pin);
} else {
// create new net
net = new Net(netname);
allNets.put(netname, net);
pin.setNet(net);
pin.setInstance(instance);
net.addPin(pin);
}
}
instance.setPins(pins);
allInstances.put(name, instance);
return instance;
}
//public HashMap getInstancesMap() { return instancesMap; }
protected HashMap getAllInstances() { return allInstances; }
protected HashMap getAllNets() { return allNets; }
/** return number of gates sized */
protected int getNumGates() { return allInstances.size(); }
protected LESizer getSizer() { return sizer; }
protected float getKeeperRatio() { return keeperRatio; }
// ======================= Hierarchy Enumerator ==============================
/**
* Override the default Cell info to pass along logical effort specific information
* @return a LECellInfo
*/
public HierarchyEnumerator.CellInfo newCellInfo() { return new LECellInfo(); }
/**
* Enter cell initializes the LECellInfo.
* @param info the LECellInfo
* @return true to process the cell, false to ignore.
*/
public boolean enterCell(HierarchyEnumerator.CellInfo info) {
if (aborted) return false;
if (((LETool.AnalyzeCell)job).checkAbort(null)) {
aborted = true;
return false;
}
((LECellInfo)info).leInit();
return true;
}
/**
* Visit NodeInst creates a new Logical Effort instance from the
* parameters found on the Nodable, if that Nodable is an LEGATE.
* It also creates instances for wire models (LEWIREs).
* @param ni the Nodable being visited
* @param info the cell info
* @return true to push down into the Nodable, false to continue.
*/
public boolean visitNodeInst(Nodable ni, HierarchyEnumerator.CellInfo info) {
float leX = (float)0.0;
boolean wire = false;
boolean primitiveTransistor = false;
// Check if this NodeInst is tagged as a logical effort node
Instance.Type type = null;
Variable var = null;
if ((var = getVar(ni, "ATTR_LEGATE")) != null) {
// assume it is LEGATE if can't resolve value
int gate = VarContext.objectToInt(info.getContext().evalVar(var), 1);
if (gate == 1)
type = Instance.Type.LEGATE;
else
- type = Instance.Type.STATICGATE;
+ return true;
}
else if ((var = getVar(ni, "ATTR_LEKEEPER")) != null) {
// assume it is LEKEEPER if can't resolve value
int gate = VarContext.objectToInt(info.getContext().evalVar(var), 1);
if (gate == 1)
type = Instance.Type.LEKEEPER;
else
- type = Instance.Type.STATICGATE;
+ return true;
}
else if (getVar(ni, "ATTR_LEWIRE") != null) {
type = Instance.Type.WIRE;
// Note that if inst is an LEWIRE, it will have no 'le' attributes.
// we therefore assign pins to have default 'le' values of one.
// This creates an instance which has Type LEWIRE, but has
// boolean leGate set to false; it will not be sized
var = ni.getVar("ATTR_L");
if (var == null) {
System.out.println("Error, no L attribute found on LEWIRE "+info.getContext().push(ni).getInstPath("."));
}
float len = VarContext.objectToFloat(info.getContext().evalVar(var), 0.0f);
var = ni.getVar("ATTR_width");
if (var == null) {
System.out.println("Warning, no width attribute found on LEWIRE "+info.getContext().push(ni).getInstPath("."));
}
float width = VarContext.objectToFloat(info.getContext().evalVar(var), 3.0f);
leX = (float)(0.95f*len + 0.05f*len*(width/3.0f))*wireRatio; // equivalent lambda of gate
leX = leX/9.0f; // drive strength X=1 is 9 lambda of gate
wire = true;
}
else if ((ni.getProto() != null) && (ni.getProto().getFunction().isTransistor())) {
// handle transistor loads
type = Instance.Type.STATICGATE;
var = ni.getVar("ATTR_width");
if (var == null) {
System.out.println("Error: transistor "+ni+" has no width in Cell "+info.getCell());
ErrorLogger.MessageLog log = errorLogger.logError("Error: transistor "+ni+" has no width in Cell "+info.getCell(), info.getCell(), 0);
log.addGeom(ni.getNodeInst(), true, info.getCell(), info.getContext());
return false;
}
float width = VarContext.objectToFloat(info.getContext().evalVar(var), (float)3.0);
var = ni.getVar("ATTR_length");
if (var == null) {
System.out.println("Error: transistor "+ni+" has no length in Cell "+info.getCell());
ErrorLogger.MessageLog log = errorLogger.logError("Error: transistor "+ni+" has no length in Cell "+info.getCell(), info.getCell(), 0);
log.addGeom(ni.getNodeInst(), true, info.getCell(), info.getContext());
return false;
}
float length = VarContext.objectToFloat(info.getContext().evalVar(var), (float)2.0);
// not exactly correct because assumes all cap is area cap, which it isn't
leX = (float)(width*length/2.0f);
leX = leX/9.0f;
primitiveTransistor = true;
}
else if ((ni.getProto() != null) && (ni.getProto().getFunction() == PrimitiveNode.Function.CAPAC)) {
type = Instance.Type.CAPACITOR;
var = ni.getVar(Schematics.SCHEM_CAPACITANCE);
if (var == null) {
System.out.println("Error: capacitor "+ni+" has no capacitance in Cell "+ni.getParent());
//ErrorLogger.ErrorLog log = errorLogger.logError("Error: capacitor "+no+" has no capacitance in Cell "+info.getCell(), info.getCell(), 0);
//log.addGeom(ni.getNodeInst(), true, no.getParent(), context);
return false;
}
float cap = VarContext.objectToFloat(info.getContext().evalVar(var), (float)0.0);
leX = (float)(cap/gateCap/1e-15/9.0f);
}
else if (ni.getVar("ATTR_LESETTINGS") != null)
return false;
else if (ni.getVar("ATTR_LEIGNORE") != null)
return false;
if (type == null) return true; // descend into and process
if (DEBUG) System.out.println("------------------------------------");
// If got to this point, this is either an LEGATE or an LEWIRE
// Both require us to build an instance.
ArrayList pins = new ArrayList();
Netlist netlist = info.getNetlist();
for (Iterator ppIt = ni.getProto().getPorts(); ppIt.hasNext();) {
PortProto pp = (PortProto)ppIt.next();
// Note default 'le' value should be one
float le = getLE(ni, type, pp, info);
String netName = info.getUniqueNetName(info.getNetID(netlist.getNetwork(ni,pp,0)), ".");
Pin.Dir dir = Pin.Dir.INPUT;
// if it's not an output, it doesn't really matter what it is.
if (pp.getCharacteristic() == PortCharacteristic.OUT) dir = Pin.Dir.OUTPUT;
if (primitiveTransistor) {
// primitive Electric Transistors have their source and drain set to BIDIR, we
// want them set to OUTPUT so that they count as diffusion capacitance
if (pp.getCharacteristic() == PortCharacteristic.BIDIR) dir = Pin.Dir.OUTPUT;
}
pins.add(new Pin(pp.getName(), dir, le, netName));
if (DEBUG) System.out.println(" Added "+dir+" pin "+pp.getName()+", le: "+le+", netName: "+netName+", Network: "+netlist.getNetwork(ni,pp,0));
if (type == Instance.Type.WIRE) break; // this is LEWIRE, only add one pin of it
}
// see if passed-down step-up exists
float localsu = su;
if (((LECellInfo)info).getSU() != -1f)
localsu = ((LECellInfo)info).getSU();
// check for step-up on gate
var = ni.getVar("ATTR_su");
if (var != null) {
float nisu = VarContext.objectToFloat(info.getContext().evalVar(var), -1f);
if (nisu != -1f)
localsu = nisu;
}
// create new leGate instance
VarContext vc = info.getContext().push(ni); // to create unique flat name
Instance inst = addInstance(vc.getInstPath("."), type, localsu, leX, pins, ni);
inst.setContext(info.getContext());
// set instance parameters for sizeable gates
if (type == Instance.Type.LEGATE) {
var = ni.getVar("ATTR_LEPARALLGRP");
if (var != null) {
// set parallel group number
int g = VarContext.objectToInt(info.getContext().evalVar(var), 0);
inst.setParallelGroup(g);
}
}
// set mfactor
float parentM = ((LECellInfo)info).getMFactor();
inst.setMfactor(parentM);
var = LETool.getMFactor(ni);
if (var != null) {
// set mfactor
float m = VarContext.objectToFloat(info.getContext().evalVar(var), 1.0f);
m = m * parentM;
inst.setMfactor(m);
}
if (DEBUG) {
if (wire) System.out.println(" Added LEWire "+vc.getInstPath(".")+", X="+leX);
else System.out.println(" Added instance "+vc.getInstPath(".")+" of type "+type+", X="+leX);
}
instancesMap.add(inst);
return false;
}
private float getLE(Nodable ni, Instance.Type type, PortProto pp, HierarchyEnumerator.CellInfo info) {
boolean leFound = false;
// Note default 'le' value should be one
float le = 1.0f;
if (!(pp instanceof Export))
return le;
Variable var = ((Export)pp).getVar("ATTR_le");
if (var != null) {
leFound = true;
le = VarContext.objectToFloat(info.getContext().evalVar(var), 1.0f);
} else if ((pp.getCharacteristic() == PortCharacteristic.OUT) &&
(type == Instance.Type.LEGATE || type == Instance.Type.LEKEEPER)) {
// if this is an Sizeable gate's output, look for diffn and diffp
float diff = 0;
var = ((Export)pp).getVar("ATTR_diffn");
if (var != null) {
diff += VarContext.objectToFloat(info.getContext().evalVar(var), 0);
leFound = true;
}
var = ((Export)pp).getVar("ATTR_diffp");
if (var != null) {
diff += VarContext.objectToFloat(info.getContext().evalVar(var), 0);
leFound = true;
}
le = diff/3.0f;
}
if (!leFound && (type == Instance.Type.LEGATE || type == Instance.Type.LEKEEPER)) {
Cell cell = (Cell)ni.getProto();
Export exp = cell.findExport(pp.getName());
if (exp != null && lePortError.get(exp) == null) {
String msg = "Warning: Sizeable gate has no logical effort specified for port "+pp.getName()+" in cell "+cell.describe();
System.out.println(msg);
ErrorLogger.MessageLog log = errorLogger.logWarning(msg, cell, 0);
log.addExport(exp, true, cell, info.getContext().push(ni));
lePortError.put(exp, exp);
}
}
return le;
}
private Variable getVar(Nodable no, String name) {
Variable var = no.getParameter(name);
//if (var == null) var = no.getVarDefaultOwner().getVar(name);
return var;
}
public void doneVisitNodeInst(Nodable ni, HierarchyEnumerator.CellInfo info) {}
/**
* Nothing to do for exitCell
*/
public void exitCell(HierarchyEnumerator.CellInfo info) {
}
/**
* Logical Effort Cell Info class. Keeps track of:
* <p>- M factors
*/
public class LECellInfo extends HierarchyEnumerator.CellInfo {
/** M-factor to be applied to size */ private float mFactor;
/** SU to be applied to gates in cell */ private float cellsu;
/** initialize LECellInfo: assumes CellInfo.init() has been called */
protected void leInit() {
HierarchyEnumerator.CellInfo parent = getParentInfo();
// check for M-Factor from parent
if (parent == null) mFactor = 1f;
else mFactor = ((LECellInfo)parent).getMFactor();
// check for su from parent
if (parent == null) cellsu = -1f;
else cellsu = ((LECellInfo)parent).getSU();
// get info from node we pushed into
Nodable ni = getContext().getNodable();
if (ni == null) return;
// get mfactor from instance we pushed into
Variable mvar = LETool.getMFactor(ni);
if (mvar != null) {
Object mval = getContext().evalVar(mvar, null);
if (mval != null)
mFactor = mFactor * VarContext.objectToFloat(mval, 1f);
}
// get su from instance we pushed into
Variable suvar = ni.getVar("ATTR_su");
if (suvar != null) {
float su = VarContext.objectToFloat(getContext().evalVar(suvar, null), -1f);
if (su != -1f) cellsu = su;
}
}
/** get mFactor */
protected float getMFactor() { return mFactor; }
protected float getSU() { return cellsu; }
}
// =============================== Statistics ==================================
public void printStatistics() {
Collection instances = getAllInstances().values();
float totalsize = 0f;
float instsize = 0f;
int numLEGates = 0;
int numLEWires = 0;
for (Iterator it = instances.iterator(); it.hasNext();) {
Instance inst = (Instance)it.next();
totalsize += inst.getLeX();
if (inst.getType() == Instance.Type.LEGATE || inst.getType() == Instance.Type.LEKEEPER) {
numLEGates++;
instsize += inst.getLeX();
}
if (inst.getType() == Instance.Type.WIRE)
numLEWires++;
}
System.out.println("Number of LEGATEs: "+numLEGates);
System.out.println("Number of Wires: "+numLEWires);
System.out.println("Total size of all LEGATEs: "+instsize);
System.out.println("Total size of all instances (sized and loads): "+totalsize);
}
/**
* return total size of all instances of the specified type
* if type is null, uses all types
*/
public float getTotalSize(Instance.Type type) {
Collection instances = getAllInstances().values();
float totalsize = 0f;
for (Iterator it = instances.iterator(); it.hasNext();) {
Instance inst = (Instance)it.next();
if (type == null)
totalsize += inst.getLeX();
else if (inst.getType() == type)
totalsize += inst.getLeX();
}
return totalsize;
}
public boolean printResults(Nodable no, VarContext context) {
// if this is a NodeInst, convert to Nodable
if (no instanceof NodeInst) {
no = Netlist.getNodableFor((NodeInst)no, 0);
}
Instance inst = null;
for (Iterator it = instancesMap.iterator(); it.hasNext(); ) {
Instance instance = (Instance)it.next();
if (instance.getNodable() == no) {
if (instance.getContext().getInstPath(".").equals(context.getInstPath("."))) {
inst = instance;
break;
}
}
}
if (inst == null) return false; // failed
MessagesWindow msgs = TopLevel.getMessagesWindow();
//Font oldFont = msgs.getFont();
//msgs.setFont(new Font("Courier", Font.BOLD, oldFont.getSize()));
// print netlister info
System.out.println("Netlister: Gate Cap="+gateCap+", Alpha="+alpha);
// print instance info
inst.print();
// collect info about what is driven
Pin out = (Pin)inst.getOutputPins().get(0);
Net net = out.getNet();
ArrayList gatesDrivenPins = new ArrayList();
ArrayList loadsDrivenPins = new ArrayList();
ArrayList wiresDrivenPins = new ArrayList();
ArrayList gatesFightingPins = new ArrayList();
for (Iterator it = net.getAllPins().iterator(); it.hasNext(); ) {
Pin pin = (Pin)it.next();
Instance in = pin.getInstance();
if (pin.getDir() == Pin.Dir.INPUT) {
if (in.isGate()) gatesDrivenPins.add(pin);
//if (in.getType() == Instance.Type.STATICGATE) staticGatesDriven.add(in);
if (in.getType() == Instance.Type.LOAD) loadsDrivenPins.add(pin);
if (in.getType() == Instance.Type.CAPACITOR) loadsDrivenPins.add(pin);
if (in.getType() == Instance.Type.WIRE) wiresDrivenPins.add(pin);
}
if (pin.getDir() == Pin.Dir.OUTPUT) {
if (in.isGate()) gatesFightingPins.add(pin);
}
}
System.out.println("Note: Load = Size * LE * M");
System.out.println("Note: Load = Size * LE * M * Alpha, for Gates Fighting");
float totalLoad = 0f;
System.out.println(" -------------------- Gates Driven ("+gatesDrivenPins.size()+") --------------------");
for (Iterator it = gatesDrivenPins.iterator(); it.hasNext(); ) {
Pin pin = (Pin)it.next(); totalLoad += pin.getInstance().printLoadInfo(pin, alpha);
}
System.out.println(" -------------------- Loads Driven ("+loadsDrivenPins.size()+") --------------------");
for (Iterator it = loadsDrivenPins.iterator(); it.hasNext(); ) {
Pin pin = (Pin)it.next(); totalLoad += pin.getInstance().printLoadInfo(pin, alpha);
}
System.out.println(" -------------------- Wires Driven ("+wiresDrivenPins.size()+") --------------------");
for (Iterator it = wiresDrivenPins.iterator(); it.hasNext(); ) {
Pin pin = (Pin)it.next(); totalLoad += pin.getInstance().printLoadInfo(pin, alpha);
}
System.out.println(" -------------------- Gates Fighting ("+gatesFightingPins.size()+") --------------------");
for (Iterator it = gatesFightingPins.iterator(); it.hasNext(); ) {
Pin pin = (Pin)it.next(); totalLoad += pin.getInstance().printLoadInfo(pin, alpha);
}
System.out.println("*** Total Load: "+TextUtils.formatDouble(totalLoad, 2));
//msgs.setFont(oldFont);
return true;
}
// ---- TEST STUFF ----- REMOVE LATER ----
public static void test1() {
LESizer.test1();
}
}
| false | true | public boolean visitNodeInst(Nodable ni, HierarchyEnumerator.CellInfo info) {
float leX = (float)0.0;
boolean wire = false;
boolean primitiveTransistor = false;
// Check if this NodeInst is tagged as a logical effort node
Instance.Type type = null;
Variable var = null;
if ((var = getVar(ni, "ATTR_LEGATE")) != null) {
// assume it is LEGATE if can't resolve value
int gate = VarContext.objectToInt(info.getContext().evalVar(var), 1);
if (gate == 1)
type = Instance.Type.LEGATE;
else
type = Instance.Type.STATICGATE;
}
else if ((var = getVar(ni, "ATTR_LEKEEPER")) != null) {
// assume it is LEKEEPER if can't resolve value
int gate = VarContext.objectToInt(info.getContext().evalVar(var), 1);
if (gate == 1)
type = Instance.Type.LEKEEPER;
else
type = Instance.Type.STATICGATE;
}
else if (getVar(ni, "ATTR_LEWIRE") != null) {
type = Instance.Type.WIRE;
// Note that if inst is an LEWIRE, it will have no 'le' attributes.
// we therefore assign pins to have default 'le' values of one.
// This creates an instance which has Type LEWIRE, but has
// boolean leGate set to false; it will not be sized
var = ni.getVar("ATTR_L");
if (var == null) {
System.out.println("Error, no L attribute found on LEWIRE "+info.getContext().push(ni).getInstPath("."));
}
float len = VarContext.objectToFloat(info.getContext().evalVar(var), 0.0f);
var = ni.getVar("ATTR_width");
if (var == null) {
System.out.println("Warning, no width attribute found on LEWIRE "+info.getContext().push(ni).getInstPath("."));
}
float width = VarContext.objectToFloat(info.getContext().evalVar(var), 3.0f);
leX = (float)(0.95f*len + 0.05f*len*(width/3.0f))*wireRatio; // equivalent lambda of gate
leX = leX/9.0f; // drive strength X=1 is 9 lambda of gate
wire = true;
}
else if ((ni.getProto() != null) && (ni.getProto().getFunction().isTransistor())) {
// handle transistor loads
type = Instance.Type.STATICGATE;
var = ni.getVar("ATTR_width");
if (var == null) {
System.out.println("Error: transistor "+ni+" has no width in Cell "+info.getCell());
ErrorLogger.MessageLog log = errorLogger.logError("Error: transistor "+ni+" has no width in Cell "+info.getCell(), info.getCell(), 0);
log.addGeom(ni.getNodeInst(), true, info.getCell(), info.getContext());
return false;
}
float width = VarContext.objectToFloat(info.getContext().evalVar(var), (float)3.0);
var = ni.getVar("ATTR_length");
if (var == null) {
System.out.println("Error: transistor "+ni+" has no length in Cell "+info.getCell());
ErrorLogger.MessageLog log = errorLogger.logError("Error: transistor "+ni+" has no length in Cell "+info.getCell(), info.getCell(), 0);
log.addGeom(ni.getNodeInst(), true, info.getCell(), info.getContext());
return false;
}
float length = VarContext.objectToFloat(info.getContext().evalVar(var), (float)2.0);
// not exactly correct because assumes all cap is area cap, which it isn't
leX = (float)(width*length/2.0f);
leX = leX/9.0f;
primitiveTransistor = true;
}
else if ((ni.getProto() != null) && (ni.getProto().getFunction() == PrimitiveNode.Function.CAPAC)) {
type = Instance.Type.CAPACITOR;
var = ni.getVar(Schematics.SCHEM_CAPACITANCE);
if (var == null) {
System.out.println("Error: capacitor "+ni+" has no capacitance in Cell "+ni.getParent());
//ErrorLogger.ErrorLog log = errorLogger.logError("Error: capacitor "+no+" has no capacitance in Cell "+info.getCell(), info.getCell(), 0);
//log.addGeom(ni.getNodeInst(), true, no.getParent(), context);
return false;
}
float cap = VarContext.objectToFloat(info.getContext().evalVar(var), (float)0.0);
leX = (float)(cap/gateCap/1e-15/9.0f);
}
else if (ni.getVar("ATTR_LESETTINGS") != null)
return false;
else if (ni.getVar("ATTR_LEIGNORE") != null)
return false;
if (type == null) return true; // descend into and process
if (DEBUG) System.out.println("------------------------------------");
// If got to this point, this is either an LEGATE or an LEWIRE
// Both require us to build an instance.
ArrayList pins = new ArrayList();
Netlist netlist = info.getNetlist();
for (Iterator ppIt = ni.getProto().getPorts(); ppIt.hasNext();) {
PortProto pp = (PortProto)ppIt.next();
// Note default 'le' value should be one
float le = getLE(ni, type, pp, info);
String netName = info.getUniqueNetName(info.getNetID(netlist.getNetwork(ni,pp,0)), ".");
Pin.Dir dir = Pin.Dir.INPUT;
// if it's not an output, it doesn't really matter what it is.
if (pp.getCharacteristic() == PortCharacteristic.OUT) dir = Pin.Dir.OUTPUT;
if (primitiveTransistor) {
// primitive Electric Transistors have their source and drain set to BIDIR, we
// want them set to OUTPUT so that they count as diffusion capacitance
if (pp.getCharacteristic() == PortCharacteristic.BIDIR) dir = Pin.Dir.OUTPUT;
}
pins.add(new Pin(pp.getName(), dir, le, netName));
if (DEBUG) System.out.println(" Added "+dir+" pin "+pp.getName()+", le: "+le+", netName: "+netName+", Network: "+netlist.getNetwork(ni,pp,0));
if (type == Instance.Type.WIRE) break; // this is LEWIRE, only add one pin of it
}
// see if passed-down step-up exists
float localsu = su;
if (((LECellInfo)info).getSU() != -1f)
localsu = ((LECellInfo)info).getSU();
// check for step-up on gate
var = ni.getVar("ATTR_su");
if (var != null) {
float nisu = VarContext.objectToFloat(info.getContext().evalVar(var), -1f);
if (nisu != -1f)
localsu = nisu;
}
// create new leGate instance
VarContext vc = info.getContext().push(ni); // to create unique flat name
Instance inst = addInstance(vc.getInstPath("."), type, localsu, leX, pins, ni);
inst.setContext(info.getContext());
// set instance parameters for sizeable gates
if (type == Instance.Type.LEGATE) {
var = ni.getVar("ATTR_LEPARALLGRP");
if (var != null) {
// set parallel group number
int g = VarContext.objectToInt(info.getContext().evalVar(var), 0);
inst.setParallelGroup(g);
}
}
// set mfactor
float parentM = ((LECellInfo)info).getMFactor();
inst.setMfactor(parentM);
var = LETool.getMFactor(ni);
if (var != null) {
// set mfactor
float m = VarContext.objectToFloat(info.getContext().evalVar(var), 1.0f);
m = m * parentM;
inst.setMfactor(m);
}
if (DEBUG) {
if (wire) System.out.println(" Added LEWire "+vc.getInstPath(".")+", X="+leX);
else System.out.println(" Added instance "+vc.getInstPath(".")+" of type "+type+", X="+leX);
}
instancesMap.add(inst);
return false;
}
| public boolean visitNodeInst(Nodable ni, HierarchyEnumerator.CellInfo info) {
float leX = (float)0.0;
boolean wire = false;
boolean primitiveTransistor = false;
// Check if this NodeInst is tagged as a logical effort node
Instance.Type type = null;
Variable var = null;
if ((var = getVar(ni, "ATTR_LEGATE")) != null) {
// assume it is LEGATE if can't resolve value
int gate = VarContext.objectToInt(info.getContext().evalVar(var), 1);
if (gate == 1)
type = Instance.Type.LEGATE;
else
return true;
}
else if ((var = getVar(ni, "ATTR_LEKEEPER")) != null) {
// assume it is LEKEEPER if can't resolve value
int gate = VarContext.objectToInt(info.getContext().evalVar(var), 1);
if (gate == 1)
type = Instance.Type.LEKEEPER;
else
return true;
}
else if (getVar(ni, "ATTR_LEWIRE") != null) {
type = Instance.Type.WIRE;
// Note that if inst is an LEWIRE, it will have no 'le' attributes.
// we therefore assign pins to have default 'le' values of one.
// This creates an instance which has Type LEWIRE, but has
// boolean leGate set to false; it will not be sized
var = ni.getVar("ATTR_L");
if (var == null) {
System.out.println("Error, no L attribute found on LEWIRE "+info.getContext().push(ni).getInstPath("."));
}
float len = VarContext.objectToFloat(info.getContext().evalVar(var), 0.0f);
var = ni.getVar("ATTR_width");
if (var == null) {
System.out.println("Warning, no width attribute found on LEWIRE "+info.getContext().push(ni).getInstPath("."));
}
float width = VarContext.objectToFloat(info.getContext().evalVar(var), 3.0f);
leX = (float)(0.95f*len + 0.05f*len*(width/3.0f))*wireRatio; // equivalent lambda of gate
leX = leX/9.0f; // drive strength X=1 is 9 lambda of gate
wire = true;
}
else if ((ni.getProto() != null) && (ni.getProto().getFunction().isTransistor())) {
// handle transistor loads
type = Instance.Type.STATICGATE;
var = ni.getVar("ATTR_width");
if (var == null) {
System.out.println("Error: transistor "+ni+" has no width in Cell "+info.getCell());
ErrorLogger.MessageLog log = errorLogger.logError("Error: transistor "+ni+" has no width in Cell "+info.getCell(), info.getCell(), 0);
log.addGeom(ni.getNodeInst(), true, info.getCell(), info.getContext());
return false;
}
float width = VarContext.objectToFloat(info.getContext().evalVar(var), (float)3.0);
var = ni.getVar("ATTR_length");
if (var == null) {
System.out.println("Error: transistor "+ni+" has no length in Cell "+info.getCell());
ErrorLogger.MessageLog log = errorLogger.logError("Error: transistor "+ni+" has no length in Cell "+info.getCell(), info.getCell(), 0);
log.addGeom(ni.getNodeInst(), true, info.getCell(), info.getContext());
return false;
}
float length = VarContext.objectToFloat(info.getContext().evalVar(var), (float)2.0);
// not exactly correct because assumes all cap is area cap, which it isn't
leX = (float)(width*length/2.0f);
leX = leX/9.0f;
primitiveTransistor = true;
}
else if ((ni.getProto() != null) && (ni.getProto().getFunction() == PrimitiveNode.Function.CAPAC)) {
type = Instance.Type.CAPACITOR;
var = ni.getVar(Schematics.SCHEM_CAPACITANCE);
if (var == null) {
System.out.println("Error: capacitor "+ni+" has no capacitance in Cell "+ni.getParent());
//ErrorLogger.ErrorLog log = errorLogger.logError("Error: capacitor "+no+" has no capacitance in Cell "+info.getCell(), info.getCell(), 0);
//log.addGeom(ni.getNodeInst(), true, no.getParent(), context);
return false;
}
float cap = VarContext.objectToFloat(info.getContext().evalVar(var), (float)0.0);
leX = (float)(cap/gateCap/1e-15/9.0f);
}
else if (ni.getVar("ATTR_LESETTINGS") != null)
return false;
else if (ni.getVar("ATTR_LEIGNORE") != null)
return false;
if (type == null) return true; // descend into and process
if (DEBUG) System.out.println("------------------------------------");
// If got to this point, this is either an LEGATE or an LEWIRE
// Both require us to build an instance.
ArrayList pins = new ArrayList();
Netlist netlist = info.getNetlist();
for (Iterator ppIt = ni.getProto().getPorts(); ppIt.hasNext();) {
PortProto pp = (PortProto)ppIt.next();
// Note default 'le' value should be one
float le = getLE(ni, type, pp, info);
String netName = info.getUniqueNetName(info.getNetID(netlist.getNetwork(ni,pp,0)), ".");
Pin.Dir dir = Pin.Dir.INPUT;
// if it's not an output, it doesn't really matter what it is.
if (pp.getCharacteristic() == PortCharacteristic.OUT) dir = Pin.Dir.OUTPUT;
if (primitiveTransistor) {
// primitive Electric Transistors have their source and drain set to BIDIR, we
// want them set to OUTPUT so that they count as diffusion capacitance
if (pp.getCharacteristic() == PortCharacteristic.BIDIR) dir = Pin.Dir.OUTPUT;
}
pins.add(new Pin(pp.getName(), dir, le, netName));
if (DEBUG) System.out.println(" Added "+dir+" pin "+pp.getName()+", le: "+le+", netName: "+netName+", Network: "+netlist.getNetwork(ni,pp,0));
if (type == Instance.Type.WIRE) break; // this is LEWIRE, only add one pin of it
}
// see if passed-down step-up exists
float localsu = su;
if (((LECellInfo)info).getSU() != -1f)
localsu = ((LECellInfo)info).getSU();
// check for step-up on gate
var = ni.getVar("ATTR_su");
if (var != null) {
float nisu = VarContext.objectToFloat(info.getContext().evalVar(var), -1f);
if (nisu != -1f)
localsu = nisu;
}
// create new leGate instance
VarContext vc = info.getContext().push(ni); // to create unique flat name
Instance inst = addInstance(vc.getInstPath("."), type, localsu, leX, pins, ni);
inst.setContext(info.getContext());
// set instance parameters for sizeable gates
if (type == Instance.Type.LEGATE) {
var = ni.getVar("ATTR_LEPARALLGRP");
if (var != null) {
// set parallel group number
int g = VarContext.objectToInt(info.getContext().evalVar(var), 0);
inst.setParallelGroup(g);
}
}
// set mfactor
float parentM = ((LECellInfo)info).getMFactor();
inst.setMfactor(parentM);
var = LETool.getMFactor(ni);
if (var != null) {
// set mfactor
float m = VarContext.objectToFloat(info.getContext().evalVar(var), 1.0f);
m = m * parentM;
inst.setMfactor(m);
}
if (DEBUG) {
if (wire) System.out.println(" Added LEWire "+vc.getInstPath(".")+", X="+leX);
else System.out.println(" Added instance "+vc.getInstPath(".")+" of type "+type+", X="+leX);
}
instancesMap.add(inst);
return false;
}
|
diff --git a/src/test/java/functional/com/thoughtworks/twu/TalksHomePage.java b/src/test/java/functional/com/thoughtworks/twu/TalksHomePage.java
index 645f76a..c700c57 100644
--- a/src/test/java/functional/com/thoughtworks/twu/TalksHomePage.java
+++ b/src/test/java/functional/com/thoughtworks/twu/TalksHomePage.java
@@ -1,153 +1,153 @@
package functional.com.thoughtworks.twu;
import com.thoughtworks.twu.utils.CasLoginLogout;
import com.thoughtworks.twu.utils.Talk;
import com.thoughtworks.twu.utils.WaitForAjax;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.firefox.FirefoxDriver;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import static com.thoughtworks.twu.utils.WaitForAjax.*;
import static org.hamcrest.CoreMatchers.is;
import static org.joda.time.DateTime.now;
import static org.junit.Assert.assertThat;
import static org.testng.Assert.assertTrue;
public class TalksHomePage {
public static final int HTTP_PORT = 9191;
public static final String HTTP_BASE_URL = "http://localhost:" + HTTP_PORT + "/twu/home.html";
private WebDriver webDriver;
private String failMessage;
private String successMessage;
private String errorCssValue;
@Before
public void setUp() {
webDriver = new FirefoxDriver();
webDriver.manage().timeouts().implicitlyWait(2, TimeUnit.SECONDS);
webDriver.get(HTTP_BASE_URL);
failMessage = "Please Supply Valid Entries For All Fields";
successMessage="New Talk Successfully Created";
errorCssValue = "rgb(255, 0, 0) 0px 0px 12px 0px";
CasLoginLogout.login(webDriver);
}
@Test
public void shouldBeAbleToCreateNewTalk() throws InterruptedException {
WebElement myTalksButton = webDriver.findElement(By.id("my_talks_button"));
myTalksButton.click();
WaitForAjax(webDriver);
assertTrue(webDriver.findElement(By.id("new_talk")).isDisplayed());
webDriver.findElement(By.id("new_talk")).click();
assertTrue(webDriver.findElement(By.id("title")).isDisplayed());
webDriver.findElement(By.id("title")).sendKeys(now().toString());
- webDriver.findElement(By.id("description")).sendKeys("Seven wise men");
+ //webDriver.findElement(By.id("description")).sendKeys("Seven wise men");
webDriver.findElement(By.id("venue")).sendKeys("Ajanta Ellora");
JavascriptExecutor javascriptExecutor = (JavascriptExecutor) webDriver;
javascriptExecutor.executeScript("$('#datepicker').val('28/09/2012')");
javascriptExecutor.executeScript("$('#timepicker').val('11:42 AM')");
javascriptExecutor.executeScript("$('#new_talk_submit').click()");
WaitForAjax(webDriver);
WebElement text = webDriver.findElement(By.id("message_box_success"));
assertThat(text.getText(), is(successMessage));
}
@Test
public void shouldBeAbleToCreateNewTalkWithoutDescription() throws Exception {
WebElement myTalksButton = webDriver.findElement(By.id("my_talks_button"));
myTalksButton.click();
assertTrue(webDriver.findElement(By.id("new_talk")).isDisplayed());
webDriver.findElement(By.id("new_talk")).click();
assertTrue(webDriver.findElement(By.id("title")).isDisplayed());
webDriver.findElement(By.id("title")).sendKeys(now().toString());
webDriver.findElement(By.id("venue")).sendKeys("Ajanta Ellora");
JavascriptExecutor javascriptExecutor = (JavascriptExecutor) webDriver;
javascriptExecutor.executeScript("$('#datepicker').val('28/09/2012')");
javascriptExecutor.executeScript("$('#timepicker').val('11:42 AM')");
javascriptExecutor.executeScript("$('#new_talk_submit').click()");
WaitForAjax(webDriver);
WebElement text = webDriver.findElement(By.id("message_box_success"));
assertThat(text.getText(), is(successMessage));
}
@Test
public void shouldNotBeAbleToCreateNewTalkWithoutTitle() throws Exception {
WebElement myTalksButton = webDriver.findElement(By.id("my_talks_button"));
myTalksButton.click();
webDriver.findElement(By.id("new_talk")).click();
webDriver.findElement(By.id("description")).sendKeys("Seven wise men");
webDriver.findElement(By.id("venue")).sendKeys("Ajanta Ellora");
JavascriptExecutor javascriptExecutor = (JavascriptExecutor) webDriver;
javascriptExecutor.executeScript("$('#datepicker').val('28/09/2012')");
javascriptExecutor.executeScript("$('#timepicker').val('11:42 AM')");
javascriptExecutor.executeScript("$('#new_talk_submit').click()");
assertThat(webDriver.findElement(By.id("title")).getCssValue("box-shadow"), is(errorCssValue));
}
@Test
public void shouldNotBeAbleToCreateNewTalkWithoutVenue() throws Exception {
WebElement myTalksButton = webDriver.findElement(By.id("my_talks_button"));
myTalksButton.click();
webDriver.findElement(By.id("new_talk")).click();
webDriver.findElement(By.id("title")).sendKeys(now().toString());
webDriver.findElement(By.id("description")).sendKeys("Seven wise men");
JavascriptExecutor javascriptExecutor = (JavascriptExecutor) webDriver;
javascriptExecutor.executeScript("$('#datepicker').val('28/09/2012')");
javascriptExecutor.executeScript("$('#timepicker').val('11:42 AM')");
javascriptExecutor.executeScript("$('#new_talk_submit').click()");
assertThat(webDriver.findElement(By.id("venue")).getCssValue("box-shadow"), is(errorCssValue));
}
@Test
public void shouldNotBeAbleToCreateNewTalkWithoutDate() throws Exception {
WebElement myTalksButton = webDriver.findElement(By.id("my_talks_button"));
myTalksButton.click();
webDriver.findElement(By.id("new_talk")).click();
webDriver.findElement(By.id("title")).sendKeys(now().toString());
webDriver.findElement(By.id("description")).sendKeys("Seven wise men");
webDriver.findElement(By.id("venue")).sendKeys("Ajanta Ellora");
JavascriptExecutor javascriptExecutor = (JavascriptExecutor) webDriver;
javascriptExecutor.executeScript("$('#timepicker').val('11:42 AM')");
javascriptExecutor.executeScript("$('#new_talk_submit').click()");
assertThat(webDriver.findElement(By.id("datepicker")).getCssValue("box-shadow"), is(errorCssValue));
}
@Test
public void shouldNotBeAbleToCreateNewTalkWithoutTime() throws Exception {
WebElement myTalksButton = webDriver.findElement(By.id("my_talks_button"));
myTalksButton.click();
webDriver.findElement(By.id("new_talk")).click();
webDriver.findElement(By.id("title")).sendKeys(now().toString());
webDriver.findElement(By.id("description")).sendKeys("Seven wise men");
webDriver.findElement(By.id("venue")).sendKeys("Ajanta Ellora");
JavascriptExecutor javascriptExecutor = (JavascriptExecutor) webDriver;
javascriptExecutor.executeScript("$('#datepicker').val('28/09/2012')");
javascriptExecutor.executeScript("$('#new_talk_submit').click()");
assertThat(webDriver.findElement(By.id("timepicker")).getCssValue("box-shadow"), is(errorCssValue));
}
@After
public void tearDown() {
CasLoginLogout.logout(webDriver);
webDriver.close();
}
}
| true | true | public void shouldBeAbleToCreateNewTalk() throws InterruptedException {
WebElement myTalksButton = webDriver.findElement(By.id("my_talks_button"));
myTalksButton.click();
WaitForAjax(webDriver);
assertTrue(webDriver.findElement(By.id("new_talk")).isDisplayed());
webDriver.findElement(By.id("new_talk")).click();
assertTrue(webDriver.findElement(By.id("title")).isDisplayed());
webDriver.findElement(By.id("title")).sendKeys(now().toString());
webDriver.findElement(By.id("description")).sendKeys("Seven wise men");
webDriver.findElement(By.id("venue")).sendKeys("Ajanta Ellora");
JavascriptExecutor javascriptExecutor = (JavascriptExecutor) webDriver;
javascriptExecutor.executeScript("$('#datepicker').val('28/09/2012')");
javascriptExecutor.executeScript("$('#timepicker').val('11:42 AM')");
javascriptExecutor.executeScript("$('#new_talk_submit').click()");
WaitForAjax(webDriver);
WebElement text = webDriver.findElement(By.id("message_box_success"));
assertThat(text.getText(), is(successMessage));
}
| public void shouldBeAbleToCreateNewTalk() throws InterruptedException {
WebElement myTalksButton = webDriver.findElement(By.id("my_talks_button"));
myTalksButton.click();
WaitForAjax(webDriver);
assertTrue(webDriver.findElement(By.id("new_talk")).isDisplayed());
webDriver.findElement(By.id("new_talk")).click();
assertTrue(webDriver.findElement(By.id("title")).isDisplayed());
webDriver.findElement(By.id("title")).sendKeys(now().toString());
//webDriver.findElement(By.id("description")).sendKeys("Seven wise men");
webDriver.findElement(By.id("venue")).sendKeys("Ajanta Ellora");
JavascriptExecutor javascriptExecutor = (JavascriptExecutor) webDriver;
javascriptExecutor.executeScript("$('#datepicker').val('28/09/2012')");
javascriptExecutor.executeScript("$('#timepicker').val('11:42 AM')");
javascriptExecutor.executeScript("$('#new_talk_submit').click()");
WaitForAjax(webDriver);
WebElement text = webDriver.findElement(By.id("message_box_success"));
assertThat(text.getText(), is(successMessage));
}
|
diff --git a/application/src/nl/sogeti/android/gpstracker/viewer/TrackList.java b/application/src/nl/sogeti/android/gpstracker/viewer/TrackList.java
index a99ff4e9..9220e764 100644
--- a/application/src/nl/sogeti/android/gpstracker/viewer/TrackList.java
+++ b/application/src/nl/sogeti/android/gpstracker/viewer/TrackList.java
@@ -1,821 +1,821 @@
/*------------------------------------------------------------------------------
** Ident: Innovation en Inspiration > Google Android
** Author: rene
** Copyright: (c) Jan 22, 2009 Sogeti Nederland B.V. All Rights Reserved.
**------------------------------------------------------------------------------
** Sogeti Nederland B.V. | No part of this file may be reproduced
** Distributed Software Engineering | or transmitted in any form or by any
** Lange Dreef 17 | means, electronic or mechanical, for the
** 4131 NJ Vianen | purpose, without the express written
** The Netherlands | permission of the copyright holder.
*------------------------------------------------------------------------------
*
* This file is part of OpenGPSTracker.
*
* OpenGPSTracker is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* OpenGPSTracker is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with OpenGPSTracker. If not, see <http://www.gnu.org/licenses/>.
*
*/
package nl.sogeti.android.gpstracker.viewer;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
import java.util.Vector;
import nl.sogeti.android.gpstracker.R;
import nl.sogeti.android.gpstracker.actions.Statistics;
import nl.sogeti.android.gpstracker.db.DatabaseHelper;
import nl.sogeti.android.gpstracker.db.GPStracking.Tracks;
import nl.sogeti.android.gpstracker.db.GPStracking.Waypoints;
import nl.sogeti.android.gpstracker.util.ProgressFilterInputStream;
import nl.sogeti.android.gpstracker.util.UnicodeReader;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
import android.app.ListActivity;
import android.app.SearchManager;
import android.content.ActivityNotFoundException;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.SimpleCursorAdapter;
import android.widget.TextView;
/**
* Show a list view of all tracks, also doubles for showing search results
*
* @version $Id$
* @author rene (c) Jan 11, 2009, Sogeti B.V.
*/
public class TrackList extends ListActivity
{
private static final String LATITUDE_ATRIBUTE = "lat";
private static final String LONGITUDE_ATTRIBUTE = "lon";
private static final String TRACK_ELEMENT = "trkpt";
private static final String SEGMENT_ELEMENT = "trkseg";
private static final String NAME_ELEMENT = "name";
private static final String TIME_ELEMENT = "time";
private static final String ELEVATION_ELEMENT = "ele";
private static final String COURSE_ELEMENT = "course";
private static final String ACCURACY_ELEMENT = "accuracy";
private static final String SPEED_ELEMENT = "speed";
private static final String TAG = "OGT.TrackList";
private static final int MENU_DETELE = Menu.FIRST + 0;
private static final int MENU_SHARE = Menu.FIRST + 1;
private static final int MENU_RENAME = Menu.FIRST + 2;
private static final int MENU_STATS = Menu.FIRST + 3;
private static final int MENU_SEARCH = Menu.FIRST + 4;
private static final int MENU_VACUUM = Menu.FIRST + 5;
private static final int MENU_PICKER = Menu.FIRST + 6;
public static final int DIALOG_FILENAME = Menu.FIRST + 22;
private static final int DIALOG_RENAME = Menu.FIRST + 23;
private static final int DIALOG_DELETE = Menu.FIRST + 24;
private static final int DIALOG_VACUUM = Menu.FIRST + 25;
private static final int DIALOG_IMPORT = Menu.FIRST + 26;
private static final int DIALOG_INSTALL = Menu.FIRST + 27;
protected static final int DIALOG_ERROR = Menu.FIRST + 28;
private static final int PICKER_OI = Menu.FIRST + 27;
private EditText mTrackNameView;
private Uri mDialogUri;
private String mDialogCurrentName = "";
private Uri mImportFileUri;
private ProgressBar mImportProgress;
private String mErrorDialogMessage;
private Exception mErrorDialogException;
private OnClickListener mDeleteOnClickListener = new DialogInterface.OnClickListener()
{
public void onClick( DialogInterface dialog, int which )
{
getContentResolver().delete( mDialogUri, null, null );
}
};
private OnClickListener mRenameOnClickListener = new DialogInterface.OnClickListener()
{
public void onClick( DialogInterface dialog, int which )
{
// Log.d( TAG, "Context item selected: "+mDialogUri+" with name "+mDialogCurrentName );
String trackName = mTrackNameView.getText().toString();
ContentValues values = new ContentValues();
values.put( Tracks.NAME, trackName );
TrackList.this.getContentResolver().update( mDialogUri, values, null, null );
}
};
private OnClickListener mVacuumOnClickListener = new DialogInterface.OnClickListener()
{
public void onClick( DialogInterface dialog, int which )
{
DatabaseHelper helper = new DatabaseHelper( TrackList.this );
helper.vacuum();
}
};
private OnClickListener mImportOnClickListener = new DialogInterface.OnClickListener()
{
public void onClick( DialogInterface dialog, int which )
{
mImportProgress.setVisibility( View.VISIBLE );
new Thread( xmlParser ).start();
}
};
private final DialogInterface.OnClickListener mOiPickerDialogListener = new DialogInterface.OnClickListener()
{
public void onClick( DialogInterface dialog, int which )
{
Uri oiDownload = Uri.parse( "market://details?id=org.openintents.filemanager" );
Intent oiAboutIntent = new Intent( Intent.ACTION_VIEW, oiDownload );
try
{
startActivity( oiAboutIntent );
}
catch (ActivityNotFoundException e)
{
oiDownload = Uri.parse( "http://openintents.googlecode.com/files/FileManager-1.1.3.apk" );
oiAboutIntent = new Intent( Intent.ACTION_VIEW, oiDownload );
startActivity( oiAboutIntent );
}
}
};
@Override
protected void onCreate( Bundle savedInstanceState )
{
super.onCreate( savedInstanceState );
this.setContentView( R.layout.tracklist );
mImportProgress = (ProgressBar) findViewById( R.id.importProgress );
displayIntent( getIntent() );
ListView listView = getListView();
listView.setItemsCanFocus(false);
// Add the context menu (the long press thing)
registerForContextMenu( listView );
}
@Override
public void onNewIntent( Intent newIntent )
{
displayIntent( newIntent );
}
/*
* (non-Javadoc)
* @see android.app.ListActivity#onRestoreInstanceState(android.os.Bundle)
*/
@Override
protected void onRestoreInstanceState( Bundle state )
{
mDialogUri = state.getParcelable( "URI" );
mDialogCurrentName = state.getString( "NAME" );
mDialogCurrentName = mDialogCurrentName != null ? mDialogCurrentName : "";
super.onRestoreInstanceState( state );
}
/*
* (non-Javadoc)
* @see android.app.Activity#onSaveInstanceState(android.os.Bundle)
*/
@Override
protected void onSaveInstanceState( Bundle outState )
{
outState.putParcelable( "URI", mDialogUri );
outState.putString( "NAME", mDialogCurrentName );
super.onSaveInstanceState( outState );
}
@Override
public boolean onCreateOptionsMenu( Menu menu )
{
boolean result = super.onCreateOptionsMenu( menu );
menu.add( ContextMenu.NONE, MENU_SEARCH, ContextMenu.NONE, android.R.string.search_go ).setIcon( android.R.drawable.ic_search_category_default ).setAlphabeticShortcut( SearchManager.MENU_KEY );
menu.add( ContextMenu.NONE, MENU_VACUUM, ContextMenu.NONE, R.string.menu_vacuum ).setIcon( android.R.drawable.ic_menu_crop );
menu.add( ContextMenu.NONE, MENU_PICKER, ContextMenu.NONE, R.string.menu_picker ).setIcon( android.R.drawable.ic_menu_add );
return result;
}
@Override
public boolean onOptionsItemSelected( MenuItem item )
{
boolean handled = false;
switch( item.getItemId() )
{
case MENU_SEARCH:
onSearchRequested();
handled = true;
break;
case MENU_VACUUM:
showDialog( DIALOG_VACUUM );
break;
case MENU_PICKER:
try
{
Intent intent = new Intent("org.openintents.action.PICK_FILE");
intent.putExtra("org.openintents.extra.TITLE", getString( R.string.dialog_import_picker ));
intent.putExtra("org.openintents.extra.BUTTON_TEXT", getString( R.string.menu_picker ));
startActivityForResult(intent, PICKER_OI );
}
catch (ActivityNotFoundException e)
{
showDialog( DIALOG_INSTALL );
}
break;
default:
handled = super.onOptionsItemSelected( item );
}
return handled;
}
@Override
protected void onListItemClick( ListView l, View v, int position, long id )
{
super.onListItemClick( l, v, position, id );
Intent intent = new Intent();
intent.setData( ContentUris.withAppendedId( Tracks.CONTENT_URI, id ) );
ComponentName caller = this.getCallingActivity();
if( caller != null )
{
setResult( RESULT_OK, intent );
finish();
}
else
{
intent.setClass( this, LoggerMap.class );
startActivity( intent );
}
}
@Override
public void onCreateContextMenu( ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo )
{
if( menuInfo instanceof AdapterView.AdapterContextMenuInfo )
{
AdapterView.AdapterContextMenuInfo itemInfo = (AdapterView.AdapterContextMenuInfo) menuInfo;
TextView textView = (TextView) itemInfo.targetView.findViewById( android.R.id.text1 );
if( textView != null )
{
menu.setHeaderTitle( textView.getText() );
}
}
menu.add( 0, MENU_STATS, 0, R.string.menu_statistics );
menu.add( 0, MENU_SHARE, 0, R.string.menu_shareTrack );
menu.add( 0, MENU_RENAME, 0, R.string.menu_renameTrack );
menu.add( 0, MENU_DETELE, 0, R.string.menu_deleteTrack );
}
@Override
public boolean onContextItemSelected( MenuItem item )
{
boolean handled = false;
AdapterView.AdapterContextMenuInfo info;
try
{
info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
}
catch (ClassCastException e)
{
Log.e( TAG, "Bad menuInfo", e );
return handled;
}
Cursor cursor = (Cursor) getListAdapter().getItem( info.position );
mDialogUri = ContentUris.withAppendedId( Tracks.CONTENT_URI, cursor.getLong( 0 ) );
mDialogCurrentName = cursor.getString( 1 );
mDialogCurrentName = mDialogCurrentName != null ? mDialogCurrentName : "";
switch( item.getItemId() )
{
case MENU_DETELE:
{
showDialog( DIALOG_DELETE );
handled = true;
break;
}
case MENU_SHARE:
{
Intent actionIntent = new Intent( Intent.ACTION_RUN );
actionIntent.setDataAndType( mDialogUri, Tracks.CONTENT_ITEM_TYPE );
actionIntent.addFlags( Intent.FLAG_GRANT_READ_URI_PERMISSION );
startActivity( Intent.createChooser( actionIntent, getString( R.string.share_track ) ) );
handled = true;
break;
}
case MENU_RENAME:
{
showDialog( DIALOG_RENAME );
handled = true;
break;
}
case MENU_STATS:
{
Intent actionIntent = new Intent( this, Statistics.class );
actionIntent.setData( mDialogUri );
startActivity( actionIntent );
handled = true;
break;
}
default:
handled = super.onContextItemSelected( item );
break;
}
return handled;
}
/*
* (non-Javadoc)
* @see android.app.Activity#onCreateDialog(int)
*/
@Override
protected Dialog onCreateDialog( int id )
{
Dialog dialog = null;
Builder builder = null;
switch( id )
{
case DIALOG_RENAME:
LayoutInflater factory = LayoutInflater.from( this );
View view = factory.inflate( R.layout.namedialog, null );
mTrackNameView = (EditText) view.findViewById( R.id.nameField );
builder = new AlertDialog.Builder( this ).setTitle( R.string.dialog_routename_title ).setMessage( R.string.dialog_routename_message ).setIcon( android.R.drawable.ic_dialog_alert )
.setPositiveButton( R.string.btn_okay, mRenameOnClickListener ).setNegativeButton( R.string.btn_cancel, null ).setView( view );
dialog = builder.create();
return dialog;
case DIALOG_DELETE:
builder = new AlertDialog.Builder( TrackList.this ).setTitle( R.string.dialog_delete_title ).setIcon( android.R.drawable.ic_dialog_alert )
.setNegativeButton( android.R.string.cancel, null ).setPositiveButton( android.R.string.ok, mDeleteOnClickListener );
dialog = builder.create();
String messageFormat = this.getResources().getString( R.string.dialog_delete_message );
String message = String.format( messageFormat, "" );
( (AlertDialog) dialog ).setMessage( message );
return dialog;
case DIALOG_VACUUM:
builder = new AlertDialog.Builder( TrackList.this ).setTitle( R.string.dialog_vacuum_title ).setMessage( R.string.dialog_vacuum_message ).setIcon( android.R.drawable.ic_dialog_alert )
.setNegativeButton( android.R.string.cancel, null ).setPositiveButton( android.R.string.ok, mVacuumOnClickListener );
dialog = builder.create();
return dialog;
case DIALOG_IMPORT:
builder = new AlertDialog.Builder( TrackList.this ).setTitle( R.string.dialog_import_title ).setMessage( getString( R.string.dialog_import_message, mImportFileUri.getLastPathSegment() ) )
.setIcon( android.R.drawable.ic_dialog_alert ).setNegativeButton( android.R.string.cancel, null ).setPositiveButton( android.R.string.ok, mImportOnClickListener );
dialog = builder.create();
return dialog;
case DIALOG_INSTALL:
builder = new AlertDialog.Builder( this );
builder
.setTitle( R.string.dialog_nooipicker )
.setMessage( R.string.dialog_nooipicker_message )
.setIcon( android.R.drawable.ic_dialog_alert )
.setPositiveButton( R.string.btn_install, mOiPickerDialogListener )
.setNegativeButton( R.string.btn_cancel, null );
dialog = builder.create();
return dialog;
case DIALOG_ERROR:
builder = new AlertDialog.Builder( this );
builder
.setIcon( android.R.drawable.ic_dialog_alert )
.setTitle( android.R.string.dialog_alert_title)
.setMessage( mErrorDialogMessage +" ("+mErrorDialogException.getMessage()+") " )
.setNeutralButton( android.R.string.cancel, null);
dialog = builder.create();
return dialog;
default:
return super.onCreateDialog( id );
}
}
/*
* (non-Javadoc)
* @see android.app.Activity#onPrepareDialog(int, android.app.Dialog)
*/
@Override
protected void onPrepareDialog( int id, Dialog dialog )
{
super.onPrepareDialog( id, dialog );
AlertDialog alert;
switch( id )
{
case DIALOG_RENAME:
mTrackNameView.setText( mDialogCurrentName );
mTrackNameView.setSelection( 0, mDialogCurrentName.length() );
break;
case DIALOG_DELETE:
alert = (AlertDialog) dialog;
String messageFormat = this.getResources().getString( R.string.dialog_delete_message );
String message = String.format( messageFormat, mDialogCurrentName );
alert.setMessage( message );
break;
case DIALOG_ERROR:
alert = (AlertDialog) dialog;
alert.setMessage( mErrorDialogMessage +" ("+mErrorDialogException.getMessage()+") " );
break;
}
}
@Override
protected void onActivityResult( int requestCode, int resultCode, Intent data )
{
if( resultCode != RESULT_CANCELED )
{
switch( requestCode )
{
case PICKER_OI:
mImportFileUri = data.getData();
mImportProgress.setVisibility( View.VISIBLE );
new Thread( xmlParser ).start();
break;
default:
super.onActivityResult( requestCode, resultCode, data );
break;
}
}
}
private void displayIntent( Intent intent )
{
final String queryAction = intent.getAction();
Cursor tracksCursor = null;
if( Intent.ACTION_SEARCH.equals( queryAction ) )
{
// Got to SEARCH a query for tracks, make a list
tracksCursor = doSearchWithIntent( intent );
}
else if( Intent.ACTION_VIEW.equals( queryAction ) )
{
Uri uri = intent.getData();
// Got to VIEW a GPX filename
if( uri.getScheme().equals( "file" ) || uri.getScheme().equals( "content" ) )
{
mImportFileUri = uri;
showDialog( DIALOG_IMPORT );
tracksCursor = managedQuery( Tracks.CONTENT_URI, new String[] { Tracks._ID, Tracks.NAME, Tracks.CREATION_TIME }, null, null, null );
}
else
{
// Got to VIEW a single track, instead had it of to the LoggerMap
Intent notificationIntent = new Intent( this, LoggerMap.class );
notificationIntent.setData( uri );
startActivity( notificationIntent );
}
}
else
{
// Got to nothing, make a list of everything
tracksCursor = managedQuery( Tracks.CONTENT_URI, new String[] { Tracks._ID, Tracks.NAME, Tracks.CREATION_TIME }, null, null, null );
}
displayCursor( tracksCursor );
}
private void displayCursor( Cursor tracksCursor )
{
// Create an array to specify the fields we want to display in the list (only TITLE)
// and an array of the fields we want to bind those fields to (in this case just text1)
String[] fromColumns = new String[] { Tracks.NAME, Tracks.CREATION_TIME };
int[] toItems = new int[] { R.id.listitem_name, R.id.listitem_from };
// Now create a simple cursor adapter and set it to display
SimpleCursorAdapter trackAdapter = new SimpleCursorAdapter( this, R.layout.trackitem, tracksCursor, fromColumns, toItems );
setListAdapter( trackAdapter );
}
private Cursor doSearchWithIntent( final Intent queryIntent )
{
final String queryString = queryIntent.getStringExtra( SearchManager.QUERY );
Cursor cursor = managedQuery( Tracks.CONTENT_URI, new String[] { Tracks._ID, Tracks.NAME, Tracks.CREATION_TIME }, "name LIKE ?", new String[] { "%" + queryString + "%" }, null );
return cursor;
}
public static final SimpleDateFormat ZULU_DATE_FORMAT = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss'Z'" );
public static final SimpleDateFormat ZULU_DATE_FORMAT_MS = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" );
protected static final int DEFAULT_UNKNOWN_FILESIZE = 1024 * 1024 * 10;
static
{
TimeZone utc = TimeZone.getTimeZone( "UTC" );
ZULU_DATE_FORMAT.setTimeZone( utc ); // ZULU_DATE_FORMAT format ends with Z for UTC so make that true
ZULU_DATE_FORMAT_MS.setTimeZone( utc );
}
private Runnable xmlParser = new Runnable()
{
Uri trackUri = null;
Uri segmentUri = null;
ContentResolver contentResolver;
public void run()
{
int eventType;
ContentValues lastPosition = null;
Vector<ContentValues> bulk = new Vector<ContentValues>();
boolean speed = false;
boolean accuracy = false;
boolean bearing = false;
boolean elevation = false;
boolean name = false;
boolean time = false;
Long importDate = new Long( new Date().getTime() );
try
{
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
- factory.setNamespaceAware( false );
+ factory.setNamespaceAware( true );
XmlPullParser xmlParser = factory.newPullParser();
int length = DEFAULT_UNKNOWN_FILESIZE;
if( mImportFileUri.getScheme().equals( "file" ))
{
File file = new File( mImportFileUri.getPath() );
length = file.length() < (long) Integer.MAX_VALUE ? (int) file.length() : Integer.MAX_VALUE;
}
mImportProgress.setMax( length );
mImportProgress.setProgress( 0 );
mImportProgress.setVisibility( View.VISIBLE );
InputStream fis = getContentResolver().openInputStream( mImportFileUri );
ProgressFilterInputStream pfis = new ProgressFilterInputStream( fis, mImportProgress );
BufferedInputStream bis = new BufferedInputStream( pfis );
UnicodeReader ur = new UnicodeReader( bis, "UTF-8" );
xmlParser.setInput( ur );
String filename = mImportFileUri.getLastPathSegment();
eventType = xmlParser.getEventType();
String attributeName;
while (eventType != XmlPullParser.END_DOCUMENT)
{
contentResolver = TrackList.this.getContentResolver();
if( eventType == XmlPullParser.START_TAG )
{
if( xmlParser.getName().equals( NAME_ELEMENT ) )
{
name = true;
}
else
{
ContentValues trackContent = new ContentValues();
trackContent.put( Tracks.NAME, filename );
if( xmlParser.getName().equals( "trk" ) )
{
startTrack(trackContent);
}
else if( xmlParser.getName().equals( SEGMENT_ELEMENT ) )
{
startSegment();
}
else if( xmlParser.getName().equals( TRACK_ELEMENT ) )
{
lastPosition = new ContentValues();
for( int i = 0; i<2; i++ )
{
attributeName = xmlParser.getAttributeName( i );
if( attributeName.equals( LATITUDE_ATRIBUTE ) )
{
lastPosition.put( Waypoints.LATITUDE, new Double( xmlParser.getAttributeValue( i ) ) );
}
else if( attributeName.equals( LONGITUDE_ATTRIBUTE ) )
{
lastPosition.put( Waypoints.LONGITUDE, new Double( xmlParser.getAttributeValue( i ) ) );
}
}
}
else if( xmlParser.getName().equals( SPEED_ELEMENT ) )
{
speed = true;
}
else if( xmlParser.getName().equals( ACCURACY_ELEMENT ) )
{
accuracy = true;
}
else if( xmlParser.getName().equals( COURSE_ELEMENT ) )
{
bearing = true;
}
else if( xmlParser.getName().equals( ELEVATION_ELEMENT ) )
{
elevation = true;
}
else if( xmlParser.getName().equals( TIME_ELEMENT ) )
{
time = true;
}
}
}
else if( eventType == XmlPullParser.END_TAG )
{
if( xmlParser.getName().equals( NAME_ELEMENT ) )
{
name = false;
}
else if( xmlParser.getName().equals( SPEED_ELEMENT ) )
{
speed = false;
}
else if( xmlParser.getName().equals( ACCURACY_ELEMENT ) )
{
accuracy = false;
}
else if( xmlParser.getName().equals( COURSE_ELEMENT ) )
{
bearing = false;
}
else if( xmlParser.getName().equals( ELEVATION_ELEMENT ) )
{
elevation = false;
}
else if( xmlParser.getName().equals( TIME_ELEMENT ) )
{
time = false;
}
else if( xmlParser.getName().equals( SEGMENT_ELEMENT ) )
{
if( segmentUri == null )
{
startSegment();
}
contentResolver.bulkInsert( Uri.withAppendedPath( segmentUri, "waypoints" ), bulk.toArray( new ContentValues[bulk.size()] ) );
bulk.clear();
}
else if( xmlParser.getName().equals( TRACK_ELEMENT ) )
{
if( !lastPosition.containsKey(Waypoints.TIME) )
{
lastPosition.put( Waypoints.TIME, importDate );
}
if( !lastPosition.containsKey(Waypoints.SPEED) )
{
lastPosition.put( Waypoints.SPEED, 0 );
}
bulk.add( lastPosition );
lastPosition = null;
}
}
else if( eventType == XmlPullParser.TEXT )
{
String text = xmlParser.getText();
if( name )
{
ContentValues nameValues = new ContentValues();
nameValues.put( Tracks.NAME, text );
if( trackUri == null )
{
startTrack( new ContentValues() );
}
contentResolver.update( trackUri, nameValues, null, null );
}
else if( lastPosition != null && speed )
{
lastPosition.put( Waypoints.SPEED, Double.parseDouble( text ) );
}
else if( lastPosition != null && accuracy )
{
lastPosition.put( Waypoints.ACCURACY, Double.parseDouble( text ) );
}
else if( lastPosition != null && bearing )
{
lastPosition.put( Waypoints.BEARING, Double.parseDouble( text ) );
}
else if( lastPosition != null && elevation )
{
lastPosition.put( Waypoints.ALTITUDE, Double.parseDouble( text ) );
}
else if( lastPosition != null && time )
{
lastPosition.put( Waypoints.TIME, parseXmlDateTime( text ) );
}
}
eventType = xmlParser.next();
}
}
catch (XmlPullParserException e)
{
mErrorDialogMessage = getString( R.string.error_importgpx_xml );
mErrorDialogException = e;
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
showDialog( DIALOG_ERROR );
}
} );
}
catch (IOException e)
{
mErrorDialogMessage = getString( R.string.error_importgpx_io );
mErrorDialogException = e;
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
showDialog( DIALOG_ERROR );
}
} );
}
catch (ParseException e)
{
mErrorDialogMessage = getString( R.string.error_importgpx_parse );
mErrorDialogException = e;
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
showDialog( DIALOG_ERROR );
}
} );
}
finally
{
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
mImportProgress.setVisibility( View.GONE );
}
} );
}
}
private void startSegment()
{
if( trackUri == null )
{
startTrack( new ContentValues() );
}
segmentUri = contentResolver.insert( Uri.withAppendedPath( trackUri, "segments" ), new ContentValues() );
}
private void startTrack(ContentValues trackContent)
{
trackUri = contentResolver.insert( Tracks.CONTENT_URI, trackContent );
}
};
public static Long parseXmlDateTime( String text ) throws ParseException
{
Long dateTime = null;
int length = text.length();
switch( length )
{
case 20:
dateTime = new Long( ZULU_DATE_FORMAT.parse( text ).getTime() );
break;
case 24:
dateTime = new Long( ZULU_DATE_FORMAT_MS.parse( text ).getTime() );
default:
break;
}
return dateTime;
}
}
| true | true | public void run()
{
int eventType;
ContentValues lastPosition = null;
Vector<ContentValues> bulk = new Vector<ContentValues>();
boolean speed = false;
boolean accuracy = false;
boolean bearing = false;
boolean elevation = false;
boolean name = false;
boolean time = false;
Long importDate = new Long( new Date().getTime() );
try
{
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
factory.setNamespaceAware( false );
XmlPullParser xmlParser = factory.newPullParser();
int length = DEFAULT_UNKNOWN_FILESIZE;
if( mImportFileUri.getScheme().equals( "file" ))
{
File file = new File( mImportFileUri.getPath() );
length = file.length() < (long) Integer.MAX_VALUE ? (int) file.length() : Integer.MAX_VALUE;
}
mImportProgress.setMax( length );
mImportProgress.setProgress( 0 );
mImportProgress.setVisibility( View.VISIBLE );
InputStream fis = getContentResolver().openInputStream( mImportFileUri );
ProgressFilterInputStream pfis = new ProgressFilterInputStream( fis, mImportProgress );
BufferedInputStream bis = new BufferedInputStream( pfis );
UnicodeReader ur = new UnicodeReader( bis, "UTF-8" );
xmlParser.setInput( ur );
String filename = mImportFileUri.getLastPathSegment();
eventType = xmlParser.getEventType();
String attributeName;
while (eventType != XmlPullParser.END_DOCUMENT)
{
contentResolver = TrackList.this.getContentResolver();
if( eventType == XmlPullParser.START_TAG )
{
if( xmlParser.getName().equals( NAME_ELEMENT ) )
{
name = true;
}
else
{
ContentValues trackContent = new ContentValues();
trackContent.put( Tracks.NAME, filename );
if( xmlParser.getName().equals( "trk" ) )
{
startTrack(trackContent);
}
else if( xmlParser.getName().equals( SEGMENT_ELEMENT ) )
{
startSegment();
}
else if( xmlParser.getName().equals( TRACK_ELEMENT ) )
{
lastPosition = new ContentValues();
for( int i = 0; i<2; i++ )
{
attributeName = xmlParser.getAttributeName( i );
if( attributeName.equals( LATITUDE_ATRIBUTE ) )
{
lastPosition.put( Waypoints.LATITUDE, new Double( xmlParser.getAttributeValue( i ) ) );
}
else if( attributeName.equals( LONGITUDE_ATTRIBUTE ) )
{
lastPosition.put( Waypoints.LONGITUDE, new Double( xmlParser.getAttributeValue( i ) ) );
}
}
}
else if( xmlParser.getName().equals( SPEED_ELEMENT ) )
{
speed = true;
}
else if( xmlParser.getName().equals( ACCURACY_ELEMENT ) )
{
accuracy = true;
}
else if( xmlParser.getName().equals( COURSE_ELEMENT ) )
{
bearing = true;
}
else if( xmlParser.getName().equals( ELEVATION_ELEMENT ) )
{
elevation = true;
}
else if( xmlParser.getName().equals( TIME_ELEMENT ) )
{
time = true;
}
}
}
else if( eventType == XmlPullParser.END_TAG )
{
if( xmlParser.getName().equals( NAME_ELEMENT ) )
{
name = false;
}
else if( xmlParser.getName().equals( SPEED_ELEMENT ) )
{
speed = false;
}
else if( xmlParser.getName().equals( ACCURACY_ELEMENT ) )
{
accuracy = false;
}
else if( xmlParser.getName().equals( COURSE_ELEMENT ) )
{
bearing = false;
}
else if( xmlParser.getName().equals( ELEVATION_ELEMENT ) )
{
elevation = false;
}
else if( xmlParser.getName().equals( TIME_ELEMENT ) )
{
time = false;
}
else if( xmlParser.getName().equals( SEGMENT_ELEMENT ) )
{
if( segmentUri == null )
{
startSegment();
}
contentResolver.bulkInsert( Uri.withAppendedPath( segmentUri, "waypoints" ), bulk.toArray( new ContentValues[bulk.size()] ) );
bulk.clear();
}
else if( xmlParser.getName().equals( TRACK_ELEMENT ) )
{
if( !lastPosition.containsKey(Waypoints.TIME) )
{
lastPosition.put( Waypoints.TIME, importDate );
}
if( !lastPosition.containsKey(Waypoints.SPEED) )
{
lastPosition.put( Waypoints.SPEED, 0 );
}
bulk.add( lastPosition );
lastPosition = null;
}
}
else if( eventType == XmlPullParser.TEXT )
{
String text = xmlParser.getText();
if( name )
{
ContentValues nameValues = new ContentValues();
nameValues.put( Tracks.NAME, text );
if( trackUri == null )
{
startTrack( new ContentValues() );
}
contentResolver.update( trackUri, nameValues, null, null );
}
else if( lastPosition != null && speed )
{
lastPosition.put( Waypoints.SPEED, Double.parseDouble( text ) );
}
else if( lastPosition != null && accuracy )
{
lastPosition.put( Waypoints.ACCURACY, Double.parseDouble( text ) );
}
else if( lastPosition != null && bearing )
{
lastPosition.put( Waypoints.BEARING, Double.parseDouble( text ) );
}
else if( lastPosition != null && elevation )
{
lastPosition.put( Waypoints.ALTITUDE, Double.parseDouble( text ) );
}
else if( lastPosition != null && time )
{
lastPosition.put( Waypoints.TIME, parseXmlDateTime( text ) );
}
}
eventType = xmlParser.next();
}
}
catch (XmlPullParserException e)
{
mErrorDialogMessage = getString( R.string.error_importgpx_xml );
mErrorDialogException = e;
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
showDialog( DIALOG_ERROR );
}
} );
}
catch (IOException e)
{
mErrorDialogMessage = getString( R.string.error_importgpx_io );
mErrorDialogException = e;
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
showDialog( DIALOG_ERROR );
}
} );
}
catch (ParseException e)
{
mErrorDialogMessage = getString( R.string.error_importgpx_parse );
mErrorDialogException = e;
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
showDialog( DIALOG_ERROR );
}
} );
}
finally
{
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
mImportProgress.setVisibility( View.GONE );
}
} );
}
}
| public void run()
{
int eventType;
ContentValues lastPosition = null;
Vector<ContentValues> bulk = new Vector<ContentValues>();
boolean speed = false;
boolean accuracy = false;
boolean bearing = false;
boolean elevation = false;
boolean name = false;
boolean time = false;
Long importDate = new Long( new Date().getTime() );
try
{
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
factory.setNamespaceAware( true );
XmlPullParser xmlParser = factory.newPullParser();
int length = DEFAULT_UNKNOWN_FILESIZE;
if( mImportFileUri.getScheme().equals( "file" ))
{
File file = new File( mImportFileUri.getPath() );
length = file.length() < (long) Integer.MAX_VALUE ? (int) file.length() : Integer.MAX_VALUE;
}
mImportProgress.setMax( length );
mImportProgress.setProgress( 0 );
mImportProgress.setVisibility( View.VISIBLE );
InputStream fis = getContentResolver().openInputStream( mImportFileUri );
ProgressFilterInputStream pfis = new ProgressFilterInputStream( fis, mImportProgress );
BufferedInputStream bis = new BufferedInputStream( pfis );
UnicodeReader ur = new UnicodeReader( bis, "UTF-8" );
xmlParser.setInput( ur );
String filename = mImportFileUri.getLastPathSegment();
eventType = xmlParser.getEventType();
String attributeName;
while (eventType != XmlPullParser.END_DOCUMENT)
{
contentResolver = TrackList.this.getContentResolver();
if( eventType == XmlPullParser.START_TAG )
{
if( xmlParser.getName().equals( NAME_ELEMENT ) )
{
name = true;
}
else
{
ContentValues trackContent = new ContentValues();
trackContent.put( Tracks.NAME, filename );
if( xmlParser.getName().equals( "trk" ) )
{
startTrack(trackContent);
}
else if( xmlParser.getName().equals( SEGMENT_ELEMENT ) )
{
startSegment();
}
else if( xmlParser.getName().equals( TRACK_ELEMENT ) )
{
lastPosition = new ContentValues();
for( int i = 0; i<2; i++ )
{
attributeName = xmlParser.getAttributeName( i );
if( attributeName.equals( LATITUDE_ATRIBUTE ) )
{
lastPosition.put( Waypoints.LATITUDE, new Double( xmlParser.getAttributeValue( i ) ) );
}
else if( attributeName.equals( LONGITUDE_ATTRIBUTE ) )
{
lastPosition.put( Waypoints.LONGITUDE, new Double( xmlParser.getAttributeValue( i ) ) );
}
}
}
else if( xmlParser.getName().equals( SPEED_ELEMENT ) )
{
speed = true;
}
else if( xmlParser.getName().equals( ACCURACY_ELEMENT ) )
{
accuracy = true;
}
else if( xmlParser.getName().equals( COURSE_ELEMENT ) )
{
bearing = true;
}
else if( xmlParser.getName().equals( ELEVATION_ELEMENT ) )
{
elevation = true;
}
else if( xmlParser.getName().equals( TIME_ELEMENT ) )
{
time = true;
}
}
}
else if( eventType == XmlPullParser.END_TAG )
{
if( xmlParser.getName().equals( NAME_ELEMENT ) )
{
name = false;
}
else if( xmlParser.getName().equals( SPEED_ELEMENT ) )
{
speed = false;
}
else if( xmlParser.getName().equals( ACCURACY_ELEMENT ) )
{
accuracy = false;
}
else if( xmlParser.getName().equals( COURSE_ELEMENT ) )
{
bearing = false;
}
else if( xmlParser.getName().equals( ELEVATION_ELEMENT ) )
{
elevation = false;
}
else if( xmlParser.getName().equals( TIME_ELEMENT ) )
{
time = false;
}
else if( xmlParser.getName().equals( SEGMENT_ELEMENT ) )
{
if( segmentUri == null )
{
startSegment();
}
contentResolver.bulkInsert( Uri.withAppendedPath( segmentUri, "waypoints" ), bulk.toArray( new ContentValues[bulk.size()] ) );
bulk.clear();
}
else if( xmlParser.getName().equals( TRACK_ELEMENT ) )
{
if( !lastPosition.containsKey(Waypoints.TIME) )
{
lastPosition.put( Waypoints.TIME, importDate );
}
if( !lastPosition.containsKey(Waypoints.SPEED) )
{
lastPosition.put( Waypoints.SPEED, 0 );
}
bulk.add( lastPosition );
lastPosition = null;
}
}
else if( eventType == XmlPullParser.TEXT )
{
String text = xmlParser.getText();
if( name )
{
ContentValues nameValues = new ContentValues();
nameValues.put( Tracks.NAME, text );
if( trackUri == null )
{
startTrack( new ContentValues() );
}
contentResolver.update( trackUri, nameValues, null, null );
}
else if( lastPosition != null && speed )
{
lastPosition.put( Waypoints.SPEED, Double.parseDouble( text ) );
}
else if( lastPosition != null && accuracy )
{
lastPosition.put( Waypoints.ACCURACY, Double.parseDouble( text ) );
}
else if( lastPosition != null && bearing )
{
lastPosition.put( Waypoints.BEARING, Double.parseDouble( text ) );
}
else if( lastPosition != null && elevation )
{
lastPosition.put( Waypoints.ALTITUDE, Double.parseDouble( text ) );
}
else if( lastPosition != null && time )
{
lastPosition.put( Waypoints.TIME, parseXmlDateTime( text ) );
}
}
eventType = xmlParser.next();
}
}
catch (XmlPullParserException e)
{
mErrorDialogMessage = getString( R.string.error_importgpx_xml );
mErrorDialogException = e;
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
showDialog( DIALOG_ERROR );
}
} );
}
catch (IOException e)
{
mErrorDialogMessage = getString( R.string.error_importgpx_io );
mErrorDialogException = e;
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
showDialog( DIALOG_ERROR );
}
} );
}
catch (ParseException e)
{
mErrorDialogMessage = getString( R.string.error_importgpx_parse );
mErrorDialogException = e;
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
showDialog( DIALOG_ERROR );
}
} );
}
finally
{
TrackList.this.runOnUiThread( new Runnable()
{
public void run()
{
mImportProgress.setVisibility( View.GONE );
}
} );
}
}
|
diff --git a/buildSrc/src/main/java/com/pieceof8/gradle/snapshot/GitScmProvider.java b/buildSrc/src/main/java/com/pieceof8/gradle/snapshot/GitScmProvider.java
index c7b19d2..899945d 100644
--- a/buildSrc/src/main/java/com/pieceof8/gradle/snapshot/GitScmProvider.java
+++ b/buildSrc/src/main/java/com/pieceof8/gradle/snapshot/GitScmProvider.java
@@ -1,109 +1,113 @@
// vi: set softtabstop=4 shiftwidth=4 expandtab:
/*
* Copyright 2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.pieceof8.gradle.snapshot;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.gradle.api.Project;
import lombok.*;
/**
* An {@code ScmProvider} for the Git Source Control Management (SCM) tool.
*/
class GitScmProvider extends ScmProvider {
/** The project this plugin is being applied to. */
private final @NonNull Project project;
/** The configuration object for this task. */
private final @NonNull SnapshotPluginExtension extension;
/**
* Constructs an {@code ScmProvider} for the Git SCM tool.
*
* @param project The (Gradle) project this plugin is being applied to.
* @see org.gradle.api.Project
*/
public GitScmProvider(final @NonNull Project project) {
super(project, Constants.DOT_GIT);
this.project = project;
this.extension = project.getExtensions()
.getByType(SnapshotPluginExtension.class);
}
/** {@inheritDoc} */
@Override
@SneakyThrows(IOException.class)
public Commit getCommit() {
if (repoDir == null) {
throw new IllegalArgumentException("'repoDir' must not be null");
}
FileRepositoryBuilder builder = new FileRepositoryBuilder();
@Cleanup Repository repo = builder.setGitDir(repoDir)
.readEnvironment()
.findGitDir()
.build();
StoredConfig conf = repo.getConfig();
int abbrev = Commit.ABBREV_LENGTH;
if (conf != null) {
abbrev = conf.getInt("core", "abbrev", abbrev);
}
val sdf = new SimpleDateFormat(extension.getDateFormat());
val HEAD = repo.getRef(Constants.HEAD);
if (HEAD == null) {
val msg = "Could not get HEAD Ref, the repository may be corrupt.";
throw new RuntimeException(msg);
}
RevWalk revWalk = new RevWalk(repo);
+ if (HEAD.getObjectId() == null) {
+ val msg = "Could not find any commits from HEAD ref.";
+ throw new RuntimeException(msg);
+ }
RevCommit commit = revWalk.parseCommit(HEAD.getObjectId());
revWalk.markStart(commit);
try {
// git commit time in sec and java datetime is in ms
val commitTime = new Date(commit.getCommitTime() * 1000L);
val ident = commit.getAuthorIdent();
return new Commit(
sdf.format(new Date()), // build time
conf.getString("user", null, "name"),
conf.getString("user", null, "email"),
repo.getBranch(),
commit.getName(),
sdf.format(commitTime),
ident.getName(),
ident.getEmailAddress(),
commit.getFullMessage().trim());
} finally {
revWalk.dispose();
}
}
}
| true | true | public Commit getCommit() {
if (repoDir == null) {
throw new IllegalArgumentException("'repoDir' must not be null");
}
FileRepositoryBuilder builder = new FileRepositoryBuilder();
@Cleanup Repository repo = builder.setGitDir(repoDir)
.readEnvironment()
.findGitDir()
.build();
StoredConfig conf = repo.getConfig();
int abbrev = Commit.ABBREV_LENGTH;
if (conf != null) {
abbrev = conf.getInt("core", "abbrev", abbrev);
}
val sdf = new SimpleDateFormat(extension.getDateFormat());
val HEAD = repo.getRef(Constants.HEAD);
if (HEAD == null) {
val msg = "Could not get HEAD Ref, the repository may be corrupt.";
throw new RuntimeException(msg);
}
RevWalk revWalk = new RevWalk(repo);
RevCommit commit = revWalk.parseCommit(HEAD.getObjectId());
revWalk.markStart(commit);
try {
// git commit time in sec and java datetime is in ms
val commitTime = new Date(commit.getCommitTime() * 1000L);
val ident = commit.getAuthorIdent();
return new Commit(
sdf.format(new Date()), // build time
conf.getString("user", null, "name"),
conf.getString("user", null, "email"),
repo.getBranch(),
commit.getName(),
sdf.format(commitTime),
ident.getName(),
ident.getEmailAddress(),
commit.getFullMessage().trim());
} finally {
revWalk.dispose();
}
}
| public Commit getCommit() {
if (repoDir == null) {
throw new IllegalArgumentException("'repoDir' must not be null");
}
FileRepositoryBuilder builder = new FileRepositoryBuilder();
@Cleanup Repository repo = builder.setGitDir(repoDir)
.readEnvironment()
.findGitDir()
.build();
StoredConfig conf = repo.getConfig();
int abbrev = Commit.ABBREV_LENGTH;
if (conf != null) {
abbrev = conf.getInt("core", "abbrev", abbrev);
}
val sdf = new SimpleDateFormat(extension.getDateFormat());
val HEAD = repo.getRef(Constants.HEAD);
if (HEAD == null) {
val msg = "Could not get HEAD Ref, the repository may be corrupt.";
throw new RuntimeException(msg);
}
RevWalk revWalk = new RevWalk(repo);
if (HEAD.getObjectId() == null) {
val msg = "Could not find any commits from HEAD ref.";
throw new RuntimeException(msg);
}
RevCommit commit = revWalk.parseCommit(HEAD.getObjectId());
revWalk.markStart(commit);
try {
// git commit time in sec and java datetime is in ms
val commitTime = new Date(commit.getCommitTime() * 1000L);
val ident = commit.getAuthorIdent();
return new Commit(
sdf.format(new Date()), // build time
conf.getString("user", null, "name"),
conf.getString("user", null, "email"),
repo.getBranch(),
commit.getName(),
sdf.format(commitTime),
ident.getName(),
ident.getEmailAddress(),
commit.getFullMessage().trim());
} finally {
revWalk.dispose();
}
}
|
diff --git a/src/test/java/algorithm/TestAlgorithmNew.java b/src/test/java/algorithm/TestAlgorithmNew.java
index fde9b5d..f6d3180 100644
--- a/src/test/java/algorithm/TestAlgorithmNew.java
+++ b/src/test/java/algorithm/TestAlgorithmNew.java
@@ -1,153 +1,153 @@
package algorithm;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
import java.util.UUID;
import crowdtrust.AnnotationType;
import crowdtrust.BinaryAccuracy;
import crowdtrust.BinarySubTask;
import crowdtrust.InputType;
import crowdtrust.MediaType;
import db.CrowdDb;
import db.DbInitialiser;
import db.LoginDb;
import db.RegisterDb;
import db.SubTaskDb;
import db.TaskDb;
import junit.framework.TestCase;
public class TestAlgorithmNew extends TestCase {
protected static int numTasks = 9;
protected static int numPeople = 10;
protected static AnnotatorModel[] annotators;
public TestAlgorithmNew(String name){
super(name);
}
public void testAlgorithmNew(){
System.setProperty("test", "true");
boolean labs = false;
if(labs){
//Clean the database
DbInitialiser.init();
//Lets create some annotators with id's 1 - numPeople and place them in array
annotators = new AnnotatorModel[numPeople];
for(int i = 0; i < numPeople; i++){
String uuid = UUID.randomUUID().toString();
uuid = uuid.replace("-", "");
uuid = uuid.substring(0, 12);
annotators[i] = new AnnotatorModel(uuid, uuid);
}
//Set up the annotators so they can answer binary question
Random rand = new Random();
for(int i = 0; i < numPeople; i++){
//int truePos = rand.nextInt(999) + 1;
//int trueNeg = rand.nextInt(999) + 1;
//annotators[i].setUpBinary(truePos, trueNeg, totalPos, totalNeg);
double percentageNormal = 0.75;
if(rand.nextDouble() > percentageNormal){
annotators[i].setUpBinary(500, 500, 1000, 1000);
}else{
annotators[i].setUpBinary(850, 850, 1000, 1000);
}
}
//Create and print their rates and names
for(int i = 0; i < numPeople; i++){
RegisterDb.addUser("[email protected]", annotators[i].getUsername(), annotators[i].getPassword(), true);
annotators[i].setId(LoginDb.checkUserDetails(annotators[i].getUsername(), annotators[i].getPassword()));
AnnotatorModel a = annotators[i];
System.out.println("annotator " +
a.bee.getId() +
" truePosRate =" + a.binary.truePosRate +
" trueNegRate =" + a.binary.trueNegRate);
}
//Lets make a client
RegisterDb.addUser("[email protected]", "gio", "gio", false);
int accountId = LoginDb.checkUserDetails("gio", "gio");
//Lets add a binary task to the database
long expiry = getDate();
float accuracy = (float)0.7;
List<String> testQs = new LinkedList<String>();
testQs.add("test q1");
testQs.add("test q2");
- assertTrue(TaskDb.addTask(accountId,"BinaryTestTask", "This is a test?", accuracy, MediaType.IMAGE, AnnotationType.BINARY, InputType.RADIO, numPeople, expiry, testQs)>0);
+ assertTrue(TaskDb.addTask(accountId,"BinaryTestTask", "This is a test?", accuracy, MediaType.IMAGE, AnnotationType.BINARY, InputType.RADIO, numPeople, expiry, testQs, 0, 0, 0)>0);
//List of answers
LinkedList<AnnotatorSubTaskAnswer> answers = new LinkedList<AnnotatorSubTaskAnswer>();
System.out.println("About to get Task id");
System.out.println("John Task Id: " + TaskDb.getTaskId("BinaryTestTask"));
System.out.println("Got it");
//Lets create a linked list of subTasks
for(int i = 0; i < numTasks; i++){
String uuid = UUID.randomUUID().toString();
uuid = uuid.replace("-", "");
uuid = uuid.substring(0, 12);
SubTaskDb.addSubtask(uuid, TaskDb.getTaskId("BinaryTestTask"));
int id = SubTaskDb.getSubTaskId(uuid);
System.out.println("Subtask Id: " + id);
BinarySubTask bst = new BinarySubTask(id,0.7,0, numPeople);
AnnotatorSubTaskAnswer asta = new AnnotatorSubTaskAnswer(bst.getId(), bst, new BinaryTestData(rand.nextInt(2)));
answers.add(asta);
}
//Give all the annotators the answers
for(int i = 0; i < numPeople; i++){
annotators[i].setTasks(answers);
}
System.out.println("Given annotators answers");
for(int i = 0; i < numTasks; i++){
BinarySubTask t = (BinarySubTask) SubTaskDb.getSubtask(i);
for(int j = 0; j < numTasks; j++){
annotators[i].answerTask(t);
}
System.out.println("Task " + i + " done.");
printAnnotators();
}
}
}
protected void printAnnotators(){
System.out.println("----------Calculating Annotator Rates-----------------");
System.out.println("Id | TPR | TNR | TPRE | TNRE ");
for(int i = 0; i < numPeople; i++){
AnnotatorModel annotator = annotators[i];
System.out.print(annotator.getBee().getId() +" | " + annotator.getBinaryBehaviour().getTruePosRate() + " | " + annotator.getBinaryBehaviour().getTrueNegRate() + " | " );
BinaryAccuracy binAccuracy = CrowdDb.getBinaryAccuracy(annotator.getBee().getId());
System.out.print(binAccuracy.getTruePositive() +" | "+ binAccuracy.getTrueNegative());
System.out.println("");
}
System.out.println("------------------------------------------------------");
}
protected long getDate(){
long ret = 0 ;
String str_date = "11-June-15";
DateFormat formatter ;
Date date ;
formatter = new SimpleDateFormat("dd-MMM-yy");
try {
date = (Date)formatter.parse(str_date);
ret = date.getTime();
} catch (ParseException e) {
e.printStackTrace();
}
return ret;
}
}
| true | true | public void testAlgorithmNew(){
System.setProperty("test", "true");
boolean labs = false;
if(labs){
//Clean the database
DbInitialiser.init();
//Lets create some annotators with id's 1 - numPeople and place them in array
annotators = new AnnotatorModel[numPeople];
for(int i = 0; i < numPeople; i++){
String uuid = UUID.randomUUID().toString();
uuid = uuid.replace("-", "");
uuid = uuid.substring(0, 12);
annotators[i] = new AnnotatorModel(uuid, uuid);
}
//Set up the annotators so they can answer binary question
Random rand = new Random();
for(int i = 0; i < numPeople; i++){
//int truePos = rand.nextInt(999) + 1;
//int trueNeg = rand.nextInt(999) + 1;
//annotators[i].setUpBinary(truePos, trueNeg, totalPos, totalNeg);
double percentageNormal = 0.75;
if(rand.nextDouble() > percentageNormal){
annotators[i].setUpBinary(500, 500, 1000, 1000);
}else{
annotators[i].setUpBinary(850, 850, 1000, 1000);
}
}
//Create and print their rates and names
for(int i = 0; i < numPeople; i++){
RegisterDb.addUser("[email protected]", annotators[i].getUsername(), annotators[i].getPassword(), true);
annotators[i].setId(LoginDb.checkUserDetails(annotators[i].getUsername(), annotators[i].getPassword()));
AnnotatorModel a = annotators[i];
System.out.println("annotator " +
a.bee.getId() +
" truePosRate =" + a.binary.truePosRate +
" trueNegRate =" + a.binary.trueNegRate);
}
//Lets make a client
RegisterDb.addUser("[email protected]", "gio", "gio", false);
int accountId = LoginDb.checkUserDetails("gio", "gio");
//Lets add a binary task to the database
long expiry = getDate();
float accuracy = (float)0.7;
List<String> testQs = new LinkedList<String>();
testQs.add("test q1");
testQs.add("test q2");
assertTrue(TaskDb.addTask(accountId,"BinaryTestTask", "This is a test?", accuracy, MediaType.IMAGE, AnnotationType.BINARY, InputType.RADIO, numPeople, expiry, testQs)>0);
//List of answers
LinkedList<AnnotatorSubTaskAnswer> answers = new LinkedList<AnnotatorSubTaskAnswer>();
System.out.println("About to get Task id");
System.out.println("John Task Id: " + TaskDb.getTaskId("BinaryTestTask"));
System.out.println("Got it");
//Lets create a linked list of subTasks
for(int i = 0; i < numTasks; i++){
String uuid = UUID.randomUUID().toString();
uuid = uuid.replace("-", "");
uuid = uuid.substring(0, 12);
SubTaskDb.addSubtask(uuid, TaskDb.getTaskId("BinaryTestTask"));
int id = SubTaskDb.getSubTaskId(uuid);
System.out.println("Subtask Id: " + id);
BinarySubTask bst = new BinarySubTask(id,0.7,0, numPeople);
AnnotatorSubTaskAnswer asta = new AnnotatorSubTaskAnswer(bst.getId(), bst, new BinaryTestData(rand.nextInt(2)));
answers.add(asta);
}
//Give all the annotators the answers
for(int i = 0; i < numPeople; i++){
annotators[i].setTasks(answers);
}
System.out.println("Given annotators answers");
for(int i = 0; i < numTasks; i++){
BinarySubTask t = (BinarySubTask) SubTaskDb.getSubtask(i);
for(int j = 0; j < numTasks; j++){
annotators[i].answerTask(t);
}
System.out.println("Task " + i + " done.");
printAnnotators();
}
}
}
| public void testAlgorithmNew(){
System.setProperty("test", "true");
boolean labs = false;
if(labs){
//Clean the database
DbInitialiser.init();
//Lets create some annotators with id's 1 - numPeople and place them in array
annotators = new AnnotatorModel[numPeople];
for(int i = 0; i < numPeople; i++){
String uuid = UUID.randomUUID().toString();
uuid = uuid.replace("-", "");
uuid = uuid.substring(0, 12);
annotators[i] = new AnnotatorModel(uuid, uuid);
}
//Set up the annotators so they can answer binary question
Random rand = new Random();
for(int i = 0; i < numPeople; i++){
//int truePos = rand.nextInt(999) + 1;
//int trueNeg = rand.nextInt(999) + 1;
//annotators[i].setUpBinary(truePos, trueNeg, totalPos, totalNeg);
double percentageNormal = 0.75;
if(rand.nextDouble() > percentageNormal){
annotators[i].setUpBinary(500, 500, 1000, 1000);
}else{
annotators[i].setUpBinary(850, 850, 1000, 1000);
}
}
//Create and print their rates and names
for(int i = 0; i < numPeople; i++){
RegisterDb.addUser("[email protected]", annotators[i].getUsername(), annotators[i].getPassword(), true);
annotators[i].setId(LoginDb.checkUserDetails(annotators[i].getUsername(), annotators[i].getPassword()));
AnnotatorModel a = annotators[i];
System.out.println("annotator " +
a.bee.getId() +
" truePosRate =" + a.binary.truePosRate +
" trueNegRate =" + a.binary.trueNegRate);
}
//Lets make a client
RegisterDb.addUser("[email protected]", "gio", "gio", false);
int accountId = LoginDb.checkUserDetails("gio", "gio");
//Lets add a binary task to the database
long expiry = getDate();
float accuracy = (float)0.7;
List<String> testQs = new LinkedList<String>();
testQs.add("test q1");
testQs.add("test q2");
assertTrue(TaskDb.addTask(accountId,"BinaryTestTask", "This is a test?", accuracy, MediaType.IMAGE, AnnotationType.BINARY, InputType.RADIO, numPeople, expiry, testQs, 0, 0, 0)>0);
//List of answers
LinkedList<AnnotatorSubTaskAnswer> answers = new LinkedList<AnnotatorSubTaskAnswer>();
System.out.println("About to get Task id");
System.out.println("John Task Id: " + TaskDb.getTaskId("BinaryTestTask"));
System.out.println("Got it");
//Lets create a linked list of subTasks
for(int i = 0; i < numTasks; i++){
String uuid = UUID.randomUUID().toString();
uuid = uuid.replace("-", "");
uuid = uuid.substring(0, 12);
SubTaskDb.addSubtask(uuid, TaskDb.getTaskId("BinaryTestTask"));
int id = SubTaskDb.getSubTaskId(uuid);
System.out.println("Subtask Id: " + id);
BinarySubTask bst = new BinarySubTask(id,0.7,0, numPeople);
AnnotatorSubTaskAnswer asta = new AnnotatorSubTaskAnswer(bst.getId(), bst, new BinaryTestData(rand.nextInt(2)));
answers.add(asta);
}
//Give all the annotators the answers
for(int i = 0; i < numPeople; i++){
annotators[i].setTasks(answers);
}
System.out.println("Given annotators answers");
for(int i = 0; i < numTasks; i++){
BinarySubTask t = (BinarySubTask) SubTaskDb.getSubtask(i);
for(int j = 0; j < numTasks; j++){
annotators[i].answerTask(t);
}
System.out.println("Task " + i + " done.");
printAnnotators();
}
}
}
|
diff --git a/example/calabash-android-plugin/src/java/com/trollsahead/qcumberless/plugins/calabash/CalabashAndroidPlugin.java b/example/calabash-android-plugin/src/java/com/trollsahead/qcumberless/plugins/calabash/CalabashAndroidPlugin.java
index 68926f8..4c07ef3 100644
--- a/example/calabash-android-plugin/src/java/com/trollsahead/qcumberless/plugins/calabash/CalabashAndroidPlugin.java
+++ b/example/calabash-android-plugin/src/java/com/trollsahead/qcumberless/plugins/calabash/CalabashAndroidPlugin.java
@@ -1,95 +1,95 @@
// Copyright (c) 2012, Daniel Andersen ([email protected])
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// 3. The name of the author may not be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.trollsahead.qcumberless.plugins.calabash;
import com.trollsahead.qcumberless.device.Device;
import com.trollsahead.qcumberless.device.calabash.CalabashAndroidDevice;
import com.trollsahead.qcumberless.device.calabash.CalabashAndroidDeviceImportStepDefinitions;
import com.trollsahead.qcumberless.engine.FlashingMessageManager;
import com.trollsahead.qcumberless.gui.ProgressBar;
import com.trollsahead.qcumberless.model.StepDefinition;
import com.trollsahead.qcumberless.plugins.ButtonBarMethodCallback;
import com.trollsahead.qcumberless.plugins.ElementMethodCallback;
import com.trollsahead.qcumberless.plugins.Plugin;
import com.trollsahead.qcumberless.util.SimpleRubyStepDefinitionParser;
import java.net.URL;
import java.util.*;
import java.util.List;
public class CalabashAndroidPlugin implements Plugin {
private CalabashAndroidDevice calabashAndroidDevice;
public void initialize() {
calabashAndroidDevice = new CalabashAndroidDevice();
}
public Set<Device> getDevices() {
Set<Device> devices = new HashSet<Device>();
devices.add(calabashAndroidDevice);
return devices;
}
- public List<StepDefinition[]> getStepDefinitions() {
+ public Map<String, List<StepDefinition>> getStepDefinitions() {
ProgressBar progressBar = new ProgressBar("Importing step definitions");
FlashingMessageManager.addMessage(progressBar);
try {
final URL[] urls = new URL[] {
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/additions_manual_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/app_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/assert_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/check_box_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/context_menu_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/date_picker_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/enter_text_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/location_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/navigation_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/press_button_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/progress_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/rotation_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/screenshot_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/spinner_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/time_picker_steps.rb")
};
return SimpleRubyStepDefinitionParser.parseFiles(urls, progressBar);
} catch (Exception e) {
e.printStackTrace();
return null;
} finally {
FlashingMessageManager.removeMessage(progressBar);
}
}
public List<ElementMethodCallback> getDefinedElementMethodsApplicableFor(int type) {
return null;
}
public List<ButtonBarMethodCallback> getButtonBarMethods() {
List<ButtonBarMethodCallback> list = new LinkedList<ButtonBarMethodCallback>();
list.add(new CalabashAndroidDeviceImportStepDefinitions(this));
return list;
}
}
| true | true | public List<StepDefinition[]> getStepDefinitions() {
ProgressBar progressBar = new ProgressBar("Importing step definitions");
FlashingMessageManager.addMessage(progressBar);
try {
final URL[] urls = new URL[] {
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/additions_manual_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/app_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/assert_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/check_box_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/context_menu_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/date_picker_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/enter_text_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/location_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/navigation_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/press_button_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/progress_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/rotation_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/screenshot_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/spinner_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/time_picker_steps.rb")
};
return SimpleRubyStepDefinitionParser.parseFiles(urls, progressBar);
} catch (Exception e) {
e.printStackTrace();
return null;
} finally {
FlashingMessageManager.removeMessage(progressBar);
}
}
| public Map<String, List<StepDefinition>> getStepDefinitions() {
ProgressBar progressBar = new ProgressBar("Importing step definitions");
FlashingMessageManager.addMessage(progressBar);
try {
final URL[] urls = new URL[] {
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/additions_manual_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/app_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/assert_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/check_box_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/context_menu_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/date_picker_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/enter_text_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/location_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/navigation_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/press_button_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/progress_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/rotation_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/screenshot_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/spinner_steps.rb"),
new URL("https://raw.github.com/calabash/calabash-android/master/ruby-gem/lib/calabash-android/steps/time_picker_steps.rb")
};
return SimpleRubyStepDefinitionParser.parseFiles(urls, progressBar);
} catch (Exception e) {
e.printStackTrace();
return null;
} finally {
FlashingMessageManager.removeMessage(progressBar);
}
}
|
diff --git a/src/aco/ACO.java b/src/aco/ACO.java
index ae7212f..603b387 100644
--- a/src/aco/ACO.java
+++ b/src/aco/ACO.java
@@ -1,34 +1,34 @@
package aco;
import java.util.ArrayList;
import java.util.Arrays;
public class ACO {
//TODO: Testar essa função.
public static float[][] calculateAggregatedQoS(
ArrayList<QoSAttribute> qosValues) {
float[][] aggregatedQoSValues;
- aggregatedQoSValues = new float[qosValues.get(0).getValues().length][qosValues
- .get(0).getValues()[0].length];
+ aggregatedQoSValues = new float[qosValues.get(0).getValues().length][];
for (int i = 0; i < aggregatedQoSValues.length; i++) {
+ aggregatedQoSValues[i] = new float[qosValues.get(0).getValues()[i].length];
Arrays.fill(aggregatedQoSValues[i], 0f);
}
for (int attr = 0; attr < qosValues.size(); attr++) {
QoSAttribute currentAttribute = qosValues.get(attr);
float[][] currentValues = currentAttribute.getValues();
for (int i = 0; i < currentValues.length; i++) {
for (int j = 0; j < currentValues[i].length; j++) {
aggregatedQoSValues[i][j] += currentValues[i][j]
* currentAttribute.getWeight();
}
}
}
return aggregatedQoSValues;
}
}
| false | true | public static float[][] calculateAggregatedQoS(
ArrayList<QoSAttribute> qosValues) {
float[][] aggregatedQoSValues;
aggregatedQoSValues = new float[qosValues.get(0).getValues().length][qosValues
.get(0).getValues()[0].length];
for (int i = 0; i < aggregatedQoSValues.length; i++) {
Arrays.fill(aggregatedQoSValues[i], 0f);
}
for (int attr = 0; attr < qosValues.size(); attr++) {
QoSAttribute currentAttribute = qosValues.get(attr);
float[][] currentValues = currentAttribute.getValues();
for (int i = 0; i < currentValues.length; i++) {
for (int j = 0; j < currentValues[i].length; j++) {
aggregatedQoSValues[i][j] += currentValues[i][j]
* currentAttribute.getWeight();
}
}
}
return aggregatedQoSValues;
}
| public static float[][] calculateAggregatedQoS(
ArrayList<QoSAttribute> qosValues) {
float[][] aggregatedQoSValues;
aggregatedQoSValues = new float[qosValues.get(0).getValues().length][];
for (int i = 0; i < aggregatedQoSValues.length; i++) {
aggregatedQoSValues[i] = new float[qosValues.get(0).getValues()[i].length];
Arrays.fill(aggregatedQoSValues[i], 0f);
}
for (int attr = 0; attr < qosValues.size(); attr++) {
QoSAttribute currentAttribute = qosValues.get(attr);
float[][] currentValues = currentAttribute.getValues();
for (int i = 0; i < currentValues.length; i++) {
for (int j = 0; j < currentValues[i].length; j++) {
aggregatedQoSValues[i][j] += currentValues[i][j]
* currentAttribute.getWeight();
}
}
}
return aggregatedQoSValues;
}
|
diff --git a/src/edu/sc/seis/sod/database/HSqlNetworkDb.java b/src/edu/sc/seis/sod/database/HSqlNetworkDb.java
index d74879684..00e801a91 100644
--- a/src/edu/sc/seis/sod/database/HSqlNetworkDb.java
+++ b/src/edu/sc/seis/sod/database/HSqlNetworkDb.java
@@ -1,42 +1,42 @@
package edu.sc.seis.sod.database;
import java.sql.*;
import org.hsqldb.*;
/**
* HSqlNetworkDb.java
*
*
* Created: Wed Oct 9 10:33:06 2002
*
* @author <a href="mailto:">Srinivasa Telukutla</a>
* @version
*/
public class HSqlNetworkDb extends AbstractNetworkDatabase{
public HSqlNetworkDb (Connection connection){
super(connection);
}
public void create() {
try {
Statement stmt = connection.createStatement();
stmt.executeUpdate(" CREATE TABLE networkdatabase "+
- " networkid int IDENTITY PRIMARY KEY, "+
+ " (networkid int IDENTITY PRIMARY KEY, "+
" serverName VARCHAR, "+
" serverDNS VARCHAR, "+
" network_code VARCHAR, "+
" station_code VARCHAR, "+
" site_code VARCHAR, "+
" channel_code VARCHAR, "+
" network_time timestamp, "+
" channel_time timestamp, "+
- " channelIdIOR VARCHAR");
+ " channelIdIOR VARCHAR)");
} catch(SQLException sqle) {
sqle.printStackTrace();
}
}
}// HSqlNetworkDb
| false | true | public void create() {
try {
Statement stmt = connection.createStatement();
stmt.executeUpdate(" CREATE TABLE networkdatabase "+
" networkid int IDENTITY PRIMARY KEY, "+
" serverName VARCHAR, "+
" serverDNS VARCHAR, "+
" network_code VARCHAR, "+
" station_code VARCHAR, "+
" site_code VARCHAR, "+
" channel_code VARCHAR, "+
" network_time timestamp, "+
" channel_time timestamp, "+
" channelIdIOR VARCHAR");
} catch(SQLException sqle) {
sqle.printStackTrace();
}
}
| public void create() {
try {
Statement stmt = connection.createStatement();
stmt.executeUpdate(" CREATE TABLE networkdatabase "+
" (networkid int IDENTITY PRIMARY KEY, "+
" serverName VARCHAR, "+
" serverDNS VARCHAR, "+
" network_code VARCHAR, "+
" station_code VARCHAR, "+
" site_code VARCHAR, "+
" channel_code VARCHAR, "+
" network_time timestamp, "+
" channel_time timestamp, "+
" channelIdIOR VARCHAR)");
} catch(SQLException sqle) {
sqle.printStackTrace();
}
}
|
diff --git a/src/ibis/impl/nameServer/tcp/NameServer.java b/src/ibis/impl/nameServer/tcp/NameServer.java
index ee6a6d4d..9ff0cc7b 100644
--- a/src/ibis/impl/nameServer/tcp/NameServer.java
+++ b/src/ibis/impl/nameServer/tcp/NameServer.java
@@ -1,737 +1,735 @@
package ibis.impl.nameServer.tcp;
import ibis.connect.controlHub.ControlHub;
import ibis.impl.nameServer.NSProps;
import ibis.io.DummyInputStream;
import ibis.io.DummyOutputStream;
import ibis.ipl.IbisIdentifier;
import ibis.ipl.IbisRuntimeException;
import ibis.util.PoolInfoServer;
import ibis.util.TypedProperties;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.Calendar;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
import java.util.Vector;
public class NameServer implements Protocol {
public static final int TCP_IBIS_NAME_SERVER_PORT_NR = 9826;
// public static final int TCP_IBIS_NAME_SERVER_PORT_NR = 5678;
private static final int BUF_SIZE = 1024;
static boolean DEBUG = TypedProperties.booleanProperty(NSProps.s_debug);
static boolean VERBOSE = TypedProperties.booleanProperty(NSProps.s_verbose);
static int PINGER_TIMEOUT = TypedProperties.intProperty(NSProps.s_timeout, 300) * 1000; // Property is in seconds, convert to milliseconds.
static class IbisInfo {
IbisIdentifier identifier;
int ibisNameServerport;
InetAddress ibisNameServerAddress;
IbisInfo(IbisIdentifier identifier, InetAddress ibisNameServerAddress, int ibisNameServerport) {
this.identifier = identifier;
this.ibisNameServerAddress = ibisNameServerAddress;
this.ibisNameServerport = ibisNameServerport;
}
public boolean equals(Object other) {
if (other instanceof IbisInfo) {
return identifier.equals(((IbisInfo) other).identifier);
} else {
return false;
}
}
public int hashCode() {
return identifier.hashCode();
}
public String toString() {
return "ibisInfo(" + identifier + "at " + ibisNameServerAddress + ":" + ibisNameServerport + ")";
}
}
static class RunInfo {
Vector pool; // a list of IbisInfos
Vector toBeDeleted; // a list of ibis identifiers
PortTypeNameServer portTypeNameServer;
ReceivePortNameServer receivePortNameServer;
ElectionServer electionServer;
long pingLimit;
RunInfo() throws IOException {
pool = new Vector();
toBeDeleted = new Vector();
portTypeNameServer = new PortTypeNameServer();
receivePortNameServer = new ReceivePortNameServer();
electionServer = new ElectionServer();
pingLimit = System.currentTimeMillis() + PINGER_TIMEOUT;
}
public String toString() {
String res = "runinfo:\n" +
" pool = \n";
for(int i=0; i<pool.size(); i++) {
res += " " + pool.get(i) + "\n";
}
res += " toBeDeleted = \n";
for(int i=0; i<toBeDeleted.size(); i++) {
res += " " + toBeDeleted.get(i) + "\n";
}
return res;
}
}
private Hashtable pools;
private ServerSocket serverSocket;
private ObjectInputStream in;
private ObjectOutputStream out;
private boolean singleRun;
private boolean joined;
private NameServer(boolean singleRun, int port) throws IOException {
this.singleRun = singleRun;
this.joined = false;
if (DEBUG) {
System.err.println("NameServer: singleRun = " + singleRun);
}
// Create a server socket.
serverSocket = NameServerClient.socketFactory.createServerSocket(port, null, false);
pools = new Hashtable();
if (VERBOSE) {
System.err.println("NameServer: created server on port " + serverSocket.getLocalPort());
}
}
private void forwardJoin(IbisInfo dest, IbisIdentifier id) {
if (DEBUG) {
System.err.println("NameServer: forwarding join of " + id.toString() + " to " + dest.ibisNameServerAddress + ", dest port: " + dest.ibisNameServerport);
}
try {
Socket s = NameServerClient.socketFactory.createSocket(dest.ibisNameServerAddress, dest.ibisNameServerport, null, -1 /* do not retry */);
DummyOutputStream d = new DummyOutputStream(s.getOutputStream());
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(d, BUF_SIZE));
out.writeByte(IBIS_JOIN);
out.writeObject(id);
NameServerClient.socketFactory.close(null, out, s);
if (DEBUG) {
System.err.println("NameServer: forwarding join of " + id.toString() + " to " + dest.identifier.toString() + " DONE");
}
} catch (Exception e) {
System.err.println("Could not forward join of " +
id.toString() + " to " + dest.identifier.toString() +
"error = " + e);
}
}
private void handleIbisJoin() throws IOException, ClassNotFoundException {
String key = in.readUTF();
IbisIdentifier id = (IbisIdentifier) in.readObject();
InetAddress address = (InetAddress) in.readObject();
int port = in.readInt();
if (DEBUG) {
System.err.print("NameServer: join to pool " + key);
System.err.print(" requested by " + id.toString());
System.err.println(", port " + port);
}
IbisInfo info = new IbisInfo(id, address, port);
RunInfo p = (RunInfo) pools.get(key);
if (p == null) {
// new run
poolPinger();
p = new RunInfo();
pools.put(key, p);
joined = true;
if (VERBOSE) {
System.err.println("NameServer: new pool " + key + " created");
}
}
if (p.pool.contains(info)) {
out.writeByte(IBIS_REFUSED);
if (DEBUG) {
System.err.println("NameServer: join to pool " + key + " of ibis " + id.toString() + " refused");
}
out.flush();
} else {
out.writeByte(IBIS_ACCEPTED);
out.writeInt(p.portTypeNameServer.getPort());
out.writeInt(p.receivePortNameServer.getPort());
out.writeInt(p.electionServer.getPort());
if (DEBUG) {
System.err.println("NameServer: join to pool " + key + " of ibis " + id.toString() + " accepted");
}
// first send all existing nodes to the new one.
out.writeInt(p.pool.size());
for (int i=0;i<p.pool.size();i++) {
IbisInfo temp = (IbisInfo) p.pool.get(i);
out.writeObject(temp.identifier);
}
//send all nodes about to leave to the new one
out.writeInt(p.toBeDeleted.size());
for (int i=0;i<p.toBeDeleted.size();i++) {
out.writeObject(p.toBeDeleted.get(i));
}
out.flush();
for (int i=0;i<p.pool.size();i++) {
IbisInfo temp = (IbisInfo) p.pool.get(i);
forwardJoin(temp, id);
}
p.pool.add(info);
String date = Calendar.getInstance().getTime().toString();
System.out.println(date + " " + id.name() + " JOINS pool " + key + " (" + p.pool.size() + " nodes)");
}
}
private void poolPinger(String key) {
if (DEBUG) {
System.err.print("NameServer: ping pool " + key);
}
RunInfo p = (RunInfo) pools.get(key);
if (p == null) {
return;
}
long t = System.currentTimeMillis();
// If the pool has not reached its ping-limit yet, return.
if (t < p.pingLimit) {
return;
}
for (int i=0;i<p.pool.size();i++) {
IbisInfo temp = (IbisInfo) p.pool.get(i);
if (doPing(temp, key)) {
// Pool is still alive. Reset its ping-limit.
p.pingLimit = t + PINGER_TIMEOUT;
return;
}
}
// Pool is dead.
pools.remove(key);
try {
String date = Calendar.getInstance().getTime().toString();
System.out.println(date + " pool " + key + " seems to be dead.");
killThreads(p);
} catch(Exception e) {
}
}
/**
* Checks all pools to see if they still are alive. If a pool is dead
* (connect to all members fails), the pool is killed.
*/
private void poolPinger() {
for (Enumeration e = pools.keys(); e.hasMoreElements() ;) {
String key = (String) e.nextElement();
poolPinger(key);
}
}
private boolean doPing(IbisInfo dest, String key) {
try {
Socket s = NameServerClient.socketFactory.createSocket(dest.ibisNameServerAddress,
dest.ibisNameServerport, null, -1 /* do not retry */);
DummyOutputStream d = new DummyOutputStream(s.getOutputStream());
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(d));
out.writeByte(IBIS_PING);
out.flush();
DummyInputStream i = new DummyInputStream(s.getInputStream());
DataInputStream in = new DataInputStream(new BufferedInputStream(i));
String k = in.readUTF();
NameServerClient.socketFactory.close(in, out, s);
if (! k.equals(key)) {
return false;
}
} catch (Exception e) {
return false;
}
return true;
}
private void forwardLeave(IbisInfo dest, IbisIdentifier id) {
if (DEBUG) {
System.err.println("NameServer: forwarding leave of " +
id.toString() + " to " + dest.identifier.toString());
}
try {
Socket s = NameServerClient.socketFactory.createSocket(dest.ibisNameServerAddress,
dest.ibisNameServerport, null, -1 /* do not retry */);
DummyOutputStream d = new DummyOutputStream(s.getOutputStream());
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(d, BUF_SIZE));
out.writeByte(IBIS_LEAVE);
out.writeObject(id);
NameServerClient.socketFactory.close(null, out, s);
} catch (Exception e) {
System.err.println("Could not forward leave of " +
id.toString() + " to " + dest.identifier.toString() +
"error = " + e);
// e.printStackTrace();
}
}
private void killThreads(RunInfo p) throws IOException {
Socket s = NameServerClient.socketFactory.createSocket(InetAddress.getLocalHost(),
p.portTypeNameServer.getPort(), null, 0 /* retry */);
DummyOutputStream d = new DummyOutputStream(s.getOutputStream());
DataOutputStream out = new DataOutputStream(new BufferedOutputStream(d, BUF_SIZE));
out.writeByte(PORTTYPE_EXIT);
NameServerClient.socketFactory.close(null, out, s);
Socket s2 = NameServerClient.socketFactory.createSocket(InetAddress.getLocalHost(),
p.receivePortNameServer.getPort(), null, 0 /* retry */);
DummyOutputStream d2 = new DummyOutputStream(s2.getOutputStream());
ObjectOutputStream out2 = new ObjectOutputStream(new BufferedOutputStream(d2, BUF_SIZE));
out2.writeByte(PORT_EXIT);
NameServerClient.socketFactory.close(null, out2, s2);
Socket s3 = NameServerClient.socketFactory.createSocket(InetAddress.getLocalHost(),
p.electionServer.getPort(), null, 0 /* retry */);
DummyOutputStream d3 = new DummyOutputStream(s3.getOutputStream());
ObjectOutputStream out3 = new ObjectOutputStream(new BufferedOutputStream(d3, BUF_SIZE));
out3.writeByte(ELECTION_EXIT);
NameServerClient.socketFactory.close(null, out3, s3);
}
private void handleIbisLeave() throws IOException, ClassNotFoundException {
String key = in.readUTF();
IbisIdentifier id = (IbisIdentifier) in.readObject();
RunInfo p = (RunInfo) pools.get(key);
if (DEBUG) {
System.err.println("NameServer: leave from pool " + key + " requested by " + id.toString());
}
if (p == null) {
// new run
System.err.println("NameServer: unknown ibis " + id.toString() + "/" + key + " tried to leave");
return;
} else {
int index = -1;
for (int i=0;i<p.pool.size();i++) {
IbisInfo info = (IbisInfo) p.pool.get(i);
if (info.identifier.equals(id)) {
index = i;
break;
}
}
if (index != -1) {
// found it.
if (DEBUG) {
System.err.println("NameServer: leave from pool " + key + " of ibis " + id.toString() + " accepted");
}
// Also forward the leave to the requester.
// It is used as an acknowledgement, and
// the leaver is only allowed to exit when it
// has received its own leave message.
for (int i=0; i<p.pool.size(); i++) {
forwardLeave((IbisInfo) p.pool.get(i), id);
}
p.pool.remove(index);
p.toBeDeleted.remove(id);
String date = Calendar.getInstance().getTime().toString();
System.out.println(date + " " + id.name() + " LEAVES pool " + key + " (" + p.pool.size() + " nodes)");
id.free();
if (p.pool.size() == 0) {
if (VERBOSE) {
System.err.println("NameServer: removing pool " + key);
}
pools.remove(key);
killThreads(p);
}
} else {
System.err.println("NameServer: unknown ibis " + id.toString() + "/" + key + " tried to leave");
}
out.writeByte(0);
out.flush();
}
}
private void forwardDelete(IbisInfo dest, IbisIdentifier id) throws IOException {
if (DEBUG) {
System.err.println("NameServer: forwarding delete of " + id.toString() + " to " + dest.identifier.toString());
}
try {
Socket s = NameServerClient.socketFactory.createSocket(dest.ibisNameServerAddress, dest.ibisNameServerport, null, -1 /*do not retry*/);
DummyOutputStream d = new DummyOutputStream(s.getOutputStream());
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(d, BUF_SIZE));
out.writeByte(IBIS_DELETE);
out.writeObject(id);
NameServerClient.socketFactory.close(null, out, s);
} catch (Exception e) {
if (DEBUG) {
System.err.println("Could not forward delete of " +
id.toString() + " to " + dest.identifier.toString() +
"error = " + e);
}
}
if (DEBUG) {
System.err.println("NameServer: forwarding delete of " + id.toString() + " to " + dest.identifier.toString() + " DONE");
}
}
private void handleIbisDelete() throws IOException, ClassNotFoundException {
String key = in.readUTF();
IbisIdentifier id = (IbisIdentifier) in.readObject();
if (DEBUG) {
System.err.println("NameServer: delete of host "
+ id.toString() + " from pool " + key);
}
RunInfo p = (RunInfo) pools.get(key);
if (p == null) {
// new run
System.err.println("NameServer: unknown ibis " + id.toString() + "/" + key + " was requested to be deleted");
return;
}
int index = -1;
for (int i=0;i<p.pool.size();i++) {
IbisInfo info = (IbisInfo) p.pool.get(i);
if (info.identifier.equals(id)) {
index = i;
break;
}
}
if (index != -1) {
//found it
p.toBeDeleted.add(id);
if (VERBOSE) {
System.out.println("DELETE: pool " + key);
}
for (int i=0;i<p.pool.size();i++) {
IbisInfo temp = (IbisInfo) p.pool.get(i);
forwardDelete(temp, id);
}
if (VERBOSE) {
System.out.println("all deletes forwarded");
}
} else {
System.err.println("NameServer: unknown ibis " + id.toString() + "/" + key + " was requested to be deleted");
}
out.writeByte(0);
out.flush();
}
private void forwardReconfigure(IbisInfo dest) throws IOException {
if (DEBUG) {
System.err.println("NameServer: forwarding reconfigure to " + dest.identifier.toString());
}
try {
Socket s = NameServerClient.socketFactory.createSocket(dest.ibisNameServerAddress, dest.ibisNameServerport, null, -1 /*do not retry*/);
DummyOutputStream d = new DummyOutputStream(s.getOutputStream());
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(d, BUF_SIZE));
out.writeByte(IBIS_RECONFIGURE);
NameServerClient.socketFactory.close(null, out, s);
} catch (Exception e) {
if (DEBUG) {
System.err.println("Could not forward reconfigure to " + dest.identifier.toString() +
"error = " + e);
}
}
if (DEBUG) {
System.err.println("NameServer: forwarding reconfigure to " + dest.identifier.toString() + " DONE");
}
}
private void handleIbisReconfigure() throws IOException, ClassNotFoundException {
String key = in.readUTF();
if (DEBUG) {
System.err.println("NameServer: reconfigure of hosts in pool " + key);
}
RunInfo p = (RunInfo) pools.get(key);
if (p == null) {
// new run
System.err.println("NameServer: unknown pool " + key + " was requested to be reconfigured");
return;
}
for (int i=0;i<p.pool.size();i++) {
IbisInfo temp = (IbisInfo) p.pool.get(i);
forwardReconfigure(temp);
}
out.writeByte(0);
out.flush();
System.out.println("RECONFIGURE: pool " + key);
}
public void run() {
int opcode;
Socket s;
boolean stop = false;
while (!stop) {
try {
if (DEBUG) {
System.err.println("NameServer: accepting incoming connections... ");
}
s = NameServerClient.socketFactory.accept(serverSocket);
if (DEBUG) {
System.err.println("NameServer: incoming connection from " + s.toString());
}
} catch (Exception e) {
System.err.println("NameServer got an error " + e.getMessage());
continue;
}
try {
DummyOutputStream dos = new DummyOutputStream(s.getOutputStream());
out = new ObjectOutputStream(new BufferedOutputStream(dos, BUF_SIZE));
DummyInputStream di = new DummyInputStream(s.getInputStream());
in = new ObjectInputStream(new BufferedInputStream(di, BUF_SIZE));
opcode = in.readByte();
switch (opcode) {
case (IBIS_JOIN):
handleIbisJoin();
break;
case (IBIS_LEAVE):
handleIbisLeave();
if (singleRun && pools.size() == 0) {
if (joined) {
stop = true;
}
// ignore invalid leave req.
}
break;
case (IBIS_DELETE):
handleIbisDelete();
break;
case (IBIS_RECONFIGURE):
handleIbisReconfigure();
break;
default:
System.err.println("NameServer got an illegal opcode: " + opcode);
}
NameServerClient.socketFactory.close(in, out, s);
} catch (Exception e1) {
System.err.println("Got an exception in NameServer.run " + e1.toString());
e1.printStackTrace();
if (s != null) {
NameServerClient.socketFactory.close(null, null, s);
}
}
// System.err.println("Pools are now: " + pools);
}
try {
serverSocket.close();
} catch (Exception e) {
throw new IbisRuntimeException("NameServer got an error" , e);
}
if (VERBOSE) {
System.err.println("NameServer: exit");
}
}
public static void main(String [] args) {
boolean single = false;
boolean control_hub = false;
boolean pool_server = true;
NameServer ns = null;
int port = TCP_IBIS_NAME_SERVER_PORT_NR;
String poolport = null;
String hubport = null;
ControlHub h = null;
for (int i = 0; i < args.length; i++) {
if (false) {
} else if (args[i].equals("-single")) {
single = true;
} else if (args[i].equals("-d")) {
DEBUG = true;
} else if (args[i].equals("-v")) {
VERBOSE = true;
} else if (args[i].equals("-port")) {
i++;
try {
port = Integer.parseInt(args[i]);
} catch (Exception e) {
System.err.println("invalid port");
System.exit(1);
}
} else if (args[i].equals("-hubport")) {
i++;
try {
int n = Integer.parseInt(args[i]);
hubport = args[i];
control_hub = true;
} catch (Exception e) {
System.err.println("invalid port");
System.exit(1);
}
} else if (args[i].equals("-poolport")) {
i++;
try {
int n = Integer.parseInt(args[i]);
poolport = args[i];
} catch (Exception e) {
System.err.println("invalid port");
System.exit(1);
}
} else if (args[i].equals("-controlhub")) {
control_hub = true;
} else if (args[i].equals("-no-controlhub")) {
control_hub = false;
} else if (args[i].equals("-poolserver")) {
pool_server = true;
} else if (args[i].equals("-no-poolserver")) {
pool_server = false;
} else if (args[i].equals("-debug")) {
// Accepted and ignored.
} else {
System.err.println("No such option: " + args[i]);
System.exit(1);
}
}
if (control_hub) {
if (hubport == null) {
hubport = Integer.toString(port+2);
}
System.setProperty("ibis.connect.hub_port", hubport);
h = new ControlHub();
h.setDaemon(true);
h.start();
}
if (pool_server) {
if (poolport == null) {
poolport = Integer.toString(port+1);
}
System.setProperty("ibis.pool.server.port", poolport);
PoolInfoServer p = new PoolInfoServer(single);
p.setDaemon(true);
p.start();
}
if(!single) {
Properties p = System.getProperties();
String singleS = p.getProperty(NSProps.s_single);
single = (singleS != null && singleS.equals("true"));
}
while (true) {
try {
ns = new NameServer(single, port);
break;
} catch (Throwable e) {
- e.printStackTrace();
- System.err.println("Main got " + e + ", retry in 1 second");
+ System.err.println("Nameserver: could not create server socket on port " + port + ", retry in 1 second");
try {Thread.sleep(1000);} catch (Exception ee) {}
-// e.printStackTrace();
}
}
try {
ns.run();
if (h != null) {
h.waitForCount(1);
}
System.exit(0);
} catch (Throwable t) {
System.err.println("Nameserver got an exception: " + t);
t.printStackTrace();
}
}
}
| false | true | public static void main(String [] args) {
boolean single = false;
boolean control_hub = false;
boolean pool_server = true;
NameServer ns = null;
int port = TCP_IBIS_NAME_SERVER_PORT_NR;
String poolport = null;
String hubport = null;
ControlHub h = null;
for (int i = 0; i < args.length; i++) {
if (false) {
} else if (args[i].equals("-single")) {
single = true;
} else if (args[i].equals("-d")) {
DEBUG = true;
} else if (args[i].equals("-v")) {
VERBOSE = true;
} else if (args[i].equals("-port")) {
i++;
try {
port = Integer.parseInt(args[i]);
} catch (Exception e) {
System.err.println("invalid port");
System.exit(1);
}
} else if (args[i].equals("-hubport")) {
i++;
try {
int n = Integer.parseInt(args[i]);
hubport = args[i];
control_hub = true;
} catch (Exception e) {
System.err.println("invalid port");
System.exit(1);
}
} else if (args[i].equals("-poolport")) {
i++;
try {
int n = Integer.parseInt(args[i]);
poolport = args[i];
} catch (Exception e) {
System.err.println("invalid port");
System.exit(1);
}
} else if (args[i].equals("-controlhub")) {
control_hub = true;
} else if (args[i].equals("-no-controlhub")) {
control_hub = false;
} else if (args[i].equals("-poolserver")) {
pool_server = true;
} else if (args[i].equals("-no-poolserver")) {
pool_server = false;
} else if (args[i].equals("-debug")) {
// Accepted and ignored.
} else {
System.err.println("No such option: " + args[i]);
System.exit(1);
}
}
if (control_hub) {
if (hubport == null) {
hubport = Integer.toString(port+2);
}
System.setProperty("ibis.connect.hub_port", hubport);
h = new ControlHub();
h.setDaemon(true);
h.start();
}
if (pool_server) {
if (poolport == null) {
poolport = Integer.toString(port+1);
}
System.setProperty("ibis.pool.server.port", poolport);
PoolInfoServer p = new PoolInfoServer(single);
p.setDaemon(true);
p.start();
}
if(!single) {
Properties p = System.getProperties();
String singleS = p.getProperty(NSProps.s_single);
single = (singleS != null && singleS.equals("true"));
}
while (true) {
try {
ns = new NameServer(single, port);
break;
} catch (Throwable e) {
e.printStackTrace();
System.err.println("Main got " + e + ", retry in 1 second");
try {Thread.sleep(1000);} catch (Exception ee) {}
// e.printStackTrace();
}
}
try {
ns.run();
if (h != null) {
h.waitForCount(1);
}
System.exit(0);
} catch (Throwable t) {
System.err.println("Nameserver got an exception: " + t);
t.printStackTrace();
}
}
| public static void main(String [] args) {
boolean single = false;
boolean control_hub = false;
boolean pool_server = true;
NameServer ns = null;
int port = TCP_IBIS_NAME_SERVER_PORT_NR;
String poolport = null;
String hubport = null;
ControlHub h = null;
for (int i = 0; i < args.length; i++) {
if (false) {
} else if (args[i].equals("-single")) {
single = true;
} else if (args[i].equals("-d")) {
DEBUG = true;
} else if (args[i].equals("-v")) {
VERBOSE = true;
} else if (args[i].equals("-port")) {
i++;
try {
port = Integer.parseInt(args[i]);
} catch (Exception e) {
System.err.println("invalid port");
System.exit(1);
}
} else if (args[i].equals("-hubport")) {
i++;
try {
int n = Integer.parseInt(args[i]);
hubport = args[i];
control_hub = true;
} catch (Exception e) {
System.err.println("invalid port");
System.exit(1);
}
} else if (args[i].equals("-poolport")) {
i++;
try {
int n = Integer.parseInt(args[i]);
poolport = args[i];
} catch (Exception e) {
System.err.println("invalid port");
System.exit(1);
}
} else if (args[i].equals("-controlhub")) {
control_hub = true;
} else if (args[i].equals("-no-controlhub")) {
control_hub = false;
} else if (args[i].equals("-poolserver")) {
pool_server = true;
} else if (args[i].equals("-no-poolserver")) {
pool_server = false;
} else if (args[i].equals("-debug")) {
// Accepted and ignored.
} else {
System.err.println("No such option: " + args[i]);
System.exit(1);
}
}
if (control_hub) {
if (hubport == null) {
hubport = Integer.toString(port+2);
}
System.setProperty("ibis.connect.hub_port", hubport);
h = new ControlHub();
h.setDaemon(true);
h.start();
}
if (pool_server) {
if (poolport == null) {
poolport = Integer.toString(port+1);
}
System.setProperty("ibis.pool.server.port", poolport);
PoolInfoServer p = new PoolInfoServer(single);
p.setDaemon(true);
p.start();
}
if(!single) {
Properties p = System.getProperties();
String singleS = p.getProperty(NSProps.s_single);
single = (singleS != null && singleS.equals("true"));
}
while (true) {
try {
ns = new NameServer(single, port);
break;
} catch (Throwable e) {
System.err.println("Nameserver: could not create server socket on port " + port + ", retry in 1 second");
try {Thread.sleep(1000);} catch (Exception ee) {}
}
}
try {
ns.run();
if (h != null) {
h.waitForCount(1);
}
System.exit(0);
} catch (Throwable t) {
System.err.println("Nameserver got an exception: " + t);
t.printStackTrace();
}
}
|
diff --git a/src/main/java/novemberkilo/irc/bot/gaming/GameBot.java b/src/main/java/novemberkilo/irc/bot/gaming/GameBot.java
index 244a7ba..a6cfad3 100644
--- a/src/main/java/novemberkilo/irc/bot/gaming/GameBot.java
+++ b/src/main/java/novemberkilo/irc/bot/gaming/GameBot.java
@@ -1,49 +1,48 @@
package novemberkilo.irc.bot.gaming;
import org.pircbotx.Configuration;
import org.pircbotx.PircBotX;
/**
* Created with IntelliJ IDEA.
* User: novemberkilo
* Date: 9/30/13
* Time: 7:26 PM
* To change this template use File | Settings | File Templates.
*/
public class GameBot {
public static void main(String[] args) throws Exception {
Configuration configuration;
- if (args.length != 5) {
- System.err.println("Required args: bot_name, bot_password, host_mask, host, channel");
- return;
- }
- if ("-".equals(args[2])) {
- configuration = new Configuration.Builder()
- .setName(args[0])
- .setNickservPassword(args[1])
- .setLogin(args[2]) //login part of hostmask, eg name:login@host
- .setAutoNickChange(true)
- .setCapEnabled(true)
- .addListener(new RollCommandListener(new RollCommandParser()))
- .addListener(new LogWhatYouHear(new SysOutLoggerController()))
- .setServerHostname(args[3])
- .addAutoJoinChannel(args[4])
- .buildConfiguration();
- } else {
+ if (args.length == 4) {
configuration = new Configuration.Builder()
.setName(args[0])
.setNickservPassword(args[1])
.setAutoNickChange(true)
.setCapEnabled(true)
.addListener(new RollCommandListener(new RollCommandParser()))
.addListener(new LogWhatYouHear(new SysOutLoggerController()))
+ .setServerHostname(args[2])
+ .addAutoJoinChannel(args[3])
+ .buildConfiguration();
+ } else if (args.length == 5) {
+ configuration = new Configuration.Builder()
+ .setName(args[0])
+ .setNickservPassword(args[1])
+ .setLogin(args[2]) //login part of hostmask, eg name:login@host
+ .setAutoNickChange(true)
+ .setCapEnabled(true)
+ .addListener(new RollCommandListener(new RollCommandParser()))
+ .addListener(new LogWhatYouHear(new SysOutLoggerController()))
.setServerHostname(args[3])
.addAutoJoinChannel(args[4])
.buildConfiguration();
+ } else {
+ System.out.println("Bad syntax.");
+ return;
}
PircBotX bot = new PircBotX(configuration);
bot.startBot();
System.out.println("nick: " + bot.getNick());
}
}
| false | true | public static void main(String[] args) throws Exception {
Configuration configuration;
if (args.length != 5) {
System.err.println("Required args: bot_name, bot_password, host_mask, host, channel");
return;
}
if ("-".equals(args[2])) {
configuration = new Configuration.Builder()
.setName(args[0])
.setNickservPassword(args[1])
.setLogin(args[2]) //login part of hostmask, eg name:login@host
.setAutoNickChange(true)
.setCapEnabled(true)
.addListener(new RollCommandListener(new RollCommandParser()))
.addListener(new LogWhatYouHear(new SysOutLoggerController()))
.setServerHostname(args[3])
.addAutoJoinChannel(args[4])
.buildConfiguration();
} else {
configuration = new Configuration.Builder()
.setName(args[0])
.setNickservPassword(args[1])
.setAutoNickChange(true)
.setCapEnabled(true)
.addListener(new RollCommandListener(new RollCommandParser()))
.addListener(new LogWhatYouHear(new SysOutLoggerController()))
.setServerHostname(args[3])
.addAutoJoinChannel(args[4])
.buildConfiguration();
}
PircBotX bot = new PircBotX(configuration);
bot.startBot();
System.out.println("nick: " + bot.getNick());
}
| public static void main(String[] args) throws Exception {
Configuration configuration;
if (args.length == 4) {
configuration = new Configuration.Builder()
.setName(args[0])
.setNickservPassword(args[1])
.setAutoNickChange(true)
.setCapEnabled(true)
.addListener(new RollCommandListener(new RollCommandParser()))
.addListener(new LogWhatYouHear(new SysOutLoggerController()))
.setServerHostname(args[2])
.addAutoJoinChannel(args[3])
.buildConfiguration();
} else if (args.length == 5) {
configuration = new Configuration.Builder()
.setName(args[0])
.setNickservPassword(args[1])
.setLogin(args[2]) //login part of hostmask, eg name:login@host
.setAutoNickChange(true)
.setCapEnabled(true)
.addListener(new RollCommandListener(new RollCommandParser()))
.addListener(new LogWhatYouHear(new SysOutLoggerController()))
.setServerHostname(args[3])
.addAutoJoinChannel(args[4])
.buildConfiguration();
} else {
System.out.println("Bad syntax.");
return;
}
PircBotX bot = new PircBotX(configuration);
bot.startBot();
System.out.println("nick: " + bot.getNick());
}
|
diff --git a/htmlunit/src/java/com/gargoylesoftware/htmlunit/html/HtmlArea.java b/htmlunit/src/java/com/gargoylesoftware/htmlunit/html/HtmlArea.java
index e3ff9df73..e60abc34f 100644
--- a/htmlunit/src/java/com/gargoylesoftware/htmlunit/html/HtmlArea.java
+++ b/htmlunit/src/java/com/gargoylesoftware/htmlunit/html/HtmlArea.java
@@ -1,323 +1,326 @@
/*
* Copyright (c) 2002-2006 Gargoyle Software Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment:
*
* "This product includes software developed by Gargoyle Software Inc.
* (http://www.GargoyleSoftware.com/)."
*
* Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear.
* 4. The name "Gargoyle Software" must not be used to endorse or promote
* products derived from this software without prior written permission.
* For written permission, please contact [email protected].
* 5. Products derived from this software may not be called "HtmlUnit", nor may
* "HtmlUnit" appear in their name, without prior written permission of
* Gargoyle Software Inc.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GARGOYLE
* SOFTWARE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.gargoylesoftware.htmlunit.html;
import java.awt.geom.Ellipse2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.SubmitMethod;
import com.gargoylesoftware.htmlunit.TextUtil;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.WebRequestSettings;
import com.gargoylesoftware.htmlunit.WebWindow;
/**
* Wrapper for the html element "area".
*
* @version $Revision$
* @author <a href="mailto:[email protected]">Mike Bowler</a>
* @author David K. Taylor
* @author <a href="mailto:[email protected]">Christian Sell</a>
* @author Marc Guillemot
* @author Ahmed Ashour
*/
public class HtmlArea extends FocusableElement {
/** the HTML tag represented by this element */
public static final String TAG_NAME = "area";
/**
* Create an instance of HtmlArea
*
* @param page The HtmlPage that contains this element.
* @param attributes the initial attributes
*/
public HtmlArea( final HtmlPage page, final Map attributes ) {
super( page, attributes );
}
/**
* @return the HTML tag name
*/
public String getTagName() {
return TAG_NAME;
}
/**
* This method will be called if there either wasn't an onclick handler or there was
* but the result of that handler was true. This is the default behaviour of clicking
* the element. The default implementation returns the current page - subclasses
* requiring different behaviour (like {@link HtmlSubmitInput}) will override this
* method.
*
* @param defaultPage The default page to return if the action does not
* load a new page.
* @return The page that is currently loaded after execution of this method
* @throws IOException If an IO error occured
*/
protected Page doClickAction(final Page defaultPage) throws IOException {
final HtmlPage enclosingPage = getPage();
final WebClient webClient = enclosingPage.getWebClient();
final String href = getHrefAttribute();
if( href != null && href.length() > 0 ) {
final HtmlPage page = getPage();
if( TextUtil.startsWithIgnoreCase(href, "javascript:") ) {
return page.executeJavaScriptIfPossible(
href, "javascript url", false, null).getNewPage();
}
else {
final URL url;
try {
url = enclosingPage.getFullyQualifiedUrl( getHrefAttribute() );
}
catch( final MalformedURLException e ) {
throw new IllegalStateException(
"Not a valid url: " + getHrefAttribute() );
}
final WebRequestSettings settings = new WebRequestSettings(url,
SubmitMethod.getInstance(getAttributeValue("method")));
final WebWindow webWindow = enclosingPage.getEnclosingWindow();
return webClient.getPage(
webWindow,
enclosingPage.getResolvedTarget(getTargetAttribute()),
settings);
}
}
else {
return defaultPage;
}
}
/**
* Return the value of the attribute "shape". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "shape"
* or an empty string if that attribute isn't defined.
*/
public final String getShapeAttribute() {
return getAttributeValue("shape");
}
/**
* Return the value of the attribute "coords". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "coords"
* or an empty string if that attribute isn't defined.
*/
public final String getCoordsAttribute() {
return getAttributeValue("coords");
}
/**
* Return the value of the attribute "href". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "href"
* or an empty string if that attribute isn't defined.
*/
public final String getHrefAttribute() {
return getAttributeValue("href");
}
/**
* Return the value of the attribute "nohref". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "nohref"
* or an empty string if that attribute isn't defined.
*/
public final String getNoHrefAttribute() {
return getAttributeValue("nohref");
}
/**
* Return the value of the attribute "alt". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "alt"
* or an empty string if that attribute isn't defined.
*/
public final String getAltAttribute() {
return getAttributeValue("alt");
}
/**
* Return the value of the attribute "tabindex". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "tabindex"
* or an empty string if that attribute isn't defined.
*/
public final String getTabIndexAttribute() {
return getAttributeValue("tabindex");
}
/**
* Return the value of the attribute "accesskey". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "accesskey"
* or an empty string if that attribute isn't defined.
*/
public final String getAccessKeyAttribute() {
return getAttributeValue("accesskey");
}
/**
* Return the value of the attribute "onfocus". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "onfocus"
* or an empty string if that attribute isn't defined.
*/
public final String getOnFocusAttribute() {
return getAttributeValue("onfocus");
}
/**
* Return the value of the attribute "onblur". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "onblur"
* or an empty string if that attribute isn't defined.
*/
public final String getOnBlurAttribute() {
return getAttributeValue("onblur");
}
/**
* Return the value of the attribute "target". Refer to the
* <a href='http://www.w3.org/TR/html401/'>HTML 4.01</a>
* documentation for details on the use of this attribute.
*
* @return The value of the attribute "target"
* or an empty string if that attribute isn't defined.
*/
public final String getTargetAttribute() {
return getAttributeValue("target");
}
/**
* Indicates if this area contains the give point
* @param x the x coordinate of the point
* @param y the y coordinate of the point
* @return <code>true</code> if the point is contained in this area
*/
boolean containsPoint(final int x, final int y) {
final String shape = StringUtils.defaultIfEmpty(getShapeAttribute(), "rect").toLowerCase();
if ("default".equals(shape) && getCoordsAttribute() != null) {
return true;
}
else if ("rect".equals(shape) && getCoordsAttribute() != null) {
final String[] coords = getCoordsAttribute().split(",");
final double leftX = Double.parseDouble( coords[0].trim() );
final double topY = Double.parseDouble( coords[1].trim() );
final double rightX = Double.parseDouble( coords[2].trim() );
final double bottomY = Double.parseDouble( coords[3].trim() );
final Rectangle2D rectangle = new Rectangle2D.Double(leftX, topY,
rightX - leftX + 1, bottomY - topY + 1);
- if (rectangle.contains(x, y))
+ if (rectangle.contains(x, y)) {
return true;
+ }
}
else if ("circle".equals(shape) && getCoordsAttribute() != null) {
final String[] coords = getCoordsAttribute().split(",");
- double centerX = Double.parseDouble( coords[0].trim() );
- double centerY = Double.parseDouble( coords[1].trim() );
+ final double centerX = Double.parseDouble( coords[0].trim() );
+ final double centerY = Double.parseDouble( coords[1].trim() );
final String radiusString = coords[2].trim();
final int radius;
try {
radius = Integer.parseInt( radiusString );
}
catch (final NumberFormatException nfe) {
throw new NumberFormatException("Circle radius of " + radiusString + " is not yet implemented.");
}
final Ellipse2D ellipse = new Ellipse2D.Double(centerX - radius / 2, centerY - radius / 2,
radius, radius);
- if (ellipse.contains(x, y))
+ if (ellipse.contains(x, y)) {
return true;
+ }
}
else if ("poly".equals(shape) && getCoordsAttribute() != null ) {
final String[] coords = getCoordsAttribute().split(",");
final GeneralPath path = new GeneralPath();
for (int i=0; i + 1 < coords.length; i+=2) {
if (i == 0) {
path.moveTo(Float.parseFloat(coords[i]), Float.parseFloat(coords[i+1]));
}
else {
path.lineTo(Float.parseFloat(coords[i]), Float.parseFloat(coords[i+1]));
}
}
path.closePath();
- if (path.contains(x, y))
+ if (path.contains(x, y)) {
return true;
+ }
}
return false;
}
}
| false | true | boolean containsPoint(final int x, final int y) {
final String shape = StringUtils.defaultIfEmpty(getShapeAttribute(), "rect").toLowerCase();
if ("default".equals(shape) && getCoordsAttribute() != null) {
return true;
}
else if ("rect".equals(shape) && getCoordsAttribute() != null) {
final String[] coords = getCoordsAttribute().split(",");
final double leftX = Double.parseDouble( coords[0].trim() );
final double topY = Double.parseDouble( coords[1].trim() );
final double rightX = Double.parseDouble( coords[2].trim() );
final double bottomY = Double.parseDouble( coords[3].trim() );
final Rectangle2D rectangle = new Rectangle2D.Double(leftX, topY,
rightX - leftX + 1, bottomY - topY + 1);
if (rectangle.contains(x, y))
return true;
}
else if ("circle".equals(shape) && getCoordsAttribute() != null) {
final String[] coords = getCoordsAttribute().split(",");
double centerX = Double.parseDouble( coords[0].trim() );
double centerY = Double.parseDouble( coords[1].trim() );
final String radiusString = coords[2].trim();
final int radius;
try {
radius = Integer.parseInt( radiusString );
}
catch (final NumberFormatException nfe) {
throw new NumberFormatException("Circle radius of " + radiusString + " is not yet implemented.");
}
final Ellipse2D ellipse = new Ellipse2D.Double(centerX - radius / 2, centerY - radius / 2,
radius, radius);
if (ellipse.contains(x, y))
return true;
}
else if ("poly".equals(shape) && getCoordsAttribute() != null ) {
final String[] coords = getCoordsAttribute().split(",");
final GeneralPath path = new GeneralPath();
for (int i=0; i + 1 < coords.length; i+=2) {
if (i == 0) {
path.moveTo(Float.parseFloat(coords[i]), Float.parseFloat(coords[i+1]));
}
else {
path.lineTo(Float.parseFloat(coords[i]), Float.parseFloat(coords[i+1]));
}
}
path.closePath();
if (path.contains(x, y))
return true;
}
return false;
}
| boolean containsPoint(final int x, final int y) {
final String shape = StringUtils.defaultIfEmpty(getShapeAttribute(), "rect").toLowerCase();
if ("default".equals(shape) && getCoordsAttribute() != null) {
return true;
}
else if ("rect".equals(shape) && getCoordsAttribute() != null) {
final String[] coords = getCoordsAttribute().split(",");
final double leftX = Double.parseDouble( coords[0].trim() );
final double topY = Double.parseDouble( coords[1].trim() );
final double rightX = Double.parseDouble( coords[2].trim() );
final double bottomY = Double.parseDouble( coords[3].trim() );
final Rectangle2D rectangle = new Rectangle2D.Double(leftX, topY,
rightX - leftX + 1, bottomY - topY + 1);
if (rectangle.contains(x, y)) {
return true;
}
}
else if ("circle".equals(shape) && getCoordsAttribute() != null) {
final String[] coords = getCoordsAttribute().split(",");
final double centerX = Double.parseDouble( coords[0].trim() );
final double centerY = Double.parseDouble( coords[1].trim() );
final String radiusString = coords[2].trim();
final int radius;
try {
radius = Integer.parseInt( radiusString );
}
catch (final NumberFormatException nfe) {
throw new NumberFormatException("Circle radius of " + radiusString + " is not yet implemented.");
}
final Ellipse2D ellipse = new Ellipse2D.Double(centerX - radius / 2, centerY - radius / 2,
radius, radius);
if (ellipse.contains(x, y)) {
return true;
}
}
else if ("poly".equals(shape) && getCoordsAttribute() != null ) {
final String[] coords = getCoordsAttribute().split(",");
final GeneralPath path = new GeneralPath();
for (int i=0; i + 1 < coords.length; i+=2) {
if (i == 0) {
path.moveTo(Float.parseFloat(coords[i]), Float.parseFloat(coords[i+1]));
}
else {
path.lineTo(Float.parseFloat(coords[i]), Float.parseFloat(coords[i+1]));
}
}
path.closePath();
if (path.contains(x, y)) {
return true;
}
}
return false;
}
|
diff --git a/src/org/dyndns/pawitp/muwifiautologin/MuWifiLogin.java b/src/org/dyndns/pawitp/muwifiautologin/MuWifiLogin.java
index 052716a..ef1632b 100644
--- a/src/org/dyndns/pawitp/muwifiautologin/MuWifiLogin.java
+++ b/src/org/dyndns/pawitp/muwifiautologin/MuWifiLogin.java
@@ -1,136 +1,136 @@
package org.dyndns.pawitp.muwifiautologin;
import java.io.IOException;
import java.net.SocketTimeoutException;
import android.app.IntentService;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.util.Log;
import android.widget.Toast;
public class MuWifiLogin extends IntentService {
static final String TAG = "MuWifiLogin";
static final int LOGIN_ERROR_ID = 1;
static final int LOGIN_ONGOING_ID = 2;
private Handler mHandler;
private SharedPreferences mPrefs;
private NotificationManager mNotifMan;
private Notification mNotification;
public MuWifiLogin() {
super(TAG);
}
@Override
public void onCreate() {
super.onCreate();
mHandler = new Handler();
mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
mNotifMan = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
mNotification = new Notification(R.drawable.ic_stat_notify_key, null, System.currentTimeMillis());
updateOngoingNotification(null, false); // Foreground service requires a valid notification
startForeground(LOGIN_ONGOING_ID, mNotification); // Stopped automatically when onHandleIntent returns
}
@Override
protected void onHandleIntent(Intent intent) {
mNotifMan.cancel(LOGIN_ERROR_ID); // clear any old notification
MuWifiClient loginClient = new MuWifiClient(mPrefs.getString(Preferences.KEY_USERNAME, null), mPrefs.getString(Preferences.KEY_PASSWORD, null));
try {
updateOngoingNotification(getString(R.string.notify_login_ongoing_text_determine_requirement), true);
if (loginClient.loginRequired()) {
try {
Log.v(TAG, "Login required");
updateOngoingNotification(getString(R.string.notify_login_ongoing_text_logging_in), true);
loginClient.login();
createToastNotification(R.string.login_successful, Toast.LENGTH_SHORT);
Log.v(TAG, "Login successful");
} catch (SocketTimeoutException e) {
// A socket timeout here means invalid crendentials!
Log.v(TAG, "Invalid credentials");
Intent notificationIntent = new Intent(this, Preferences.class);
createErrorNotification(notificationIntent, getString(R.string.notify_login_error_invalid_credentials_text));
}
} else {
createToastNotification(R.string.no_login_required, Toast.LENGTH_SHORT);
Log.v(TAG, "No login required");
}
} catch (LoginException e) {
Log.v(TAG, "Login failed");
Intent notificationIntent = new Intent(this, ErrorWebView.class);
notificationIntent.putExtra(ErrorWebView.EXTRA_CONTENT, e.getMessage());
createErrorNotification(notificationIntent, getString(R.string.notify_login_error_text));
} catch (IOException e) {
Log.v(TAG, "Login failed: IOException");
Intent notificationIntent = new Intent(this, IOErrorView.class);
notificationIntent.putExtra(IOErrorView.EXTRA_CONTENT, Utils.stackTraceToString(e));
- createErrorNotification(notificationIntent, getString(R.string.notify_login_error_text));
+ createErrorNotification(notificationIntent, getString(R.string.notify_login_error_connection_problem_text));
} catch (NullPointerException e) {
// a bug in HttpClient library
// thrown when there is a connection failure when handling a redirect
Log.v(TAG, "Login failed: NullPointerException");
Log.v(TAG, Utils.stackTraceToString(e));
- createErrorNotification(new Intent(), getString(R.string.notify_login_error_null_exception_text));
+ createErrorNotification(new Intent(), getString(R.string.notify_login_error_connection_problem_text));
}
}
private void updateOngoingNotification(String message, boolean notify) {
PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent() , 0);
mNotification.setLatestEventInfo(this, getString(R.string.notify_login_ongoing_title), message, contentIntent);
if (notify) {
mNotifMan.notify(LOGIN_ONGOING_ID, mNotification);
}
}
private void createErrorNotification(Intent notificationIntent, String errorText) {
notificationIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
Notification notification = new Notification(R.drawable.ic_stat_notify_key, getString(R.string.ticker_login_error), System.currentTimeMillis());
notification.setLatestEventInfo(this, getString(R.string.notify_login_error_title), errorText, contentIntent);
notification.flags = Notification.FLAG_AUTO_CANCEL;
if (mPrefs.getBoolean(Preferences.KEY_ERROR_NOTIFY_SOUND, false)) {
notification.defaults |= Notification.DEFAULT_SOUND;
}
if (mPrefs.getBoolean(Preferences.KEY_ERROR_NOTIFY_VIBRATE, false)) {
notification.defaults |= Notification.DEFAULT_VIBRATE;
}
if (mPrefs.getBoolean(Preferences.KEY_ERROR_NOTIFY_LIGHTS, false)) {
notification.defaults |= Notification.DEFAULT_LIGHTS;
}
mNotifMan.notify(LOGIN_ERROR_ID, notification);
}
private void createToastNotification(final int message, final int length) {
mHandler.post(new Runnable() {
@Override
public void run() {
Toast.makeText(MuWifiLogin.this, message, length).show();
}
});
}
}
| false | true | protected void onHandleIntent(Intent intent) {
mNotifMan.cancel(LOGIN_ERROR_ID); // clear any old notification
MuWifiClient loginClient = new MuWifiClient(mPrefs.getString(Preferences.KEY_USERNAME, null), mPrefs.getString(Preferences.KEY_PASSWORD, null));
try {
updateOngoingNotification(getString(R.string.notify_login_ongoing_text_determine_requirement), true);
if (loginClient.loginRequired()) {
try {
Log.v(TAG, "Login required");
updateOngoingNotification(getString(R.string.notify_login_ongoing_text_logging_in), true);
loginClient.login();
createToastNotification(R.string.login_successful, Toast.LENGTH_SHORT);
Log.v(TAG, "Login successful");
} catch (SocketTimeoutException e) {
// A socket timeout here means invalid crendentials!
Log.v(TAG, "Invalid credentials");
Intent notificationIntent = new Intent(this, Preferences.class);
createErrorNotification(notificationIntent, getString(R.string.notify_login_error_invalid_credentials_text));
}
} else {
createToastNotification(R.string.no_login_required, Toast.LENGTH_SHORT);
Log.v(TAG, "No login required");
}
} catch (LoginException e) {
Log.v(TAG, "Login failed");
Intent notificationIntent = new Intent(this, ErrorWebView.class);
notificationIntent.putExtra(ErrorWebView.EXTRA_CONTENT, e.getMessage());
createErrorNotification(notificationIntent, getString(R.string.notify_login_error_text));
} catch (IOException e) {
Log.v(TAG, "Login failed: IOException");
Intent notificationIntent = new Intent(this, IOErrorView.class);
notificationIntent.putExtra(IOErrorView.EXTRA_CONTENT, Utils.stackTraceToString(e));
createErrorNotification(notificationIntent, getString(R.string.notify_login_error_text));
} catch (NullPointerException e) {
// a bug in HttpClient library
// thrown when there is a connection failure when handling a redirect
Log.v(TAG, "Login failed: NullPointerException");
Log.v(TAG, Utils.stackTraceToString(e));
createErrorNotification(new Intent(), getString(R.string.notify_login_error_null_exception_text));
}
}
| protected void onHandleIntent(Intent intent) {
mNotifMan.cancel(LOGIN_ERROR_ID); // clear any old notification
MuWifiClient loginClient = new MuWifiClient(mPrefs.getString(Preferences.KEY_USERNAME, null), mPrefs.getString(Preferences.KEY_PASSWORD, null));
try {
updateOngoingNotification(getString(R.string.notify_login_ongoing_text_determine_requirement), true);
if (loginClient.loginRequired()) {
try {
Log.v(TAG, "Login required");
updateOngoingNotification(getString(R.string.notify_login_ongoing_text_logging_in), true);
loginClient.login();
createToastNotification(R.string.login_successful, Toast.LENGTH_SHORT);
Log.v(TAG, "Login successful");
} catch (SocketTimeoutException e) {
// A socket timeout here means invalid crendentials!
Log.v(TAG, "Invalid credentials");
Intent notificationIntent = new Intent(this, Preferences.class);
createErrorNotification(notificationIntent, getString(R.string.notify_login_error_invalid_credentials_text));
}
} else {
createToastNotification(R.string.no_login_required, Toast.LENGTH_SHORT);
Log.v(TAG, "No login required");
}
} catch (LoginException e) {
Log.v(TAG, "Login failed");
Intent notificationIntent = new Intent(this, ErrorWebView.class);
notificationIntent.putExtra(ErrorWebView.EXTRA_CONTENT, e.getMessage());
createErrorNotification(notificationIntent, getString(R.string.notify_login_error_text));
} catch (IOException e) {
Log.v(TAG, "Login failed: IOException");
Intent notificationIntent = new Intent(this, IOErrorView.class);
notificationIntent.putExtra(IOErrorView.EXTRA_CONTENT, Utils.stackTraceToString(e));
createErrorNotification(notificationIntent, getString(R.string.notify_login_error_connection_problem_text));
} catch (NullPointerException e) {
// a bug in HttpClient library
// thrown when there is a connection failure when handling a redirect
Log.v(TAG, "Login failed: NullPointerException");
Log.v(TAG, Utils.stackTraceToString(e));
createErrorNotification(new Intent(), getString(R.string.notify_login_error_connection_problem_text));
}
}
|
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 00b17549..6560c5d3 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -1,1397 +1,1397 @@
/*
* Copyright (C) 2008 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.launcher2;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProviderInfo;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Intent;
import android.content.Intent.ShortcutIconResource;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ProviderInfo;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Parcelable;
import android.os.RemoteException;
import android.util.Log;
import android.os.Process;
import android.os.SystemClock;
import java.lang.ref.WeakReference;
import java.net.URISyntaxException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import com.android.launcher.R;
/**
* Maintains in-memory state of the Launcher. It is expected that there should be only one
* LauncherModel object held in a static. Also provide APIs for updating the database state
* for the Launcher.
*/
public class LauncherModel extends BroadcastReceiver {
static final boolean DEBUG_LOADERS = false;
static final String TAG = "Launcher.Model";
private final LauncherApplication mApp;
private final Object mLock = new Object();
private DeferredHandler mHandler = new DeferredHandler();
private Loader mLoader = new Loader();
private boolean mBeforeFirstLoad = true;
private WeakReference<Callbacks> mCallbacks;
private AllAppsList mAllAppsList;
private IconCache mIconCache;
private Bitmap mDefaultIcon;
public interface Callbacks {
public int getCurrentWorkspaceScreen();
public void startBinding();
public void bindItems(ArrayList<ItemInfo> shortcuts, int start, int end);
public void bindFolders(HashMap<Long,FolderInfo> folders);
public void finishBindingItems();
public void bindAppWidget(LauncherAppWidgetInfo info);
public void bindAllApplications(ArrayList<ApplicationInfo> apps);
public void bindAppsAdded(ArrayList<ApplicationInfo> apps);
public void bindAppsUpdated(ArrayList<ApplicationInfo> apps);
public void bindAppsRemoved(ArrayList<ApplicationInfo> apps);
}
LauncherModel(LauncherApplication app, IconCache iconCache) {
mApp = app;
mAllAppsList = new AllAppsList(iconCache);
mIconCache = iconCache;
mDefaultIcon = Utilities.createIconBitmap(
app.getPackageManager().getDefaultActivityIcon(), app);
}
public Bitmap getFallbackIcon() {
return Bitmap.createBitmap(mDefaultIcon);
}
/**
* Adds an item to the DB if it was not created previously, or move it to a new
* <container, screen, cellX, cellY>
*/
static void addOrMoveItemInDatabase(Context context, ItemInfo item, long container,
int screen, int cellX, int cellY) {
if (item.container == ItemInfo.NO_ID) {
// From all apps
addItemToDatabase(context, item, container, screen, cellX, cellY, false);
} else {
// From somewhere else
moveItemInDatabase(context, item, container, screen, cellX, cellY);
}
}
/**
* Move an item in the DB to a new <container, screen, cellX, cellY>
*/
static void moveItemInDatabase(Context context, ItemInfo item, long container, int screen,
int cellX, int cellY) {
item.container = container;
item.screen = screen;
item.cellX = cellX;
item.cellY = cellY;
final ContentValues values = new ContentValues();
final ContentResolver cr = context.getContentResolver();
values.put(LauncherSettings.Favorites.CONTAINER, item.container);
values.put(LauncherSettings.Favorites.CELLX, item.cellX);
values.put(LauncherSettings.Favorites.CELLY, item.cellY);
values.put(LauncherSettings.Favorites.SCREEN, item.screen);
cr.update(LauncherSettings.Favorites.getContentUri(item.id, false), values, null, null);
}
/**
* Returns true if the shortcuts already exists in the database.
* we identify a shortcut by its title and intent.
*/
static boolean shortcutExists(Context context, String title, Intent intent) {
final ContentResolver cr = context.getContentResolver();
Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI,
new String[] { "title", "intent" }, "title=? and intent=?",
new String[] { title, intent.toUri(0) }, null);
boolean result = false;
try {
result = c.moveToFirst();
} finally {
c.close();
}
return result;
}
/**
* Find a folder in the db, creating the FolderInfo if necessary, and adding it to folderList.
*/
FolderInfo getFolderById(Context context, HashMap<Long,FolderInfo> folderList, long id) {
final ContentResolver cr = context.getContentResolver();
Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI, null,
"_id=? and (itemType=? or itemType=?)",
new String[] { String.valueOf(id),
String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER),
String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER) }, null);
try {
if (c.moveToFirst()) {
final int itemTypeIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ITEM_TYPE);
final int titleIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE);
final int containerIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CONTAINER);
final int screenIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.SCREEN);
final int cellXIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLX);
final int cellYIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLY);
FolderInfo folderInfo = null;
switch (c.getInt(itemTypeIndex)) {
case LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER:
folderInfo = findOrMakeUserFolder(folderList, id);
break;
case LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER:
folderInfo = findOrMakeLiveFolder(folderList, id);
break;
}
folderInfo.title = c.getString(titleIndex);
folderInfo.id = id;
folderInfo.container = c.getInt(containerIndex);
folderInfo.screen = c.getInt(screenIndex);
folderInfo.cellX = c.getInt(cellXIndex);
folderInfo.cellY = c.getInt(cellYIndex);
return folderInfo;
}
} finally {
c.close();
}
return null;
}
/**
* Add an item to the database in a specified container. Sets the container, screen, cellX and
* cellY fields of the item. Also assigns an ID to the item.
*/
static void addItemToDatabase(Context context, ItemInfo item, long container,
int screen, int cellX, int cellY, boolean notify) {
item.container = container;
item.screen = screen;
item.cellX = cellX;
item.cellY = cellY;
final ContentValues values = new ContentValues();
final ContentResolver cr = context.getContentResolver();
item.onAddToDatabase(values);
Uri result = cr.insert(notify ? LauncherSettings.Favorites.CONTENT_URI :
LauncherSettings.Favorites.CONTENT_URI_NO_NOTIFICATION, values);
if (result != null) {
item.id = Integer.parseInt(result.getPathSegments().get(1));
}
}
/**
* Update an item to the database in a specified container.
*/
static void updateItemInDatabase(Context context, ItemInfo item) {
final ContentValues values = new ContentValues();
final ContentResolver cr = context.getContentResolver();
item.onAddToDatabase(values);
cr.update(LauncherSettings.Favorites.getContentUri(item.id, false), values, null, null);
}
/**
* Removes the specified item from the database
* @param context
* @param item
*/
static void deleteItemFromDatabase(Context context, ItemInfo item) {
final ContentResolver cr = context.getContentResolver();
cr.delete(LauncherSettings.Favorites.getContentUri(item.id, false), null, null);
}
/**
* Remove the contents of the specified folder from the database
*/
static void deleteUserFolderContentsFromDatabase(Context context, UserFolderInfo info) {
final ContentResolver cr = context.getContentResolver();
cr.delete(LauncherSettings.Favorites.getContentUri(info.id, false), null, null);
cr.delete(LauncherSettings.Favorites.CONTENT_URI,
LauncherSettings.Favorites.CONTAINER + "=" + info.id, null);
}
/**
* Set this as the current Launcher activity object for the loader.
*/
public void initialize(Callbacks callbacks) {
synchronized (mLock) {
mCallbacks = new WeakReference<Callbacks>(callbacks);
}
}
public void startLoader(Context context, boolean isLaunching) {
mLoader.startLoader(context, isLaunching);
}
public void stopLoader() {
mLoader.stopLoader();
}
/**
* We pick up most of the changes to all apps.
*/
public void setAllAppsDirty() {
mLoader.setAllAppsDirty();
}
public void setWorkspaceDirty() {
mLoader.setWorkspaceDirty();
}
/**
* Call from the handler for ACTION_PACKAGE_ADDED, ACTION_PACKAGE_REMOVED and
* ACTION_PACKAGE_CHANGED.
*/
public void onReceive(Context context, Intent intent) {
// Use the app as the context.
context = mApp;
ArrayList<ApplicationInfo> added = null;
ArrayList<ApplicationInfo> removed = null;
ArrayList<ApplicationInfo> modified = null;
synchronized (mLock) {
if (mBeforeFirstLoad) {
// If we haven't even loaded yet, don't bother, since we'll just pick
// up the changes.
return;
}
final String action = intent.getAction();
if (Intent.ACTION_PACKAGE_CHANGED.equals(action)
|| Intent.ACTION_PACKAGE_REMOVED.equals(action)
|| Intent.ACTION_PACKAGE_ADDED.equals(action)) {
final String packageName = intent.getData().getSchemeSpecificPart();
final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
if (packageName == null || packageName.length() == 0) {
// they sent us a bad intent
return;
}
if (Intent.ACTION_PACKAGE_CHANGED.equals(action)) {
mAllAppsList.updatePackage(context, packageName);
} else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
if (!replacing) {
mAllAppsList.removePackage(packageName);
}
// else, we are replacing the package, so a PACKAGE_ADDED will be sent
// later, we will update the package at this time
} else if (Intent.ACTION_PACKAGE_ADDED.equals(action)) {
if (!replacing) {
mAllAppsList.addPackage(context, packageName);
} else {
mAllAppsList.updatePackage(context, packageName);
}
}
if (mAllAppsList.added.size() > 0) {
added = mAllAppsList.added;
mAllAppsList.added = new ArrayList<ApplicationInfo>();
}
if (mAllAppsList.removed.size() > 0) {
removed = mAllAppsList.removed;
mAllAppsList.removed = new ArrayList<ApplicationInfo>();
for (ApplicationInfo info: removed) {
mIconCache.remove(info.intent.getComponent());
}
}
if (mAllAppsList.modified.size() > 0) {
modified = mAllAppsList.modified;
mAllAppsList.modified = new ArrayList<ApplicationInfo>();
}
final Callbacks callbacks = mCallbacks != null ? mCallbacks.get() : null;
if (callbacks == null) {
Log.w(TAG, "Nobody to tell about the new app. Launcher is probably loading.");
return;
}
if (added != null) {
final ArrayList<ApplicationInfo> addedFinal = added;
mHandler.post(new Runnable() {
public void run() {
callbacks.bindAppsAdded(addedFinal);
}
});
}
if (modified != null) {
final ArrayList<ApplicationInfo> modifiedFinal = modified;
mHandler.post(new Runnable() {
public void run() {
callbacks.bindAppsUpdated(modifiedFinal);
}
});
}
if (removed != null) {
final ArrayList<ApplicationInfo> removedFinal = removed;
mHandler.post(new Runnable() {
public void run() {
callbacks.bindAppsRemoved(removedFinal);
}
});
}
} else {
if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(action)) {
String packages[] = intent.getStringArrayExtra(
Intent.EXTRA_CHANGED_PACKAGE_LIST);
if (packages == null || packages.length == 0) {
return;
}
setAllAppsDirty();
setWorkspaceDirty();
startLoader(context, false);
} else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) {
String packages[] = intent.getStringArrayExtra(
Intent.EXTRA_CHANGED_PACKAGE_LIST);
if (packages == null || packages.length == 0) {
return;
}
setAllAppsDirty();
setWorkspaceDirty();
startLoader(context, false);
}
}
}
}
public class Loader {
private static final int ITEMS_CHUNK = 6;
private LoaderThread mLoaderThread;
private int mLastWorkspaceSeq = 0;
private int mWorkspaceSeq = 1;
private int mLastAllAppsSeq = 0;
private int mAllAppsSeq = 1;
final ArrayList<ItemInfo> mItems = new ArrayList<ItemInfo>();
final ArrayList<LauncherAppWidgetInfo> mAppWidgets = new ArrayList<LauncherAppWidgetInfo>();
final HashMap<Long, FolderInfo> mFolders = new HashMap<Long, FolderInfo>();
/**
* Call this from the ui thread so the handler is initialized on the correct thread.
*/
public Loader() {
}
public void startLoader(Context context, boolean isLaunching) {
synchronized (mLock) {
if (DEBUG_LOADERS) {
Log.d(TAG, "startLoader isLaunching=" + isLaunching);
}
// Don't bother to start the thread if we know it's not going to do anything
if (mCallbacks.get() != null) {
LoaderThread oldThread = mLoaderThread;
if (oldThread != null) {
if (oldThread.isLaunching()) {
// don't downgrade isLaunching if we're already running
isLaunching = true;
}
oldThread.stopLocked();
}
mLoaderThread = new LoaderThread(context, oldThread, isLaunching);
mLoaderThread.start();
}
}
}
public void stopLoader() {
synchronized (mLock) {
if (mLoaderThread != null) {
mLoaderThread.stopLocked();
}
}
}
public void setWorkspaceDirty() {
synchronized (mLock) {
mWorkspaceSeq++;
}
}
public void setAllAppsDirty() {
synchronized (mLock) {
mAllAppsSeq++;
}
}
/**
* Runnable for the thread that loads the contents of the launcher:
* - workspace icons
* - widgets
* - all apps icons
*/
private class LoaderThread extends Thread {
private Context mContext;
private Thread mWaitThread;
private boolean mIsLaunching;
private boolean mStopped;
private boolean mWorkspaceDoneBinding;
LoaderThread(Context context, Thread waitThread, boolean isLaunching) {
mContext = context;
mWaitThread = waitThread;
mIsLaunching = isLaunching;
}
boolean isLaunching() {
return mIsLaunching;
}
/**
* If another LoaderThread was supplied, we need to wait for that to finish before
* we start our processing. This keeps the ordering of the setting and clearing
* of the dirty flags correct by making sure we don't start processing stuff until
* they've had a chance to re-set them. We do this waiting the worker thread, not
* the ui thread to avoid ANRs.
*/
private void waitForOtherThread() {
if (mWaitThread != null) {
boolean done = false;
while (!done) {
try {
mWaitThread.join();
done = true;
} catch (InterruptedException ex) {
// Ignore
}
}
mWaitThread = null;
}
}
public void run() {
waitForOtherThread();
// Elevate priority when Home launches for the first time to avoid
// starving at boot time. Staring at a blank home is not cool.
synchronized (mLock) {
android.os.Process.setThreadPriority(mIsLaunching
? Process.THREAD_PRIORITY_DEFAULT : Process.THREAD_PRIORITY_BACKGROUND);
}
// Load the workspace only if it's dirty.
int workspaceSeq;
boolean workspaceDirty;
synchronized (mLock) {
workspaceSeq = mWorkspaceSeq;
workspaceDirty = mWorkspaceSeq != mLastWorkspaceSeq;
}
if (workspaceDirty) {
loadWorkspace();
}
synchronized (mLock) {
// If we're not stopped, and nobody has incremented mWorkspaceSeq.
if (mStopped) {
return;
}
if (workspaceSeq == mWorkspaceSeq) {
mLastWorkspaceSeq = mWorkspaceSeq;
}
}
// Bind the workspace
bindWorkspace();
// Wait until the either we're stopped or the other threads are done.
// This way we don't start loading all apps until the workspace has settled
// down.
synchronized (LoaderThread.this) {
mHandler.postIdle(new Runnable() {
public void run() {
synchronized (LoaderThread.this) {
mWorkspaceDoneBinding = true;
if (DEBUG_LOADERS) {
Log.d(TAG, "done with workspace");
}
LoaderThread.this.notify();
}
}
});
if (DEBUG_LOADERS) {
Log.d(TAG, "waiting to be done with workspace");
}
while (!mStopped && !mWorkspaceDoneBinding) {
try {
this.wait();
} catch (InterruptedException ex) {
// Ignore
}
}
if (DEBUG_LOADERS) {
Log.d(TAG, "done waiting to be done with workspace");
}
}
// Load all apps if they're dirty
int allAppsSeq;
boolean allAppsDirty;
synchronized (mLock) {
allAppsSeq = mAllAppsSeq;
allAppsDirty = mAllAppsSeq != mLastAllAppsSeq;
if (DEBUG_LOADERS) {
Log.d(TAG, "mAllAppsSeq=" + mAllAppsSeq
+ " mLastAllAppsSeq=" + mLastAllAppsSeq + " allAppsDirty");
}
}
if (allAppsDirty) {
loadAllApps();
}
synchronized (mLock) {
// If we're not stopped, and nobody has incremented mAllAppsSeq.
if (mStopped) {
return;
}
if (allAppsSeq == mAllAppsSeq) {
mLastAllAppsSeq = mAllAppsSeq;
}
}
// Bind all apps
if (allAppsDirty) {
bindAllApps();
}
// Clear out this reference, otherwise we end up holding it until all of the
// callback runnables are done.
mContext = null;
synchronized (mLock) {
// Setting the reference is atomic, but we can't do it inside the other critical
// sections.
mLoaderThread = null;
}
}
public void stopLocked() {
synchronized (LoaderThread.this) {
mStopped = true;
this.notify();
}
}
/**
* Gets the callbacks object. If we've been stopped, or if the launcher object
* has somehow been garbage collected, return null instead.
*/
Callbacks tryGetCallbacks() {
synchronized (mLock) {
if (mStopped) {
return null;
}
final Callbacks callbacks = mCallbacks.get();
if (callbacks == null) {
Log.w(TAG, "no mCallbacks");
return null;
}
return callbacks;
}
}
private void loadWorkspace() {
long t = SystemClock.uptimeMillis();
final Context context = mContext;
final ContentResolver contentResolver = context.getContentResolver();
final PackageManager manager = context.getPackageManager();
final AppWidgetManager widgets = AppWidgetManager.getInstance(context);
final boolean isSafeMode = manager.isSafeMode();
mItems.clear();
mAppWidgets.clear();
mFolders.clear();
final ArrayList<Long> itemsToRemove = new ArrayList<Long>();
final Cursor c = contentResolver.query(
LauncherSettings.Favorites.CONTENT_URI, null, null, null, null);
try {
final int idIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites._ID);
final int intentIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.INTENT);
final int titleIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.TITLE);
final int iconTypeIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ICON_TYPE);
final int iconIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON);
final int iconPackageIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ICON_PACKAGE);
final int iconResourceIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ICON_RESOURCE);
final int containerIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.CONTAINER);
final int itemTypeIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ITEM_TYPE);
final int appWidgetIdIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.APPWIDGET_ID);
final int screenIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.SCREEN);
final int cellXIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.CELLX);
final int cellYIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.CELLY);
final int spanXIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.SPANX);
final int spanYIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.SPANY);
final int uriIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.URI);
final int displayModeIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.DISPLAY_MODE);
ShortcutInfo info;
String intentDescription;
LauncherAppWidgetInfo appWidgetInfo;
int container;
long id;
Intent intent;
while (!mStopped && c.moveToNext()) {
try {
int itemType = c.getInt(itemTypeIndex);
switch (itemType) {
case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
intentDescription = c.getString(intentIndex);
try {
intent = Intent.parseUri(intentDescription, 0);
} catch (URISyntaxException e) {
continue;
}
if (itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
info = getShortcutInfo(manager, intent, context, c, iconIndex,
titleIndex);
} else {
info = getShortcutInfo(c, context, iconTypeIndex,
iconPackageIndex, iconResourceIndex, iconIndex,
titleIndex);
}
if (info != null) {
updateSavedIcon(context, info, c, iconIndex);
info.intent = intent;
info.id = c.getLong(idIndex);
container = c.getInt(containerIndex);
info.container = container;
info.screen = c.getInt(screenIndex);
info.cellX = c.getInt(cellXIndex);
info.cellY = c.getInt(cellYIndex);
switch (container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
mItems.add(info);
break;
default:
// Item is in a user folder
UserFolderInfo folderInfo =
findOrMakeUserFolder(mFolders, container);
folderInfo.add(info);
break;
}
} else {
// Failed to load the shortcut, probably because the
// activity manager couldn't resolve it (maybe the app
// was uninstalled), or the db row was somehow screwed up.
// Delete it.
id = c.getLong(idIndex);
Log.e(TAG, "Error loading shortcut " + id + ", removing it");
contentResolver.delete(LauncherSettings.Favorites.getContentUri(
id, false), null, null);
}
break;
case LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER:
id = c.getLong(idIndex);
UserFolderInfo folderInfo = findOrMakeUserFolder(mFolders, id);
folderInfo.title = c.getString(titleIndex);
folderInfo.id = id;
container = c.getInt(containerIndex);
folderInfo.container = container;
folderInfo.screen = c.getInt(screenIndex);
folderInfo.cellX = c.getInt(cellXIndex);
folderInfo.cellY = c.getInt(cellYIndex);
switch (container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
mItems.add(folderInfo);
break;
}
mFolders.put(folderInfo.id, folderInfo);
break;
case LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER:
id = c.getLong(idIndex);
Uri uri = Uri.parse(c.getString(uriIndex));
// Make sure the live folder exists
final ProviderInfo providerInfo =
context.getPackageManager().resolveContentProvider(
uri.getAuthority(), 0);
if (providerInfo == null && !isSafeMode) {
itemsToRemove.add(id);
} else {
LiveFolderInfo liveFolderInfo = findOrMakeLiveFolder(mFolders, id);
intentDescription = c.getString(intentIndex);
intent = null;
if (intentDescription != null) {
try {
intent = Intent.parseUri(intentDescription, 0);
} catch (URISyntaxException e) {
// Ignore, a live folder might not have a base intent
}
}
liveFolderInfo.title = c.getString(titleIndex);
liveFolderInfo.id = id;
liveFolderInfo.uri = uri;
container = c.getInt(containerIndex);
liveFolderInfo.container = container;
liveFolderInfo.screen = c.getInt(screenIndex);
liveFolderInfo.cellX = c.getInt(cellXIndex);
liveFolderInfo.cellY = c.getInt(cellYIndex);
liveFolderInfo.baseIntent = intent;
liveFolderInfo.displayMode = c.getInt(displayModeIndex);
loadLiveFolderIcon(context, c, iconTypeIndex, iconPackageIndex,
iconResourceIndex, liveFolderInfo);
switch (container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
mItems.add(liveFolderInfo);
break;
}
mFolders.put(liveFolderInfo.id, liveFolderInfo);
}
break;
case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
// Read all Launcher-specific widget details
int appWidgetId = c.getInt(appWidgetIdIndex);
id = c.getLong(idIndex);
final AppWidgetProviderInfo provider =
widgets.getAppWidgetInfo(appWidgetId);
if (!isSafeMode && (provider == null || provider.provider == null ||
provider.provider.getPackageName() == null)) {
itemsToRemove.add(id);
} else {
appWidgetInfo = new LauncherAppWidgetInfo(appWidgetId);
appWidgetInfo.id = id;
appWidgetInfo.screen = c.getInt(screenIndex);
appWidgetInfo.cellX = c.getInt(cellXIndex);
appWidgetInfo.cellY = c.getInt(cellYIndex);
appWidgetInfo.spanX = c.getInt(spanXIndex);
appWidgetInfo.spanY = c.getInt(spanYIndex);
container = c.getInt(containerIndex);
if (container != LauncherSettings.Favorites.CONTAINER_DESKTOP) {
Log.e(TAG, "Widget found where container "
+ "!= CONTAINER_DESKTOP -- ignoring!");
continue;
}
appWidgetInfo.container = c.getInt(containerIndex);
mAppWidgets.add(appWidgetInfo);
}
break;
}
} catch (Exception e) {
Log.w(TAG, "Desktop items loading interrupted:", e);
}
}
} finally {
c.close();
}
if (itemsToRemove.size() > 0) {
ContentProviderClient client = contentResolver.acquireContentProviderClient(
LauncherSettings.Favorites.CONTENT_URI);
// Remove dead items
for (long id : itemsToRemove) {
if (DEBUG_LOADERS) {
Log.d(TAG, "Removed id = " + id);
}
// Don't notify content observers
try {
client.delete(LauncherSettings.Favorites.getContentUri(id, false),
null, null);
} catch (RemoteException e) {
Log.w(TAG, "Could not remove id = " + id);
}
}
}
if (DEBUG_LOADERS) {
Log.d(TAG, "loaded workspace in " + (SystemClock.uptimeMillis()-t) + "ms");
}
}
/**
* Read everything out of our database.
*/
private void bindWorkspace() {
final long t = SystemClock.uptimeMillis();
// Don't use these two variables in any of the callback runnables.
// Otherwise we hold a reference to them.
Callbacks callbacks = mCallbacks.get();
if (callbacks == null) {
// This launcher has exited and nobody bothered to tell us. Just bail.
Log.w(TAG, "LoaderThread running with no launcher");
return;
}
int N;
// Tell the workspace that we're about to start firing items at it
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.startBinding();
}
}
});
// Add the items to the workspace.
N = mItems.size();
for (int i=0; i<N; i+=ITEMS_CHUNK) {
final int start = i;
final int chunkSize = (i+ITEMS_CHUNK <= N) ? ITEMS_CHUNK : (N-i);
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindItems(mItems, start, start+chunkSize);
}
}
});
}
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindFolders(mFolders);
}
}
});
// Wait until the queue goes empty.
mHandler.postIdle(new Runnable() {
public void run() {
if (DEBUG_LOADERS) {
Log.d(TAG, "Going to start binding widgets soon.");
}
}
});
// Bind the widgets, one at a time.
// WARNING: this is calling into the workspace from the background thread,
// but since getCurrentScreen() just returns the int, we should be okay. This
// is just a hint for the order, and if it's wrong, we'll be okay.
// TODO: instead, we should have that push the current screen into here.
final int currentScreen = callbacks.getCurrentWorkspaceScreen();
N = mAppWidgets.size();
// once for the current screen
for (int i=0; i<N; i++) {
final LauncherAppWidgetInfo widget = mAppWidgets.get(i);
if (widget.screen == currentScreen) {
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindAppWidget(widget);
}
}
});
}
}
// once for the other screens
for (int i=0; i<N; i++) {
final LauncherAppWidgetInfo widget = mAppWidgets.get(i);
if (widget.screen != currentScreen) {
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindAppWidget(widget);
}
}
});
}
}
// Tell the workspace that we're done.
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.finishBindingItems();
}
}
});
// If we're profiling, this is the last thing in the queue.
mHandler.post(new Runnable() {
public void run() {
if (DEBUG_LOADERS) {
Log.d(TAG, "bound workspace in "
+ (SystemClock.uptimeMillis()-t) + "ms");
}
if (Launcher.PROFILE_ROTATE) {
android.os.Debug.stopMethodTracing();
}
}
});
}
private void loadAllApps() {
final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
final Callbacks callbacks = tryGetCallbacks();
if (callbacks == null) {
return;
}
final PackageManager packageManager = mContext.getPackageManager();
final List<ResolveInfo> apps = packageManager.queryIntentActivities(mainIntent, 0);
synchronized (mLock) {
mBeforeFirstLoad = false;
mAllAppsList.clear();
if (apps != null) {
long t = SystemClock.uptimeMillis();
int N = apps.size();
for (int i=0; i<N && !mStopped; i++) {
// This builds the icon bitmaps.
mAllAppsList.add(new ApplicationInfo(apps.get(i), mIconCache));
}
Collections.sort(mAllAppsList.data, APP_NAME_COMPARATOR);
Collections.sort(mAllAppsList.added, APP_NAME_COMPARATOR);
if (DEBUG_LOADERS) {
Log.d(TAG, "cached app icons in "
+ (SystemClock.uptimeMillis()-t) + "ms");
}
}
}
}
private void bindAllApps() {
synchronized (mLock) {
final ArrayList<ApplicationInfo> results
= (ArrayList<ApplicationInfo>) mAllAppsList.data.clone();
// We're adding this now, so clear out this so we don't re-send them.
mAllAppsList.added = new ArrayList<ApplicationInfo>();
mHandler.post(new Runnable() {
public void run() {
final long t = SystemClock.uptimeMillis();
final int count = results.size();
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindAllApplications(results);
}
if (DEBUG_LOADERS) {
Log.d(TAG, "bound app " + count + " icons in "
+ (SystemClock.uptimeMillis() - t) + "ms");
}
}
});
}
}
public void dumpState() {
Log.d(TAG, "mLoader.mLoaderThread.mContext=" + mContext);
Log.d(TAG, "mLoader.mLoaderThread.mWaitThread=" + mWaitThread);
Log.d(TAG, "mLoader.mLoaderThread.mIsLaunching=" + mIsLaunching);
Log.d(TAG, "mLoader.mLoaderThread.mStopped=" + mStopped);
Log.d(TAG, "mLoader.mLoaderThread.mWorkspaceDoneBinding=" + mWorkspaceDoneBinding);
}
}
public void dumpState() {
Log.d(TAG, "mLoader.mLastWorkspaceSeq=" + mLoader.mLastWorkspaceSeq);
Log.d(TAG, "mLoader.mWorkspaceSeq=" + mLoader.mWorkspaceSeq);
Log.d(TAG, "mLoader.mLastAllAppsSeq=" + mLoader.mLastAllAppsSeq);
Log.d(TAG, "mLoader.mAllAppsSeq=" + mLoader.mAllAppsSeq);
Log.d(TAG, "mLoader.mItems size=" + mLoader.mItems.size());
if (mLoaderThread != null) {
mLoaderThread.dumpState();
} else {
Log.d(TAG, "mLoader.mLoaderThread=null");
}
}
}
/**
* This is called from the code that adds shortcuts from the intent receiver. This
* doesn't have a Cursor, but
*/
public ShortcutInfo getShortcutInfo(PackageManager manager, Intent intent, Context context) {
- return getShortcutInfo(manager, intent, context);
+ return getShortcutInfo(manager, intent, context, null, -1, -1);
}
/**
* Make an ShortcutInfo object for a shortcut that is an application.
*
* If c is not null, then it will be used to fill in missing data like the title and icon.
*/
public ShortcutInfo getShortcutInfo(PackageManager manager, Intent intent, Context context,
Cursor c, int iconIndex, int titleIndex) {
Bitmap icon = null;
final ShortcutInfo info = new ShortcutInfo();
ComponentName componentName = intent.getComponent();
if (componentName == null) {
return null;
}
// the resource -- This may implicitly give us back the fallback icon,
// but don't worry about that. All we're doing with usingFallbackIcon is
// to avoid saving lots of copies of that in the database, and most apps
// have icons anyway.
final ResolveInfo resolveInfo = manager.resolveActivity(intent, 0);
if (resolveInfo != null) {
icon = mIconCache.getIcon(componentName, resolveInfo);
}
// the db
if (icon == null) {
if (c != null) {
icon = getIconFromCursor(c, iconIndex);
}
}
// the fallback icon
if (icon == null) {
icon = getFallbackIcon();
info.usingFallbackIcon = true;
}
info.setIcon(icon);
// from the resource
if (resolveInfo != null) {
info.title = resolveInfo.activityInfo.loadLabel(manager);
}
// from the db
if (info.title == null) {
if (c != null) {
info.title = c.getString(titleIndex);
}
}
// fall back to the class name of the activity
if (info.title == null) {
info.title = componentName.getClassName();
}
info.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
return info;
}
/**
* Make an ShortcutInfo object for a shortcut that isn't an application.
*/
private ShortcutInfo getShortcutInfo(Cursor c, Context context,
int iconTypeIndex, int iconPackageIndex, int iconResourceIndex, int iconIndex,
int titleIndex) {
Bitmap icon = null;
final ShortcutInfo info = new ShortcutInfo();
info.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
info.title = c.getString(titleIndex);
int iconType = c.getInt(iconTypeIndex);
switch (iconType) {
case LauncherSettings.Favorites.ICON_TYPE_RESOURCE:
String packageName = c.getString(iconPackageIndex);
String resourceName = c.getString(iconResourceIndex);
PackageManager packageManager = context.getPackageManager();
info.customIcon = false;
// the resource
try {
Resources resources = packageManager.getResourcesForApplication(packageName);
if (resources != null) {
final int id = resources.getIdentifier(resourceName, null, null);
icon = Utilities.createIconBitmap(resources.getDrawable(id), context);
}
} catch (Exception e) {
// drop this. we have other places to look for icons
}
// the db
if (icon == null) {
icon = getIconFromCursor(c, iconIndex);
}
// the fallback icon
if (icon == null) {
icon = getFallbackIcon();
info.usingFallbackIcon = true;
}
break;
case LauncherSettings.Favorites.ICON_TYPE_BITMAP:
icon = getIconFromCursor(c, iconIndex);
if (icon == null) {
icon = getFallbackIcon();
info.customIcon = false;
info.usingFallbackIcon = true;
} else {
info.customIcon = true;
}
info.setIcon(icon);
break;
default:
info.setIcon(getFallbackIcon());
info.usingFallbackIcon = true;
info.customIcon = false;
break;
}
return info;
}
Bitmap getIconFromCursor(Cursor c, int iconIndex) {
if (false) {
Log.d(TAG, "getIconFromCursor app="
+ c.getString(c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE)));
}
byte[] data = c.getBlob(iconIndex);
try {
return BitmapFactory.decodeByteArray(data, 0, data.length);
} catch (Exception e) {
return null;
}
}
ShortcutInfo addShortcut(Context context, Intent data,
CellLayout.CellInfo cellInfo, boolean notify) {
final ShortcutInfo info = infoFromShortcutIntent(context, data);
addItemToDatabase(context, info, LauncherSettings.Favorites.CONTAINER_DESKTOP,
cellInfo.screen, cellInfo.cellX, cellInfo.cellY, notify);
return info;
}
private ShortcutInfo infoFromShortcutIntent(Context context, Intent data) {
Intent intent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);
String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
Parcelable bitmap = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);
Bitmap icon = null;
boolean filtered = false;
boolean customIcon = false;
ShortcutIconResource iconResource = null;
if (bitmap != null && bitmap instanceof Bitmap) {
icon = Utilities.createIconBitmap(new FastBitmapDrawable((Bitmap)bitmap), context);
filtered = true;
customIcon = true;
} else {
Parcelable extra = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
if (extra != null && extra instanceof ShortcutIconResource) {
try {
iconResource = (ShortcutIconResource) extra;
final PackageManager packageManager = context.getPackageManager();
Resources resources = packageManager.getResourcesForApplication(
iconResource.packageName);
final int id = resources.getIdentifier(iconResource.resourceName, null, null);
icon = Utilities.createIconBitmap(resources.getDrawable(id), context);
} catch (Exception e) {
Log.w(TAG, "Could not load shortcut icon: " + extra);
}
}
}
final ShortcutInfo info = new ShortcutInfo();
if (icon == null) {
icon = getFallbackIcon();
info.usingFallbackIcon = true;
}
info.setIcon(icon);
info.title = name;
info.intent = intent;
info.customIcon = customIcon;
info.iconResource = iconResource;
return info;
}
private static void loadLiveFolderIcon(Context context, Cursor c, int iconTypeIndex,
int iconPackageIndex, int iconResourceIndex, LiveFolderInfo liveFolderInfo) {
int iconType = c.getInt(iconTypeIndex);
switch (iconType) {
case LauncherSettings.Favorites.ICON_TYPE_RESOURCE:
String packageName = c.getString(iconPackageIndex);
String resourceName = c.getString(iconResourceIndex);
PackageManager packageManager = context.getPackageManager();
try {
Resources resources = packageManager.getResourcesForApplication(packageName);
final int id = resources.getIdentifier(resourceName, null, null);
liveFolderInfo.icon = Utilities.createIconBitmap(resources.getDrawable(id),
context);
} catch (Exception e) {
liveFolderInfo.icon = Utilities.createIconBitmap(
context.getResources().getDrawable(R.drawable.ic_launcher_folder),
context);
}
liveFolderInfo.iconResource = new Intent.ShortcutIconResource();
liveFolderInfo.iconResource.packageName = packageName;
liveFolderInfo.iconResource.resourceName = resourceName;
break;
default:
liveFolderInfo.icon = Utilities.createIconBitmap(
context.getResources().getDrawable(R.drawable.ic_launcher_folder),
context);
}
}
void updateSavedIcon(Context context, ShortcutInfo info, Cursor c, int iconIndex) {
// If this icon doesn't have a custom icon, check to see
// what's stored in the DB, and if it doesn't match what
// we're going to show, store what we are going to show back
// into the DB. We do this so when we're loading, if the
// package manager can't find an icon (for example because
// the app is on SD) then we can use that instead.
if (info.onExternalStorage && !info.customIcon && !info.usingFallbackIcon) {
boolean needSave;
byte[] data = c.getBlob(iconIndex);
try {
if (data != null) {
Bitmap saved = BitmapFactory.decodeByteArray(data, 0, data.length);
Bitmap loaded = info.getIcon(mIconCache);
needSave = !saved.sameAs(loaded);
} else {
needSave = true;
}
} catch (Exception e) {
needSave = true;
}
if (needSave) {
Log.d(TAG, "going to save icon bitmap for info=" + info);
// This is slower than is ideal, but this only happens either
// after the froyo OTA or when the app is updated with a new
// icon.
updateItemInDatabase(context, info);
}
}
}
/**
* Return an existing UserFolderInfo object if we have encountered this ID previously,
* or make a new one.
*/
private static UserFolderInfo findOrMakeUserFolder(HashMap<Long, FolderInfo> folders, long id) {
// See if a placeholder was created for us already
FolderInfo folderInfo = folders.get(id);
if (folderInfo == null || !(folderInfo instanceof UserFolderInfo)) {
// No placeholder -- create a new instance
folderInfo = new UserFolderInfo();
folders.put(id, folderInfo);
}
return (UserFolderInfo) folderInfo;
}
/**
* Return an existing UserFolderInfo object if we have encountered this ID previously, or make a
* new one.
*/
private static LiveFolderInfo findOrMakeLiveFolder(HashMap<Long, FolderInfo> folders, long id) {
// See if a placeholder was created for us already
FolderInfo folderInfo = folders.get(id);
if (folderInfo == null || !(folderInfo instanceof LiveFolderInfo)) {
// No placeholder -- create a new instance
folderInfo = new LiveFolderInfo();
folders.put(id, folderInfo);
}
return (LiveFolderInfo) folderInfo;
}
private static String getLabel(PackageManager manager, ActivityInfo activityInfo) {
String label = activityInfo.loadLabel(manager).toString();
if (label == null) {
label = manager.getApplicationLabel(activityInfo.applicationInfo).toString();
if (label == null) {
label = activityInfo.name;
}
}
return label;
}
private static final Collator sCollator = Collator.getInstance();
public static final Comparator<ApplicationInfo> APP_NAME_COMPARATOR
= new Comparator<ApplicationInfo>() {
public final int compare(ApplicationInfo a, ApplicationInfo b) {
return sCollator.compare(a.title.toString(), b.title.toString());
}
};
public void dumpState() {
Log.d(TAG, "mBeforeFirstLoad=" + mBeforeFirstLoad);
Log.d(TAG, "mCallbacks=" + mCallbacks);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.data", mAllAppsList.data);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.added", mAllAppsList.added);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.removed", mAllAppsList.removed);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.modified", mAllAppsList.modified);
mLoader.dumpState();
}
}
| true | true | static boolean shortcutExists(Context context, String title, Intent intent) {
final ContentResolver cr = context.getContentResolver();
Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI,
new String[] { "title", "intent" }, "title=? and intent=?",
new String[] { title, intent.toUri(0) }, null);
boolean result = false;
try {
result = c.moveToFirst();
} finally {
c.close();
}
return result;
}
/**
* Find a folder in the db, creating the FolderInfo if necessary, and adding it to folderList.
*/
FolderInfo getFolderById(Context context, HashMap<Long,FolderInfo> folderList, long id) {
final ContentResolver cr = context.getContentResolver();
Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI, null,
"_id=? and (itemType=? or itemType=?)",
new String[] { String.valueOf(id),
String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER),
String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER) }, null);
try {
if (c.moveToFirst()) {
final int itemTypeIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ITEM_TYPE);
final int titleIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE);
final int containerIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CONTAINER);
final int screenIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.SCREEN);
final int cellXIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLX);
final int cellYIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLY);
FolderInfo folderInfo = null;
switch (c.getInt(itemTypeIndex)) {
case LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER:
folderInfo = findOrMakeUserFolder(folderList, id);
break;
case LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER:
folderInfo = findOrMakeLiveFolder(folderList, id);
break;
}
folderInfo.title = c.getString(titleIndex);
folderInfo.id = id;
folderInfo.container = c.getInt(containerIndex);
folderInfo.screen = c.getInt(screenIndex);
folderInfo.cellX = c.getInt(cellXIndex);
folderInfo.cellY = c.getInt(cellYIndex);
return folderInfo;
}
} finally {
c.close();
}
return null;
}
/**
* Add an item to the database in a specified container. Sets the container, screen, cellX and
* cellY fields of the item. Also assigns an ID to the item.
*/
static void addItemToDatabase(Context context, ItemInfo item, long container,
int screen, int cellX, int cellY, boolean notify) {
item.container = container;
item.screen = screen;
item.cellX = cellX;
item.cellY = cellY;
final ContentValues values = new ContentValues();
final ContentResolver cr = context.getContentResolver();
item.onAddToDatabase(values);
Uri result = cr.insert(notify ? LauncherSettings.Favorites.CONTENT_URI :
LauncherSettings.Favorites.CONTENT_URI_NO_NOTIFICATION, values);
if (result != null) {
item.id = Integer.parseInt(result.getPathSegments().get(1));
}
}
/**
* Update an item to the database in a specified container.
*/
static void updateItemInDatabase(Context context, ItemInfo item) {
final ContentValues values = new ContentValues();
final ContentResolver cr = context.getContentResolver();
item.onAddToDatabase(values);
cr.update(LauncherSettings.Favorites.getContentUri(item.id, false), values, null, null);
}
/**
* Removes the specified item from the database
* @param context
* @param item
*/
static void deleteItemFromDatabase(Context context, ItemInfo item) {
final ContentResolver cr = context.getContentResolver();
cr.delete(LauncherSettings.Favorites.getContentUri(item.id, false), null, null);
}
/**
* Remove the contents of the specified folder from the database
*/
static void deleteUserFolderContentsFromDatabase(Context context, UserFolderInfo info) {
final ContentResolver cr = context.getContentResolver();
cr.delete(LauncherSettings.Favorites.getContentUri(info.id, false), null, null);
cr.delete(LauncherSettings.Favorites.CONTENT_URI,
LauncherSettings.Favorites.CONTAINER + "=" + info.id, null);
}
/**
* Set this as the current Launcher activity object for the loader.
*/
public void initialize(Callbacks callbacks) {
synchronized (mLock) {
mCallbacks = new WeakReference<Callbacks>(callbacks);
}
}
public void startLoader(Context context, boolean isLaunching) {
mLoader.startLoader(context, isLaunching);
}
public void stopLoader() {
mLoader.stopLoader();
}
/**
* We pick up most of the changes to all apps.
*/
public void setAllAppsDirty() {
mLoader.setAllAppsDirty();
}
public void setWorkspaceDirty() {
mLoader.setWorkspaceDirty();
}
/**
* Call from the handler for ACTION_PACKAGE_ADDED, ACTION_PACKAGE_REMOVED and
* ACTION_PACKAGE_CHANGED.
*/
public void onReceive(Context context, Intent intent) {
// Use the app as the context.
context = mApp;
ArrayList<ApplicationInfo> added = null;
ArrayList<ApplicationInfo> removed = null;
ArrayList<ApplicationInfo> modified = null;
synchronized (mLock) {
if (mBeforeFirstLoad) {
// If we haven't even loaded yet, don't bother, since we'll just pick
// up the changes.
return;
}
final String action = intent.getAction();
if (Intent.ACTION_PACKAGE_CHANGED.equals(action)
|| Intent.ACTION_PACKAGE_REMOVED.equals(action)
|| Intent.ACTION_PACKAGE_ADDED.equals(action)) {
final String packageName = intent.getData().getSchemeSpecificPart();
final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
if (packageName == null || packageName.length() == 0) {
// they sent us a bad intent
return;
}
if (Intent.ACTION_PACKAGE_CHANGED.equals(action)) {
mAllAppsList.updatePackage(context, packageName);
} else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
if (!replacing) {
mAllAppsList.removePackage(packageName);
}
// else, we are replacing the package, so a PACKAGE_ADDED will be sent
// later, we will update the package at this time
} else if (Intent.ACTION_PACKAGE_ADDED.equals(action)) {
if (!replacing) {
mAllAppsList.addPackage(context, packageName);
} else {
mAllAppsList.updatePackage(context, packageName);
}
}
if (mAllAppsList.added.size() > 0) {
added = mAllAppsList.added;
mAllAppsList.added = new ArrayList<ApplicationInfo>();
}
if (mAllAppsList.removed.size() > 0) {
removed = mAllAppsList.removed;
mAllAppsList.removed = new ArrayList<ApplicationInfo>();
for (ApplicationInfo info: removed) {
mIconCache.remove(info.intent.getComponent());
}
}
if (mAllAppsList.modified.size() > 0) {
modified = mAllAppsList.modified;
mAllAppsList.modified = new ArrayList<ApplicationInfo>();
}
final Callbacks callbacks = mCallbacks != null ? mCallbacks.get() : null;
if (callbacks == null) {
Log.w(TAG, "Nobody to tell about the new app. Launcher is probably loading.");
return;
}
if (added != null) {
final ArrayList<ApplicationInfo> addedFinal = added;
mHandler.post(new Runnable() {
public void run() {
callbacks.bindAppsAdded(addedFinal);
}
});
}
if (modified != null) {
final ArrayList<ApplicationInfo> modifiedFinal = modified;
mHandler.post(new Runnable() {
public void run() {
callbacks.bindAppsUpdated(modifiedFinal);
}
});
}
if (removed != null) {
final ArrayList<ApplicationInfo> removedFinal = removed;
mHandler.post(new Runnable() {
public void run() {
callbacks.bindAppsRemoved(removedFinal);
}
});
}
} else {
if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(action)) {
String packages[] = intent.getStringArrayExtra(
Intent.EXTRA_CHANGED_PACKAGE_LIST);
if (packages == null || packages.length == 0) {
return;
}
setAllAppsDirty();
setWorkspaceDirty();
startLoader(context, false);
} else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) {
String packages[] = intent.getStringArrayExtra(
Intent.EXTRA_CHANGED_PACKAGE_LIST);
if (packages == null || packages.length == 0) {
return;
}
setAllAppsDirty();
setWorkspaceDirty();
startLoader(context, false);
}
}
}
}
public class Loader {
private static final int ITEMS_CHUNK = 6;
private LoaderThread mLoaderThread;
private int mLastWorkspaceSeq = 0;
private int mWorkspaceSeq = 1;
private int mLastAllAppsSeq = 0;
private int mAllAppsSeq = 1;
final ArrayList<ItemInfo> mItems = new ArrayList<ItemInfo>();
final ArrayList<LauncherAppWidgetInfo> mAppWidgets = new ArrayList<LauncherAppWidgetInfo>();
final HashMap<Long, FolderInfo> mFolders = new HashMap<Long, FolderInfo>();
/**
* Call this from the ui thread so the handler is initialized on the correct thread.
*/
public Loader() {
}
public void startLoader(Context context, boolean isLaunching) {
synchronized (mLock) {
if (DEBUG_LOADERS) {
Log.d(TAG, "startLoader isLaunching=" + isLaunching);
}
// Don't bother to start the thread if we know it's not going to do anything
if (mCallbacks.get() != null) {
LoaderThread oldThread = mLoaderThread;
if (oldThread != null) {
if (oldThread.isLaunching()) {
// don't downgrade isLaunching if we're already running
isLaunching = true;
}
oldThread.stopLocked();
}
mLoaderThread = new LoaderThread(context, oldThread, isLaunching);
mLoaderThread.start();
}
}
}
public void stopLoader() {
synchronized (mLock) {
if (mLoaderThread != null) {
mLoaderThread.stopLocked();
}
}
}
public void setWorkspaceDirty() {
synchronized (mLock) {
mWorkspaceSeq++;
}
}
public void setAllAppsDirty() {
synchronized (mLock) {
mAllAppsSeq++;
}
}
/**
* Runnable for the thread that loads the contents of the launcher:
* - workspace icons
* - widgets
* - all apps icons
*/
private class LoaderThread extends Thread {
private Context mContext;
private Thread mWaitThread;
private boolean mIsLaunching;
private boolean mStopped;
private boolean mWorkspaceDoneBinding;
LoaderThread(Context context, Thread waitThread, boolean isLaunching) {
mContext = context;
mWaitThread = waitThread;
mIsLaunching = isLaunching;
}
boolean isLaunching() {
return mIsLaunching;
}
/**
* If another LoaderThread was supplied, we need to wait for that to finish before
* we start our processing. This keeps the ordering of the setting and clearing
* of the dirty flags correct by making sure we don't start processing stuff until
* they've had a chance to re-set them. We do this waiting the worker thread, not
* the ui thread to avoid ANRs.
*/
private void waitForOtherThread() {
if (mWaitThread != null) {
boolean done = false;
while (!done) {
try {
mWaitThread.join();
done = true;
} catch (InterruptedException ex) {
// Ignore
}
}
mWaitThread = null;
}
}
public void run() {
waitForOtherThread();
// Elevate priority when Home launches for the first time to avoid
// starving at boot time. Staring at a blank home is not cool.
synchronized (mLock) {
android.os.Process.setThreadPriority(mIsLaunching
? Process.THREAD_PRIORITY_DEFAULT : Process.THREAD_PRIORITY_BACKGROUND);
}
// Load the workspace only if it's dirty.
int workspaceSeq;
boolean workspaceDirty;
synchronized (mLock) {
workspaceSeq = mWorkspaceSeq;
workspaceDirty = mWorkspaceSeq != mLastWorkspaceSeq;
}
if (workspaceDirty) {
loadWorkspace();
}
synchronized (mLock) {
// If we're not stopped, and nobody has incremented mWorkspaceSeq.
if (mStopped) {
return;
}
if (workspaceSeq == mWorkspaceSeq) {
mLastWorkspaceSeq = mWorkspaceSeq;
}
}
// Bind the workspace
bindWorkspace();
// Wait until the either we're stopped or the other threads are done.
// This way we don't start loading all apps until the workspace has settled
// down.
synchronized (LoaderThread.this) {
mHandler.postIdle(new Runnable() {
public void run() {
synchronized (LoaderThread.this) {
mWorkspaceDoneBinding = true;
if (DEBUG_LOADERS) {
Log.d(TAG, "done with workspace");
}
LoaderThread.this.notify();
}
}
});
if (DEBUG_LOADERS) {
Log.d(TAG, "waiting to be done with workspace");
}
while (!mStopped && !mWorkspaceDoneBinding) {
try {
this.wait();
} catch (InterruptedException ex) {
// Ignore
}
}
if (DEBUG_LOADERS) {
Log.d(TAG, "done waiting to be done with workspace");
}
}
// Load all apps if they're dirty
int allAppsSeq;
boolean allAppsDirty;
synchronized (mLock) {
allAppsSeq = mAllAppsSeq;
allAppsDirty = mAllAppsSeq != mLastAllAppsSeq;
if (DEBUG_LOADERS) {
Log.d(TAG, "mAllAppsSeq=" + mAllAppsSeq
+ " mLastAllAppsSeq=" + mLastAllAppsSeq + " allAppsDirty");
}
}
if (allAppsDirty) {
loadAllApps();
}
synchronized (mLock) {
// If we're not stopped, and nobody has incremented mAllAppsSeq.
if (mStopped) {
return;
}
if (allAppsSeq == mAllAppsSeq) {
mLastAllAppsSeq = mAllAppsSeq;
}
}
// Bind all apps
if (allAppsDirty) {
bindAllApps();
}
// Clear out this reference, otherwise we end up holding it until all of the
// callback runnables are done.
mContext = null;
synchronized (mLock) {
// Setting the reference is atomic, but we can't do it inside the other critical
// sections.
mLoaderThread = null;
}
}
public void stopLocked() {
synchronized (LoaderThread.this) {
mStopped = true;
this.notify();
}
}
/**
* Gets the callbacks object. If we've been stopped, or if the launcher object
* has somehow been garbage collected, return null instead.
*/
Callbacks tryGetCallbacks() {
synchronized (mLock) {
if (mStopped) {
return null;
}
final Callbacks callbacks = mCallbacks.get();
if (callbacks == null) {
Log.w(TAG, "no mCallbacks");
return null;
}
return callbacks;
}
}
private void loadWorkspace() {
long t = SystemClock.uptimeMillis();
final Context context = mContext;
final ContentResolver contentResolver = context.getContentResolver();
final PackageManager manager = context.getPackageManager();
final AppWidgetManager widgets = AppWidgetManager.getInstance(context);
final boolean isSafeMode = manager.isSafeMode();
mItems.clear();
mAppWidgets.clear();
mFolders.clear();
final ArrayList<Long> itemsToRemove = new ArrayList<Long>();
final Cursor c = contentResolver.query(
LauncherSettings.Favorites.CONTENT_URI, null, null, null, null);
try {
final int idIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites._ID);
final int intentIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.INTENT);
final int titleIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.TITLE);
final int iconTypeIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ICON_TYPE);
final int iconIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON);
final int iconPackageIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ICON_PACKAGE);
final int iconResourceIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ICON_RESOURCE);
final int containerIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.CONTAINER);
final int itemTypeIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ITEM_TYPE);
final int appWidgetIdIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.APPWIDGET_ID);
final int screenIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.SCREEN);
final int cellXIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.CELLX);
final int cellYIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.CELLY);
final int spanXIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.SPANX);
final int spanYIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.SPANY);
final int uriIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.URI);
final int displayModeIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.DISPLAY_MODE);
ShortcutInfo info;
String intentDescription;
LauncherAppWidgetInfo appWidgetInfo;
int container;
long id;
Intent intent;
while (!mStopped && c.moveToNext()) {
try {
int itemType = c.getInt(itemTypeIndex);
switch (itemType) {
case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
intentDescription = c.getString(intentIndex);
try {
intent = Intent.parseUri(intentDescription, 0);
} catch (URISyntaxException e) {
continue;
}
if (itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
info = getShortcutInfo(manager, intent, context, c, iconIndex,
titleIndex);
} else {
info = getShortcutInfo(c, context, iconTypeIndex,
iconPackageIndex, iconResourceIndex, iconIndex,
titleIndex);
}
if (info != null) {
updateSavedIcon(context, info, c, iconIndex);
info.intent = intent;
info.id = c.getLong(idIndex);
container = c.getInt(containerIndex);
info.container = container;
info.screen = c.getInt(screenIndex);
info.cellX = c.getInt(cellXIndex);
info.cellY = c.getInt(cellYIndex);
switch (container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
mItems.add(info);
break;
default:
// Item is in a user folder
UserFolderInfo folderInfo =
findOrMakeUserFolder(mFolders, container);
folderInfo.add(info);
break;
}
} else {
// Failed to load the shortcut, probably because the
// activity manager couldn't resolve it (maybe the app
// was uninstalled), or the db row was somehow screwed up.
// Delete it.
id = c.getLong(idIndex);
Log.e(TAG, "Error loading shortcut " + id + ", removing it");
contentResolver.delete(LauncherSettings.Favorites.getContentUri(
id, false), null, null);
}
break;
case LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER:
id = c.getLong(idIndex);
UserFolderInfo folderInfo = findOrMakeUserFolder(mFolders, id);
folderInfo.title = c.getString(titleIndex);
folderInfo.id = id;
container = c.getInt(containerIndex);
folderInfo.container = container;
folderInfo.screen = c.getInt(screenIndex);
folderInfo.cellX = c.getInt(cellXIndex);
folderInfo.cellY = c.getInt(cellYIndex);
switch (container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
mItems.add(folderInfo);
break;
}
mFolders.put(folderInfo.id, folderInfo);
break;
case LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER:
id = c.getLong(idIndex);
Uri uri = Uri.parse(c.getString(uriIndex));
// Make sure the live folder exists
final ProviderInfo providerInfo =
context.getPackageManager().resolveContentProvider(
uri.getAuthority(), 0);
if (providerInfo == null && !isSafeMode) {
itemsToRemove.add(id);
} else {
LiveFolderInfo liveFolderInfo = findOrMakeLiveFolder(mFolders, id);
intentDescription = c.getString(intentIndex);
intent = null;
if (intentDescription != null) {
try {
intent = Intent.parseUri(intentDescription, 0);
} catch (URISyntaxException e) {
// Ignore, a live folder might not have a base intent
}
}
liveFolderInfo.title = c.getString(titleIndex);
liveFolderInfo.id = id;
liveFolderInfo.uri = uri;
container = c.getInt(containerIndex);
liveFolderInfo.container = container;
liveFolderInfo.screen = c.getInt(screenIndex);
liveFolderInfo.cellX = c.getInt(cellXIndex);
liveFolderInfo.cellY = c.getInt(cellYIndex);
liveFolderInfo.baseIntent = intent;
liveFolderInfo.displayMode = c.getInt(displayModeIndex);
loadLiveFolderIcon(context, c, iconTypeIndex, iconPackageIndex,
iconResourceIndex, liveFolderInfo);
switch (container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
mItems.add(liveFolderInfo);
break;
}
mFolders.put(liveFolderInfo.id, liveFolderInfo);
}
break;
case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
// Read all Launcher-specific widget details
int appWidgetId = c.getInt(appWidgetIdIndex);
id = c.getLong(idIndex);
final AppWidgetProviderInfo provider =
widgets.getAppWidgetInfo(appWidgetId);
if (!isSafeMode && (provider == null || provider.provider == null ||
provider.provider.getPackageName() == null)) {
itemsToRemove.add(id);
} else {
appWidgetInfo = new LauncherAppWidgetInfo(appWidgetId);
appWidgetInfo.id = id;
appWidgetInfo.screen = c.getInt(screenIndex);
appWidgetInfo.cellX = c.getInt(cellXIndex);
appWidgetInfo.cellY = c.getInt(cellYIndex);
appWidgetInfo.spanX = c.getInt(spanXIndex);
appWidgetInfo.spanY = c.getInt(spanYIndex);
container = c.getInt(containerIndex);
if (container != LauncherSettings.Favorites.CONTAINER_DESKTOP) {
Log.e(TAG, "Widget found where container "
+ "!= CONTAINER_DESKTOP -- ignoring!");
continue;
}
appWidgetInfo.container = c.getInt(containerIndex);
mAppWidgets.add(appWidgetInfo);
}
break;
}
} catch (Exception e) {
Log.w(TAG, "Desktop items loading interrupted:", e);
}
}
} finally {
c.close();
}
if (itemsToRemove.size() > 0) {
ContentProviderClient client = contentResolver.acquireContentProviderClient(
LauncherSettings.Favorites.CONTENT_URI);
// Remove dead items
for (long id : itemsToRemove) {
if (DEBUG_LOADERS) {
Log.d(TAG, "Removed id = " + id);
}
// Don't notify content observers
try {
client.delete(LauncherSettings.Favorites.getContentUri(id, false),
null, null);
} catch (RemoteException e) {
Log.w(TAG, "Could not remove id = " + id);
}
}
}
if (DEBUG_LOADERS) {
Log.d(TAG, "loaded workspace in " + (SystemClock.uptimeMillis()-t) + "ms");
}
}
/**
* Read everything out of our database.
*/
private void bindWorkspace() {
final long t = SystemClock.uptimeMillis();
// Don't use these two variables in any of the callback runnables.
// Otherwise we hold a reference to them.
Callbacks callbacks = mCallbacks.get();
if (callbacks == null) {
// This launcher has exited and nobody bothered to tell us. Just bail.
Log.w(TAG, "LoaderThread running with no launcher");
return;
}
int N;
// Tell the workspace that we're about to start firing items at it
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.startBinding();
}
}
});
// Add the items to the workspace.
N = mItems.size();
for (int i=0; i<N; i+=ITEMS_CHUNK) {
final int start = i;
final int chunkSize = (i+ITEMS_CHUNK <= N) ? ITEMS_CHUNK : (N-i);
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindItems(mItems, start, start+chunkSize);
}
}
});
}
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindFolders(mFolders);
}
}
});
// Wait until the queue goes empty.
mHandler.postIdle(new Runnable() {
public void run() {
if (DEBUG_LOADERS) {
Log.d(TAG, "Going to start binding widgets soon.");
}
}
});
// Bind the widgets, one at a time.
// WARNING: this is calling into the workspace from the background thread,
// but since getCurrentScreen() just returns the int, we should be okay. This
// is just a hint for the order, and if it's wrong, we'll be okay.
// TODO: instead, we should have that push the current screen into here.
final int currentScreen = callbacks.getCurrentWorkspaceScreen();
N = mAppWidgets.size();
// once for the current screen
for (int i=0; i<N; i++) {
final LauncherAppWidgetInfo widget = mAppWidgets.get(i);
if (widget.screen == currentScreen) {
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindAppWidget(widget);
}
}
});
}
}
// once for the other screens
for (int i=0; i<N; i++) {
final LauncherAppWidgetInfo widget = mAppWidgets.get(i);
if (widget.screen != currentScreen) {
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindAppWidget(widget);
}
}
});
}
}
// Tell the workspace that we're done.
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.finishBindingItems();
}
}
});
// If we're profiling, this is the last thing in the queue.
mHandler.post(new Runnable() {
public void run() {
if (DEBUG_LOADERS) {
Log.d(TAG, "bound workspace in "
+ (SystemClock.uptimeMillis()-t) + "ms");
}
if (Launcher.PROFILE_ROTATE) {
android.os.Debug.stopMethodTracing();
}
}
});
}
private void loadAllApps() {
final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
final Callbacks callbacks = tryGetCallbacks();
if (callbacks == null) {
return;
}
final PackageManager packageManager = mContext.getPackageManager();
final List<ResolveInfo> apps = packageManager.queryIntentActivities(mainIntent, 0);
synchronized (mLock) {
mBeforeFirstLoad = false;
mAllAppsList.clear();
if (apps != null) {
long t = SystemClock.uptimeMillis();
int N = apps.size();
for (int i=0; i<N && !mStopped; i++) {
// This builds the icon bitmaps.
mAllAppsList.add(new ApplicationInfo(apps.get(i), mIconCache));
}
Collections.sort(mAllAppsList.data, APP_NAME_COMPARATOR);
Collections.sort(mAllAppsList.added, APP_NAME_COMPARATOR);
if (DEBUG_LOADERS) {
Log.d(TAG, "cached app icons in "
+ (SystemClock.uptimeMillis()-t) + "ms");
}
}
}
}
private void bindAllApps() {
synchronized (mLock) {
final ArrayList<ApplicationInfo> results
= (ArrayList<ApplicationInfo>) mAllAppsList.data.clone();
// We're adding this now, so clear out this so we don't re-send them.
mAllAppsList.added = new ArrayList<ApplicationInfo>();
mHandler.post(new Runnable() {
public void run() {
final long t = SystemClock.uptimeMillis();
final int count = results.size();
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindAllApplications(results);
}
if (DEBUG_LOADERS) {
Log.d(TAG, "bound app " + count + " icons in "
+ (SystemClock.uptimeMillis() - t) + "ms");
}
}
});
}
}
public void dumpState() {
Log.d(TAG, "mLoader.mLoaderThread.mContext=" + mContext);
Log.d(TAG, "mLoader.mLoaderThread.mWaitThread=" + mWaitThread);
Log.d(TAG, "mLoader.mLoaderThread.mIsLaunching=" + mIsLaunching);
Log.d(TAG, "mLoader.mLoaderThread.mStopped=" + mStopped);
Log.d(TAG, "mLoader.mLoaderThread.mWorkspaceDoneBinding=" + mWorkspaceDoneBinding);
}
}
public void dumpState() {
Log.d(TAG, "mLoader.mLastWorkspaceSeq=" + mLoader.mLastWorkspaceSeq);
Log.d(TAG, "mLoader.mWorkspaceSeq=" + mLoader.mWorkspaceSeq);
Log.d(TAG, "mLoader.mLastAllAppsSeq=" + mLoader.mLastAllAppsSeq);
Log.d(TAG, "mLoader.mAllAppsSeq=" + mLoader.mAllAppsSeq);
Log.d(TAG, "mLoader.mItems size=" + mLoader.mItems.size());
if (mLoaderThread != null) {
mLoaderThread.dumpState();
} else {
Log.d(TAG, "mLoader.mLoaderThread=null");
}
}
}
/**
* This is called from the code that adds shortcuts from the intent receiver. This
* doesn't have a Cursor, but
*/
public ShortcutInfo getShortcutInfo(PackageManager manager, Intent intent, Context context) {
return getShortcutInfo(manager, intent, context);
}
/**
* Make an ShortcutInfo object for a shortcut that is an application.
*
* If c is not null, then it will be used to fill in missing data like the title and icon.
*/
public ShortcutInfo getShortcutInfo(PackageManager manager, Intent intent, Context context,
Cursor c, int iconIndex, int titleIndex) {
Bitmap icon = null;
final ShortcutInfo info = new ShortcutInfo();
ComponentName componentName = intent.getComponent();
if (componentName == null) {
return null;
}
// the resource -- This may implicitly give us back the fallback icon,
// but don't worry about that. All we're doing with usingFallbackIcon is
// to avoid saving lots of copies of that in the database, and most apps
// have icons anyway.
final ResolveInfo resolveInfo = manager.resolveActivity(intent, 0);
if (resolveInfo != null) {
icon = mIconCache.getIcon(componentName, resolveInfo);
}
// the db
if (icon == null) {
if (c != null) {
icon = getIconFromCursor(c, iconIndex);
}
}
// the fallback icon
if (icon == null) {
icon = getFallbackIcon();
info.usingFallbackIcon = true;
}
info.setIcon(icon);
// from the resource
if (resolveInfo != null) {
info.title = resolveInfo.activityInfo.loadLabel(manager);
}
// from the db
if (info.title == null) {
if (c != null) {
info.title = c.getString(titleIndex);
}
}
// fall back to the class name of the activity
if (info.title == null) {
info.title = componentName.getClassName();
}
info.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
return info;
}
/**
* Make an ShortcutInfo object for a shortcut that isn't an application.
*/
private ShortcutInfo getShortcutInfo(Cursor c, Context context,
int iconTypeIndex, int iconPackageIndex, int iconResourceIndex, int iconIndex,
int titleIndex) {
Bitmap icon = null;
final ShortcutInfo info = new ShortcutInfo();
info.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
info.title = c.getString(titleIndex);
int iconType = c.getInt(iconTypeIndex);
switch (iconType) {
case LauncherSettings.Favorites.ICON_TYPE_RESOURCE:
String packageName = c.getString(iconPackageIndex);
String resourceName = c.getString(iconResourceIndex);
PackageManager packageManager = context.getPackageManager();
info.customIcon = false;
// the resource
try {
Resources resources = packageManager.getResourcesForApplication(packageName);
if (resources != null) {
final int id = resources.getIdentifier(resourceName, null, null);
icon = Utilities.createIconBitmap(resources.getDrawable(id), context);
}
} catch (Exception e) {
// drop this. we have other places to look for icons
}
// the db
if (icon == null) {
icon = getIconFromCursor(c, iconIndex);
}
// the fallback icon
if (icon == null) {
icon = getFallbackIcon();
info.usingFallbackIcon = true;
}
break;
case LauncherSettings.Favorites.ICON_TYPE_BITMAP:
icon = getIconFromCursor(c, iconIndex);
if (icon == null) {
icon = getFallbackIcon();
info.customIcon = false;
info.usingFallbackIcon = true;
} else {
info.customIcon = true;
}
info.setIcon(icon);
break;
default:
info.setIcon(getFallbackIcon());
info.usingFallbackIcon = true;
info.customIcon = false;
break;
}
return info;
}
Bitmap getIconFromCursor(Cursor c, int iconIndex) {
if (false) {
Log.d(TAG, "getIconFromCursor app="
+ c.getString(c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE)));
}
byte[] data = c.getBlob(iconIndex);
try {
return BitmapFactory.decodeByteArray(data, 0, data.length);
} catch (Exception e) {
return null;
}
}
ShortcutInfo addShortcut(Context context, Intent data,
CellLayout.CellInfo cellInfo, boolean notify) {
final ShortcutInfo info = infoFromShortcutIntent(context, data);
addItemToDatabase(context, info, LauncherSettings.Favorites.CONTAINER_DESKTOP,
cellInfo.screen, cellInfo.cellX, cellInfo.cellY, notify);
return info;
}
private ShortcutInfo infoFromShortcutIntent(Context context, Intent data) {
Intent intent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);
String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
Parcelable bitmap = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);
Bitmap icon = null;
boolean filtered = false;
boolean customIcon = false;
ShortcutIconResource iconResource = null;
if (bitmap != null && bitmap instanceof Bitmap) {
icon = Utilities.createIconBitmap(new FastBitmapDrawable((Bitmap)bitmap), context);
filtered = true;
customIcon = true;
} else {
Parcelable extra = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
if (extra != null && extra instanceof ShortcutIconResource) {
try {
iconResource = (ShortcutIconResource) extra;
final PackageManager packageManager = context.getPackageManager();
Resources resources = packageManager.getResourcesForApplication(
iconResource.packageName);
final int id = resources.getIdentifier(iconResource.resourceName, null, null);
icon = Utilities.createIconBitmap(resources.getDrawable(id), context);
} catch (Exception e) {
Log.w(TAG, "Could not load shortcut icon: " + extra);
}
}
}
final ShortcutInfo info = new ShortcutInfo();
if (icon == null) {
icon = getFallbackIcon();
info.usingFallbackIcon = true;
}
info.setIcon(icon);
info.title = name;
info.intent = intent;
info.customIcon = customIcon;
info.iconResource = iconResource;
return info;
}
private static void loadLiveFolderIcon(Context context, Cursor c, int iconTypeIndex,
int iconPackageIndex, int iconResourceIndex, LiveFolderInfo liveFolderInfo) {
int iconType = c.getInt(iconTypeIndex);
switch (iconType) {
case LauncherSettings.Favorites.ICON_TYPE_RESOURCE:
String packageName = c.getString(iconPackageIndex);
String resourceName = c.getString(iconResourceIndex);
PackageManager packageManager = context.getPackageManager();
try {
Resources resources = packageManager.getResourcesForApplication(packageName);
final int id = resources.getIdentifier(resourceName, null, null);
liveFolderInfo.icon = Utilities.createIconBitmap(resources.getDrawable(id),
context);
} catch (Exception e) {
liveFolderInfo.icon = Utilities.createIconBitmap(
context.getResources().getDrawable(R.drawable.ic_launcher_folder),
context);
}
liveFolderInfo.iconResource = new Intent.ShortcutIconResource();
liveFolderInfo.iconResource.packageName = packageName;
liveFolderInfo.iconResource.resourceName = resourceName;
break;
default:
liveFolderInfo.icon = Utilities.createIconBitmap(
context.getResources().getDrawable(R.drawable.ic_launcher_folder),
context);
}
}
void updateSavedIcon(Context context, ShortcutInfo info, Cursor c, int iconIndex) {
// If this icon doesn't have a custom icon, check to see
// what's stored in the DB, and if it doesn't match what
// we're going to show, store what we are going to show back
// into the DB. We do this so when we're loading, if the
// package manager can't find an icon (for example because
// the app is on SD) then we can use that instead.
if (info.onExternalStorage && !info.customIcon && !info.usingFallbackIcon) {
boolean needSave;
byte[] data = c.getBlob(iconIndex);
try {
if (data != null) {
Bitmap saved = BitmapFactory.decodeByteArray(data, 0, data.length);
Bitmap loaded = info.getIcon(mIconCache);
needSave = !saved.sameAs(loaded);
} else {
needSave = true;
}
} catch (Exception e) {
needSave = true;
}
if (needSave) {
Log.d(TAG, "going to save icon bitmap for info=" + info);
// This is slower than is ideal, but this only happens either
// after the froyo OTA or when the app is updated with a new
// icon.
updateItemInDatabase(context, info);
}
}
}
/**
* Return an existing UserFolderInfo object if we have encountered this ID previously,
* or make a new one.
*/
private static UserFolderInfo findOrMakeUserFolder(HashMap<Long, FolderInfo> folders, long id) {
// See if a placeholder was created for us already
FolderInfo folderInfo = folders.get(id);
if (folderInfo == null || !(folderInfo instanceof UserFolderInfo)) {
// No placeholder -- create a new instance
folderInfo = new UserFolderInfo();
folders.put(id, folderInfo);
}
return (UserFolderInfo) folderInfo;
}
/**
* Return an existing UserFolderInfo object if we have encountered this ID previously, or make a
* new one.
*/
private static LiveFolderInfo findOrMakeLiveFolder(HashMap<Long, FolderInfo> folders, long id) {
// See if a placeholder was created for us already
FolderInfo folderInfo = folders.get(id);
if (folderInfo == null || !(folderInfo instanceof LiveFolderInfo)) {
// No placeholder -- create a new instance
folderInfo = new LiveFolderInfo();
folders.put(id, folderInfo);
}
return (LiveFolderInfo) folderInfo;
}
private static String getLabel(PackageManager manager, ActivityInfo activityInfo) {
String label = activityInfo.loadLabel(manager).toString();
if (label == null) {
label = manager.getApplicationLabel(activityInfo.applicationInfo).toString();
if (label == null) {
label = activityInfo.name;
}
}
return label;
}
private static final Collator sCollator = Collator.getInstance();
public static final Comparator<ApplicationInfo> APP_NAME_COMPARATOR
= new Comparator<ApplicationInfo>() {
public final int compare(ApplicationInfo a, ApplicationInfo b) {
return sCollator.compare(a.title.toString(), b.title.toString());
}
};
public void dumpState() {
Log.d(TAG, "mBeforeFirstLoad=" + mBeforeFirstLoad);
Log.d(TAG, "mCallbacks=" + mCallbacks);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.data", mAllAppsList.data);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.added", mAllAppsList.added);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.removed", mAllAppsList.removed);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.modified", mAllAppsList.modified);
mLoader.dumpState();
}
}
| static boolean shortcutExists(Context context, String title, Intent intent) {
final ContentResolver cr = context.getContentResolver();
Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI,
new String[] { "title", "intent" }, "title=? and intent=?",
new String[] { title, intent.toUri(0) }, null);
boolean result = false;
try {
result = c.moveToFirst();
} finally {
c.close();
}
return result;
}
/**
* Find a folder in the db, creating the FolderInfo if necessary, and adding it to folderList.
*/
FolderInfo getFolderById(Context context, HashMap<Long,FolderInfo> folderList, long id) {
final ContentResolver cr = context.getContentResolver();
Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI, null,
"_id=? and (itemType=? or itemType=?)",
new String[] { String.valueOf(id),
String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER),
String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER) }, null);
try {
if (c.moveToFirst()) {
final int itemTypeIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ITEM_TYPE);
final int titleIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE);
final int containerIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CONTAINER);
final int screenIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.SCREEN);
final int cellXIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLX);
final int cellYIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLY);
FolderInfo folderInfo = null;
switch (c.getInt(itemTypeIndex)) {
case LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER:
folderInfo = findOrMakeUserFolder(folderList, id);
break;
case LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER:
folderInfo = findOrMakeLiveFolder(folderList, id);
break;
}
folderInfo.title = c.getString(titleIndex);
folderInfo.id = id;
folderInfo.container = c.getInt(containerIndex);
folderInfo.screen = c.getInt(screenIndex);
folderInfo.cellX = c.getInt(cellXIndex);
folderInfo.cellY = c.getInt(cellYIndex);
return folderInfo;
}
} finally {
c.close();
}
return null;
}
/**
* Add an item to the database in a specified container. Sets the container, screen, cellX and
* cellY fields of the item. Also assigns an ID to the item.
*/
static void addItemToDatabase(Context context, ItemInfo item, long container,
int screen, int cellX, int cellY, boolean notify) {
item.container = container;
item.screen = screen;
item.cellX = cellX;
item.cellY = cellY;
final ContentValues values = new ContentValues();
final ContentResolver cr = context.getContentResolver();
item.onAddToDatabase(values);
Uri result = cr.insert(notify ? LauncherSettings.Favorites.CONTENT_URI :
LauncherSettings.Favorites.CONTENT_URI_NO_NOTIFICATION, values);
if (result != null) {
item.id = Integer.parseInt(result.getPathSegments().get(1));
}
}
/**
* Update an item to the database in a specified container.
*/
static void updateItemInDatabase(Context context, ItemInfo item) {
final ContentValues values = new ContentValues();
final ContentResolver cr = context.getContentResolver();
item.onAddToDatabase(values);
cr.update(LauncherSettings.Favorites.getContentUri(item.id, false), values, null, null);
}
/**
* Removes the specified item from the database
* @param context
* @param item
*/
static void deleteItemFromDatabase(Context context, ItemInfo item) {
final ContentResolver cr = context.getContentResolver();
cr.delete(LauncherSettings.Favorites.getContentUri(item.id, false), null, null);
}
/**
* Remove the contents of the specified folder from the database
*/
static void deleteUserFolderContentsFromDatabase(Context context, UserFolderInfo info) {
final ContentResolver cr = context.getContentResolver();
cr.delete(LauncherSettings.Favorites.getContentUri(info.id, false), null, null);
cr.delete(LauncherSettings.Favorites.CONTENT_URI,
LauncherSettings.Favorites.CONTAINER + "=" + info.id, null);
}
/**
* Set this as the current Launcher activity object for the loader.
*/
public void initialize(Callbacks callbacks) {
synchronized (mLock) {
mCallbacks = new WeakReference<Callbacks>(callbacks);
}
}
public void startLoader(Context context, boolean isLaunching) {
mLoader.startLoader(context, isLaunching);
}
public void stopLoader() {
mLoader.stopLoader();
}
/**
* We pick up most of the changes to all apps.
*/
public void setAllAppsDirty() {
mLoader.setAllAppsDirty();
}
public void setWorkspaceDirty() {
mLoader.setWorkspaceDirty();
}
/**
* Call from the handler for ACTION_PACKAGE_ADDED, ACTION_PACKAGE_REMOVED and
* ACTION_PACKAGE_CHANGED.
*/
public void onReceive(Context context, Intent intent) {
// Use the app as the context.
context = mApp;
ArrayList<ApplicationInfo> added = null;
ArrayList<ApplicationInfo> removed = null;
ArrayList<ApplicationInfo> modified = null;
synchronized (mLock) {
if (mBeforeFirstLoad) {
// If we haven't even loaded yet, don't bother, since we'll just pick
// up the changes.
return;
}
final String action = intent.getAction();
if (Intent.ACTION_PACKAGE_CHANGED.equals(action)
|| Intent.ACTION_PACKAGE_REMOVED.equals(action)
|| Intent.ACTION_PACKAGE_ADDED.equals(action)) {
final String packageName = intent.getData().getSchemeSpecificPart();
final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
if (packageName == null || packageName.length() == 0) {
// they sent us a bad intent
return;
}
if (Intent.ACTION_PACKAGE_CHANGED.equals(action)) {
mAllAppsList.updatePackage(context, packageName);
} else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
if (!replacing) {
mAllAppsList.removePackage(packageName);
}
// else, we are replacing the package, so a PACKAGE_ADDED will be sent
// later, we will update the package at this time
} else if (Intent.ACTION_PACKAGE_ADDED.equals(action)) {
if (!replacing) {
mAllAppsList.addPackage(context, packageName);
} else {
mAllAppsList.updatePackage(context, packageName);
}
}
if (mAllAppsList.added.size() > 0) {
added = mAllAppsList.added;
mAllAppsList.added = new ArrayList<ApplicationInfo>();
}
if (mAllAppsList.removed.size() > 0) {
removed = mAllAppsList.removed;
mAllAppsList.removed = new ArrayList<ApplicationInfo>();
for (ApplicationInfo info: removed) {
mIconCache.remove(info.intent.getComponent());
}
}
if (mAllAppsList.modified.size() > 0) {
modified = mAllAppsList.modified;
mAllAppsList.modified = new ArrayList<ApplicationInfo>();
}
final Callbacks callbacks = mCallbacks != null ? mCallbacks.get() : null;
if (callbacks == null) {
Log.w(TAG, "Nobody to tell about the new app. Launcher is probably loading.");
return;
}
if (added != null) {
final ArrayList<ApplicationInfo> addedFinal = added;
mHandler.post(new Runnable() {
public void run() {
callbacks.bindAppsAdded(addedFinal);
}
});
}
if (modified != null) {
final ArrayList<ApplicationInfo> modifiedFinal = modified;
mHandler.post(new Runnable() {
public void run() {
callbacks.bindAppsUpdated(modifiedFinal);
}
});
}
if (removed != null) {
final ArrayList<ApplicationInfo> removedFinal = removed;
mHandler.post(new Runnable() {
public void run() {
callbacks.bindAppsRemoved(removedFinal);
}
});
}
} else {
if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(action)) {
String packages[] = intent.getStringArrayExtra(
Intent.EXTRA_CHANGED_PACKAGE_LIST);
if (packages == null || packages.length == 0) {
return;
}
setAllAppsDirty();
setWorkspaceDirty();
startLoader(context, false);
} else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) {
String packages[] = intent.getStringArrayExtra(
Intent.EXTRA_CHANGED_PACKAGE_LIST);
if (packages == null || packages.length == 0) {
return;
}
setAllAppsDirty();
setWorkspaceDirty();
startLoader(context, false);
}
}
}
}
public class Loader {
private static final int ITEMS_CHUNK = 6;
private LoaderThread mLoaderThread;
private int mLastWorkspaceSeq = 0;
private int mWorkspaceSeq = 1;
private int mLastAllAppsSeq = 0;
private int mAllAppsSeq = 1;
final ArrayList<ItemInfo> mItems = new ArrayList<ItemInfo>();
final ArrayList<LauncherAppWidgetInfo> mAppWidgets = new ArrayList<LauncherAppWidgetInfo>();
final HashMap<Long, FolderInfo> mFolders = new HashMap<Long, FolderInfo>();
/**
* Call this from the ui thread so the handler is initialized on the correct thread.
*/
public Loader() {
}
public void startLoader(Context context, boolean isLaunching) {
synchronized (mLock) {
if (DEBUG_LOADERS) {
Log.d(TAG, "startLoader isLaunching=" + isLaunching);
}
// Don't bother to start the thread if we know it's not going to do anything
if (mCallbacks.get() != null) {
LoaderThread oldThread = mLoaderThread;
if (oldThread != null) {
if (oldThread.isLaunching()) {
// don't downgrade isLaunching if we're already running
isLaunching = true;
}
oldThread.stopLocked();
}
mLoaderThread = new LoaderThread(context, oldThread, isLaunching);
mLoaderThread.start();
}
}
}
public void stopLoader() {
synchronized (mLock) {
if (mLoaderThread != null) {
mLoaderThread.stopLocked();
}
}
}
public void setWorkspaceDirty() {
synchronized (mLock) {
mWorkspaceSeq++;
}
}
public void setAllAppsDirty() {
synchronized (mLock) {
mAllAppsSeq++;
}
}
/**
* Runnable for the thread that loads the contents of the launcher:
* - workspace icons
* - widgets
* - all apps icons
*/
private class LoaderThread extends Thread {
private Context mContext;
private Thread mWaitThread;
private boolean mIsLaunching;
private boolean mStopped;
private boolean mWorkspaceDoneBinding;
LoaderThread(Context context, Thread waitThread, boolean isLaunching) {
mContext = context;
mWaitThread = waitThread;
mIsLaunching = isLaunching;
}
boolean isLaunching() {
return mIsLaunching;
}
/**
* If another LoaderThread was supplied, we need to wait for that to finish before
* we start our processing. This keeps the ordering of the setting and clearing
* of the dirty flags correct by making sure we don't start processing stuff until
* they've had a chance to re-set them. We do this waiting the worker thread, not
* the ui thread to avoid ANRs.
*/
private void waitForOtherThread() {
if (mWaitThread != null) {
boolean done = false;
while (!done) {
try {
mWaitThread.join();
done = true;
} catch (InterruptedException ex) {
// Ignore
}
}
mWaitThread = null;
}
}
public void run() {
waitForOtherThread();
// Elevate priority when Home launches for the first time to avoid
// starving at boot time. Staring at a blank home is not cool.
synchronized (mLock) {
android.os.Process.setThreadPriority(mIsLaunching
? Process.THREAD_PRIORITY_DEFAULT : Process.THREAD_PRIORITY_BACKGROUND);
}
// Load the workspace only if it's dirty.
int workspaceSeq;
boolean workspaceDirty;
synchronized (mLock) {
workspaceSeq = mWorkspaceSeq;
workspaceDirty = mWorkspaceSeq != mLastWorkspaceSeq;
}
if (workspaceDirty) {
loadWorkspace();
}
synchronized (mLock) {
// If we're not stopped, and nobody has incremented mWorkspaceSeq.
if (mStopped) {
return;
}
if (workspaceSeq == mWorkspaceSeq) {
mLastWorkspaceSeq = mWorkspaceSeq;
}
}
// Bind the workspace
bindWorkspace();
// Wait until the either we're stopped or the other threads are done.
// This way we don't start loading all apps until the workspace has settled
// down.
synchronized (LoaderThread.this) {
mHandler.postIdle(new Runnable() {
public void run() {
synchronized (LoaderThread.this) {
mWorkspaceDoneBinding = true;
if (DEBUG_LOADERS) {
Log.d(TAG, "done with workspace");
}
LoaderThread.this.notify();
}
}
});
if (DEBUG_LOADERS) {
Log.d(TAG, "waiting to be done with workspace");
}
while (!mStopped && !mWorkspaceDoneBinding) {
try {
this.wait();
} catch (InterruptedException ex) {
// Ignore
}
}
if (DEBUG_LOADERS) {
Log.d(TAG, "done waiting to be done with workspace");
}
}
// Load all apps if they're dirty
int allAppsSeq;
boolean allAppsDirty;
synchronized (mLock) {
allAppsSeq = mAllAppsSeq;
allAppsDirty = mAllAppsSeq != mLastAllAppsSeq;
if (DEBUG_LOADERS) {
Log.d(TAG, "mAllAppsSeq=" + mAllAppsSeq
+ " mLastAllAppsSeq=" + mLastAllAppsSeq + " allAppsDirty");
}
}
if (allAppsDirty) {
loadAllApps();
}
synchronized (mLock) {
// If we're not stopped, and nobody has incremented mAllAppsSeq.
if (mStopped) {
return;
}
if (allAppsSeq == mAllAppsSeq) {
mLastAllAppsSeq = mAllAppsSeq;
}
}
// Bind all apps
if (allAppsDirty) {
bindAllApps();
}
// Clear out this reference, otherwise we end up holding it until all of the
// callback runnables are done.
mContext = null;
synchronized (mLock) {
// Setting the reference is atomic, but we can't do it inside the other critical
// sections.
mLoaderThread = null;
}
}
public void stopLocked() {
synchronized (LoaderThread.this) {
mStopped = true;
this.notify();
}
}
/**
* Gets the callbacks object. If we've been stopped, or if the launcher object
* has somehow been garbage collected, return null instead.
*/
Callbacks tryGetCallbacks() {
synchronized (mLock) {
if (mStopped) {
return null;
}
final Callbacks callbacks = mCallbacks.get();
if (callbacks == null) {
Log.w(TAG, "no mCallbacks");
return null;
}
return callbacks;
}
}
private void loadWorkspace() {
long t = SystemClock.uptimeMillis();
final Context context = mContext;
final ContentResolver contentResolver = context.getContentResolver();
final PackageManager manager = context.getPackageManager();
final AppWidgetManager widgets = AppWidgetManager.getInstance(context);
final boolean isSafeMode = manager.isSafeMode();
mItems.clear();
mAppWidgets.clear();
mFolders.clear();
final ArrayList<Long> itemsToRemove = new ArrayList<Long>();
final Cursor c = contentResolver.query(
LauncherSettings.Favorites.CONTENT_URI, null, null, null, null);
try {
final int idIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites._ID);
final int intentIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.INTENT);
final int titleIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.TITLE);
final int iconTypeIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ICON_TYPE);
final int iconIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON);
final int iconPackageIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ICON_PACKAGE);
final int iconResourceIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ICON_RESOURCE);
final int containerIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.CONTAINER);
final int itemTypeIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.ITEM_TYPE);
final int appWidgetIdIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.APPWIDGET_ID);
final int screenIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.SCREEN);
final int cellXIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.CELLX);
final int cellYIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.CELLY);
final int spanXIndex = c.getColumnIndexOrThrow
(LauncherSettings.Favorites.SPANX);
final int spanYIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.SPANY);
final int uriIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.URI);
final int displayModeIndex = c.getColumnIndexOrThrow(
LauncherSettings.Favorites.DISPLAY_MODE);
ShortcutInfo info;
String intentDescription;
LauncherAppWidgetInfo appWidgetInfo;
int container;
long id;
Intent intent;
while (!mStopped && c.moveToNext()) {
try {
int itemType = c.getInt(itemTypeIndex);
switch (itemType) {
case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
intentDescription = c.getString(intentIndex);
try {
intent = Intent.parseUri(intentDescription, 0);
} catch (URISyntaxException e) {
continue;
}
if (itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
info = getShortcutInfo(manager, intent, context, c, iconIndex,
titleIndex);
} else {
info = getShortcutInfo(c, context, iconTypeIndex,
iconPackageIndex, iconResourceIndex, iconIndex,
titleIndex);
}
if (info != null) {
updateSavedIcon(context, info, c, iconIndex);
info.intent = intent;
info.id = c.getLong(idIndex);
container = c.getInt(containerIndex);
info.container = container;
info.screen = c.getInt(screenIndex);
info.cellX = c.getInt(cellXIndex);
info.cellY = c.getInt(cellYIndex);
switch (container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
mItems.add(info);
break;
default:
// Item is in a user folder
UserFolderInfo folderInfo =
findOrMakeUserFolder(mFolders, container);
folderInfo.add(info);
break;
}
} else {
// Failed to load the shortcut, probably because the
// activity manager couldn't resolve it (maybe the app
// was uninstalled), or the db row was somehow screwed up.
// Delete it.
id = c.getLong(idIndex);
Log.e(TAG, "Error loading shortcut " + id + ", removing it");
contentResolver.delete(LauncherSettings.Favorites.getContentUri(
id, false), null, null);
}
break;
case LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER:
id = c.getLong(idIndex);
UserFolderInfo folderInfo = findOrMakeUserFolder(mFolders, id);
folderInfo.title = c.getString(titleIndex);
folderInfo.id = id;
container = c.getInt(containerIndex);
folderInfo.container = container;
folderInfo.screen = c.getInt(screenIndex);
folderInfo.cellX = c.getInt(cellXIndex);
folderInfo.cellY = c.getInt(cellYIndex);
switch (container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
mItems.add(folderInfo);
break;
}
mFolders.put(folderInfo.id, folderInfo);
break;
case LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER:
id = c.getLong(idIndex);
Uri uri = Uri.parse(c.getString(uriIndex));
// Make sure the live folder exists
final ProviderInfo providerInfo =
context.getPackageManager().resolveContentProvider(
uri.getAuthority(), 0);
if (providerInfo == null && !isSafeMode) {
itemsToRemove.add(id);
} else {
LiveFolderInfo liveFolderInfo = findOrMakeLiveFolder(mFolders, id);
intentDescription = c.getString(intentIndex);
intent = null;
if (intentDescription != null) {
try {
intent = Intent.parseUri(intentDescription, 0);
} catch (URISyntaxException e) {
// Ignore, a live folder might not have a base intent
}
}
liveFolderInfo.title = c.getString(titleIndex);
liveFolderInfo.id = id;
liveFolderInfo.uri = uri;
container = c.getInt(containerIndex);
liveFolderInfo.container = container;
liveFolderInfo.screen = c.getInt(screenIndex);
liveFolderInfo.cellX = c.getInt(cellXIndex);
liveFolderInfo.cellY = c.getInt(cellYIndex);
liveFolderInfo.baseIntent = intent;
liveFolderInfo.displayMode = c.getInt(displayModeIndex);
loadLiveFolderIcon(context, c, iconTypeIndex, iconPackageIndex,
iconResourceIndex, liveFolderInfo);
switch (container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
mItems.add(liveFolderInfo);
break;
}
mFolders.put(liveFolderInfo.id, liveFolderInfo);
}
break;
case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
// Read all Launcher-specific widget details
int appWidgetId = c.getInt(appWidgetIdIndex);
id = c.getLong(idIndex);
final AppWidgetProviderInfo provider =
widgets.getAppWidgetInfo(appWidgetId);
if (!isSafeMode && (provider == null || provider.provider == null ||
provider.provider.getPackageName() == null)) {
itemsToRemove.add(id);
} else {
appWidgetInfo = new LauncherAppWidgetInfo(appWidgetId);
appWidgetInfo.id = id;
appWidgetInfo.screen = c.getInt(screenIndex);
appWidgetInfo.cellX = c.getInt(cellXIndex);
appWidgetInfo.cellY = c.getInt(cellYIndex);
appWidgetInfo.spanX = c.getInt(spanXIndex);
appWidgetInfo.spanY = c.getInt(spanYIndex);
container = c.getInt(containerIndex);
if (container != LauncherSettings.Favorites.CONTAINER_DESKTOP) {
Log.e(TAG, "Widget found where container "
+ "!= CONTAINER_DESKTOP -- ignoring!");
continue;
}
appWidgetInfo.container = c.getInt(containerIndex);
mAppWidgets.add(appWidgetInfo);
}
break;
}
} catch (Exception e) {
Log.w(TAG, "Desktop items loading interrupted:", e);
}
}
} finally {
c.close();
}
if (itemsToRemove.size() > 0) {
ContentProviderClient client = contentResolver.acquireContentProviderClient(
LauncherSettings.Favorites.CONTENT_URI);
// Remove dead items
for (long id : itemsToRemove) {
if (DEBUG_LOADERS) {
Log.d(TAG, "Removed id = " + id);
}
// Don't notify content observers
try {
client.delete(LauncherSettings.Favorites.getContentUri(id, false),
null, null);
} catch (RemoteException e) {
Log.w(TAG, "Could not remove id = " + id);
}
}
}
if (DEBUG_LOADERS) {
Log.d(TAG, "loaded workspace in " + (SystemClock.uptimeMillis()-t) + "ms");
}
}
/**
* Read everything out of our database.
*/
private void bindWorkspace() {
final long t = SystemClock.uptimeMillis();
// Don't use these two variables in any of the callback runnables.
// Otherwise we hold a reference to them.
Callbacks callbacks = mCallbacks.get();
if (callbacks == null) {
// This launcher has exited and nobody bothered to tell us. Just bail.
Log.w(TAG, "LoaderThread running with no launcher");
return;
}
int N;
// Tell the workspace that we're about to start firing items at it
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.startBinding();
}
}
});
// Add the items to the workspace.
N = mItems.size();
for (int i=0; i<N; i+=ITEMS_CHUNK) {
final int start = i;
final int chunkSize = (i+ITEMS_CHUNK <= N) ? ITEMS_CHUNK : (N-i);
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindItems(mItems, start, start+chunkSize);
}
}
});
}
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindFolders(mFolders);
}
}
});
// Wait until the queue goes empty.
mHandler.postIdle(new Runnable() {
public void run() {
if (DEBUG_LOADERS) {
Log.d(TAG, "Going to start binding widgets soon.");
}
}
});
// Bind the widgets, one at a time.
// WARNING: this is calling into the workspace from the background thread,
// but since getCurrentScreen() just returns the int, we should be okay. This
// is just a hint for the order, and if it's wrong, we'll be okay.
// TODO: instead, we should have that push the current screen into here.
final int currentScreen = callbacks.getCurrentWorkspaceScreen();
N = mAppWidgets.size();
// once for the current screen
for (int i=0; i<N; i++) {
final LauncherAppWidgetInfo widget = mAppWidgets.get(i);
if (widget.screen == currentScreen) {
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindAppWidget(widget);
}
}
});
}
}
// once for the other screens
for (int i=0; i<N; i++) {
final LauncherAppWidgetInfo widget = mAppWidgets.get(i);
if (widget.screen != currentScreen) {
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindAppWidget(widget);
}
}
});
}
}
// Tell the workspace that we're done.
mHandler.post(new Runnable() {
public void run() {
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.finishBindingItems();
}
}
});
// If we're profiling, this is the last thing in the queue.
mHandler.post(new Runnable() {
public void run() {
if (DEBUG_LOADERS) {
Log.d(TAG, "bound workspace in "
+ (SystemClock.uptimeMillis()-t) + "ms");
}
if (Launcher.PROFILE_ROTATE) {
android.os.Debug.stopMethodTracing();
}
}
});
}
private void loadAllApps() {
final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
final Callbacks callbacks = tryGetCallbacks();
if (callbacks == null) {
return;
}
final PackageManager packageManager = mContext.getPackageManager();
final List<ResolveInfo> apps = packageManager.queryIntentActivities(mainIntent, 0);
synchronized (mLock) {
mBeforeFirstLoad = false;
mAllAppsList.clear();
if (apps != null) {
long t = SystemClock.uptimeMillis();
int N = apps.size();
for (int i=0; i<N && !mStopped; i++) {
// This builds the icon bitmaps.
mAllAppsList.add(new ApplicationInfo(apps.get(i), mIconCache));
}
Collections.sort(mAllAppsList.data, APP_NAME_COMPARATOR);
Collections.sort(mAllAppsList.added, APP_NAME_COMPARATOR);
if (DEBUG_LOADERS) {
Log.d(TAG, "cached app icons in "
+ (SystemClock.uptimeMillis()-t) + "ms");
}
}
}
}
private void bindAllApps() {
synchronized (mLock) {
final ArrayList<ApplicationInfo> results
= (ArrayList<ApplicationInfo>) mAllAppsList.data.clone();
// We're adding this now, so clear out this so we don't re-send them.
mAllAppsList.added = new ArrayList<ApplicationInfo>();
mHandler.post(new Runnable() {
public void run() {
final long t = SystemClock.uptimeMillis();
final int count = results.size();
Callbacks callbacks = tryGetCallbacks();
if (callbacks != null) {
callbacks.bindAllApplications(results);
}
if (DEBUG_LOADERS) {
Log.d(TAG, "bound app " + count + " icons in "
+ (SystemClock.uptimeMillis() - t) + "ms");
}
}
});
}
}
public void dumpState() {
Log.d(TAG, "mLoader.mLoaderThread.mContext=" + mContext);
Log.d(TAG, "mLoader.mLoaderThread.mWaitThread=" + mWaitThread);
Log.d(TAG, "mLoader.mLoaderThread.mIsLaunching=" + mIsLaunching);
Log.d(TAG, "mLoader.mLoaderThread.mStopped=" + mStopped);
Log.d(TAG, "mLoader.mLoaderThread.mWorkspaceDoneBinding=" + mWorkspaceDoneBinding);
}
}
public void dumpState() {
Log.d(TAG, "mLoader.mLastWorkspaceSeq=" + mLoader.mLastWorkspaceSeq);
Log.d(TAG, "mLoader.mWorkspaceSeq=" + mLoader.mWorkspaceSeq);
Log.d(TAG, "mLoader.mLastAllAppsSeq=" + mLoader.mLastAllAppsSeq);
Log.d(TAG, "mLoader.mAllAppsSeq=" + mLoader.mAllAppsSeq);
Log.d(TAG, "mLoader.mItems size=" + mLoader.mItems.size());
if (mLoaderThread != null) {
mLoaderThread.dumpState();
} else {
Log.d(TAG, "mLoader.mLoaderThread=null");
}
}
}
/**
* This is called from the code that adds shortcuts from the intent receiver. This
* doesn't have a Cursor, but
*/
public ShortcutInfo getShortcutInfo(PackageManager manager, Intent intent, Context context) {
return getShortcutInfo(manager, intent, context, null, -1, -1);
}
/**
* Make an ShortcutInfo object for a shortcut that is an application.
*
* If c is not null, then it will be used to fill in missing data like the title and icon.
*/
public ShortcutInfo getShortcutInfo(PackageManager manager, Intent intent, Context context,
Cursor c, int iconIndex, int titleIndex) {
Bitmap icon = null;
final ShortcutInfo info = new ShortcutInfo();
ComponentName componentName = intent.getComponent();
if (componentName == null) {
return null;
}
// the resource -- This may implicitly give us back the fallback icon,
// but don't worry about that. All we're doing with usingFallbackIcon is
// to avoid saving lots of copies of that in the database, and most apps
// have icons anyway.
final ResolveInfo resolveInfo = manager.resolveActivity(intent, 0);
if (resolveInfo != null) {
icon = mIconCache.getIcon(componentName, resolveInfo);
}
// the db
if (icon == null) {
if (c != null) {
icon = getIconFromCursor(c, iconIndex);
}
}
// the fallback icon
if (icon == null) {
icon = getFallbackIcon();
info.usingFallbackIcon = true;
}
info.setIcon(icon);
// from the resource
if (resolveInfo != null) {
info.title = resolveInfo.activityInfo.loadLabel(manager);
}
// from the db
if (info.title == null) {
if (c != null) {
info.title = c.getString(titleIndex);
}
}
// fall back to the class name of the activity
if (info.title == null) {
info.title = componentName.getClassName();
}
info.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
return info;
}
/**
* Make an ShortcutInfo object for a shortcut that isn't an application.
*/
private ShortcutInfo getShortcutInfo(Cursor c, Context context,
int iconTypeIndex, int iconPackageIndex, int iconResourceIndex, int iconIndex,
int titleIndex) {
Bitmap icon = null;
final ShortcutInfo info = new ShortcutInfo();
info.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
info.title = c.getString(titleIndex);
int iconType = c.getInt(iconTypeIndex);
switch (iconType) {
case LauncherSettings.Favorites.ICON_TYPE_RESOURCE:
String packageName = c.getString(iconPackageIndex);
String resourceName = c.getString(iconResourceIndex);
PackageManager packageManager = context.getPackageManager();
info.customIcon = false;
// the resource
try {
Resources resources = packageManager.getResourcesForApplication(packageName);
if (resources != null) {
final int id = resources.getIdentifier(resourceName, null, null);
icon = Utilities.createIconBitmap(resources.getDrawable(id), context);
}
} catch (Exception e) {
// drop this. we have other places to look for icons
}
// the db
if (icon == null) {
icon = getIconFromCursor(c, iconIndex);
}
// the fallback icon
if (icon == null) {
icon = getFallbackIcon();
info.usingFallbackIcon = true;
}
break;
case LauncherSettings.Favorites.ICON_TYPE_BITMAP:
icon = getIconFromCursor(c, iconIndex);
if (icon == null) {
icon = getFallbackIcon();
info.customIcon = false;
info.usingFallbackIcon = true;
} else {
info.customIcon = true;
}
info.setIcon(icon);
break;
default:
info.setIcon(getFallbackIcon());
info.usingFallbackIcon = true;
info.customIcon = false;
break;
}
return info;
}
Bitmap getIconFromCursor(Cursor c, int iconIndex) {
if (false) {
Log.d(TAG, "getIconFromCursor app="
+ c.getString(c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE)));
}
byte[] data = c.getBlob(iconIndex);
try {
return BitmapFactory.decodeByteArray(data, 0, data.length);
} catch (Exception e) {
return null;
}
}
ShortcutInfo addShortcut(Context context, Intent data,
CellLayout.CellInfo cellInfo, boolean notify) {
final ShortcutInfo info = infoFromShortcutIntent(context, data);
addItemToDatabase(context, info, LauncherSettings.Favorites.CONTAINER_DESKTOP,
cellInfo.screen, cellInfo.cellX, cellInfo.cellY, notify);
return info;
}
private ShortcutInfo infoFromShortcutIntent(Context context, Intent data) {
Intent intent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);
String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
Parcelable bitmap = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);
Bitmap icon = null;
boolean filtered = false;
boolean customIcon = false;
ShortcutIconResource iconResource = null;
if (bitmap != null && bitmap instanceof Bitmap) {
icon = Utilities.createIconBitmap(new FastBitmapDrawable((Bitmap)bitmap), context);
filtered = true;
customIcon = true;
} else {
Parcelable extra = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
if (extra != null && extra instanceof ShortcutIconResource) {
try {
iconResource = (ShortcutIconResource) extra;
final PackageManager packageManager = context.getPackageManager();
Resources resources = packageManager.getResourcesForApplication(
iconResource.packageName);
final int id = resources.getIdentifier(iconResource.resourceName, null, null);
icon = Utilities.createIconBitmap(resources.getDrawable(id), context);
} catch (Exception e) {
Log.w(TAG, "Could not load shortcut icon: " + extra);
}
}
}
final ShortcutInfo info = new ShortcutInfo();
if (icon == null) {
icon = getFallbackIcon();
info.usingFallbackIcon = true;
}
info.setIcon(icon);
info.title = name;
info.intent = intent;
info.customIcon = customIcon;
info.iconResource = iconResource;
return info;
}
private static void loadLiveFolderIcon(Context context, Cursor c, int iconTypeIndex,
int iconPackageIndex, int iconResourceIndex, LiveFolderInfo liveFolderInfo) {
int iconType = c.getInt(iconTypeIndex);
switch (iconType) {
case LauncherSettings.Favorites.ICON_TYPE_RESOURCE:
String packageName = c.getString(iconPackageIndex);
String resourceName = c.getString(iconResourceIndex);
PackageManager packageManager = context.getPackageManager();
try {
Resources resources = packageManager.getResourcesForApplication(packageName);
final int id = resources.getIdentifier(resourceName, null, null);
liveFolderInfo.icon = Utilities.createIconBitmap(resources.getDrawable(id),
context);
} catch (Exception e) {
liveFolderInfo.icon = Utilities.createIconBitmap(
context.getResources().getDrawable(R.drawable.ic_launcher_folder),
context);
}
liveFolderInfo.iconResource = new Intent.ShortcutIconResource();
liveFolderInfo.iconResource.packageName = packageName;
liveFolderInfo.iconResource.resourceName = resourceName;
break;
default:
liveFolderInfo.icon = Utilities.createIconBitmap(
context.getResources().getDrawable(R.drawable.ic_launcher_folder),
context);
}
}
void updateSavedIcon(Context context, ShortcutInfo info, Cursor c, int iconIndex) {
// If this icon doesn't have a custom icon, check to see
// what's stored in the DB, and if it doesn't match what
// we're going to show, store what we are going to show back
// into the DB. We do this so when we're loading, if the
// package manager can't find an icon (for example because
// the app is on SD) then we can use that instead.
if (info.onExternalStorage && !info.customIcon && !info.usingFallbackIcon) {
boolean needSave;
byte[] data = c.getBlob(iconIndex);
try {
if (data != null) {
Bitmap saved = BitmapFactory.decodeByteArray(data, 0, data.length);
Bitmap loaded = info.getIcon(mIconCache);
needSave = !saved.sameAs(loaded);
} else {
needSave = true;
}
} catch (Exception e) {
needSave = true;
}
if (needSave) {
Log.d(TAG, "going to save icon bitmap for info=" + info);
// This is slower than is ideal, but this only happens either
// after the froyo OTA or when the app is updated with a new
// icon.
updateItemInDatabase(context, info);
}
}
}
/**
* Return an existing UserFolderInfo object if we have encountered this ID previously,
* or make a new one.
*/
private static UserFolderInfo findOrMakeUserFolder(HashMap<Long, FolderInfo> folders, long id) {
// See if a placeholder was created for us already
FolderInfo folderInfo = folders.get(id);
if (folderInfo == null || !(folderInfo instanceof UserFolderInfo)) {
// No placeholder -- create a new instance
folderInfo = new UserFolderInfo();
folders.put(id, folderInfo);
}
return (UserFolderInfo) folderInfo;
}
/**
* Return an existing UserFolderInfo object if we have encountered this ID previously, or make a
* new one.
*/
private static LiveFolderInfo findOrMakeLiveFolder(HashMap<Long, FolderInfo> folders, long id) {
// See if a placeholder was created for us already
FolderInfo folderInfo = folders.get(id);
if (folderInfo == null || !(folderInfo instanceof LiveFolderInfo)) {
// No placeholder -- create a new instance
folderInfo = new LiveFolderInfo();
folders.put(id, folderInfo);
}
return (LiveFolderInfo) folderInfo;
}
private static String getLabel(PackageManager manager, ActivityInfo activityInfo) {
String label = activityInfo.loadLabel(manager).toString();
if (label == null) {
label = manager.getApplicationLabel(activityInfo.applicationInfo).toString();
if (label == null) {
label = activityInfo.name;
}
}
return label;
}
private static final Collator sCollator = Collator.getInstance();
public static final Comparator<ApplicationInfo> APP_NAME_COMPARATOR
= new Comparator<ApplicationInfo>() {
public final int compare(ApplicationInfo a, ApplicationInfo b) {
return sCollator.compare(a.title.toString(), b.title.toString());
}
};
public void dumpState() {
Log.d(TAG, "mBeforeFirstLoad=" + mBeforeFirstLoad);
Log.d(TAG, "mCallbacks=" + mCallbacks);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.data", mAllAppsList.data);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.added", mAllAppsList.added);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.removed", mAllAppsList.removed);
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.modified", mAllAppsList.modified);
mLoader.dumpState();
}
}
|
diff --git a/src/main/java/org/elasticsearch/sorting/nativescript/script/ActivitySortScript.java b/src/main/java/org/elasticsearch/sorting/nativescript/script/ActivitySortScript.java
index 0d78872..4ed31bb 100644
--- a/src/main/java/org/elasticsearch/sorting/nativescript/script/ActivitySortScript.java
+++ b/src/main/java/org/elasticsearch/sorting/nativescript/script/ActivitySortScript.java
@@ -1,55 +1,55 @@
package main.java.org.elasticsearch.sorting.nativescript.script;
import java.util.Date;
import java.util.Map;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.script.AbstractDoubleSearchScript;
import org.elasticsearch.script.ExecutableScript;
import org.elasticsearch.script.NativeScriptFactory;
public class ActivitySortScript implements NativeScriptFactory {
@Override
public ExecutableScript newScript(@Nullable Map<String, Object> params) {
return new SortScript();
}
public static class SortScript extends AbstractDoubleSearchScript {
// private final ESLogger logger =
// Loggers.getLogger(ActivitySortScript.class);
private final long one_hour = 3600000;
private final Date to_day = new Date();
public SortScript() {
}
@Override
public double runAsDouble() {
double total = (Long.parseLong(getFieldValue("like")) * 5)
+ (Long.parseLong(getFieldValue("participate")) * 100)
+ Long.parseLong(getFieldValue("status"));
Date start_time = BaseModule
.parse_date(getFieldValue("start_time"));
Date end_time = BaseModule.parse_date(getFieldValue("end_time"));
if (start_time.after(to_day)) {
return total
/ ((start_time.getTime() - to_day.getTime()) / one_hour);
} else if (start_time.before(to_day) && end_time.before(to_day)) {
- return total
- / ((to_day.getTime() - end_time.getTime()) / one_hour);
+ return (total * 0.8)
+ / (((to_day.getTime() - end_time.getTime()) / one_hour) * 100);
} else {
return (total + (((end_time.getTime() - to_day.getTime()) / one_hour) * 0.4))
/ ((to_day.getTime() - start_time.getTime()) / one_hour);
}
}
private String getFieldValue(String field) {
return source().get(field).toString();
}
}
}
| true | true | public double runAsDouble() {
double total = (Long.parseLong(getFieldValue("like")) * 5)
+ (Long.parseLong(getFieldValue("participate")) * 100)
+ Long.parseLong(getFieldValue("status"));
Date start_time = BaseModule
.parse_date(getFieldValue("start_time"));
Date end_time = BaseModule.parse_date(getFieldValue("end_time"));
if (start_time.after(to_day)) {
return total
/ ((start_time.getTime() - to_day.getTime()) / one_hour);
} else if (start_time.before(to_day) && end_time.before(to_day)) {
return total
/ ((to_day.getTime() - end_time.getTime()) / one_hour);
} else {
return (total + (((end_time.getTime() - to_day.getTime()) / one_hour) * 0.4))
/ ((to_day.getTime() - start_time.getTime()) / one_hour);
}
}
| public double runAsDouble() {
double total = (Long.parseLong(getFieldValue("like")) * 5)
+ (Long.parseLong(getFieldValue("participate")) * 100)
+ Long.parseLong(getFieldValue("status"));
Date start_time = BaseModule
.parse_date(getFieldValue("start_time"));
Date end_time = BaseModule.parse_date(getFieldValue("end_time"));
if (start_time.after(to_day)) {
return total
/ ((start_time.getTime() - to_day.getTime()) / one_hour);
} else if (start_time.before(to_day) && end_time.before(to_day)) {
return (total * 0.8)
/ (((to_day.getTime() - end_time.getTime()) / one_hour) * 100);
} else {
return (total + (((end_time.getTime() - to_day.getTime()) / one_hour) * 0.4))
/ ((to_day.getTime() - start_time.getTime()) / one_hour);
}
}
|
diff --git a/COMP20050-2008/project/Thrust/src/thrust/audio/SoundEffect.java b/COMP20050-2008/project/Thrust/src/thrust/audio/SoundEffect.java
index e6ac150c..c6a5b467 100644
--- a/COMP20050-2008/project/Thrust/src/thrust/audio/SoundEffect.java
+++ b/COMP20050-2008/project/Thrust/src/thrust/audio/SoundEffect.java
@@ -1,37 +1,37 @@
/*
* A re-implementation of the classic C=64 game 'Thrust'.
*
* @author "Joe Kiniry ([email protected])"
* @module "COMP 20050, COMP 30050"
* @creation_date "March 2007"
* @last_updated_date "April 2008"
* @keywords "C=64", "Thrust", "game"
*/
package thrust.audio;
import java.io.File;
/**
* Any sound made in response to a event.
* @author Joe Kiniry ([email protected])
* @version 2 April 2008
*/
public class SoundEffect {
/**
* This is your sound effect.
* @param the_sound_effect_file the sound effect to make.
* @return the new sound effect for the effect stored in 's'.
*/
- public /*@ pure @*/ SoundEffect make(File the_sound_effect_file) {
+ public static /*@ pure @*/ SoundEffect make(File the_sound_effect_file) {
assert false; //@ assert false;
return null;
}
/**
* Start playing your effect.
*/
public void start() {
assert false; //@ assert false;
}
}
| true | true | public /*@ pure @*/ SoundEffect make(File the_sound_effect_file) {
assert false; //@ assert false;
return null;
}
| public static /*@ pure @*/ SoundEffect make(File the_sound_effect_file) {
assert false; //@ assert false;
return null;
}
|
diff --git a/src/main/java/br/ufrj/jfirn/intelligent/evaluation/QuickCollisionEvaluator.java b/src/main/java/br/ufrj/jfirn/intelligent/evaluation/QuickCollisionEvaluator.java
index bae477a..b885546 100644
--- a/src/main/java/br/ufrj/jfirn/intelligent/evaluation/QuickCollisionEvaluator.java
+++ b/src/main/java/br/ufrj/jfirn/intelligent/evaluation/QuickCollisionEvaluator.java
@@ -1,123 +1,123 @@
package br.ufrj.jfirn.intelligent.evaluation;
import org.apache.commons.math3.util.FastMath;
import br.ufrj.jfirn.common.Point;
import br.ufrj.jfirn.intelligent.Collision;
import br.ufrj.jfirn.intelligent.MobileObstacleStatisticsLogger;
import br.ufrj.jfirn.intelligent.Thoughts;
import br.ufrj.jfirn.intelligent.Trajectory;
public class QuickCollisionEvaluator implements Evaluator {
@Override
public void evaluate(Thoughts thoughts, Instruction instruction, ChainOfEvaluations chain) {
//think and evaluate and change your thoughts and decide what to do next...
final Point myPosition = thoughts.myPosition();
for (MobileObstacleStatisticsLogger mo : thoughts.allObstacleStatistics()) { //evaluate everyone I see.
Collision collision = evaluateCollision(
myPosition,
thoughts.myDirection(),
thoughts.mySpeed(),
mo.lastKnownPosition(),
mo.directionMean(),
mo.speedMean(),
mo.getObservedObjectId()
);
if (collision == null) { //No collision. Verify someone else.
continue;
}
//If this collision is too far in the future, forget about it. Verify someone else.
if (myPosition.distanceTo(collision.position) > 200d || collision.time > 10d) {
continue;
}
//This if may be weird, but it will work because we defined a equals and hashCode
//to Collision class, based on the id of the object that the robot will collide with.
thoughts.putCollision(mo.getObservedObjectId(), collision);
}
chain.nextEvaluator(thoughts, instruction, chain); //keep thinking
}
private Collision evaluateCollision(Point myPosition, double myDirection, double mySpeed, Point otherPosition, double otherDirection, double otherSpeed, int id) {
//TODO I fear this will perform poorly for something supposed to be fast...
//here we forecast if a collision may happen
final Point collisionPosition =
intersection(myPosition, myDirection, otherPosition, otherDirection);
if (collisionPosition == null) { //if there is no intersection, then there is no collision
return null;
}
//now, we calculate when it's going to happen...
//but first, will it really happen?
if ( //if any robot has passed the evaluated collision position, then there will be no collision.
!isTheRightDirection(myPosition, myDirection, collisionPosition) ||
!isTheRightDirection(otherPosition, otherDirection, collisionPosition) ) {
return null;
}
//when each robot will reach the collision position?
- final double meTime = timeToReach(myPosition, mySpeed, collisionPosition);
+ final double myTime = timeToReach(myPosition, mySpeed, collisionPosition);
final double otherTime = timeToReach(otherPosition, otherSpeed, collisionPosition);
//Heuristic: I'm considering there will be a collision if the time between robots to arrive at the collision position are almost the same.
//TODO Improve this 'if', maybe considering objects direction, speed, size, etc.
- if (FastMath.abs(meTime - otherTime) > 6d) {
+ if (FastMath.abs(myTime - otherTime) > 6d) {
return null;
}
//estimate the collision time with the average of times
- final double time = (meTime + otherTime) / 2d;
+ final double time = (myTime + otherTime) / 2d;
return new Collision(id, collisionPosition, time);
}
/**
* The robot paths intersect at some point?
*/
private Point intersection(Point myPosition, double myDirection, Point otherPosition, double otherDirection) {
final Trajectory t1 = new Trajectory(myDirection, myPosition);
final Trajectory t2 = new Trajectory(otherDirection, otherPosition);
return t1.intersect(t2);
}
/**
* How much time a robot at position with speed would take to reach destination?
* Ignores the direction because I assume I'm going straight towards the destination.
* @see #isTheRightDirection(Point, double, Point)
*/
private double timeToReach(Point position, double speed, Point destination) {
return position.distanceTo(destination) / speed;
}
/**
* Is the robot going towards the collision or has it passed the destination already?
* true if it is going in the right direction.
*/
public static boolean isTheRightDirection(Point position, double direction, Point destination) {
//TODO there might be a better/faster way to do this
final double y = destination.y() - position.y();
final double x = destination.x() - position.x();
final double angle = FastMath.atan2(y, x);
final double sinDirection = FastMath.sin(direction);
final double sinAngle = FastMath.sin(angle);
final double cosDirection = FastMath.cos(direction);
final double cosAngle = FastMath.cos(angle);
return FastMath.signum(sinDirection) == FastMath.signum(sinAngle)
&& FastMath.signum(cosDirection) == FastMath.signum(cosAngle);
}
}
| false | true | private Collision evaluateCollision(Point myPosition, double myDirection, double mySpeed, Point otherPosition, double otherDirection, double otherSpeed, int id) {
//TODO I fear this will perform poorly for something supposed to be fast...
//here we forecast if a collision may happen
final Point collisionPosition =
intersection(myPosition, myDirection, otherPosition, otherDirection);
if (collisionPosition == null) { //if there is no intersection, then there is no collision
return null;
}
//now, we calculate when it's going to happen...
//but first, will it really happen?
if ( //if any robot has passed the evaluated collision position, then there will be no collision.
!isTheRightDirection(myPosition, myDirection, collisionPosition) ||
!isTheRightDirection(otherPosition, otherDirection, collisionPosition) ) {
return null;
}
//when each robot will reach the collision position?
final double meTime = timeToReach(myPosition, mySpeed, collisionPosition);
final double otherTime = timeToReach(otherPosition, otherSpeed, collisionPosition);
//Heuristic: I'm considering there will be a collision if the time between robots to arrive at the collision position are almost the same.
//TODO Improve this 'if', maybe considering objects direction, speed, size, etc.
if (FastMath.abs(meTime - otherTime) > 6d) {
return null;
}
//estimate the collision time with the average of times
final double time = (meTime + otherTime) / 2d;
return new Collision(id, collisionPosition, time);
}
| private Collision evaluateCollision(Point myPosition, double myDirection, double mySpeed, Point otherPosition, double otherDirection, double otherSpeed, int id) {
//TODO I fear this will perform poorly for something supposed to be fast...
//here we forecast if a collision may happen
final Point collisionPosition =
intersection(myPosition, myDirection, otherPosition, otherDirection);
if (collisionPosition == null) { //if there is no intersection, then there is no collision
return null;
}
//now, we calculate when it's going to happen...
//but first, will it really happen?
if ( //if any robot has passed the evaluated collision position, then there will be no collision.
!isTheRightDirection(myPosition, myDirection, collisionPosition) ||
!isTheRightDirection(otherPosition, otherDirection, collisionPosition) ) {
return null;
}
//when each robot will reach the collision position?
final double myTime = timeToReach(myPosition, mySpeed, collisionPosition);
final double otherTime = timeToReach(otherPosition, otherSpeed, collisionPosition);
//Heuristic: I'm considering there will be a collision if the time between robots to arrive at the collision position are almost the same.
//TODO Improve this 'if', maybe considering objects direction, speed, size, etc.
if (FastMath.abs(myTime - otherTime) > 6d) {
return null;
}
//estimate the collision time with the average of times
final double time = (myTime + otherTime) / 2d;
return new Collision(id, collisionPosition, time);
}
|
diff --git a/com.buglabs.common/com/buglabs/util/simplerestclient/HTTPRequest.java b/com.buglabs.common/com/buglabs/util/simplerestclient/HTTPRequest.java
index 5b9dce1..ecc7823 100644
--- a/com.buglabs.common/com/buglabs/util/simplerestclient/HTTPRequest.java
+++ b/com.buglabs.common/com/buglabs/util/simplerestclient/HTTPRequest.java
@@ -1,626 +1,626 @@
/*******************************************************************************
* Copyright (c) 2008, 2009 Brian Ballantine and Bug Labs, Inc.
*
* MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*******************************************************************************/
package com.buglabs.util.simplerestclient;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.buglabs.util.Base64;
/**
* class for dealing RESTfully with HTTP Requests
*
* Example Usage:
* HttpRequest req = new HttpRequest(myConnectionProvider)
* HttpResponse resp = req.get("http://some.url")
* System.out.println(resp.getString());
*
* @author Brian
*
* Revisions
* 09-03-2008 AK added a Map header parameter to "put" and "post" to support http header
*
*
*/
public class HTTPRequest {
/**
* Implementors can configure the http connection before every call is made.
* Useful for setting headers that always need to be present in every WS call to a given server.
*
* @author kgilmer
*
*/
public interface HTTPConnectionInitializer {
public void initialize(HttpURLConnection connection);
}
//////////////////////////////////////////////// HTTP REQUEST METHODS
private static final String HEADER_TYPE = "Content-Type";
private static final String HEADER_PARA = "Content-Disposition: form-data";
private static final String CONTENT_TYPE = "multipart/form-data";
private static final String LINE_ENDING = "\r\n";
private static final String BOUNDARY = "boundary=";
private static final String PARA_NAME = "name";
private static final String FILE_NAME = "filename";
private List<HTTPConnectionInitializer> configurators;
private IConnectionProvider _connectionProvider;
private boolean debugMode = false;
/**
* constructor where client provides connectionProvider
*
*/
public HTTPRequest(IConnectionProvider connectionProvider) {
_connectionProvider = connectionProvider;
}
/**
* @param connectionProvider
* @param debugMode
*/
public HTTPRequest(IConnectionProvider connectionProvider, boolean debugMode) {
this(connectionProvider);
this.debugMode = debugMode;
}
/**
* @param connectionProvider
* @param debugMode
*/
public HTTPRequest(boolean debugMode) {
this();
this.debugMode = debugMode;
}
/**
* constructor that uses default connection provider
*/
public HTTPRequest() {
_connectionProvider = new DefaultConnectionProvider();
}
/**
* Do an authenticated HTTP GET from url
*
* @param url String URL to connect to
* @return HttpURLConnection ready with response data
*/
public HTTPResponse get(String url) throws IOException {
HttpURLConnection conn = getAndConfigureConnection(url);
conn.setDoInput(true);
conn.setDoOutput(false);
if (debugMode)
debugMessage("GET", url, conn);
return connect(conn);
}
/**
* @param url
* @return
* @throws IOException
*/
private HttpURLConnection getAndConfigureConnection(String url) throws IOException {
url = guardUrl(url);
HttpURLConnection connection = _connectionProvider.getConnection(url);
if (configurators == null)
return connection;
for (HTTPConnectionInitializer c: configurators)
c.initialize(connection);
return connection;
}
/**
* Do an authenticated HTTP GET from url
*
* @param url String URL to connect to
* @return HttpURLConnection ready with response data
*/
public HTTPResponse get(String url, Map<String, String> headers) throws IOException {
HttpURLConnection conn = getAndConfigureConnection(url);
conn.setDoInput(true);
conn.setDoOutput(false);
for (Entry<String, String> e: headers.entrySet())
conn.addRequestProperty(e.getKey(), e.getValue());
if (debugMode)
debugMessage("GET", url, conn);
return connect(conn);
}
/**
* Do an HTTP POST to url
*
* @param url String URL to connect to
* @param data String data to post
* @return HttpURLConnection ready with response data
*/
public HTTPResponse post(String url, String data) throws IOException {
return post(url, data, null);
}
/**
* Do an HTTP POST to url w/ extra http headers
*
* @param url
* @param data
* @param headers
* @return
* @throws IOException
*/
public HTTPResponse post(String url, String data, Map<String, String> headers) throws IOException {
HttpURLConnection conn = getAndConfigureConnection(url);
if (headers != null)
for (Entry<String, String> e: headers.entrySet())
conn.setRequestProperty(e.getKey(), e.getValue());
if (debugMode)
debugMessage("POST", url + " data: " + data, conn);
conn.setDoOutput(true);
OutputStreamWriter osr = new OutputStreamWriter(conn.getOutputStream());
osr.write(data);
osr.flush();
osr.close();
return connect(conn);
}
/**
* Do an HTTP POST to url
*
* @param url String URL to connect to
* @param stream InputStream data to post
* @return HttpURLConnection ready with response data
*/
public HTTPResponse post(String url, InputStream stream) throws IOException {
byte[] buff = streamToByteArray(stream);
String data = Base64.encodeBytes(buff);
return post(url, data);
}
/**
* Posts a Map of key, value pair properties, like a web form
*
* @param url
* @param properties
* @return
* @throws IOException
*/
public HTTPResponse post(String url, Map<String, String> properties) throws IOException {
String data = propertyString(properties);
HashMap<String, String> headers = new HashMap<String, String>();
headers.put("Content-Type", "application/x-www-form-urlencoded");
return post(url, data, headers);
}
/**
* Posts a Map of key, value pair properties, like a web form
*
* @param url
* @param properties
* @return
* @throws IOException
*/
public HTTPResponse post(String url, Map<String, String> properties, Map<String, String> headers) throws IOException {
String data = propertyString(properties);
headers.put("Content-Type", "application/x-www-form-urlencoded");
return post(url, data, headers);
}
/**
* Post byte data to a url
*
* @param url
* @param data
* @return
* @throws IOException
*/
public HTTPResponse post(String url, byte[] data) throws IOException {
HttpURLConnection conn = getAndConfigureConnection(url);
conn.setRequestProperty("Content-Length", String.valueOf(data.length));
conn.setRequestMethod("POST");
conn.setDoOutput(true);
if (debugMode)
debugMessage("POST", url, conn);
OutputStream os = conn.getOutputStream();
os.write(data);
return connect(conn);
}
/**
* Does a multipart post which is different than a regular post
* mostly use this one if you're posting files
*
* @param url
* @param parameters
* Key-Value pairs in map. Keys are always string. Values can be string or IFormFile
* @param properties
* @return
*/
- public HTTPResponse postMultipart(String url, Map<String, String> parameters) throws IOException {
+ public HTTPResponse postMultipart(String url, Map<String, Object> parameters) throws IOException {
HttpURLConnection conn = getAndConfigureConnection(url);
conn.setRequestMethod("POST");
String boundary = createMultipartBoundary();
conn.setRequestProperty(HEADER_TYPE, CONTENT_TYPE +"; "+ BOUNDARY + boundary);
conn.setDoOutput(true);
if (debugMode)
debugMessage("POST", url, conn);
// write things out to connection
OutputStream os = conn.getOutputStream();
// add parameters
Object [] elems = parameters.keySet().toArray();
StringBuffer buf; // lil helper
IFormFile file;
for (int i=0; i < elems.length; i++) {
String key = (String)elems[i];
Object obj = parameters.get(key);
//System.out.println("--" + key);
buf = new StringBuffer();
if (obj instanceof IFormFile) {
file = (IFormFile)obj;
buf.append("--"+ boundary+LINE_ENDING);
buf.append(HEADER_PARA);
buf.append("; "+ PARA_NAME +"=\""+ key +"\"");
buf.append("; "+ FILE_NAME +"=\""+ file.getFilename() +"\""+ LINE_ENDING);
buf.append(HEADER_TYPE + ": " + file.getContentType() + ";");
buf.append(LINE_ENDING);
buf.append(LINE_ENDING);
os.write(buf.toString().getBytes());
os.write(file.getBytes());
} else if (obj != null) {
buf.append("--"+ boundary+LINE_ENDING);
buf.append(HEADER_PARA);
buf.append("; "+ PARA_NAME +"=\""+ key +"\"");
buf.append(LINE_ENDING);
buf.append(LINE_ENDING);
buf.append(obj.toString());
os.write(buf.toString().getBytes());
}
os.write(LINE_ENDING.getBytes());
}
os.write(("--"+ boundary+"--"+LINE_ENDING).getBytes());
return connect(conn);
}
/**
* Do an HTTP PUT to url
*
* @param url String URL to connect to
* @param data String data to post
* @return HttpURLConnection ready with response data
*/
public HTTPResponse put(String url, String data) throws IOException {
return put(url, data, null);
}
/**
* Do an HTTP PUT to url with extra headers
*
* @param url
* @param data
* @param headers
* @return
* @throws IOException
*/
public HTTPResponse put(String url, String data, Map<String, String> headers) throws IOException{
HttpURLConnection connection = getAndConfigureConnection(url);
if (headers != null)
for (Entry<String, String> e: headers.entrySet())
connection.setRequestProperty(e.getKey(), e.getValue());
if (debugMode)
debugMessage("PUT", url, connection);
connection.setDoOutput(true);
connection.setRequestMethod("PUT");
OutputStreamWriter osr = new OutputStreamWriter(connection.getOutputStream());
osr.write(data);
osr.flush();
osr.close();
return connect(connection);
}
/**
* Do an HTTP PUT to url
*
* @param url String URL to connect to
* @param stream InputStream data to put
* @return HttpURLConnection ready with response data
*/
public HTTPResponse put(String url, InputStream stream) throws IOException {
byte[] buff = streamToByteArray(stream);
String data = Base64.encodeBytes(buff);
return put(url, data);
}
/**
* Do an HTTP DELETE to url
*
* @param url
* @return
* @throws IOException
*/
public HTTPResponse delete(String url) throws IOException {
HttpURLConnection connection = getAndConfigureConnection(url);
connection.setDoInput(true);
connection.setRequestMethod("DELETE");
if (debugMode)
debugMessage("DELETE", url, connection);
return connect(connection);
}
/**
* Do an HTTP DELETE to url
*
* @param url
* @param headers
* @return
* @throws IOException
*/
public HTTPResponse delete(String url, Map<String, String> headers) throws IOException {
HttpURLConnection connection = getAndConfigureConnection(url);
if (headers != null)
for (Entry<String, String> e: headers.entrySet())
connection.setRequestProperty(e.getKey(), e.getValue());
if (debugMode)
debugMessage("DELETE", url, connection);
connection.setDoInput(true);
connection.setRequestMethod("DELETE");
return connect(connection);
}
/**
* Puts a Map of key, value pair properties, like a web form
*
* @param url
* @param properties
* @return
* @throws IOException
*/
public HTTPResponse put(String url, Map<String, String> properties) throws IOException {
String data = propertyString(properties);
HashMap<String, String> headers = new HashMap<String, String>();
headers.put("Content-Type", "application/x-www-form-urlencoded");
return put(url, data, headers);
}
/**
* Puts a Map of key, value pair properties, like a web form
*
* @param url
* @param properties
* @return
* @throws IOException
*/
public HTTPResponse put(String url, Map<String, String> properties, Map<String, String> headers) throws IOException {
String data = propertyString(properties);
headers.put("Content-Type", "application/x-www-form-urlencoded");
return put(url, data, headers);
}
/**
* Do an HTTP HEAD to url
*
* @param url String URL to connect to
* @return HttpURLConnection ready with response data
*/
public HTTPResponse head(String url) throws IOException {
HttpURLConnection connection = getAndConfigureConnection(url);
connection.setDoOutput(true);
connection.setRequestMethod("HEAD");
if (debugMode)
debugMessage("HEAD", url, connection);
return connect(connection);
}
////////////////////////////////////////////////////////////// THESE HELP
/**
* Connect to server, check the status, and return the new HTTPResponse
*/
private HTTPResponse connect(HttpURLConnection connection) throws HTTPException, IOException {
long timestamp = 0;
if (debugMode)
timestamp = System.currentTimeMillis();
HTTPResponse response = new HTTPResponse(connection);
response.checkStatus();
if (debugMode)
debugMessage(timestamp, connection.getURL().toString());
return response;
}
/**
* A simple helper function
*
* @param in InputStream to turn into a byte array
* @return byte array (byte[]) w/ contents of input stream
*/
public static byte[] streamToByteArray(InputStream in) throws IOException {
ByteArrayOutputStream os = new ByteArrayOutputStream();
int read = 0;
byte[] buff = new byte[4096];
try {
while ((read = in.read(buff)) > 0) {
os.write(buff, 0, read);
}
} catch (IOException e1) {
e1.printStackTrace();
}
return os.toByteArray();
}
/**
* turns a map into a key=value property string for sending to bugnet
*/
public static String propertyString(Map<String, String> props) throws IOException {
String propstr = new String();
String key;
for (Iterator<String> i = props.keySet().iterator(); i.hasNext();) {
key = i.next();
propstr = propstr + URLEncoder.encode(key, "UTF-8") + "=" + URLEncoder.encode((String) props.get(key), "UTF-8");
if (i.hasNext()) {
propstr = propstr + "&";
}
}
return propstr;
}
/**
* helper to create multipart form boundary
*
* @return
*/
private static String createMultipartBoundary() {
StringBuffer buf = new StringBuffer();
buf.append("---------------------------");
for (int i=0; i < 15; i++) {
double rand = Math.random() * 35;
if (rand < 10) {
buf.append((int)rand);
} else {
int ascii = 87 + (int)rand;
char symbol = (char)ascii;
buf.append(symbol);
}
}
return buf.toString();
}
/**
* Add a initializer that will be called for each http operation before the call is made.
* @param c
*/
public void addConfigurator(HTTPConnectionInitializer c) {
if (configurators == null)
configurators = new ArrayList<HTTPRequest.HTTPConnectionInitializer>();
if (!configurators.contains(c))
configurators.add(c);
}
/**
* Remove a initializer.
* @param c
*/
public void removeConfigurator(HTTPConnectionInitializer c) {
if (configurators == null)
return;
configurators.remove(c);
if (configurators.size() == 0)
configurators = null;
}
/**
* Print debug messages
* @param httpMethod
* @param url
* @param conn
*/
private void debugMessage(String httpMethod, String url, HttpURLConnection conn) {
System.out.println("HTTPRequest DEBUG " + System.currentTimeMillis() + ": [" + httpMethod + "] " + url + " ~ " + conn.getRequestProperties());
}
/**
* Print debug messages with ws time info
* @param time
* @param url
*/
private void debugMessage(long time, String url) {
System.out.println("HTTPRequest DEBUG time (" + (System.currentTimeMillis() - time) + " ms): " + url);
}
/**
* Check for null and handle protocol-less type.
* @param url
*/
private String guardUrl(String url) {
if (url == null)
throw new RuntimeException("URL passed in was null.");
//If no protocol defined in url, assume HTTP.
if (!url.toLowerCase().trim().startsWith("http"))
return "http://" + url;
return url;
}
}
| true | true | public HTTPResponse postMultipart(String url, Map<String, String> parameters) throws IOException {
HttpURLConnection conn = getAndConfigureConnection(url);
conn.setRequestMethod("POST");
String boundary = createMultipartBoundary();
conn.setRequestProperty(HEADER_TYPE, CONTENT_TYPE +"; "+ BOUNDARY + boundary);
conn.setDoOutput(true);
if (debugMode)
debugMessage("POST", url, conn);
// write things out to connection
OutputStream os = conn.getOutputStream();
// add parameters
Object [] elems = parameters.keySet().toArray();
StringBuffer buf; // lil helper
IFormFile file;
for (int i=0; i < elems.length; i++) {
String key = (String)elems[i];
Object obj = parameters.get(key);
//System.out.println("--" + key);
buf = new StringBuffer();
if (obj instanceof IFormFile) {
file = (IFormFile)obj;
buf.append("--"+ boundary+LINE_ENDING);
buf.append(HEADER_PARA);
buf.append("; "+ PARA_NAME +"=\""+ key +"\"");
buf.append("; "+ FILE_NAME +"=\""+ file.getFilename() +"\""+ LINE_ENDING);
buf.append(HEADER_TYPE + ": " + file.getContentType() + ";");
buf.append(LINE_ENDING);
buf.append(LINE_ENDING);
os.write(buf.toString().getBytes());
os.write(file.getBytes());
} else if (obj != null) {
buf.append("--"+ boundary+LINE_ENDING);
buf.append(HEADER_PARA);
buf.append("; "+ PARA_NAME +"=\""+ key +"\"");
buf.append(LINE_ENDING);
buf.append(LINE_ENDING);
buf.append(obj.toString());
os.write(buf.toString().getBytes());
}
os.write(LINE_ENDING.getBytes());
}
os.write(("--"+ boundary+"--"+LINE_ENDING).getBytes());
return connect(conn);
}
| public HTTPResponse postMultipart(String url, Map<String, Object> parameters) throws IOException {
HttpURLConnection conn = getAndConfigureConnection(url);
conn.setRequestMethod("POST");
String boundary = createMultipartBoundary();
conn.setRequestProperty(HEADER_TYPE, CONTENT_TYPE +"; "+ BOUNDARY + boundary);
conn.setDoOutput(true);
if (debugMode)
debugMessage("POST", url, conn);
// write things out to connection
OutputStream os = conn.getOutputStream();
// add parameters
Object [] elems = parameters.keySet().toArray();
StringBuffer buf; // lil helper
IFormFile file;
for (int i=0; i < elems.length; i++) {
String key = (String)elems[i];
Object obj = parameters.get(key);
//System.out.println("--" + key);
buf = new StringBuffer();
if (obj instanceof IFormFile) {
file = (IFormFile)obj;
buf.append("--"+ boundary+LINE_ENDING);
buf.append(HEADER_PARA);
buf.append("; "+ PARA_NAME +"=\""+ key +"\"");
buf.append("; "+ FILE_NAME +"=\""+ file.getFilename() +"\""+ LINE_ENDING);
buf.append(HEADER_TYPE + ": " + file.getContentType() + ";");
buf.append(LINE_ENDING);
buf.append(LINE_ENDING);
os.write(buf.toString().getBytes());
os.write(file.getBytes());
} else if (obj != null) {
buf.append("--"+ boundary+LINE_ENDING);
buf.append(HEADER_PARA);
buf.append("; "+ PARA_NAME +"=\""+ key +"\"");
buf.append(LINE_ENDING);
buf.append(LINE_ENDING);
buf.append(obj.toString());
os.write(buf.toString().getBytes());
}
os.write(LINE_ENDING.getBytes());
}
os.write(("--"+ boundary+"--"+LINE_ENDING).getBytes());
return connect(conn);
}
|
diff --git a/src/me/FluffyWolfers/Jet/JetListener.java b/src/me/FluffyWolfers/Jet/JetListener.java
index 910fdba..6fb229e 100644
--- a/src/me/FluffyWolfers/Jet/JetListener.java
+++ b/src/me/FluffyWolfers/Jet/JetListener.java
@@ -1,138 +1,140 @@
package me.FluffyWolfers.Jet;
import java.util.ArrayList;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
public class JetListener implements Listener{
@SuppressWarnings("deprecation")
@EventHandler(priority = EventPriority.HIGHEST)
public void addFuel(PlayerInteractEvent e){
Player p = e.getPlayer();
//if(!p.getGameMode().equals(GameMode.CREATIVE)){
if(p.hasPermission("jet.fly")){
if(e.getAction().equals(Action.RIGHT_CLICK_AIR)||e.getAction().equals(Action.RIGHT_CLICK_BLOCK)){
if(p.getInventory().getChestplate() != null && p.getInventory().getChestplate().getItemMeta().getDisplayName().equals(ChatColor.DARK_PURPLE + "Jet Pack")){
ItemStack chest = p.getInventory().getChestplate();
ItemMeta im = chest.getItemMeta();
if(p.getItemInHand().getType().equals(Material.COAL)){
String per = ChatColor.stripColor(im.getLore().get(0)).split("/")[0].substring(0, ChatColor.stripColor(im.getLore().get(0)).split("/")[0].length() - 1);
int cur = Integer.parseInt(per);
int orig = cur;
cur+=3;
if(cur >= 100){
cur = 100;
}
String str = String.valueOf(cur);
if(cur <= 25){
ArrayList<String> list = new ArrayList<String>();
list.add(ChatColor.DARK_RED + str + " / 100");
im.setLore(list);
chest.setItemMeta(im);
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.DARK_RED + str + ChatColor.DARK_PURPLE + " fuel!");
}
if(cur >= 26 && cur <= 75){
ArrayList<String> list = new ArrayList<String>();
list.clear();
list.add(ChatColor.GOLD + str + " / 100");
im.setLore(list);
chest.setItemMeta(im);
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.GOLD + str + ChatColor.DARK_PURPLE + " fuel!");
}
if(cur >= 76 && cur <= 100){
ArrayList<String> list = new ArrayList<String>();
list.clear();
list.add(ChatColor.GREEN + str + " / 100");
im.setLore(list);
chest.setItemMeta(im);
if(cur != 100)
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.GREEN + str + ChatColor.DARK_PURPLE + " fuel!");
}
p.getInventory().setChestplate(null);
p.getInventory().setChestplate(chest);
p.updateInventory();
if(orig >= 100){
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack already has " + ChatColor.GREEN + str + ChatColor.DARK_PURPLE + " fuel!");
}else{
if(p.getInventory().getItemInHand().getAmount()>1){
p.getInventory().getItemInHand().setAmount(p.getInventory().getItemInHand().getAmount() - 1);
}else{
p.getInventory().remove(p.getInventory().getItemInHand());
+ }
+ if(cur==100){
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.GREEN + str + ChatColor.DARK_PURPLE + " fuel!");
}
}
if(!JetCraft.flying.contains(p)){
JetCraft.flying.add(p);
}
p.setAllowFlight(true);
}
}
}
}
//}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onMove(PlayerMoveEvent e){
Player p = e.getPlayer();
//if(!p.getGameMode().equals(GameMode.CREATIVE)){
if(p.hasPermission("jet.fly")){
if(p.getInventory().getChestplate() != null && p.getInventory().getChestplate().getItemMeta().getDisplayName().equals(ChatColor.DARK_PURPLE + "Jet Pack")){
ItemStack chest = p.getInventory().getChestplate();
ItemMeta im = chest.getItemMeta();
String per = ChatColor.stripColor(im.getLore().get(0)).split("/")[0].substring(0, ChatColor.stripColor(im.getLore().get(0)).split("/")[0].length() - 1);
if(Integer.parseInt(per) > 0){
if(!JetCraft.flying.contains(p)){
JetCraft.flying.add(p);
}
p.setAllowFlight(true);
}
}
}
//}
}
}
| true | true | public void addFuel(PlayerInteractEvent e){
Player p = e.getPlayer();
//if(!p.getGameMode().equals(GameMode.CREATIVE)){
if(p.hasPermission("jet.fly")){
if(e.getAction().equals(Action.RIGHT_CLICK_AIR)||e.getAction().equals(Action.RIGHT_CLICK_BLOCK)){
if(p.getInventory().getChestplate() != null && p.getInventory().getChestplate().getItemMeta().getDisplayName().equals(ChatColor.DARK_PURPLE + "Jet Pack")){
ItemStack chest = p.getInventory().getChestplate();
ItemMeta im = chest.getItemMeta();
if(p.getItemInHand().getType().equals(Material.COAL)){
String per = ChatColor.stripColor(im.getLore().get(0)).split("/")[0].substring(0, ChatColor.stripColor(im.getLore().get(0)).split("/")[0].length() - 1);
int cur = Integer.parseInt(per);
int orig = cur;
cur+=3;
if(cur >= 100){
cur = 100;
}
String str = String.valueOf(cur);
if(cur <= 25){
ArrayList<String> list = new ArrayList<String>();
list.add(ChatColor.DARK_RED + str + " / 100");
im.setLore(list);
chest.setItemMeta(im);
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.DARK_RED + str + ChatColor.DARK_PURPLE + " fuel!");
}
if(cur >= 26 && cur <= 75){
ArrayList<String> list = new ArrayList<String>();
list.clear();
list.add(ChatColor.GOLD + str + " / 100");
im.setLore(list);
chest.setItemMeta(im);
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.GOLD + str + ChatColor.DARK_PURPLE + " fuel!");
}
if(cur >= 76 && cur <= 100){
ArrayList<String> list = new ArrayList<String>();
list.clear();
list.add(ChatColor.GREEN + str + " / 100");
im.setLore(list);
chest.setItemMeta(im);
if(cur != 100)
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.GREEN + str + ChatColor.DARK_PURPLE + " fuel!");
}
p.getInventory().setChestplate(null);
p.getInventory().setChestplate(chest);
p.updateInventory();
if(orig >= 100){
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack already has " + ChatColor.GREEN + str + ChatColor.DARK_PURPLE + " fuel!");
}else{
if(p.getInventory().getItemInHand().getAmount()>1){
p.getInventory().getItemInHand().setAmount(p.getInventory().getItemInHand().getAmount() - 1);
}else{
p.getInventory().remove(p.getInventory().getItemInHand());
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.GREEN + str + ChatColor.DARK_PURPLE + " fuel!");
}
}
if(!JetCraft.flying.contains(p)){
JetCraft.flying.add(p);
}
p.setAllowFlight(true);
}
}
}
}
//}
}
| public void addFuel(PlayerInteractEvent e){
Player p = e.getPlayer();
//if(!p.getGameMode().equals(GameMode.CREATIVE)){
if(p.hasPermission("jet.fly")){
if(e.getAction().equals(Action.RIGHT_CLICK_AIR)||e.getAction().equals(Action.RIGHT_CLICK_BLOCK)){
if(p.getInventory().getChestplate() != null && p.getInventory().getChestplate().getItemMeta().getDisplayName().equals(ChatColor.DARK_PURPLE + "Jet Pack")){
ItemStack chest = p.getInventory().getChestplate();
ItemMeta im = chest.getItemMeta();
if(p.getItemInHand().getType().equals(Material.COAL)){
String per = ChatColor.stripColor(im.getLore().get(0)).split("/")[0].substring(0, ChatColor.stripColor(im.getLore().get(0)).split("/")[0].length() - 1);
int cur = Integer.parseInt(per);
int orig = cur;
cur+=3;
if(cur >= 100){
cur = 100;
}
String str = String.valueOf(cur);
if(cur <= 25){
ArrayList<String> list = new ArrayList<String>();
list.add(ChatColor.DARK_RED + str + " / 100");
im.setLore(list);
chest.setItemMeta(im);
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.DARK_RED + str + ChatColor.DARK_PURPLE + " fuel!");
}
if(cur >= 26 && cur <= 75){
ArrayList<String> list = new ArrayList<String>();
list.clear();
list.add(ChatColor.GOLD + str + " / 100");
im.setLore(list);
chest.setItemMeta(im);
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.GOLD + str + ChatColor.DARK_PURPLE + " fuel!");
}
if(cur >= 76 && cur <= 100){
ArrayList<String> list = new ArrayList<String>();
list.clear();
list.add(ChatColor.GREEN + str + " / 100");
im.setLore(list);
chest.setItemMeta(im);
if(cur != 100)
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.GREEN + str + ChatColor.DARK_PURPLE + " fuel!");
}
p.getInventory().setChestplate(null);
p.getInventory().setChestplate(chest);
p.updateInventory();
if(orig >= 100){
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack already has " + ChatColor.GREEN + str + ChatColor.DARK_PURPLE + " fuel!");
}else{
if(p.getInventory().getItemInHand().getAmount()>1){
p.getInventory().getItemInHand().setAmount(p.getInventory().getItemInHand().getAmount() - 1);
}else{
p.getInventory().remove(p.getInventory().getItemInHand());
}
if(cur==100){
p.sendMessage(ChatColor.DARK_PURPLE + "Your jetpack now has " + ChatColor.GREEN + str + ChatColor.DARK_PURPLE + " fuel!");
}
}
if(!JetCraft.flying.contains(p)){
JetCraft.flying.add(p);
}
p.setAllowFlight(true);
}
}
}
}
//}
}
|
diff --git a/TextAndImage/src/main/java/it/gmariotti/android/examples/spantext/MainActivity.java b/TextAndImage/src/main/java/it/gmariotti/android/examples/spantext/MainActivity.java
index d4c75e0..a5805c1 100644
--- a/TextAndImage/src/main/java/it/gmariotti/android/examples/spantext/MainActivity.java
+++ b/TextAndImage/src/main/java/it/gmariotti/android/examples/spantext/MainActivity.java
@@ -1,149 +1,150 @@
/*
* ******************************************************************************
* * Copyright (c) 2014 Gabriele Mariotti.
* *
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* *
* * http://www.apache.org/licenses/LICENSE-2.0
* *
* * Unless required by applicable law or agreed to in writing, software
* * distributed under the License is distributed on an "AS IS" BASIS,
* * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* * See the License for the specific language governing permissions and
* * limitations under the License.
* *****************************************************************************
*/
package it.gmariotti.android.examples.spantext;
import android.app.Activity;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
import android.os.Bundle;
import android.text.Html;
import android.text.Layout;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.LeadingMarginSpan;
import android.view.ViewTreeObserver;
import android.widget.ImageView;
import android.widget.TextView;
public class MainActivity extends Activity {
/**
* TextView
*/
TextView mTextView;
/**
* ImageView
*/
ImageView mImageView;
int finalHeight, finalWidth;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
mTextView = (TextView) findViewById(R.id.text);
mImageView = (ImageView) findViewById(R.id.icon);
final ViewTreeObserver vto = mImageView.getViewTreeObserver();
vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
mImageView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
finalHeight = mImageView.getMeasuredHeight();
finalWidth = mImageView.getMeasuredWidth();
makeSpan();
}
});
}
/**
* This method builds the text layout
*/
private void makeSpan() {
/**
* Get the text
*/
String plainText=getResources().getString(R.string.text_sample);
Spanned htmlText = Html.fromHtml(plainText);
SpannableString mSpannableString= new SpannableString(htmlText);
int allTextStart = 0;
int allTextEnd = htmlText.length() - 1;
/**
* Calculate the lines number = image height.
* You can improve it... it is just an example
*/
int lines;
Rect bounds = new Rect();
mTextView.getPaint().getTextBounds(plainText.substring(0,10), 0, 1, bounds);
- float textLineHeight = mTextView.getPaint().getTextSize();
- lines = (int) (finalHeight/textLineHeight);
+ //float textLineHeight = mTextView.getPaint().getTextSize();
+ float fontSpacing=mTextView.getPaint().getFontSpacing();
+ lines = (int) (finalHeight/(fontSpacing));
/**
* Build the layout with LeadingMarginSpan2
*/
MyLeadingMarginSpan2 span = new MyLeadingMarginSpan2(lines, finalWidth +10 );
mSpannableString.setSpan(span, allTextStart, allTextEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTextView.setText(mSpannableString);
}
/**
*
*/
class MyLeadingMarginSpan2 implements LeadingMarginSpan.LeadingMarginSpan2 {
private int margin;
private int lines;
MyLeadingMarginSpan2(int lines, int margin) {
this.margin = margin;
this.lines = lines;
}
/**
* Apply the margin
*
* @param first
* @return
*/
@Override
public int getLeadingMargin(boolean first) {
if (first) {
return margin;
} else {
return 0;
}
}
@Override
public void drawLeadingMargin(Canvas c, Paint p, int x, int dir,
int top, int baseline, int bottom, CharSequence text,
int start, int end, boolean first, Layout layout) {}
@Override
public int getLeadingMarginLineCount() {
return lines;
}
};
}
| true | true | private void makeSpan() {
/**
* Get the text
*/
String plainText=getResources().getString(R.string.text_sample);
Spanned htmlText = Html.fromHtml(plainText);
SpannableString mSpannableString= new SpannableString(htmlText);
int allTextStart = 0;
int allTextEnd = htmlText.length() - 1;
/**
* Calculate the lines number = image height.
* You can improve it... it is just an example
*/
int lines;
Rect bounds = new Rect();
mTextView.getPaint().getTextBounds(plainText.substring(0,10), 0, 1, bounds);
float textLineHeight = mTextView.getPaint().getTextSize();
lines = (int) (finalHeight/textLineHeight);
/**
* Build the layout with LeadingMarginSpan2
*/
MyLeadingMarginSpan2 span = new MyLeadingMarginSpan2(lines, finalWidth +10 );
mSpannableString.setSpan(span, allTextStart, allTextEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTextView.setText(mSpannableString);
}
| private void makeSpan() {
/**
* Get the text
*/
String plainText=getResources().getString(R.string.text_sample);
Spanned htmlText = Html.fromHtml(plainText);
SpannableString mSpannableString= new SpannableString(htmlText);
int allTextStart = 0;
int allTextEnd = htmlText.length() - 1;
/**
* Calculate the lines number = image height.
* You can improve it... it is just an example
*/
int lines;
Rect bounds = new Rect();
mTextView.getPaint().getTextBounds(plainText.substring(0,10), 0, 1, bounds);
//float textLineHeight = mTextView.getPaint().getTextSize();
float fontSpacing=mTextView.getPaint().getFontSpacing();
lines = (int) (finalHeight/(fontSpacing));
/**
* Build the layout with LeadingMarginSpan2
*/
MyLeadingMarginSpan2 span = new MyLeadingMarginSpan2(lines, finalWidth +10 );
mSpannableString.setSpan(span, allTextStart, allTextEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTextView.setText(mSpannableString);
}
|
diff --git a/src/plugins/Library/util/SkeletonBTreeMap.java b/src/plugins/Library/util/SkeletonBTreeMap.java
index 153c3f8..e2199db 100644
--- a/src/plugins/Library/util/SkeletonBTreeMap.java
+++ b/src/plugins/Library/util/SkeletonBTreeMap.java
@@ -1,1571 +1,1571 @@
/* This code is part of Freenet. It is distributed under the GNU General
* Public License, version 2 (or at your option any later version). See
* http://www.gnu.org/ for further details of the GPL. */
package plugins.Library.util;
import plugins.Library.io.serial.Serialiser.*;
import plugins.Library.io.serial.IterableSerialiser;
import plugins.Library.io.serial.ScheduledSerialiser;
import plugins.Library.io.serial.MapSerialiser;
import plugins.Library.io.serial.Translator;
import plugins.Library.io.DataFormatException;
import plugins.Library.util.exec.TaskAbortException;
import plugins.Library.util.exec.TaskCompleteException;
import plugins.Library.util.func.Tuples.X2;
import plugins.Library.util.func.Tuples.X3;
import java.util.Comparator;
import java.util.Iterator;
import java.util.Collection;
import java.util.Map;
import java.util.List;
import java.util.LinkedHashMap;
import java.util.ArrayList;
// TODO NORM tidy this
import java.util.Queue;
import java.util.PriorityQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.PriorityBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import plugins.Library.util.exec.Progress;
import plugins.Library.util.exec.ProgressParts;
import plugins.Library.util.exec.BaseCompositeProgress;
import plugins.Library.io.serial.Serialiser;
import plugins.Library.io.serial.ProgressTracker;
import plugins.Library.util.exec.TaskCompleteException;
import plugins.Library.util.BTreeMap.Node;
import plugins.Library.util.concurrent.Scheduler;
import java.util.Collections;
import java.util.SortedSet;
import java.util.SortedMap;
import java.util.TreeSet;
import java.util.TreeMap;
import java.util.HashMap;
import freenet.support.Logger;
import plugins.Library.util.Sorted;
import plugins.Library.util.concurrent.BoundedPriorityBlockingQueue;
import plugins.Library.util.concurrent.ExceptionConvertor;
import plugins.Library.util.concurrent.ObjectProcessor;
import plugins.Library.util.concurrent.Executors;
import plugins.Library.util.event.TrackingSweeper;
import plugins.Library.util.event.CountingSweeper;
import plugins.Library.util.func.Closure;
import plugins.Library.util.func.SafeClosure;
import static plugins.Library.util.Maps.$K;
/**
** {@link Skeleton} of a {@link BTreeMap}. DOCUMENT
**
** TODO HIGH get rid of uses of rnode.get(K). All other uses of rnode, as well
** as lnode and entries, have already been removed. This will allow us to
** re-implement the Node class.
**
** To the maintainer: this class is very very unstructured and a lot of the
** functionality should be split off elsewhere. Feel free to move stuff around.
**
** @author infinity0
*/
public class SkeletonBTreeMap<K, V> extends BTreeMap<K, V> implements SkeletonMap<K, V> {
/*
** Whether entries are "internal to" or "contained within" nodes, ie.
** are the entries for a node completely stored (including values) with
** that node in the serialised representation, or do they refer to other
** serialised data that is external to the node?
**
** This determines whether a {@link TreeMap} or a {@link SkeletonTreeMap}
** is used to back the entries in a node.
**
** Eg. a {@code BTreeMap<String, BTreeSet<TermEntry>>} would have this
** {@code true} for the map, and {@code false} for the map backing the set.
*/
//final protected boolean internal_entries;
/*
** OPT HIGH disable for now, since I can't think of a good way to
** implement this tidily.
**
** three options:
**
** 0 have SkeletonNode use TreeMap when int_ent is true rather than
** SkeletonTreeMap but this will either break the Skeleton contract of
** deflate(), which expects isBare() to be true afterwards, or it will
** break the contract of isBare(), if we modifiy that method to return
** true for TreeMaps instead.
**
** - pros: uses an existing class, efficient
** - cons: breaks contracts (no foreseeable way to avoid), complicated
** to implement
**
** 1 have another class that extends SkeletonTreeMap which has one single
** boolean value isDeflated, alias *flate(K) to *flate(), and all those
** functions do is set that boolean. then override get() etc to throw
** DNLEx depending on the value of that boolean; and have SkeletonNode
** use this class when int_ent is true.
**
** - pros: simple, efficient OPT HIGH
** - cons: requires YetAnotherClass
**
** 2 don't have the internal_entries, and just use a dummy serialiser that
** copies task.data to task.meta for push tasks, and vice versa for pull
** tasks.
**
** - pros: simple to implement
** - cons: a hack, inefficient
**
** for now using option 2, will probably implement option 1 at some point..
*/
/**
** Serialiser for the node objects.
*/
protected IterableSerialiser<SkeletonNode> nsrl;
/**
** Serialiser for the value objects.
*/
protected MapSerialiser<K, V> vsrl;
public void setSerialiser(IterableSerialiser<SkeletonNode> n, MapSerialiser<K, V> v) {
if ((nsrl != null || vsrl != null) && !isLive()) {
throw new IllegalStateException("Cannot change the serialiser when the structure is not live.");
}
nsrl = n;
vsrl = v;
((SkeletonNode)root).setSerialiser();
}
static volatile boolean logMINOR;
static volatile boolean logDEBUG;
static {
Logger.registerClass(SkeletonBTreeMap.class);
}
final public Comparator<PullTask<SkeletonNode>> CMP_PULL = new Comparator<PullTask<SkeletonNode>>() {
/*@Override**/ public int compare(PullTask<SkeletonNode> t1, PullTask<SkeletonNode> t2) {
return ((GhostNode)t1.meta).compareTo((GhostNode)t2.meta);
}
};
final public Comparator<PushTask<SkeletonNode>> CMP_PUSH = new Comparator<PushTask<SkeletonNode>>() {
/*@Override**/ public int compare(PushTask<SkeletonNode> t1, PushTask<SkeletonNode> t2) {
return t1.data.compareTo(t2.data);
}
};
final public Comparator<Map.Entry<K, V>> CMP_ENTRY = new Comparator<Map.Entry<K, V>>() {
/*@Override**/ public int compare(Map.Entry<K, V> t1, Map.Entry<K, V> t2) {
return SkeletonBTreeMap.this.compare(t1.getKey(), t2.getKey());
}
};
public class SkeletonNode extends Node implements Skeleton<K, IterableSerialiser<SkeletonNode>> {
protected int ghosts = 0;
protected SkeletonNode(K lk, K rk, boolean lf, SkeletonTreeMap<K, V> map) {
super(lk, rk, lf, map);
setSerialiser();
}
protected SkeletonNode(K lk, K rk, boolean lf) {
this(lk, rk, lf, new SkeletonTreeMap<K, V>(comparator));
}
protected SkeletonNode(K lk, K rk, boolean lf, SkeletonTreeMap<K, V> map, Collection<GhostNode> gh) {
this(lk, rk, lf, map);
_size = map.size();
if (!lf) {
if (map.size()+1 != gh.size()) {
throw new IllegalArgumentException("SkeletonNode: in constructing " + getName() + ", got size mismatch: map:" + map.size() + "; gh:" + gh.size());
}
Iterator<GhostNode> it = gh.iterator();
for (X2<K, K> kp: iterKeyPairs()) {
GhostNode ghost = it.next();
ghost.lkey = kp._0;
ghost.rkey = kp._1;
ghost.parent = this;
_size += ghost._size;
addChildNode(ghost);
}
ghosts = gh.size();
}
}
/**
** Set the value-serialiser for this node and all subnodes to match
** the one assigned for the entire tree.
*/
public void setSerialiser() {
((SkeletonTreeMap<K, V>)entries).setSerialiser(vsrl);
if (!isLeaf()) {
for (Node n: iterNodes()) {
if (!n.isGhost()) {
((SkeletonNode)n).setSerialiser();
}
}
}
}
/**
** Create a {@link GhostNode} object that represents this node.
*/
public GhostNode makeGhost(Object meta) {
GhostNode ghost = new GhostNode(lkey, rkey, totalSize());
ghost.setMeta(meta);
return ghost;
}
/*@Override**/ public Object getMeta() { return null; }
/*@Override**/ public void setMeta(Object m) { }
/*@Override**/ public IterableSerialiser<SkeletonNode> getSerialiser() { return nsrl; }
/*@Override**/ public boolean isLive() {
if (ghosts > 0 || !((SkeletonTreeMap<K, V>)entries).isLive()) { return false; }
if (!isLeaf()) {
for (Node n: iterNodes()) {
SkeletonNode skel = (SkeletonNode)n;
if (!skel.isLive()) { return false; }
}
}
return true;
}
/*@Override**/ public boolean isBare() {
if (!isLeaf()) {
if (ghosts < childCount()) {
return false;
}
}
return ((SkeletonTreeMap<K, V>)entries).isBare();
}
/**
** {@inheritDoc}
*/
@Override protected void addChildNode(Node child) {
super.addChildNode(child);
if (child.isGhost()) { ++ghosts; }
}
/**
** DOCUMENT.
*/
protected void setChildNode(Node child) {
assert(lnodes.containsKey(child.rkey));
assert(rnodes.containsKey(child.lkey));
assert(lnodes.get(child.rkey) == rnodes.get(child.lkey));
lnodes.put(child.rkey, child);
rnodes.put(child.lkey, child);
}
/**
** Attaches a child {@link GhostNode}.
**
** It is '''assumed''' that there is already a {@link SkeletonNode} in
** its place; the ghost will replace it. It is up to the caller to
** ensure that this holds.
**
** @param ghost The GhostNode to attach
*/
protected void attachGhost(GhostNode ghost) {
assert(!rnodes.get(ghost.lkey).isGhost());
ghost.parent = this;
setChildNode(ghost);
++ghosts;
}
/**
** Attaches a child {@link SkeletonNode}.
**
** It is '''assumed''' that there is already a {@link GhostNode} in its
** place; the skeleton will replace it. It is up to the caller to
** ensure that this holds.
**
** @param skel The SkeletonNode to attach
*/
protected void attachSkeleton(SkeletonNode skel) {
assert(rnodes.get(skel.lkey).isGhost());
setChildNode(skel);
--ghosts;
}
/*@Override**/ public void deflate() throws TaskAbortException {
if (!isLeaf()) {
List<PushTask<SkeletonNode>> tasks = new ArrayList<PushTask<SkeletonNode>>(childCount() - ghosts);
for (Node node: iterNodes()) {
if (node.isGhost()) { continue; }
if (!((SkeletonNode)node).isBare()) {
((SkeletonNode)node).deflate();
}
tasks.add(new PushTask<SkeletonNode>((SkeletonNode)node));
}
nsrl.push(tasks);
for (PushTask<SkeletonNode> task: tasks) {
try {
attachGhost((GhostNode)task.meta);
} catch (RuntimeException e) {
throw new TaskAbortException("Could not deflate BTreeMap Node " + getRange(), e);
}
}
}
((SkeletonTreeMap<K, V>)entries).deflate();
assert(isBare());
}
// OPT make this parallel
/*@Override**/ public void inflate() throws TaskAbortException {
((SkeletonTreeMap<K, V>)entries).inflate();
if (!isLeaf()) {
for (Node node: iterNodes()) {
inflate(node.lkey, true);
}
}
assert(isLive());
}
/*@Override**/ public void inflate(K key) throws TaskAbortException {
inflate(key, false);
}
/**
** Deflates the node to the immediate right of the given key.
**
** Expects metadata to be of type {@link GhostNode}.
**
** @param key The key
*/
/*@Override**/ public void deflate(K key) throws TaskAbortException {
if (isLeaf()) { return; }
Node node = rnodes.get(key);
if (node.isGhost()) { return; }
if (!((SkeletonNode)node).isBare()) {
throw new IllegalStateException("Cannot deflate non-bare BTreeMap node");
}
PushTask<SkeletonNode> task = new PushTask<SkeletonNode>((SkeletonNode)node);
try {
nsrl.push(task);
attachGhost((GhostNode)task.meta);
// TODO LOW maybe just ignore all non-error abortions
} catch (TaskCompleteException e) {
assert(node.isGhost());
} catch (RuntimeException e) {
throw new TaskAbortException("Could not deflate BTreeMap Node " + node.getRange(), e);
}
}
/**
** Inflates the node to the immediate right of the given key.
**
** Passes metadata of type {@link GhostNode}.
**
** @param key The key
** @param auto Whether to recursively inflate the node's subnodes.
*/
public void inflate(K key, boolean auto) throws TaskAbortException {
if (isLeaf()) { return; }
Node node = rnodes.get(key);
if (!node.isGhost()) { return; }
PullTask<SkeletonNode> task = new PullTask<SkeletonNode>(node);
try {
nsrl.pull(task);
postPullTask(task, this);
if (auto) { task.data.inflate(); }
} catch (TaskCompleteException e) {
assert(!node.isGhost());
} catch (DataFormatException e) {
throw new TaskAbortException("Could not inflate BTreeMap Node " + node.getRange(), e);
} catch (RuntimeException e) {
throw new TaskAbortException("Could not inflate BTreeMap Node " + node.getRange(), e);
}
}
}
public class GhostNode extends Node {
/**
** Points to the parent {@link SkeletonNode}.
**
** Maintaining this field's value is a bitch, so I've tried to remove uses
** of this from the code. Currently, it is only used for the parent field
** a {@link DataFormatException}, which lets us retrieve the serialiser,
** progress, etc etc etc. TODO NORM somehow find another way of doing that
** so we can get rid of it completely.
*/
protected SkeletonNode parent;
protected Object meta;
protected GhostNode(K lk, K rk, SkeletonNode p, int s) {
super(lk, rk, false, null);
parent = p;
_size = s;
}
protected GhostNode(K lk, K rk, int s) {
this(lk, rk, null, s);
}
public Object getMeta() {
return meta;
}
public void setMeta(Object m) {
meta = m;
}
@Override public int nodeSize() {
throw new DataNotLoadedException("BTreeMap Node not loaded: " + getRange(), parent, lkey, this);
}
@Override public int childCount() {
throw new DataNotLoadedException("BTreeMap Node not loaded: " + getRange(), parent, lkey, this);
}
@Override public boolean isLeaf() {
throw new DataNotLoadedException("BTreeMap Node not loaded: " + getRange(), parent, lkey, this);
}
@Override public Node nodeL(Node n) {
// this method-call should never be reached in the B-tree algorithm
throw new AssertionError("GhostNode: called nodeL()");
}
@Override public Node nodeR(Node n) {
// this method-call should never be reached in the B-tree algorithm
throw new AssertionError("GhostNode: called nodeR()");
}
@Override public Node selectNode(K key) {
// this method-call should never be reached in the B-tree algorithm
throw new AssertionError("GhostNode: called selectNode()");
}
}
public SkeletonBTreeMap(Comparator<? super K> cmp, int node_min) {
super(cmp, node_min);
}
public SkeletonBTreeMap(int node_min) {
super(node_min);
}
/**
** Post-processes a {@link PullTask} and returns the {@link SkeletonNode}
** pulled.
**
** The tree will be in a consistent state after the operation, if it was
** in a consistent state before it.
*/
protected SkeletonNode postPullTask(PullTask<SkeletonNode> task, SkeletonNode parent) throws DataFormatException {
SkeletonNode node = task.data;
GhostNode ghost = (GhostNode)task.meta;
if (!compare0(ghost.lkey, node.lkey) || !compare0(ghost.rkey, node.rkey)) {
throw new DataFormatException("BTreeMap Node lkey/rkey does not match", null, node);
}
parent.attachSkeleton(node);
return node;
}
/**
** Post-processes a {@link PushTask} and returns the {@link GhostNode}
** pushed.
**
** The tree will be in a consistent state after the operation, if it was
** in a consistent state before it.
*/
protected GhostNode postPushTask(PushTask<SkeletonNode> task, SkeletonNode parent) {
GhostNode ghost = (GhostNode)task.meta;
parent.attachGhost(ghost);
return ghost;
}
@Override protected Node newNode(K lk, K rk, boolean lf) {
return new SkeletonNode(lk, rk, lf);
}
@Override protected void swapKey(K key, Node src, Node dst) {
SkeletonTreeMap.swapKey(key, (SkeletonTreeMap<K, V>)src.entries, (SkeletonTreeMap<K, V>)dst.entries);
}
/*========================================================================
public interface SkeletonMap
========================================================================*/
/*@Override**/ public Object getMeta() { return null; }
/*@Override**/ public void setMeta(Object m) { }
/*@Override**/ public MapSerialiser<K, V> getSerialiser() { return vsrl; }
/*@Override**/ public boolean isLive() {
return ((SkeletonNode)root).isLive();
}
/*@Override**/ public boolean isBare() {
return ((SkeletonNode)root).isBare();
}
/*@Override**/ public void deflate() throws TaskAbortException {
((SkeletonNode)root).deflate();
}
// TODO NORM tidy this; this should proboably go in a serialiser
// and then we will access the Progress of a submap with a task whose
// metadata is (lkey, rkey), or something..(PROGRESS)
BaseCompositeProgress pr_inf = new BaseCompositeProgress();
public BaseCompositeProgress getProgressInflate() { return pr_inf; } // REMOVE ME
/**
** Parallel bulk-inflate. At the moment, this will inflate all the values
** of each nodes too.
**
** Not yet thread safe, but ideally it should be. See source for details.
*/
/*@Override**/ public void inflate() throws TaskAbortException {
// TODO NORM adapt the algorithm to track partial loads of submaps (SUBMAP)
// TODO NORM if we do that, we'll also need to make it thread-safe. (THREAD)
// TODO NORM and do the PROGRESS stuff whilst we're at it
if (!(nsrl instanceof ScheduledSerialiser)) {
// TODO LOW could just use the code below - since the Scheduler would be
// unavailable, the tasks could be executed in the current thread, and the
// priority queue's comparator would turn it into depth-first search
// automatically.
((SkeletonNode)root).inflate();
return;
}
final Queue<SkeletonNode> nodequeue = new PriorityQueue<SkeletonNode>();
Map<PullTask<SkeletonNode>, ProgressTracker<SkeletonNode, ?>> ids = null;
ProgressTracker<SkeletonNode, ?> ntracker = null;;
if (nsrl instanceof Serialiser.Trackable) {
ids = new LinkedHashMap<PullTask<SkeletonNode>, ProgressTracker<SkeletonNode, ?>>();
ntracker = ((Serialiser.Trackable<SkeletonNode>)nsrl).getTracker();
// PROGRESS make a ProgressTracker track this instead of "pr_inf".
pr_inf.setSubProgress(ProgressTracker.makePullProgressIterable(ids));
pr_inf.setSubject("Pulling all entries in B-tree");
}
final ObjectProcessor<PullTask<SkeletonNode>, SkeletonNode, TaskAbortException> proc_pull
= ((ScheduledSerialiser<SkeletonNode>)nsrl).pullSchedule(
new PriorityBlockingQueue<PullTask<SkeletonNode>>(0x10, CMP_PULL),
new LinkedBlockingQueue<X2<PullTask<SkeletonNode>, TaskAbortException>>(0x10),
new HashMap<PullTask<SkeletonNode>, SkeletonNode>()
);
//System.out.println("Using scheduler");
//int DEBUG_pushed = 0, DEBUG_popped = 0;
try {
nodequeue.add((SkeletonNode)root);
// FIXME HIGH make a copy of the deflated root so that we can restore it if the
// operation fails
do {
//System.out.println("pushed: " + DEBUG_pushed + "; popped: " + DEBUG_popped);
// handle the inflated tasks and attach them to the tree.
// THREAD progress tracker should prevent this from being run twice for the
// same node, but what if we didn't use a progress tracker? hmm...
while (proc_pull.hasCompleted()) {
X3<PullTask<SkeletonNode>, SkeletonNode, TaskAbortException> res = proc_pull.accept();
PullTask<SkeletonNode> task = res._0;
SkeletonNode parent = res._1;
TaskAbortException ex = res._2;
if (ex != null) {
assert(!(ex instanceof plugins.Library.util.exec.TaskInProgressException)); // by contract of ScheduledSerialiser
if (!(ex instanceof TaskCompleteException)) {
// TODO LOW maybe dump it somewhere else and throw it at the end...
throw ex;
}
// retrieve the inflated SkeletonNode and add it to the queue...
GhostNode ghost = (GhostNode)task.meta;
// THREAD race condition here... if another thread has inflated the task
// but not yet attached the inflated node to the tree, the assertion fails.
// could check to see if the Progress for the Task still exists, but the
// performance of this depends on the GC freeing weak referents quickly...
assert(!parent.rnodes.get(ghost.lkey).isGhost());
nodequeue.add((SkeletonNode)parent.rnodes.get(ghost.lkey));
} else {
SkeletonNode node = postPullTask(task, parent);
nodequeue.add(node);
}
//++DEBUG_popped;
}
// go through the nodequeue and add any child ghost nodes to the tasks queue
while (!nodequeue.isEmpty()) {
SkeletonNode node = nodequeue.remove();
// TODO HIGH this needs to be asynchronous
((SkeletonTreeMap<K, V>)node.entries).inflate(); // SUBMAP here
if (node.isLeaf()) { continue; }
for (Node next: node.iterNodes()) { // SUBMAP here
if (!next.isGhost()) {
SkeletonNode skel = (SkeletonNode)next;
if (!skel.isLive()) { nodequeue.add(skel); }
continue;
}
PullTask<SkeletonNode> task = new PullTask<SkeletonNode>((GhostNode)next);
if (ids != null) { ids.put(task, ntracker); }
ObjectProcessor.submitSafe(proc_pull, task, node);
//++DEBUG_pushed;
}
}
Thread.sleep(0x40); // FIXME HIGH
// we really should put this higher, but BIndexTest tries to inflate a
// of trees in serial and with a 1 second-wait between each, this would
// take ages
} while (proc_pull.hasPending());
pr_inf.setEstimate(ProgressParts.TOTAL_FINALIZED);
} catch (DataFormatException e) {
throw new TaskAbortException("Bad data format", e);
} catch (InterruptedException e) {
throw new TaskAbortException("interrupted", e);
} finally {
proc_pull.close();
//System.out.println("pushed: " + DEBUG_pushed + "; popped: " + DEBUG_popped);
//assert(DEBUG_pushed == DEBUG_popped);
}
}
/*@Override**/ public void deflate(K key) throws TaskAbortException {
throw new UnsupportedOperationException("not implemented");
}
/*@Override**/ public void inflate(K key) throws TaskAbortException {
inflate(key);
}
/*@Override**/ public void inflate(K key, boolean deflateRest) throws TaskAbortException {
// TODO NORM tidy up
// OPT LOW could write a more efficient version by keeping track of
// the already-inflated nodes so get() doesn't keep traversing down the
// tree - would only improve performance from O(log(n)^2) to O(log(n)) so
// not that big a priority
for (;;) {
try {
if(deflateRest)
getDeflateRest(key);
else
get(key);
break;
} catch (DataNotLoadedException e) {
e.getParent().inflate(e.getKey());
}
}
}
/**
** {@inheritDoc}
**
** This implementation just descends the tree, returning the value for the
** given key if it can be found.
* @throws TaskAbortException
**
** @throws ClassCastException key cannot be compared with the keys
** currently in the map
** @throws NullPointerException key is {@code null} and this map uses
** natural order, or its comparator does not tolerate {@code null}
** keys
*/
public V getDeflateRest(Object k) throws TaskAbortException {
K key = (K) k;
Node node = root;
for (;;) {
if (node.isLeaf()) {
return node.entries.get(key);
}
Node nextnode = node.selectNode(key);
if (nextnode == null) {
for(Node sub : node.iterNodes()) {
if(sub != nextnode && sub instanceof SkeletonBTreeMap.SkeletonNode)
((SkeletonNode)sub).deflate();
}
return node.entries.get(key);
}
node = nextnode;
}
}
/**
** @param putmap Entries to insert into this map
** @param remkey Keys to remove from this map
** @see #update(SortedSet, SortedSet, SortedMap, Closure)
*/
public void update(SortedMap<K, V> putmap, SortedSet<K> remkey) throws TaskAbortException {
update(null, remkey, putmap, null, new TaskAbortExceptionConvertor());
}
/**
** @param putkey Keys to insert into this map
** @param remkey Keys to remove from this map
** @param value_handler Closure to retrieve the value for each putkey
** @see #update(SortedSet, SortedSet, SortedMap, Closure)
*/
public <X extends Exception> void update(SortedSet<K> putkey, SortedSet<K> remkey, Closure<Map.Entry<K, V>, X> value_handler, ExceptionConvertor<X> conv) throws TaskAbortException {
update(putkey, remkey, null, value_handler, conv);
}
/**
** The executor backing {@link #VALUE_EXECUTOR}.
*/
private static Executor value_exec = null;
/**
* Separate executor for value handlers. Value handlers can themselves call
* update() and end up polling, so we need to keep them separate from the
* threads that do the actual work! */
final public static Executor VALUE_EXECUTOR = new Executor() {
/*@Override**/ public void execute(Runnable r) {
synchronized (Executors.class) {
if (value_exec == null) {
value_exec = new ThreadPoolExecutor(
0x40, 0x40, 1, TimeUnit.SECONDS,
new LinkedBlockingQueue<Runnable>(),
new ThreadPoolExecutor.CallerRunsPolicy()
);
}
}
value_exec.execute(r);
}
};
/**
** The executor backing {@link #VALUE_EXECUTOR}.
*/
private static Executor deflate_exec = null;
/**
* Separate executor for deflating. We don't want update()'s to prevent actual
* pushes. */
final public static Executor DEFLATE_EXECUTOR = new Executor() {
/*@Override**/ public void execute(Runnable r) {
synchronized (Executors.class) {
if (deflate_exec == null) {
deflate_exec = new ThreadPoolExecutor(
0x40, 0x40, 1, TimeUnit.SECONDS,
new LinkedBlockingQueue<Runnable>(),
new ThreadPoolExecutor.CallerRunsPolicy()
);
}
}
deflate_exec.execute(r);
}
};
/**
** Asynchronously updates a remote B-tree. This uses two-pass merge/split
** algorithms (as opposed to the one-pass algorithms of the standard {@link
** BTreeMap}) since it assumes a copy-on-write backing data store, where
** the advantages (concurrency, etc) of one-pass algorithms disappear, and
** the disadvantages (unneeded merges/splits) remain.
**
** Unlike the (ideal design goal of the) inflate/deflate methods, this is
** designed to support accept only one concurrent update. It is up to the
** caller to ensure that this holds. TODO NORM enforce this somehow
**
** Currently, this method assumes that the root.isBare(). TODO NORM enforce
** this..
**
** Note: {@code remkey} is not implemented yet.
**
** @throws UnsupportedOperationException if {@code remkey} is not empty
*/
protected <X extends Exception> void update(
SortedSet<K> putkey, SortedSet<K> remkey,
final SortedMap<K, V> putmap, Closure<Map.Entry<K, V>, X> value_handler,
ExceptionConvertor<X> conv
) throws TaskAbortException {
while(true) {
- SortedSet<K> rejected;
+ final SortedSet<K> rejected;
if (value_handler == null) {
// synchronous value callback - null, remkey, putmap, null
assert(putkey == null);
putkey = Sorted.keySet(putmap);
rejected = null;
} else {
// asynchronous value callback - putkey, remkey, null, closure
assert(putmap == null);
rejected = new TreeSet<K>();
}
if (remkey != null && !remkey.isEmpty()) {
throw new UnsupportedOperationException("SkeletonBTreeMap: update() currently only supports merge operations");
}
/*
** The code below might seem confusing at first, because the action of
** the algorithm on a single node is split up into several asynchronous
** parts, which are not visually adjacent. Here is a more contiguous
** description of what happens to a single node between being inflated
** and then eventually deflated.
**
** Life cycle of a node:
**
** - node gets popped from proc_pull
** - enter InflateChildNodes
** - subnodes get pushed into proc_pull
** - (recurse for each subnode)
** - subnode gets popped from proc_pull
** - etc
** - split-subnodes get pushed into proc_push
** - wait for all: split-subnodes get popped from proc_push
** - enter SplitNode
** - for each item in the original node's DeflateNode
** - release the item and acquire it on
** - the parent's DeflateNode if the item is a separator
** - a new DeflateNode if the item is now in a split-node
** - for each split-node:
** - wait for all: values get popped from proc_val; SplitNode to close()
** - enter DeflateNode
** - split-node gets pushed into proc_push (except for root)
**
*/
// TODO LOW - currently, the algorithm will automatically completely
// inflate each node as it is pulled in from the network (ie. inflate
// all of its values). this is not necessary, since not all of the
// values may be updated. it would be possible to make it work more
// efficiently, which would save some network traffic, but this would
// be quite fiddly. also, the current way allows the Packer to be more
// aggressive in packing the values into splitfiles.
// FIXME NORM - currently, there is a potential deadlock issue here,
// because proc_{pull,push,val} all use the same ThreadPoolExecutor to
// execute tasks. if the pool fills up with manager tasks {pull,push}
// then worker tasks {val} cannot execute, resulting in deadlock. at
// present, this is avoided by having ObjectProcessor.maxconc less than
// the poolsize, but future developers may change this unknowingly.
//
// a proper solution would be to have manager and worker tasks use
// different thread pools, ie. different ThreadPoolExecutors. care
// needs to be taken when doing this because the call can be recursive;
// ie. if the values are also SkeletonBTreeMaps, then the workers might
// start child "manager" tasks by calling value.update()
//
// arguably a better solution would be to not use threads, and use
// the async interface (i should have done this when i first coded it).
// see doc/todo.txt for details
final ObjectProcessor<PullTask<SkeletonNode>, SafeClosure<SkeletonNode>, TaskAbortException> proc_pull
= ((ScheduledSerialiser<SkeletonNode>)nsrl).pullSchedule(
new PriorityBlockingQueue<PullTask<SkeletonNode>>(0x10, CMP_PULL),
new LinkedBlockingQueue<X2<PullTask<SkeletonNode>, TaskAbortException>>(8),
new HashMap<PullTask<SkeletonNode>, SafeClosure<SkeletonNode>>()
);
final ObjectProcessor<PushTask<SkeletonNode>, CountingSweeper<SkeletonNode>, TaskAbortException> proc_push
= ((ScheduledSerialiser<SkeletonNode>)nsrl).pushSchedule(
new PriorityBlockingQueue<PushTask<SkeletonNode>>(0x10, CMP_PUSH),
new LinkedBlockingQueue<X2<PushTask<SkeletonNode>, TaskAbortException>>(0x10),
new HashMap<PushTask<SkeletonNode>, CountingSweeper<SkeletonNode>>()
);
/**
** Deposit for a value-retrieval operation
*/
class DeflateNode extends TrackingSweeper<K, SortedSet<K>> implements Runnable, SafeClosure<Map.Entry<K, V>> {
/** The node to be pushed, when run() is called. */
final SkeletonNode node;
/** A closure for the parent node. This is called when all of its children (of
** which this.node is one) have been pushed. */
final CountingSweeper<SkeletonNode> parNClo;
private boolean deflated;
protected DeflateNode(SkeletonNode n, CountingSweeper<SkeletonNode> pnc) {
super(true, true, new TreeSet<K>(comparator), null);
parNClo = pnc;
node = n;
}
/**
** Push this node. This is run when this sweeper is cleared, which
** happens after all the node's local values have been obtained,
** '''and''' the node has passed through SplitNode (which closes
** this sweeper).
*/
public void run() {
try {
deflate();
} catch (TaskAbortException e) {
throw new RuntimeException(e); // FIXME HIGH
}
assert(node.isBare());
if (parNClo == null) {
// do not deflate the root
assert(node == root);
return;
}
ObjectProcessor.submitSafe(proc_push, new PushTask<SkeletonNode>(node), parNClo);
}
/**
** Update the key's value in the node. Runs whenever an entry is
** popped from proc_val.
*/
public void invoke(Map.Entry<K, V> en) {
assert(node.entries.containsKey(en.getKey()));
node.entries.put(en.getKey(), en.getValue());
if(logMINOR) Logger.minor(this, "New value for key "+en.getKey()+" : "+en.getValue()+" in "+node+" parent = "+parNClo);
}
public void deflate() throws TaskAbortException {
synchronized(this) {
if(deflated) return;
deflated = true;
}
((SkeletonTreeMap<K, V>)node.entries).deflate();
}
}
// must be located after DeflateNode's class definition
// The proc_val output queue must comfortably cover everything generated by a single invocation of InflateChildNodes, or else we will deadlock.
// Note that this is all deflated sub-trees, so they are relatively small - some of the other queues
// handle much larger structures in their counters.
final ObjectProcessor<Map.Entry<K, V>, DeflateNode, X> proc_val = (value_handler == null)? null
: new ObjectProcessor<Map.Entry<K, V>, DeflateNode, X>(
new BoundedPriorityBlockingQueue<Map.Entry<K, V>>(0x10, CMP_ENTRY),
new LinkedBlockingQueue<X2<Map.Entry<K, V>, X>>(ENT_MAX*3),
new HashMap<Map.Entry<K, V>, DeflateNode>(),
value_handler, VALUE_EXECUTOR, conv // These can block so pool them separately.
).autostart();
final Comparator<DeflateNode> CMP_DEFLATE = new Comparator<DeflateNode>() {
public int compare(DeflateNode arg0, DeflateNode arg1) {
return arg0.node.compareTo(arg1.node);
}
};
final ObjectProcessor<DeflateNode, SkeletonNode, TaskAbortException> proc_deflate =
new ObjectProcessor<DeflateNode, SkeletonNode, TaskAbortException>(
new BoundedPriorityBlockingQueue<DeflateNode>(0x10, CMP_DEFLATE),
new LinkedBlockingQueue<X2<DeflateNode, TaskAbortException>>(),
new HashMap<DeflateNode, SkeletonNode>(),
new Closure<DeflateNode, TaskAbortException>() {
public void invoke(DeflateNode param) throws TaskAbortException {
param.deflate();
}
}, DEFLATE_EXECUTOR, new TaskAbortExceptionConvertor()).autostart();
// Limit it to 2 at once to minimise memory usage.
// The actual inserts will occur in parallel anyway.
proc_deflate.setMaxConc(2);
// Dummy constant for SplitNode
final SortedMap<K, V> EMPTY_SORTEDMAP = new TreeMap<K, V>(comparator);
/**
** Deposit for a PushTask
*/
class SplitNode extends CountingSweeper<SkeletonNode> implements Runnable {
/** The node to be split, when run() is called. */
final SkeletonNode node;
/** The node's parent, where new nodes/keys are attached during the split process. */
/*final*/ SkeletonNode parent;
/** The value-closure for this node. This keeps track of all unhandled values
* in this node. If this node is split, and the values have not been handled,
* they are passed onto the value-closures of the relevant split nodes (or
* that of the parent node, if the key turns out to be a separator key). */
final DeflateNode nodeVClo;
/** The closure for the parent node, also a CountingSweeper. We keep a
* reference to this so we can add the new split nodes to it. */
/*final*/ SplitNode parNClo;
/** The value-closure for the parent node. The comment for nodeVClo explains
* why we need a reference to this. */
/*final*/ DeflateNode parVClo;
protected SplitNode(SkeletonNode n, SkeletonNode p, DeflateNode vc, SplitNode pnc, DeflateNode pvc) {
super(true, false);
node = n;
parent = p;
nodeVClo = vc;
parNClo = pnc;
parVClo = pvc;
}
/**
** Closes the node's DeflateNode, and (if appropriate) splits the
** node and updates the deposits for each key moved. This is run
** after all its children have been deflated.
*/
public void run() {
assert(node.ghosts == node.childCount());
// All subnodes have been deflated, so nothing else can possibly add keys
// to this node.
nodeVClo.close();
int sk = minKeysFor(node.nodeSize());
// No need to split
if (sk == 0) {
if (nodeVClo.isCleared()) {
try {
proc_deflate.submit(nodeVClo, nodeVClo.node);
} catch (InterruptedException e) {
// Impossible ?
throw new RuntimeException(e);
}
}
return;
}
if (parent == null) {
assert(parNClo == null && parVClo == null);
// create a new parent, parNClo, parVClo
// similar stuff as for InflateChildNodes but no merging
parent = new SkeletonNode(null, null, false);
parent.addAll(EMPTY_SORTEDMAP, Collections.singleton(node));
parVClo = new DeflateNode(parent, null);
parNClo = new SplitNode(parent, null, parVClo, null, null);
parNClo.acquire(node);
parNClo.close();
root = parent;
}
Collection<K> keys = Sorted.select(Sorted.keySet(node.entries), sk);
parent.split(node.lkey, keys, node.rkey);
Iterable<Node> nodes = parent.iterNodes(node.lkey, node.rkey);
// WORKAROUND unnecessary cast here - bug in SunJDK6; works fine on OpenJDK6
SortedSet<K> held = (SortedSet<K>)nodeVClo.view();
// if synchronous, all values should have already been handled
assert(proc_val != null || held.size() == 0);
// reassign appropriate keys to parent sweeper
for (K key: keys) {
if (!held.contains(key)) { continue; }
reassignKeyToSweeper(key, parVClo);
}
//System.out.println("parent:"+parent.getRange()+"\nseps:"+keys+"\nheld:"+held);
parNClo.open();
// for each split-node, create a sweeper that will run when all its (k,v)
// pairs have been popped from value_complete
for (Node nn: nodes) {
SkeletonNode n = (SkeletonNode)nn;
DeflateNode vClo = new DeflateNode(n, parNClo);
// reassign appropriate keys to the split-node's sweeper
SortedSet<K> subheld = subSet(held, n.lkey, n.rkey);
//try {
assert(subheld.isEmpty() || compareL(n.lkey, subheld.first()) < 0 && compareR(subheld.last(), n.rkey) < 0);
//} catch (AssertionError e) {
// System.out.println(n.lkey + " " + subheld.first() + " " + subheld.last() + " " + n.rkey);
// throw e;
//}
for (K key: subheld) {
reassignKeyToSweeper(key, vClo);
}
vClo.close();
// if no keys were added
if (vClo.isCleared()) {
try {
proc_deflate.submit(vClo, vClo.node);
} catch (InterruptedException e) {
// Impossible ?
throw new RuntimeException(e);
}
}
parNClo.acquire(n);
}
// original (unsplit) node had a ticket on the parNClo sweeper, release it
parNClo.release(node);
parNClo.close();
assert(!parNClo.isCleared()); // we always have at least one node to deflate
}
/**
** When we move a key to another node (eg. to the parent, or to a new node
** resulting from the split), we must deassign it from the original node's
** sweeper and reassign it to the sweeper for the new node.
**
** NOTE: if the overall co-ordinator algorithm is ever made concurrent,
** this section MUST be made atomic
**
** @param key The key
** @param clo The sweeper to reassign the key to
*/
private void reassignKeyToSweeper(K key, DeflateNode clo) {
clo.acquire(key);
//assert(((UpdateValue)value_closures.get(key)).node == node);
proc_val.update($K(key, (V)null), clo);
// FIXME what if it has already run???
if(logMINOR) Logger.minor(this, "Reassigning key "+key+" to "+clo+" on "+this+" parent="+parent+" parent split node "+parNClo+" parent deflate node "+parVClo);
// nodeVClo.release(key);
// this is unnecessary since nodeVClo() will only be used if we did not
// split its node (and never called this method)
}
}
/**
** Deposit for a PullTask
*/
class InflateChildNodes implements SafeClosure<SkeletonNode> {
/** The parent node, passed to closures which need it. */
final SkeletonNode parent;
/** The keys to put into this node. */
final SortedSet<K> putkey;
/** The closure for the parent node, passed to closures which need it. */
final SplitNode parNClo;
/** The value-closure for the parent node, passed to closures which need it. */
final DeflateNode parVClo;
protected InflateChildNodes(SkeletonNode p, SortedSet<K> ki, SplitNode pnc, DeflateNode pvc) {
parent = p;
putkey = ki;
parNClo = pnc;
parVClo = pvc;
}
protected InflateChildNodes(SortedSet<K> ki) {
this(null, ki, null, null);
}
/**
** Merge the relevant parts of the map into the node, and inflate its
** children. Runs whenever a node is popped from proc_pull.
*/
public void invoke(SkeletonNode node) {
assert(compareL(node.lkey, putkey.first()) < 0);
assert(compareR(putkey.last(), node.rkey) < 0);
// FIXME HIGH make this asynchronous
try { ((SkeletonTreeMap<K, V>)node.entries).inflate(); } catch (TaskAbortException e) { throw new RuntimeException(e); }
// closure to be called when all local values have been obtained
DeflateNode vClo = new DeflateNode(node, parNClo);
// closure to be called when all subnodes have been handled
SplitNode nClo = new SplitNode(node, parent, vClo, parNClo, parVClo);
// invalidate every totalSize cache directly after we inflate it
node._size = -1;
// OPT LOW if putkey is empty then skip
// each key in putkey is either added to the local entries, or delegated to
// the the relevant child node.
if (node.isLeaf()) {
// add all keys into the node, since there are no children.
if (proc_val == null) {
// OPT: could use a splice-merge here. for TreeMap, there is not an
// easy way of doing this, nor will it likely make a lot of a difference.
// however, if we re-implement SkeletonNode, this might become relevant.
for (K key: putkey) {
if(putmap.get(key) == null) throw new NullPointerException();
node.entries.put(key, putmap.get(key));
}
} else {
if(putkey.size() < proc_val.outputCapacity()) {
for (K key: putkey) { handleLocalPut(node, key, vClo); }
} else {
// Add as many as we can, then put the rest into rejected.
TreeSet<K> accepted = new TreeSet<K>(Sorted.select(putkey, proc_val.outputCapacity()/2));
List<SortedSet<K>> notAccepted = Sorted.split(putkey, accepted, new TreeSet<K>()); // FIXME NullSet ???
System.err.println("Too many keys to add to a single node: We can add "+proc_val.outputCapacity()+" but are being asked to add "+putkey.size()+" - adding "+accepted.size()+" and rejecting the rest.");
for (K key: accepted) { handleLocalPut(node, key, vClo); }
synchronized(rejected) {
for(SortedSet<K> set : notAccepted) {
rejected.addAll(set);
}
}
}
}
} else {
// only add keys that already exist locally in the node. other keys
// are delegated to the relevant child node.
SortedSet<K> fkey = new TreeSet<K>(comparator);
Iterable<SortedSet<K>> range = Sorted.split(putkey, Sorted.keySet(node.entries), fkey);
if (proc_val == null) {
for (K key: fkey) {
if(putmap.get(key) == null) throw new NullPointerException();
node.entries.put(key, putmap.get(key));
}
} else {
for (K key: fkey) { handleLocalPut(node, key, vClo); }
}
for (SortedSet<K> rng: range) {
GhostNode n;
try {
n = (GhostNode)node.selectNode(rng.first());
} catch (ClassCastException e) {
// This has been seen in practice. I have no idea what it means.
// FIXME HIGH !!!
Logger.error(this, "Node is already loaded?!?!?!: "+node.selectNode(rng.first()));
continue;
}
PullTask<SkeletonNode> task = new PullTask<SkeletonNode>(n);
// possibly re-design CountingSweeper to not care about types, or have acquire() instead
nClo.acquire((SkeletonNode)null); // dirty hack. FIXME LOW
// WORKAROUND unnecessary cast here - bug in SunJDK6; works fine on OpenJDK6
ObjectProcessor.submitSafe(proc_pull, task, (SafeClosure<SkeletonNode>)new InflateChildNodes(node, rng, nClo, vClo));
}
}
nClo.close();
if (nClo.isCleared()) { nClo.run(); } // eg. if no child nodes need to be modified
}
/**
** Handle a planned local put to the node.
**
** Keys added locally have their values set to null. These will be updated
** with the correct values via UpdateValue, when the value-getter completes
** its operation on the key. We add the keys now, **before** the value is
** obtained, so that SplitNode can work out how to split the node as early
** as possible.
**
** @param n The node to put the key into
** @param key The key
** @param vClo The sweeper that tracks if the key's value has been obtained
*/
private void handleLocalPut(SkeletonNode n, K key, DeflateNode vClo) {
V oldval = n.entries.put(key, null);
vClo.acquire(key);
if(logMINOR) Logger.minor(this, "handleLocalPut for key "+key+" old value "+oldval+" for deflate node "+vClo+" - passing to proc_val");
ObjectProcessor.submitSafe(proc_val, $K(key, oldval), vClo);
}
private void handleLocalRemove(SkeletonNode n, K key, TrackingSweeper<K, SortedSet<K>> vClo) {
throw new UnsupportedOperationException("not implemented");
}
}
proc_pull.setName("pull");
proc_push.setName("push");
if (proc_val != null) { proc_val.setName("val"); }
proc_deflate.setName("deflate");
try {
(new InflateChildNodes(putkey)).invoke((SkeletonNode)root);
// FIXME HIGH make a copy of the deflated root so that we can restore it if the
// operation fails
int olds = size;
boolean progress = true;
int count = 0;
int ccount = 0;
do {
//System.out.println(System.identityHashCode(this) + " " + proc_pull + " " + proc_push + " " + ((proc_val == null)? "": proc_val));
// Only sleep if we run out of jobs.
if((!progress) && (count++ > 10)) {
count = 0;
if(ccount++ > 10) {
System.out.println(/*System.identityHashCode(this) + " " + */proc_val + " " + proc_pull + " " + proc_push+ " "+proc_deflate);
ccount = 0;
}
Thread.sleep(0x100);
}
progress = false;
boolean loop = false;
while (proc_push.hasCompleted()) {
X3<PushTask<SkeletonNode>, CountingSweeper<SkeletonNode>, TaskAbortException> res = proc_push.accept();
PushTask<SkeletonNode> task = res._0;
CountingSweeper<SkeletonNode> sw = res._1;
TaskAbortException ex = res._2;
if (ex != null) {
// FIXME HIGH
throw new UnsupportedOperationException("SkeletonBTreeMap.update(): PushTask aborted; handler not implemented yet", ex);
}
postPushTask(task, ((SplitNode)sw).node);
sw.release(task.data);
if (sw.isCleared()) { ((Runnable)sw).run(); }
loop = true;
progress = true;
}
if(loop) continue;
//System.out.println(System.identityHashCode(this) + " " + proc_push + " " + ((proc_val == null)? "": proc_val+ " ") + proc_pull);
if(proc_deflate.hasCompleted()) {
X3<DeflateNode, SkeletonNode, TaskAbortException> res = proc_deflate.accept();
DeflateNode sw = res._0;
TaskAbortException ex = res._2;
if(ex != null)
// FIXME HIGH
throw ex;
sw.run();
progress = true;
continue;
}
if(loop) continue;
if (proc_val != null && proc_val.hasCompleted()) {
X3<Map.Entry<K, V>, DeflateNode, X> res = proc_val.accept();
Map.Entry<K, V> en = res._0;
DeflateNode sw = res._1;
X ex = res._2;
if (ex != null) {
// FIXME HIGH
throw new UnsupportedOperationException("SkeletonBTreeMap.update(): value-retrieval aborted; handler not implemented yet", ex);
}
sw.invoke(en);
sw.release(en.getKey());
if (sw.isCleared()) {
proc_deflate.submit(sw, sw.node);
}
progress = true;
continue;
}
if (proc_pull.hasCompleted()) {
X3<PullTask<SkeletonNode>, SafeClosure<SkeletonNode>, TaskAbortException> res = proc_pull.accept();
PullTask<SkeletonNode> task = res._0;
SafeClosure<SkeletonNode> clo = res._1;
TaskAbortException ex = res._2;
if (ex != null) {
// FIXME HIGH
throw new UnsupportedOperationException("SkeletonBTreeMap.update(): PullTask aborted; handler not implemented yet", ex);
}
SkeletonNode node = postPullTask(task, ((InflateChildNodes)clo).parent);
clo.invoke(node);
progress = true;
continue;
}
} while (proc_pull.hasPending() || proc_push.hasPending() || (proc_val != null && proc_val.hasPending()) || proc_deflate.hasPending());
size = root.totalSize();
} catch (RuntimeException e) {
throw new TaskAbortException("Task failed", e);
} catch (DataFormatException e) {
throw new TaskAbortException("Bad data format", e);
} catch (InterruptedException e) {
throw new TaskAbortException("interrupted", e);
} finally {
proc_pull.close();
proc_push.close();
if (proc_val != null) { proc_val.close(); }
proc_deflate.close();
}
if(rejected == null || rejected.isEmpty()) return;
System.err.println("Rejected keys: "+rejected.size()+" - re-running merge with rejected keys.");
putkey = rejected;
- rejected = new TreeSet<K>();
+ rejected.clear();
}
}
/**
** Creates a translator for the nodes of the B-tree. This method is
** necessary because {@link NodeTranslator} is a non-static class.
**
** For an in-depth discussion on why that class is not static, see the
** class description for {@link BTreeMap.Node}.
**
** TODO LOW maybe store these in a WeakHashSet or something... will need to
** code equals() and hashCode() for that
**
** @param ktr Translator for the keys
** @param mtr Translator for each node's local entries map
*/
public <Q, R> NodeTranslator<Q, R> makeNodeTranslator(Translator<K, Q> ktr, Translator<SkeletonTreeMap<K, V>, R> mtr) {
return new NodeTranslator<Q, R>(ktr, mtr);
}
/************************************************************************
** DOCUMENT.
**
** For an in-depth discussion on why this class is not static, see the
** class description for {@link BTreeMap.Node}.
**
** @param <Q> Target type of key-translator
** @param <R> Target type of map-translater
** @author infinity0
*/
public class NodeTranslator<Q, R> implements Translator<SkeletonNode, Map<String, Object>> {
/**
** An optional translator for the keys.
*/
final Translator<K, Q> ktr;
/**
** An optional translator for each node's local entries map.
*/
final Translator<SkeletonTreeMap<K, V>, R> mtr;
public NodeTranslator(Translator<K, Q> k, Translator<SkeletonTreeMap<K, V>, R> m) {
ktr = k;
mtr = m;
}
/*@Override**/ public Map<String, Object> app(SkeletonNode node) {
if (!node.isBare()) {
throw new IllegalStateException("Cannot translate non-bare node " + node.getRange() + "; size:" + node.nodeSize() + "; ghosts:" + node.ghosts + "; root:" + (root == node));
}
Map<String, Object> map = new LinkedHashMap<String, Object>();
map.put("lkey", (ktr == null)? node.lkey: ktr.app(node.lkey));
map.put("rkey", (ktr == null)? node.rkey: ktr.app(node.rkey));
map.put("entries", (mtr == null)? node.entries: mtr.app((SkeletonTreeMap<K, V>)node.entries));
if (!node.isLeaf()) {
Map<Object, Integer> subnodes = new LinkedHashMap<Object, Integer>();
for (X3<K, Node, K> next: node.iterNodesK()) {
GhostNode gh = (GhostNode)(next._1);
subnodes.put(gh.getMeta(), gh.totalSize());
}
map.put("subnodes", subnodes);
}
return map;
}
/*@Override**/ public SkeletonNode rev(Map<String, Object> map) throws DataFormatException {
try {
boolean notleaf = map.containsKey("subnodes");
List<GhostNode> gh = null;
if (notleaf) {
Map<Object, Integer> subnodes = (Map<Object, Integer>)map.get("subnodes");
gh = new ArrayList<GhostNode>(subnodes.size());
for (Map.Entry<Object, Integer> en: subnodes.entrySet()) {
GhostNode ghost = new GhostNode(null, null, null, en.getValue());
ghost.setMeta(en.getKey());
gh.add(ghost);
}
}
SkeletonNode node = new SkeletonNode(
(ktr == null)? (K)map.get("lkey"): ktr.rev((Q)map.get("lkey")),
(ktr == null)? (K)map.get("rkey"): ktr.rev((Q)map.get("rkey")),
!notleaf,
(mtr == null)? (SkeletonTreeMap<K, V>)map.get("entries")
: mtr.rev((R)map.get("entries")),
gh
);
if (!node.isBare()) {
throw new IllegalStateException("map-translator did not produce a bare SkeletonTreeMap: " + mtr);
}
verifyNodeIntegrity(node);
return node;
} catch (ClassCastException e) {
throw new DataFormatException("Could not build SkeletonNode from data", e, map, null, null);
} catch (IllegalArgumentException e) {
throw new DataFormatException("Could not build SkeletonNode from data", e, map, null, null);
} catch (IllegalStateException e) {
throw new DataFormatException("Could not build SkeletonNode from data", e, map, null, null);
}
}
}
/************************************************************************
** {@link Translator} with access to the members of {@link BTreeMap}.
** DOCUMENT.
**
** @author infinity0
*/
public static class TreeTranslator<K, V> implements Translator<SkeletonBTreeMap<K, V>, Map<String, Object>> {
final Translator<K, ?> ktr;
final Translator<SkeletonTreeMap<K, V>, ?> mtr;
public TreeTranslator(Translator<K, ?> k, Translator<SkeletonTreeMap<K, V>, ?> m) {
ktr = k;
mtr = m;
}
/*@Override**/ public Map<String, Object> app(SkeletonBTreeMap<K, V> tree) {
if (tree.comparator() != null) {
throw new UnsupportedOperationException("Sorry, this translator does not (yet) support comparators");
}
Map<String, Object> map = new LinkedHashMap<String, Object>();
map.put("node_min", tree.NODE_MIN);
map.put("size", tree.size);
Map<String, Object> rmap = tree.makeNodeTranslator(ktr, mtr).app((SkeletonBTreeMap.SkeletonNode)tree.root);
map.put("entries", rmap.get("entries"));
if (!tree.root.isLeaf()) {
map.put("subnodes", rmap.get("subnodes"));
}
return map;
}
/*@Override**/ public SkeletonBTreeMap<K, V> rev(Map<String, Object> map) throws DataFormatException {
try {
SkeletonBTreeMap<K, V> tree = new SkeletonBTreeMap<K, V>((Integer)map.get("node_min"));
tree.size = (Integer)map.get("size");
// map.put("lkey", null); // NULLNOTICE: get() gives null which matches
// map.put("rkey", null); // NULLNOTICE: get() gives null which matches
tree.root = tree.makeNodeTranslator(ktr, mtr).rev(map);
if (tree.size != tree.root.totalSize()) {
throw new DataFormatException("Mismatched sizes - tree: " + tree.size + "; root: " + tree.root.totalSize(), null, null);
}
return tree;
} catch (ClassCastException e) {
throw new DataFormatException("Could not build SkeletonBTreeMap from data", e, map, null, null);
}
}
}
public String toString() {
// Default toString for an AbstractCollection dumps everything underneath it.
// We don't want that here, especially as they may not be loaded.
return getClass().getName() + "@" + System.identityHashCode(this)+":size="+size;
}
}
| false | true | protected <X extends Exception> void update(
SortedSet<K> putkey, SortedSet<K> remkey,
final SortedMap<K, V> putmap, Closure<Map.Entry<K, V>, X> value_handler,
ExceptionConvertor<X> conv
) throws TaskAbortException {
while(true) {
SortedSet<K> rejected;
if (value_handler == null) {
// synchronous value callback - null, remkey, putmap, null
assert(putkey == null);
putkey = Sorted.keySet(putmap);
rejected = null;
} else {
// asynchronous value callback - putkey, remkey, null, closure
assert(putmap == null);
rejected = new TreeSet<K>();
}
if (remkey != null && !remkey.isEmpty()) {
throw new UnsupportedOperationException("SkeletonBTreeMap: update() currently only supports merge operations");
}
/*
** The code below might seem confusing at first, because the action of
** the algorithm on a single node is split up into several asynchronous
** parts, which are not visually adjacent. Here is a more contiguous
** description of what happens to a single node between being inflated
** and then eventually deflated.
**
** Life cycle of a node:
**
** - node gets popped from proc_pull
** - enter InflateChildNodes
** - subnodes get pushed into proc_pull
** - (recurse for each subnode)
** - subnode gets popped from proc_pull
** - etc
** - split-subnodes get pushed into proc_push
** - wait for all: split-subnodes get popped from proc_push
** - enter SplitNode
** - for each item in the original node's DeflateNode
** - release the item and acquire it on
** - the parent's DeflateNode if the item is a separator
** - a new DeflateNode if the item is now in a split-node
** - for each split-node:
** - wait for all: values get popped from proc_val; SplitNode to close()
** - enter DeflateNode
** - split-node gets pushed into proc_push (except for root)
**
*/
// TODO LOW - currently, the algorithm will automatically completely
// inflate each node as it is pulled in from the network (ie. inflate
// all of its values). this is not necessary, since not all of the
// values may be updated. it would be possible to make it work more
// efficiently, which would save some network traffic, but this would
// be quite fiddly. also, the current way allows the Packer to be more
// aggressive in packing the values into splitfiles.
// FIXME NORM - currently, there is a potential deadlock issue here,
// because proc_{pull,push,val} all use the same ThreadPoolExecutor to
// execute tasks. if the pool fills up with manager tasks {pull,push}
// then worker tasks {val} cannot execute, resulting in deadlock. at
// present, this is avoided by having ObjectProcessor.maxconc less than
// the poolsize, but future developers may change this unknowingly.
//
// a proper solution would be to have manager and worker tasks use
// different thread pools, ie. different ThreadPoolExecutors. care
// needs to be taken when doing this because the call can be recursive;
// ie. if the values are also SkeletonBTreeMaps, then the workers might
// start child "manager" tasks by calling value.update()
//
// arguably a better solution would be to not use threads, and use
// the async interface (i should have done this when i first coded it).
// see doc/todo.txt for details
final ObjectProcessor<PullTask<SkeletonNode>, SafeClosure<SkeletonNode>, TaskAbortException> proc_pull
= ((ScheduledSerialiser<SkeletonNode>)nsrl).pullSchedule(
new PriorityBlockingQueue<PullTask<SkeletonNode>>(0x10, CMP_PULL),
new LinkedBlockingQueue<X2<PullTask<SkeletonNode>, TaskAbortException>>(8),
new HashMap<PullTask<SkeletonNode>, SafeClosure<SkeletonNode>>()
);
final ObjectProcessor<PushTask<SkeletonNode>, CountingSweeper<SkeletonNode>, TaskAbortException> proc_push
= ((ScheduledSerialiser<SkeletonNode>)nsrl).pushSchedule(
new PriorityBlockingQueue<PushTask<SkeletonNode>>(0x10, CMP_PUSH),
new LinkedBlockingQueue<X2<PushTask<SkeletonNode>, TaskAbortException>>(0x10),
new HashMap<PushTask<SkeletonNode>, CountingSweeper<SkeletonNode>>()
);
/**
** Deposit for a value-retrieval operation
*/
class DeflateNode extends TrackingSweeper<K, SortedSet<K>> implements Runnable, SafeClosure<Map.Entry<K, V>> {
/** The node to be pushed, when run() is called. */
final SkeletonNode node;
/** A closure for the parent node. This is called when all of its children (of
** which this.node is one) have been pushed. */
final CountingSweeper<SkeletonNode> parNClo;
private boolean deflated;
protected DeflateNode(SkeletonNode n, CountingSweeper<SkeletonNode> pnc) {
super(true, true, new TreeSet<K>(comparator), null);
parNClo = pnc;
node = n;
}
/**
** Push this node. This is run when this sweeper is cleared, which
** happens after all the node's local values have been obtained,
** '''and''' the node has passed through SplitNode (which closes
** this sweeper).
*/
public void run() {
try {
deflate();
} catch (TaskAbortException e) {
throw new RuntimeException(e); // FIXME HIGH
}
assert(node.isBare());
if (parNClo == null) {
// do not deflate the root
assert(node == root);
return;
}
ObjectProcessor.submitSafe(proc_push, new PushTask<SkeletonNode>(node), parNClo);
}
/**
** Update the key's value in the node. Runs whenever an entry is
** popped from proc_val.
*/
public void invoke(Map.Entry<K, V> en) {
assert(node.entries.containsKey(en.getKey()));
node.entries.put(en.getKey(), en.getValue());
if(logMINOR) Logger.minor(this, "New value for key "+en.getKey()+" : "+en.getValue()+" in "+node+" parent = "+parNClo);
}
public void deflate() throws TaskAbortException {
synchronized(this) {
if(deflated) return;
deflated = true;
}
((SkeletonTreeMap<K, V>)node.entries).deflate();
}
}
// must be located after DeflateNode's class definition
// The proc_val output queue must comfortably cover everything generated by a single invocation of InflateChildNodes, or else we will deadlock.
// Note that this is all deflated sub-trees, so they are relatively small - some of the other queues
// handle much larger structures in their counters.
final ObjectProcessor<Map.Entry<K, V>, DeflateNode, X> proc_val = (value_handler == null)? null
: new ObjectProcessor<Map.Entry<K, V>, DeflateNode, X>(
new BoundedPriorityBlockingQueue<Map.Entry<K, V>>(0x10, CMP_ENTRY),
new LinkedBlockingQueue<X2<Map.Entry<K, V>, X>>(ENT_MAX*3),
new HashMap<Map.Entry<K, V>, DeflateNode>(),
value_handler, VALUE_EXECUTOR, conv // These can block so pool them separately.
).autostart();
final Comparator<DeflateNode> CMP_DEFLATE = new Comparator<DeflateNode>() {
public int compare(DeflateNode arg0, DeflateNode arg1) {
return arg0.node.compareTo(arg1.node);
}
};
final ObjectProcessor<DeflateNode, SkeletonNode, TaskAbortException> proc_deflate =
new ObjectProcessor<DeflateNode, SkeletonNode, TaskAbortException>(
new BoundedPriorityBlockingQueue<DeflateNode>(0x10, CMP_DEFLATE),
new LinkedBlockingQueue<X2<DeflateNode, TaskAbortException>>(),
new HashMap<DeflateNode, SkeletonNode>(),
new Closure<DeflateNode, TaskAbortException>() {
public void invoke(DeflateNode param) throws TaskAbortException {
param.deflate();
}
}, DEFLATE_EXECUTOR, new TaskAbortExceptionConvertor()).autostart();
// Limit it to 2 at once to minimise memory usage.
// The actual inserts will occur in parallel anyway.
proc_deflate.setMaxConc(2);
// Dummy constant for SplitNode
final SortedMap<K, V> EMPTY_SORTEDMAP = new TreeMap<K, V>(comparator);
/**
** Deposit for a PushTask
*/
class SplitNode extends CountingSweeper<SkeletonNode> implements Runnable {
/** The node to be split, when run() is called. */
final SkeletonNode node;
/** The node's parent, where new nodes/keys are attached during the split process. */
/*final*/ SkeletonNode parent;
/** The value-closure for this node. This keeps track of all unhandled values
* in this node. If this node is split, and the values have not been handled,
* they are passed onto the value-closures of the relevant split nodes (or
* that of the parent node, if the key turns out to be a separator key). */
final DeflateNode nodeVClo;
/** The closure for the parent node, also a CountingSweeper. We keep a
* reference to this so we can add the new split nodes to it. */
/*final*/ SplitNode parNClo;
/** The value-closure for the parent node. The comment for nodeVClo explains
* why we need a reference to this. */
/*final*/ DeflateNode parVClo;
protected SplitNode(SkeletonNode n, SkeletonNode p, DeflateNode vc, SplitNode pnc, DeflateNode pvc) {
super(true, false);
node = n;
parent = p;
nodeVClo = vc;
parNClo = pnc;
parVClo = pvc;
}
/**
** Closes the node's DeflateNode, and (if appropriate) splits the
** node and updates the deposits for each key moved. This is run
** after all its children have been deflated.
*/
public void run() {
assert(node.ghosts == node.childCount());
// All subnodes have been deflated, so nothing else can possibly add keys
// to this node.
nodeVClo.close();
int sk = minKeysFor(node.nodeSize());
// No need to split
if (sk == 0) {
if (nodeVClo.isCleared()) {
try {
proc_deflate.submit(nodeVClo, nodeVClo.node);
} catch (InterruptedException e) {
// Impossible ?
throw new RuntimeException(e);
}
}
return;
}
if (parent == null) {
assert(parNClo == null && parVClo == null);
// create a new parent, parNClo, parVClo
// similar stuff as for InflateChildNodes but no merging
parent = new SkeletonNode(null, null, false);
parent.addAll(EMPTY_SORTEDMAP, Collections.singleton(node));
parVClo = new DeflateNode(parent, null);
parNClo = new SplitNode(parent, null, parVClo, null, null);
parNClo.acquire(node);
parNClo.close();
root = parent;
}
Collection<K> keys = Sorted.select(Sorted.keySet(node.entries), sk);
parent.split(node.lkey, keys, node.rkey);
Iterable<Node> nodes = parent.iterNodes(node.lkey, node.rkey);
// WORKAROUND unnecessary cast here - bug in SunJDK6; works fine on OpenJDK6
SortedSet<K> held = (SortedSet<K>)nodeVClo.view();
// if synchronous, all values should have already been handled
assert(proc_val != null || held.size() == 0);
// reassign appropriate keys to parent sweeper
for (K key: keys) {
if (!held.contains(key)) { continue; }
reassignKeyToSweeper(key, parVClo);
}
//System.out.println("parent:"+parent.getRange()+"\nseps:"+keys+"\nheld:"+held);
parNClo.open();
// for each split-node, create a sweeper that will run when all its (k,v)
// pairs have been popped from value_complete
for (Node nn: nodes) {
SkeletonNode n = (SkeletonNode)nn;
DeflateNode vClo = new DeflateNode(n, parNClo);
// reassign appropriate keys to the split-node's sweeper
SortedSet<K> subheld = subSet(held, n.lkey, n.rkey);
//try {
assert(subheld.isEmpty() || compareL(n.lkey, subheld.first()) < 0 && compareR(subheld.last(), n.rkey) < 0);
//} catch (AssertionError e) {
// System.out.println(n.lkey + " " + subheld.first() + " " + subheld.last() + " " + n.rkey);
// throw e;
//}
for (K key: subheld) {
reassignKeyToSweeper(key, vClo);
}
vClo.close();
// if no keys were added
if (vClo.isCleared()) {
try {
proc_deflate.submit(vClo, vClo.node);
} catch (InterruptedException e) {
// Impossible ?
throw new RuntimeException(e);
}
}
parNClo.acquire(n);
}
// original (unsplit) node had a ticket on the parNClo sweeper, release it
parNClo.release(node);
parNClo.close();
assert(!parNClo.isCleared()); // we always have at least one node to deflate
}
/**
** When we move a key to another node (eg. to the parent, or to a new node
** resulting from the split), we must deassign it from the original node's
** sweeper and reassign it to the sweeper for the new node.
**
** NOTE: if the overall co-ordinator algorithm is ever made concurrent,
** this section MUST be made atomic
**
** @param key The key
** @param clo The sweeper to reassign the key to
*/
private void reassignKeyToSweeper(K key, DeflateNode clo) {
clo.acquire(key);
//assert(((UpdateValue)value_closures.get(key)).node == node);
proc_val.update($K(key, (V)null), clo);
// FIXME what if it has already run???
if(logMINOR) Logger.minor(this, "Reassigning key "+key+" to "+clo+" on "+this+" parent="+parent+" parent split node "+parNClo+" parent deflate node "+parVClo);
// nodeVClo.release(key);
// this is unnecessary since nodeVClo() will only be used if we did not
// split its node (and never called this method)
}
}
/**
** Deposit for a PullTask
*/
class InflateChildNodes implements SafeClosure<SkeletonNode> {
/** The parent node, passed to closures which need it. */
final SkeletonNode parent;
/** The keys to put into this node. */
final SortedSet<K> putkey;
/** The closure for the parent node, passed to closures which need it. */
final SplitNode parNClo;
/** The value-closure for the parent node, passed to closures which need it. */
final DeflateNode parVClo;
protected InflateChildNodes(SkeletonNode p, SortedSet<K> ki, SplitNode pnc, DeflateNode pvc) {
parent = p;
putkey = ki;
parNClo = pnc;
parVClo = pvc;
}
protected InflateChildNodes(SortedSet<K> ki) {
this(null, ki, null, null);
}
/**
** Merge the relevant parts of the map into the node, and inflate its
** children. Runs whenever a node is popped from proc_pull.
*/
public void invoke(SkeletonNode node) {
assert(compareL(node.lkey, putkey.first()) < 0);
assert(compareR(putkey.last(), node.rkey) < 0);
// FIXME HIGH make this asynchronous
try { ((SkeletonTreeMap<K, V>)node.entries).inflate(); } catch (TaskAbortException e) { throw new RuntimeException(e); }
// closure to be called when all local values have been obtained
DeflateNode vClo = new DeflateNode(node, parNClo);
// closure to be called when all subnodes have been handled
SplitNode nClo = new SplitNode(node, parent, vClo, parNClo, parVClo);
// invalidate every totalSize cache directly after we inflate it
node._size = -1;
// OPT LOW if putkey is empty then skip
// each key in putkey is either added to the local entries, or delegated to
// the the relevant child node.
if (node.isLeaf()) {
// add all keys into the node, since there are no children.
if (proc_val == null) {
// OPT: could use a splice-merge here. for TreeMap, there is not an
// easy way of doing this, nor will it likely make a lot of a difference.
// however, if we re-implement SkeletonNode, this might become relevant.
for (K key: putkey) {
if(putmap.get(key) == null) throw new NullPointerException();
node.entries.put(key, putmap.get(key));
}
} else {
if(putkey.size() < proc_val.outputCapacity()) {
for (K key: putkey) { handleLocalPut(node, key, vClo); }
} else {
// Add as many as we can, then put the rest into rejected.
TreeSet<K> accepted = new TreeSet<K>(Sorted.select(putkey, proc_val.outputCapacity()/2));
List<SortedSet<K>> notAccepted = Sorted.split(putkey, accepted, new TreeSet<K>()); // FIXME NullSet ???
System.err.println("Too many keys to add to a single node: We can add "+proc_val.outputCapacity()+" but are being asked to add "+putkey.size()+" - adding "+accepted.size()+" and rejecting the rest.");
for (K key: accepted) { handleLocalPut(node, key, vClo); }
synchronized(rejected) {
for(SortedSet<K> set : notAccepted) {
rejected.addAll(set);
}
}
}
}
} else {
// only add keys that already exist locally in the node. other keys
// are delegated to the relevant child node.
SortedSet<K> fkey = new TreeSet<K>(comparator);
Iterable<SortedSet<K>> range = Sorted.split(putkey, Sorted.keySet(node.entries), fkey);
if (proc_val == null) {
for (K key: fkey) {
if(putmap.get(key) == null) throw new NullPointerException();
node.entries.put(key, putmap.get(key));
}
} else {
for (K key: fkey) { handleLocalPut(node, key, vClo); }
}
for (SortedSet<K> rng: range) {
GhostNode n;
try {
n = (GhostNode)node.selectNode(rng.first());
} catch (ClassCastException e) {
// This has been seen in practice. I have no idea what it means.
// FIXME HIGH !!!
Logger.error(this, "Node is already loaded?!?!?!: "+node.selectNode(rng.first()));
continue;
}
PullTask<SkeletonNode> task = new PullTask<SkeletonNode>(n);
// possibly re-design CountingSweeper to not care about types, or have acquire() instead
nClo.acquire((SkeletonNode)null); // dirty hack. FIXME LOW
// WORKAROUND unnecessary cast here - bug in SunJDK6; works fine on OpenJDK6
ObjectProcessor.submitSafe(proc_pull, task, (SafeClosure<SkeletonNode>)new InflateChildNodes(node, rng, nClo, vClo));
}
}
nClo.close();
if (nClo.isCleared()) { nClo.run(); } // eg. if no child nodes need to be modified
}
/**
** Handle a planned local put to the node.
**
** Keys added locally have their values set to null. These will be updated
** with the correct values via UpdateValue, when the value-getter completes
** its operation on the key. We add the keys now, **before** the value is
** obtained, so that SplitNode can work out how to split the node as early
** as possible.
**
** @param n The node to put the key into
** @param key The key
** @param vClo The sweeper that tracks if the key's value has been obtained
*/
private void handleLocalPut(SkeletonNode n, K key, DeflateNode vClo) {
V oldval = n.entries.put(key, null);
vClo.acquire(key);
if(logMINOR) Logger.minor(this, "handleLocalPut for key "+key+" old value "+oldval+" for deflate node "+vClo+" - passing to proc_val");
ObjectProcessor.submitSafe(proc_val, $K(key, oldval), vClo);
}
private void handleLocalRemove(SkeletonNode n, K key, TrackingSweeper<K, SortedSet<K>> vClo) {
throw new UnsupportedOperationException("not implemented");
}
}
proc_pull.setName("pull");
proc_push.setName("push");
if (proc_val != null) { proc_val.setName("val"); }
proc_deflate.setName("deflate");
try {
(new InflateChildNodes(putkey)).invoke((SkeletonNode)root);
// FIXME HIGH make a copy of the deflated root so that we can restore it if the
// operation fails
int olds = size;
boolean progress = true;
int count = 0;
int ccount = 0;
do {
//System.out.println(System.identityHashCode(this) + " " + proc_pull + " " + proc_push + " " + ((proc_val == null)? "": proc_val));
// Only sleep if we run out of jobs.
if((!progress) && (count++ > 10)) {
count = 0;
if(ccount++ > 10) {
System.out.println(/*System.identityHashCode(this) + " " + */proc_val + " " + proc_pull + " " + proc_push+ " "+proc_deflate);
ccount = 0;
}
Thread.sleep(0x100);
}
progress = false;
boolean loop = false;
while (proc_push.hasCompleted()) {
X3<PushTask<SkeletonNode>, CountingSweeper<SkeletonNode>, TaskAbortException> res = proc_push.accept();
PushTask<SkeletonNode> task = res._0;
CountingSweeper<SkeletonNode> sw = res._1;
TaskAbortException ex = res._2;
if (ex != null) {
// FIXME HIGH
throw new UnsupportedOperationException("SkeletonBTreeMap.update(): PushTask aborted; handler not implemented yet", ex);
}
postPushTask(task, ((SplitNode)sw).node);
sw.release(task.data);
if (sw.isCleared()) { ((Runnable)sw).run(); }
loop = true;
progress = true;
}
if(loop) continue;
//System.out.println(System.identityHashCode(this) + " " + proc_push + " " + ((proc_val == null)? "": proc_val+ " ") + proc_pull);
if(proc_deflate.hasCompleted()) {
X3<DeflateNode, SkeletonNode, TaskAbortException> res = proc_deflate.accept();
DeflateNode sw = res._0;
TaskAbortException ex = res._2;
if(ex != null)
// FIXME HIGH
throw ex;
sw.run();
progress = true;
continue;
}
if(loop) continue;
if (proc_val != null && proc_val.hasCompleted()) {
X3<Map.Entry<K, V>, DeflateNode, X> res = proc_val.accept();
Map.Entry<K, V> en = res._0;
DeflateNode sw = res._1;
X ex = res._2;
if (ex != null) {
// FIXME HIGH
throw new UnsupportedOperationException("SkeletonBTreeMap.update(): value-retrieval aborted; handler not implemented yet", ex);
}
sw.invoke(en);
sw.release(en.getKey());
if (sw.isCleared()) {
proc_deflate.submit(sw, sw.node);
}
progress = true;
continue;
}
if (proc_pull.hasCompleted()) {
X3<PullTask<SkeletonNode>, SafeClosure<SkeletonNode>, TaskAbortException> res = proc_pull.accept();
PullTask<SkeletonNode> task = res._0;
SafeClosure<SkeletonNode> clo = res._1;
TaskAbortException ex = res._2;
if (ex != null) {
// FIXME HIGH
throw new UnsupportedOperationException("SkeletonBTreeMap.update(): PullTask aborted; handler not implemented yet", ex);
}
SkeletonNode node = postPullTask(task, ((InflateChildNodes)clo).parent);
clo.invoke(node);
progress = true;
continue;
}
} while (proc_pull.hasPending() || proc_push.hasPending() || (proc_val != null && proc_val.hasPending()) || proc_deflate.hasPending());
size = root.totalSize();
} catch (RuntimeException e) {
throw new TaskAbortException("Task failed", e);
} catch (DataFormatException e) {
throw new TaskAbortException("Bad data format", e);
} catch (InterruptedException e) {
throw new TaskAbortException("interrupted", e);
} finally {
proc_pull.close();
proc_push.close();
if (proc_val != null) { proc_val.close(); }
proc_deflate.close();
}
if(rejected == null || rejected.isEmpty()) return;
System.err.println("Rejected keys: "+rejected.size()+" - re-running merge with rejected keys.");
putkey = rejected;
rejected = new TreeSet<K>();
}
}
| protected <X extends Exception> void update(
SortedSet<K> putkey, SortedSet<K> remkey,
final SortedMap<K, V> putmap, Closure<Map.Entry<K, V>, X> value_handler,
ExceptionConvertor<X> conv
) throws TaskAbortException {
while(true) {
final SortedSet<K> rejected;
if (value_handler == null) {
// synchronous value callback - null, remkey, putmap, null
assert(putkey == null);
putkey = Sorted.keySet(putmap);
rejected = null;
} else {
// asynchronous value callback - putkey, remkey, null, closure
assert(putmap == null);
rejected = new TreeSet<K>();
}
if (remkey != null && !remkey.isEmpty()) {
throw new UnsupportedOperationException("SkeletonBTreeMap: update() currently only supports merge operations");
}
/*
** The code below might seem confusing at first, because the action of
** the algorithm on a single node is split up into several asynchronous
** parts, which are not visually adjacent. Here is a more contiguous
** description of what happens to a single node between being inflated
** and then eventually deflated.
**
** Life cycle of a node:
**
** - node gets popped from proc_pull
** - enter InflateChildNodes
** - subnodes get pushed into proc_pull
** - (recurse for each subnode)
** - subnode gets popped from proc_pull
** - etc
** - split-subnodes get pushed into proc_push
** - wait for all: split-subnodes get popped from proc_push
** - enter SplitNode
** - for each item in the original node's DeflateNode
** - release the item and acquire it on
** - the parent's DeflateNode if the item is a separator
** - a new DeflateNode if the item is now in a split-node
** - for each split-node:
** - wait for all: values get popped from proc_val; SplitNode to close()
** - enter DeflateNode
** - split-node gets pushed into proc_push (except for root)
**
*/
// TODO LOW - currently, the algorithm will automatically completely
// inflate each node as it is pulled in from the network (ie. inflate
// all of its values). this is not necessary, since not all of the
// values may be updated. it would be possible to make it work more
// efficiently, which would save some network traffic, but this would
// be quite fiddly. also, the current way allows the Packer to be more
// aggressive in packing the values into splitfiles.
// FIXME NORM - currently, there is a potential deadlock issue here,
// because proc_{pull,push,val} all use the same ThreadPoolExecutor to
// execute tasks. if the pool fills up with manager tasks {pull,push}
// then worker tasks {val} cannot execute, resulting in deadlock. at
// present, this is avoided by having ObjectProcessor.maxconc less than
// the poolsize, but future developers may change this unknowingly.
//
// a proper solution would be to have manager and worker tasks use
// different thread pools, ie. different ThreadPoolExecutors. care
// needs to be taken when doing this because the call can be recursive;
// ie. if the values are also SkeletonBTreeMaps, then the workers might
// start child "manager" tasks by calling value.update()
//
// arguably a better solution would be to not use threads, and use
// the async interface (i should have done this when i first coded it).
// see doc/todo.txt for details
final ObjectProcessor<PullTask<SkeletonNode>, SafeClosure<SkeletonNode>, TaskAbortException> proc_pull
= ((ScheduledSerialiser<SkeletonNode>)nsrl).pullSchedule(
new PriorityBlockingQueue<PullTask<SkeletonNode>>(0x10, CMP_PULL),
new LinkedBlockingQueue<X2<PullTask<SkeletonNode>, TaskAbortException>>(8),
new HashMap<PullTask<SkeletonNode>, SafeClosure<SkeletonNode>>()
);
final ObjectProcessor<PushTask<SkeletonNode>, CountingSweeper<SkeletonNode>, TaskAbortException> proc_push
= ((ScheduledSerialiser<SkeletonNode>)nsrl).pushSchedule(
new PriorityBlockingQueue<PushTask<SkeletonNode>>(0x10, CMP_PUSH),
new LinkedBlockingQueue<X2<PushTask<SkeletonNode>, TaskAbortException>>(0x10),
new HashMap<PushTask<SkeletonNode>, CountingSweeper<SkeletonNode>>()
);
/**
** Deposit for a value-retrieval operation
*/
class DeflateNode extends TrackingSweeper<K, SortedSet<K>> implements Runnable, SafeClosure<Map.Entry<K, V>> {
/** The node to be pushed, when run() is called. */
final SkeletonNode node;
/** A closure for the parent node. This is called when all of its children (of
** which this.node is one) have been pushed. */
final CountingSweeper<SkeletonNode> parNClo;
private boolean deflated;
protected DeflateNode(SkeletonNode n, CountingSweeper<SkeletonNode> pnc) {
super(true, true, new TreeSet<K>(comparator), null);
parNClo = pnc;
node = n;
}
/**
** Push this node. This is run when this sweeper is cleared, which
** happens after all the node's local values have been obtained,
** '''and''' the node has passed through SplitNode (which closes
** this sweeper).
*/
public void run() {
try {
deflate();
} catch (TaskAbortException e) {
throw new RuntimeException(e); // FIXME HIGH
}
assert(node.isBare());
if (parNClo == null) {
// do not deflate the root
assert(node == root);
return;
}
ObjectProcessor.submitSafe(proc_push, new PushTask<SkeletonNode>(node), parNClo);
}
/**
** Update the key's value in the node. Runs whenever an entry is
** popped from proc_val.
*/
public void invoke(Map.Entry<K, V> en) {
assert(node.entries.containsKey(en.getKey()));
node.entries.put(en.getKey(), en.getValue());
if(logMINOR) Logger.minor(this, "New value for key "+en.getKey()+" : "+en.getValue()+" in "+node+" parent = "+parNClo);
}
public void deflate() throws TaskAbortException {
synchronized(this) {
if(deflated) return;
deflated = true;
}
((SkeletonTreeMap<K, V>)node.entries).deflate();
}
}
// must be located after DeflateNode's class definition
// The proc_val output queue must comfortably cover everything generated by a single invocation of InflateChildNodes, or else we will deadlock.
// Note that this is all deflated sub-trees, so they are relatively small - some of the other queues
// handle much larger structures in their counters.
final ObjectProcessor<Map.Entry<K, V>, DeflateNode, X> proc_val = (value_handler == null)? null
: new ObjectProcessor<Map.Entry<K, V>, DeflateNode, X>(
new BoundedPriorityBlockingQueue<Map.Entry<K, V>>(0x10, CMP_ENTRY),
new LinkedBlockingQueue<X2<Map.Entry<K, V>, X>>(ENT_MAX*3),
new HashMap<Map.Entry<K, V>, DeflateNode>(),
value_handler, VALUE_EXECUTOR, conv // These can block so pool them separately.
).autostart();
final Comparator<DeflateNode> CMP_DEFLATE = new Comparator<DeflateNode>() {
public int compare(DeflateNode arg0, DeflateNode arg1) {
return arg0.node.compareTo(arg1.node);
}
};
final ObjectProcessor<DeflateNode, SkeletonNode, TaskAbortException> proc_deflate =
new ObjectProcessor<DeflateNode, SkeletonNode, TaskAbortException>(
new BoundedPriorityBlockingQueue<DeflateNode>(0x10, CMP_DEFLATE),
new LinkedBlockingQueue<X2<DeflateNode, TaskAbortException>>(),
new HashMap<DeflateNode, SkeletonNode>(),
new Closure<DeflateNode, TaskAbortException>() {
public void invoke(DeflateNode param) throws TaskAbortException {
param.deflate();
}
}, DEFLATE_EXECUTOR, new TaskAbortExceptionConvertor()).autostart();
// Limit it to 2 at once to minimise memory usage.
// The actual inserts will occur in parallel anyway.
proc_deflate.setMaxConc(2);
// Dummy constant for SplitNode
final SortedMap<K, V> EMPTY_SORTEDMAP = new TreeMap<K, V>(comparator);
/**
** Deposit for a PushTask
*/
class SplitNode extends CountingSweeper<SkeletonNode> implements Runnable {
/** The node to be split, when run() is called. */
final SkeletonNode node;
/** The node's parent, where new nodes/keys are attached during the split process. */
/*final*/ SkeletonNode parent;
/** The value-closure for this node. This keeps track of all unhandled values
* in this node. If this node is split, and the values have not been handled,
* they are passed onto the value-closures of the relevant split nodes (or
* that of the parent node, if the key turns out to be a separator key). */
final DeflateNode nodeVClo;
/** The closure for the parent node, also a CountingSweeper. We keep a
* reference to this so we can add the new split nodes to it. */
/*final*/ SplitNode parNClo;
/** The value-closure for the parent node. The comment for nodeVClo explains
* why we need a reference to this. */
/*final*/ DeflateNode parVClo;
protected SplitNode(SkeletonNode n, SkeletonNode p, DeflateNode vc, SplitNode pnc, DeflateNode pvc) {
super(true, false);
node = n;
parent = p;
nodeVClo = vc;
parNClo = pnc;
parVClo = pvc;
}
/**
** Closes the node's DeflateNode, and (if appropriate) splits the
** node and updates the deposits for each key moved. This is run
** after all its children have been deflated.
*/
public void run() {
assert(node.ghosts == node.childCount());
// All subnodes have been deflated, so nothing else can possibly add keys
// to this node.
nodeVClo.close();
int sk = minKeysFor(node.nodeSize());
// No need to split
if (sk == 0) {
if (nodeVClo.isCleared()) {
try {
proc_deflate.submit(nodeVClo, nodeVClo.node);
} catch (InterruptedException e) {
// Impossible ?
throw new RuntimeException(e);
}
}
return;
}
if (parent == null) {
assert(parNClo == null && parVClo == null);
// create a new parent, parNClo, parVClo
// similar stuff as for InflateChildNodes but no merging
parent = new SkeletonNode(null, null, false);
parent.addAll(EMPTY_SORTEDMAP, Collections.singleton(node));
parVClo = new DeflateNode(parent, null);
parNClo = new SplitNode(parent, null, parVClo, null, null);
parNClo.acquire(node);
parNClo.close();
root = parent;
}
Collection<K> keys = Sorted.select(Sorted.keySet(node.entries), sk);
parent.split(node.lkey, keys, node.rkey);
Iterable<Node> nodes = parent.iterNodes(node.lkey, node.rkey);
// WORKAROUND unnecessary cast here - bug in SunJDK6; works fine on OpenJDK6
SortedSet<K> held = (SortedSet<K>)nodeVClo.view();
// if synchronous, all values should have already been handled
assert(proc_val != null || held.size() == 0);
// reassign appropriate keys to parent sweeper
for (K key: keys) {
if (!held.contains(key)) { continue; }
reassignKeyToSweeper(key, parVClo);
}
//System.out.println("parent:"+parent.getRange()+"\nseps:"+keys+"\nheld:"+held);
parNClo.open();
// for each split-node, create a sweeper that will run when all its (k,v)
// pairs have been popped from value_complete
for (Node nn: nodes) {
SkeletonNode n = (SkeletonNode)nn;
DeflateNode vClo = new DeflateNode(n, parNClo);
// reassign appropriate keys to the split-node's sweeper
SortedSet<K> subheld = subSet(held, n.lkey, n.rkey);
//try {
assert(subheld.isEmpty() || compareL(n.lkey, subheld.first()) < 0 && compareR(subheld.last(), n.rkey) < 0);
//} catch (AssertionError e) {
// System.out.println(n.lkey + " " + subheld.first() + " " + subheld.last() + " " + n.rkey);
// throw e;
//}
for (K key: subheld) {
reassignKeyToSweeper(key, vClo);
}
vClo.close();
// if no keys were added
if (vClo.isCleared()) {
try {
proc_deflate.submit(vClo, vClo.node);
} catch (InterruptedException e) {
// Impossible ?
throw new RuntimeException(e);
}
}
parNClo.acquire(n);
}
// original (unsplit) node had a ticket on the parNClo sweeper, release it
parNClo.release(node);
parNClo.close();
assert(!parNClo.isCleared()); // we always have at least one node to deflate
}
/**
** When we move a key to another node (eg. to the parent, or to a new node
** resulting from the split), we must deassign it from the original node's
** sweeper and reassign it to the sweeper for the new node.
**
** NOTE: if the overall co-ordinator algorithm is ever made concurrent,
** this section MUST be made atomic
**
** @param key The key
** @param clo The sweeper to reassign the key to
*/
private void reassignKeyToSweeper(K key, DeflateNode clo) {
clo.acquire(key);
//assert(((UpdateValue)value_closures.get(key)).node == node);
proc_val.update($K(key, (V)null), clo);
// FIXME what if it has already run???
if(logMINOR) Logger.minor(this, "Reassigning key "+key+" to "+clo+" on "+this+" parent="+parent+" parent split node "+parNClo+" parent deflate node "+parVClo);
// nodeVClo.release(key);
// this is unnecessary since nodeVClo() will only be used if we did not
// split its node (and never called this method)
}
}
/**
** Deposit for a PullTask
*/
class InflateChildNodes implements SafeClosure<SkeletonNode> {
/** The parent node, passed to closures which need it. */
final SkeletonNode parent;
/** The keys to put into this node. */
final SortedSet<K> putkey;
/** The closure for the parent node, passed to closures which need it. */
final SplitNode parNClo;
/** The value-closure for the parent node, passed to closures which need it. */
final DeflateNode parVClo;
protected InflateChildNodes(SkeletonNode p, SortedSet<K> ki, SplitNode pnc, DeflateNode pvc) {
parent = p;
putkey = ki;
parNClo = pnc;
parVClo = pvc;
}
protected InflateChildNodes(SortedSet<K> ki) {
this(null, ki, null, null);
}
/**
** Merge the relevant parts of the map into the node, and inflate its
** children. Runs whenever a node is popped from proc_pull.
*/
public void invoke(SkeletonNode node) {
assert(compareL(node.lkey, putkey.first()) < 0);
assert(compareR(putkey.last(), node.rkey) < 0);
// FIXME HIGH make this asynchronous
try { ((SkeletonTreeMap<K, V>)node.entries).inflate(); } catch (TaskAbortException e) { throw new RuntimeException(e); }
// closure to be called when all local values have been obtained
DeflateNode vClo = new DeflateNode(node, parNClo);
// closure to be called when all subnodes have been handled
SplitNode nClo = new SplitNode(node, parent, vClo, parNClo, parVClo);
// invalidate every totalSize cache directly after we inflate it
node._size = -1;
// OPT LOW if putkey is empty then skip
// each key in putkey is either added to the local entries, or delegated to
// the the relevant child node.
if (node.isLeaf()) {
// add all keys into the node, since there are no children.
if (proc_val == null) {
// OPT: could use a splice-merge here. for TreeMap, there is not an
// easy way of doing this, nor will it likely make a lot of a difference.
// however, if we re-implement SkeletonNode, this might become relevant.
for (K key: putkey) {
if(putmap.get(key) == null) throw new NullPointerException();
node.entries.put(key, putmap.get(key));
}
} else {
if(putkey.size() < proc_val.outputCapacity()) {
for (K key: putkey) { handleLocalPut(node, key, vClo); }
} else {
// Add as many as we can, then put the rest into rejected.
TreeSet<K> accepted = new TreeSet<K>(Sorted.select(putkey, proc_val.outputCapacity()/2));
List<SortedSet<K>> notAccepted = Sorted.split(putkey, accepted, new TreeSet<K>()); // FIXME NullSet ???
System.err.println("Too many keys to add to a single node: We can add "+proc_val.outputCapacity()+" but are being asked to add "+putkey.size()+" - adding "+accepted.size()+" and rejecting the rest.");
for (K key: accepted) { handleLocalPut(node, key, vClo); }
synchronized(rejected) {
for(SortedSet<K> set : notAccepted) {
rejected.addAll(set);
}
}
}
}
} else {
// only add keys that already exist locally in the node. other keys
// are delegated to the relevant child node.
SortedSet<K> fkey = new TreeSet<K>(comparator);
Iterable<SortedSet<K>> range = Sorted.split(putkey, Sorted.keySet(node.entries), fkey);
if (proc_val == null) {
for (K key: fkey) {
if(putmap.get(key) == null) throw new NullPointerException();
node.entries.put(key, putmap.get(key));
}
} else {
for (K key: fkey) { handleLocalPut(node, key, vClo); }
}
for (SortedSet<K> rng: range) {
GhostNode n;
try {
n = (GhostNode)node.selectNode(rng.first());
} catch (ClassCastException e) {
// This has been seen in practice. I have no idea what it means.
// FIXME HIGH !!!
Logger.error(this, "Node is already loaded?!?!?!: "+node.selectNode(rng.first()));
continue;
}
PullTask<SkeletonNode> task = new PullTask<SkeletonNode>(n);
// possibly re-design CountingSweeper to not care about types, or have acquire() instead
nClo.acquire((SkeletonNode)null); // dirty hack. FIXME LOW
// WORKAROUND unnecessary cast here - bug in SunJDK6; works fine on OpenJDK6
ObjectProcessor.submitSafe(proc_pull, task, (SafeClosure<SkeletonNode>)new InflateChildNodes(node, rng, nClo, vClo));
}
}
nClo.close();
if (nClo.isCleared()) { nClo.run(); } // eg. if no child nodes need to be modified
}
/**
** Handle a planned local put to the node.
**
** Keys added locally have their values set to null. These will be updated
** with the correct values via UpdateValue, when the value-getter completes
** its operation on the key. We add the keys now, **before** the value is
** obtained, so that SplitNode can work out how to split the node as early
** as possible.
**
** @param n The node to put the key into
** @param key The key
** @param vClo The sweeper that tracks if the key's value has been obtained
*/
private void handleLocalPut(SkeletonNode n, K key, DeflateNode vClo) {
V oldval = n.entries.put(key, null);
vClo.acquire(key);
if(logMINOR) Logger.minor(this, "handleLocalPut for key "+key+" old value "+oldval+" for deflate node "+vClo+" - passing to proc_val");
ObjectProcessor.submitSafe(proc_val, $K(key, oldval), vClo);
}
private void handleLocalRemove(SkeletonNode n, K key, TrackingSweeper<K, SortedSet<K>> vClo) {
throw new UnsupportedOperationException("not implemented");
}
}
proc_pull.setName("pull");
proc_push.setName("push");
if (proc_val != null) { proc_val.setName("val"); }
proc_deflate.setName("deflate");
try {
(new InflateChildNodes(putkey)).invoke((SkeletonNode)root);
// FIXME HIGH make a copy of the deflated root so that we can restore it if the
// operation fails
int olds = size;
boolean progress = true;
int count = 0;
int ccount = 0;
do {
//System.out.println(System.identityHashCode(this) + " " + proc_pull + " " + proc_push + " " + ((proc_val == null)? "": proc_val));
// Only sleep if we run out of jobs.
if((!progress) && (count++ > 10)) {
count = 0;
if(ccount++ > 10) {
System.out.println(/*System.identityHashCode(this) + " " + */proc_val + " " + proc_pull + " " + proc_push+ " "+proc_deflate);
ccount = 0;
}
Thread.sleep(0x100);
}
progress = false;
boolean loop = false;
while (proc_push.hasCompleted()) {
X3<PushTask<SkeletonNode>, CountingSweeper<SkeletonNode>, TaskAbortException> res = proc_push.accept();
PushTask<SkeletonNode> task = res._0;
CountingSweeper<SkeletonNode> sw = res._1;
TaskAbortException ex = res._2;
if (ex != null) {
// FIXME HIGH
throw new UnsupportedOperationException("SkeletonBTreeMap.update(): PushTask aborted; handler not implemented yet", ex);
}
postPushTask(task, ((SplitNode)sw).node);
sw.release(task.data);
if (sw.isCleared()) { ((Runnable)sw).run(); }
loop = true;
progress = true;
}
if(loop) continue;
//System.out.println(System.identityHashCode(this) + " " + proc_push + " " + ((proc_val == null)? "": proc_val+ " ") + proc_pull);
if(proc_deflate.hasCompleted()) {
X3<DeflateNode, SkeletonNode, TaskAbortException> res = proc_deflate.accept();
DeflateNode sw = res._0;
TaskAbortException ex = res._2;
if(ex != null)
// FIXME HIGH
throw ex;
sw.run();
progress = true;
continue;
}
if(loop) continue;
if (proc_val != null && proc_val.hasCompleted()) {
X3<Map.Entry<K, V>, DeflateNode, X> res = proc_val.accept();
Map.Entry<K, V> en = res._0;
DeflateNode sw = res._1;
X ex = res._2;
if (ex != null) {
// FIXME HIGH
throw new UnsupportedOperationException("SkeletonBTreeMap.update(): value-retrieval aborted; handler not implemented yet", ex);
}
sw.invoke(en);
sw.release(en.getKey());
if (sw.isCleared()) {
proc_deflate.submit(sw, sw.node);
}
progress = true;
continue;
}
if (proc_pull.hasCompleted()) {
X3<PullTask<SkeletonNode>, SafeClosure<SkeletonNode>, TaskAbortException> res = proc_pull.accept();
PullTask<SkeletonNode> task = res._0;
SafeClosure<SkeletonNode> clo = res._1;
TaskAbortException ex = res._2;
if (ex != null) {
// FIXME HIGH
throw new UnsupportedOperationException("SkeletonBTreeMap.update(): PullTask aborted; handler not implemented yet", ex);
}
SkeletonNode node = postPullTask(task, ((InflateChildNodes)clo).parent);
clo.invoke(node);
progress = true;
continue;
}
} while (proc_pull.hasPending() || proc_push.hasPending() || (proc_val != null && proc_val.hasPending()) || proc_deflate.hasPending());
size = root.totalSize();
} catch (RuntimeException e) {
throw new TaskAbortException("Task failed", e);
} catch (DataFormatException e) {
throw new TaskAbortException("Bad data format", e);
} catch (InterruptedException e) {
throw new TaskAbortException("interrupted", e);
} finally {
proc_pull.close();
proc_push.close();
if (proc_val != null) { proc_val.close(); }
proc_deflate.close();
}
if(rejected == null || rejected.isEmpty()) return;
System.err.println("Rejected keys: "+rejected.size()+" - re-running merge with rejected keys.");
putkey = rejected;
rejected.clear();
}
}
|
diff --git a/src/org/jarvisland/level/level0/TutorialRoom.java b/src/org/jarvisland/level/level0/TutorialRoom.java
index 55b392d..93a3a46 100644
--- a/src/org/jarvisland/level/level0/TutorialRoom.java
+++ b/src/org/jarvisland/level/level0/TutorialRoom.java
@@ -1,72 +1,72 @@
package org.jarvisland.level.level0;
import org.jarvisland.InventoryManager;
import org.jarvisland.LevelManager;
import org.jarvisland.levels.room.AbstractRoom;
import org.jarvisland.levels.room.Room;
import org.jarvisland.levels.room.RoomNotAccessibleException;
/**
* La pièce tutoriel du niveau 0
*
* Il faut ouvrir un coffre, prendre la clé, utiliser la clé
* sur la porte et sortir de la pièce.
*
* @author niclupien
*
*/
public class TutorialRoom extends AbstractRoom {
boolean coffreOuvert = false;
boolean isPorteOuverte = false;
public String execute(String s) {
if (s.matches("OUVRIR.* COFFRE")) {
if (coffreOuvert)
return "Le coffre est déjà ouvert.";
coffreOuvert = true;
return "Le coffre s'ouvre et un épais nuage de poussière en sort. Il y a une clé dans le fond.";
- } else if (s.matches("PRENDRE.* CLÉ")) {
+ } else if (s.matches("PRENDRE.* CLE")) {
if (coffreOuvert && !InventoryManager.getInstance().hasItem("Clé")) {
InventoryManager.getInstance().addItem("Clé");
return "Vous ramassez une clé.";
}
- } else if (s.matches("UTILISER.* CLÉ.* PORTE")) {
+ } else if (s.matches("UTILISER.* CLE.* PORTE")) {
if (InventoryManager.getInstance().hasItem("Clé")) {
isPorteOuverte = true;
InventoryManager.getInstance().removeItem("Clé");
return "La porte est maintenant ouverte.";
}
}
return null;
}
public String look() {
return "Vous vous trouvez dans une petite pièce sombre.\n" +
"Vous n'avez aucune idée où vous êtes mais vous voyez\n" +
"un coffre dans un coin à côté d'ossements humains.";
}
public Room north() throws RoomNotAccessibleException {
if (!isPorteOuverte)
throw new RoomNotAccessibleException("Vous voyez une porte métallique.\n" +
"Elle est verrouillée et il n'y a aucun moyen de la défoncer.");
LevelManager.getInstance().notifyCurrentLevel("outOfFirstRoomEvent");
return null;
}
public Room south() throws RoomNotAccessibleException {
throw new RoomNotAccessibleException("Vous voyez un mur de pierre couvert de taches de sang.");
}
public Room east() throws RoomNotAccessibleException {
throw new RoomNotAccessibleException("Vous voyez un mur de pierre.");
}
public Room west() throws RoomNotAccessibleException {
throw new RoomNotAccessibleException("Vous voyez un mur de pierre.");
}
}
| false | true | public String execute(String s) {
if (s.matches("OUVRIR.* COFFRE")) {
if (coffreOuvert)
return "Le coffre est déjà ouvert.";
coffreOuvert = true;
return "Le coffre s'ouvre et un épais nuage de poussière en sort. Il y a une clé dans le fond.";
} else if (s.matches("PRENDRE.* CLÉ")) {
if (coffreOuvert && !InventoryManager.getInstance().hasItem("Clé")) {
InventoryManager.getInstance().addItem("Clé");
return "Vous ramassez une clé.";
}
} else if (s.matches("UTILISER.* CLÉ.* PORTE")) {
if (InventoryManager.getInstance().hasItem("Clé")) {
isPorteOuverte = true;
InventoryManager.getInstance().removeItem("Clé");
return "La porte est maintenant ouverte.";
}
}
return null;
}
| public String execute(String s) {
if (s.matches("OUVRIR.* COFFRE")) {
if (coffreOuvert)
return "Le coffre est déjà ouvert.";
coffreOuvert = true;
return "Le coffre s'ouvre et un épais nuage de poussière en sort. Il y a une clé dans le fond.";
} else if (s.matches("PRENDRE.* CLE")) {
if (coffreOuvert && !InventoryManager.getInstance().hasItem("Clé")) {
InventoryManager.getInstance().addItem("Clé");
return "Vous ramassez une clé.";
}
} else if (s.matches("UTILISER.* CLE.* PORTE")) {
if (InventoryManager.getInstance().hasItem("Clé")) {
isPorteOuverte = true;
InventoryManager.getInstance().removeItem("Clé");
return "La porte est maintenant ouverte.";
}
}
return null;
}
|
diff --git a/src/main/java/us/yuxin/hump/io/SymlinkRCFileInputFormat.java b/src/main/java/us/yuxin/hump/io/SymlinkRCFileInputFormat.java
index e78356a..77342f1 100644
--- a/src/main/java/us/yuxin/hump/io/SymlinkRCFileInputFormat.java
+++ b/src/main/java/us/yuxin/hump/io/SymlinkRCFileInputFormat.java
@@ -1,232 +1,232 @@
package us.yuxin.hump.io;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.ContentSummary;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.io.ContentSummaryInputFormat;
import org.apache.hadoop.hive.ql.io.RCFileInputFormat;
import org.apache.hadoop.hive.ql.io.RCFileRecordReader;
import org.apache.hadoop.hive.ql.io.ReworkMapredInputFormat;
import org.apache.hadoop.hive.ql.plan.MapredWork;
import org.apache.hadoop.hive.ql.plan.PartitionDesc;
import org.apache.hadoop.hive.serde2.columnar.BytesRefArrayWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.mapred.FileSplit;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.RecordReader;
import org.apache.hadoop.mapred.Reporter;
public class SymlinkRCFileInputFormat<K extends LongWritable, V extends BytesRefArrayWritable>
extends RCFileInputFormat<K, V> implements ContentSummaryInputFormat, ReworkMapredInputFormat {
long minSplitSize = SequenceFile.SYNC_INTERVAL;
long blockSize = 1024 * 1024 * 64;
final static double SPLIT_SLOP = 1.1;
public final static String SYMLINK_FILE_SIGN_V1 = "SYMLINK.RCFILE.V1";
public SymlinkRCFileInputFormat() {
super();
}
@Override
@SuppressWarnings("unchecked")
public RecordReader<K, V> getRecordReader(InputSplit split, JobConf job,
Reporter reporter) throws IOException {
reporter.setStatus(split.toString());
// FileSplit s = (FileSplit)split;
// LOG.info("GETRR: " + s.getPath().toString() + ":" + s.getLength());
return new RCFileRecordReader(job, (FileSplit) split);
}
@Override
public boolean validateInput(FileSystem fs, HiveConf conf, ArrayList<FileStatus> files) throws IOException {
return true;
}
@Override
public InputSplit[] getSplits(JobConf job, int numSplits) throws IOException {
Path[] symlinksDirs = getInputPaths(job);
if (symlinksDirs.length == 0) {
throw new IOException("No input paths specified in job");
}
List<FileInfo> targetPaths = new ArrayList<FileInfo>();
getTargetPathsFromSymlinksDirs(job, symlinksDirs, targetPaths);
job.setLong("mapreduce.input.num.files", targetPaths.size());
long totalSize = 0;
for (FileInfo fi: targetPaths) {
totalSize += fi.length;
}
long goalSize = totalSize / (numSplits == 0 ? 1: numSplits);
long minSize = Math.max(job.getLong("mapred.min.split.size", 1), minSplitSize);
ArrayList<FileSplit> splits = new ArrayList<FileSplit>(numSplits);
for (FileInfo fi: targetPaths) {
Path path = fi.path;
long length = fi.length;
if (length != 0 ) /*isSplitable is always true */ {
long splitSize = computeSplitSize(goalSize, minSize, blockSize);
long bytesRemaining = length;
while(((double)bytesRemaining) / splitSize > SPLIT_SLOP) {
splits.add(new FileSplit(path, length - bytesRemaining, splitSize, new String[0]));
bytesRemaining -= splitSize;
}
if (bytesRemaining != 0) {
splits.add(new FileSplit(path, length - bytesRemaining, bytesRemaining, new String[0]));
}
}
}
LOG.debug("Total # of splits:" + splits.size());
return splits.toArray(new FileSplit[splits.size()]);
}
private static void getTargetPathsFromSymlinksDirs(
Configuration conf, Path[] symlinksDirs,
List<FileInfo> targetPaths) throws IOException {
for (Path symlinkDir: symlinksDirs) {
FileSystem fileSystem = symlinkDir.getFileSystem(conf);
FileStatus[] symlinks = fileSystem.listStatus(symlinkDir);
for (FileStatus symlink: symlinks) {
BufferedReader reader = new BufferedReader(
new InputStreamReader(fileSystem.open(symlink.getPath())));
String line;
line = reader.readLine();
if (line.equals(SYMLINK_FILE_SIGN_V1)) {
while((line = reader.readLine()) != null) {
int o1 = line.indexOf(',');
// TODO error handle.
FileInfo fi = new FileInfo();
fi.length = Long.parseLong(line.substring(0, o1));
int o2 = line.indexOf(',', o1 + 1);
fi.row = Long.parseLong(line.substring(o1 + 1, o2));
fi.path = new Path(line.substring(o2 + 1));
fi.symlink = symlink.getPath();
// Skip zero row RCFile.
if (fi.row == 0) {
continue;
}
targetPaths.add(fi);
}
}
reader.close();
}
}
}
@Override
public ContentSummary getContentSummary(Path p, JobConf job) throws IOException {
long[] summary = {0, 0, 0};
List<FileInfo> targetPaths = new ArrayList<FileInfo>();
try {
getTargetPathsFromSymlinksDirs(job, new Path[] {p}, targetPaths);
} catch (Exception e) {
throw new IOException("Error parsing symlinks from specified job input path.", e);
}
for (FileInfo fi: targetPaths) {
summary[0] += fi.length;
summary[1] += 1;
}
return new ContentSummary(summary[0], summary[1], summary[2]);
}
@Override
public void rework(HiveConf job, MapredWork work) throws IOException {
Map<String, PartitionDesc> pathToParts = work.getPathToPartitionInfo();
List<String> toRemovePaths = new ArrayList<String>();
Map<String, PartitionDesc> toAddPathToPart = new HashMap<String, PartitionDesc>();
Map<String, ArrayList<String>> pathToAliases = work.getPathToAliases();
for (Map.Entry<String, PartitionDesc> pathPartEntry: pathToParts.entrySet()) {
String path = pathPartEntry.getKey();
PartitionDesc partDesc = pathPartEntry.getValue();
if (partDesc.getInputFileFormatClass().equals(SymlinkRCFileInputFormat.class)) {
Path symlinkDir = new Path(path);
FileSystem fileSystem = symlinkDir.getFileSystem(job);
FileStatus fStatus = fileSystem.getFileStatus(symlinkDir);
FileStatus symlinks[] = null;
if (!fStatus.isDir()) {
symlinks = new FileStatus[] {fStatus};
} else {
symlinks = fileSystem.listStatus(symlinkDir);
}
toRemovePaths.add(path);
ArrayList<String> aliases = pathToAliases.remove(path);
for (FileStatus symlink: symlinks) {
BufferedReader reader = new BufferedReader(
new InputStreamReader(fileSystem.open(symlink.getPath())));
String line;
line = reader.readLine();
if (line.equals(SYMLINK_FILE_SIGN_V1)) {
while((line = reader.readLine()) != null) {
int o1 = line.indexOf(',');
int o2 = line.indexOf(',', o1 + 1);
long row = Long.parseLong(line.substring(o1 + 1, o2));
String realPath = line.substring(o2 + 1);
if (row == 0) {
continue;
}
toAddPathToPart.put(realPath, partDesc);
- pathToAliases.put(line, aliases);
+ pathToAliases.put(realPath, aliases);
}
}
reader.close();
}
}
}
pathToParts.putAll(toAddPathToPart);
for (String toRemove: toRemovePaths) {
pathToParts.remove(toRemove);
}
}
public static class FileInfo {
public Path path;
public Path symlink;
public long length;
public long row;
}
}
| true | true | public void rework(HiveConf job, MapredWork work) throws IOException {
Map<String, PartitionDesc> pathToParts = work.getPathToPartitionInfo();
List<String> toRemovePaths = new ArrayList<String>();
Map<String, PartitionDesc> toAddPathToPart = new HashMap<String, PartitionDesc>();
Map<String, ArrayList<String>> pathToAliases = work.getPathToAliases();
for (Map.Entry<String, PartitionDesc> pathPartEntry: pathToParts.entrySet()) {
String path = pathPartEntry.getKey();
PartitionDesc partDesc = pathPartEntry.getValue();
if (partDesc.getInputFileFormatClass().equals(SymlinkRCFileInputFormat.class)) {
Path symlinkDir = new Path(path);
FileSystem fileSystem = symlinkDir.getFileSystem(job);
FileStatus fStatus = fileSystem.getFileStatus(symlinkDir);
FileStatus symlinks[] = null;
if (!fStatus.isDir()) {
symlinks = new FileStatus[] {fStatus};
} else {
symlinks = fileSystem.listStatus(symlinkDir);
}
toRemovePaths.add(path);
ArrayList<String> aliases = pathToAliases.remove(path);
for (FileStatus symlink: symlinks) {
BufferedReader reader = new BufferedReader(
new InputStreamReader(fileSystem.open(symlink.getPath())));
String line;
line = reader.readLine();
if (line.equals(SYMLINK_FILE_SIGN_V1)) {
while((line = reader.readLine()) != null) {
int o1 = line.indexOf(',');
int o2 = line.indexOf(',', o1 + 1);
long row = Long.parseLong(line.substring(o1 + 1, o2));
String realPath = line.substring(o2 + 1);
if (row == 0) {
continue;
}
toAddPathToPart.put(realPath, partDesc);
pathToAliases.put(line, aliases);
}
}
reader.close();
}
}
}
pathToParts.putAll(toAddPathToPart);
for (String toRemove: toRemovePaths) {
pathToParts.remove(toRemove);
}
}
| public void rework(HiveConf job, MapredWork work) throws IOException {
Map<String, PartitionDesc> pathToParts = work.getPathToPartitionInfo();
List<String> toRemovePaths = new ArrayList<String>();
Map<String, PartitionDesc> toAddPathToPart = new HashMap<String, PartitionDesc>();
Map<String, ArrayList<String>> pathToAliases = work.getPathToAliases();
for (Map.Entry<String, PartitionDesc> pathPartEntry: pathToParts.entrySet()) {
String path = pathPartEntry.getKey();
PartitionDesc partDesc = pathPartEntry.getValue();
if (partDesc.getInputFileFormatClass().equals(SymlinkRCFileInputFormat.class)) {
Path symlinkDir = new Path(path);
FileSystem fileSystem = symlinkDir.getFileSystem(job);
FileStatus fStatus = fileSystem.getFileStatus(symlinkDir);
FileStatus symlinks[] = null;
if (!fStatus.isDir()) {
symlinks = new FileStatus[] {fStatus};
} else {
symlinks = fileSystem.listStatus(symlinkDir);
}
toRemovePaths.add(path);
ArrayList<String> aliases = pathToAliases.remove(path);
for (FileStatus symlink: symlinks) {
BufferedReader reader = new BufferedReader(
new InputStreamReader(fileSystem.open(symlink.getPath())));
String line;
line = reader.readLine();
if (line.equals(SYMLINK_FILE_SIGN_V1)) {
while((line = reader.readLine()) != null) {
int o1 = line.indexOf(',');
int o2 = line.indexOf(',', o1 + 1);
long row = Long.parseLong(line.substring(o1 + 1, o2));
String realPath = line.substring(o2 + 1);
if (row == 0) {
continue;
}
toAddPathToPart.put(realPath, partDesc);
pathToAliases.put(realPath, aliases);
}
}
reader.close();
}
}
}
pathToParts.putAll(toAddPathToPart);
for (String toRemove: toRemovePaths) {
pathToParts.remove(toRemove);
}
}
|
diff --git a/Stimpack/Stimpack-war/src/java/servlets/EditStudentServlet.java b/Stimpack/Stimpack-war/src/java/servlets/EditStudentServlet.java
index 9887fd2..1afd6a5 100644
--- a/Stimpack/Stimpack-war/src/java/servlets/EditStudentServlet.java
+++ b/Stimpack/Stimpack-war/src/java/servlets/EditStudentServlet.java
@@ -1,131 +1,131 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package servlets;
import ejb.Student;
import ejb.StudentFacadeLocal;
import java.io.IOException;
import java.io.PrintWriter;
import javax.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import pojo.md5;
/**
*
* @author Josh
*/
public class EditStudentServlet extends HttpServlet {
@EJB
private StudentFacadeLocal studentFacade;
/**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
* @throws ServletException if a servlet-specific error occurs
* @throws IOException if an I/O error occurs
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- String method, surname, firstname, username, password, phone, email;
+ String surname, firstname, username, password, phone, email;
Integer studentId = 0;
Short age;
try {
try {
studentId = Integer.parseInt(request.getParameter("student_id"));
} catch (Exception e) {
}
surname = request.getParameter("surname");
firstname = request.getParameter("firstname");
username = request.getParameter("username");
password = request.getParameter("password");
age = Short.parseShort(request.getParameter("age"));
phone = request.getParameter("phone");
email = request.getParameter("email");
} catch (Exception e) {
response.setContentType("text/html;charset=UTF-8");
PrintWriter out = response.getWriter();
out.println("ERROR: some form fields are missing or invalid.<br />");
out.println(e.getMessage());
out.close();
return;
}
Student student;
if (studentId > 0) {
- student = studentFacade.find(age);
+ student = studentFacade.find(studentId);
} else {
student = new Student();
}
student.setLastname(surname);
student.setFirstname(firstname);
student.setUsername(username);
student.setPassword(md5.md5(password));
student.setAge(age);
student.setPhone(phone);
student.setEmail(email);
try {
if (studentId > 0) {
studentFacade.edit(student);
} else {
studentFacade.create(student);
}
} catch (Exception e) {
response.setContentType("text/html;charset=UTF-8");
PrintWriter out = response.getWriter();
out.println("ERROR: Could not create student in database.<br />");
out.println(e.getMessage());
out.close();
return;
}
response.sendRedirect("studentDetails.xhtml");
}
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
/**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
* @throws ServletException if a servlet-specific error occurs
* @throws IOException if an I/O error occurs
*/
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
}
/**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
* @throws ServletException if a servlet-specific error occurs
* @throws IOException if an I/O error occurs
*/
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
}
/**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
@Override
public String getServletInfo() {
return "Short description";
}// </editor-fold>
}
| false | true | protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
String method, surname, firstname, username, password, phone, email;
Integer studentId = 0;
Short age;
try {
try {
studentId = Integer.parseInt(request.getParameter("student_id"));
} catch (Exception e) {
}
surname = request.getParameter("surname");
firstname = request.getParameter("firstname");
username = request.getParameter("username");
password = request.getParameter("password");
age = Short.parseShort(request.getParameter("age"));
phone = request.getParameter("phone");
email = request.getParameter("email");
} catch (Exception e) {
response.setContentType("text/html;charset=UTF-8");
PrintWriter out = response.getWriter();
out.println("ERROR: some form fields are missing or invalid.<br />");
out.println(e.getMessage());
out.close();
return;
}
Student student;
if (studentId > 0) {
student = studentFacade.find(age);
} else {
student = new Student();
}
student.setLastname(surname);
student.setFirstname(firstname);
student.setUsername(username);
student.setPassword(md5.md5(password));
student.setAge(age);
student.setPhone(phone);
student.setEmail(email);
try {
if (studentId > 0) {
studentFacade.edit(student);
} else {
studentFacade.create(student);
}
} catch (Exception e) {
response.setContentType("text/html;charset=UTF-8");
PrintWriter out = response.getWriter();
out.println("ERROR: Could not create student in database.<br />");
out.println(e.getMessage());
out.close();
return;
}
response.sendRedirect("studentDetails.xhtml");
}
| protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
String surname, firstname, username, password, phone, email;
Integer studentId = 0;
Short age;
try {
try {
studentId = Integer.parseInt(request.getParameter("student_id"));
} catch (Exception e) {
}
surname = request.getParameter("surname");
firstname = request.getParameter("firstname");
username = request.getParameter("username");
password = request.getParameter("password");
age = Short.parseShort(request.getParameter("age"));
phone = request.getParameter("phone");
email = request.getParameter("email");
} catch (Exception e) {
response.setContentType("text/html;charset=UTF-8");
PrintWriter out = response.getWriter();
out.println("ERROR: some form fields are missing or invalid.<br />");
out.println(e.getMessage());
out.close();
return;
}
Student student;
if (studentId > 0) {
student = studentFacade.find(studentId);
} else {
student = new Student();
}
student.setLastname(surname);
student.setFirstname(firstname);
student.setUsername(username);
student.setPassword(md5.md5(password));
student.setAge(age);
student.setPhone(phone);
student.setEmail(email);
try {
if (studentId > 0) {
studentFacade.edit(student);
} else {
studentFacade.create(student);
}
} catch (Exception e) {
response.setContentType("text/html;charset=UTF-8");
PrintWriter out = response.getWriter();
out.println("ERROR: Could not create student in database.<br />");
out.println(e.getMessage());
out.close();
return;
}
response.sendRedirect("studentDetails.xhtml");
}
|
diff --git a/api/src/main/java/org/qi4j/service/Configuration.java b/api/src/main/java/org/qi4j/service/Configuration.java
index 5e53db0b9..c7d571945 100644
--- a/api/src/main/java/org/qi4j/service/Configuration.java
+++ b/api/src/main/java/org/qi4j/service/Configuration.java
@@ -1,135 +1,133 @@
/*
* Copyright (c) 2008, Rickard �berg. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.qi4j.service;
import java.io.InputStream;
import org.qi4j.Qi4j;
import org.qi4j.composite.Composite;
import org.qi4j.composite.ConcernOf;
import org.qi4j.composite.Concerns;
import org.qi4j.composite.Mixins;
import org.qi4j.entity.EntityCompositeNotFoundException;
import org.qi4j.entity.UnitOfWork;
import org.qi4j.entity.UnitOfWorkFactory;
import org.qi4j.injection.scope.Structure;
import org.qi4j.injection.scope.This;
import org.qi4j.injection.scope.Uses;
import org.qi4j.property.PropertyMapper;
/**
* Provide Configurations for Services. A Service that wants to be configurable
* should inject a reference to Configuration with the Configuration type:
*
* @This Configuration<MyServiceConfiguration> config;
* where MyServiceConfiguration extends EntityComposite. The Configuration implementation
* will either locate an instance of the given Configuration type in the
* persistent store using the identity of the Service, or create a new such instance
* if one doesn't already exist.
* <p/>
* If a new Configuration instance is created then it will be populated with properties
* from the properties file whose filesystem name is the same as the identity (e.g. "MyService.properties").
* <p/>
* The Configuration instance can be modified externally just like any other EntityComposite, but
* its values will not be updated in the Service until Configuration.refresh is called. This allows
* safe reloads of Configuration state to ensure that it is not reloaded while the Service is handling
* a request.
* <p/>
* The Configuration will be automatically refreshed when the Service is activated through the Activatable.activate()
* method by the Qi4j runtime. Any refreshes at other points will have to be done manually or triggered through some other
* mechanism.
*/
@Mixins( Configuration.ConfigurationMixin.class )
public interface Configuration<T>
{
T configuration();
void refresh();
// Implementation of Configuration
@Concerns( Configuration.ConfigurationActivationRefreshConcern.class )
public final class ConfigurationMixin<T>
implements Configuration<T>
{
private T configuration;
private UnitOfWork uow;
public ConfigurationMixin( @Structure Qi4j api,
@This Composite me,
@Structure UnitOfWorkFactory uowf,
@Uses ServiceDescriptor descriptor )
throws Exception
{
Class configurationType = api.getConfigurationType( me );
if( configurationType == null )
{
throw new InstantiationException( "Could not figure out type of Configuration" );
}
uow = uowf.newUnitOfWork();
try
{
configuration = (T) uow.find( descriptor.identity(), configurationType );
}
- // todo workaround
- //catch( EntityCompositeNotFoundException e )
- catch( Exception e )
+ catch( EntityCompositeNotFoundException e )
{
configuration = (T) uow.newEntityBuilder( descriptor.identity(), configurationType ).newInstance();
// Check for defaults
InputStream asStream = getClass().getResourceAsStream( "/" + descriptor.identity() + ".properties" );
if( asStream != null )
{
PropertyMapper.map( asStream, (Composite) configuration );
}
uow.complete();
uow = uowf.newUnitOfWork();
configuration = uow.dereference( configuration );
}
uow.pause();
}
public T configuration()
{
return configuration;
}
public void refresh()
{
if( uow != null )
{
uow.refresh( configuration );
}
}
}
// Refresh the Configuration when the Service is activated
public abstract class ConfigurationActivationRefreshConcern
extends ConcernOf<Activatable>
implements Activatable
{
@This Configuration<Object> configuration;
public void activate() throws Exception
{
configuration.refresh();
next.activate();
}
}
}
| true | true | public ConfigurationMixin( @Structure Qi4j api,
@This Composite me,
@Structure UnitOfWorkFactory uowf,
@Uses ServiceDescriptor descriptor )
throws Exception
{
Class configurationType = api.getConfigurationType( me );
if( configurationType == null )
{
throw new InstantiationException( "Could not figure out type of Configuration" );
}
uow = uowf.newUnitOfWork();
try
{
configuration = (T) uow.find( descriptor.identity(), configurationType );
}
// todo workaround
//catch( EntityCompositeNotFoundException e )
catch( Exception e )
{
configuration = (T) uow.newEntityBuilder( descriptor.identity(), configurationType ).newInstance();
// Check for defaults
InputStream asStream = getClass().getResourceAsStream( "/" + descriptor.identity() + ".properties" );
if( asStream != null )
{
PropertyMapper.map( asStream, (Composite) configuration );
}
uow.complete();
uow = uowf.newUnitOfWork();
configuration = uow.dereference( configuration );
}
uow.pause();
}
| public ConfigurationMixin( @Structure Qi4j api,
@This Composite me,
@Structure UnitOfWorkFactory uowf,
@Uses ServiceDescriptor descriptor )
throws Exception
{
Class configurationType = api.getConfigurationType( me );
if( configurationType == null )
{
throw new InstantiationException( "Could not figure out type of Configuration" );
}
uow = uowf.newUnitOfWork();
try
{
configuration = (T) uow.find( descriptor.identity(), configurationType );
}
catch( EntityCompositeNotFoundException e )
{
configuration = (T) uow.newEntityBuilder( descriptor.identity(), configurationType ).newInstance();
// Check for defaults
InputStream asStream = getClass().getResourceAsStream( "/" + descriptor.identity() + ".properties" );
if( asStream != null )
{
PropertyMapper.map( asStream, (Composite) configuration );
}
uow.complete();
uow = uowf.newUnitOfWork();
configuration = uow.dereference( configuration );
}
uow.pause();
}
|
diff --git a/src/dctc/java/com/dataiku/dip/shaker/services/smartdate/DateFormatGuesser.java b/src/dctc/java/com/dataiku/dip/shaker/services/smartdate/DateFormatGuesser.java
index 851e6cd..0f921ae 100644
--- a/src/dctc/java/com/dataiku/dip/shaker/services/smartdate/DateFormatGuesser.java
+++ b/src/dctc/java/com/dataiku/dip/shaker/services/smartdate/DateFormatGuesser.java
@@ -1,220 +1,220 @@
package com.dataiku.dip.shaker.services.smartdate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
import com.google.common.collect.Lists;
public class DateFormatGuesser {
//21/Jan/2013:15:59:59 +0100
static List<String> splitWithSeps(String str, Pattern p) {
int lastMatch = 0;
List<String> ret = new ArrayList<String>();
Matcher m = p.matcher(str);
while (m.find()) {
ret.add(str.substring(lastMatch, m.start()));
ret.add(m.group());
lastMatch = m.end();
}
ret.add(str.substring(lastMatch));
return ret;
}
static class FormatChunk {
FormatChunk(String pattern) {
this.pattern = pattern;
}
String pattern;
boolean end;
List<FormatChunk> successors = new ArrayList<DateFormatGuesser.FormatChunk>();
}
void recurse(List<FormatChunk> prevCandidates, String format, List<String> chunks, int curIdx, boolean monthDone, boolean dayDone, boolean hoursDone, boolean minutesDone, boolean secondsDone) {
FormatChunk newFormat = new FormatChunk(format);
prevCandidates.add(newFormat);
if (curIdx + 1 >= chunks.size()) {
newFormat.end = true;
return;
}
observeRec(newFormat.successors, chunks, curIdx + 1, monthDone, dayDone, hoursDone, minutesDone, secondsDone);
}
static Set<String> enMonthNames = new HashSet<String>();
static Set<String> enDayNames = new HashSet<String>();
static {
enMonthNames.add("Jan");
enMonthNames.add("Feb");
enMonthNames.add("Mar");
enMonthNames.add("Apr");
enMonthNames.add("May");
enMonthNames.add("Jun");
enMonthNames.add("Jul");
enMonthNames.add("Aug");
enMonthNames.add("Sep");
enMonthNames.add("Oct");
enMonthNames.add("Nov");
enMonthNames.add("Dec");
enDayNames.add("Mon");
enDayNames.add("Tue");
enDayNames.add("Wed");
enDayNames.add("Thu");
enDayNames.add("Fri");
enDayNames.add("Sat");
enDayNames.add("Sun");
}
void observeRec(List<FormatChunk> oCandidates, List<String> chunks, int curIdx, boolean monthDone, boolean dayDone, boolean hoursDone, boolean minutesDone, boolean secondDone) {
String c = chunks.get(curIdx);
if (c.length() <= 1) {
- if (StringUtils.isNumeric(c)) {
+ if (c.length() > 0 && StringUtils.isNumeric(c)) {
// Could be month, day, hour, minute, second
int ic = Integer.parseInt(c);
if (!monthDone && ic > 0 && ic <= 12) recurse(oCandidates, "MM", chunks, curIdx, true, dayDone, hoursDone, minutesDone, secondDone);
if (!dayDone && ic > 0 && ic <= 31) recurse(oCandidates, "dd", chunks, curIdx, monthDone, true, hoursDone, minutesDone, secondDone);
if (!hoursDone && ic >= 0 && ic <= 23) recurse(oCandidates, "HH", chunks, curIdx, monthDone, dayDone, true, minutesDone, secondDone);
// We have never seen a format where minute comes before hour or second before minute !
if (hoursDone && !minutesDone && ic >= 0 && ic <= 60) recurse(oCandidates, "mm", chunks, curIdx, monthDone, dayDone, hoursDone, true, secondDone);
if (minutesDone && !secondDone && ic >= 0 && ic <= 61) recurse(oCandidates, "ss", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, true);
} else {
// Separator
recurse(oCandidates, c, chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
}
return;
}
if (c.length() == 4 && StringUtils.isNumeric(c)) {
recurse(oCandidates, "yyyy", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
} else if (c.length() == 3 && StringUtils.isNumeric(c)) {
int ic = Integer.parseInt(c);
if (ic >= 0 && ic <= 999 && hoursDone && minutesDone && secondDone) {
recurse(oCandidates, "SSS", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
}
} else if (c.length() == 2 && StringUtils.isNumeric(c)) {
int ic = Integer.parseInt(c);
if (!monthDone && ic > 0 && ic <= 12) recurse(oCandidates, "MM", chunks, curIdx, true, dayDone, hoursDone, minutesDone, secondDone);
if (!dayDone && ic > 0 && ic <= 31) recurse(oCandidates, "dd", chunks, curIdx, monthDone, true, hoursDone, minutesDone, secondDone);
if (!hoursDone && ic >= 0 && ic <= 23) recurse(oCandidates, "HH", chunks, curIdx, monthDone, dayDone, true, minutesDone, secondDone);
// We have never seen a format where minute comes before hour or second before minute !
if (hoursDone && !minutesDone && ic >= 0 && ic <= 60) recurse(oCandidates, "mm", chunks, curIdx, monthDone, dayDone, hoursDone, true, secondDone);
if (minutesDone && !secondDone && ic >= 0 && ic <= 61) recurse(oCandidates, "ss", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, true);
} else if (c.length() == 3 && enMonthNames.contains(c)) {
recurse(oCandidates, "MMM", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
} else if (c.length() == 3 && enDayNames.contains(c)) {
recurse(oCandidates, "EEE", chunks, curIdx,monthDone, dayDone, hoursDone, minutesDone, secondDone);
} else if (c.length() == 5 && (c.charAt(0) == '+' || c.charAt(0) == '-')) {
recurse(oCandidates, "Z", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
}
}
void collect(List<String> o, String curStr, FormatChunk curChk) {
String newStr = curStr + curChk.pattern;
if (curChk.successors.size() == 0 && curChk.end) {
o.add(newStr);
} else {
for (FormatChunk next : curChk.successors) {
collect(o, newStr, next);
}
}
}
public static class DetectedFormat implements Comparable<DetectedFormat>{
String format;
int nbOK;
int trust;
@Override
public int compareTo(DetectedFormat o) {
if (nbOK < o.nbOK) return 1;
if (nbOK > o.nbOK) return -1;
if (trust < o.trust) return 1;
if (trust > o.trust) return -1;
return 0;
}
public String getFormat() {
return format;
}
}
Pattern separators = Pattern.compile("[,\\- :/]");
Map<String, DetectedFormat> formats = new HashMap<String, DetectedFormat>();
public void addObservation(String observation) {
List<String> chunks = splitWithSeps(observation, separators);
// Repair damage we might have caused to "12:23:12 -0100"
for (int i = 0; i < chunks.size() - 2; i++) {
// System.out.println("Repairing (" + chunks.get(i) + ") (" + chunks.get(i+1) +")");
if (chunks.get(i).equals(" ") && chunks.get(i+1).equals("") && chunks.get(i+2).equals("-")) {
System.out.println("yes");
chunks.set(i+3, "-" + chunks.get(i+3));
chunks.remove(i+1);
chunks.remove(i+1);
}
}
System.out.println(StringUtils.join(chunks, "__"));
List<FormatChunk> roots = new ArrayList<DateFormatGuesser.FormatChunk>();
observeRec(roots, chunks, 0, false, false, false, false, false);
List<String> candidates = new ArrayList<String>();
for (FormatChunk root : roots) {
collect(candidates, "", root);
}
for (String candidate : candidates) {
DetectedFormat df = formats.get(candidate);
if (df == null) {
df = new DetectedFormat();
df.format = candidate;
System.out.println(candidate.indexOf("dd"));
System.out.println(candidate.indexOf("HH"));
if (candidate.equals("EEE, dd MMM yyyy HH:mm:ss Z")) {
df.trust = 2;
} else if (isBefore(candidate, "HH", "dd") || hasAAndNotB(candidate, "HH", "dd")) {
df.trust = 0;
} else {
df.trust = 1;
}
formats.put(candidate, df);
}
df.nbOK++;
System.out.println("CAND " + candidate);
}
}
private static boolean isBefore(String candidate, String a, String b) {
return candidate.indexOf(a) >= 0 && candidate.indexOf(b) >= 0 && candidate.indexOf(a) < candidate.indexOf(b);
}
private static boolean hasAAndNotB(String candidate, String a, String b) {
return candidate.indexOf(a) >= 0 && candidate.indexOf(b) < 0;
}
public List<DetectedFormat> getResults() {
List<DetectedFormat> ret = Lists.newArrayList(formats.values());
Collections.sort(ret);
return ret;
}
public void clearObservation() {
formats.clear();
}
public List<DetectedFormat> guess(List<String> observations) {
for (String observation : observations) {
addObservation(observation);
}
return getResults();
}
}
| true | true | void observeRec(List<FormatChunk> oCandidates, List<String> chunks, int curIdx, boolean monthDone, boolean dayDone, boolean hoursDone, boolean minutesDone, boolean secondDone) {
String c = chunks.get(curIdx);
if (c.length() <= 1) {
if (StringUtils.isNumeric(c)) {
// Could be month, day, hour, minute, second
int ic = Integer.parseInt(c);
if (!monthDone && ic > 0 && ic <= 12) recurse(oCandidates, "MM", chunks, curIdx, true, dayDone, hoursDone, minutesDone, secondDone);
if (!dayDone && ic > 0 && ic <= 31) recurse(oCandidates, "dd", chunks, curIdx, monthDone, true, hoursDone, minutesDone, secondDone);
if (!hoursDone && ic >= 0 && ic <= 23) recurse(oCandidates, "HH", chunks, curIdx, monthDone, dayDone, true, minutesDone, secondDone);
// We have never seen a format where minute comes before hour or second before minute !
if (hoursDone && !minutesDone && ic >= 0 && ic <= 60) recurse(oCandidates, "mm", chunks, curIdx, monthDone, dayDone, hoursDone, true, secondDone);
if (minutesDone && !secondDone && ic >= 0 && ic <= 61) recurse(oCandidates, "ss", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, true);
} else {
// Separator
recurse(oCandidates, c, chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
}
return;
}
if (c.length() == 4 && StringUtils.isNumeric(c)) {
recurse(oCandidates, "yyyy", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
} else if (c.length() == 3 && StringUtils.isNumeric(c)) {
int ic = Integer.parseInt(c);
if (ic >= 0 && ic <= 999 && hoursDone && minutesDone && secondDone) {
recurse(oCandidates, "SSS", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
}
} else if (c.length() == 2 && StringUtils.isNumeric(c)) {
int ic = Integer.parseInt(c);
if (!monthDone && ic > 0 && ic <= 12) recurse(oCandidates, "MM", chunks, curIdx, true, dayDone, hoursDone, minutesDone, secondDone);
if (!dayDone && ic > 0 && ic <= 31) recurse(oCandidates, "dd", chunks, curIdx, monthDone, true, hoursDone, minutesDone, secondDone);
if (!hoursDone && ic >= 0 && ic <= 23) recurse(oCandidates, "HH", chunks, curIdx, monthDone, dayDone, true, minutesDone, secondDone);
// We have never seen a format where minute comes before hour or second before minute !
if (hoursDone && !minutesDone && ic >= 0 && ic <= 60) recurse(oCandidates, "mm", chunks, curIdx, monthDone, dayDone, hoursDone, true, secondDone);
if (minutesDone && !secondDone && ic >= 0 && ic <= 61) recurse(oCandidates, "ss", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, true);
} else if (c.length() == 3 && enMonthNames.contains(c)) {
recurse(oCandidates, "MMM", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
} else if (c.length() == 3 && enDayNames.contains(c)) {
recurse(oCandidates, "EEE", chunks, curIdx,monthDone, dayDone, hoursDone, minutesDone, secondDone);
} else if (c.length() == 5 && (c.charAt(0) == '+' || c.charAt(0) == '-')) {
recurse(oCandidates, "Z", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
}
}
| void observeRec(List<FormatChunk> oCandidates, List<String> chunks, int curIdx, boolean monthDone, boolean dayDone, boolean hoursDone, boolean minutesDone, boolean secondDone) {
String c = chunks.get(curIdx);
if (c.length() <= 1) {
if (c.length() > 0 && StringUtils.isNumeric(c)) {
// Could be month, day, hour, minute, second
int ic = Integer.parseInt(c);
if (!monthDone && ic > 0 && ic <= 12) recurse(oCandidates, "MM", chunks, curIdx, true, dayDone, hoursDone, minutesDone, secondDone);
if (!dayDone && ic > 0 && ic <= 31) recurse(oCandidates, "dd", chunks, curIdx, monthDone, true, hoursDone, minutesDone, secondDone);
if (!hoursDone && ic >= 0 && ic <= 23) recurse(oCandidates, "HH", chunks, curIdx, monthDone, dayDone, true, minutesDone, secondDone);
// We have never seen a format where minute comes before hour or second before minute !
if (hoursDone && !minutesDone && ic >= 0 && ic <= 60) recurse(oCandidates, "mm", chunks, curIdx, monthDone, dayDone, hoursDone, true, secondDone);
if (minutesDone && !secondDone && ic >= 0 && ic <= 61) recurse(oCandidates, "ss", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, true);
} else {
// Separator
recurse(oCandidates, c, chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
}
return;
}
if (c.length() == 4 && StringUtils.isNumeric(c)) {
recurse(oCandidates, "yyyy", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
} else if (c.length() == 3 && StringUtils.isNumeric(c)) {
int ic = Integer.parseInt(c);
if (ic >= 0 && ic <= 999 && hoursDone && minutesDone && secondDone) {
recurse(oCandidates, "SSS", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
}
} else if (c.length() == 2 && StringUtils.isNumeric(c)) {
int ic = Integer.parseInt(c);
if (!monthDone && ic > 0 && ic <= 12) recurse(oCandidates, "MM", chunks, curIdx, true, dayDone, hoursDone, minutesDone, secondDone);
if (!dayDone && ic > 0 && ic <= 31) recurse(oCandidates, "dd", chunks, curIdx, monthDone, true, hoursDone, minutesDone, secondDone);
if (!hoursDone && ic >= 0 && ic <= 23) recurse(oCandidates, "HH", chunks, curIdx, monthDone, dayDone, true, minutesDone, secondDone);
// We have never seen a format where minute comes before hour or second before minute !
if (hoursDone && !minutesDone && ic >= 0 && ic <= 60) recurse(oCandidates, "mm", chunks, curIdx, monthDone, dayDone, hoursDone, true, secondDone);
if (minutesDone && !secondDone && ic >= 0 && ic <= 61) recurse(oCandidates, "ss", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, true);
} else if (c.length() == 3 && enMonthNames.contains(c)) {
recurse(oCandidates, "MMM", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
} else if (c.length() == 3 && enDayNames.contains(c)) {
recurse(oCandidates, "EEE", chunks, curIdx,monthDone, dayDone, hoursDone, minutesDone, secondDone);
} else if (c.length() == 5 && (c.charAt(0) == '+' || c.charAt(0) == '-')) {
recurse(oCandidates, "Z", chunks, curIdx, monthDone, dayDone, hoursDone, minutesDone, secondDone);
}
}
|
diff --git a/org.caleydo.view.tourguide/src/org/caleydo/view/tourguide/vendingmachine/ScoreQueryUI.java b/org.caleydo.view.tourguide/src/org/caleydo/view/tourguide/vendingmachine/ScoreQueryUI.java
index 2229e928c..fe5f181f3 100644
--- a/org.caleydo.view.tourguide/src/org/caleydo/view/tourguide/vendingmachine/ScoreQueryUI.java
+++ b/org.caleydo.view.tourguide/src/org/caleydo/view/tourguide/vendingmachine/ScoreQueryUI.java
@@ -1,519 +1,520 @@
/*******************************************************************************
* Caleydo - visualization for molecular biology - http://caleydo.org
*
* Copyright(C) 2005, 2012 Graz University of Technology, Marc Streit, Alexander
* Lex, Christian Partl, Johannes Kepler University Linz </p>
*
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later
* version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>
*******************************************************************************/
package org.caleydo.view.tourguide.vendingmachine;
import static org.caleydo.core.view.opengl.layout.ElementLayouts.createButton;
import static org.caleydo.core.view.opengl.layout.ElementLayouts.createColor;
import static org.caleydo.core.view.opengl.layout.ElementLayouts.createLabel;
import static org.caleydo.core.view.opengl.layout.ElementLayouts.createXSpacer;
import static org.caleydo.core.view.opengl.layout.ElementLayouts.createYSeparator;
import static org.caleydo.core.view.opengl.layout.ElementLayouts.createYSpacer;
import static org.caleydo.core.view.opengl.layout.ElementLayouts.wrap;
import static org.caleydo.core.view.opengl.layout.util.Renderers.createPickingRenderer;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.caleydo.core.data.perspective.table.TablePerspective;
import org.caleydo.core.data.virtualarray.group.Group;
import org.caleydo.core.util.base.ConstantLabelProvider;
import org.caleydo.core.util.color.Color;
import org.caleydo.core.util.color.Colors;
import org.caleydo.core.util.color.IColor;
import org.caleydo.core.util.format.Formatter;
import org.caleydo.core.view.contextmenu.ContextMenuCreator;
import org.caleydo.core.view.contextmenu.GenericContextMenuItem;
import org.caleydo.core.view.opengl.canvas.AGLView;
import org.caleydo.core.view.opengl.layout.Column;
import org.caleydo.core.view.opengl.layout.ElementLayout;
import org.caleydo.core.view.opengl.layout.Row;
import org.caleydo.core.view.opengl.layout.util.ColorRenderer;
import org.caleydo.core.view.opengl.layout.util.TextureRenderer;
import org.caleydo.core.view.opengl.picking.APickingListener;
import org.caleydo.core.view.opengl.picking.Pick;
import org.caleydo.core.view.opengl.util.button.Button;
import org.caleydo.core.view.opengl.util.texture.EIconTextures;
import org.caleydo.view.tourguide.data.ESorting;
import org.caleydo.view.tourguide.data.ScoreQuery;
import org.caleydo.view.tourguide.data.Scores;
import org.caleydo.view.tourguide.data.ScoringElement;
import org.caleydo.view.tourguide.data.score.AGroupScore;
import org.caleydo.view.tourguide.data.score.AStratificationScore;
import org.caleydo.view.tourguide.data.score.EScoreType;
import org.caleydo.view.tourguide.data.score.IScore;
import org.caleydo.view.tourguide.data.score.ProductScore;
import org.caleydo.view.tourguide.event.AddScoreColumnEvent;
import org.caleydo.view.tourguide.event.RemoveScoreColumnEvent;
import org.caleydo.view.tourguide.renderer.ScoreBarRenderer;
import com.google.common.base.Function;
/**
* @author Samuel Gratzl
*
*/
public class ScoreQueryUI extends Column {
private static final String SORT_COLUMN = "SORT_COLUMN";
private static final String SELECT_ROW = "SELECT_ROW";
private static final String SELECT_ROW_COLUMN = "SELECT_ROW_COLUMN";
private static final String ADD_TO_STRATOMEX = "ADD_TO_STATOMEX";
private static final String ADD_COLUMN = "ADD_COLUMN";
private static final IColor SELECTED_COLOR = Colors.YELLOW;
private static final int COL0_RANK_WIDTH = 20;
private static final int COLX_SCORE_WIDTH = 75;
private static final int COL2_ADD_COLUMN_X_WIDTH = 16;
private static final int ROW_HEIGHT = 18;
private final List<SortableColumnHeader> columns = new ArrayList<>();
private Row headerRow;
private int selectedRow = -1;
private List<ScoringElement> data = Collections.emptyList();
private ScoreQuery query;
private final PropertyChangeListener selectionChanged = new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
onSelectionChanged(evt);
}
};
private final PropertyChangeListener orderByChanged = new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
onOrderByChanged(evt);
}
};
private final ISelectionListener selectionListener;
private final AGLView view;
private final Function<ScoringElement, Void> addToStratomexCallback;
public ScoreQueryUI(AGLView view, ISelectionListener listener, Function<ScoringElement, Void> addToStratomex) {
this.view = view;
this.selectionListener = listener;
this.addToStratomexCallback = addToStratomex;
init();
view.addTypePickingListener(new APickingListener() {
@Override
public void clicked(Pick pick) {
onSortBy(columns.get(pick.getObjectID()));
}
@Override
public void rightClicked(Pick pick) {
onShowColumnMenu(columns.get(pick.getObjectID()));
}
}, SORT_COLUMN);
view.addTypePickingListener(new APickingListener() {
@Override
public void clicked(Pick pick) {
onAddColumn();
}
}, ADD_COLUMN);
view.addTypePickingTooltipListener("Add another column", ADD_COLUMN);
view.addTypePickingListener(new APickingListener() {
@Override
public void clicked(Pick pick) {
setSelected(pick.getObjectID(), -1);
}
@Override
public void rightClicked(Pick pick) {
onAddToStratomex(pick.getObjectID());
}
}, SELECT_ROW);
view.addTypePickingTooltipListener("click to highlight, right-click to add to Stratomex", SELECT_ROW);
view.addTypePickingListener(new APickingListener() {
@Override
public void clicked(Pick pick) {
int id = pick.getObjectID();
setSelected(id >> 8, id & 0xFF);
}
}, SELECT_ROW_COLUMN);
view.addTypePickingListener(new APickingListener() {
@Override
public void clicked(Pick pick) {
onAddToStratomex(pick.getObjectID());
}
}, ADD_TO_STRATOMEX);
view.addTypePickingTooltipListener("Add this row to StratomeX", ADD_TO_STRATOMEX);
}
private void init() {
this.setBottomUp(false);
setGrabX(true);
setGrabY(true);
this.headerRow = new Row();
this.add(createYSpacer(5));
this.add(headerRow);
this.add(createYSeparator(9));
}
public void setQuery(ScoreQuery query) {
if (this.query != null) {
this.query.removePropertyChangeListener(ScoreQuery.PROP_SELECTION, selectionChanged);
this.query.removePropertyChangeListener(ScoreQuery.PROP_ORDER_BY, orderByChanged);
}
this.query = query;
this.query.addPropertyChangeListener(ScoreQuery.PROP_SELECTION, selectionChanged);
this.query.addPropertyChangeListener(ScoreQuery.PROP_ORDER_BY, orderByChanged);
// initial
createColumns(query);
}
private void createColumns(ScoreQuery query) {
this.headerRow.clear();
this.columns.clear();
this.headerRow.setPixelSizeY(ROW_HEIGHT);
this.headerRow.add(createXSpacer(3));
this.headerRow.add(createXSpacer(COL0_RANK_WIDTH));
this.headerRow.add(createXSpacer(16));
this.headerRow.add(ReferenceElements.create(Colors.TRANSPARENT, new ConstantLabelProvider("Stratification"),
new ConstantLabelProvider("Group"), this.view));
this.headerRow.add(createXSpacer(3));
int i = 0;
for (IScore column : query.getSelection()) {
SortableColumnHeader col = new SortableColumnHeader(column, i++, query.getSorting(column));
this.headerRow.add(col).add(createXSpacer(3));
this.columns.add(col);
}
headerRow.add(createButton(view, new Button(ADD_COLUMN, 1, EIconTextures.GROUPER_COLLAPSE_PLUS)));
invalidate();
}
public ScoreQuery getQuery() {
return query;
}
protected void onSelectionChanged(PropertyChangeEvent evt) {
createColumns(this.query);
if (this.data != null)
setData(data);
}
protected void onOrderByChanged(PropertyChangeEvent evt) {
for (SortableColumnHeader col : columns) {
ESorting s = query.getSorting(col.getScoreID());
if (s != null)
col.setSort(s);
}
}
protected void onAddColumn() {
Collection<IScore> scores = Scores.get().getScoreIDs();
if (scores.isEmpty())
return;
ContextMenuCreator creator = view.getContextMenuCreator();
if (scores.size() >= 2)
creator.addContextMenuItem(new GenericContextMenuItem("Create Combined Score",
new AddScoreColumnEvent(this)));
Set<IScore> visible = new HashSet<>();
for (SortableColumnHeader c : this.columns)
visible.add(c.getScoreID());
for (IScore s : scores) {
if (visible.contains(s))
continue;
creator.addContextMenuItem(new GenericContextMenuItem("Add " + s.getLabel(), new AddScoreColumnEvent(s,
this)));
}
}
protected void onShowColumnMenu(SortableColumnHeader sortableColumnHeader) {
ContextMenuCreator creator = view.getContextMenuCreator();
creator.addContextMenuItem(new GenericContextMenuItem("Remove", new RemoveScoreColumnEvent(sortableColumnHeader
.getScoreID(), this)));
}
protected void onAddToStratomex(int row) {
if (this.selectedRow == row)
setSelected(-1, -1);
addToStratomexCallback.apply(data.get(row));
}
public Collection<IScore> getColumns() {
Collection<IScore> cols = new ArrayList<>(columns.size());
for (SortableColumnHeader col : columns)
cols.add(col.getScoreID());
return cols;
}
public List<ScoringElement> getData() {
return Collections.unmodifiableList(data);
}
public ScoringElement getSelected() {
if (selectedRow < 0)
return null;
return data.get(selectedRow);
}
public void setData(List<ScoringElement> data) {
this.data = data;
this.clear();
this.add(createYSpacer(5));
this.add(headerRow);
this.add(createYSeparator(9));
final int length = data.size();
for (int i = 0; i < length; ++i)
add(createRow(this.view, data.get(i), i)).add(createYSpacer(5));
invalidate();
}
private void invalidate() {
if (layoutManager != null) {
layoutManager.updateLayout();
updateSubLayout();
}
}
private ElementLayout createRow(AGLView view, ScoringElement elem, int i) {
Row tr = new Row();
tr.setPixelSizeY(ROW_HEIGHT);
tr.add(createLabel(view, query.isSorted() ? String.format("%d.", i + 1) : "", COL0_RANK_WIDTH));
tr.add(createXSpacer(3));
tr.add(createButton(view, new Button(ADD_TO_STRATOMEX, i, EIconTextures.GROUPER_COLLAPSE_PLUS)));
tr.add(createXSpacer(3));
ElementLayout source = ReferenceElements.create(elem.getStratification(), elem.getGroup(), this.view);
source.addBackgroundRenderer(createPickingRenderer(SELECT_ROW, i, this.view));
tr.add(source);
tr.add(createXSpacer(3));
int j = 0;
for (SortableColumnHeader header : columns) {
int id = i << 8 + j++;
tr.add(createScoreValue(view, elem, header, id)).add(createXSpacer(3));
}
tr.add(createXSpacer(COL2_ADD_COLUMN_X_WIDTH));
tr.addBackgroundRenderer(new ColorRenderer(Colors.TRANSPARENT.getRGBA()));
return tr;
}
private ElementLayout createScoreValue(AGLView view, ScoringElement elem, SortableColumnHeader header, int id) {
Row row = new Row();
row.setGrabY(true);
+ row.setXDynamic(true);
IScore underlyingScore = header.getScoreID();
if (underlyingScore instanceof ProductScore)
underlyingScore = elem.getSelected((ProductScore) underlyingScore);
TablePerspective strat = resolveStratification(underlyingScore);
Group group = resolveGroup(underlyingScore);
switch (header.type) {
case STRATIFICATION_SCORE:
if (strat != null) {
row.add(createColor(strat.getDataDomain().getColor(), ReferenceElements.DATADOMAIN_TYPE_WIDTH));
row.add(createXSpacer(3));
row.add(createLabel(view, strat.getRecordPerspective(), ReferenceElements.STRATIFACTION_WIDTH));
} else {
row.add(createXSpacer(ReferenceElements.DATADOMAIN_TYPE_WIDTH + 3
+ ReferenceElements.STRATIFACTION_WIDTH));
}
row.add(createXSpacer(3));
break;
case GROUP_SCORE:
if (strat != null) {
row.add(createColor(strat.getDataDomain().getColor(), ReferenceElements.DATADOMAIN_TYPE_WIDTH));
row.add(createXSpacer(3));
row.add(createLabel(view, strat.getRecordPerspective(), ReferenceElements.STRATIFACTION_WIDTH));
} else {
row.add(createXSpacer(ReferenceElements.DATADOMAIN_TYPE_WIDTH + 3
+ ReferenceElements.STRATIFACTION_WIDTH));
}
if (group != null) {
row.add(createXSpacer(3));
row.add(createLabel(view, group, ReferenceElements.GROUP_WIDTH));
} else {
row.add(createXSpacer(3 + ReferenceElements.GROUP_WIDTH));
}
row.add(createXSpacer(3));
break;
default:
row.add(createXSpacer(20));
break;
}
float value = header.getScoreID().getScore(elem);
if (!Float.isNaN(value)) {
ElementLayout valueEL = createLabel(view, Formatter.formatNumber(value), COLX_SCORE_WIDTH);
valueEL.setGrabY(true);
valueEL.addBackgroundRenderer(new ScoreBarRenderer(value, strat != null ? strat.getDataDomain().getColor()
: new Color(0, 0, 1, 0.25f)));
row.add(valueEL);
} else {
row.add(createXSpacer(COLX_SCORE_WIDTH));
}
row.addBackgroundRenderer(createPickingRenderer(SELECT_ROW_COLUMN, id, this.view));
return row;
}
private static TablePerspective resolveStratification(IScore score) {
if (score instanceof AStratificationScore)
return ((AStratificationScore) score).getReference();
if (score instanceof AGroupScore)
return ((AGroupScore) score).getStratification();
return null;
}
private static Group resolveGroup(IScore score) {
if (score instanceof AGroupScore)
return ((AGroupScore) score).getGroup();
return null;
}
public static int getOptimalWidth(EScoreType type) {
switch (type) {
case GROUP_SCORE:
return ReferenceElements.DATADOMAIN_TYPE_WIDTH + 3 + ReferenceElements.STRATIFACTION_WIDTH + 3
+ ReferenceElements.GROUP_WIDTH;
case STRATIFICATION_SCORE:
return ReferenceElements.DATADOMAIN_TYPE_WIDTH + 3 + ReferenceElements.STRATIFACTION_WIDTH;
default:
return 20;
}
}
public void setSelected(int row, int col) {
ScoringElement old = null;
if (selectedRow != -1) {
old = data.get(selectedRow);
setBackgroundColor(selectedRow, Colors.TRANSPARENT);
}
selectedRow = row;
ScoringElement new_ = null;
if (selectedRow != -1) {
new_ = data.get(selectedRow);
setBackgroundColor(row, SELECTED_COLOR);
}
selectionListener.onSelectionChanged(old, new_, getSelectScoreID(new_, col));
}
private IScore getSelectScoreID(ScoringElement row, int col) {
if (row == null || col < 0)
return null;
IScore s = columns.get(col).getScoreID();
if (s instanceof ProductScore)
s = row.getSelected((ProductScore) s);
return s;
}
private void setBackgroundColor(int i, IColor color) {
ElementLayout r = getTableRow(i);
ColorRenderer c = (ColorRenderer) r.getBackgroundRenderer().get(0);
c.setColor(color.getRGBA());
}
private ElementLayout getTableRow(int i) {
return get(3 + (i) * 2); // 1 border 2 for header *2 for spacing
}
protected void onSortBy(SortableColumnHeader columnHeader) {
if (query == null)
return;
query.sortBy(columnHeader.getScoreID(), columnHeader.nextSorting());
}
private class SortableColumnHeader extends Row {
private ESorting sort = ESorting.NONE;
private final IScore scoreID;
private final EScoreType type;
public SortableColumnHeader(final IScore scoreID, int i, ESorting sorting) {
this.scoreID = scoreID;
this.sort = sorting;
this.type = scoreID.getScoreType();
setBottomUp(false);
setPixelSizeX(getOptimalWidth(type) + 3 + COLX_SCORE_WIDTH);
ElementLayout label = createLabel(view, scoreID, -1);
label.setGrabY(true);
add(label);
add(wrap(new TextureRenderer(sort.getFileName(), view.getTextureManager()), 16));
addBackgroundRenderer(createPickingRenderer(SORT_COLUMN, i, view));
}
public IScore getScoreID() {
return scoreID;
}
public void setSort(ESorting sort) {
if (this.sort == sort)
return;
this.sort = sort;
get(1).setRenderer(new TextureRenderer(this.sort.getFileName(), view.getTextureManager()));
}
public ESorting nextSorting() {
setSort(this.sort.next());
return this.sort;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + getOuterType().hashCode();
result = prime * result + ((scoreID == null) ? 0 : scoreID.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
SortableColumnHeader other = (SortableColumnHeader) obj;
if (!getOuterType().equals(other.getOuterType()))
return false;
if (scoreID == null) {
if (other.scoreID != null)
return false;
} else if (!scoreID.equals(other.scoreID))
return false;
return true;
}
private ScoreQueryUI getOuterType() {
return ScoreQueryUI.this;
}
}
public interface ISelectionListener {
public void onSelectionChanged(ScoringElement old_, ScoringElement new_, IScore new_column);
}
}
| true | true | private ElementLayout createScoreValue(AGLView view, ScoringElement elem, SortableColumnHeader header, int id) {
Row row = new Row();
row.setGrabY(true);
IScore underlyingScore = header.getScoreID();
if (underlyingScore instanceof ProductScore)
underlyingScore = elem.getSelected((ProductScore) underlyingScore);
TablePerspective strat = resolveStratification(underlyingScore);
Group group = resolveGroup(underlyingScore);
switch (header.type) {
case STRATIFICATION_SCORE:
if (strat != null) {
row.add(createColor(strat.getDataDomain().getColor(), ReferenceElements.DATADOMAIN_TYPE_WIDTH));
row.add(createXSpacer(3));
row.add(createLabel(view, strat.getRecordPerspective(), ReferenceElements.STRATIFACTION_WIDTH));
} else {
row.add(createXSpacer(ReferenceElements.DATADOMAIN_TYPE_WIDTH + 3
+ ReferenceElements.STRATIFACTION_WIDTH));
}
row.add(createXSpacer(3));
break;
case GROUP_SCORE:
if (strat != null) {
row.add(createColor(strat.getDataDomain().getColor(), ReferenceElements.DATADOMAIN_TYPE_WIDTH));
row.add(createXSpacer(3));
row.add(createLabel(view, strat.getRecordPerspective(), ReferenceElements.STRATIFACTION_WIDTH));
} else {
row.add(createXSpacer(ReferenceElements.DATADOMAIN_TYPE_WIDTH + 3
+ ReferenceElements.STRATIFACTION_WIDTH));
}
if (group != null) {
row.add(createXSpacer(3));
row.add(createLabel(view, group, ReferenceElements.GROUP_WIDTH));
} else {
row.add(createXSpacer(3 + ReferenceElements.GROUP_WIDTH));
}
row.add(createXSpacer(3));
break;
default:
row.add(createXSpacer(20));
break;
}
float value = header.getScoreID().getScore(elem);
if (!Float.isNaN(value)) {
ElementLayout valueEL = createLabel(view, Formatter.formatNumber(value), COLX_SCORE_WIDTH);
valueEL.setGrabY(true);
valueEL.addBackgroundRenderer(new ScoreBarRenderer(value, strat != null ? strat.getDataDomain().getColor()
: new Color(0, 0, 1, 0.25f)));
row.add(valueEL);
} else {
row.add(createXSpacer(COLX_SCORE_WIDTH));
}
row.addBackgroundRenderer(createPickingRenderer(SELECT_ROW_COLUMN, id, this.view));
return row;
}
| private ElementLayout createScoreValue(AGLView view, ScoringElement elem, SortableColumnHeader header, int id) {
Row row = new Row();
row.setGrabY(true);
row.setXDynamic(true);
IScore underlyingScore = header.getScoreID();
if (underlyingScore instanceof ProductScore)
underlyingScore = elem.getSelected((ProductScore) underlyingScore);
TablePerspective strat = resolveStratification(underlyingScore);
Group group = resolveGroup(underlyingScore);
switch (header.type) {
case STRATIFICATION_SCORE:
if (strat != null) {
row.add(createColor(strat.getDataDomain().getColor(), ReferenceElements.DATADOMAIN_TYPE_WIDTH));
row.add(createXSpacer(3));
row.add(createLabel(view, strat.getRecordPerspective(), ReferenceElements.STRATIFACTION_WIDTH));
} else {
row.add(createXSpacer(ReferenceElements.DATADOMAIN_TYPE_WIDTH + 3
+ ReferenceElements.STRATIFACTION_WIDTH));
}
row.add(createXSpacer(3));
break;
case GROUP_SCORE:
if (strat != null) {
row.add(createColor(strat.getDataDomain().getColor(), ReferenceElements.DATADOMAIN_TYPE_WIDTH));
row.add(createXSpacer(3));
row.add(createLabel(view, strat.getRecordPerspective(), ReferenceElements.STRATIFACTION_WIDTH));
} else {
row.add(createXSpacer(ReferenceElements.DATADOMAIN_TYPE_WIDTH + 3
+ ReferenceElements.STRATIFACTION_WIDTH));
}
if (group != null) {
row.add(createXSpacer(3));
row.add(createLabel(view, group, ReferenceElements.GROUP_WIDTH));
} else {
row.add(createXSpacer(3 + ReferenceElements.GROUP_WIDTH));
}
row.add(createXSpacer(3));
break;
default:
row.add(createXSpacer(20));
break;
}
float value = header.getScoreID().getScore(elem);
if (!Float.isNaN(value)) {
ElementLayout valueEL = createLabel(view, Formatter.formatNumber(value), COLX_SCORE_WIDTH);
valueEL.setGrabY(true);
valueEL.addBackgroundRenderer(new ScoreBarRenderer(value, strat != null ? strat.getDataDomain().getColor()
: new Color(0, 0, 1, 0.25f)));
row.add(valueEL);
} else {
row.add(createXSpacer(COLX_SCORE_WIDTH));
}
row.addBackgroundRenderer(createPickingRenderer(SELECT_ROW_COLUMN, id, this.view));
return row;
}
|
diff --git a/src/test/java/org/arbeitspferde/groningen/validator/ValidatorTest.java b/src/test/java/org/arbeitspferde/groningen/validator/ValidatorTest.java
index 41b6d64..9f4c3ac 100644
--- a/src/test/java/org/arbeitspferde/groningen/validator/ValidatorTest.java
+++ b/src/test/java/org/arbeitspferde/groningen/validator/ValidatorTest.java
@@ -1,211 +1,215 @@
/* Copyright 2012 Google, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.arbeitspferde.groningen.validator;
import com.google.common.collect.Lists;
import org.arbeitspferde.groningen.common.ClockedExperimentDbTestCaseBase;
import org.arbeitspferde.groningen.config.GroningenConfig;
import org.arbeitspferde.groningen.eventlog.EventLoggerService;
import org.arbeitspferde.groningen.eventlog.SafeProtoLogger;
import org.arbeitspferde.groningen.experimentdb.CommandLine;
import org.arbeitspferde.groningen.experimentdb.Experiment;
import org.arbeitspferde.groningen.experimentdb.ExperimentDb;
import org.arbeitspferde.groningen.experimentdb.PauseTime;
import org.arbeitspferde.groningen.experimentdb.ResourceMetric;
import org.arbeitspferde.groningen.experimentdb.SubjectRestart;
import org.arbeitspferde.groningen.experimentdb.SubjectStateBridge;
import org.arbeitspferde.groningen.proto.Event;
import org.arbeitspferde.groningen.proto.GroningenConfigProto.ProgramConfiguration;
import org.arbeitspferde.groningen.proto.Params.GroningenParamsOrBuilder;
import org.arbeitspferde.groningen.subject.Subject;
import org.easymock.EasyMock;
import java.util.List;
/**
* The test for {@link Validator}.
*/
public class ValidatorTest extends ClockedExperimentDbTestCaseBase {
private static final long START_TIME = 1000L;
/** The object instance we are testing. */
private Validator validator;
private EventLoggerService mockEventLoggerService;
private String servingAddress;
private GroningenConfig mockGroningenConfig;
@Override
protected void setUp() throws Exception {
super.setUp();
mockEventLoggerService = EasyMock.createMock(EventLoggerService.class);
experimentDb = EasyMock.createMock(ExperimentDb.class);
mockGroningenConfig = EasyMock.createMock(GroningenConfig.class);
servingAddress = "myservingaddress:31337";
validator = new Validator(clock, monitor, experimentDb, mockGroningenConfig,
mockEventLoggerService, servingAddress, START_TIME, metricExporter);
}
/**
* Check that profiledRun works without exception.
*
* TODO(team): Make less fragile.
* TODO(team): Validate Protocol Buffer emissions.
*/
public void testProfiledRun() throws Exception {
final Experiment mockExperiment = EasyMock.createMock(Experiment.class);
final SubjectStateBridge mockSubjectA = EasyMock.createMock(SubjectStateBridge.class);
final SubjectStateBridge mockSubjectB = EasyMock.createMock(SubjectStateBridge.class);
final List<SubjectStateBridge> subjects = Lists.newArrayList();
final PauseTime mockSubjectAPauseTime = EasyMock.createMock(PauseTime.class);
final ResourceMetric mockSubjectAResourceMetric = EasyMock.createMock(ResourceMetric.class);
final PauseTime mockSubjectBPauseTime = EasyMock.createMock(PauseTime.class);
final ResourceMetric mockSubjectBResourceMetric = EasyMock.createMock(ResourceMetric.class);
final SubjectRestart mockSubjectASubjectRestart = EasyMock.createMock(SubjectRestart.class);
final SubjectRestart mockSubjectBSubjectRestart = EasyMock.createMock(SubjectRestart.class);
final CommandLine mockSubjectACommandLine = EasyMock.createMock(CommandLine.class);
final CommandLine mockSubjectBCommandLine = EasyMock.createMock(CommandLine.class);
final GroningenParamsOrBuilder mockGroningenParams =
EasyMock.createMock(GroningenParamsOrBuilder.class);
final Subject mockSubjectAAssociatedSubject = EasyMock.createMock(Subject.class);
final Subject mockSubjectBAssociatedSubject = EasyMock.createMock(Subject.class);
final SafeProtoLogger<Event.EventEntry> mockEventLogger =
EasyMock.createMock(SafeProtoLogger.class);
final ProgramConfiguration programConfiguration =
ProgramConfiguration.newBuilder().buildPartial();
subjects.add(mockSubjectA);
subjects.add(mockSubjectB);
EasyMock.expect(experimentDb.getLastExperiment()).andReturn(mockExperiment);
EasyMock.expect(mockExperiment.getSubjects()).andReturn(subjects);
EasyMock.expect(mockSubjectA.getPauseTime()).andReturn(mockSubjectAPauseTime);
EasyMock.expect(mockSubjectA.getResourceMetric()).andReturn(mockSubjectAResourceMetric);
EasyMock.expect(mockSubjectA.getSubjectRestart()).andReturn(mockSubjectASubjectRestart);
EasyMock.expect(mockSubjectA.getIdOfObject()).andReturn(1L);
EasyMock.expect(mockSubjectASubjectRestart.restartThresholdCrossed(mockGroningenConfig))
.andReturn(false);
EasyMock.expect(mockSubjectASubjectRestart.didNotRun()).andReturn(false);
EasyMock.expect(mockSubjectA.getCommandLine()).andReturn(mockSubjectACommandLine);
EasyMock.expect(mockSubjectA.getCommandLineStrings()).andReturn(Lists.newArrayList("foo"));
EasyMock.expect(mockSubjectACommandLine.toArgumentString()).andReturn("foo");
EasyMock.expect(mockSubjectA.wasRemoved()).andReturn(false);
EasyMock.expect(mockGroningenConfig.getParamBlock()).andReturn(mockGroningenParams);
EasyMock.expect(mockGroningenParams.getLatencyWeight()).andReturn(2D).atLeastOnce();
EasyMock.expect(mockGroningenParams.getThroughputWeight()).andReturn(0D).atLeastOnce();
EasyMock.expect(mockGroningenParams.getMemoryWeight()).andReturn(5D).atLeastOnce();
EasyMock.expect(mockSubjectAPauseTime.computeScore(PauseTime.ScoreType.LATENCY))
.andReturn(4D);
EasyMock.expect(mockSubjectAPauseTime.computeScore(PauseTime.ScoreType.THROUGHPUT))
.andReturn(0D);
EasyMock.expect(mockSubjectAResourceMetric.computeScore(ResourceMetric.ScoreType.MEMORY))
.andReturn(10D);
EasyMock.expect(mockSubjectA.getAssociatedSubject()).andReturn(mockSubjectAAssociatedSubject)
.atLeastOnce();
+ EasyMock.expect(mockSubjectAAssociatedSubject.isDefault()).andReturn(false)
+ .atLeastOnce();
EasyMock.expect(mockSubjectAAssociatedSubject.getServingAddress()).andReturn("/path/to/foo")
.atLeastOnce();
EasyMock.expect(experimentDb.getExperimentId()).andReturn(3L);
EasyMock.expect(mockGroningenConfig.getProtoConfig()).andReturn(programConfiguration);
EasyMock.expect(mockSubjectA.getPauseTime()).andReturn(mockSubjectAPauseTime);
EasyMock.expect(mockSubjectAPauseTime.getPauseDurations()).andReturn(Lists.newArrayList(1D));
EasyMock.expect(mockEventLoggerService.getLogger()).andReturn(mockEventLogger);
mockEventLogger.logProtoEntry(EasyMock.isA(Event.EventEntry.class));
EasyMock.expectLastCall();
EasyMock.expect(mockSubjectB.getPauseTime()).andReturn(mockSubjectBPauseTime);
EasyMock.expect(mockSubjectB.getResourceMetric()).andReturn(mockSubjectBResourceMetric);
EasyMock.expect(mockSubjectB.getSubjectRestart()).andReturn(mockSubjectBSubjectRestart);
EasyMock.expect(mockSubjectB.getIdOfObject()).andReturn(1L);
EasyMock.expect(mockSubjectBSubjectRestart.restartThresholdCrossed(mockGroningenConfig))
.andReturn(false);
EasyMock.expect(mockSubjectBSubjectRestart.didNotRun()).andReturn(false);
EasyMock.expect(mockSubjectB.getCommandLine()).andReturn(mockSubjectBCommandLine);
EasyMock.expect(mockSubjectB.getCommandLineStrings()).andReturn(Lists.newArrayList("bar"));
EasyMock.expect(mockSubjectBCommandLine.toArgumentString()).andReturn("baz");
EasyMock.expect(mockSubjectB.wasRemoved()).andReturn(false);
mockSubjectBPauseTime.invalidate();
EasyMock.expectLastCall();
mockSubjectBResourceMetric.invalidate();
EasyMock.expectLastCall();
EasyMock.expect(mockGroningenConfig.getParamBlock()).andReturn(mockGroningenParams);
EasyMock.expect(mockSubjectBPauseTime.computeScore(PauseTime.ScoreType.LATENCY))
.andReturn(8D);
EasyMock.expect(mockSubjectBPauseTime.computeScore(PauseTime.ScoreType.THROUGHPUT))
.andReturn(0D);
EasyMock.expect(mockSubjectBResourceMetric.computeScore(ResourceMetric.ScoreType.MEMORY))
.andReturn(20D);
EasyMock.expect(mockSubjectB.getAssociatedSubject()).andReturn(mockSubjectBAssociatedSubject)
.atLeastOnce();
+ EasyMock.expect(mockSubjectBAssociatedSubject.isDefault()).andReturn(false)
+ .atLeastOnce();
EasyMock.expect(mockSubjectBAssociatedSubject.getServingAddress()).andReturn("/path/to/bar")
.atLeastOnce();
EasyMock.expect(experimentDb.getExperimentId()).andReturn(3L);
EasyMock.expect(mockGroningenConfig.getProtoConfig()).andReturn(programConfiguration);
EasyMock.expect(mockSubjectB.getPauseTime()).andReturn(mockSubjectBPauseTime);
EasyMock.expect(mockSubjectBPauseTime.getPauseDurations()).andReturn(Lists.newArrayList(1D));
EasyMock.expect(mockEventLoggerService.getLogger()).andReturn(mockEventLogger);
mockEventLogger.logProtoEntry(EasyMock.isA(Event.EventEntry.class));
EasyMock.expectLastCall();
EasyMock.replay(experimentDb);
EasyMock.replay(mockExperiment);
EasyMock.replay(mockSubjectA);
EasyMock.replay(mockSubjectB);
EasyMock.replay(mockSubjectAPauseTime);
EasyMock.replay(mockSubjectBPauseTime);
EasyMock.replay(mockSubjectAResourceMetric);
EasyMock.replay(mockSubjectBResourceMetric);
EasyMock.replay(mockSubjectASubjectRestart);
EasyMock.replay(mockSubjectBSubjectRestart);
EasyMock.replay(mockSubjectACommandLine);
EasyMock.replay(mockSubjectBCommandLine);
EasyMock.replay(mockGroningenConfig);
EasyMock.replay(mockGroningenParams);
EasyMock.replay(mockSubjectAAssociatedSubject);
EasyMock.replay(mockSubjectBAssociatedSubject);
EasyMock.replay(mockEventLoggerService);
EasyMock.replay(mockEventLogger);
validator.profiledRun(mockGroningenConfig);
EasyMock.verify(experimentDb);
EasyMock.verify(mockEventLoggerService);
EasyMock.verify(mockExperiment);
EasyMock.verify(mockSubjectA);
EasyMock.verify(mockSubjectB);
EasyMock.verify(mockSubjectAPauseTime);
EasyMock.verify(mockSubjectBPauseTime);
EasyMock.verify(mockSubjectAResourceMetric);
EasyMock.verify(mockSubjectBResourceMetric);
EasyMock.verify(mockSubjectASubjectRestart);
EasyMock.verify(mockSubjectBSubjectRestart);
EasyMock.verify(mockSubjectACommandLine);
EasyMock.verify(mockSubjectBCommandLine);
EasyMock.verify(mockGroningenConfig);
EasyMock.verify(mockGroningenParams);
EasyMock.verify(mockSubjectAAssociatedSubject);
EasyMock.verify(mockSubjectBAssociatedSubject);
EasyMock.verify(mockEventLoggerService);
EasyMock.verify(mockEventLogger);
}
}
| false | true | public void testProfiledRun() throws Exception {
final Experiment mockExperiment = EasyMock.createMock(Experiment.class);
final SubjectStateBridge mockSubjectA = EasyMock.createMock(SubjectStateBridge.class);
final SubjectStateBridge mockSubjectB = EasyMock.createMock(SubjectStateBridge.class);
final List<SubjectStateBridge> subjects = Lists.newArrayList();
final PauseTime mockSubjectAPauseTime = EasyMock.createMock(PauseTime.class);
final ResourceMetric mockSubjectAResourceMetric = EasyMock.createMock(ResourceMetric.class);
final PauseTime mockSubjectBPauseTime = EasyMock.createMock(PauseTime.class);
final ResourceMetric mockSubjectBResourceMetric = EasyMock.createMock(ResourceMetric.class);
final SubjectRestart mockSubjectASubjectRestart = EasyMock.createMock(SubjectRestart.class);
final SubjectRestart mockSubjectBSubjectRestart = EasyMock.createMock(SubjectRestart.class);
final CommandLine mockSubjectACommandLine = EasyMock.createMock(CommandLine.class);
final CommandLine mockSubjectBCommandLine = EasyMock.createMock(CommandLine.class);
final GroningenParamsOrBuilder mockGroningenParams =
EasyMock.createMock(GroningenParamsOrBuilder.class);
final Subject mockSubjectAAssociatedSubject = EasyMock.createMock(Subject.class);
final Subject mockSubjectBAssociatedSubject = EasyMock.createMock(Subject.class);
final SafeProtoLogger<Event.EventEntry> mockEventLogger =
EasyMock.createMock(SafeProtoLogger.class);
final ProgramConfiguration programConfiguration =
ProgramConfiguration.newBuilder().buildPartial();
subjects.add(mockSubjectA);
subjects.add(mockSubjectB);
EasyMock.expect(experimentDb.getLastExperiment()).andReturn(mockExperiment);
EasyMock.expect(mockExperiment.getSubjects()).andReturn(subjects);
EasyMock.expect(mockSubjectA.getPauseTime()).andReturn(mockSubjectAPauseTime);
EasyMock.expect(mockSubjectA.getResourceMetric()).andReturn(mockSubjectAResourceMetric);
EasyMock.expect(mockSubjectA.getSubjectRestart()).andReturn(mockSubjectASubjectRestart);
EasyMock.expect(mockSubjectA.getIdOfObject()).andReturn(1L);
EasyMock.expect(mockSubjectASubjectRestart.restartThresholdCrossed(mockGroningenConfig))
.andReturn(false);
EasyMock.expect(mockSubjectASubjectRestart.didNotRun()).andReturn(false);
EasyMock.expect(mockSubjectA.getCommandLine()).andReturn(mockSubjectACommandLine);
EasyMock.expect(mockSubjectA.getCommandLineStrings()).andReturn(Lists.newArrayList("foo"));
EasyMock.expect(mockSubjectACommandLine.toArgumentString()).andReturn("foo");
EasyMock.expect(mockSubjectA.wasRemoved()).andReturn(false);
EasyMock.expect(mockGroningenConfig.getParamBlock()).andReturn(mockGroningenParams);
EasyMock.expect(mockGroningenParams.getLatencyWeight()).andReturn(2D).atLeastOnce();
EasyMock.expect(mockGroningenParams.getThroughputWeight()).andReturn(0D).atLeastOnce();
EasyMock.expect(mockGroningenParams.getMemoryWeight()).andReturn(5D).atLeastOnce();
EasyMock.expect(mockSubjectAPauseTime.computeScore(PauseTime.ScoreType.LATENCY))
.andReturn(4D);
EasyMock.expect(mockSubjectAPauseTime.computeScore(PauseTime.ScoreType.THROUGHPUT))
.andReturn(0D);
EasyMock.expect(mockSubjectAResourceMetric.computeScore(ResourceMetric.ScoreType.MEMORY))
.andReturn(10D);
EasyMock.expect(mockSubjectA.getAssociatedSubject()).andReturn(mockSubjectAAssociatedSubject)
.atLeastOnce();
EasyMock.expect(mockSubjectAAssociatedSubject.getServingAddress()).andReturn("/path/to/foo")
.atLeastOnce();
EasyMock.expect(experimentDb.getExperimentId()).andReturn(3L);
EasyMock.expect(mockGroningenConfig.getProtoConfig()).andReturn(programConfiguration);
EasyMock.expect(mockSubjectA.getPauseTime()).andReturn(mockSubjectAPauseTime);
EasyMock.expect(mockSubjectAPauseTime.getPauseDurations()).andReturn(Lists.newArrayList(1D));
EasyMock.expect(mockEventLoggerService.getLogger()).andReturn(mockEventLogger);
mockEventLogger.logProtoEntry(EasyMock.isA(Event.EventEntry.class));
EasyMock.expectLastCall();
EasyMock.expect(mockSubjectB.getPauseTime()).andReturn(mockSubjectBPauseTime);
EasyMock.expect(mockSubjectB.getResourceMetric()).andReturn(mockSubjectBResourceMetric);
EasyMock.expect(mockSubjectB.getSubjectRestart()).andReturn(mockSubjectBSubjectRestart);
EasyMock.expect(mockSubjectB.getIdOfObject()).andReturn(1L);
EasyMock.expect(mockSubjectBSubjectRestart.restartThresholdCrossed(mockGroningenConfig))
.andReturn(false);
EasyMock.expect(mockSubjectBSubjectRestart.didNotRun()).andReturn(false);
EasyMock.expect(mockSubjectB.getCommandLine()).andReturn(mockSubjectBCommandLine);
EasyMock.expect(mockSubjectB.getCommandLineStrings()).andReturn(Lists.newArrayList("bar"));
EasyMock.expect(mockSubjectBCommandLine.toArgumentString()).andReturn("baz");
EasyMock.expect(mockSubjectB.wasRemoved()).andReturn(false);
mockSubjectBPauseTime.invalidate();
EasyMock.expectLastCall();
mockSubjectBResourceMetric.invalidate();
EasyMock.expectLastCall();
EasyMock.expect(mockGroningenConfig.getParamBlock()).andReturn(mockGroningenParams);
EasyMock.expect(mockSubjectBPauseTime.computeScore(PauseTime.ScoreType.LATENCY))
.andReturn(8D);
EasyMock.expect(mockSubjectBPauseTime.computeScore(PauseTime.ScoreType.THROUGHPUT))
.andReturn(0D);
EasyMock.expect(mockSubjectBResourceMetric.computeScore(ResourceMetric.ScoreType.MEMORY))
.andReturn(20D);
EasyMock.expect(mockSubjectB.getAssociatedSubject()).andReturn(mockSubjectBAssociatedSubject)
.atLeastOnce();
EasyMock.expect(mockSubjectBAssociatedSubject.getServingAddress()).andReturn("/path/to/bar")
.atLeastOnce();
EasyMock.expect(experimentDb.getExperimentId()).andReturn(3L);
EasyMock.expect(mockGroningenConfig.getProtoConfig()).andReturn(programConfiguration);
EasyMock.expect(mockSubjectB.getPauseTime()).andReturn(mockSubjectBPauseTime);
EasyMock.expect(mockSubjectBPauseTime.getPauseDurations()).andReturn(Lists.newArrayList(1D));
EasyMock.expect(mockEventLoggerService.getLogger()).andReturn(mockEventLogger);
mockEventLogger.logProtoEntry(EasyMock.isA(Event.EventEntry.class));
EasyMock.expectLastCall();
EasyMock.replay(experimentDb);
EasyMock.replay(mockExperiment);
EasyMock.replay(mockSubjectA);
EasyMock.replay(mockSubjectB);
EasyMock.replay(mockSubjectAPauseTime);
EasyMock.replay(mockSubjectBPauseTime);
EasyMock.replay(mockSubjectAResourceMetric);
EasyMock.replay(mockSubjectBResourceMetric);
EasyMock.replay(mockSubjectASubjectRestart);
EasyMock.replay(mockSubjectBSubjectRestart);
EasyMock.replay(mockSubjectACommandLine);
EasyMock.replay(mockSubjectBCommandLine);
EasyMock.replay(mockGroningenConfig);
EasyMock.replay(mockGroningenParams);
EasyMock.replay(mockSubjectAAssociatedSubject);
EasyMock.replay(mockSubjectBAssociatedSubject);
EasyMock.replay(mockEventLoggerService);
EasyMock.replay(mockEventLogger);
validator.profiledRun(mockGroningenConfig);
EasyMock.verify(experimentDb);
EasyMock.verify(mockEventLoggerService);
EasyMock.verify(mockExperiment);
EasyMock.verify(mockSubjectA);
EasyMock.verify(mockSubjectB);
EasyMock.verify(mockSubjectAPauseTime);
EasyMock.verify(mockSubjectBPauseTime);
EasyMock.verify(mockSubjectAResourceMetric);
EasyMock.verify(mockSubjectBResourceMetric);
EasyMock.verify(mockSubjectASubjectRestart);
EasyMock.verify(mockSubjectBSubjectRestart);
EasyMock.verify(mockSubjectACommandLine);
EasyMock.verify(mockSubjectBCommandLine);
EasyMock.verify(mockGroningenConfig);
EasyMock.verify(mockGroningenParams);
EasyMock.verify(mockSubjectAAssociatedSubject);
EasyMock.verify(mockSubjectBAssociatedSubject);
EasyMock.verify(mockEventLoggerService);
EasyMock.verify(mockEventLogger);
}
| public void testProfiledRun() throws Exception {
final Experiment mockExperiment = EasyMock.createMock(Experiment.class);
final SubjectStateBridge mockSubjectA = EasyMock.createMock(SubjectStateBridge.class);
final SubjectStateBridge mockSubjectB = EasyMock.createMock(SubjectStateBridge.class);
final List<SubjectStateBridge> subjects = Lists.newArrayList();
final PauseTime mockSubjectAPauseTime = EasyMock.createMock(PauseTime.class);
final ResourceMetric mockSubjectAResourceMetric = EasyMock.createMock(ResourceMetric.class);
final PauseTime mockSubjectBPauseTime = EasyMock.createMock(PauseTime.class);
final ResourceMetric mockSubjectBResourceMetric = EasyMock.createMock(ResourceMetric.class);
final SubjectRestart mockSubjectASubjectRestart = EasyMock.createMock(SubjectRestart.class);
final SubjectRestart mockSubjectBSubjectRestart = EasyMock.createMock(SubjectRestart.class);
final CommandLine mockSubjectACommandLine = EasyMock.createMock(CommandLine.class);
final CommandLine mockSubjectBCommandLine = EasyMock.createMock(CommandLine.class);
final GroningenParamsOrBuilder mockGroningenParams =
EasyMock.createMock(GroningenParamsOrBuilder.class);
final Subject mockSubjectAAssociatedSubject = EasyMock.createMock(Subject.class);
final Subject mockSubjectBAssociatedSubject = EasyMock.createMock(Subject.class);
final SafeProtoLogger<Event.EventEntry> mockEventLogger =
EasyMock.createMock(SafeProtoLogger.class);
final ProgramConfiguration programConfiguration =
ProgramConfiguration.newBuilder().buildPartial();
subjects.add(mockSubjectA);
subjects.add(mockSubjectB);
EasyMock.expect(experimentDb.getLastExperiment()).andReturn(mockExperiment);
EasyMock.expect(mockExperiment.getSubjects()).andReturn(subjects);
EasyMock.expect(mockSubjectA.getPauseTime()).andReturn(mockSubjectAPauseTime);
EasyMock.expect(mockSubjectA.getResourceMetric()).andReturn(mockSubjectAResourceMetric);
EasyMock.expect(mockSubjectA.getSubjectRestart()).andReturn(mockSubjectASubjectRestart);
EasyMock.expect(mockSubjectA.getIdOfObject()).andReturn(1L);
EasyMock.expect(mockSubjectASubjectRestart.restartThresholdCrossed(mockGroningenConfig))
.andReturn(false);
EasyMock.expect(mockSubjectASubjectRestart.didNotRun()).andReturn(false);
EasyMock.expect(mockSubjectA.getCommandLine()).andReturn(mockSubjectACommandLine);
EasyMock.expect(mockSubjectA.getCommandLineStrings()).andReturn(Lists.newArrayList("foo"));
EasyMock.expect(mockSubjectACommandLine.toArgumentString()).andReturn("foo");
EasyMock.expect(mockSubjectA.wasRemoved()).andReturn(false);
EasyMock.expect(mockGroningenConfig.getParamBlock()).andReturn(mockGroningenParams);
EasyMock.expect(mockGroningenParams.getLatencyWeight()).andReturn(2D).atLeastOnce();
EasyMock.expect(mockGroningenParams.getThroughputWeight()).andReturn(0D).atLeastOnce();
EasyMock.expect(mockGroningenParams.getMemoryWeight()).andReturn(5D).atLeastOnce();
EasyMock.expect(mockSubjectAPauseTime.computeScore(PauseTime.ScoreType.LATENCY))
.andReturn(4D);
EasyMock.expect(mockSubjectAPauseTime.computeScore(PauseTime.ScoreType.THROUGHPUT))
.andReturn(0D);
EasyMock.expect(mockSubjectAResourceMetric.computeScore(ResourceMetric.ScoreType.MEMORY))
.andReturn(10D);
EasyMock.expect(mockSubjectA.getAssociatedSubject()).andReturn(mockSubjectAAssociatedSubject)
.atLeastOnce();
EasyMock.expect(mockSubjectAAssociatedSubject.isDefault()).andReturn(false)
.atLeastOnce();
EasyMock.expect(mockSubjectAAssociatedSubject.getServingAddress()).andReturn("/path/to/foo")
.atLeastOnce();
EasyMock.expect(experimentDb.getExperimentId()).andReturn(3L);
EasyMock.expect(mockGroningenConfig.getProtoConfig()).andReturn(programConfiguration);
EasyMock.expect(mockSubjectA.getPauseTime()).andReturn(mockSubjectAPauseTime);
EasyMock.expect(mockSubjectAPauseTime.getPauseDurations()).andReturn(Lists.newArrayList(1D));
EasyMock.expect(mockEventLoggerService.getLogger()).andReturn(mockEventLogger);
mockEventLogger.logProtoEntry(EasyMock.isA(Event.EventEntry.class));
EasyMock.expectLastCall();
EasyMock.expect(mockSubjectB.getPauseTime()).andReturn(mockSubjectBPauseTime);
EasyMock.expect(mockSubjectB.getResourceMetric()).andReturn(mockSubjectBResourceMetric);
EasyMock.expect(mockSubjectB.getSubjectRestart()).andReturn(mockSubjectBSubjectRestart);
EasyMock.expect(mockSubjectB.getIdOfObject()).andReturn(1L);
EasyMock.expect(mockSubjectBSubjectRestart.restartThresholdCrossed(mockGroningenConfig))
.andReturn(false);
EasyMock.expect(mockSubjectBSubjectRestart.didNotRun()).andReturn(false);
EasyMock.expect(mockSubjectB.getCommandLine()).andReturn(mockSubjectBCommandLine);
EasyMock.expect(mockSubjectB.getCommandLineStrings()).andReturn(Lists.newArrayList("bar"));
EasyMock.expect(mockSubjectBCommandLine.toArgumentString()).andReturn("baz");
EasyMock.expect(mockSubjectB.wasRemoved()).andReturn(false);
mockSubjectBPauseTime.invalidate();
EasyMock.expectLastCall();
mockSubjectBResourceMetric.invalidate();
EasyMock.expectLastCall();
EasyMock.expect(mockGroningenConfig.getParamBlock()).andReturn(mockGroningenParams);
EasyMock.expect(mockSubjectBPauseTime.computeScore(PauseTime.ScoreType.LATENCY))
.andReturn(8D);
EasyMock.expect(mockSubjectBPauseTime.computeScore(PauseTime.ScoreType.THROUGHPUT))
.andReturn(0D);
EasyMock.expect(mockSubjectBResourceMetric.computeScore(ResourceMetric.ScoreType.MEMORY))
.andReturn(20D);
EasyMock.expect(mockSubjectB.getAssociatedSubject()).andReturn(mockSubjectBAssociatedSubject)
.atLeastOnce();
EasyMock.expect(mockSubjectBAssociatedSubject.isDefault()).andReturn(false)
.atLeastOnce();
EasyMock.expect(mockSubjectBAssociatedSubject.getServingAddress()).andReturn("/path/to/bar")
.atLeastOnce();
EasyMock.expect(experimentDb.getExperimentId()).andReturn(3L);
EasyMock.expect(mockGroningenConfig.getProtoConfig()).andReturn(programConfiguration);
EasyMock.expect(mockSubjectB.getPauseTime()).andReturn(mockSubjectBPauseTime);
EasyMock.expect(mockSubjectBPauseTime.getPauseDurations()).andReturn(Lists.newArrayList(1D));
EasyMock.expect(mockEventLoggerService.getLogger()).andReturn(mockEventLogger);
mockEventLogger.logProtoEntry(EasyMock.isA(Event.EventEntry.class));
EasyMock.expectLastCall();
EasyMock.replay(experimentDb);
EasyMock.replay(mockExperiment);
EasyMock.replay(mockSubjectA);
EasyMock.replay(mockSubjectB);
EasyMock.replay(mockSubjectAPauseTime);
EasyMock.replay(mockSubjectBPauseTime);
EasyMock.replay(mockSubjectAResourceMetric);
EasyMock.replay(mockSubjectBResourceMetric);
EasyMock.replay(mockSubjectASubjectRestart);
EasyMock.replay(mockSubjectBSubjectRestart);
EasyMock.replay(mockSubjectACommandLine);
EasyMock.replay(mockSubjectBCommandLine);
EasyMock.replay(mockGroningenConfig);
EasyMock.replay(mockGroningenParams);
EasyMock.replay(mockSubjectAAssociatedSubject);
EasyMock.replay(mockSubjectBAssociatedSubject);
EasyMock.replay(mockEventLoggerService);
EasyMock.replay(mockEventLogger);
validator.profiledRun(mockGroningenConfig);
EasyMock.verify(experimentDb);
EasyMock.verify(mockEventLoggerService);
EasyMock.verify(mockExperiment);
EasyMock.verify(mockSubjectA);
EasyMock.verify(mockSubjectB);
EasyMock.verify(mockSubjectAPauseTime);
EasyMock.verify(mockSubjectBPauseTime);
EasyMock.verify(mockSubjectAResourceMetric);
EasyMock.verify(mockSubjectBResourceMetric);
EasyMock.verify(mockSubjectASubjectRestart);
EasyMock.verify(mockSubjectBSubjectRestart);
EasyMock.verify(mockSubjectACommandLine);
EasyMock.verify(mockSubjectBCommandLine);
EasyMock.verify(mockGroningenConfig);
EasyMock.verify(mockGroningenParams);
EasyMock.verify(mockSubjectAAssociatedSubject);
EasyMock.verify(mockSubjectBAssociatedSubject);
EasyMock.verify(mockEventLoggerService);
EasyMock.verify(mockEventLogger);
}
|
diff --git a/trunk/xmlvm/src/xmlvm/org/xmlvm/proc/out/OutputProcessFactory.java b/trunk/xmlvm/src/xmlvm/org/xmlvm/proc/out/OutputProcessFactory.java
index 840ef2dc..50eee34f 100755
--- a/trunk/xmlvm/src/xmlvm/org/xmlvm/proc/out/OutputProcessFactory.java
+++ b/trunk/xmlvm/src/xmlvm/org/xmlvm/proc/out/OutputProcessFactory.java
@@ -1,85 +1,85 @@
/*
* Copyright (c) 2004-2009 XMLVM --- An XML-based Programming Language
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 675 Mass
* Ave, Cambridge, MA 02139, USA.
*
* For more information, visit the XMLVM Home Page at http://www.xmlvm.org
*/
package org.xmlvm.proc.out;
import org.xmlvm.Log;
import org.xmlvm.main.Arguments;
import org.xmlvm.main.Targets;
import org.xmlvm.proc.XmlvmProcess;
/**
* Creates OutputProcess based on the given targets.
*/
public class OutputProcessFactory {
/**
* The arguments that should be given to the created processes.
*/
protected Arguments arguments;
/**
* Creates a new OutputProcessFactory
*
* @param arguments
* The arguments that should be given to the created processes.
*/
public OutputProcessFactory(Arguments arguments) {
this.arguments = arguments;
}
/**
* Based on the given target, returns a suitable target process or null, if
* no process could be found.
*/
public XmlvmProcess<?> createTargetProcess(Targets target, String out) {
switch (target) {
case JS:
return new JavaScriptOutputProcess(arguments);
case PYTHON:
return new PythonOutputProcess(arguments);
case CPP:
return new CppOutputProcess(arguments);
case OBJC:
return new ObjectiveCOutputProcess(arguments);
case QOOXDOO:
return new QooxdooOutputProcess(arguments);
case IPHONE:
return new IPhoneOutputProcess(arguments);
case IPHONEANDROID:
return new Android2IPhoneOutputProcess(arguments);
case WEBOS:
- return new Android2IPhoneOutputProcess(arguments);
+ return new Android2PalmPreOutputProcess(arguments);
case XMLVM:
return new XmlvmOutputProcess(arguments);
case IPHONETEMPLATE:
return new TemplateOutputProcess(arguments);
case CLASS:
return new JavaByteCodeOutputProcess(arguments);
case EXE:
return new CILByteCodeOutputProcess(arguments);
case DEX:
return new DexOutputProcess(arguments);
case DEXMLVM:
return new DEXmlvmOutputProcess(arguments);
}
Log.error("Could not create target process for target '" + target + "'.");
return null;
}
}
| true | true | public XmlvmProcess<?> createTargetProcess(Targets target, String out) {
switch (target) {
case JS:
return new JavaScriptOutputProcess(arguments);
case PYTHON:
return new PythonOutputProcess(arguments);
case CPP:
return new CppOutputProcess(arguments);
case OBJC:
return new ObjectiveCOutputProcess(arguments);
case QOOXDOO:
return new QooxdooOutputProcess(arguments);
case IPHONE:
return new IPhoneOutputProcess(arguments);
case IPHONEANDROID:
return new Android2IPhoneOutputProcess(arguments);
case WEBOS:
return new Android2IPhoneOutputProcess(arguments);
case XMLVM:
return new XmlvmOutputProcess(arguments);
case IPHONETEMPLATE:
return new TemplateOutputProcess(arguments);
case CLASS:
return new JavaByteCodeOutputProcess(arguments);
case EXE:
return new CILByteCodeOutputProcess(arguments);
case DEX:
return new DexOutputProcess(arguments);
case DEXMLVM:
return new DEXmlvmOutputProcess(arguments);
}
Log.error("Could not create target process for target '" + target + "'.");
return null;
}
| public XmlvmProcess<?> createTargetProcess(Targets target, String out) {
switch (target) {
case JS:
return new JavaScriptOutputProcess(arguments);
case PYTHON:
return new PythonOutputProcess(arguments);
case CPP:
return new CppOutputProcess(arguments);
case OBJC:
return new ObjectiveCOutputProcess(arguments);
case QOOXDOO:
return new QooxdooOutputProcess(arguments);
case IPHONE:
return new IPhoneOutputProcess(arguments);
case IPHONEANDROID:
return new Android2IPhoneOutputProcess(arguments);
case WEBOS:
return new Android2PalmPreOutputProcess(arguments);
case XMLVM:
return new XmlvmOutputProcess(arguments);
case IPHONETEMPLATE:
return new TemplateOutputProcess(arguments);
case CLASS:
return new JavaByteCodeOutputProcess(arguments);
case EXE:
return new CILByteCodeOutputProcess(arguments);
case DEX:
return new DexOutputProcess(arguments);
case DEXMLVM:
return new DEXmlvmOutputProcess(arguments);
}
Log.error("Could not create target process for target '" + target + "'.");
return null;
}
|
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportUtils.java b/src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportUtils.java
index 00bbbfe6..5ef3f21b 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportUtils.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportUtils.java
@@ -1,217 +1,217 @@
/**
* $Revision: $
* $Date: $
*
* Copyright (C) 2006 Jive Software. All rights reserved.
*
* This software is published under the terms of the GNU Lesser Public License (LGPL),
* a copy of which is included in this distribution.
*/
package org.jivesoftware.sparkimpl.plugin.gateways.transports;
import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.filter.PacketIDFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.Registration;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.PrivateDataManager;
import org.jivesoftware.smackx.ServiceDiscoveryManager;
import org.jivesoftware.smackx.packet.DiscoverInfo;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.util.TaskEngine;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.plugin.gateways.GatewayPrivateData;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
/**
* Handles some basic handling of
*/
public class TransportUtils {
private static Map<String, Transport> transports = new HashMap<String, Transport>();
private static GatewayPrivateData gatewayPreferences;
private TransportUtils() {
}
static {
PrivateDataManager.addPrivateDataProvider(GatewayPrivateData.ELEMENT, GatewayPrivateData.NAMESPACE, new GatewayPrivateData.ConferencePrivateDataProvider());
final Runnable loadGateways = new Runnable() {
public void run() {
try {
PrivateDataManager pdm = SparkManager.getSessionManager().getPersonalDataManager();
gatewayPreferences = (GatewayPrivateData)pdm.getPrivateData(GatewayPrivateData.ELEMENT, GatewayPrivateData.NAMESPACE);
}
catch (XMPPException e) {
Log.error("Unable to load private data for Gateways", e);
}
}
};
TaskEngine.getInstance().submit(loadGateways);
}
public static boolean autoJoinService(String serviceName) {
return gatewayPreferences.autoLogin(serviceName);
}
public static void setAutoJoin(String serviceName, boolean autoJoin) {
gatewayPreferences.addService(serviceName, autoJoin);
PrivateDataManager pdm = SparkManager.getSessionManager().getPersonalDataManager();
try {
pdm.setPrivateData(gatewayPreferences);
}
catch (XMPPException e) {
Log.error(e);
}
}
public static Transport getTransport(String serviceName) {
// Return transport.
if (transports.containsKey(serviceName)) {
return transports.get(serviceName);
}
return null;
}
/**
* Returns true if the jid is from a gateway.
* @param jid the jid.
* @return true if the jid is from a gateway.
*/
public static boolean isFromGateway(String jid) {
jid = StringUtils.parseBareAddress(jid);
String serviceName = StringUtils.parseServer(jid);
return transports.containsKey(serviceName);
}
public static void addTransport(String serviceName, Transport transport) {
transports.put(serviceName, transport);
}
public static Collection<Transport> getTransports() {
return transports.values();
}
/**
* Checks if the user is registered with a gateway.
*
* @param con the XMPPConnection.
* @param transport the transport.
* @return true if the user is registered with the transport.
*/
public static boolean isRegistered(XMPPConnection con, Transport transport) {
if (!con.isConnected()) {
return false;
}
ServiceDiscoveryManager discoveryManager = ServiceDiscoveryManager.getInstanceFor(con);
try {
DiscoverInfo info = discoveryManager.discoverInfo(transport.getServiceName());
return info.containsFeature("jabber:iq:registered");
}
catch (XMPPException e) {
Log.error(e);
}
return false;
}
/**
* Registers a user with a gateway.
*
* @param con the XMPPConnection.
* @param gatewayDomain the domain of the gateway (service name)
* @param username the username.
* @param password the password.
* @param nickname the nickname.
* @throws XMPPException thrown if there was an issue registering with the gateway.
*/
public static void registerUser(XMPPConnection con, String gatewayDomain, String username, String password, String nickname) throws XMPPException {
Registration registration = new Registration();
registration.setType(IQ.Type.SET);
registration.setTo(gatewayDomain);
registration.addExtension(new GatewayRegisterExtension());
Map<String, String> attributes = new HashMap<String, String>();
if (username != null) {
attributes.put("username", username);
}
if (password != null) {
attributes.put("password", password);
}
if (nickname != null) {
- attributes.put("nickname", nickname);
+ attributes.put("nick", nickname);
}
registration.setAttributes(attributes);
PacketCollector collector = con.createPacketCollector(new PacketIDFilter(registration.getPacketID()));
con.sendPacket(registration);
IQ response = (IQ)collector.nextResult(SmackConfiguration.getPacketReplyTimeout());
collector.cancel();
if (response == null) {
throw new XMPPException("Server timed out");
}
if (response.getType() == IQ.Type.ERROR) {
throw new XMPPException("Error registering user", response.getError());
}
}
/**
* @param con the XMPPConnection.
* @param gatewayDomain the domain of the gateway (service name)
* @throws XMPPException thrown if there was an issue unregistering with the gateway.
*/
public static void unregister(XMPPConnection con, String gatewayDomain) throws XMPPException {
Registration registration = new Registration();
registration.setType(IQ.Type.SET);
registration.setTo(gatewayDomain);
Map<String,String> map = new HashMap<String,String>();
map.put("remove", "");
registration.setAttributes(map);
PacketCollector collector = con.createPacketCollector(new PacketIDFilter(registration.getPacketID()));
con.sendPacket(registration);
IQ response = (IQ)collector.nextResult(SmackConfiguration.getPacketReplyTimeout());
collector.cancel();
if (response == null) {
throw new XMPPException("Server timed out");
}
if (response.getType() == IQ.Type.ERROR) {
throw new XMPPException("Error registering user", response.getError());
}
}
static class GatewayRegisterExtension implements PacketExtension {
public String getElementName() {
return "x";
}
public String getNamespace() {
return "jabber:iq:gateway:register";
}
public String toXML() {
StringBuilder builder = new StringBuilder();
builder.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
"\"/>");
return builder.toString();
}
}
}
| true | true | public static void registerUser(XMPPConnection con, String gatewayDomain, String username, String password, String nickname) throws XMPPException {
Registration registration = new Registration();
registration.setType(IQ.Type.SET);
registration.setTo(gatewayDomain);
registration.addExtension(new GatewayRegisterExtension());
Map<String, String> attributes = new HashMap<String, String>();
if (username != null) {
attributes.put("username", username);
}
if (password != null) {
attributes.put("password", password);
}
if (nickname != null) {
attributes.put("nickname", nickname);
}
registration.setAttributes(attributes);
PacketCollector collector = con.createPacketCollector(new PacketIDFilter(registration.getPacketID()));
con.sendPacket(registration);
IQ response = (IQ)collector.nextResult(SmackConfiguration.getPacketReplyTimeout());
collector.cancel();
if (response == null) {
throw new XMPPException("Server timed out");
}
if (response.getType() == IQ.Type.ERROR) {
throw new XMPPException("Error registering user", response.getError());
}
}
| public static void registerUser(XMPPConnection con, String gatewayDomain, String username, String password, String nickname) throws XMPPException {
Registration registration = new Registration();
registration.setType(IQ.Type.SET);
registration.setTo(gatewayDomain);
registration.addExtension(new GatewayRegisterExtension());
Map<String, String> attributes = new HashMap<String, String>();
if (username != null) {
attributes.put("username", username);
}
if (password != null) {
attributes.put("password", password);
}
if (nickname != null) {
attributes.put("nick", nickname);
}
registration.setAttributes(attributes);
PacketCollector collector = con.createPacketCollector(new PacketIDFilter(registration.getPacketID()));
con.sendPacket(registration);
IQ response = (IQ)collector.nextResult(SmackConfiguration.getPacketReplyTimeout());
collector.cancel();
if (response == null) {
throw new XMPPException("Server timed out");
}
if (response.getType() == IQ.Type.ERROR) {
throw new XMPPException("Error registering user", response.getError());
}
}
|
diff --git a/src/com/iBank/Commands/CommandHelp.java b/src/com/iBank/Commands/CommandHelp.java
index f8f8222..2357773 100644
--- a/src/com/iBank/Commands/CommandHelp.java
+++ b/src/com/iBank/Commands/CommandHelp.java
@@ -1,74 +1,74 @@
package com.iBank.Commands;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.iBank.iBank;
import com.iBank.system.Command;
import com.iBank.system.CommandHandler;
import com.iBank.system.CommandInfo;
import com.iBank.system.Configuration;
import com.iBank.system.MessageManager;
/**
* /bank or /bank help
* @author steffengy
*
*/
@CommandInfo(arguments = { "" },
permission = "iBank.access",
root = "bank",
sub = "help"
)
public class CommandHelp implements Command {
protected String root = "";
/**
* Constructor
* @param root The root name of the command
*/
public CommandHelp(String root) {
this.root = root;
}
@Override
public void handle(CommandSender sender, String[] arguments) {
//Display possible help for this command
if(!(sender instanceof Player)) {
- MessageManager.send(sender, "iBank "+iBank.description.getVersion()+" ("+iBank.CodeName+")");
+ MessageManager.send(sender, "iBank "+iBank.description.getVersion());
String args = "";
for(String name : CommandHandler.getCommands("bank"))
{
args = CommandHandler.getArgInfo(root, name);
MessageManager.send(sender, " /"+root+" "+name+" &gray&"+args+" &gold&-&y& "+CommandHandler.getHelp(root, name));
}
return;
}
int sites = 1 + (int) Math.ceil(CommandHandler.getCommands("bank").size() / 9);
int curSite = 0;
try{
curSite = arguments.length == 0 ? 0 : Integer.parseInt(arguments[0]) -1;
}catch(Exception e) { }
- MessageManager.send(sender, "iBank "+iBank.description.getVersion()+" ("+iBank.CodeName+") ("+(curSite+1)+"/"+sites+")", "");
+ MessageManager.send(sender, "iBank "+iBank.description.getVersion()+" ("+(curSite+1)+"/"+sites+")", "");
String args = "";
int counter = 0;
//from = site * 12
//to = site * 12 + 12
for(String name : CommandHandler.getCommands("bank"))
{
if(CommandHandler.isCallable((Player)sender, root , name))
{
if((curSite * 12) > counter) { counter++; continue; }
if(curSite * 12 + 12 < counter) break;
args = CommandHandler.getArgInfo(root, name) != null ? CommandHandler.getArgInfo(root, name) : "";
MessageManager.send(sender, " /"+root+" "+name+" &gray&"+args+" &gold&-&y& "+CommandHandler.getHelp(root, name), "");
counter++;
}
}
}
public String getHelp() {
return Configuration.StringEntry.HelpDescription.getValue();
}
}
| false | true | public void handle(CommandSender sender, String[] arguments) {
//Display possible help for this command
if(!(sender instanceof Player)) {
MessageManager.send(sender, "iBank "+iBank.description.getVersion()+" ("+iBank.CodeName+")");
String args = "";
for(String name : CommandHandler.getCommands("bank"))
{
args = CommandHandler.getArgInfo(root, name);
MessageManager.send(sender, " /"+root+" "+name+" &gray&"+args+" &gold&-&y& "+CommandHandler.getHelp(root, name));
}
return;
}
int sites = 1 + (int) Math.ceil(CommandHandler.getCommands("bank").size() / 9);
int curSite = 0;
try{
curSite = arguments.length == 0 ? 0 : Integer.parseInt(arguments[0]) -1;
}catch(Exception e) { }
MessageManager.send(sender, "iBank "+iBank.description.getVersion()+" ("+iBank.CodeName+") ("+(curSite+1)+"/"+sites+")", "");
String args = "";
int counter = 0;
//from = site * 12
//to = site * 12 + 12
for(String name : CommandHandler.getCommands("bank"))
{
if(CommandHandler.isCallable((Player)sender, root , name))
{
if((curSite * 12) > counter) { counter++; continue; }
if(curSite * 12 + 12 < counter) break;
args = CommandHandler.getArgInfo(root, name) != null ? CommandHandler.getArgInfo(root, name) : "";
MessageManager.send(sender, " /"+root+" "+name+" &gray&"+args+" &gold&-&y& "+CommandHandler.getHelp(root, name), "");
counter++;
}
}
}
| public void handle(CommandSender sender, String[] arguments) {
//Display possible help for this command
if(!(sender instanceof Player)) {
MessageManager.send(sender, "iBank "+iBank.description.getVersion());
String args = "";
for(String name : CommandHandler.getCommands("bank"))
{
args = CommandHandler.getArgInfo(root, name);
MessageManager.send(sender, " /"+root+" "+name+" &gray&"+args+" &gold&-&y& "+CommandHandler.getHelp(root, name));
}
return;
}
int sites = 1 + (int) Math.ceil(CommandHandler.getCommands("bank").size() / 9);
int curSite = 0;
try{
curSite = arguments.length == 0 ? 0 : Integer.parseInt(arguments[0]) -1;
}catch(Exception e) { }
MessageManager.send(sender, "iBank "+iBank.description.getVersion()+" ("+(curSite+1)+"/"+sites+")", "");
String args = "";
int counter = 0;
//from = site * 12
//to = site * 12 + 12
for(String name : CommandHandler.getCommands("bank"))
{
if(CommandHandler.isCallable((Player)sender, root , name))
{
if((curSite * 12) > counter) { counter++; continue; }
if(curSite * 12 + 12 < counter) break;
args = CommandHandler.getArgInfo(root, name) != null ? CommandHandler.getArgInfo(root, name) : "";
MessageManager.send(sender, " /"+root+" "+name+" &gray&"+args+" &gold&-&y& "+CommandHandler.getHelp(root, name), "");
counter++;
}
}
}
|
diff --git a/src/java/org/jamwiki/persistency/db/DatabaseUpgrades.java b/src/java/org/jamwiki/persistency/db/DatabaseUpgrades.java
index d1c30b5f..b1912238 100644
--- a/src/java/org/jamwiki/persistency/db/DatabaseUpgrades.java
+++ b/src/java/org/jamwiki/persistency/db/DatabaseUpgrades.java
@@ -1,147 +1,147 @@
/**
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE, version 2.1, dated February 1999.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the latest version of the GNU Lesser General
* Public License as published by the Free Software Foundation;
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program (LICENSE.txt); if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package org.jamwiki.persistency.db;
import java.sql.Connection;
import java.sql.Timestamp;
import java.util.Vector;
import org.apache.log4j.Logger;
import org.jamwiki.Environment;
/**
* This class simply contains utility methods for upgrading database schemas
* (if needed) between JAMWiki versions. In general upgrade methods will only
* be maintained for a few versions and then deleted - for example, JAMWiki version 10.0.0
* does not need to keep the upgrade methods from JAMWiki 0.0.1 around.
*/
public class DatabaseUpgrades {
private static Logger logger = Logger.getLogger(DatabaseUpgrades.class.getName());
/**
*
*/
public static Vector upgrade010(Vector messages) throws Exception {
Connection conn = null;
try {
conn = DatabaseConnection.getConnection();
conn.setAutoCommit(false);
String sql = "alter table jam_virtual_wiki add column default_topic_name VARCHAR(200)";
DatabaseConnection.executeUpdate(sql, conn);
sql = "update jam_virtual_wiki set default_topic_name = ?";
WikiPreparedStatement stmt = new WikiPreparedStatement(sql);
stmt.setString(1, Environment.getValue(Environment.PROP_BASE_DEFAULT_TOPIC));
stmt.executeUpdate(conn);
sql = "alter table jam_virtual_wiki alter column default_topic_name set NOT NULL";
DatabaseConnection.executeUpdate(sql, conn);
conn.commit();
// FIXME - hard coding
messages.add("Updated jam_virtual_wiki table");
} catch (Exception e) {
conn.rollback();
throw e;
} finally {
DatabaseConnection.closeConnection(conn);
}
return messages;
}
/**
*
*/
public static Vector upgrade030(Vector messages) throws Exception {
Connection conn = null;
try {
conn = DatabaseConnection.getConnection();
conn.setAutoCommit(false);
String sql = "drop table jam_image";
DatabaseConnection.executeUpdate(sql, conn);
// FIXME - hard coding
messages.add("Dropped jam_image table");
DatabaseConnection.executeUpdate(DefaultQueryHandler.STATEMENT_CREATE_CATEGORY_TABLE, conn);
// FIXME - hard coding
messages.add("Added jam_category table");
conn.commit();
} catch (Exception e) {
try {
DatabaseConnection.executeUpdate(DefaultQueryHandler.STATEMENT_DROP_CATEGORY_TABLE, conn);
} catch (Exception ex) {}
conn.rollback();
throw e;
} finally {
DatabaseConnection.closeConnection(conn);
}
return messages;
}
/**
*
*/
public static Vector upgrade031(Vector messages) throws Exception {
Connection conn = null;
try {
// FIXME - hard coding
conn = DatabaseConnection.getConnection();
conn.setAutoCommit(false);
// add redirection column
String sql = "alter table jam_topic add column redirect_to VARCHAR(200) ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Added redirect_to column to table jam_topic");
- // convert topic_deleted (int) to topic_delete_date (timestamp)
+ // convert topic_deleted (int) to delete_date (timestamp)
sql = "alter table jam_topic add column delete_date TIMESTAMP ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Added delete_date column to table jam_topic");
sql = "alter table jam_topic drop constraint jam_unique_topic_name_vwiki ";
DatabaseConnection.executeUpdate(sql, conn);
sql = "alter table jam_topic add constraint jam_unique_topic_name_vwiki UNIQUE (topic_name, virtual_wiki_id, delete_date) ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Updated unique topic name constraint");
sql = "update jam_topic set delete_date = ? where topic_deleted = '1' ";
WikiPreparedStatement stmt = new WikiPreparedStatement(sql);
stmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
stmt.executeUpdate(conn);
messages.add("Updated deleted topics in jam_topic");
sql = "alter table jam_topic drop column topic_deleted ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Dropped column topic_deleted from table jam_topic");
// convert file_deleted (int) to file_deleted (timestamp)
sql = "alter table jam_file add column delete_date TIMESTAMP ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Added delete_date column to table jam_file");
sql = "update jam_file set delete_date = ? where file_deleted = '1' ";
stmt = new WikiPreparedStatement(sql);
stmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
stmt.executeUpdate(conn);
messages.add("Updated deleted files in jam_file");
sql = "alter table jam_file drop column file_deleted ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Dropped column file_deleted from table jam_file");
// make user login constraint "lower(login)"
sql = "alter table jam_wiki_user drop constraint jam_unique_wiki_user_login ";
DatabaseConnection.executeUpdate(sql, conn);
DatabaseConnection.executeUpdate(DefaultQueryHandler.STATEMENT_CREATE_WIKI_USER_LOGIN_INDEX, conn);
messages.add("Updated unique wiki user login constraint");
conn.commit();
} catch (Exception e) {
conn.rollback();
throw e;
} finally {
DatabaseConnection.closeConnection(conn);
}
return messages;
}
}
| true | true | public static Vector upgrade031(Vector messages) throws Exception {
Connection conn = null;
try {
// FIXME - hard coding
conn = DatabaseConnection.getConnection();
conn.setAutoCommit(false);
// add redirection column
String sql = "alter table jam_topic add column redirect_to VARCHAR(200) ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Added redirect_to column to table jam_topic");
// convert topic_deleted (int) to topic_delete_date (timestamp)
sql = "alter table jam_topic add column delete_date TIMESTAMP ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Added delete_date column to table jam_topic");
sql = "alter table jam_topic drop constraint jam_unique_topic_name_vwiki ";
DatabaseConnection.executeUpdate(sql, conn);
sql = "alter table jam_topic add constraint jam_unique_topic_name_vwiki UNIQUE (topic_name, virtual_wiki_id, delete_date) ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Updated unique topic name constraint");
sql = "update jam_topic set delete_date = ? where topic_deleted = '1' ";
WikiPreparedStatement stmt = new WikiPreparedStatement(sql);
stmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
stmt.executeUpdate(conn);
messages.add("Updated deleted topics in jam_topic");
sql = "alter table jam_topic drop column topic_deleted ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Dropped column topic_deleted from table jam_topic");
// convert file_deleted (int) to file_deleted (timestamp)
sql = "alter table jam_file add column delete_date TIMESTAMP ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Added delete_date column to table jam_file");
sql = "update jam_file set delete_date = ? where file_deleted = '1' ";
stmt = new WikiPreparedStatement(sql);
stmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
stmt.executeUpdate(conn);
messages.add("Updated deleted files in jam_file");
sql = "alter table jam_file drop column file_deleted ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Dropped column file_deleted from table jam_file");
// make user login constraint "lower(login)"
sql = "alter table jam_wiki_user drop constraint jam_unique_wiki_user_login ";
DatabaseConnection.executeUpdate(sql, conn);
DatabaseConnection.executeUpdate(DefaultQueryHandler.STATEMENT_CREATE_WIKI_USER_LOGIN_INDEX, conn);
messages.add("Updated unique wiki user login constraint");
conn.commit();
} catch (Exception e) {
conn.rollback();
throw e;
} finally {
DatabaseConnection.closeConnection(conn);
}
return messages;
}
| public static Vector upgrade031(Vector messages) throws Exception {
Connection conn = null;
try {
// FIXME - hard coding
conn = DatabaseConnection.getConnection();
conn.setAutoCommit(false);
// add redirection column
String sql = "alter table jam_topic add column redirect_to VARCHAR(200) ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Added redirect_to column to table jam_topic");
// convert topic_deleted (int) to delete_date (timestamp)
sql = "alter table jam_topic add column delete_date TIMESTAMP ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Added delete_date column to table jam_topic");
sql = "alter table jam_topic drop constraint jam_unique_topic_name_vwiki ";
DatabaseConnection.executeUpdate(sql, conn);
sql = "alter table jam_topic add constraint jam_unique_topic_name_vwiki UNIQUE (topic_name, virtual_wiki_id, delete_date) ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Updated unique topic name constraint");
sql = "update jam_topic set delete_date = ? where topic_deleted = '1' ";
WikiPreparedStatement stmt = new WikiPreparedStatement(sql);
stmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
stmt.executeUpdate(conn);
messages.add("Updated deleted topics in jam_topic");
sql = "alter table jam_topic drop column topic_deleted ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Dropped column topic_deleted from table jam_topic");
// convert file_deleted (int) to file_deleted (timestamp)
sql = "alter table jam_file add column delete_date TIMESTAMP ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Added delete_date column to table jam_file");
sql = "update jam_file set delete_date = ? where file_deleted = '1' ";
stmt = new WikiPreparedStatement(sql);
stmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
stmt.executeUpdate(conn);
messages.add("Updated deleted files in jam_file");
sql = "alter table jam_file drop column file_deleted ";
DatabaseConnection.executeUpdate(sql, conn);
messages.add("Dropped column file_deleted from table jam_file");
// make user login constraint "lower(login)"
sql = "alter table jam_wiki_user drop constraint jam_unique_wiki_user_login ";
DatabaseConnection.executeUpdate(sql, conn);
DatabaseConnection.executeUpdate(DefaultQueryHandler.STATEMENT_CREATE_WIKI_USER_LOGIN_INDEX, conn);
messages.add("Updated unique wiki user login constraint");
conn.commit();
} catch (Exception e) {
conn.rollback();
throw e;
} finally {
DatabaseConnection.closeConnection(conn);
}
return messages;
}
|
diff --git a/src/org/openplans/rcavl/GpsService.java b/src/org/openplans/rcavl/GpsService.java
index d94f619..91a6d40 100644
--- a/src/org/openplans/rcavl/GpsService.java
+++ b/src/org/openplans/rcavl/GpsService.java
@@ -1,211 +1,211 @@
/* This program is free software: you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation, either version 3 of
the License, or (props, at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package org.openplans.rcavl;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Binder;
import android.os.Bundle;
import android.os.IBinder;
import android.os.Looper;
import android.util.Log;
public class GpsService extends Service {
private GpsServiceThread thread;
private LocalBinder binder = new LocalBinder();
private RCAVL activity;
@Override
public void onCreate() {
super.onCreate();
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
String url = intent.getStringExtra("pingUrl");
String email = intent.getStringExtra("email");
String password = intent.getStringExtra("password");
thread = new GpsServiceThread(url, email, password);
new Thread(thread).start();
return START_STICKY;
}
@Override
public void onDestroy() {
thread.stop();
}
public class LocalBinder extends Binder {
GpsService getService() {
// Return this instance of LocalService so clients can call public
// methods
return GpsService.this;
}
}
class GpsServiceThread implements LocationListener, Runnable {
private final String TAG = GpsServiceThread.class.toString();
private String url;
private String password;
private String email;
private String status;
private volatile boolean active;
private Location lastLocation;
private LocationManager locationManager;
public GpsServiceThread(String url, String email, String password) {
this.url = url;
this.email = email;
this.password = password;
this.status = "active";
active = true;
}
public void stop() {
Looper looper = Looper.myLooper();
looper.quit();
}
public void onLocationChanged(Location location) {
if (!active) {
return;
}
lastLocation = location;
ping(location);
}
private void ping(Location location) {
HttpClient client = new DefaultHttpClient();
HttpPost request = new HttpPost(url);
try {
List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(
4);
nameValuePairs.add(new BasicNameValuePair("email", email));
nameValuePairs
.add(new BasicNameValuePair("password", password));
if (location != null) {
- nameValuePairs.add(new BasicNameValuePair("latitude",
+ nameValuePairs.add(new BasicNameValuePair("lat",
Double.toString(location.getLatitude())));
- nameValuePairs.add(new BasicNameValuePair("latitude",
+ nameValuePairs.add(new BasicNameValuePair("lng",
Double.toString(location.getLongitude())));
}
nameValuePairs.add(new BasicNameValuePair("status", status));
request.setEntity(new UrlEncodedFormEntity(nameValuePairs));
@SuppressWarnings("unused")
HttpResponse response = client.execute(request);
/* would be nice to do something with the result here */
} catch (ClientProtocolException e) {
Log.e(TAG, "exception sending ping " + e);
} catch (IOException e) {
Log.e(TAG, "exception sending ping " + e);
}
}
public void onProviderDisabled(String provider) {
toast("provider disabled " + provider);
}
public void onProviderEnabled(String provider) {
toast("provider enabled " + provider);
}
public void onStatusChanged(String provider, int status, Bundle extras) {
toast("on status changed " + provider + " status = " + status);
}
public void toast(String message) {
if (!active) {
return;
}
if (activity != null) {
activity.toast(message);
}
}
public void run() {
Looper.prepare();
locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
locationManager.requestLocationUpdates(
LocationManager.GPS_PROVIDER, 0, 0, this);
Looper.loop();
Looper.myLooper().quit();
}
public void setStatus(String status) {
this.status = status;
ping(lastLocation);
}
public String getStatus() {
return status;
}
public void setActive(boolean active) {
this.active = active;
if (active) {
locationManager.requestLocationUpdates(
LocationManager.GPS_PROVIDER, 0, 0, this);
} else {
locationManager.removeUpdates(this);
}
}
public boolean isActive() {
return active;
}
}
@Override
public IBinder onBind(Intent intent) {
return binder;
}
public void setActivity(RCAVL activity) {
this.activity = activity;
}
public void setStatus(String status, boolean active) {
thread.setActive(active);
thread.setStatus(status);
}
public boolean isActive() {
return thread.isActive();
}
}
| false | true | private void ping(Location location) {
HttpClient client = new DefaultHttpClient();
HttpPost request = new HttpPost(url);
try {
List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(
4);
nameValuePairs.add(new BasicNameValuePair("email", email));
nameValuePairs
.add(new BasicNameValuePair("password", password));
if (location != null) {
nameValuePairs.add(new BasicNameValuePair("latitude",
Double.toString(location.getLatitude())));
nameValuePairs.add(new BasicNameValuePair("latitude",
Double.toString(location.getLongitude())));
}
nameValuePairs.add(new BasicNameValuePair("status", status));
request.setEntity(new UrlEncodedFormEntity(nameValuePairs));
@SuppressWarnings("unused")
HttpResponse response = client.execute(request);
/* would be nice to do something with the result here */
} catch (ClientProtocolException e) {
Log.e(TAG, "exception sending ping " + e);
} catch (IOException e) {
Log.e(TAG, "exception sending ping " + e);
}
}
| private void ping(Location location) {
HttpClient client = new DefaultHttpClient();
HttpPost request = new HttpPost(url);
try {
List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(
4);
nameValuePairs.add(new BasicNameValuePair("email", email));
nameValuePairs
.add(new BasicNameValuePair("password", password));
if (location != null) {
nameValuePairs.add(new BasicNameValuePair("lat",
Double.toString(location.getLatitude())));
nameValuePairs.add(new BasicNameValuePair("lng",
Double.toString(location.getLongitude())));
}
nameValuePairs.add(new BasicNameValuePair("status", status));
request.setEntity(new UrlEncodedFormEntity(nameValuePairs));
@SuppressWarnings("unused")
HttpResponse response = client.execute(request);
/* would be nice to do something with the result here */
} catch (ClientProtocolException e) {
Log.e(TAG, "exception sending ping " + e);
} catch (IOException e) {
Log.e(TAG, "exception sending ping " + e);
}
}
|
diff --git a/src/HelloWorld.java b/src/HelloWorld.java
index 4ec52e9..dcb5d95 100644
--- a/src/HelloWorld.java
+++ b/src/HelloWorld.java
@@ -1,40 +1,35 @@
/**
* ハローワールドクラス
*
* @author 3567
*
*/
public class HelloWorld {
/**
* システムアウトします
*
* @param args
*/
public static void main(String[] args) {
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
// 承認後に予定変更できるように対応
- System.out.println("test");
- System.out.println("test");
- System.out.println("test");
- System.out.println("test");
- System.out.println("test");
- System.out.println("test");
+ System.out.println("Java");
}
}
| true | true | public static void main(String[] args) {
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
// 承認後に予定変更できるように対応
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
}
| public static void main(String[] args) {
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
System.out.println("test");
// 承認後に予定変更できるように対応
System.out.println("Java");
}
|
diff --git a/iq4j-faces/src/main/java/com/iq4j/faces/taghandler/EntityConverterHandler.java b/iq4j-faces/src/main/java/com/iq4j/faces/taghandler/EntityConverterHandler.java
index a70e90c..46920b1 100644
--- a/iq4j-faces/src/main/java/com/iq4j/faces/taghandler/EntityConverterHandler.java
+++ b/iq4j-faces/src/main/java/com/iq4j/faces/taghandler/EntityConverterHandler.java
@@ -1,38 +1,38 @@
package com.iq4j.faces.taghandler;
import java.io.IOException;
import javax.faces.component.UIComponent;
import javax.faces.view.facelets.FaceletContext;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagConfig;
import javax.faces.view.facelets.TagHandler;
import com.iq4j.faces.util.ExpressionsUtil;
public class EntityConverterHandler extends TagHandler {
private final TagAttribute entity;
private final TagAttribute noSelectionValue;
public EntityConverterHandler(TagConfig config) {
super(config);
this.entity = getAttribute("entity");
this.noSelectionValue = getAttribute("noSelectionValue");
}
@Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException {
- if(entity == null) { // if entry attribute not setted. entityConverter would not be registered.
+ if(entity == null || entity.getValue() == null) { // if entry attribute not setted. entityConverter would not be registered.
return;
}
parent.getAttributes().put("entity", entity.getValue(ctx));
parent.getAttributes().put("noSelectionValue", noSelectionValue == null ? "" : noSelectionValue.getValue(ctx));
parent.setValueExpression("converter", new ExpressionsUtil().createValueExpression("#{entityConverter}"));
}
}
| true | true | public void apply(FaceletContext ctx, UIComponent parent) throws IOException {
if(entity == null) { // if entry attribute not setted. entityConverter would not be registered.
return;
}
parent.getAttributes().put("entity", entity.getValue(ctx));
parent.getAttributes().put("noSelectionValue", noSelectionValue == null ? "" : noSelectionValue.getValue(ctx));
parent.setValueExpression("converter", new ExpressionsUtil().createValueExpression("#{entityConverter}"));
}
| public void apply(FaceletContext ctx, UIComponent parent) throws IOException {
if(entity == null || entity.getValue() == null) { // if entry attribute not setted. entityConverter would not be registered.
return;
}
parent.getAttributes().put("entity", entity.getValue(ctx));
parent.getAttributes().put("noSelectionValue", noSelectionValue == null ? "" : noSelectionValue.getValue(ctx));
parent.setValueExpression("converter", new ExpressionsUtil().createValueExpression("#{entityConverter}"));
}
|
diff --git a/src/net/mdcreator/tpplus/PlayerListener.java b/src/net/mdcreator/tpplus/PlayerListener.java
index fe1044c..978a782 100644
--- a/src/net/mdcreator/tpplus/PlayerListener.java
+++ b/src/net/mdcreator/tpplus/PlayerListener.java
@@ -1,50 +1,51 @@
package net.mdcreator.tpplus;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerBedEnterEvent;
import org.bukkit.event.player.PlayerJoinEvent;
public class PlayerListener implements Listener {
private TPPlus plugin;
private String title = ChatColor.DARK_GRAY + "[" + ChatColor.BLUE + "TP+" + ChatColor.DARK_GRAY + "] " + ChatColor.GRAY;
public PlayerListener(TPPlus plugin){
this.plugin = plugin;
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event){
Player player = event.getPlayer();
if(!player.hasPlayedBefore()){
FileConfiguration config = plugin.configYML;
Location loc = new Location(
plugin.getServer().getWorld(config.getString("spawn.world")),
config.getDouble("spawn.y"),
config.getDouble("spawn.x"),
config.getDouble("spawn.z"),
(float) config.getDouble("spawn.pitch"),
(float) config.getDouble("spawn.yaw")
);
+ loc.getWorld().loadChunk(loc.getWorld().getChunkAt(loc));
player.teleport(loc);
loc.getWorld().playEffect(loc, Effect.ENDER_SIGNAL, 1);
loc.getWorld().playEffect(loc, Effect.MOBSPAWNER_FLAMES, 1);
loc.getWorld().playEffect(loc, Effect.STEP_SOUND, 90);
}
}
@EventHandler
public void onPlayerBedLeave(PlayerBedEnterEvent event){
Player player = event.getPlayer();
if(!plugin.homesManager.homes.containsKey(player.getName())){
player.sendMessage(title + "To set your bed as home, say " + ChatColor.DARK_GRAY +"/home set bed" + ChatColor.GRAY + ".");
}
}
}
| true | true | public void onPlayerJoin(PlayerJoinEvent event){
Player player = event.getPlayer();
if(!player.hasPlayedBefore()){
FileConfiguration config = plugin.configYML;
Location loc = new Location(
plugin.getServer().getWorld(config.getString("spawn.world")),
config.getDouble("spawn.y"),
config.getDouble("spawn.x"),
config.getDouble("spawn.z"),
(float) config.getDouble("spawn.pitch"),
(float) config.getDouble("spawn.yaw")
);
player.teleport(loc);
loc.getWorld().playEffect(loc, Effect.ENDER_SIGNAL, 1);
loc.getWorld().playEffect(loc, Effect.MOBSPAWNER_FLAMES, 1);
loc.getWorld().playEffect(loc, Effect.STEP_SOUND, 90);
}
}
| public void onPlayerJoin(PlayerJoinEvent event){
Player player = event.getPlayer();
if(!player.hasPlayedBefore()){
FileConfiguration config = plugin.configYML;
Location loc = new Location(
plugin.getServer().getWorld(config.getString("spawn.world")),
config.getDouble("spawn.y"),
config.getDouble("spawn.x"),
config.getDouble("spawn.z"),
(float) config.getDouble("spawn.pitch"),
(float) config.getDouble("spawn.yaw")
);
loc.getWorld().loadChunk(loc.getWorld().getChunkAt(loc));
player.teleport(loc);
loc.getWorld().playEffect(loc, Effect.ENDER_SIGNAL, 1);
loc.getWorld().playEffect(loc, Effect.MOBSPAWNER_FLAMES, 1);
loc.getWorld().playEffect(loc, Effect.STEP_SOUND, 90);
}
}
|
diff --git a/src/tetrix/core/tetrominos/L.java b/src/tetrix/core/tetrominos/L.java
index c266593..1f937aa 100644
--- a/src/tetrix/core/tetrominos/L.java
+++ b/src/tetrix/core/tetrominos/L.java
@@ -1,124 +1,124 @@
package tetrix.core.tetrominos;
/**
*
* @author Magnus Huttu
*
*/
import org.newdawn.slick.SlickException;
import tetrix.core.BlockBox;
import tetrix.core.Position;
import tetrix.util.Util;
public class L extends Tetromino {
public L(int startX, BlockBox bBox) {
this(startX, (Util.WINDOW_WIDTH - Util.BOX_WIDTH) / 2, bBox);
}
public L(int startX, int leftIn, BlockBox bBox) {
this(startX, leftIn, Util.SQUARE_SIZE, bBox);
}
public L(int startX, int leftIn, int fallspeed, BlockBox bBox) {
super(startX, leftIn, fallspeed, bBox);
}
public void build() {
Square[] s = super.getSquares();
int rand = (int) (Math.random() * 40);
if (rand < 10) {
for (int i = 0; i < 4; i++) {
s[i] = new Square(new Position(
super.getLeftIn(Util.SQUARE_SIZE * 3)
+ (Util.SQUARE_SIZE * super.getStartX()) - i
* Util.SQUARE_SIZE, Util.B4_BOX_HEIGHT
+ Util.SQUARE_SIZE), this, i);
if (i < 1)
s[i] = new Square(new Position(
(super.getLeftIn(Util.SQUARE_SIZE * 2))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT), this, i);
}
} else if (rand < 20 && rand >= 10) {
for (int i = 0; i < 4; i++) {
s[i] = new Square(new Position(super.getLeftIn(0)
+ (Util.SQUARE_SIZE * super.getStartX() + i
* Util.SQUARE_SIZE), Util.B4_BOX_HEIGHT), this,
i);
if (i > 2)
s[i] = new Square(new Position((super.getLeftIn(0))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT + Util.SQUARE_SIZE), this, i);
}
} else if (rand < 30 && rand >= 20) {
for (int i = 3; i > -1; i--) {
s[i] = new Square(new Position(
super.getLeftIn(Util.SQUARE_SIZE)
+ (Util.SQUARE_SIZE * super.getStartX()),
(Util.B4_BOX_HEIGHT) + i * Util.SQUARE_SIZE), this,
i);
if (i > 2)
s[i] = new Square(new Position((super.getLeftIn(0))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT), this, i);
}
} else if (rand < 40 && rand >= 30) {
- for (int i = 3; i > -1; i--) {
+ for (int i = 0; i < 4; i++) {
s[i] = new Square(new Position(
super.getLeftIn(0)
+ (Util.SQUARE_SIZE * super.getStartX()),
- (Util.B4_BOX_HEIGHT - Util.SQUARE_SIZE) + i
+ (Util.B4_BOX_HEIGHT - Util.SQUARE_SIZE) + (2-i)
* Util.SQUARE_SIZE), this, i);
- if (i < 1)
+ if (i > 2)
s[i] = new Square(new Position(
(super.getLeftIn(Util.SQUARE_SIZE))
+ (Util.SQUARE_SIZE * super.getStartX()),
- Util.B4_BOX_HEIGHT + 2 * Util.SQUARE_SIZE), this, i);
+ Util.B4_BOX_HEIGHT + Util.SQUARE_SIZE), this, i);
}
}
}
@Override
public String toString() {
return "L";
}
public void notWhole() throws SlickException {
Square[] sq2 = getSquares();
for (Square s : getSquares()) {
if (s.destroyed()) {
if (!s.used()) {
if (s.getNbr() == 0) {
if (!used && !SqrDstr4) {
sq2[3].destroy();
sq2[3].use();
bBox.newBrokenBlock(3, this, sq2[3].getPos(),
getX());
used = true;
}
SqrDstr = true;
} else if (s.getNbr() == 1) {
if (!used && !SqrDstr3) {
sq2[2].destroy();
sq2[2].use();
bBox.newBrokenBlock(2, this, sq2[2].getPos(),
getX());
used = true;
}
SqrDstr2 = true;
} else if (s.getNbr() == 2) {
SqrDstr3 = true;
} else if (s.getNbr() == 3) {
SqrDstr4 = true;
}
}
}
}
}
}
| false | true | public void build() {
Square[] s = super.getSquares();
int rand = (int) (Math.random() * 40);
if (rand < 10) {
for (int i = 0; i < 4; i++) {
s[i] = new Square(new Position(
super.getLeftIn(Util.SQUARE_SIZE * 3)
+ (Util.SQUARE_SIZE * super.getStartX()) - i
* Util.SQUARE_SIZE, Util.B4_BOX_HEIGHT
+ Util.SQUARE_SIZE), this, i);
if (i < 1)
s[i] = new Square(new Position(
(super.getLeftIn(Util.SQUARE_SIZE * 2))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT), this, i);
}
} else if (rand < 20 && rand >= 10) {
for (int i = 0; i < 4; i++) {
s[i] = new Square(new Position(super.getLeftIn(0)
+ (Util.SQUARE_SIZE * super.getStartX() + i
* Util.SQUARE_SIZE), Util.B4_BOX_HEIGHT), this,
i);
if (i > 2)
s[i] = new Square(new Position((super.getLeftIn(0))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT + Util.SQUARE_SIZE), this, i);
}
} else if (rand < 30 && rand >= 20) {
for (int i = 3; i > -1; i--) {
s[i] = new Square(new Position(
super.getLeftIn(Util.SQUARE_SIZE)
+ (Util.SQUARE_SIZE * super.getStartX()),
(Util.B4_BOX_HEIGHT) + i * Util.SQUARE_SIZE), this,
i);
if (i > 2)
s[i] = new Square(new Position((super.getLeftIn(0))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT), this, i);
}
} else if (rand < 40 && rand >= 30) {
for (int i = 3; i > -1; i--) {
s[i] = new Square(new Position(
super.getLeftIn(0)
+ (Util.SQUARE_SIZE * super.getStartX()),
(Util.B4_BOX_HEIGHT - Util.SQUARE_SIZE) + i
* Util.SQUARE_SIZE), this, i);
if (i < 1)
s[i] = new Square(new Position(
(super.getLeftIn(Util.SQUARE_SIZE))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT + 2 * Util.SQUARE_SIZE), this, i);
}
}
}
| public void build() {
Square[] s = super.getSquares();
int rand = (int) (Math.random() * 40);
if (rand < 10) {
for (int i = 0; i < 4; i++) {
s[i] = new Square(new Position(
super.getLeftIn(Util.SQUARE_SIZE * 3)
+ (Util.SQUARE_SIZE * super.getStartX()) - i
* Util.SQUARE_SIZE, Util.B4_BOX_HEIGHT
+ Util.SQUARE_SIZE), this, i);
if (i < 1)
s[i] = new Square(new Position(
(super.getLeftIn(Util.SQUARE_SIZE * 2))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT), this, i);
}
} else if (rand < 20 && rand >= 10) {
for (int i = 0; i < 4; i++) {
s[i] = new Square(new Position(super.getLeftIn(0)
+ (Util.SQUARE_SIZE * super.getStartX() + i
* Util.SQUARE_SIZE), Util.B4_BOX_HEIGHT), this,
i);
if (i > 2)
s[i] = new Square(new Position((super.getLeftIn(0))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT + Util.SQUARE_SIZE), this, i);
}
} else if (rand < 30 && rand >= 20) {
for (int i = 3; i > -1; i--) {
s[i] = new Square(new Position(
super.getLeftIn(Util.SQUARE_SIZE)
+ (Util.SQUARE_SIZE * super.getStartX()),
(Util.B4_BOX_HEIGHT) + i * Util.SQUARE_SIZE), this,
i);
if (i > 2)
s[i] = new Square(new Position((super.getLeftIn(0))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT), this, i);
}
} else if (rand < 40 && rand >= 30) {
for (int i = 0; i < 4; i++) {
s[i] = new Square(new Position(
super.getLeftIn(0)
+ (Util.SQUARE_SIZE * super.getStartX()),
(Util.B4_BOX_HEIGHT - Util.SQUARE_SIZE) + (2-i)
* Util.SQUARE_SIZE), this, i);
if (i > 2)
s[i] = new Square(new Position(
(super.getLeftIn(Util.SQUARE_SIZE))
+ (Util.SQUARE_SIZE * super.getStartX()),
Util.B4_BOX_HEIGHT + Util.SQUARE_SIZE), this, i);
}
}
}
|
diff --git a/src/com/shade/lighting/LightMask.java b/src/com/shade/lighting/LightMask.java
index db17042..6f6cc7e 100644
--- a/src/com/shade/lighting/LightMask.java
+++ b/src/com/shade/lighting/LightMask.java
@@ -1,168 +1,165 @@
package com.shade.lighting;
import java.util.Arrays;
import java.util.LinkedList;
import org.lwjgl.opengl.GL11;
import org.newdawn.slick.Color;
import org.newdawn.slick.GameContainer;
import org.newdawn.slick.Graphics;
import org.newdawn.slick.Image;
import org.newdawn.slick.state.StateBasedGame;
import com.shade.controls.DayPhaseTimer;
/**
* A view which renders a set of entities, lights, and background images in such
* a way as to generate dynamic lighting.
*
* It's safe to draw things to the screen after calling LightMask.render if you
* want them to appear above the gameplay, for instance user controls.
*
* <em>Note that calling render will update your entities' luminosity. Please
* direct any hate mail to JJ Jou.</em>
*
* @author JJ Jou <[email protected]>
* @author Alexander Schearer <[email protected]>
*/
public class LightMask {
protected final static Color SHADE = new Color(0, 0, 0, .3f);
public static final float MAX_DARKNESS = 0.4f;
private DayPhaseTimer timer;
/**======================END CONSTANTS=======================*/
private int threshold;
private LinkedList<LightSource> lights;
public LightMask(int threshold, DayPhaseTimer time) {
this.threshold = threshold;
lights = new LinkedList<LightSource>();
timer = time;
}
public void add(LightSource light) {
lights.add(light);
}
public void render(StateBasedGame game, Graphics g,
LuminousEntity[] entities, Image... backgrounds) {
renderLights(game, g, entities);
renderBackgrounds(game, g, backgrounds);
renderEntities(game, g, entities);
//RENDER NIGHT! WHEEE
renderTimeOfDay(game, g);
}
public void renderTimeOfDay(StateBasedGame game, Graphics g){
Color c = g.getColor();
if(timer.getDaylightStatus()==DayPhaseTimer.DayLightStatus.DUSK){
g.setColor(new Color(1-timer.timeLeft(),1-timer.timeLeft(),0f,MAX_DARKNESS*timer.timeLeft()));
g.fillRect(0, 0, game.getContainer().getWidth(), game.getContainer().getHeight());
}
else if(timer.getDaylightStatus()==DayPhaseTimer.DayLightStatus.NIGHT){
g.setColor(new Color(0,0,0,MAX_DARKNESS));
g.fillRect(0, 0, game.getContainer().getWidth(), game.getContainer().getHeight());
}
else if(timer.getDaylightStatus()==DayPhaseTimer.DayLightStatus.DAWN){
g.setColor(new Color(timer.timeLeft(),timer.timeLeft(),0,MAX_DARKNESS*(1-timer.timeLeft())));
g.fillRect(0, 0, game.getContainer().getWidth(), game.getContainer().getHeight());
}
g.setColor(c);
}
private void renderLights(StateBasedGame game, Graphics g,
LuminousEntity... entities) {
enableStencil();
for (LightSource light : lights) {
light.render(game, g, entities);
}
disableStencil();
GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
g.setColor(SHADE);
GameContainer c = game.getContainer();
g.fillRect(0, 0, c.getWidth(), c.getHeight());
g.setColor(Color.white);
}
private void renderBackgrounds(StateBasedGame game, Graphics g,
Image... backgrounds) {
GL11.glBlendFunc(GL11.GL_DST_ALPHA, GL11.GL_ONE);
for (Image background : backgrounds) {
background.draw();
}
}
private void renderEntities(StateBasedGame game, Graphics g,
LuminousEntity... entities) {
Arrays.sort(entities);
int i = 0;
- // GL11.glEnable(GL11.GL_ALPHA_TEST);
+ GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_STENCIL_TEST);
- GL11.glStencilFunc(GL11.GL_ALWAYS, 1, 1);
- GL11.glStencilOp(GL11.GL_KEEP, GL11.GL_KEEP, GL11.GL_REPLACE);
GL11.glAlphaFunc(GL11.GL_GREATER, 0);
GL11.glBlendFunc(GL11.GL_DST_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
while (i < entities.length && entities[i].getZIndex() < threshold) {
entities[i].render(game, g);
entities[i].setLuminosity(getLuminosityFor(entities[i], g));
i++;
}
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
while (i < entities.length) {
entities[i].render(game, g);
entities[i].setLuminosity(getLuminosityFor(entities[i], g));
i++;
}
- GL11.glDisable(GL11.GL_STENCIL_TEST);
GL11.glDisable(GL11.GL_ALPHA_TEST);
}
private float getLuminosityFor(LuminousEntity entity, Graphics g) {
return g.getPixel((int) entity.getXCenter(), (int) entity.getYCenter()).a;
}
/**
* Called before drawing the shadows cast by a light.
*/
protected static void enableStencil() {
// write only to the stencil buffer
GL11.glEnable(GL11.GL_STENCIL_TEST);
GL11.glColorMask(false, false, false, false);
GL11.glDepthMask(false);
}
protected static void resetStencil(){
GL11.glClearStencil(0);
// write a one to the stencil buffer everywhere we are about to draw
GL11.glStencilFunc(GL11.GL_ALWAYS, 1, 1);
// this is to always pass a one to the stencil buffer where we draw
GL11.glStencilOp(GL11.GL_REPLACE, GL11.GL_REPLACE, GL11.GL_REPLACE);
}
/**
* Called after drawing the shadows cast by a light.
*/
protected static void keepStencil() {
// resume drawing to everything
GL11.glDepthMask(true);
GL11.glColorMask(true, true, true, true);
GL11.glStencilFunc(GL11.GL_NOTEQUAL, 1, 1);
// don't modify the contents of the stencil buffer
GL11.glStencilOp(GL11.GL_KEEP, GL11.GL_KEEP, GL11.GL_KEEP);
GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
}
protected static void disableStencil(){
GL11.glDisable(GL11.GL_STENCIL_TEST);
GL11.glClear(GL11.GL_STENCIL_BUFFER_BIT);
}
}
| false | true | private void renderEntities(StateBasedGame game, Graphics g,
LuminousEntity... entities) {
Arrays.sort(entities);
int i = 0;
// GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_STENCIL_TEST);
GL11.glStencilFunc(GL11.GL_ALWAYS, 1, 1);
GL11.glStencilOp(GL11.GL_KEEP, GL11.GL_KEEP, GL11.GL_REPLACE);
GL11.glAlphaFunc(GL11.GL_GREATER, 0);
GL11.glBlendFunc(GL11.GL_DST_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
while (i < entities.length && entities[i].getZIndex() < threshold) {
entities[i].render(game, g);
entities[i].setLuminosity(getLuminosityFor(entities[i], g));
i++;
}
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
while (i < entities.length) {
entities[i].render(game, g);
entities[i].setLuminosity(getLuminosityFor(entities[i], g));
i++;
}
GL11.glDisable(GL11.GL_STENCIL_TEST);
GL11.glDisable(GL11.GL_ALPHA_TEST);
}
| private void renderEntities(StateBasedGame game, Graphics g,
LuminousEntity... entities) {
Arrays.sort(entities);
int i = 0;
GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_STENCIL_TEST);
GL11.glAlphaFunc(GL11.GL_GREATER, 0);
GL11.glBlendFunc(GL11.GL_DST_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
while (i < entities.length && entities[i].getZIndex() < threshold) {
entities[i].render(game, g);
entities[i].setLuminosity(getLuminosityFor(entities[i], g));
i++;
}
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
while (i < entities.length) {
entities[i].render(game, g);
entities[i].setLuminosity(getLuminosityFor(entities[i], g));
i++;
}
GL11.glDisable(GL11.GL_ALPHA_TEST);
}
|
diff --git a/src/net/rptools/maptool/client/ui/zone/ZoneRenderer.java b/src/net/rptools/maptool/client/ui/zone/ZoneRenderer.java
index 9eda3c1d..e418194a 100644
--- a/src/net/rptools/maptool/client/ui/zone/ZoneRenderer.java
+++ b/src/net/rptools/maptool/client/ui/zone/ZoneRenderer.java
@@ -1,2580 +1,2580 @@
/* The MIT License
*
* Copyright (c) 2005 David Rice, Trevor Croft
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation files
* (the "Software"), to deal in the Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package net.rptools.maptool.client.ui.zone;
import java.awt.AlphaComposite;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Composite;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Paint;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.Shape;
import java.awt.Stroke;
import java.awt.TexturePaint;
import java.awt.Transparency;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.dnd.DnDConstants;
import java.awt.dnd.DropTarget;
import java.awt.dnd.DropTargetDragEvent;
import java.awt.dnd.DropTargetDropEvent;
import java.awt.dnd.DropTargetEvent;
import java.awt.dnd.DropTargetListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
import java.awt.geom.AffineTransform;
import java.awt.geom.Area;
import java.awt.geom.Ellipse2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.QuadCurve2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.awt.image.ImageObserver;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.swing.JComponent;
import javax.swing.SwingUtilities;
import javax.swing.Timer;
import net.rptools.lib.MD5Key;
import net.rptools.lib.image.ImageUtil;
import net.rptools.lib.swing.ImageBorder;
import net.rptools.lib.swing.ImageLabel;
import net.rptools.lib.swing.SwingUtil;
import net.rptools.maptool.client.AppActions;
import net.rptools.maptool.client.AppPreferences;
import net.rptools.maptool.client.AppState;
import net.rptools.maptool.client.AppStyle;
import net.rptools.maptool.client.AppUtil;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.MapToolUtil;
import net.rptools.maptool.client.ScreenPoint;
import net.rptools.maptool.client.TransferableHelper;
import net.rptools.maptool.client.TransferableToken;
import net.rptools.maptool.client.ui.Scale;
import net.rptools.maptool.client.ui.token.NewTokenDialog;
import net.rptools.maptool.client.ui.token.TokenOverlay;
import net.rptools.maptool.client.ui.token.TokenStates;
import net.rptools.maptool.client.ui.token.TokenTemplate;
import net.rptools.maptool.client.walker.ZoneWalker;
import net.rptools.maptool.model.Asset;
import net.rptools.maptool.model.AssetManager;
import net.rptools.maptool.model.AttachedLightSource;
import net.rptools.maptool.model.CellPoint;
import net.rptools.maptool.model.Direction;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Grid;
import net.rptools.maptool.model.GridCapabilities;
import net.rptools.maptool.model.HexGrid;
import net.rptools.maptool.model.Label;
import net.rptools.maptool.model.LightSource;
import net.rptools.maptool.model.ModelChangeEvent;
import net.rptools.maptool.model.ModelChangeListener;
import net.rptools.maptool.model.Path;
import net.rptools.maptool.model.Player;
import net.rptools.maptool.model.Token;
import net.rptools.maptool.model.TokenFootprint;
import net.rptools.maptool.model.Vision;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZonePoint;
import net.rptools.maptool.model.drawing.DrawableTexturePaint;
import net.rptools.maptool.model.drawing.DrawnElement;
import net.rptools.maptool.util.GraphicsUtil;
import net.rptools.maptool.util.ImageManager;
import net.rptools.maptool.util.StringUtil;
import net.rptools.maptool.util.TokenUtil;
/**
*/
public class ZoneRenderer extends JComponent implements DropTargetListener, Comparable {
private static final long serialVersionUID = 3832897780066104884L;
public static final int MIN_GRID_SIZE = 5;
protected Zone zone;
private Scale zoneScale;
private DrawableRenderer backgroundDrawableRenderer = new PartitionedDrawableRenderer();
private DrawableRenderer objectDrawableRenderer = new BackBufferDrawableRenderer();
private DrawableRenderer tokenDrawableRenderer = new BackBufferDrawableRenderer();
private DrawableRenderer gmDrawableRenderer = new BackBufferDrawableRenderer();
private List<ZoneOverlay> overlayList = new ArrayList<ZoneOverlay>();
private Map<Zone.Layer , List<TokenLocation>> tokenLocationMap = new HashMap<Zone.Layer, List<TokenLocation>>();
private Set<GUID> selectedTokenSet = new HashSet<GUID>();
private List<LabelLocation> labelLocationList = new LinkedList<LabelLocation>();
private Set<Area> coveredTokenSet = new HashSet<Area>();
private Map<GUID, SelectionSet> selectionSetMap = new HashMap<GUID, SelectionSet>();
private Map<Token, Area> tokenVisionCache = new HashMap<Token, Area>();
private Map<Token, Area> lightSourceCache = new HashMap<Token, Area>();
private Map<Token, TokenLocation> tokenLocationCache = new HashMap<Token, TokenLocation>();
private List<TokenLocation> markerLocationList = new ArrayList<TokenLocation>();
private GeneralPath facingArrow;
private List<Token> showPathList = new ArrayList<Token>();
// Optimizations
private Map<Token, BufferedImage> replacementImageMap = new HashMap<Token, BufferedImage>();
private Token tokenUnderMouse;
private ScreenPoint pointUnderMouse;
private Zone.Layer activeLayer;
private Timer repaintTimer;
private int loadingProgress;
private boolean isLoaded;
private boolean isUsingVision;
private Area visibleArea;
private Area currentTokenVisionArea;
private Area lightSourceArea;
private BufferedImage fogBuffer;
private boolean flushFog = true;
private BufferedImage miniImage;
private BufferedImage backbuffer;
private boolean drawBackground = true;
private int lastX;
private int lastY;
private BufferedImage cellShape;
private int lastScale;
// I don't like this, at all, but it'll work for now, basically keep track of when the fog cache
// needs to be flushed in the case of switching views
private ZoneView lastView;
private AreaData topologyAreaData;
public ZoneRenderer(Zone zone) {
if (zone == null) { throw new IllegalArgumentException("Zone cannot be null"); }
this.zone = zone;
zone.addModelChangeListener(new ZoneModelChangeListener());
setFocusable(true);
setZoneScale(new Scale());
// DnD
new DropTarget(this, this);
// Focus
addMouseListener(new MouseAdapter(){
public void mousePressed(MouseEvent e) {
requestFocusInWindow();
}
@Override
public void mouseExited(MouseEvent e) {
pointUnderMouse = null;
}
@Override
public void mouseEntered(MouseEvent e) {
}
});
addMouseMotionListener(new MouseMotionAdapter() {
@Override
public void mouseMoved(MouseEvent e) {
pointUnderMouse = new ScreenPoint(e.getX(), e.getY());
}
});
// fps.start();
}
public void setRepaintTimer(Timer timer) {
repaintTimer = timer;
}
public void showPath(Token token, boolean show) {
if (show) {
showPathList.add(token);
} else {
showPathList.remove(token);
}
}
public boolean isPathShowing(Token token) {
return showPathList.contains(token);
}
public void clearShowPaths() {
showPathList.clear();
repaint();
}
public Scale getZoneScale() {
return zoneScale;
}
public void setZoneScale(Scale scale) {
zoneScale = scale;
scale.addPropertyChangeListener (new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
if (Scale.PROPERTY_SCALE.equals(evt.getPropertyName())) {
tokenLocationCache.clear();
flushFog = true;
}
if (Scale.PROPERTY_OFFSET.equals(evt.getPropertyName())) {
// flushFog = true;
}
repaint();
}
});
}
/**
* I _hate_ this method. But couldn't think of a better way to tell the drawable renderer that a new image had arrived
* TODO: FIX THIS ! Perhaps add a new app listener for when new images show up, add the drawable renderer as a listener
*/
public void flushDrawableRenderer() {
backgroundDrawableRenderer.flush ();
objectDrawableRenderer.flush();
tokenDrawableRenderer.flush();
gmDrawableRenderer.flush();
}
public ScreenPoint getPointUnderMouse() {
return pointUnderMouse;
}
public void setMouseOver(Token token) {
if (tokenUnderMouse == token) {
return;
}
tokenUnderMouse = token;
repaint();
}
@Override
public boolean isOpaque() {
return false;
}
public void addMoveSelectionSet (String playerId, GUID keyToken, Set<GUID> tokenList, boolean clearLocalSelected) {
// I'm not supposed to be moving a token when someone else is already moving it
if (clearLocalSelected) {
for (GUID guid : tokenList) {
selectedTokenSet.remove (guid);
}
}
selectionSetMap.put (keyToken, new SelectionSet(playerId, keyToken, tokenList));
repaint();
}
public boolean hasMoveSelectionSetMoved(GUID keyToken, ZonePoint point) {
SelectionSet set = selectionSetMap.get (keyToken);
if (set == null) {
return false;
}
Token token = zone.getToken(keyToken);
int x = point.x - token.getX();
int y = point.y - token.getY ();
return set.offsetX != x || set.offsetY != y;
}
public void updateMoveSelectionSet (GUID keyToken, ZonePoint offset) {
SelectionSet set = selectionSetMap.get(keyToken);
if (set == null) {
return;
}
Token token = zone.getToken(keyToken);
// int tokenWidth = (int)(TokenSize.getWidth(token, zone.getGrid().getSize()) * getScale());
// int tokenHeight = (int)(TokenSize.getHeight(token, zone.getGrid().getSize()) * getScale());
//
// // figure out screen bounds
// ScreenPoint tsp = ScreenPoint.fromZonePoint(this, token.getX(), token.getY());
// ScreenPoint dsp = ScreenPoint.fromZonePoint(this, offset.x, offset.y);
// ScreenPoint osp = ScreenPoint.fromZonePoint(this, token.getX() + set.offsetX, token.getY() + set.offsetY );
//
// int strWidth = SwingUtilities.computeStringWidth(fontMetrics, set.getPlayerId());
//
// int x = Math.min(tsp.x, dsp.x) - strWidth/2-4/*playername*/;
// int y = Math.min (tsp.y, dsp.y);
// int width = Math.abs(tsp.x - dsp.x)+ tokenWidth + strWidth+8/*playername*/;
// int height = Math.abs(tsp.y - dsp.y)+ tokenHeight + 45/*labels*/;
// Rectangle newBounds = new Rectangle(x, y, width, height);
//
// x = Math.min(tsp.x, osp.x) - strWidth/2-4/*playername*/;
// y = Math.min(tsp.y, osp.y);
// width = Math.abs(tsp.x - osp.x)+ tokenWidth + strWidth+8/*playername*/;
// height = Math.abs(tsp.y - osp.y)+ tokenHeight + 45/*labels*/;
// Rectangle oldBounds = new Rectangle(x, y, width, height);
//
// newBounds = newBounds.union(oldBounds);
//
set.setOffset (offset.x - token.getX(), offset.y - token.getY());
//repaint(newBounds.x, newBounds.y, newBounds.width, newBounds.height);
repaint();
}
public void toggleMoveSelectionSetWaypoint(GUID keyToken, ZonePoint location) {
SelectionSet set = selectionSetMap.get(keyToken);
if (set == null) {
return;
}
set.toggleWaypoint(location);
repaint();
}
public void removeMoveSelectionSet (GUID keyToken) {
SelectionSet set = selectionSetMap.remove(keyToken);
if (set == null) {
return;
}
repaint();
}
public void commitMoveSelectionSet (GUID keyTokenId) {
// TODO: Quick hack to handle updating server state
SelectionSet set = selectionSetMap.get(keyTokenId);
removeMoveSelectionSet(keyTokenId);
MapTool.serverCommand().stopTokenMove(getZone().getId(), keyTokenId);
Token keyToken = zone.getToken(keyTokenId);
CellPoint originPoint = zone.getGrid().convert(new ZonePoint(keyToken.getX (), keyToken.getY()));
Path path = set.getWalker() != null ? set.getWalker().getPath() : set.gridlessPath != null ? set.gridlessPath : null;
for (GUID tokenGUID : set.getTokens()) {
Token token = zone.getToken (tokenGUID);
CellPoint tokenCell = zone.getGrid().convert(new ZonePoint(token.getX(), token.getY()));
int cellOffX = originPoint.x - tokenCell.x;
int cellOffY = originPoint.y - tokenCell.y;
token.applyMove(set.getOffsetX(), set.getOffsetY(), path != null ? path.derive(cellOffX, cellOffY) : null);
// No longer need this version
replacementImageMap.remove(token);
flush(token);
MapTool.serverCommand().putToken(zone.getId(), token);
}
MapTool.getFrame().updateTokenTree();
}
public boolean isTokenMoving(Token token) {
for (SelectionSet set : selectionSetMap.values()) {
if (set.contains(token)) {
return true;
}
}
return false;
}
protected void setViewOffset(int x, int y) {
zoneScale.setOffset(x, y);
}
public void centerOn(ZonePoint point) {
int x = point.x;
int y = point.y;
x = getSize().width/2 - (int)(x*getScale())-1;
y = getSize().height/2 - (int)(y*getScale())-1;
setViewOffset(x, y);
repaint();
}
public void centerOn(CellPoint point) {
centerOn(zone.getGrid().convert(point));
}
public void flush(Token token) {
tokenVisionCache.remove(token);
tokenLocationCache.remove(token);
lightSourceCache.remove(token);
lightSourceArea = null;
if (token.hasLightSources()) {
// Have to recalculate all token vision
tokenVisionCache.clear();
}
flushFog = true;
}
/**
* Clear internal caches and backbuffers
*/
public void flush() {
if (zone.getBackgroundPaint() instanceof DrawableTexturePaint) {
ImageManager.flushImage(((DrawableTexturePaint)zone.getBackgroundPaint()).getAssetId());
}
ImageManager.flushImage(zone.getMapAssetId());
flushDrawableRenderer();
tokenVisionCache.clear();
replacementImageMap.clear();
fogBuffer = null;
isLoaded = false;
}
public Zone getZone() {
return zone;
}
public void addOverlay(ZoneOverlay overlay) {
overlayList.add(overlay);
}
public void removeOverlay(ZoneOverlay overlay) {
overlayList.remove(overlay);
}
public void moveViewBy(int dx, int dy) {
setViewOffset(getViewOffsetX() + dx, getViewOffsetY() + dy);
}
public void zoomReset() {
zoneScale.reset();
}
public void zoomIn(int x, int y) {
zoneScale.zoomIn(x, y);
}
public void zoomOut(int x, int y) {
zoneScale.zoomOut(x, y);
}
public void setView(int x, int y, int zoomIndex) {
setViewOffset(x, y);
zoneScale.setIndex(zoomIndex);
}
public BufferedImage getMiniImage(int size) {
// if (miniImage == null && getTileImage() != ImageManager.UNKNOWN_IMAGE) {
// miniImage = new BufferedImage(size, size, Transparency.OPAQUE);
// Graphics2D g = miniImage.createGraphics();
// g.setPaint(new TexturePaint(getTileImage(), new Rectangle(0, 0, miniImage.getWidth(), miniImage.getHeight())));
// g.fillRect(0, 0, size, size);
// g.dispose();
// }
return miniImage;
}
public void paintComponent(Graphics g) {
if (repaintTimer != null) {
repaintTimer.restart();
}
Graphics2D g2d = (Graphics2D) g;
Player.Role role = MapTool.getPlayer().getRole();
if (role == Player.Role.GM && AppState.isShowAsPlayer()) {
role = Player.Role.PLAYER;
}
renderZone(g2d, new ZoneView(role));
if (!zone.isVisible()) {
GraphicsUtil.drawBoxedString(g2d, "Map not visible to players", getSize().width/2, 20);
}
if (AppState.isShowAsPlayer()) {
GraphicsUtil.drawBoxedString(g2d, "Player View", getSize().width/2, 20);
}
}
public void renderZone(Graphics2D g2d, ZoneView view) {
// Do this smack dab first so that even if we need to show the "Loading" indicator,
// we can still start to figure things out like the token tree visibility
calculateVision(view);
// Are we still waiting to show the zone ?
if (isLoading()) {
Dimension size = getSize();
g2d.setColor(Color.black);
g2d.fillRect(0, 0, size.width , size.height);
GraphicsUtil.drawBoxedString(g2d, " Loading ... " + loadingProgress + "% ", size.width/2, size.height/2);
return;
}
if (MapTool.getCampaign ().isBeingSerialized()) {
Dimension size = getSize();
g2d.setColor(Color.black);
g2d.fillRect(0, 0, size.width, size.height);
GraphicsUtil.drawBoxedString (g2d, " Please Wait ", size.width/2, size.height/2);
return;
}
if (zone == null) { return; }
// Clear internal state
tokenLocationMap.clear();
coveredTokenSet.clear();
markerLocationList.clear();
// Rendering pipeline
renderBoard(g2d, view);
renderDrawableOverlay(g2d, backgroundDrawableRenderer, view, zone.getBackgroundDrawnElements());
renderTokens(g2d, zone.getBackgroundStamps(), view);
renderDrawableOverlay(g2d, objectDrawableRenderer, view, zone.getObjectDrawnElements());
renderTokenTemplates(g2d, view);
renderGrid(g2d, view);
if (view.isGMView()) {
renderTokens(g2d, zone.getGMStamps(), view);
renderDrawableOverlay(g2d, gmDrawableRenderer, view, zone.getGMDrawnElements());
}
renderTokens(g2d, zone.getStampTokens(), view);
renderDrawableOverlay(g2d, tokenDrawableRenderer, view, zone.getDrawnElements());
renderPlayerVisionOverlay(g2d, view);
renderTokens(g2d, zone.getTokens(), view);
renderMoveSelectionSets(g2d, view);
renderLabels(g2d, view);
renderFog(g2d, view);
renderGMVisionOverlay(g2d, view);
for (int i = 0; i < overlayList.size(); i++) {
ZoneOverlay overlay = overlayList.get(i);
overlay.paintOverlay(this, g2d);
}
renderCoordinates(g2d, view);
// if (lightSourceArea != null) {
// g2d.setColor(Color.yellow);
// g2d.fill(lightSourceArea.createTransformedArea(AffineTransform.getScaleInstance (getScale(), getScale())));
// }
//
// g2d.setColor(Color.red);
// for (AreaMeta meta : getTopologyAreaData().getAreaList()) {
//
// Area area = new Area(meta.getArea().getBounds()).createTransformedArea(AffineTransform.getScaleInstance (getScale(), getScale()));
// area = area.createTransformedArea(AffineTransform.getTranslateInstance(zoneScale.getOffsetX(), zoneScale.getOffsetY()));
// g2d.draw(area);
// }
lastView = view;
}
public Area getVisibleArea() {
return visibleArea;
}
private void renderPlayerVisionOverlay(Graphics2D g, ZoneView view) {
if (!view.isGMView()) {
renderVisionOverlay(g, view);
}
}
private void renderGMVisionOverlay(Graphics2D g, ZoneView view) {
if (view.isGMView()) {
renderVisionOverlay(g, view);
}
}
private void renderVisionOverlay(Graphics2D g, ZoneView view) {
if (currentTokenVisionArea == null) {
return;
}
Object oldAA = g.getRenderingHint (RenderingHints.KEY_ANTIALIASING);
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g.setColor(new Color(200, 200, 200));
g.draw(currentTokenVisionArea);
boolean useHaloColor = tokenUnderMouse.getHaloColor() != null && AppPreferences.getUseHaloColorOnVisionOverlay();
if (tokenUnderMouse.getVisionOverlayColor() != null || useHaloColor) {
Color visionColor = useHaloColor ? tokenUnderMouse.getHaloColor() : tokenUnderMouse.getVisionOverlayColor();
g.setColor(new Color(visionColor.getRed(), visionColor.getGreen(), visionColor.getBlue(), AppPreferences.getVisionOverlayOpacity()));
g.fill(currentTokenVisionArea);
}
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, oldAA);
}
private void renderPlayerVision(Graphics2D g, ZoneView view) {
// Object oldAntiAlias = g.getRenderingHint(RenderingHints.KEY_ANTIALIASING );
// g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
//
//
//
// if (currentTokenVisionArea != null && !view.isGMView()) {
// // Draw the outline under the fog
// g.setColor(new Color(200, 200, 200));
// g.draw(currentTokenVisionArea);
// }
//
// g.setRenderingHint(RenderingHints.KEY_ANTIALIASING , oldAntiAlias);
}
public AreaData getTopologyAreaData() {
if (topologyAreaData == null) {
topologyAreaData = new AreaData(zone.getTopology());
topologyAreaData.digest();
}
return topologyAreaData;
}
public Area getLightSourceArea() {
return lightSourceArea;
}
private void calculateVision(ZoneView view) {
currentTokenVisionArea = null;
long startTime = System.currentTimeMillis();
// Calculate lights
lightSourceArea = null;
for (Token token : zone.getAllTokens()) {
if (!token.hasLightSources() || !token.isVisible()) {
continue;
}
Area area = lightSourceCache.get(token);
if (area == null) {
area = new Area();
for (AttachedLightSource attachedLightSource : token.getLightSources()) {
LightSource lightSource = MapTool.getCampaign().getLightSource(attachedLightSource.getLightSourceId());
if (lightSource == null) {
continue;
}
Point p = FogUtil.calculateVisionCenter(token, zone);
Area lightSourceArea = lightSource.getArea(token, zone, attachedLightSource.getDirection());
Area visibleArea = FogUtil.calculateVisibility(p.x, p.y, lightSourceArea, getTopologyAreaData());
if (visibleArea != null) {
area.add(visibleArea);
}
}
lightSourceCache.put(token, area);
}
// Lazy create
if (lightSourceArea == null) {
lightSourceArea = new Area();
}
// Combine all light source visible area
lightSourceArea.add(area);
}
// Calculate vision
isUsingVision = lightSourceArea != null || (zone.getTopology() != null && !zone.getTopology().isEmpty());
visibleArea = null;
if (isUsingVision) {
for (Token token : zone.getAllTokens()) {
if (token.hasSight ()) {
// Don't bother if it's not visible
if (!view.isGMView() && !token.isVisible()) {
continue;
}
// Permission
if (MapTool.getServerPolicy().isUseIndividualViews()) {
if (!AppUtil.playerOwns(token)) {
continue;
}
} else {
if (token.getType() != Token.Type.PC && !view.isGMView()) {
continue;
}
}
Area tokenVision = getTokenVision(token);
if (tokenVision != null) {
if (visibleArea == null) {
visibleArea = new Area();
}
visibleArea.add(tokenVision);
if (token == tokenUnderMouse) {
tokenVision = new Area(tokenVision); // Don't modify the original, which is now in the cache
tokenVision.transform(AffineTransform.getScaleInstance(getScale(), getScale()));
tokenVision.transform(AffineTransform.getTranslateInstance(getViewOffsetX(), getViewOffsetY()));
currentTokenVisionArea = tokenVision;
}
}
}
}
}
if (visibleArea != null) {
visibleArea.transform(AffineTransform.getScaleInstance(getScale(), getScale()));
visibleArea.transform(AffineTransform.getTranslateInstance (getViewOffsetX(), getViewOffsetY()));
}
// System.out.println("Vision calc: " + (System.currentTimeMillis() - startTime));
}
public Area getTokenVision(Token token) {
Area tokenVision = tokenVisionCache.get(token);
if (tokenVision == null) {
Point p = FogUtil.calculateVisionCenter(token, zone);
int visionDistance = zone.getTokenVisionDistance();
Area visionArea = new Area(new Ellipse2D.Double(-visionDistance, -visionDistance, visionDistance*2, visionDistance*2));
tokenVision = FogUtil.calculateVisibility(p.x, p.y, visionArea, getTopologyAreaData());
// Now apply light sources
if (tokenVision != null && lightSourceArea != null) {
tokenVision.intersect(lightSourceArea);
}
tokenVisionCache.put(token, tokenVision);
}
return tokenVision;
}
/**
* Paint all of the token templates for selected tokens.
*
* @param g Paint on this graphic object.
*/
private void renderTokenTemplates(Graphics2D g, ZoneView view) {
float scale = zoneScale.getScale();
int scaledGridSize = (int) getScaledGridSize();
// Find tokens with template state
// TODO: I really don't like this, it should be optimized
AffineTransform old = g.getTransform();
AffineTransform t = new AffineTransform();
g.setTransform(t);
for (Token token : zone.getAllTokens()) {
for (String state : token.getStatePropertyNames()) {
Object value = token.getState(state);
if (value instanceof TokenTemplate) {
// Only show if selected
if (!AppState.isShowLightRadius()) {
continue;
}
// Calculate the token bounds
Rectangle size = token.getBounds(zone);
int width = (int) (size.width * scale) - 1;
int height = (int) (size.height * scale) - 1;
ScreenPoint tokenScreenLocation = ScreenPoint.fromZonePointRnd(this, token.getX(), token.getY());
int x = (int)(tokenScreenLocation.x + 1);
int y = (int)(tokenScreenLocation.y);
if (width < scaledGridSize) {
x += (scaledGridSize - width) / 2;
}
if (height < scaledGridSize) {
y += (scaledGridSize - height) / 2;
}
Rectangle bounds = new Rectangle(x, y, width, height);
// Set up the graphics, paint the template, restore the graphics
t.setTransform(old);
t.translate(bounds.x, bounds.y);
t.scale(getScale(), getScale());
g.setTransform(t);
((TokenTemplate)value).paintTemplate(g, token, bounds, this);
}
}
}
g.setTransform(old);
}
private void renderLabels(Graphics2D g, ZoneView view) {
labelLocationList.clear();
for (Label label : zone.getLabels()) {
ZonePoint zp = new ZonePoint(label.getX(), label.getY());
if (!zone.isPointVisible(zp, view.getRole())) {
continue;
}
ScreenPoint sp = ScreenPoint.fromZonePointRnd(this, zp.x, zp.y);
Rectangle bounds = GraphicsUtil.drawBoxedString(g, label.getLabel(), (int)sp.x, (int)sp.y);
labelLocationList.add(new LabelLocation(bounds, label));
}
}
Integer fogX = null;
Integer fogY = null;
private void renderFog(Graphics2D g, ZoneView view) {
if (!zone.hasFog()) {
return;
}
if (lastView == null || view.isGMView() != lastView.isGMView()) {
flushFog = true;
}
Dimension size = getSize();
// Optimization for panning
Area fogClip = null;
if (!flushFog && fogX != null && fogY != null && (fogX != getViewOffsetX() || fogY != getViewOffsetY())) {
if (Math.abs(fogX - getViewOffsetX()) < size.width && Math.abs(fogY - getViewOffsetY()) < size.height) {
int deltaX = getViewOffsetX() - fogX;
int deltaY = getViewOffsetY() - fogY;
Graphics2D buffG = fogBuffer.createGraphics();
buffG.setComposite(AlphaComposite.Src);
buffG.copyArea(0, 0, size.width, size.height, deltaX, deltaY);
buffG.dispose();
fogClip = new Area();
if (deltaX < 0) {
fogClip.add(new Area(new Rectangle(size.width+deltaX, 0, -deltaX, size.height)));
} else if (deltaX > 0){
fogClip.add(new Area(new Rectangle(0, 0, deltaX, size.height)));
}
if (deltaY < 0) {
fogClip.add(new Area(new Rectangle(0, size.height + deltaY, size.width, -deltaY)));
} else if (deltaY > 0) {
fogClip.add(new Area(new Rectangle(0, 0, size.width, deltaY)));
}
}
flushFog = true;
}
if (flushFog || fogBuffer == null || fogBuffer.getWidth() != size.width || fogBuffer.getHeight() != size.height) {
fogX = getViewOffsetX();
fogY = getViewOffsetY();
boolean newImage = false;
if (fogBuffer == null || fogBuffer.getWidth() != size.width || fogBuffer.getHeight() != size.height) {
newImage = true;
fogBuffer = new BufferedImage(size.width, size.height, view.isGMView() ? Transparency.TRANSLUCENT : Transparency.BITMASK);
}
Graphics2D buffG = fogBuffer.createGraphics();
buffG.setClip(fogClip != null ? fogClip : new Rectangle(0, 0, size.width, size.height));
SwingUtil.useAntiAliasing(buffG);
if (!newImage){
Composite oldComposite = buffG.getComposite();
buffG.setComposite(AlphaComposite.Clear);
buffG.fillRect(0, 0, size.width, size.height);
buffG.setComposite(oldComposite);
}
//Update back buffer overlay size
Area exposedArea = zone.getExposedArea().createTransformedArea(AffineTransform.getScaleInstance (getScale(), getScale()));
exposedArea = exposedArea.createTransformedArea(AffineTransform.getTranslateInstance(zoneScale.getOffsetX(), zoneScale.getOffsetY()));
// Fill
buffG.setPaint(zone.getFogPaint().getPaint(getViewOffsetX(), getViewOffsetY(), getScale()));
buffG.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC, view.isGMView() ? .6f : 1f));
buffG.fillRect(0, 0, size.width, size.height);
// Cut out the exposed area
buffG.setComposite(AlphaComposite.getInstance(AlphaComposite.CLEAR));
buffG.fill(exposedArea);
// Soft fog
if (isUsingVision) {
buffG.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC));
if (visibleArea != null) {
buffG.setColor(new Color(0, 0, 0, 80));
if (zone.hasFog ()) {
// Fill in the exposed area (TODO: perhaps combine this with the clearing of the same area above)
buffG.fill(exposedArea);
buffG.setComposite(AlphaComposite.getInstance(AlphaComposite.CLEAR));
Area clip = new Area(buffG.getClip());
clip.intersect(exposedArea);
Shape oldClip = buffG.getClip();
buffG.setClip(clip);
buffG.fill(visibleArea);
buffG.setClip(oldClip);
} else {
buffG.setColor(new Color(255, 255, 255, 40));
buffG.fill(visibleArea);
}
} else {
if (zone.hasFog()) {
buffG.setColor(new Color(0, 0, 0, 80));
buffG.fill(exposedArea);
}
}
}
// Outline
if (false && AppPreferences.getUseSoftFogEdges()) {
GraphicsUtil.renderSoftClipping(buffG, exposedArea, (int)(zone.getGrid().getSize() * getScale()*.25), view.isGMView() ? .6 : 1);
} else {
buffG.setComposite(AlphaComposite.Src);
buffG.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
buffG.setColor(Color.black);
buffG.draw(exposedArea);
}
buffG.dispose();
flushFog = false;
}
g.drawImage(fogBuffer, 0, 0, this);
}
public boolean isLoading() {
if (isLoaded) {
// We're done, until the cache is cleared
return false;
}
// Get a list of all the assets in the zone
Set<MD5Key> assetSet = zone.getAllAssetIds();
assetSet.remove(null); // remove bad data
// Make sure they are loaded
int count = 0;
boolean loaded = true;
for (MD5Key id : assetSet) {
// Have we gotten the actual data yet ?
Asset asset = AssetManager.getAsset(id);
if (asset == null) {
loaded = false;
continue;
}
// Have we loaded the image into memory yet ?
Image image = ImageManager.getImage(asset, new ImageObserver[]{});
if (image == null || image == ImageManager.UNKNOWN_IMAGE ) {
loaded = false;
continue;
}
// We made it ! This image is ready
count ++;
}
loadingProgress = (int)((count / (double)assetSet.size()) * 100);
isLoaded = loaded;
if (isLoaded) {
// Notify the token tree that it should update
MapTool.getFrame().updateTokenTree();
}
return !isLoaded;
}
protected void renderDrawableOverlay(Graphics g, DrawableRenderer renderer, ZoneView view, List<DrawnElement> drawnElements) {
Rectangle viewport = new Rectangle(zoneScale.getOffsetX (), zoneScale.getOffsetY(), getSize().width, getSize().height);
List<DrawnElement> list = new ArrayList<DrawnElement>();
list.addAll(drawnElements);
renderer.renderDrawables (g, list, viewport, getScale());
}
protected void renderBoard(Graphics2D g, ZoneView view) {
Dimension size = getSize();
if (backbuffer == null || backbuffer.getWidth() != size.width || backbuffer.getHeight() != size.height) {
backbuffer = new BufferedImage(size.width, size.height, Transparency.OPAQUE);
drawBackground = true;
}
Scale scale = getZoneScale();
if (scale.getOffsetX() != lastX || scale.getOffsetY() != lastY || scale.getIndex() != lastScale) {
drawBackground = true;
}
if (drawBackground) {
Graphics2D bbg = backbuffer.createGraphics();
// Background texture
Paint paint = zone.getBackgroundPaint().getPaint(getViewOffsetX(), getViewOffsetY(), getScale());
bbg.setPaint(paint);
bbg.fillRect(0, 0, size.width, size.height);
// Map
if (zone.getMapAssetId() != null) {
BufferedImage mapImage = ImageManager.getImage(AssetManager.getAsset(zone.getMapAssetId()), this);
bbg.drawImage(mapImage, getViewOffsetX(), getViewOffsetY(), (int)(mapImage.getWidth()*getScale()), (int)(mapImage.getHeight()*getScale()), null);
}
bbg.dispose();
drawBackground = false;
}
lastX = scale.getOffsetX();
lastY = scale.getOffsetY();
lastScale = scale.getIndex();
g.drawImage(backbuffer, 0, 0, this);
}
protected void renderGrid(Graphics2D g, ZoneView view) {
int gridSize = (int) ( zone.getGrid().getSize() * getScale());
if (!AppState.isShowGrid() || gridSize < MIN_GRID_SIZE) {
return;
}
zone.getGrid().draw(this, g, g.getClipBounds());
}
protected void renderCoordinates(Graphics2D g, ZoneView view) {
if (AppState.isShowCoordinates()) {
zone.getGrid().drawCoordinatesOverlay(g, this);
}
}
private boolean isHexGrid() {
return zone.getGrid() instanceof HexGrid ? true : false;
}
protected void renderMoveSelectionSets(Graphics2D g, ZoneView view) {
// Short circuit
if (isUsingVision && visibleArea == null) {
return;
}
Grid grid = zone.getGrid();
float scale = zoneScale.getScale();
Set<SelectionSet> selections = new HashSet<SelectionSet>();
selections.addAll(selectionSetMap.values());
for (SelectionSet set : selections) {
Token keyToken = zone.getToken(set.getKeyToken());
ZoneWalker walker = set.getWalker();
for (GUID tokenGUID : set.getTokens()) {
Token token = zone.getToken(tokenGUID);
boolean isOwner = token.isOwner(MapTool.getPlayer().getName());
// Perhaps deleted ?
if (token == null) {
continue;
}
// Don't bother if it's not visible
if (!token.isVisible() && !view.isGMView()) {
continue;
}
Asset asset = AssetManager.getAsset(token.getImageAssetId());
if (asset == null) {
continue;
}
// OPTIMIZE: combine this with the code in renderTokens()
Rectangle footprintBounds = token.getBounds(zone);
ScreenPoint newScreenPoint = ScreenPoint.fromZonePoint(this, footprintBounds.x + set.getOffsetX(), footprintBounds.y + set.getOffsetY());
BufferedImage image = ImageManager.getImage(AssetManager.getAsset(token.getImageAssetId()));
int scaledWidth = (int)(footprintBounds.width * scale);
int scaledHeight = (int)(footprintBounds.height * scale);
// Tokens are centered on the image center point
int x = (int)(newScreenPoint.x);
int y = (int)(newScreenPoint.y);
// Vision visibility
Rectangle clip = g.getClipBounds();
if (!view.isGMView() && !isOwner && visibleArea != null) {
// Only show the part of the path that is visible
Area clipArea = new Area(clip);
clipArea.intersect(visibleArea);
g.setClip(clipArea);
}
// Show path only on the key token
if (token == keyToken) {
if (!token.isStamp()) {
if (!token.isObjectStamp() && zone.getGrid().getCapabilities().isPathingSupported() && token.isSnapToGrid()) {
renderPath(g, walker.getPath(), token.getFootprint(zone.getGrid()));
} else {
// Line
Color highlight = new Color(255, 255, 255, 80);
Stroke highlightStroke = new BasicStroke(9);
Stroke oldStroke = g.getStroke();
Object oldAA = SwingUtil.useAntiAliasing(g);
ScreenPoint lastPoint = ScreenPoint.fromZonePointRnd(this, token.getX()+footprintBounds.width/2, token.getY()+footprintBounds.height/2);
for (ZonePoint zp : set.gridlessPath.getCellPath()) {
ScreenPoint nextPoint = ScreenPoint.fromZonePoint(this, zp.x, zp.y);
g.setColor(highlight);
g.setStroke(highlightStroke);
g.drawLine((int)lastPoint.x, (int)lastPoint.y , (int)nextPoint.x, (int)nextPoint.y);
g.setStroke(oldStroke);
g.setColor(Color.blue);
g.drawLine((int)lastPoint.x, (int)lastPoint.y , (int)nextPoint.x, (int)nextPoint.y);
lastPoint = nextPoint;
}
g.setColor(highlight);
g.setStroke(highlightStroke);
g.drawLine((int)lastPoint.x, (int)lastPoint.y, x + scaledWidth/2, y + scaledHeight/2);
g.setStroke(oldStroke);
g.setColor(Color.blue);
g.drawLine((int)lastPoint.x, (int)lastPoint.y, x + scaledWidth/2, y + scaledHeight/2);
SwingUtil.restoreAntiAliasing(g, oldAA);
// Waypoints
for (ZonePoint p : set.gridlessPath.getCellPath()) {
p = new ZonePoint(p.x, p.y);
highlightCell(g, p, AppStyle.cellWaypointImage, .333f);
}
}
}
}
// handle flipping
BufferedImage workImage = image;
if (token.isFlippedX() || token.isFlippedY()) {
workImage = new BufferedImage(image.getWidth(), image.getHeight(), image.getTransparency());
int workW = image.getWidth() * (token.isFlippedX() ? -1 : 1);
int workH = image.getHeight() * (token.isFlippedY() ? -1 : 1);
int workX = token.isFlippedX() ? image.getWidth() : 0;
int workY = token.isFlippedY() ? image.getHeight() : 0;
Graphics2D wig = workImage.createGraphics();
wig.drawImage(image, workX, workY, workW, workH, null);
wig.dispose();
}
// Draw token
Dimension imgSize = new Dimension(workImage.getWidth(), workImage.getHeight());
SwingUtil.constrainTo(imgSize, footprintBounds.width, footprintBounds.height);
int offsetx = 0;
int offsety = 0;
if (token.isSnapToScale()) {
offsetx = (int)(imgSize.width < footprintBounds.width ? (footprintBounds.width - imgSize.width)/2 * getScale() : 0);
offsety = (int)(imgSize.height < footprintBounds.height ? (footprintBounds.height - imgSize.height)/2 * getScale() : 0);
}
int tx = x + offsetx;
int ty = y + offsety;
AffineTransform at = new AffineTransform();
at.translate(tx, ty);
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
at.rotate(Math.toRadians (-token.getFacing() - 90), scaledWidth/2 - token.getAnchor().x*scale - offsetx, scaledHeight/2 - token.getAnchor().y*scale - offsety); // facing defaults to down, or -90 degrees
}
if (token.isSnapToScale()) {
at.scale((double) imgSize.width / workImage.getWidth(), (double) imgSize.height / workImage.getHeight());
at.scale(getScale(), getScale());
} else {
at.scale((double) scaledWidth / workImage.getWidth(), (double) scaledHeight / workImage.getHeight());
}
g.drawImage(workImage, at, this);
// Other details
if (token == keyToken) {
// if the token is visible on the screen it will be in the location cache
if (tokenLocationCache.containsKey(token)) {
y += 10 + scaledHeight;
x += scaledWidth/2;
if (!token.isStamp()) {
if (AppState.getShowMovementMeasurements ()) {
String distance = "";
if (zone.getGrid().getCapabilities().isPathingSupported() && token.isSnapToGrid()) {
if (walker.getDistance() >= 1) {
distance = Integer.toString(walker.getDistance());
}
} else {
double c = 0;
ZonePoint lastPoint = new ZonePoint(token.getX()+footprintBounds.width/2, token.getY()+footprintBounds.height/2);
for (ZonePoint zp : set.gridlessPath.getCellPath()) {
int a = lastPoint.x - zp.x;
int b = lastPoint.y - zp.y;
c += Math.hypot(a, b);
lastPoint = zp;
}
ZonePoint finalPoint = new ZonePoint((set.offsetX + token.getX())+footprintBounds.width/2, (set.offsetY + token.getY())+footprintBounds.height/2);
int a = lastPoint.x - finalPoint.x;
int b = lastPoint.y - finalPoint.y;
c += Math.hypot(a, b);
c /= zone.getGrid().getSize(); // Number of "cells"
c *= zone.getUnitsPerCell(); // "actual" distance traveled
distance = String.format("%.1f", c);
}
if (distance.length() > 0) {
GraphicsUtil.drawBoxedString(g, distance, x, y);
y += 20;
}
}
}
if (set.getPlayerId() != null && set.getPlayerId().length() >= 1) {
GraphicsUtil.drawBoxedString (g, set.getPlayerId(), x, y);
}
}
}
g.setClip(clip);
}
}
}
public void renderPath(Graphics2D g, Path path, TokenFootprint footprint) {
Object oldRendering = g.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
CellPoint previousPoint = null;
Point previousHalfPoint = null;
Grid grid = zone.getGrid();
float scale = getScale();
Rectangle footprintBounds = footprint.getBounds(grid);
List<CellPoint> cellPath = path.getCellPath();
Set<CellPoint> pathSet = new HashSet<CellPoint>();
List<ZonePoint> waypointList = new LinkedList<ZonePoint>();
for (CellPoint p : cellPath) {
pathSet.addAll(footprint.getOccupiedCells(p));
if (path.isWaypoint(p) && previousPoint != null) {
ZonePoint zp = grid.convert(p);
zp.x += footprintBounds.width/2;
zp.y += footprintBounds.height/2;
waypointList.add(zp);
}
previousPoint = p;
}
// Don't show the final path point as a waypoint, it's redundant, and ugly
if (waypointList.size() > 0) {
waypointList.remove(waypointList.size()-1);
}
Dimension cellOffset = zone.getGrid().getCellOffset();
for (CellPoint p : pathSet) {
ZonePoint zp = grid.convert(p);
zp.x += grid.getCellWidth()/2 + cellOffset.width;
zp.y += grid.getCellHeight()/2 + cellOffset.height;
highlightCell(g, zp, grid.getCellHighlight(), 1.0f);
}
for (ZonePoint p : waypointList) {
ZonePoint zp = new ZonePoint(p.x + cellOffset.width, p.y + cellOffset.height);
highlightCell(g, zp, AppStyle.cellWaypointImage, .333f);
}
// Line path
if (grid.getCapabilities().isPathLineSupported() ) {
ZonePoint lineOffset = new ZonePoint(footprintBounds.x + footprintBounds.width/2 - grid.getOffsetX(), footprintBounds.y + footprintBounds.height/2 - grid.getOffsetY());
int xOffset = (int)(lineOffset.x * scale);
int yOffset = (int)(lineOffset.y * scale);
g.setColor(Color.blue);
previousPoint = null;
for (CellPoint p : cellPath) {
if (previousPoint != null) {
ZonePoint ozp = grid.convert(previousPoint);
int ox = ozp.x;
int oy = ozp.y;
ZonePoint dzp = grid.convert(p);
int dx = dzp.x;
int dy = dzp.y;
ScreenPoint origin = ScreenPoint.fromZonePoint(this, ox, oy);
ScreenPoint destination = ScreenPoint.fromZonePoint(this, dx, dy);
int halfx = (int)(( origin.x + destination.x)/2);
int halfy = (int)((origin.y + destination.y)/2);
Point halfPoint = new Point(halfx, halfy);
if (previousHalfPoint != null) {
int x1 = previousHalfPoint.x+xOffset;
int y1 = previousHalfPoint.y+yOffset;
int x2 = (int)origin.x+xOffset;
int y2 = (int)origin.y+yOffset;
int xh = halfPoint.x+xOffset;
int yh = halfPoint.y+yOffset;
QuadCurve2D curve = new QuadCurve2D.Float(x1, y1, x2, y2, xh, yh);
g.draw(curve);
}
previousHalfPoint = halfPoint;
}
previousPoint = p;
}
}
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, oldRendering);
}
public void highlightCell(Graphics2D g, ZonePoint point, BufferedImage image, float size) {
Grid grid = zone.getGrid();
double cwidth = grid.getCellWidth() * getScale();
double cheight = grid.getCellHeight() * getScale();
double iwidth = cwidth * size;
double iheight = cheight * size;
ScreenPoint sp = ScreenPoint.fromZonePoint(this, point);
g.drawImage (image, (int)(sp.x - iwidth/2), (int)(sp.y - iheight/2), (int)iwidth, (int)iheight, this);
}
/**
* Get a list of tokens currently visible on the screen. The list is ordered by location starting
* in the top left and going to the bottom right
* @return
*/
public List<Token> getTokensOnScreen() {
List<Token> list = new ArrayList<Token>();
// Always assume tokens, for now
List<TokenLocation> tokenLocationListCopy = new ArrayList<TokenLocation>();
tokenLocationListCopy.addAll(getTokenLocations(Zone.Layer.TOKEN));
for (TokenLocation location : tokenLocationListCopy) {
list.add(location.token);
}
// Sort by location on screen, top left to bottom right
Collections.sort(list, new Comparator<Token>(){
public int compare(Token o1, Token o2) {
if (o1.getY() < o2.getY()) {
return -1;
}
if (o1.getY() > o2.getY()) {
return 1;
}
if (o1.getX() < o2.getX()) {
return -1;
}
if (o1.getX() > o2.getX()) {
return 1;
}
return 0;
}
});
return list;
}
public Zone.Layer getActiveLayer() {
return activeLayer != null ? activeLayer : Zone.Layer.TOKEN;
}
public void setActiveLayer(Zone.Layer layer) {
activeLayer = layer;
selectedTokenSet.clear();
repaint();
}
/**
* Get the token locations for the given layer, creates an empty list
* if there are not locations for the given layer
*/
private List<TokenLocation> getTokenLocations(Zone.Layer layer) {
List<TokenLocation> list = tokenLocationMap.get(layer);
if (list != null) {
return list;
}
list = new LinkedList<TokenLocation>();
tokenLocationMap.put(layer, list);
return list;
}
// TODO: I don't like this hardwiring
protected Shape getCircleFacingArrow(int angle, int size) {
int base = (int)(size * .75);
int width = (int)(size * .35);
facingArrow = new GeneralPath();
facingArrow.moveTo(base, -width);
facingArrow.lineTo(size, 0);
facingArrow.lineTo(base, width);
facingArrow.lineTo(base, -width);
return ((GeneralPath)facingArrow.createTransformedShape( AffineTransform.getRotateInstance(-Math.toRadians(angle)))).createTransformedShape(AffineTransform.getScaleInstance(getScale(), getScale()));
}
// TODO: I don't like this hardwiring
protected Shape getSquareFacingArrow(int angle, int size) {
int base = (int)(size * .75);
int width = (int)(size * .35);
facingArrow = new GeneralPath();
facingArrow.moveTo(0, 0);
facingArrow.lineTo(-(size - base), -width);
facingArrow.lineTo(-(size - base), width);
facingArrow.lineTo(0, 0);
return ((GeneralPath)facingArrow.createTransformedShape(AffineTransform.getRotateInstance(-Math.toRadians(angle)))).createTransformedShape( AffineTransform.getScaleInstance(getScale(), getScale()));
}
protected void renderTokens(Graphics2D g, List<Token> tokenList, ZoneView view) {
Rectangle viewport = new Rectangle(0, 0, getSize().width, getSize().height);
Rectangle clipBounds = g.getClipBounds();
float scale = zoneScale.getScale();
for (Token token : tokenList) {
// Don't bother if it's not visible
if (!zone.isTokenVisible(token) && !view.isGMView()) {
continue;
}
if (token.isStamp() && isTokenMoving(token)) {
continue;
}
TokenLocation location = tokenLocationCache.get(token);
if (location != null && !location.maybeOnscreen(viewport)) {
continue;
}
Rectangle footprintBounds = token.getBounds(zone);
BufferedImage image = null;
Asset asset = AssetManager.getAsset(token.getImageAssetId ());
if (asset == null) {
// In the mean time, show a placeholder
image = ImageManager.UNKNOWN_IMAGE;
} else {
image = ImageManager.getImage(AssetManager.getAsset(token.getImageAssetId()), this);
}
int scaledWidth = (int)(footprintBounds.width*scale);
int scaledHeight = (int)(footprintBounds.height*scale);
// if (!token.isStamp()) {
// // Fit inside the grid
// scaledWidth --;
// scaledHeight --;
// }
ScreenPoint tokenScreenLocation = ScreenPoint.fromZonePoint (this, footprintBounds.x, footprintBounds.y);
// Tokens are centered on the image center point
int x = (int)tokenScreenLocation.x;
int y = (int)tokenScreenLocation.y;
Rectangle origBounds = new Rectangle(x, y, scaledWidth, scaledHeight);
Area tokenBounds = new Area(origBounds);
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
tokenBounds.transform(AffineTransform.getRotateInstance(Math.toRadians(-token.getFacing() - 90), scaledWidth/2 + x - (token.getAnchor().x*scale), scaledHeight/2 + y - (token.getAnchor().y*scale))); // facing defaults to down, or -90 degrees
}
location = new TokenLocation(tokenBounds, origBounds, token, x, y, footprintBounds.width, footprintBounds.height, scaledWidth, scaledHeight);
tokenLocationCache.put(token, location);
// General visibility
if (!view.isGMView() && !zone.isTokenVisible(token)) {
continue;
}
// Vision visibility
if (!view.isGMView() && token.isToken() && isUsingVision) {
if (!GraphicsUtil.intersects(visibleArea, location.bounds)) {
continue;
}
}
// Markers
if (token.isMarker() && canSeeMarker(token)) {
markerLocationList.add(location);
}
if (!location.bounds.intersects(clipBounds)) {
// Not on the screen, don't have to worry about it
continue;
}
// Stacking check
if (!token.isStamp()) {
for (TokenLocation currLocation : getTokenLocations(Zone.Layer.TOKEN)) {
Area r1 = currLocation.bounds;
// Are we covering anyone ?
if (GraphicsUtil.contains(location.bounds, r1)) {
// Are we covering someone that is covering someone ?
Area oldRect = null;
for (Area r2 : coveredTokenSet) {
if (location.bounds.getBounds().contains(r2.getBounds ())) {
oldRect = r2;
break;
}
}
if (oldRect != null) {
coveredTokenSet.remove(oldRect);
}
coveredTokenSet.add(location.bounds);
}
}
}
// Keep track of the location on the screen
// Note the order where the top most token is at the end of the list
List<TokenLocation> locationList = null;
if (!token.isStamp()) {
locationList = getTokenLocations(Zone.Layer.TOKEN);
} else {
if (token.isObjectStamp()) {
locationList = getTokenLocations(Zone.Layer.OBJECT);
}
if (token.isBackgroundStamp()) {
locationList = getTokenLocations(Zone.Layer.BACKGROUND);
}
if (token.isGMStamp()) {
locationList = getTokenLocations(Zone.Layer.GM);
}
}
if (locationList != null) {
locationList.add(location);
}
// Only draw if we're visible
// NOTE: this takes place AFTER resizing the image, that's so that the user
// sufferes a pause only once while scaling, and not as new tokens are
// scrolled onto the screen
if (!location.bounds.intersects(clipBounds)) {
continue;
}
// Moving ?
if (isTokenMoving(token)) {
BufferedImage replacementImage = replacementImageMap.get(token);
if (replacementImage == null) {
replacementImage = ImageUtil.rgbToGrayscale(image);
replacementImageMap.put(token, replacementImage);
}
image = replacementImage;
}
// Previous path
if (showPathList.contains(token) && token.getLastPath() != null) {
renderPath(g, token.getLastPath(), token.getFootprint(zone.getGrid()));
}
Shape clip = g.getClipBounds();
if (token.isToken() && !view.isGMView() && !token.isOwner(MapTool.getPlayer().getName()) && visibleArea != null) {
Area clipArea = new Area(clip);
clipArea.intersect(visibleArea);
g.setClip(clipArea);
}
// Halo (TOPDOWN, CIRCLE)
if (token.hasHalo() && (token.getShape() == Token.TokenShape.TOP_DOWN || token.getShape() == Token.TokenShape.CIRCLE)) {
Stroke oldStroke = g.getStroke();
g.setStroke( new BasicStroke(AppPreferences.getHaloLineWidth()));
g.setColor(token.getHaloColor());
g.drawRect(location.x, location.y, location.scaledWidth, location.scaledHeight);
g.setStroke(oldStroke);
}
// handle flipping
BufferedImage workImage = image;
if (token.isFlippedX() || token.isFlippedY()) {
workImage = new BufferedImage( image.getWidth(), image.getHeight(), image.getTransparency());
int workW = image.getWidth() * (token.isFlippedX() ? -1 : 1);
int workH = image.getHeight() * (token.isFlippedY () ? -1 : 1);
int workX = token.isFlippedX() ? image.getWidth() : 0;
int workY = token.isFlippedY() ? image.getHeight() : 0;
Graphics2D wig = workImage.createGraphics ();
wig.drawImage(image, workX, workY, workW, workH, null);
wig.dispose();
}
// Position
Dimension imgSize = new Dimension(workImage.getWidth(), workImage.getHeight());
SwingUtil.constrainTo(imgSize, footprintBounds.width, footprintBounds.height);
int offsetx = 0;
int offsety = 0;
if (token.isSnapToScale()) {
offsetx = (int)(imgSize.width < footprintBounds.width ? (footprintBounds.width - imgSize.width)/2 * getScale() : 0);
offsety = (int)(imgSize.height < footprintBounds.height ? (footprintBounds.height - imgSize.height)/2 * getScale() : 0);
}
int tx = location.x + offsetx;
int ty = location.y + offsety;
AffineTransform at = new AffineTransform();
at.translate(tx, ty);
// Rotated
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
at.rotate(Math.toRadians(-token.getFacing() - 90), location.scaledWidth/2 - (token.getAnchor().x*scale) - offsetx, location.scaledHeight/2 - (token.getAnchor().y*scale) - offsety); // facing defaults to down, or -90 degrees
}
// Draw the token
if (token.isSnapToScale()) {
at.scale((double) imgSize.width / workImage.getWidth(), (double) imgSize.height / workImage.getHeight());
at.scale(getScale(), getScale());
} else {
at.scale((double) scaledWidth / workImage.getWidth(), (double) scaledHeight / workImage.getHeight());
}
g.drawImage(workImage, at, this);
// Halo (SQUARE)
if (token.hasHalo() && token.getShape() == Token.TokenShape.SQUARE) {
Stroke oldStroke = g.getStroke();
g.setStroke(new BasicStroke(AppPreferences.getHaloLineWidth()));
g.setColor (token.getHaloColor());
g.drawRect(location.x, location.y, location.scaledWidth, location.scaledHeight);
g.setStroke(oldStroke);
}
g.setClip(clip);
// Facing ?
// TODO: Optimize this by doing it once per token per facing
if (token.hasFacing()) {
Token.TokenShape tokenType = token.getShape();
switch(tokenType) {
case CIRCLE:
Shape arrow = getCircleFacingArrow(token.getFacing(), footprintBounds.width/2);
int cx = location.x + location.scaledWidth/2;
int cy = location.y + location.scaledHeight/2;
g.translate(cx, cy);
g.setColor(Color.yellow);
g.fill(arrow);
g.setColor(Color.darkGray);
g.draw(arrow);
g.translate(-cx, -cy);
break;
case SQUARE:
int facing = token.getFacing();
arrow = getSquareFacingArrow(facing, footprintBounds.width/2);
cx = location.x + location.scaledWidth/2;
cy = location.y + location.scaledHeight/2;
// Find the edge of the image
int xp = location.scaledWidth/2;
int yp = location.scaledHeight/2;
if (facing >= 45 && facing <= 135 || facing <= -45 && facing >= -135) {
xp = (int)(yp / Math.tan(Math.toRadians(facing)));
if (facing < 0 ) {
xp = -xp;
yp = -yp;
}
} else {
yp = (int)(xp * Math.tan(Math.toRadians(facing)));
if (facing > 135 || facing < -135) {
xp = -xp;
yp = -yp;
}
}
cx += xp;
cy -= yp;
g.translate (cx, cy);
g.setColor(Color.yellow);
g.fill(arrow);
g.setColor(Color.darkGray);
g.draw(arrow);
g.translate(-cx, -cy);
break;
}
}
// Check for state
if (!token.getStatePropertyNames().isEmpty()) {
// Set up the graphics so that the overlay can just be painted.
clip = g.getClip();
AffineTransform transform = new AffineTransform();
transform.translate(location.x+g.getTransform().getTranslateX(), location.y+g.getTransform().getTranslateY());
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
- transform.rotate(Math.toRadians(-token.getFacing() - 90), location.scaledWidth/2 - (token.getAnchor().x*scale) - offsetx, location.scaledHeight/2 - (token.getAnchor().y*scale) - offsety); // facing defaults to down, or -90 degrees
+ transform.rotate(Math.toRadians(-token.getFacing() - 90), location.scaledWidth/2 - (token.getAnchor().x*scale), location.scaledHeight/2 - (token.getAnchor().y*scale)); // facing defaults to down, or -90 degrees
}
Graphics2D locg = (Graphics2D)g.create();
locg.setTransform(transform);
Rectangle bounds = new Rectangle(0, 0, location.scaledWidth, location.scaledHeight);
Rectangle overlayClip = g.getClipBounds().intersection(bounds);
locg.setClip(overlayClip);
// Check each of the set values
for (String state : token.getStatePropertyNames()) {
Object stateValue = token.getState (state);
// Check for the on/off states & paint them
if (stateValue instanceof Boolean && ((Boolean)stateValue).booleanValue()) {
TokenOverlay overlay = TokenStates.getOverlay(state);
if (overlay != null) overlay.paintOverlay(locg, token, bounds);
// Check for an overlay state value and paint that
} else if (stateValue instanceof TokenOverlay) {
((TokenOverlay)stateValue).paintOverlay(locg, token, bounds);
}
}
}
// DEBUGGING
// ScreenPoint tmpsp = ScreenPoint.fromZonePoint(this, new ZonePoint(token.getX(), token.getY()));
// g.setColor(Color.red);
// g.drawLine(tmpsp.x, 0, tmpsp.x, getSize().height);
// g.drawLine(0, tmpsp.y, getSize().width, tmpsp.y);
}
// Selection and labels
for (TokenLocation location : getTokenLocations(getActiveLayer())) {
Area bounds = location.bounds;
Rectangle origBounds = location.origBounds;
// TODO: This isn't entirely accurate as it doesn't account for the actual text
// to be in the clipping bounds, but I'll fix that later
if (!location.bounds.getBounds().intersects(clipBounds)) {
continue;
}
Token token = location.token;
boolean isSelected = selectedTokenSet.contains(token.getId());
if (isSelected) {
Rectangle footprintBounds = token.getBounds(zone);
ScreenPoint sp = ScreenPoint.fromZonePoint(this, footprintBounds.x, footprintBounds.y);
double width = footprintBounds.width * getScale();
double height = footprintBounds.height * getScale();
ImageBorder selectedBorder = token.isStamp() ? AppStyle.selectedStampBorder : AppStyle.selectedBorder;
// Border
if (token.hasFacing() && (token.getShape() == Token.TokenShape.TOP_DOWN || token.isStamp ())) {
AffineTransform oldTransform = g.getTransform();
// Rotated
g.translate(sp.x, sp.y);
g.rotate(Math.toRadians(-token.getFacing() - 90), width/2 - (token.getAnchor().x*scale), height/2 - (token.getAnchor().y*scale)); // facing defaults to down, or -90 degrees
selectedBorder.paintAround(g, 0, 0, (int)width, (int)height);
g.setTransform(oldTransform);
} else {
selectedBorder.paintAround(g, (int)sp.x, (int)sp.y, (int)width, (int)height);
}
}
// Name
if (AppState.isShowTokenNames() || isSelected || token == tokenUnderMouse) {
String name = token.getName();
if (view.isGMView () && token.getGMName() != null && token.getGMName().length() > 0) {
name += " (" + token.getGMName() + ")";
}
ImageLabel background = token.isVisible() ? token.getType() == Token.Type.NPC ? GraphicsUtil.BLUE_LABEL : GraphicsUtil.GREY_LABEL : GraphicsUtil.DARK_GREY_LABEL;
Color foreground = token.isVisible() ? token.getType() == Token.Type.NPC ? Color.white : Color.black : Color.white;
int offset = 10 + (isSelected ? 3 : 0);
GraphicsUtil.drawBoxedString(g, name, bounds.getBounds().x + bounds.getBounds ().width/2, bounds.getBounds().y + bounds.getBounds().height + offset, SwingUtilities.CENTER, background, foreground);
if (token.getLabel() != null && token.getLabel().trim().length() > 0) {
offset += 16 + (isSelected ? 3 : 0);
GraphicsUtil.drawBoxedString(g, token.getLabel(), bounds.getBounds().x + bounds.getBounds ().width/2, bounds.getBounds().y + bounds.getBounds().height + offset, SwingUtilities.CENTER, background, foreground);
}
}
}
// Stacks
Shape clip = g.getClipBounds();
if (!view.isGMView() && visibleArea != null) {
Area clipArea = new Area(clip);
clipArea.intersect(visibleArea);
g.setClip(clipArea);
}
for (Area rect : coveredTokenSet) {
BufferedImage stackImage = AppStyle.stackImage ;
g.drawImage(stackImage, rect.getBounds().x + rect.getBounds().width - stackImage.getWidth() + 2, rect.getBounds().y - 2, null);
}
// // Markers
// for (TokenLocation location : getMarkerLocations() ) {
// BufferedImage stackImage = AppStyle.markerImage;
// g.drawImage(stackImage, location.bounds.getBounds().x, location.bounds.getBounds().y, null);
// }
g.setClip(clip);
}
private boolean canSeeMarker(Token token) {
return MapTool.getPlayer().isGM() || !StringUtil.isEmpty(token.getNotes());
}
public Set<GUID> getSelectedTokenSet() {
return selectedTokenSet;
}
public boolean isTokenSelectable(GUID tokenGUID) {
if (tokenGUID == null) {
return false;
}
Token token = zone.getToken(tokenGUID);
if (token == null) {
return false;
}
if (!AppUtil.playerOwns(token)) {
return false;
}
// FOR NOW: if you own the token, you can select it
// if (!AppUtil.playerOwns(token) && !zone.isTokenVisible(token)) {
// return false;
// }
//
return true;
}
public boolean selectToken(GUID tokenGUID) {
if (!isTokenSelectable(tokenGUID)) {
return false;
}
selectedTokenSet.add(tokenGUID);
repaint();
return true;
}
/**
* Screen space rectangle
*/
public void selectTokens(Rectangle rect) {
for (TokenLocation location : getTokenLocations(getActiveLayer())) {
if (rect.intersects (location.bounds.getBounds())) {
selectToken(location.token.getId());
}
}
}
public void clearSelectedTokens() {
clearShowPaths();
selectedTokenSet.clear ();
repaint();
}
public Area getTokenBounds(Token token) {
TokenLocation location = tokenLocationCache.get(token);
return location != null ? location.bounds : null;
}
public Area getMarkerBounds(Token token) {
for (TokenLocation location : markerLocationList) {
if (location.token == token) {
return location.bounds;
}
}
return null;
}
public Rectangle getLabelBounds(Label label) {
for (LabelLocation location : labelLocationList) {
if (location.label == label) {
return location.bounds;
}
}
return null;
}
/**
* Returns the token at screen location x, y (not cell location). To get
* the token at a cell location, use getGameMap() and use that.
*
* @param x
* @param y
* @return
*/
public Token getTokenAt (int x, int y) {
List<TokenLocation> locationList = new ArrayList<TokenLocation>();
locationList.addAll(getTokenLocations(getActiveLayer()));
Collections.reverse(locationList);
for (TokenLocation location : locationList) {
if (location.bounds.contains(x, y)) {
return location.token;
}
}
return null;
}
public Token getMarkerAt (int x, int y) {
List<TokenLocation> locationList = new ArrayList<TokenLocation>();
locationList.addAll(markerLocationList);
Collections.reverse(locationList);
for (TokenLocation location : locationList) {
if (location.bounds.contains(x, y)) {
return location.token;
}
}
return null;
}
public List<Token> getTokenStackAt (int x, int y) {
List<Area> stackList = new ArrayList<Area>();
stackList.addAll(coveredTokenSet);
for (Area bounds : stackList) {
if (bounds.contains(x, y)) {
List<Token> tokenList = new ArrayList<Token>();
for (TokenLocation location : getTokenLocations(getActiveLayer())) {
if (location.bounds.getBounds().intersects(bounds.getBounds())) {
tokenList.add(location.token);
}
}
return tokenList;
}
}
return null;
}
/**
* Returns the label at screen location x, y (not cell location). To get
* the token at a cell location, use getGameMap() and use that.
*
* @param x
* @param y
* @return
*/
public Label getLabelAt (int x, int y) {
List<LabelLocation> labelList = new ArrayList<LabelLocation>();
labelList.addAll(labelLocationList);
Collections.reverse(labelList);
for (LabelLocation location : labelList) {
if (location.bounds.contains(x, y)) {
return location.label;
}
}
return null;
}
public int getViewOffsetX() {
return zoneScale.getOffsetX();
}
public int getViewOffsetY() {
return zoneScale.getOffsetY();
}
public void adjustGridSize(int delta) {
zone.getGrid().setSize(Math.max(0, zone.getGrid().getSize() + delta));
repaint();
}
public void moveGridBy(int dx, int dy) {
int gridOffsetX = zone.getGrid().getOffsetX();
int gridOffsetY = zone.getGrid().getOffsetY();
gridOffsetX += dx;
gridOffsetY += dy;
if (gridOffsetY > 0) {
gridOffsetY = gridOffsetY - (int)zone.getGrid().getCellHeight();
}
if (gridOffsetX > 0) {
gridOffsetX = gridOffsetX - (int)zone.getGrid().getCellWidth();
}
zone.getGrid().setOffset(gridOffsetX, gridOffsetY);
repaint();
}
/**
* Since the map can be scaled, this is a convenience method to find out
* what cell is at this location.
*
* @param screenPoint Find the cell for this point.
* @return The cell coordinates of the passed screen point.
*/
public CellPoint getCellAt(ScreenPoint screenPoint) {
ZonePoint zp = screenPoint.convertToZone(this);
return zone.getGrid().convert(zp);
}
public float getScale() {
return zoneScale.getScale();
}
public int getScaleIndex() {
// Used when enforcing view
return zoneScale.getIndex();
}
public void setScaleIndex(int index) {
zoneScale.setIndex(index);
}
public double getScaledGridSize() {
// Optimize: only need to calc this when grid size or scale changes
return getScale() * zone.getGrid().getSize();
}
/**
* This makes sure that any image updates get refreshed. This could be a little smarter.
*/
@Override
public boolean imageUpdate(Image img, int infoflags, int x, int y, int w, int h) {
repaint();
return super.imageUpdate(img, infoflags, x, y, w, h);
}
/**
* Represents a movement set
*/
private class SelectionSet {
private HashSet<GUID> selectionSet = new HashSet<GUID>();
private GUID keyToken;
private String playerId;
private ZoneWalker walker;
private Token token;
private Path<ZonePoint> gridlessPath;
// Pixel distance from keyToken's origin
private int offsetX;
private int offsetY;
public SelectionSet(String playerId, GUID tokenGUID, Set<GUID> selectionList) {
selectionSet.addAll(selectionList);
keyToken = tokenGUID;
this.playerId = playerId;
token = zone.getToken(tokenGUID);
if (token.isSnapToGrid() && zone.getGrid().getCapabilities().isSnapToGridSupported()) {
if (ZoneRenderer.this.zone.getGrid().getCapabilities().isPathingSupported()) {
CellPoint tokenPoint = zone.getGrid().convert(new ZonePoint(token.getX(), token.getY()));
walker = ZoneRenderer.this.zone.getGrid().createZoneWalker();
walker.setWaypoints(tokenPoint, tokenPoint);
}
} else {
gridlessPath = new Path<ZonePoint>();
}
}
public ZoneWalker getWalker() {
return walker;
}
public GUID getKeyToken() {
return keyToken;
}
public Set<GUID> getTokens() {
return selectionSet;
}
public boolean contains(Token token) {
return selectionSet.contains(token.getId());
}
public void setOffset(int x, int y) {
offsetX = x;
offsetY = y;
if (ZoneRenderer.this.zone.getGrid().getCapabilities().isPathingSupported() && token.isSnapToGrid()) {
CellPoint point = zone.getGrid().convert(new ZonePoint( token.getX()+x, token.getY()+y));
walker.replaceLastWaypoint(point);
}
}
/**
* Add the waypoint if it is a new waypoint. If it is
* an old waypoint remove it.
*
* @param location The point where the waypoint is toggled.
*/
public void toggleWaypoint(ZonePoint location) {
// CellPoint cp = renderer.getZone().getGrid().convert(new ZonePoint(dragStartX, dragStartY));
if (token.isSnapToGrid()) {
walker.toggleWaypoint(getZone().getGrid().convert(location));
} else {
gridlessPath.addWayPoint(location);
gridlessPath.addPathCell(location);
}
}
public int getOffsetX() {
return offsetX;
}
public int getOffsetY() {
return offsetY;
}
public String getPlayerId() {
return playerId;
}
}
private class TokenLocation {
public Area bounds;
public Rectangle origBounds;
public Token token;
public Rectangle boundsCache;
public int height;
public int width;
public int scaledHeight;
public int scaledWidth;
public int x;
public int y;
public int offsetX;
public int offsetY;
public TokenLocation(Area bounds, Rectangle origBounds, Token token, int x, int y, int width, int height, int scaledWidth, int scaledHeight) {
this.bounds = bounds;
this.token = token;
this.origBounds = origBounds;
this.width = width;
this.height = height;
this.scaledWidth = scaledWidth;
this.scaledHeight = scaledHeight;
this.x = x;
this.y = y;
offsetX = getViewOffsetX();
offsetY = getViewOffsetY();
boundsCache = bounds.getBounds();
}
public boolean maybeOnscreen(Rectangle viewport) {
int deltaX = getViewOffsetX() - offsetX;
int deltaY = getViewOffsetY() - offsetY;
boundsCache.x += deltaX;
boundsCache.y += deltaY;
offsetX = getViewOffsetX();
offsetY = getViewOffsetY();
if (!boundsCache.intersects(viewport)) {
return false;
}
return true;
}
}
private static class LabelLocation {
public Rectangle bounds;
public Label label;
public LabelLocation(Rectangle bounds, Label label) {
this.bounds = bounds;
this.label = label;
}
}
////
// DROP TARGET LISTENER
/* (non-Javadoc)
* @see java.awt.dnd.DropTargetListener#dragEnter(java.awt.dnd.DropTargetDragEvent)
*/
public void dragEnter(DropTargetDragEvent dtde) {}
/* (non-Javadoc)
* @see java.awt.dnd.DropTargetListener#dragExit(java.awt.dnd.DropTargetEvent)
*/
public void dragExit(DropTargetEvent dte) {}
/* (non-Javadoc)
* @see java.awt.dnd.DropTargetListener#dragOver (java.awt.dnd.DropTargetDragEvent)
*/
public void dragOver(DropTargetDragEvent dtde) {
}
private void addTokens(List<Token> tokens, ZonePoint zp, boolean configureToken) {
GridCapabilities gridCaps = zone.getGrid().getCapabilities();
boolean isGM = MapTool.getPlayer().isGM();
ScreenPoint sp = ScreenPoint.fromZonePoint(this, zp);
Point dropPoint = new Point((int)sp.x, (int)sp.y);
SwingUtilities.convertPointToScreen(dropPoint, this);
for (Token token : tokens) {
// Get the snap to grid value for the current prefs and abilities
token.setSnapToGrid(gridCaps.isSnapToGridSupported() && AppPreferences.getTokensStartSnapToGrid());
if (gridCaps.isSnapToGridSupported() && token.isSnapToGrid()) {
zp = zone.getGrid().convert(zone.getGrid().convert(zp));
}
token.setX(zp.x);
token.setY(zp.y);
// Set the image properties
if (configureToken) {
BufferedImage image = ImageManager.getImageAndWait(AssetManager.getAsset(token.getImageAssetId()));
token.setShape(TokenUtil.guessTokenType((BufferedImage)image));
token.setWidth(image.getWidth(null));
token.setHeight(image.getHeight(null));
token.setLayer(getActiveLayer());
token.setFootprint(zone.getGrid(), zone.getGrid().getDefaultFootprint());
}
// He who drops, owns, if there are not players already set
if (!token.hasOwners() && !isGM) {
token.addOwner(MapTool.getPlayer().getName());
}
// Token type
Rectangle size = token.getBounds(zone);
switch (getActiveLayer()) {
case TOKEN: {
// Players can't drop invisible tokens
token.setVisible(!isGM || AppPreferences.getNewTokensVisible());
if (AppPreferences.getTokensStartFreesize()) {
token.setSnapToScale(false);
}
break;
}
case BACKGROUND: {
token.setShape (Token.TokenShape.TOP_DOWN);
token.setSnapToScale(!AppPreferences.getBackgroundsStartFreesize());
token.setSnapToGrid(AppPreferences.getBackgroundsStartSnapToGrid());
token.setVisible(AppPreferences.getNewBackgroundsVisible());
// Center on drop point
if (!token.isSnapToScale() && !token.isSnapToGrid()) {
token.setX(token.getX() - size.width/2);
token.setY(token.getY() - size.height/2);
}
break;
}
case OBJECT: {
token.setShape(Token.TokenShape.TOP_DOWN);
token.setSnapToScale(!AppPreferences.getObjectsStartFreesize());
token.setSnapToGrid(AppPreferences.getObjectsStartSnapToGrid());
token.setVisible(AppPreferences.getNewObjectsVisible());
// Center on drop point
if (!token.isSnapToScale() && !token.isSnapToGrid()) {
token.setX(token.getX() - size.width/2);
token.setY(token.getY() - size.height/2);
}
break;
}
}
// Check the name (after Token layer is set as name relies on layer)
token.setName(MapToolUtil.nextTokenId(zone, token));
// Token type
if (isGM) {
token.setType(Token.Type.NPC);
if (getActiveLayer() == Zone.Layer.TOKEN) {
if (AppPreferences.getShowDialogOnNewToken()) {
NewTokenDialog dialog = new NewTokenDialog(token, dropPoint.x, dropPoint.y);
dialog.showDialog();
if (!dialog.isSuccess()) {
continue;
}
}
}
} else {
// Player dropped, player token
token.setType(Token.Type.PC);
}
// Save the token and tell everybody about it
zone.putToken(token);
MapTool.serverCommand().putToken(zone.getId(), token);
}
// For convenience, select them
clearSelectedTokens();
for (Token token : tokens) {
selectToken(token.getId());
}
// Copy them to the clipboard so that we can quickly copy them onto the map
AppActions.copyTokens(tokens);
requestFocusInWindow();
repaint();
}
/*
* (non-Javadoc)
*
* @see java.awt.dnd.DropTargetListener#drop (java.awt.dnd.DropTargetDropEvent)
*/
public void drop(DropTargetDropEvent dtde) {
final ZonePoint zp = new ScreenPoint((int) dtde.getLocation().getX(),
(int) dtde.getLocation().getY()).convertToZone(this);
Transferable t = dtde.getTransferable();
if (!(TransferableHelper.isSupportedAssetFlavor(t)
|| TransferableHelper.isSupportedTokenFlavor(t))
|| (dtde.getDropAction () & DnDConstants.ACTION_COPY_OR_MOVE) == 0) {
dtde.rejectDrop(); // Not a supported flavor or not a copy/move
return;
}
dtde.acceptDrop(dtde.getDropAction());
List<Token> tokens = null;
List<Asset> assets = TransferableHelper.getAsset(dtde);
if (assets != null) {
tokens = new ArrayList<Token>(assets.size());
for (Asset asset : assets) {
tokens.add(new Token(asset.getName(), asset.getId()));
}
addTokens(tokens, zp, true);
} else {
if (t.isDataFlavorSupported(TransferableToken.dataFlavor)) {
try {
// Make a copy so that it gets a new unique GUID
tokens = Collections.singletonList(new Token((Token)t.getTransferData(TransferableToken.dataFlavor)));
addTokens(tokens, zp, false);
} catch (UnsupportedFlavorException ufe) {
ufe.printStackTrace();
} catch (IOException ioe) {
ioe.printStackTrace();
}
} else {
tokens = TransferableHelper.getTokens(dtde.getTransferable ());
addTokens(tokens, zp, true);
}
}
dtde.dropComplete(tokens != null);
}
/* (non-Javadoc)
* @see java.awt.dnd.DropTargetListener#dropActionChanged (java.awt.dnd.DropTargetDragEvent)
*/
public void dropActionChanged(DropTargetDragEvent dtde) {
// TODO Auto-generated method stub
}
////
// ZONE MODEL CHANGE LISTENER
private class ZoneModelChangeListener implements ModelChangeListener {
public void modelChanged(ModelChangeEvent event) {
Object evt = event.getEvent();
if (evt == Zone.Event.TOPOLOGY_CHANGED) {
tokenVisionCache.clear();
topologyAreaData = null;
lightSourceArea = null;
lightSourceCache.clear();
flushFog = true;
}
if (evt == Zone.Event.TOKEN_CHANGED || evt == Zone.Event.TOKEN_REMOVED) {
flush((Token)event.getArg());
}
if (evt == Zone.Event.FOG_CHANGED) {
flushFog = true;
}
MapTool.getFrame().updateTokenTree();
repaint();
}
}
////
// COMPARABLE
public int compareTo(Object o) {
if (!(o instanceof ZoneRenderer)) {
return 0;
}
return zone.getCreationTime() < ((ZoneRenderer)o).zone.getCreationTime() ? -1 : 1;
}
}
| true | true | protected void renderTokens(Graphics2D g, List<Token> tokenList, ZoneView view) {
Rectangle viewport = new Rectangle(0, 0, getSize().width, getSize().height);
Rectangle clipBounds = g.getClipBounds();
float scale = zoneScale.getScale();
for (Token token : tokenList) {
// Don't bother if it's not visible
if (!zone.isTokenVisible(token) && !view.isGMView()) {
continue;
}
if (token.isStamp() && isTokenMoving(token)) {
continue;
}
TokenLocation location = tokenLocationCache.get(token);
if (location != null && !location.maybeOnscreen(viewport)) {
continue;
}
Rectangle footprintBounds = token.getBounds(zone);
BufferedImage image = null;
Asset asset = AssetManager.getAsset(token.getImageAssetId ());
if (asset == null) {
// In the mean time, show a placeholder
image = ImageManager.UNKNOWN_IMAGE;
} else {
image = ImageManager.getImage(AssetManager.getAsset(token.getImageAssetId()), this);
}
int scaledWidth = (int)(footprintBounds.width*scale);
int scaledHeight = (int)(footprintBounds.height*scale);
// if (!token.isStamp()) {
// // Fit inside the grid
// scaledWidth --;
// scaledHeight --;
// }
ScreenPoint tokenScreenLocation = ScreenPoint.fromZonePoint (this, footprintBounds.x, footprintBounds.y);
// Tokens are centered on the image center point
int x = (int)tokenScreenLocation.x;
int y = (int)tokenScreenLocation.y;
Rectangle origBounds = new Rectangle(x, y, scaledWidth, scaledHeight);
Area tokenBounds = new Area(origBounds);
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
tokenBounds.transform(AffineTransform.getRotateInstance(Math.toRadians(-token.getFacing() - 90), scaledWidth/2 + x - (token.getAnchor().x*scale), scaledHeight/2 + y - (token.getAnchor().y*scale))); // facing defaults to down, or -90 degrees
}
location = new TokenLocation(tokenBounds, origBounds, token, x, y, footprintBounds.width, footprintBounds.height, scaledWidth, scaledHeight);
tokenLocationCache.put(token, location);
// General visibility
if (!view.isGMView() && !zone.isTokenVisible(token)) {
continue;
}
// Vision visibility
if (!view.isGMView() && token.isToken() && isUsingVision) {
if (!GraphicsUtil.intersects(visibleArea, location.bounds)) {
continue;
}
}
// Markers
if (token.isMarker() && canSeeMarker(token)) {
markerLocationList.add(location);
}
if (!location.bounds.intersects(clipBounds)) {
// Not on the screen, don't have to worry about it
continue;
}
// Stacking check
if (!token.isStamp()) {
for (TokenLocation currLocation : getTokenLocations(Zone.Layer.TOKEN)) {
Area r1 = currLocation.bounds;
// Are we covering anyone ?
if (GraphicsUtil.contains(location.bounds, r1)) {
// Are we covering someone that is covering someone ?
Area oldRect = null;
for (Area r2 : coveredTokenSet) {
if (location.bounds.getBounds().contains(r2.getBounds ())) {
oldRect = r2;
break;
}
}
if (oldRect != null) {
coveredTokenSet.remove(oldRect);
}
coveredTokenSet.add(location.bounds);
}
}
}
// Keep track of the location on the screen
// Note the order where the top most token is at the end of the list
List<TokenLocation> locationList = null;
if (!token.isStamp()) {
locationList = getTokenLocations(Zone.Layer.TOKEN);
} else {
if (token.isObjectStamp()) {
locationList = getTokenLocations(Zone.Layer.OBJECT);
}
if (token.isBackgroundStamp()) {
locationList = getTokenLocations(Zone.Layer.BACKGROUND);
}
if (token.isGMStamp()) {
locationList = getTokenLocations(Zone.Layer.GM);
}
}
if (locationList != null) {
locationList.add(location);
}
// Only draw if we're visible
// NOTE: this takes place AFTER resizing the image, that's so that the user
// sufferes a pause only once while scaling, and not as new tokens are
// scrolled onto the screen
if (!location.bounds.intersects(clipBounds)) {
continue;
}
// Moving ?
if (isTokenMoving(token)) {
BufferedImage replacementImage = replacementImageMap.get(token);
if (replacementImage == null) {
replacementImage = ImageUtil.rgbToGrayscale(image);
replacementImageMap.put(token, replacementImage);
}
image = replacementImage;
}
// Previous path
if (showPathList.contains(token) && token.getLastPath() != null) {
renderPath(g, token.getLastPath(), token.getFootprint(zone.getGrid()));
}
Shape clip = g.getClipBounds();
if (token.isToken() && !view.isGMView() && !token.isOwner(MapTool.getPlayer().getName()) && visibleArea != null) {
Area clipArea = new Area(clip);
clipArea.intersect(visibleArea);
g.setClip(clipArea);
}
// Halo (TOPDOWN, CIRCLE)
if (token.hasHalo() && (token.getShape() == Token.TokenShape.TOP_DOWN || token.getShape() == Token.TokenShape.CIRCLE)) {
Stroke oldStroke = g.getStroke();
g.setStroke( new BasicStroke(AppPreferences.getHaloLineWidth()));
g.setColor(token.getHaloColor());
g.drawRect(location.x, location.y, location.scaledWidth, location.scaledHeight);
g.setStroke(oldStroke);
}
// handle flipping
BufferedImage workImage = image;
if (token.isFlippedX() || token.isFlippedY()) {
workImage = new BufferedImage( image.getWidth(), image.getHeight(), image.getTransparency());
int workW = image.getWidth() * (token.isFlippedX() ? -1 : 1);
int workH = image.getHeight() * (token.isFlippedY () ? -1 : 1);
int workX = token.isFlippedX() ? image.getWidth() : 0;
int workY = token.isFlippedY() ? image.getHeight() : 0;
Graphics2D wig = workImage.createGraphics ();
wig.drawImage(image, workX, workY, workW, workH, null);
wig.dispose();
}
// Position
Dimension imgSize = new Dimension(workImage.getWidth(), workImage.getHeight());
SwingUtil.constrainTo(imgSize, footprintBounds.width, footprintBounds.height);
int offsetx = 0;
int offsety = 0;
if (token.isSnapToScale()) {
offsetx = (int)(imgSize.width < footprintBounds.width ? (footprintBounds.width - imgSize.width)/2 * getScale() : 0);
offsety = (int)(imgSize.height < footprintBounds.height ? (footprintBounds.height - imgSize.height)/2 * getScale() : 0);
}
int tx = location.x + offsetx;
int ty = location.y + offsety;
AffineTransform at = new AffineTransform();
at.translate(tx, ty);
// Rotated
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
at.rotate(Math.toRadians(-token.getFacing() - 90), location.scaledWidth/2 - (token.getAnchor().x*scale) - offsetx, location.scaledHeight/2 - (token.getAnchor().y*scale) - offsety); // facing defaults to down, or -90 degrees
}
// Draw the token
if (token.isSnapToScale()) {
at.scale((double) imgSize.width / workImage.getWidth(), (double) imgSize.height / workImage.getHeight());
at.scale(getScale(), getScale());
} else {
at.scale((double) scaledWidth / workImage.getWidth(), (double) scaledHeight / workImage.getHeight());
}
g.drawImage(workImage, at, this);
// Halo (SQUARE)
if (token.hasHalo() && token.getShape() == Token.TokenShape.SQUARE) {
Stroke oldStroke = g.getStroke();
g.setStroke(new BasicStroke(AppPreferences.getHaloLineWidth()));
g.setColor (token.getHaloColor());
g.drawRect(location.x, location.y, location.scaledWidth, location.scaledHeight);
g.setStroke(oldStroke);
}
g.setClip(clip);
// Facing ?
// TODO: Optimize this by doing it once per token per facing
if (token.hasFacing()) {
Token.TokenShape tokenType = token.getShape();
switch(tokenType) {
case CIRCLE:
Shape arrow = getCircleFacingArrow(token.getFacing(), footprintBounds.width/2);
int cx = location.x + location.scaledWidth/2;
int cy = location.y + location.scaledHeight/2;
g.translate(cx, cy);
g.setColor(Color.yellow);
g.fill(arrow);
g.setColor(Color.darkGray);
g.draw(arrow);
g.translate(-cx, -cy);
break;
case SQUARE:
int facing = token.getFacing();
arrow = getSquareFacingArrow(facing, footprintBounds.width/2);
cx = location.x + location.scaledWidth/2;
cy = location.y + location.scaledHeight/2;
// Find the edge of the image
int xp = location.scaledWidth/2;
int yp = location.scaledHeight/2;
if (facing >= 45 && facing <= 135 || facing <= -45 && facing >= -135) {
xp = (int)(yp / Math.tan(Math.toRadians(facing)));
if (facing < 0 ) {
xp = -xp;
yp = -yp;
}
} else {
yp = (int)(xp * Math.tan(Math.toRadians(facing)));
if (facing > 135 || facing < -135) {
xp = -xp;
yp = -yp;
}
}
cx += xp;
cy -= yp;
g.translate (cx, cy);
g.setColor(Color.yellow);
g.fill(arrow);
g.setColor(Color.darkGray);
g.draw(arrow);
g.translate(-cx, -cy);
break;
}
}
// Check for state
if (!token.getStatePropertyNames().isEmpty()) {
// Set up the graphics so that the overlay can just be painted.
clip = g.getClip();
AffineTransform transform = new AffineTransform();
transform.translate(location.x+g.getTransform().getTranslateX(), location.y+g.getTransform().getTranslateY());
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
transform.rotate(Math.toRadians(-token.getFacing() - 90), location.scaledWidth/2 - (token.getAnchor().x*scale) - offsetx, location.scaledHeight/2 - (token.getAnchor().y*scale) - offsety); // facing defaults to down, or -90 degrees
}
Graphics2D locg = (Graphics2D)g.create();
locg.setTransform(transform);
Rectangle bounds = new Rectangle(0, 0, location.scaledWidth, location.scaledHeight);
Rectangle overlayClip = g.getClipBounds().intersection(bounds);
locg.setClip(overlayClip);
// Check each of the set values
for (String state : token.getStatePropertyNames()) {
Object stateValue = token.getState (state);
// Check for the on/off states & paint them
if (stateValue instanceof Boolean && ((Boolean)stateValue).booleanValue()) {
TokenOverlay overlay = TokenStates.getOverlay(state);
if (overlay != null) overlay.paintOverlay(locg, token, bounds);
// Check for an overlay state value and paint that
} else if (stateValue instanceof TokenOverlay) {
((TokenOverlay)stateValue).paintOverlay(locg, token, bounds);
}
}
}
// DEBUGGING
// ScreenPoint tmpsp = ScreenPoint.fromZonePoint(this, new ZonePoint(token.getX(), token.getY()));
// g.setColor(Color.red);
// g.drawLine(tmpsp.x, 0, tmpsp.x, getSize().height);
// g.drawLine(0, tmpsp.y, getSize().width, tmpsp.y);
}
// Selection and labels
for (TokenLocation location : getTokenLocations(getActiveLayer())) {
Area bounds = location.bounds;
Rectangle origBounds = location.origBounds;
// TODO: This isn't entirely accurate as it doesn't account for the actual text
// to be in the clipping bounds, but I'll fix that later
if (!location.bounds.getBounds().intersects(clipBounds)) {
continue;
}
Token token = location.token;
boolean isSelected = selectedTokenSet.contains(token.getId());
if (isSelected) {
Rectangle footprintBounds = token.getBounds(zone);
ScreenPoint sp = ScreenPoint.fromZonePoint(this, footprintBounds.x, footprintBounds.y);
double width = footprintBounds.width * getScale();
double height = footprintBounds.height * getScale();
ImageBorder selectedBorder = token.isStamp() ? AppStyle.selectedStampBorder : AppStyle.selectedBorder;
// Border
if (token.hasFacing() && (token.getShape() == Token.TokenShape.TOP_DOWN || token.isStamp ())) {
AffineTransform oldTransform = g.getTransform();
// Rotated
g.translate(sp.x, sp.y);
g.rotate(Math.toRadians(-token.getFacing() - 90), width/2 - (token.getAnchor().x*scale), height/2 - (token.getAnchor().y*scale)); // facing defaults to down, or -90 degrees
selectedBorder.paintAround(g, 0, 0, (int)width, (int)height);
g.setTransform(oldTransform);
} else {
selectedBorder.paintAround(g, (int)sp.x, (int)sp.y, (int)width, (int)height);
}
}
// Name
if (AppState.isShowTokenNames() || isSelected || token == tokenUnderMouse) {
String name = token.getName();
if (view.isGMView () && token.getGMName() != null && token.getGMName().length() > 0) {
name += " (" + token.getGMName() + ")";
}
ImageLabel background = token.isVisible() ? token.getType() == Token.Type.NPC ? GraphicsUtil.BLUE_LABEL : GraphicsUtil.GREY_LABEL : GraphicsUtil.DARK_GREY_LABEL;
Color foreground = token.isVisible() ? token.getType() == Token.Type.NPC ? Color.white : Color.black : Color.white;
int offset = 10 + (isSelected ? 3 : 0);
GraphicsUtil.drawBoxedString(g, name, bounds.getBounds().x + bounds.getBounds ().width/2, bounds.getBounds().y + bounds.getBounds().height + offset, SwingUtilities.CENTER, background, foreground);
if (token.getLabel() != null && token.getLabel().trim().length() > 0) {
offset += 16 + (isSelected ? 3 : 0);
GraphicsUtil.drawBoxedString(g, token.getLabel(), bounds.getBounds().x + bounds.getBounds ().width/2, bounds.getBounds().y + bounds.getBounds().height + offset, SwingUtilities.CENTER, background, foreground);
}
}
}
// Stacks
Shape clip = g.getClipBounds();
if (!view.isGMView() && visibleArea != null) {
Area clipArea = new Area(clip);
clipArea.intersect(visibleArea);
g.setClip(clipArea);
}
for (Area rect : coveredTokenSet) {
BufferedImage stackImage = AppStyle.stackImage ;
g.drawImage(stackImage, rect.getBounds().x + rect.getBounds().width - stackImage.getWidth() + 2, rect.getBounds().y - 2, null);
}
// // Markers
// for (TokenLocation location : getMarkerLocations() ) {
// BufferedImage stackImage = AppStyle.markerImage;
// g.drawImage(stackImage, location.bounds.getBounds().x, location.bounds.getBounds().y, null);
// }
g.setClip(clip);
}
| protected void renderTokens(Graphics2D g, List<Token> tokenList, ZoneView view) {
Rectangle viewport = new Rectangle(0, 0, getSize().width, getSize().height);
Rectangle clipBounds = g.getClipBounds();
float scale = zoneScale.getScale();
for (Token token : tokenList) {
// Don't bother if it's not visible
if (!zone.isTokenVisible(token) && !view.isGMView()) {
continue;
}
if (token.isStamp() && isTokenMoving(token)) {
continue;
}
TokenLocation location = tokenLocationCache.get(token);
if (location != null && !location.maybeOnscreen(viewport)) {
continue;
}
Rectangle footprintBounds = token.getBounds(zone);
BufferedImage image = null;
Asset asset = AssetManager.getAsset(token.getImageAssetId ());
if (asset == null) {
// In the mean time, show a placeholder
image = ImageManager.UNKNOWN_IMAGE;
} else {
image = ImageManager.getImage(AssetManager.getAsset(token.getImageAssetId()), this);
}
int scaledWidth = (int)(footprintBounds.width*scale);
int scaledHeight = (int)(footprintBounds.height*scale);
// if (!token.isStamp()) {
// // Fit inside the grid
// scaledWidth --;
// scaledHeight --;
// }
ScreenPoint tokenScreenLocation = ScreenPoint.fromZonePoint (this, footprintBounds.x, footprintBounds.y);
// Tokens are centered on the image center point
int x = (int)tokenScreenLocation.x;
int y = (int)tokenScreenLocation.y;
Rectangle origBounds = new Rectangle(x, y, scaledWidth, scaledHeight);
Area tokenBounds = new Area(origBounds);
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
tokenBounds.transform(AffineTransform.getRotateInstance(Math.toRadians(-token.getFacing() - 90), scaledWidth/2 + x - (token.getAnchor().x*scale), scaledHeight/2 + y - (token.getAnchor().y*scale))); // facing defaults to down, or -90 degrees
}
location = new TokenLocation(tokenBounds, origBounds, token, x, y, footprintBounds.width, footprintBounds.height, scaledWidth, scaledHeight);
tokenLocationCache.put(token, location);
// General visibility
if (!view.isGMView() && !zone.isTokenVisible(token)) {
continue;
}
// Vision visibility
if (!view.isGMView() && token.isToken() && isUsingVision) {
if (!GraphicsUtil.intersects(visibleArea, location.bounds)) {
continue;
}
}
// Markers
if (token.isMarker() && canSeeMarker(token)) {
markerLocationList.add(location);
}
if (!location.bounds.intersects(clipBounds)) {
// Not on the screen, don't have to worry about it
continue;
}
// Stacking check
if (!token.isStamp()) {
for (TokenLocation currLocation : getTokenLocations(Zone.Layer.TOKEN)) {
Area r1 = currLocation.bounds;
// Are we covering anyone ?
if (GraphicsUtil.contains(location.bounds, r1)) {
// Are we covering someone that is covering someone ?
Area oldRect = null;
for (Area r2 : coveredTokenSet) {
if (location.bounds.getBounds().contains(r2.getBounds ())) {
oldRect = r2;
break;
}
}
if (oldRect != null) {
coveredTokenSet.remove(oldRect);
}
coveredTokenSet.add(location.bounds);
}
}
}
// Keep track of the location on the screen
// Note the order where the top most token is at the end of the list
List<TokenLocation> locationList = null;
if (!token.isStamp()) {
locationList = getTokenLocations(Zone.Layer.TOKEN);
} else {
if (token.isObjectStamp()) {
locationList = getTokenLocations(Zone.Layer.OBJECT);
}
if (token.isBackgroundStamp()) {
locationList = getTokenLocations(Zone.Layer.BACKGROUND);
}
if (token.isGMStamp()) {
locationList = getTokenLocations(Zone.Layer.GM);
}
}
if (locationList != null) {
locationList.add(location);
}
// Only draw if we're visible
// NOTE: this takes place AFTER resizing the image, that's so that the user
// sufferes a pause only once while scaling, and not as new tokens are
// scrolled onto the screen
if (!location.bounds.intersects(clipBounds)) {
continue;
}
// Moving ?
if (isTokenMoving(token)) {
BufferedImage replacementImage = replacementImageMap.get(token);
if (replacementImage == null) {
replacementImage = ImageUtil.rgbToGrayscale(image);
replacementImageMap.put(token, replacementImage);
}
image = replacementImage;
}
// Previous path
if (showPathList.contains(token) && token.getLastPath() != null) {
renderPath(g, token.getLastPath(), token.getFootprint(zone.getGrid()));
}
Shape clip = g.getClipBounds();
if (token.isToken() && !view.isGMView() && !token.isOwner(MapTool.getPlayer().getName()) && visibleArea != null) {
Area clipArea = new Area(clip);
clipArea.intersect(visibleArea);
g.setClip(clipArea);
}
// Halo (TOPDOWN, CIRCLE)
if (token.hasHalo() && (token.getShape() == Token.TokenShape.TOP_DOWN || token.getShape() == Token.TokenShape.CIRCLE)) {
Stroke oldStroke = g.getStroke();
g.setStroke( new BasicStroke(AppPreferences.getHaloLineWidth()));
g.setColor(token.getHaloColor());
g.drawRect(location.x, location.y, location.scaledWidth, location.scaledHeight);
g.setStroke(oldStroke);
}
// handle flipping
BufferedImage workImage = image;
if (token.isFlippedX() || token.isFlippedY()) {
workImage = new BufferedImage( image.getWidth(), image.getHeight(), image.getTransparency());
int workW = image.getWidth() * (token.isFlippedX() ? -1 : 1);
int workH = image.getHeight() * (token.isFlippedY () ? -1 : 1);
int workX = token.isFlippedX() ? image.getWidth() : 0;
int workY = token.isFlippedY() ? image.getHeight() : 0;
Graphics2D wig = workImage.createGraphics ();
wig.drawImage(image, workX, workY, workW, workH, null);
wig.dispose();
}
// Position
Dimension imgSize = new Dimension(workImage.getWidth(), workImage.getHeight());
SwingUtil.constrainTo(imgSize, footprintBounds.width, footprintBounds.height);
int offsetx = 0;
int offsety = 0;
if (token.isSnapToScale()) {
offsetx = (int)(imgSize.width < footprintBounds.width ? (footprintBounds.width - imgSize.width)/2 * getScale() : 0);
offsety = (int)(imgSize.height < footprintBounds.height ? (footprintBounds.height - imgSize.height)/2 * getScale() : 0);
}
int tx = location.x + offsetx;
int ty = location.y + offsety;
AffineTransform at = new AffineTransform();
at.translate(tx, ty);
// Rotated
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
at.rotate(Math.toRadians(-token.getFacing() - 90), location.scaledWidth/2 - (token.getAnchor().x*scale) - offsetx, location.scaledHeight/2 - (token.getAnchor().y*scale) - offsety); // facing defaults to down, or -90 degrees
}
// Draw the token
if (token.isSnapToScale()) {
at.scale((double) imgSize.width / workImage.getWidth(), (double) imgSize.height / workImage.getHeight());
at.scale(getScale(), getScale());
} else {
at.scale((double) scaledWidth / workImage.getWidth(), (double) scaledHeight / workImage.getHeight());
}
g.drawImage(workImage, at, this);
// Halo (SQUARE)
if (token.hasHalo() && token.getShape() == Token.TokenShape.SQUARE) {
Stroke oldStroke = g.getStroke();
g.setStroke(new BasicStroke(AppPreferences.getHaloLineWidth()));
g.setColor (token.getHaloColor());
g.drawRect(location.x, location.y, location.scaledWidth, location.scaledHeight);
g.setStroke(oldStroke);
}
g.setClip(clip);
// Facing ?
// TODO: Optimize this by doing it once per token per facing
if (token.hasFacing()) {
Token.TokenShape tokenType = token.getShape();
switch(tokenType) {
case CIRCLE:
Shape arrow = getCircleFacingArrow(token.getFacing(), footprintBounds.width/2);
int cx = location.x + location.scaledWidth/2;
int cy = location.y + location.scaledHeight/2;
g.translate(cx, cy);
g.setColor(Color.yellow);
g.fill(arrow);
g.setColor(Color.darkGray);
g.draw(arrow);
g.translate(-cx, -cy);
break;
case SQUARE:
int facing = token.getFacing();
arrow = getSquareFacingArrow(facing, footprintBounds.width/2);
cx = location.x + location.scaledWidth/2;
cy = location.y + location.scaledHeight/2;
// Find the edge of the image
int xp = location.scaledWidth/2;
int yp = location.scaledHeight/2;
if (facing >= 45 && facing <= 135 || facing <= -45 && facing >= -135) {
xp = (int)(yp / Math.tan(Math.toRadians(facing)));
if (facing < 0 ) {
xp = -xp;
yp = -yp;
}
} else {
yp = (int)(xp * Math.tan(Math.toRadians(facing)));
if (facing > 135 || facing < -135) {
xp = -xp;
yp = -yp;
}
}
cx += xp;
cy -= yp;
g.translate (cx, cy);
g.setColor(Color.yellow);
g.fill(arrow);
g.setColor(Color.darkGray);
g.draw(arrow);
g.translate(-cx, -cy);
break;
}
}
// Check for state
if (!token.getStatePropertyNames().isEmpty()) {
// Set up the graphics so that the overlay can just be painted.
clip = g.getClip();
AffineTransform transform = new AffineTransform();
transform.translate(location.x+g.getTransform().getTranslateX(), location.y+g.getTransform().getTranslateY());
if (token.hasFacing() && token.getShape() == Token.TokenShape.TOP_DOWN) {
transform.rotate(Math.toRadians(-token.getFacing() - 90), location.scaledWidth/2 - (token.getAnchor().x*scale), location.scaledHeight/2 - (token.getAnchor().y*scale)); // facing defaults to down, or -90 degrees
}
Graphics2D locg = (Graphics2D)g.create();
locg.setTransform(transform);
Rectangle bounds = new Rectangle(0, 0, location.scaledWidth, location.scaledHeight);
Rectangle overlayClip = g.getClipBounds().intersection(bounds);
locg.setClip(overlayClip);
// Check each of the set values
for (String state : token.getStatePropertyNames()) {
Object stateValue = token.getState (state);
// Check for the on/off states & paint them
if (stateValue instanceof Boolean && ((Boolean)stateValue).booleanValue()) {
TokenOverlay overlay = TokenStates.getOverlay(state);
if (overlay != null) overlay.paintOverlay(locg, token, bounds);
// Check for an overlay state value and paint that
} else if (stateValue instanceof TokenOverlay) {
((TokenOverlay)stateValue).paintOverlay(locg, token, bounds);
}
}
}
// DEBUGGING
// ScreenPoint tmpsp = ScreenPoint.fromZonePoint(this, new ZonePoint(token.getX(), token.getY()));
// g.setColor(Color.red);
// g.drawLine(tmpsp.x, 0, tmpsp.x, getSize().height);
// g.drawLine(0, tmpsp.y, getSize().width, tmpsp.y);
}
// Selection and labels
for (TokenLocation location : getTokenLocations(getActiveLayer())) {
Area bounds = location.bounds;
Rectangle origBounds = location.origBounds;
// TODO: This isn't entirely accurate as it doesn't account for the actual text
// to be in the clipping bounds, but I'll fix that later
if (!location.bounds.getBounds().intersects(clipBounds)) {
continue;
}
Token token = location.token;
boolean isSelected = selectedTokenSet.contains(token.getId());
if (isSelected) {
Rectangle footprintBounds = token.getBounds(zone);
ScreenPoint sp = ScreenPoint.fromZonePoint(this, footprintBounds.x, footprintBounds.y);
double width = footprintBounds.width * getScale();
double height = footprintBounds.height * getScale();
ImageBorder selectedBorder = token.isStamp() ? AppStyle.selectedStampBorder : AppStyle.selectedBorder;
// Border
if (token.hasFacing() && (token.getShape() == Token.TokenShape.TOP_DOWN || token.isStamp ())) {
AffineTransform oldTransform = g.getTransform();
// Rotated
g.translate(sp.x, sp.y);
g.rotate(Math.toRadians(-token.getFacing() - 90), width/2 - (token.getAnchor().x*scale), height/2 - (token.getAnchor().y*scale)); // facing defaults to down, or -90 degrees
selectedBorder.paintAround(g, 0, 0, (int)width, (int)height);
g.setTransform(oldTransform);
} else {
selectedBorder.paintAround(g, (int)sp.x, (int)sp.y, (int)width, (int)height);
}
}
// Name
if (AppState.isShowTokenNames() || isSelected || token == tokenUnderMouse) {
String name = token.getName();
if (view.isGMView () && token.getGMName() != null && token.getGMName().length() > 0) {
name += " (" + token.getGMName() + ")";
}
ImageLabel background = token.isVisible() ? token.getType() == Token.Type.NPC ? GraphicsUtil.BLUE_LABEL : GraphicsUtil.GREY_LABEL : GraphicsUtil.DARK_GREY_LABEL;
Color foreground = token.isVisible() ? token.getType() == Token.Type.NPC ? Color.white : Color.black : Color.white;
int offset = 10 + (isSelected ? 3 : 0);
GraphicsUtil.drawBoxedString(g, name, bounds.getBounds().x + bounds.getBounds ().width/2, bounds.getBounds().y + bounds.getBounds().height + offset, SwingUtilities.CENTER, background, foreground);
if (token.getLabel() != null && token.getLabel().trim().length() > 0) {
offset += 16 + (isSelected ? 3 : 0);
GraphicsUtil.drawBoxedString(g, token.getLabel(), bounds.getBounds().x + bounds.getBounds ().width/2, bounds.getBounds().y + bounds.getBounds().height + offset, SwingUtilities.CENTER, background, foreground);
}
}
}
// Stacks
Shape clip = g.getClipBounds();
if (!view.isGMView() && visibleArea != null) {
Area clipArea = new Area(clip);
clipArea.intersect(visibleArea);
g.setClip(clipArea);
}
for (Area rect : coveredTokenSet) {
BufferedImage stackImage = AppStyle.stackImage ;
g.drawImage(stackImage, rect.getBounds().x + rect.getBounds().width - stackImage.getWidth() + 2, rect.getBounds().y - 2, null);
}
// // Markers
// for (TokenLocation location : getMarkerLocations() ) {
// BufferedImage stackImage = AppStyle.markerImage;
// g.drawImage(stackImage, location.bounds.getBounds().x, location.bounds.getBounds().y, null);
// }
g.setClip(clip);
}
|
diff --git a/src/edu/drexel/psal/anonymouth/gooie/DriverEditor.java b/src/edu/drexel/psal/anonymouth/gooie/DriverEditor.java
index db86120..12a5cc1 100644
--- a/src/edu/drexel/psal/anonymouth/gooie/DriverEditor.java
+++ b/src/edu/drexel/psal/anonymouth/gooie/DriverEditor.java
@@ -1,1369 +1,1362 @@
package edu.drexel.psal.anonymouth.gooie;
import edu.drexel.psal.anonymouth.engine.Attribute;
import edu.drexel.psal.anonymouth.engine.DataAnalyzer;
import edu.drexel.psal.anonymouth.engine.DocumentMagician;
import edu.drexel.psal.anonymouth.engine.FeatureList;
import edu.drexel.psal.anonymouth.utils.ConsolidationStation;
import edu.drexel.psal.anonymouth.utils.IndexFinder;
import edu.drexel.psal.anonymouth.utils.TaggedDocument;
import edu.drexel.psal.anonymouth.utils.TaggedSentence;
import edu.drexel.psal.anonymouth.utils.Word;
import edu.drexel.psal.jstylo.generics.Logger;
import edu.drexel.psal.jstylo.generics.Logger.LogOut;
import edu.drexel.psal.jstylo.GUI.DocsTabDriver.ExtFilter;
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.BadLocationException;
import javax.swing.text.DefaultHighlighter;
import javax.swing.text.Highlighter;
import com.jgaap.generics.Document;
/**
* editorTabDriver does the work for the editorTab (Editor) in the main GUI (GUIMain)
* @author Andrew W.E. McDonald
* @author Marc Barrowclift
* @author Joe Muoio
*
*/
public class DriverEditor {
private final static String NAME = "( DriverEditor ) - ";
public static boolean isUsingNineFeatures = false;
protected static boolean hasBeenInitialized = false;
protected static String[] condensedSuggestions;
protected static int numEdits = 0;
protected static boolean isFirstRun = true;
protected static DataAnalyzer wizard;
private static DocumentMagician magician;
protected static String[] theFeatures;
protected static ArrayList<HighlightMapper> elementsToRemoveInSentence = new ArrayList<HighlightMapper>();
protected static ArrayList<HighlightMapper> selectedAddElements = new ArrayList<HighlightMapper>();
protected static ArrayList<HighlightMapper> selectedRemoveElements = new ArrayList<HighlightMapper>();
public static int resultsMaxIndex;
public static Object maxValue;
public static String chosenAuthor = "n/a";
protected static Attribute currentAttrib;
public static boolean hasCurrentAttrib = false;
public static boolean isWorkingOnUpdating = false;
// It seems redundant to have these next four variables, but they are used in slightly different ways, and are all necessary.
public static int currentCaretPosition = -1;
public static int startSelection = -1;
public static int oldStartSelection = -1;
public static int endSelection = -1;
public static int oldEndSelection = -1;
protected static int selectedIndexTP;
protected static int sizeOfCfd;
protected static boolean consoleDead = true;
protected static boolean dictDead = true;
protected static ArrayList<String> featuresInCfd;
protected static String selectedFeature;
protected static boolean shouldReset = false;
protected static boolean isCalcHist = false;
protected static ArrayList<FeatureList> noCalcHistFeatures;
protected static ArrayList<FeatureList> yesCalcHistFeatures;
protected static String searchBoxInputText;
public static Attribute[] attribs;
public static HashMap<FeatureList,Integer> attributesMappedByName;
public static HashMap<Integer,Integer> suggestionToAttributeMap;
protected static ConsolidationStation consolidator;
private static String cleanWordRegex=".*([\\.,!?])+";//REFINE THIS??
private static final Color HILIT_COLOR = new Color(255,0,0,100);//Color.yellow; //new Color(50, 161,227);// Color.blue;
protected static DefaultHighlighter.DefaultHighlightPainter painter = new DefaultHighlighter.DefaultHighlightPainter(new Color(255,255,0,128));
protected static DefaultHighlighter.DefaultHighlightPainter painterRemove = new DefaultHighlighter.DefaultHighlightPainter(HILIT_COLOR);
protected static DefaultHighlighter.DefaultHighlightPainter painterAdd = new DefaultHighlighter.DefaultHighlightPainter(new Color(0,255,0,128));
protected static Translation translator = new Translation();
public static TaggedDocument taggedDoc;
protected static Map<String, TaggedSentence> originals = new HashMap<String, TaggedSentence>();
protected static ArrayList<String> originalSents = new ArrayList<String>();
public static int currentSentNum = 0;
protected static int lastSentNum = -1;
protected static int sentToTranslate = 0;
public static int[] selectedSentIndexRange = new int[]{-2,-2};
protected static int[] lastSelectedSentIndexRange = new int[]{-3,-3};
protected static int lastCaretLocation = -1;
protected static int charsInserted = -1;
protected static int charsRemoved = -1;
protected static String currentSentenceString = "";
protected static Object currentHighlight = null;
protected static int ignoreNumActions = 0;
protected static int caretPositionPriorToCharInsertion = 0;
protected static int caretPositionPriorToCharRemoval = 0;
protected static int caretPositionPriorToAction = 0;
public static int[] oldSelectionInfo = new int[3];
protected static Map<String, int[]> wordsToRemove = new HashMap<String, int[]>();
protected static SuggestionCalculator suggestionCalculator;
protected static Boolean shouldUpdate = false;
protected static Boolean EOSPreviouslyRemoved = false;
protected static Boolean EOSesRemoved = false;
protected static Boolean changedCaret = false;
protected static String newLine = System.lineSeparator();
public static Boolean deleting = false;
protected static Boolean charsWereInserted = false;
protected static Boolean charsWereRemoved = false;
public static Boolean EOSJustRemoved = false;
public static int[] leftSentInfo = new int[0];
public static int[] rightSentInfo = new int[0];
private static boolean translate = false;
protected static ActionListener saveAsTestDoc;
protected static Object lock = new Object();
private static boolean wholeLastSentDeleted = false;
private static boolean wholeBeginningSentDeleted = false;
public static boolean skipDeletingEOSes = false;
public static boolean ignoreVersion = false;
public static TaggedDocument backedUpTaggedDoc;
public static int getCurrentSentNum(){
return currentSentNum;
}
protected static void doTranslations(ArrayList<TaggedSentence> sentences, GUIMain main)
{
GUIMain.GUITranslator.load(sentences);
}
protected static boolean checkSentFor(String currentSent, String str)
{
@SuppressWarnings("resource")
Scanner parser = new Scanner(currentSent);
boolean inSent = false;
String tempStr;
while(parser.hasNext())
{
tempStr = parser.next();
if(tempStr.matches(cleanWordRegex))
tempStr = tempStr.substring(0,tempStr.length()-1);
if(tempStr.equalsIgnoreCase(str))
{
inSent = true;
break;
}
}
return inSent;
}
/**
* Sets all the components within the editor inner tab spawner to disabled, except for the Process button.
* @param b boolean determining if the components are enabled or disabled
* @param main GUIMain object
*/
public static void setAllDocTabUseable(boolean b, GUIMain main) {
System.out.println("SETTING TO = " + b);
main.saveButton.setEnabled(b);
main.fileSaveTestDocMenuItem.setEnabled(b);
main.fileSaveAsTestDocMenuItem.setEnabled(b);
main.viewClustersMenuItem.setEnabled(b);
main.elementsToAddPane.setEnabled(b);
main.elementsToAddPane.setFocusable(b);
main.elementsToRemoveTable.setEnabled(b);
main.elementsToRemoveTable.setFocusable(b);
main.getDocumentPane().setEnabled(b);
main.clipboard.setEnabled(b);
if (b) {
if (PropertiesUtil.getDoTranslations()) {
main.resetTranslator.setEnabled(true);
} else {
main.resetTranslator.setEnabled(false);
}
}
}
/**
* Removes the sentence at index sentenceNumberToRemove in the current TaggedDocument, and replaces it with the sentenceToReplaceWith.
* Then, converts the updated TaggedDocument to a string, and puts the new version in the editor window.
* @param main
* @param sentenceNumberToRemove
* @param sentenceToReplaceWith
* @param shouldUpdate if true, it replaces the text in the JTextPane (documentPane) with the text in the TaggedDocument (taggedDoc).
*/
protected static void removeReplaceAndUpdate(GUIMain main, int sentenceNumberToRemove, String sentenceToReplaceWith, boolean shouldUpdate) {
taggedDoc.removeAndReplace(sentenceNumberToRemove, sentenceToReplaceWith);
System.out.println(" To Remove = \"" + taggedDoc.getSentenceNumber(sentenceNumberToRemove).getUntagged(false) + "\"");
System.out.println(" To Add = \"" + sentenceToReplaceWith + "\"");
/**
* We must do this AFTER creating the new tagged sentence so that the translations are attached to the most recent tagged sentence, not the old
* one that was replaced.
*/
if (translate) {
translate = false;
GUIMain.GUITranslator.replace(taggedDoc.getSentenceNumber(oldSelectionInfo[0]), originals.get(originalSents.get(oldSelectionInfo[0])));//new old
main.anonymityDrawingPanel.updateAnonymityBar();
originals.remove(originalSents.get(oldSelectionInfo[0]));
originals.put(taggedDoc.getSentenceNumber(oldSelectionInfo[0]).getUntagged(false), taggedDoc.getSentenceNumber(oldSelectionInfo[0]));
originalSents.remove(oldSelectionInfo[0]);
originalSents.add(taggedDoc.getSentenceNumber(oldSelectionInfo[0]).getUntagged(false));
SuggestionCalculator.placeSuggestions(main);
}
if (shouldUpdate) {
ignoreNumActions = 3;
main.getDocumentPane().setText(taggedDoc.getUntaggedDocument(false)); // NOTE should be false after testing!!!
main.getDocumentPane().getCaret().setDot(caretPositionPriorToAction);
main.getDocumentPane().setCaretPosition(caretPositionPriorToAction);
ignoreNumActions = 0;
}
int[] selectionInfo = calculateIndicesOfSentences(currentCaretPosition)[0];
currentSentNum = selectionInfo[0];
selectedSentIndexRange[0] = selectionInfo[1]; //start highlight
selectedSentIndexRange[1] = selectionInfo[2]; //end highlight
moveHighlight(main,selectedSentIndexRange);
main.anonymityDrawingPanel.updateAnonymityBar();
}
/**
* Does the same thing as <code>removeReplaceAndUpdate</code>, except it doesn't remove and replace.
* It simply updates the text editor box with the contents of <code>taggedDoc</code>,
* sets the caret to <code>caretPositionPriorToCharInsertion</code>,
* and moves the highlight the sentence that the caret has been moved to.
* @param main
* @param shouldUpdate
*/
public static void update(GUIMain main, Boolean shouldUpdate) {
if (shouldUpdate) {
ignoreNumActions = 3;
main.getDocumentPane().setText(taggedDoc.getUntaggedDocument(false));
main.getDocumentPane().getCaret().setDot(caretPositionPriorToCharInsertion);
main.getDocumentPane().setCaretPosition(caretPositionPriorToCharInsertion);
}
int[] selectionInfo = calculateIndicesOfSentences(caretPositionPriorToCharInsertion)[0];
currentSentNum = selectionInfo[0];
selectedSentIndexRange[0] = selectionInfo[1]; //start highlight
selectedSentIndexRange[1] = selectionInfo[2]; //end highlight
moveHighlight(main,selectedSentIndexRange);
main.anonymityDrawingPanel.updateAnonymityBar();
}
/**
* resets the highlight to a new start and end.
* @param main
* @param start
* @param end
*/
protected static void moveHighlight(final GUIMain main, int[] bounds) {
if (main.getDocumentPane().getCaret().getDot() != main.getDocumentPane().getCaret().getMark()) {
removeHighlightWordsToRemove(main);
main.getDocumentPane().getHighlighter().removeHighlight(currentHighlight);
return;
}
if (currentHighlight != null)
main.getDocumentPane().getHighlighter().removeHighlight(currentHighlight);
try {
System.out.printf("Moving highlight to %d to %d\n", bounds[0],bounds[1]);
if ((selectedSentIndexRange[0] != currentCaretPosition || currentSentNum == 0) || deleting) { //if the user is not selecting a sentence, don't highlight it.
if (main.getDocumentPane().getText().substring(bounds[0], bounds[0]+2).contains(newLine)) { // if the sentence is preceded by a newline, we need to modify this a bit
int temp = 0;
while (main.getDocumentPane().getText().substring(selectedSentIndexRange[0]+temp, selectedSentIndexRange[0]+1+temp).equals(newLine))
temp++;
if (selectedSentIndexRange[0]+temp <= currentCaretPosition) { //If the user is actually selecting the sentence
currentHighlight = main.getDocumentPane().getHighlighter().addHighlight(bounds[0]+temp, bounds[1], painter);
if (PropertiesUtil.getAutoHighlight())
highlightWordsToRemove(main, bounds[0]+temp, bounds[1]);
} else {
removeHighlightWordsToRemove(main);
}
} else {
int temp = 0;
//if (main.getDocumentPane().getText().substring(selectedSentIndexRange[0], selectedSentIndexRange[0]+1).equals(" "))
// temp++;
while (main.getDocumentPane().getText().substring(selectedSentIndexRange[0]+temp, selectedSentIndexRange[0]+1+temp).equals(" ")) //we want to not highlight whitespace before the actual sentence.
temp++;
if (selectedSentIndexRange[0]+temp <= currentCaretPosition || isFirstRun) {
currentHighlight = main.getDocumentPane().getHighlighter().addHighlight(bounds[0]+temp, bounds[1], painter);
if (PropertiesUtil.getAutoHighlight())
highlightWordsToRemove(main, bounds[0]+temp, bounds[1]);
} else {
removeHighlightWordsToRemove(main);
}
}
} else {
removeHighlightWordsToRemove(main);
}
} catch (BadLocationException err) {
err.printStackTrace();
}
synchronized(lock) {
lock.notify();
}
}
public static void removeHighlightWordsToRemove(GUIMain main) {
Highlighter highlight = main.getDocumentPane().getHighlighter();
int highlightedObjectsSize = DriverEditor.elementsToRemoveInSentence.size();
for (int i = 0; i < highlightedObjectsSize; i++)
highlight.removeHighlight(DriverEditor.elementsToRemoveInSentence.get(i).getHighlightedObject());
DriverEditor.elementsToRemoveInSentence.clear();
}
/**
* Automatically highlights words to remove in the currently highlighted sentence
* @param main
* @param start
* @param end
*/
public static void highlightWordsToRemove(GUIMain main, int start, int end) {
try {
Highlighter highlight = main.getDocumentPane().getHighlighter();
int highlightedObjectsSize = DriverEditor.elementsToRemoveInSentence.size();
for (int i = 0; i < highlightedObjectsSize; i++)
highlight.removeHighlight(DriverEditor.elementsToRemoveInSentence.get(i).getHighlightedObject());
DriverEditor.elementsToRemoveInSentence.clear();
ArrayList<int[]> index = new ArrayList<int[]>();
//If the "word to remove" is punctuation and in the form of "Remove ...'s" for example, we want
//to just extract the "..." for highlighting
String[] words = taggedDoc.getWordsInSentence(taggedDoc.getTaggedSentenceAtIndex(start+1)); //if we don't increment by one, it gets the previous sentence.
int sentenceSize = words.length;
int removeSize = main.elementsToRemoveTable.getRowCount();
for (int i = 0; i < sentenceSize; i++) {
for (int x = 0; x < removeSize; x++) {
String wordToRemove = (String)main.elementsToRemoveTable.getModel().getValueAt(x, 0);
String[] test = wordToRemove.split(" ");
if (test.length > 2) {
wordToRemove = test[1].substring(0, test.length-2);
}
if (words[i].equals(wordToRemove)) {
index.addAll(IndexFinder.findIndicesInSection(main.getDocumentPane().getText(), wordToRemove, start, end));
}
}
}
int indexSize = index.size();
for (int i = 0; i < indexSize; i++)
DriverEditor.elementsToRemoveInSentence.add(new HighlightMapper(index.get(i)[0], index.get(i)[1], highlight.addHighlight(index.get(i)[0], index.get(i)[1], DriverEditor.painterRemove)));
} catch (Exception e1) {
Logger.logln(NAME+"Error occured while getting selected word to remove value and highlighting all instances.", LogOut.STDERR);
}
}
/**
* Calcualtes the selected sentence number (index in TaggedDocument taggedDoc), start of that sentence in the documentPane, and end of the sentence in the documentPane.
* Returns all three values in an int array.
* @param currentCaretPosition the positions in the document to return sentence indices for
* @return a 2d int array such that each row is an array such that: index 0 is the sentence index, index 1 is the beginning of the sentence (w.r.t. the whole document in the editor), and index 2 is the end of the sentence.
* {sentenceNumber, startHighlight, endHighlight} (where start and end Highlight are the starting and ending indices of the selected sentence). The rows correspond to the order of the input indices
*
* If 'currentCaretPosition' is past the end of the document (greater than the number of characters in the document), then "null" will be returned.
*/
public static int[][] calculateIndicesOfSentences(int ... positions){
// get the lengths of each of the sentences
int[] sentenceLengths = taggedDoc.getSentenceLengths();
int numSents = sentenceLengths.length;
int positionNumber;
int numPositions = positions.length;
int currentPosition;
int[][] results = new int[numPositions][3];
for (positionNumber = 0; positionNumber < numPositions; positionNumber++) {
int i = 0;
int lengthSoFar = 0;
int[] lengthTriangle = new int[numSents]; // index '0' will be the length of sentence 0, index '1' will be the length of sentence '0' plus sentence '1', index '2' will be the lengths of the first three sentences added together, and so on.
int selectedSentence = 0;
currentPosition = positions[positionNumber];
if (currentPosition > 0) {
while (lengthSoFar <= currentPosition && i < numSents) { //used to be i <= numSents, but since the sentence indexes are 0 based, it should be i < numSents
lengthSoFar += sentenceLengths[i];
lengthTriangle[i] = lengthSoFar;
i++;
}
selectedSentence = i - 1;// after exiting the loop, 'i' will be one greater than we want it to be.
}
int startHighlight = 0;
int endHighlight = 0;
if (selectedSentence >= numSents)
return null; // don't do anything.
else if (selectedSentence <= 0)
endHighlight = sentenceLengths[0];
else {
startHighlight = lengthTriangle[selectedSentence-1]; // start highlighting JUST after the previous sentence stops
endHighlight = lengthTriangle[selectedSentence]; // stop highlighting when the current sentence stops.
}
results[positionNumber] = new int[]{selectedSentence, startHighlight, endHighlight};
}
//Checking to see if the user's deletion includes deleting a whole sentence at both the end of their selection and the beginning of their selection.
//This is because we need to handle the deletion process different depending on which one is true or false.
if (results.length > 1) {
if ((results[1][0] - results[0][0]) >= 4 && (results[1][2] == oldStartSelection + (results[1][2] - results[1][1]) || results[1][2] == oldEndSelection + (results[1][2] - results[1][1])))
wholeLastSentDeleted = true;
if (results[1][0] - results[0][0] >= 4 && (results[0][2] == oldStartSelection + (results[0][2] - results[0][1]) || results[0][2] == oldEndSelection + (results[0][2] - results[0][1])))
wholeBeginningSentDeleted = true;
}
return results;
}
private static void displayEditInfo(DocumentEvent e) {
javax.swing.text.Document document = (javax.swing.text.Document) e.getDocument();
int changeLength = e.getLength();
System.out.println(e.getType().toString() + ": " + changeLength + " character(s). Text length = " + document.getLength() + ".");
}
protected static void initListeners(final GUIMain main) {
/***********************************************************************************************************************************************
*############################################################################################################*
*########################################### BEGIN EDITING HANDLERS ###########################################*
*############################################################################################################*
***********************************************************************************************************************************************/
suggestionCalculator = new SuggestionCalculator();
main.getDocumentPane().addCaretListener(new CaretListener() {
@Override
public void caretUpdate(CaretEvent e) {
System.out.println("======================================================================================");
if (ignoreNumActions > 0) {
charsInserted = 0;
charsWereRemoved = false;
charsWereInserted = false;
charsRemoved = 0;
ignoreNumActions--;
} else if (taggedDoc != null) { //main.documentPane.getText().length() != 0
boolean setSelectionInfoAndHighlight = true;
startSelection = e.getDot();
endSelection = e.getMark();
currentCaretPosition = startSelection;
int[] currentSentSelectionInfo = null;
caretPositionPriorToCharInsertion = currentCaretPosition - charsInserted;
caretPositionPriorToCharRemoval = currentCaretPosition + charsRemoved;
if (charsRemoved > 0) {
caretPositionPriorToAction = caretPositionPriorToCharRemoval;
// update the EOSTracker, and from the value that it returns we can tell if sentences are being merged (EOS characters are being erased)
/**
* We must subtract all the indices by 1 because the InputFilter indices refuses to work with anything other than - 1, and as such
* the indices here and in TaggedDocument must be adjustest as well.
*/
if (skipDeletingEOSes) {
skipDeletingEOSes = false;
} else {
EOSJustRemoved = taggedDoc.specialCharTracker.removeEOSesInRange( currentCaretPosition-1, caretPositionPriorToCharRemoval-1);
}
if (EOSJustRemoved) {
try {
// note that 'currentCaretPosition' will always be less than 'caretPositionPriorToCharRemoval' if characters were removed!
int[][] activatedSentenceInfo = calculateIndicesOfSentences(currentCaretPosition, caretPositionPriorToCharRemoval);
int i;
int j = 0;
leftSentInfo = activatedSentenceInfo[0];
rightSentInfo = activatedSentenceInfo[1];
if (rightSentInfo[0] != leftSentInfo[0]) {
int numToDelete = rightSentInfo[0] - (leftSentInfo[0]+1); // add '1' because we don't want to count the lower bound (e.g. if midway through sentence '6' down to midway through sentence '3' was deleted, we want to delete "6 - (3+1) = 2" TaggedSentences.
int[] taggedSentsToDelete;
// Now we list the indices of sentences that need to be removed, which are the ones between the left and right sentence (though not including either the left or the right sentence).
if (wholeLastSentDeleted) {
//We want to ignore the rightmost sentence from our deletion process since we didn't actually delete anything from it.
taggedSentsToDelete = new int[numToDelete-1];
for (i = (leftSentInfo[0] + 1); i < rightSentInfo[0]-1; i++) {
taggedSentsToDelete[j] = leftSentInfo[0] + 1;
j++;
}
} else {
//We want to include the rightmost sentence in our deletion process since we are partially deleting some of it.
taggedSentsToDelete = new int[numToDelete];
for (i = (leftSentInfo[0] + 1); i < rightSentInfo[0]; i++) {
taggedSentsToDelete[j] = leftSentInfo[0] + 1;
j++;
}
}
//First delete every sentence the user has deleted wholly (there's no extra concatenation or tricks, just delete).
taggedDoc.removeTaggedSentences(taggedSentsToDelete);
System.out.println(NAME+"Ending whole sentence deletion, now handling left and right (if available) deletion");
// Then read the remaining strings from "left" and "right" sentence:
// for left: read from 'leftSentInfo[1]' (the beginning of the sentence) to 'currentCaretPosition' (where the "sentence" now ends)
// for right: read from 'caretPositionPriorToCharRemoval' (where the "sentence" now begins) to 'rightSentInfo[2]' (the end of the sentence)
// Once we have the string, we call removeAndReplace, once for each sentence (String)
String docText = main.getDocumentPane().getText();
String leftSentCurrent = docText.substring(leftSentInfo[1],currentCaretPosition);
taggedDoc.removeAndReplace(leftSentInfo[0], leftSentCurrent);
//Needed so that we don't delete more than we should if that be the case
//TODO integrate this better with wholeLastSentDeleted and wholeBeginningSentDeleted so it's cleaner, right now this is pretty sloppy and confusing
if (TaggedDocument.userDeletedSentence) {
rightSentInfo[0] = rightSentInfo[0]-1;
}
String rightSentCurrent = docText.substring((caretPositionPriorToCharRemoval-charsRemoved), (rightSentInfo[2]-charsRemoved));//we need to shift our indices over by the number of characters removed.
if (wholeLastSentDeleted && wholeBeginningSentDeleted) {
wholeLastSentDeleted = false;
wholeBeginningSentDeleted = false;
taggedDoc.removeAndReplace(leftSentInfo[0], "");
} else if (wholeLastSentDeleted && !wholeBeginningSentDeleted) {
wholeLastSentDeleted = false;
taggedDoc.removeAndReplace(leftSentInfo[0]+1, "");
taggedDoc.concatRemoveAndReplace(taggedDoc.getTaggedDocument().get(leftSentInfo[0]),leftSentInfo[0], taggedDoc.getTaggedDocument().get(leftSentInfo[0]+1), leftSentInfo[0]+1);
} else {
try {
taggedDoc.removeAndReplace(leftSentInfo[0]+1, rightSentCurrent);
taggedDoc.concatRemoveAndReplace(taggedDoc.getTaggedDocument().get(leftSentInfo[0]),leftSentInfo[0], taggedDoc.getTaggedDocument().get(leftSentInfo[0]+1), leftSentInfo[0]+1);
} catch (Exception e1) {
taggedDoc.removeAndReplace(leftSentInfo[0], rightSentCurrent);
}
}
// Now that we have internally gotten rid of the parts of left and right sentence that no longer exist in the editor box, we merge those two sentences so that they become a single TaggedSentence.
TaggedDocument.userDeletedSentence = false;
}
} catch (Exception e1) {
Logger.logln(NAME+"Error occured while attempting to delete an EOS character.", LogOut.STDERR);
Logger.logln(NAME+"-> leftSentInfo", LogOut.STDERR);
if (leftSentInfo != null) {
for (int i = 0; i < leftSentInfo.length; i++)
Logger.logln(NAME+"\tleftSentInfo["+i+"] = " + leftSentInfo[i], LogOut.STDERR);
} else {
Logger.logln(NAME+"\tleftSentInfo was null!", LogOut.STDERR);
}
Logger.logln(NAME+"-> rightSentInfo", LogOut.STDERR);
if (rightSentInfo != null) {
for (int i = 0; i < leftSentInfo.length; i++)
Logger.logln(NAME+"\rightSentInfo["+i+"] = " + rightSentInfo[i], LogOut.STDERR);
} else {
Logger.logln(NAME+"\rightSentInfo was null!", LogOut.STDERR);
}
Logger.logln(NAME+"->Document Text (What the user sees)", LogOut.STDERR);
Logger.logln(NAME+"\t" + main.getDocumentPane().getText(), LogOut.STDERR);
Logger.logln(NAME+"->Tagged Document Text (The Backend)", LogOut.STDERR);
int size = taggedDoc.getNumSentences();
for (int i = 0; i < size; i++) {
Logger.logln(NAME+"\t" + taggedDoc.getUntaggedSentences(false).get(i));
}
ErrorHandler.editorError("Editor Failure", "Anonymouth has encountered an internal problem\nprocessing your most recent action.\n\nWe are aware of and working on the issue,\nand we apologize for any inconvenience.");
return;
}
// now update the EOSTracker
taggedDoc.specialCharTracker.shiftAllEOSChars(false, caretPositionPriorToCharRemoval, charsRemoved);
// Then update the currentSentSelectionInfo, and fix variables
currentSentSelectionInfo = calculateIndicesOfSentences(currentCaretPosition)[0];
currentSentNum = currentSentSelectionInfo[0];
selectedSentIndexRange[0] = currentSentSelectionInfo[1];
selectedSentIndexRange[1] = currentSentSelectionInfo[2];
// Now set the number of characters removed to zero because the action has been dealt with, and we don't want the statement further down to execute and screw up our indices.
charsRemoved = 0;
EOSJustRemoved = false;
} else {
// update the EOSTracker
taggedDoc.specialCharTracker.shiftAllEOSChars(false, caretPositionPriorToAction, charsRemoved);
}
} else if (charsInserted > 0) {
caretPositionPriorToAction = caretPositionPriorToCharInsertion;
// update the EOSTracker. First shift the current EOS objects, and then create a new one
taggedDoc.specialCharTracker.shiftAllEOSChars(true, caretPositionPriorToAction, charsInserted);
} else {
caretPositionPriorToAction = currentCaretPosition;
}
// Then update the selection information so that when we move the highlight, it highlights "both" sentences (well, what used to be both sentences, but is now a single sentence)
try {
//Try-catch in place just in case the user tried clicking on an area that does not contain sentences.
currentSentSelectionInfo = calculateIndicesOfSentences(currentCaretPosition)[0];
} catch (ArrayIndexOutOfBoundsException exception) {
return;
}
if (currentSentSelectionInfo == null)
return; // don't do anything.
lastSentNum = currentSentNum;
currentSentNum = currentSentSelectionInfo[0];
boolean inRange = false;
//check to see if the current caret location is within the selectedSentIndexRange ([0] is min, [1] is max)
if ( caretPositionPriorToAction >= selectedSentIndexRange[0] && caretPositionPriorToAction < selectedSentIndexRange[1]) {
inRange = true;
// Caret is inside range of presently selected sentence.
// update from previous caret
if (charsInserted > 0 ) {// && lastSentNum != -1){
selectedSentIndexRange[1] += charsInserted;
charsInserted = ~-1; // puzzle: what does this mean? (scroll to bottom of file for answer) - AweM
charsWereInserted = true;
charsWereRemoved = false;
} else if (charsRemoved > 0) {// && lastSentNum != -1){
selectedSentIndexRange[1] -= charsRemoved;
charsRemoved = 0;
charsWereRemoved = true;
charsWereInserted = false;
}
} else if (!isFirstRun) {
/**
* Yet another thing that seems somewhat goofy but serves a distinct and important purpose. Since we're supposed to wait in InputFilter
* when the user types an EOS character since they may type more and we're not sure yet if they are actually done with the sentence, nothing
* will be removed, replaced, or updated until we have confirmation that it's the end of the sentence. This means that if they click/move away from the
* sentence after typing a period INSTEAD of finishing the sentence with a space or continuing the EOS characters, the sentence replacement will get
* all screwed up. This is to ensure that no matter what, when a sentence is created and we know it's a sentence it gets processed.
*/
if (changedCaret && InputFilter.isEOS) {
InputFilter.isEOS = false;
changedCaret = false;
shouldUpdate = true;
/**
* Exists for the sole purpose of pushing a sentence that has been edited and finished to the appropriate place in
* The Translation.java class so that it can be promptly translated. This will ONLY happen when the user has clicked
* away from the sentence they were editing to work on another one (the reason behind this being we don't want to be
* constantly pushing now sentences to be translated is the user's immediately going to replace them again, we only
* want to translate completed sentences).
*/
if (!originals.keySet().contains(main.getDocumentPane().getText().substring(selectedSentIndexRange[0],selectedSentIndexRange[1])))
translate = true;
}
}
// selectionInfo is an int array with 3 values: {selectedSentNum, startHighlight, endHighlight}
// xxx todo xxx get rid of this check (if possible... BEI sets the selectedSentIndexRange)....
if (isFirstRun) { //NOTE needed a way to make sure that the very first time a sentence is clicked (, we didn't break stuff... this may not be the best way...
isFirstRun = false;
} else {
lastSelectedSentIndexRange[0] = selectedSentIndexRange[0];
lastSelectedSentIndexRange[1] = selectedSentIndexRange[1];
currentSentenceString = main.getDocumentPane().getText().substring(lastSelectedSentIndexRange[0],lastSelectedSentIndexRange[1]);
if (!taggedDoc.getSentenceNumber(lastSentNum).getUntagged(false).equals(currentSentenceString)) {
main.anonymityDrawingPanel.updateAnonymityBar();
setSelectionInfoAndHighlight = false;
GUIMain.saved = false;
}
if ((currentCaretPosition-1 != lastCaretLocation && !charsWereRemoved && charsWereInserted) || (currentCaretPosition != lastCaretLocation-1) && !charsWereInserted && charsWereRemoved) {
charsWereInserted = false;
charsWereRemoved = false;
shouldUpdate = true;
/**
* Exists for the sole purpose of pushing a sentence that has been edited and finished to the appropriate place in
* The Translation.java class so that it can be promptly translated. This will ONLY happen when the user has clicked
* away from the sentence they were editing to work on another one (the reason behind this being we don't want to be
* constantly pushing now sentences to be translated is the user's immediately going to replace them again, we only
* want to translate completed sentences).
*/
if (!originals.keySet().contains(main.getDocumentPane().getText().substring(selectedSentIndexRange[0],selectedSentIndexRange[1])))
translate = true;
}
}
if (setSelectionInfoAndHighlight) {
currentSentSelectionInfo = calculateIndicesOfSentences(caretPositionPriorToAction)[0];
selectedSentIndexRange[0] = currentSentSelectionInfo[1]; //start highlight
selectedSentIndexRange[1] = currentSentSelectionInfo[2]; //end highlight
moveHighlight(main, selectedSentIndexRange);
}
lastCaretLocation = currentCaretPosition;
sentToTranslate = currentSentNum;
if (!inRange) {
if (shouldUpdate && !ignoreVersion) {
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
main.versionControl.addVersion(backedUpTaggedDoc, oldStartSelection);
}
DriverTranslationsTab.showTranslations(taggedDoc.getSentenceNumber(sentToTranslate));
}
if (shouldUpdate) {
shouldUpdate = false;
GUIMain.saved = false;
removeReplaceAndUpdate(main, lastSentNum, currentSentenceString, false);
}
oldSelectionInfo = currentSentSelectionInfo;
oldStartSelection = startSelection;
oldEndSelection = endSelection;
}
}
});
/**
* Key listener for the documentPane. Allows tracking the cursor while typing to make sure that indices of sentence start and ends
*/
main.getDocumentPane().addKeyListener(new KeyListener() {
@Override
public void keyPressed(KeyEvent arg0) {
if (arg0.getKeyCode() == KeyEvent.VK_RIGHT ||
arg0.getKeyCode() == KeyEvent.VK_LEFT ||
arg0.getKeyCode() == KeyEvent.VK_UP ||
arg0.getKeyCode() == KeyEvent.VK_DOWN) {
changedCaret = true;
main.clipboard.setEnabled(false, false, true);
}
if (arg0.getKeyCode() == KeyEvent.VK_BACK_SPACE)
deleting = true;
else
deleting = false;
}
@Override
public void keyReleased(KeyEvent arg0) {}
@Override
public void keyTyped(KeyEvent arg0) {}
});
main.getDocumentPane().getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
if (!GUIMain.processed){
return;
}
charsInserted = e.getLength();
if (main.versionControl.isUndoEmpty() && GUIMain.processed && !ignoreVersion) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
if (ignoreVersion) {
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
return;
}
if (e.getLength() > 1) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
} else {
if (InputFilter.shouldBackup) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset()+1);
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
}
}
@Override
public void removeUpdate(DocumentEvent e) {
if (!GUIMain.processed) {
return;
}
if (InputFilter.ignoreDeletion)
InputFilter.ignoreDeletion = false;
else
charsRemoved = e.getLength();
if (main.versionControl.isUndoEmpty() && GUIMain.processed && !ignoreVersion) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
System.out.println(ignoreVersion);
System.out.println(GUIMain.processed);
if (ignoreVersion) {
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
return;
}
if (e.getLength() > 1) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
} else {
if (InputFilter.shouldBackup) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
}
}
@Override
public void changedUpdate(DocumentEvent e) {
DriverEditor.displayEditInfo(e);
}
});
main.getDocumentPane().addMouseListener(new MouseListener() {
@Override
public void mouseClicked(MouseEvent me) {
}
@Override
public void mousePressed(MouseEvent me) {
}
@Override
public void mouseReleased(MouseEvent me) {
changedCaret = true;
deleting = false;
if (main.getDocumentPane().getCaret().getDot() == main.getDocumentPane().getCaret().getMark())
main.clipboard.setEnabled(false, false, true);
else
main.clipboard.setEnabled(true);
}
@Override
public void mouseEntered(MouseEvent me) {
}
@Override
public void mouseExited(MouseEvent me) {
}
});
/***********************************************************************************************************************************************
*############################################################################################################*
*########################################### END EDITING HANDLERS ########################################### *
*############################################################################################################*
************************************************************************************************************************************************/
/**
* ActionListener for process button (bar).
*/
main.processButton.addActionListener(new ActionListener() {
@Override
public synchronized void actionPerformed(ActionEvent event) {
// ----- check if all requirements for processing are met
String errorMessage = "Oops! Found errors that must be taken care of prior to processing!\n\nErrors found:\n";
if (!main.mainDocReady())
errorMessage += "<html>• Main document not provided.</html>\n";
if (!main.sampleDocsReady())
errorMessage += "<html>• Sample documents not provided.</html>\n";
if (!main.trainDocsReady())
errorMessage += "<html>• Train documents not provided.</html>\n";
if (!main.featuresAreReady())
errorMessage += "<html>• Feature set not chosen.</html>\n";
if (!main.classifiersAreReady())
errorMessage += "<html>• Classifier not chosen.</html>\n";
if (!main.hasAtLeastThreeOtherAuthors())
errorMessage += "<html>• You must have at least 3 other authors.</html>";
System.out.println("BEFORE IF");
// ----- display error message if there are errors
if (errorMessage != "Oops! Found errors that must be taken care of prior to processing!\n\nErrors found:\n") {
- System.out.println("SHOULD NOT HAVE EXECUTED");
JOptionPane.showMessageDialog(main, errorMessage, "Configuration Error!",
JOptionPane.ERROR_MESSAGE);
} else {
- System.out.println("THE SHOULD EXECUTE");
main.leftTabPane.setSelectedIndex(0);
// ----- confirm they want to process
if (true) {// ---- can be a confirm dialog to make sure they want to process.
setAllDocTabUseable(false, main);
- System.out.println("Doc tab useable");
- System.out.println("isFirstRun = " + isFirstRun);
- System.out.println("taggedDoc = " + taggedDoc);
// ----- if this is the first run, do everything that needs to be ran the first time
if (taggedDoc == null) {
- System.out.println("ERROR, SHOULD NOT RUN");
// ----- create the main document and add it to the appropriate array list.
// ----- may not need the arraylist in the future since you only really can have one at a time
TaggedDocument taggedDocument = new TaggedDocument();
ConsolidationStation.toModifyTaggedDocs=new ArrayList<TaggedDocument>();
ConsolidationStation.toModifyTaggedDocs.add(taggedDocument);
taggedDoc = ConsolidationStation.toModifyTaggedDocs.get(0);
Logger.logln(NAME+"Initial processing starting...");
// initialize all arraylists needed for feature processing
sizeOfCfd = main.cfd.numOfFeatureDrivers();
featuresInCfd = new ArrayList<String>(sizeOfCfd);
noCalcHistFeatures = new ArrayList<FeatureList>(sizeOfCfd);
yesCalcHistFeatures = new ArrayList<FeatureList>(sizeOfCfd);
for(int i = 0; i < sizeOfCfd; i++) {
String theName = main.cfd.featureDriverAt(i).getName();
// capitalize the name and replace all " " and "-" with "_"
theName = theName.replaceAll("[ -]","_").toUpperCase();
if(isCalcHist == false) {
isCalcHist = main.cfd.featureDriverAt(i).isCalcHist();
yesCalcHistFeatures.add(FeatureList.valueOf(theName));
} else {
// these values will go in suggestion list... PLUS any
noCalcHistFeatures.add(FeatureList.valueOf(theName));
}
featuresInCfd.add(i,theName);
}
wizard = new DataAnalyzer(main.ps);
magician = new DocumentMagician(false);
} else {
- System.out.println("ELSE, SHOULD RUN");
isFirstRun = false;
//TODO ASK ANDREW: Should we erase the user's "this is a single sentence" actions upon reprocessing? Only only when they reset the highlighter?
taggedDoc.specialCharTracker.resetEOSCharacters();
taggedDoc = new TaggedDocument(main.getDocumentPane().getText());
Logger.logln(NAME+"Repeat processing starting....");
resetAll(main);
}
main.getDocumentPane().getHighlighter().removeAllHighlights();
elementsToRemoveInSentence.clear();
selectedAddElements.clear();
selectedRemoveElements.clear();
Logger.logln(NAME+"calling backendInterface for preTargetSelectionProcessing");
BackendInterface.preTargetSelectionProcessing(main,wizard,magician);
}
}
}
});
saveAsTestDoc = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Logger.logln(NAME+"Save As document button clicked.");
JFileChooser save = new JFileChooser();
save.setSelectedFile(new File("anonymizedDoc.txt"));
save.addChoosableFileFilter(new ExtFilter("txt files (*.txt)", "txt"));
int answer = save.showSaveDialog(main);
if (answer == JFileChooser.APPROVE_OPTION) {
File f = save.getSelectedFile();
String path = f.getAbsolutePath();
if (!path.toLowerCase().endsWith(".txt"))
path += ".txt";
try {
BufferedWriter bw = new BufferedWriter(new FileWriter(path));
bw.write(main.getDocumentPane().getText());
bw.flush();
bw.close();
Logger.log("Saved contents of current tab to "+path);
GUIMain.saved = true;
} catch (IOException exc) {
Logger.logln(NAME+"Failed opening "+path+" for writing",LogOut.STDERR);
Logger.logln(NAME+exc.toString(),LogOut.STDERR);
JOptionPane.showMessageDialog(null,
"Failed saving contents of current tab into:\n"+path,
"Save Problem Set Failure",
JOptionPane.ERROR_MESSAGE);
}
} else
Logger.logln(NAME+"Save As contents of current tab canceled");
}
};
main.saveButton.addActionListener(saveAsTestDoc);
}
/**
* Resets everything to their default values, to be used before reprocessing
* @param main - An instance of GUIMain
*/
public static void resetAll(GUIMain main) {
reset();
GUIMain.GUITranslator.reset();
DriverTranslationsTab.reset();
main.versionControl.reset();
main.anonymityDrawingPanel.reset();
main.resultsWindow.reset();
GUIUpdateInterface.updateResultsPrepColor(main);
main.elementsToRemoveTable.removeAllElements();
main.elementsToRemoveModel.addRow(new String[] {"Re-processing, please wait", ""});
main.elementsToAdd.removeAllElements();
main.elementsToAdd.add(0, "Re-processing, please wait");
}
public static void reset() {
currentCaretPosition = 0;
startSelection = -1;
endSelection = -1;
noCalcHistFeatures.clear();
yesCalcHistFeatures.clear();
originals.clear();
originalSents.clear();
currentSentNum = 0;
lastSentNum = -1;
sentToTranslate = 0;
selectedSentIndexRange = new int[]{-2,-2};
lastSelectedSentIndexRange = new int[]{-3,-3};
lastCaretLocation = -1;
charsInserted = -1;
charsRemoved = -1;
currentSentenceString = "";
ignoreNumActions = 0;
caretPositionPriorToCharInsertion = 0;
caretPositionPriorToCharRemoval = 0;
caretPositionPriorToAction = 0;
oldSelectionInfo = new int[3];
wordsToRemove.clear();
}
public static void save(GUIMain main) {
Logger.logln(NAME+"Save document button clicked.");
String path = main.ps.getTestDocs().get(0).getFilePath();
try {
BufferedWriter bw = new BufferedWriter(new FileWriter(path));
bw.write(main.getDocumentPane().getText());
bw.flush();
bw.close();
Logger.log("Saved contents of document to "+path);
GUIMain.saved = true;
} catch (IOException exc) {
Logger.logln(NAME+"Failed opening "+path+" for writing",LogOut.STDERR);
Logger.logln(NAME+exc.toString(),LogOut.STDERR);
JOptionPane.showMessageDialog(null,
"Failed saving contents of current tab into:\n"+path,
"Save Problem Set Failure",
JOptionPane.ERROR_MESSAGE);
}
}
public static int getSelection(JOptionPane oPane){
Object selectedValue = oPane.getValue();
if(selectedValue != null){
Object options[] = oPane.getOptions();
if (options == null){
return ((Integer) selectedValue).intValue();
}
else{
int i;
int j;
for(i=0, j= options.length; i<j;i++){
if(options[i].equals(selectedValue))
return i;
}
}
}
return 0;
}
public static void setSuggestions() {
SuggestionCalculator.placeSuggestions(GUIMain.inst);
}
}
class TheHighlighter extends DefaultHighlighter.DefaultHighlightPainter{
public TheHighlighter(Color color){
super(color);
}
}
class SuggestionCalculator {
private final static String PUNCTUATION = "?!,.\"`'";
private final static String CLEANWORD=".*([\\.,!?])+";
private static DocumentMagician magician;
protected static Highlighter editTracker;
protected static ArrayList<String[]> topToRemove;
protected static ArrayList<String> topToAdd;
public static void init(DocumentMagician magician) {
SuggestionCalculator.magician = magician;
}
/*
* Highlights the sentence that is currently in the editor box in the main document
* no return
*/
protected static void placeSuggestions(GUIMain main) {
//We must first clear any existing highlights the user has and remove all existing suggestions
Highlighter highlight = main.getDocumentPane().getHighlighter();
int highlightedObjectsSize = DriverEditor.selectedAddElements.size();
for (int i = 0; i < highlightedObjectsSize; i++)
highlight.removeHighlight(DriverEditor.selectedAddElements.get(i).getHighlightedObject());
DriverEditor.selectedAddElements.clear();
highlightedObjectsSize = DriverEditor.selectedRemoveElements.size();
for (int i = 0; i < highlightedObjectsSize; i++)
highlight.removeHighlight(DriverEditor.selectedRemoveElements.get(i).getHighlightedObject());
DriverEditor.selectedRemoveElements.clear();
//If the user had a word highlighted and we're updating the list, we want to keep the word highlighted if it's in the updated list
String prevSelectedElement = "";
if (main.elementsToAddPane.getSelectedValue() != null)
prevSelectedElement = main.elementsToAddPane.getSelectedValue();
if (main.elementsToRemoveTable.getSelectedRow() != -1)
prevSelectedElement = (String)main.elementsToRemoveTable.getModel().getValueAt(main.elementsToRemoveTable.getSelectedRow(), 0);
if (main.elementsToRemoveTable.getRowCount() > 0)
main.elementsToRemoveTable.removeAllElements();
if (main.elementsToAdd.getSize() > 0)
main.elementsToAdd.removeAllElements();
//Adding new suggestions
List<Document> documents = magician.getDocumentSets().get(1); //all the user's sample documents (written by them)
documents.add(magician.getDocumentSets().get(2).get(0)); //we also want to count the user's test document
topToRemove = ConsolidationStation.getPriorityWordsAndOccurances(documents, true, .1);
topToAdd = ConsolidationStation.getPriorityWords(ConsolidationStation.authorSampleTaggedDocs, false, 1);
ArrayList<String> sentences = DriverEditor.taggedDoc.getUntaggedSentences(false);
int sentNum = DriverEditor.getCurrentSentNum();
String sentence = sentences.get(sentNum);
int arrSize = topToRemove.size();
// String setString = "";
// int fromIndex = 0;
String tempString;
// ArrayList<Integer> tempArray;
// int indexOfTemp;
for (int i = 0; i < arrSize; i++) {//loops through top to remove list
// setString += topToRemove.get(i) + "\n";//sets the string to return
@SuppressWarnings("resource")
Scanner parser = new Scanner(sentence);
// fromIndex = 0;
while (parser.hasNext()) {//finds if the given word to remove is in the current sentence
//loops through current sentence
tempString = parser.next();
if (tempString.matches(CLEANWORD)) {//TODO: refine this.
tempString=tempString.substring(0,tempString.length()-1);
//Logger.logln("replaced a period in: "+tempString);
}
// if (tempString.equals(topToRemove.get(i))) {
// tempArray = new ArrayList<Integer>(2);
//
// indexOfTemp = sentence.indexOf(tempString, fromIndex);
// tempArray.add(indexOfTemp + startHighlight);//-numberTimesFixTabs
// tempArray.add(indexOfTemp+tempString.length() + startHighlight);
//
// added = false;
// for(int j=0;j<indexArray.size();j++){
// if(indexArray.get(j).get(0)>tempArray.get(0)){
// indexArray.add(j,tempArray);
// added=true;
// break;
// }
// }
// if(!added)
// indexArray.add(tempArray);
// //fromIndex=tempArray.get(1);
// }
// fromIndex+=tempString.length()+1;
}
if (!topToRemove.get(i).equals("''") && !topToRemove.get(i).equals("``")) {
String left, right;
//The element to remove
if (PUNCTUATION.contains(topToRemove.get(i)[0].trim()))
left = "Reduce " + topToRemove.get(i)[0] + "'s";
else
left = topToRemove.get(i)[0];
//The number of occurrences
if (topToRemove.get(i)[1].equals("0"))
right = "None";
else if (topToRemove.get(i)[1].equals("1"))
right = "1 time";
else
right = topToRemove.get(i)[1] + " times";
main.elementsToRemoveModel.insertRow(i, new String[] {left, right});
if (topToRemove.get(i)[0].trim().equals(prevSelectedElement)) {
main.elementsToRemoveTable.setRowSelectionInterval(i, i);
}
}
}
//main.elementsToRemoveTable.clearSelection();
main.elementsToAdd.removeAllElements();
arrSize = topToAdd.size();
for (int i=0;i<arrSize;i++) {
main.elementsToAdd.add(i, topToAdd.get(i));
if (topToAdd.get(i).equals(prevSelectedElement)) {
main.elementsToAddPane.setSelectedValue(topToAdd.get(i), true);
}
}
//main.elementsToAddPane.clearSelection();
//findSynonyms(main, sentence);
}
/**
* Finds the synonyms of the words to remove in the words to add list
*/
protected static void findSynonyms(GUIMain main, String currentSent) {
String[] tempArr;
//addTracker = new DefaultHighlighter();
// TODO make new painter!!! (this one doesn't exist) anymore // painter3 = new DefaultHighlighter.DefaultHighlightPainter(new Color(0,0,255,128));
String tempStr, synSetString = "";
int index;
synSetString = "";
boolean inSent;
Scanner parser;
HashMap<String,Integer> indexMap = new HashMap<String,Integer>();
for (String[] str : topToRemove) {
tempArr = DictionaryBinding.getSynonyms(str[0]);
if (tempArr!=null) {
//inSent=currentSent.contains(str);
inSent = DriverEditor.checkSentFor(currentSent,str[0]);
if (inSent)
synSetString+=str[0]+"=>";
for (int i = 0; i < tempArr.length; i++) {//looks through synonyms
tempStr=tempArr[i];
if (inSent) {
synSetString += tempStr + ", ";
for (String addString : topToAdd) {
if (addString.equalsIgnoreCase(tempStr)) {
index = synSetString.indexOf(tempStr);
indexMap.put(tempStr, index);
}
}
}
}
if (inSent)
synSetString = synSetString.substring(0, synSetString.length()-2)+"\n";
}
}
@SuppressWarnings("resource")
Scanner sentParser = new Scanner(currentSent);
String wordToSearch, wordSynMatch;
HashMap<String,String> wordsWithSynonyms = new HashMap<String,String>();
boolean added = false;
synSetString = "";
while (sentParser.hasNext()) {//loops through every word in the sentence
wordToSearch = sentParser.next();
tempArr = DictionaryBinding.getSynonyms(wordToSearch);
wordSynMatch = "";
if (!wordsWithSynonyms.containsKey(wordToSearch.toLowerCase().trim())) {
if (tempArr != null) {
for (int i = 0; i < tempArr.length; i++) {//looks through synonyms
tempStr = tempArr[i];
wordSynMatch += tempStr + " ";
added = false;
for (String addString:topToAdd) {//loops through the toAdd list
if (addString.trim().equalsIgnoreCase(tempStr.trim())) {//there is a match in topToAdd!
if (!synSetString.contains(wordToSearch))
synSetString += wordToSearch + " => ";
synSetString = synSetString + addString + ", ";
//index=synSetString.indexOf(tempStr);
//indexMap.put(tempStr, index);
added=true;
break;
}
}
if (added) {
//do something if the word was added like print to the box.
synSetString=synSetString.substring(0, synSetString.length()-2)+"\n";
}
}
if (wordSynMatch.length() > 2)
wordsWithSynonyms.put(wordToSearch.toLowerCase().trim(), wordSynMatch.substring(0, wordSynMatch.length()-1));
else
wordsWithSynonyms.put(wordToSearch.toLowerCase().trim(), "No Synonyms");
}
}
}
String tempStrToAdd;
Word possibleToAdd;
double topAnon = 0;
for (String[] wordToRem : topToRemove) {//adds ALL the synonyms in the wordsToRemove
if (wordsWithSynonyms.containsKey(wordToRem[0])) {
tempStr = wordsWithSynonyms.get(wordToRem[0]);
tempStrToAdd = "";
parser = new Scanner(tempStr);
topAnon = 0;
while (parser.hasNext()) {
possibleToAdd = new Word(parser.next().trim());
ConsolidationStation.setWordFeatures(possibleToAdd);
if (possibleToAdd.getAnonymityIndex() > topAnon) {
tempStrToAdd = possibleToAdd.getUntagged() + ", ";//changed for test
topAnon = possibleToAdd.getAnonymityIndex();
}
}
synSetString += wordToRem[0] + " => " + tempStrToAdd + "\n";
}
}
// Iterator<String> iter = indexMap.keySet().iterator();
// String key;
// while (iter.hasNext()) {
// key = (String) iter.next();
// index = indexMap.get(key);
//
// try {
// addTracker.addHighlight(index, index+key.length(), painter3);
// } catch (BadLocationException e) {
// e.printStackTrace();
// }
// }
}
}
/*
* Answer to puzzle:
* The "~" is a bitwise "NOT". "-1" (in binary) is represented by all 1's. So, a bitwise 'NOT' makes it equivalent to '0':
*
* ~-1 == 0
*/
| false | true | protected static void initListeners(final GUIMain main) {
/***********************************************************************************************************************************************
*############################################################################################################*
*########################################### BEGIN EDITING HANDLERS ###########################################*
*############################################################################################################*
***********************************************************************************************************************************************/
suggestionCalculator = new SuggestionCalculator();
main.getDocumentPane().addCaretListener(new CaretListener() {
@Override
public void caretUpdate(CaretEvent e) {
System.out.println("======================================================================================");
if (ignoreNumActions > 0) {
charsInserted = 0;
charsWereRemoved = false;
charsWereInserted = false;
charsRemoved = 0;
ignoreNumActions--;
} else if (taggedDoc != null) { //main.documentPane.getText().length() != 0
boolean setSelectionInfoAndHighlight = true;
startSelection = e.getDot();
endSelection = e.getMark();
currentCaretPosition = startSelection;
int[] currentSentSelectionInfo = null;
caretPositionPriorToCharInsertion = currentCaretPosition - charsInserted;
caretPositionPriorToCharRemoval = currentCaretPosition + charsRemoved;
if (charsRemoved > 0) {
caretPositionPriorToAction = caretPositionPriorToCharRemoval;
// update the EOSTracker, and from the value that it returns we can tell if sentences are being merged (EOS characters are being erased)
/**
* We must subtract all the indices by 1 because the InputFilter indices refuses to work with anything other than - 1, and as such
* the indices here and in TaggedDocument must be adjustest as well.
*/
if (skipDeletingEOSes) {
skipDeletingEOSes = false;
} else {
EOSJustRemoved = taggedDoc.specialCharTracker.removeEOSesInRange( currentCaretPosition-1, caretPositionPriorToCharRemoval-1);
}
if (EOSJustRemoved) {
try {
// note that 'currentCaretPosition' will always be less than 'caretPositionPriorToCharRemoval' if characters were removed!
int[][] activatedSentenceInfo = calculateIndicesOfSentences(currentCaretPosition, caretPositionPriorToCharRemoval);
int i;
int j = 0;
leftSentInfo = activatedSentenceInfo[0];
rightSentInfo = activatedSentenceInfo[1];
if (rightSentInfo[0] != leftSentInfo[0]) {
int numToDelete = rightSentInfo[0] - (leftSentInfo[0]+1); // add '1' because we don't want to count the lower bound (e.g. if midway through sentence '6' down to midway through sentence '3' was deleted, we want to delete "6 - (3+1) = 2" TaggedSentences.
int[] taggedSentsToDelete;
// Now we list the indices of sentences that need to be removed, which are the ones between the left and right sentence (though not including either the left or the right sentence).
if (wholeLastSentDeleted) {
//We want to ignore the rightmost sentence from our deletion process since we didn't actually delete anything from it.
taggedSentsToDelete = new int[numToDelete-1];
for (i = (leftSentInfo[0] + 1); i < rightSentInfo[0]-1; i++) {
taggedSentsToDelete[j] = leftSentInfo[0] + 1;
j++;
}
} else {
//We want to include the rightmost sentence in our deletion process since we are partially deleting some of it.
taggedSentsToDelete = new int[numToDelete];
for (i = (leftSentInfo[0] + 1); i < rightSentInfo[0]; i++) {
taggedSentsToDelete[j] = leftSentInfo[0] + 1;
j++;
}
}
//First delete every sentence the user has deleted wholly (there's no extra concatenation or tricks, just delete).
taggedDoc.removeTaggedSentences(taggedSentsToDelete);
System.out.println(NAME+"Ending whole sentence deletion, now handling left and right (if available) deletion");
// Then read the remaining strings from "left" and "right" sentence:
// for left: read from 'leftSentInfo[1]' (the beginning of the sentence) to 'currentCaretPosition' (where the "sentence" now ends)
// for right: read from 'caretPositionPriorToCharRemoval' (where the "sentence" now begins) to 'rightSentInfo[2]' (the end of the sentence)
// Once we have the string, we call removeAndReplace, once for each sentence (String)
String docText = main.getDocumentPane().getText();
String leftSentCurrent = docText.substring(leftSentInfo[1],currentCaretPosition);
taggedDoc.removeAndReplace(leftSentInfo[0], leftSentCurrent);
//Needed so that we don't delete more than we should if that be the case
//TODO integrate this better with wholeLastSentDeleted and wholeBeginningSentDeleted so it's cleaner, right now this is pretty sloppy and confusing
if (TaggedDocument.userDeletedSentence) {
rightSentInfo[0] = rightSentInfo[0]-1;
}
String rightSentCurrent = docText.substring((caretPositionPriorToCharRemoval-charsRemoved), (rightSentInfo[2]-charsRemoved));//we need to shift our indices over by the number of characters removed.
if (wholeLastSentDeleted && wholeBeginningSentDeleted) {
wholeLastSentDeleted = false;
wholeBeginningSentDeleted = false;
taggedDoc.removeAndReplace(leftSentInfo[0], "");
} else if (wholeLastSentDeleted && !wholeBeginningSentDeleted) {
wholeLastSentDeleted = false;
taggedDoc.removeAndReplace(leftSentInfo[0]+1, "");
taggedDoc.concatRemoveAndReplace(taggedDoc.getTaggedDocument().get(leftSentInfo[0]),leftSentInfo[0], taggedDoc.getTaggedDocument().get(leftSentInfo[0]+1), leftSentInfo[0]+1);
} else {
try {
taggedDoc.removeAndReplace(leftSentInfo[0]+1, rightSentCurrent);
taggedDoc.concatRemoveAndReplace(taggedDoc.getTaggedDocument().get(leftSentInfo[0]),leftSentInfo[0], taggedDoc.getTaggedDocument().get(leftSentInfo[0]+1), leftSentInfo[0]+1);
} catch (Exception e1) {
taggedDoc.removeAndReplace(leftSentInfo[0], rightSentCurrent);
}
}
// Now that we have internally gotten rid of the parts of left and right sentence that no longer exist in the editor box, we merge those two sentences so that they become a single TaggedSentence.
TaggedDocument.userDeletedSentence = false;
}
} catch (Exception e1) {
Logger.logln(NAME+"Error occured while attempting to delete an EOS character.", LogOut.STDERR);
Logger.logln(NAME+"-> leftSentInfo", LogOut.STDERR);
if (leftSentInfo != null) {
for (int i = 0; i < leftSentInfo.length; i++)
Logger.logln(NAME+"\tleftSentInfo["+i+"] = " + leftSentInfo[i], LogOut.STDERR);
} else {
Logger.logln(NAME+"\tleftSentInfo was null!", LogOut.STDERR);
}
Logger.logln(NAME+"-> rightSentInfo", LogOut.STDERR);
if (rightSentInfo != null) {
for (int i = 0; i < leftSentInfo.length; i++)
Logger.logln(NAME+"\rightSentInfo["+i+"] = " + rightSentInfo[i], LogOut.STDERR);
} else {
Logger.logln(NAME+"\rightSentInfo was null!", LogOut.STDERR);
}
Logger.logln(NAME+"->Document Text (What the user sees)", LogOut.STDERR);
Logger.logln(NAME+"\t" + main.getDocumentPane().getText(), LogOut.STDERR);
Logger.logln(NAME+"->Tagged Document Text (The Backend)", LogOut.STDERR);
int size = taggedDoc.getNumSentences();
for (int i = 0; i < size; i++) {
Logger.logln(NAME+"\t" + taggedDoc.getUntaggedSentences(false).get(i));
}
ErrorHandler.editorError("Editor Failure", "Anonymouth has encountered an internal problem\nprocessing your most recent action.\n\nWe are aware of and working on the issue,\nand we apologize for any inconvenience.");
return;
}
// now update the EOSTracker
taggedDoc.specialCharTracker.shiftAllEOSChars(false, caretPositionPriorToCharRemoval, charsRemoved);
// Then update the currentSentSelectionInfo, and fix variables
currentSentSelectionInfo = calculateIndicesOfSentences(currentCaretPosition)[0];
currentSentNum = currentSentSelectionInfo[0];
selectedSentIndexRange[0] = currentSentSelectionInfo[1];
selectedSentIndexRange[1] = currentSentSelectionInfo[2];
// Now set the number of characters removed to zero because the action has been dealt with, and we don't want the statement further down to execute and screw up our indices.
charsRemoved = 0;
EOSJustRemoved = false;
} else {
// update the EOSTracker
taggedDoc.specialCharTracker.shiftAllEOSChars(false, caretPositionPriorToAction, charsRemoved);
}
} else if (charsInserted > 0) {
caretPositionPriorToAction = caretPositionPriorToCharInsertion;
// update the EOSTracker. First shift the current EOS objects, and then create a new one
taggedDoc.specialCharTracker.shiftAllEOSChars(true, caretPositionPriorToAction, charsInserted);
} else {
caretPositionPriorToAction = currentCaretPosition;
}
// Then update the selection information so that when we move the highlight, it highlights "both" sentences (well, what used to be both sentences, but is now a single sentence)
try {
//Try-catch in place just in case the user tried clicking on an area that does not contain sentences.
currentSentSelectionInfo = calculateIndicesOfSentences(currentCaretPosition)[0];
} catch (ArrayIndexOutOfBoundsException exception) {
return;
}
if (currentSentSelectionInfo == null)
return; // don't do anything.
lastSentNum = currentSentNum;
currentSentNum = currentSentSelectionInfo[0];
boolean inRange = false;
//check to see if the current caret location is within the selectedSentIndexRange ([0] is min, [1] is max)
if ( caretPositionPriorToAction >= selectedSentIndexRange[0] && caretPositionPriorToAction < selectedSentIndexRange[1]) {
inRange = true;
// Caret is inside range of presently selected sentence.
// update from previous caret
if (charsInserted > 0 ) {// && lastSentNum != -1){
selectedSentIndexRange[1] += charsInserted;
charsInserted = ~-1; // puzzle: what does this mean? (scroll to bottom of file for answer) - AweM
charsWereInserted = true;
charsWereRemoved = false;
} else if (charsRemoved > 0) {// && lastSentNum != -1){
selectedSentIndexRange[1] -= charsRemoved;
charsRemoved = 0;
charsWereRemoved = true;
charsWereInserted = false;
}
} else if (!isFirstRun) {
/**
* Yet another thing that seems somewhat goofy but serves a distinct and important purpose. Since we're supposed to wait in InputFilter
* when the user types an EOS character since they may type more and we're not sure yet if they are actually done with the sentence, nothing
* will be removed, replaced, or updated until we have confirmation that it's the end of the sentence. This means that if they click/move away from the
* sentence after typing a period INSTEAD of finishing the sentence with a space or continuing the EOS characters, the sentence replacement will get
* all screwed up. This is to ensure that no matter what, when a sentence is created and we know it's a sentence it gets processed.
*/
if (changedCaret && InputFilter.isEOS) {
InputFilter.isEOS = false;
changedCaret = false;
shouldUpdate = true;
/**
* Exists for the sole purpose of pushing a sentence that has been edited and finished to the appropriate place in
* The Translation.java class so that it can be promptly translated. This will ONLY happen when the user has clicked
* away from the sentence they were editing to work on another one (the reason behind this being we don't want to be
* constantly pushing now sentences to be translated is the user's immediately going to replace them again, we only
* want to translate completed sentences).
*/
if (!originals.keySet().contains(main.getDocumentPane().getText().substring(selectedSentIndexRange[0],selectedSentIndexRange[1])))
translate = true;
}
}
// selectionInfo is an int array with 3 values: {selectedSentNum, startHighlight, endHighlight}
// xxx todo xxx get rid of this check (if possible... BEI sets the selectedSentIndexRange)....
if (isFirstRun) { //NOTE needed a way to make sure that the very first time a sentence is clicked (, we didn't break stuff... this may not be the best way...
isFirstRun = false;
} else {
lastSelectedSentIndexRange[0] = selectedSentIndexRange[0];
lastSelectedSentIndexRange[1] = selectedSentIndexRange[1];
currentSentenceString = main.getDocumentPane().getText().substring(lastSelectedSentIndexRange[0],lastSelectedSentIndexRange[1]);
if (!taggedDoc.getSentenceNumber(lastSentNum).getUntagged(false).equals(currentSentenceString)) {
main.anonymityDrawingPanel.updateAnonymityBar();
setSelectionInfoAndHighlight = false;
GUIMain.saved = false;
}
if ((currentCaretPosition-1 != lastCaretLocation && !charsWereRemoved && charsWereInserted) || (currentCaretPosition != lastCaretLocation-1) && !charsWereInserted && charsWereRemoved) {
charsWereInserted = false;
charsWereRemoved = false;
shouldUpdate = true;
/**
* Exists for the sole purpose of pushing a sentence that has been edited and finished to the appropriate place in
* The Translation.java class so that it can be promptly translated. This will ONLY happen when the user has clicked
* away from the sentence they were editing to work on another one (the reason behind this being we don't want to be
* constantly pushing now sentences to be translated is the user's immediately going to replace them again, we only
* want to translate completed sentences).
*/
if (!originals.keySet().contains(main.getDocumentPane().getText().substring(selectedSentIndexRange[0],selectedSentIndexRange[1])))
translate = true;
}
}
if (setSelectionInfoAndHighlight) {
currentSentSelectionInfo = calculateIndicesOfSentences(caretPositionPriorToAction)[0];
selectedSentIndexRange[0] = currentSentSelectionInfo[1]; //start highlight
selectedSentIndexRange[1] = currentSentSelectionInfo[2]; //end highlight
moveHighlight(main, selectedSentIndexRange);
}
lastCaretLocation = currentCaretPosition;
sentToTranslate = currentSentNum;
if (!inRange) {
if (shouldUpdate && !ignoreVersion) {
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
main.versionControl.addVersion(backedUpTaggedDoc, oldStartSelection);
}
DriverTranslationsTab.showTranslations(taggedDoc.getSentenceNumber(sentToTranslate));
}
if (shouldUpdate) {
shouldUpdate = false;
GUIMain.saved = false;
removeReplaceAndUpdate(main, lastSentNum, currentSentenceString, false);
}
oldSelectionInfo = currentSentSelectionInfo;
oldStartSelection = startSelection;
oldEndSelection = endSelection;
}
}
});
/**
* Key listener for the documentPane. Allows tracking the cursor while typing to make sure that indices of sentence start and ends
*/
main.getDocumentPane().addKeyListener(new KeyListener() {
@Override
public void keyPressed(KeyEvent arg0) {
if (arg0.getKeyCode() == KeyEvent.VK_RIGHT ||
arg0.getKeyCode() == KeyEvent.VK_LEFT ||
arg0.getKeyCode() == KeyEvent.VK_UP ||
arg0.getKeyCode() == KeyEvent.VK_DOWN) {
changedCaret = true;
main.clipboard.setEnabled(false, false, true);
}
if (arg0.getKeyCode() == KeyEvent.VK_BACK_SPACE)
deleting = true;
else
deleting = false;
}
@Override
public void keyReleased(KeyEvent arg0) {}
@Override
public void keyTyped(KeyEvent arg0) {}
});
main.getDocumentPane().getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
if (!GUIMain.processed){
return;
}
charsInserted = e.getLength();
if (main.versionControl.isUndoEmpty() && GUIMain.processed && !ignoreVersion) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
if (ignoreVersion) {
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
return;
}
if (e.getLength() > 1) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
} else {
if (InputFilter.shouldBackup) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset()+1);
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
}
}
@Override
public void removeUpdate(DocumentEvent e) {
if (!GUIMain.processed) {
return;
}
if (InputFilter.ignoreDeletion)
InputFilter.ignoreDeletion = false;
else
charsRemoved = e.getLength();
if (main.versionControl.isUndoEmpty() && GUIMain.processed && !ignoreVersion) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
System.out.println(ignoreVersion);
System.out.println(GUIMain.processed);
if (ignoreVersion) {
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
return;
}
if (e.getLength() > 1) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
} else {
if (InputFilter.shouldBackup) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
}
}
@Override
public void changedUpdate(DocumentEvent e) {
DriverEditor.displayEditInfo(e);
}
});
main.getDocumentPane().addMouseListener(new MouseListener() {
@Override
public void mouseClicked(MouseEvent me) {
}
@Override
public void mousePressed(MouseEvent me) {
}
@Override
public void mouseReleased(MouseEvent me) {
changedCaret = true;
deleting = false;
if (main.getDocumentPane().getCaret().getDot() == main.getDocumentPane().getCaret().getMark())
main.clipboard.setEnabled(false, false, true);
else
main.clipboard.setEnabled(true);
}
@Override
public void mouseEntered(MouseEvent me) {
}
@Override
public void mouseExited(MouseEvent me) {
}
});
/***********************************************************************************************************************************************
*############################################################################################################*
*########################################### END EDITING HANDLERS ########################################### *
*############################################################################################################*
************************************************************************************************************************************************/
/**
* ActionListener for process button (bar).
*/
main.processButton.addActionListener(new ActionListener() {
@Override
public synchronized void actionPerformed(ActionEvent event) {
// ----- check if all requirements for processing are met
String errorMessage = "Oops! Found errors that must be taken care of prior to processing!\n\nErrors found:\n";
if (!main.mainDocReady())
errorMessage += "<html>• Main document not provided.</html>\n";
if (!main.sampleDocsReady())
errorMessage += "<html>• Sample documents not provided.</html>\n";
if (!main.trainDocsReady())
errorMessage += "<html>• Train documents not provided.</html>\n";
if (!main.featuresAreReady())
errorMessage += "<html>• Feature set not chosen.</html>\n";
if (!main.classifiersAreReady())
errorMessage += "<html>• Classifier not chosen.</html>\n";
if (!main.hasAtLeastThreeOtherAuthors())
errorMessage += "<html>• You must have at least 3 other authors.</html>";
System.out.println("BEFORE IF");
// ----- display error message if there are errors
if (errorMessage != "Oops! Found errors that must be taken care of prior to processing!\n\nErrors found:\n") {
System.out.println("SHOULD NOT HAVE EXECUTED");
JOptionPane.showMessageDialog(main, errorMessage, "Configuration Error!",
JOptionPane.ERROR_MESSAGE);
} else {
System.out.println("THE SHOULD EXECUTE");
main.leftTabPane.setSelectedIndex(0);
// ----- confirm they want to process
if (true) {// ---- can be a confirm dialog to make sure they want to process.
setAllDocTabUseable(false, main);
System.out.println("Doc tab useable");
System.out.println("isFirstRun = " + isFirstRun);
System.out.println("taggedDoc = " + taggedDoc);
// ----- if this is the first run, do everything that needs to be ran the first time
if (taggedDoc == null) {
System.out.println("ERROR, SHOULD NOT RUN");
// ----- create the main document and add it to the appropriate array list.
// ----- may not need the arraylist in the future since you only really can have one at a time
TaggedDocument taggedDocument = new TaggedDocument();
ConsolidationStation.toModifyTaggedDocs=new ArrayList<TaggedDocument>();
ConsolidationStation.toModifyTaggedDocs.add(taggedDocument);
taggedDoc = ConsolidationStation.toModifyTaggedDocs.get(0);
Logger.logln(NAME+"Initial processing starting...");
// initialize all arraylists needed for feature processing
sizeOfCfd = main.cfd.numOfFeatureDrivers();
featuresInCfd = new ArrayList<String>(sizeOfCfd);
noCalcHistFeatures = new ArrayList<FeatureList>(sizeOfCfd);
yesCalcHistFeatures = new ArrayList<FeatureList>(sizeOfCfd);
for(int i = 0; i < sizeOfCfd; i++) {
String theName = main.cfd.featureDriverAt(i).getName();
// capitalize the name and replace all " " and "-" with "_"
theName = theName.replaceAll("[ -]","_").toUpperCase();
if(isCalcHist == false) {
isCalcHist = main.cfd.featureDriverAt(i).isCalcHist();
yesCalcHistFeatures.add(FeatureList.valueOf(theName));
} else {
// these values will go in suggestion list... PLUS any
noCalcHistFeatures.add(FeatureList.valueOf(theName));
}
featuresInCfd.add(i,theName);
}
wizard = new DataAnalyzer(main.ps);
magician = new DocumentMagician(false);
} else {
System.out.println("ELSE, SHOULD RUN");
isFirstRun = false;
//TODO ASK ANDREW: Should we erase the user's "this is a single sentence" actions upon reprocessing? Only only when they reset the highlighter?
taggedDoc.specialCharTracker.resetEOSCharacters();
taggedDoc = new TaggedDocument(main.getDocumentPane().getText());
Logger.logln(NAME+"Repeat processing starting....");
resetAll(main);
}
main.getDocumentPane().getHighlighter().removeAllHighlights();
elementsToRemoveInSentence.clear();
selectedAddElements.clear();
selectedRemoveElements.clear();
Logger.logln(NAME+"calling backendInterface for preTargetSelectionProcessing");
BackendInterface.preTargetSelectionProcessing(main,wizard,magician);
}
}
}
});
saveAsTestDoc = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Logger.logln(NAME+"Save As document button clicked.");
JFileChooser save = new JFileChooser();
save.setSelectedFile(new File("anonymizedDoc.txt"));
save.addChoosableFileFilter(new ExtFilter("txt files (*.txt)", "txt"));
int answer = save.showSaveDialog(main);
if (answer == JFileChooser.APPROVE_OPTION) {
File f = save.getSelectedFile();
String path = f.getAbsolutePath();
if (!path.toLowerCase().endsWith(".txt"))
path += ".txt";
try {
BufferedWriter bw = new BufferedWriter(new FileWriter(path));
bw.write(main.getDocumentPane().getText());
bw.flush();
bw.close();
Logger.log("Saved contents of current tab to "+path);
GUIMain.saved = true;
} catch (IOException exc) {
Logger.logln(NAME+"Failed opening "+path+" for writing",LogOut.STDERR);
Logger.logln(NAME+exc.toString(),LogOut.STDERR);
JOptionPane.showMessageDialog(null,
"Failed saving contents of current tab into:\n"+path,
"Save Problem Set Failure",
JOptionPane.ERROR_MESSAGE);
}
} else
Logger.logln(NAME+"Save As contents of current tab canceled");
}
};
main.saveButton.addActionListener(saveAsTestDoc);
}
/**
* Resets everything to their default values, to be used before reprocessing
* @param main - An instance of GUIMain
*/
public static void resetAll(GUIMain main) {
reset();
GUIMain.GUITranslator.reset();
DriverTranslationsTab.reset();
main.versionControl.reset();
main.anonymityDrawingPanel.reset();
main.resultsWindow.reset();
GUIUpdateInterface.updateResultsPrepColor(main);
main.elementsToRemoveTable.removeAllElements();
main.elementsToRemoveModel.addRow(new String[] {"Re-processing, please wait", ""});
main.elementsToAdd.removeAllElements();
main.elementsToAdd.add(0, "Re-processing, please wait");
}
public static void reset() {
currentCaretPosition = 0;
startSelection = -1;
endSelection = -1;
noCalcHistFeatures.clear();
yesCalcHistFeatures.clear();
originals.clear();
originalSents.clear();
currentSentNum = 0;
lastSentNum = -1;
sentToTranslate = 0;
selectedSentIndexRange = new int[]{-2,-2};
lastSelectedSentIndexRange = new int[]{-3,-3};
lastCaretLocation = -1;
charsInserted = -1;
charsRemoved = -1;
currentSentenceString = "";
ignoreNumActions = 0;
caretPositionPriorToCharInsertion = 0;
caretPositionPriorToCharRemoval = 0;
caretPositionPriorToAction = 0;
oldSelectionInfo = new int[3];
wordsToRemove.clear();
}
public static void save(GUIMain main) {
Logger.logln(NAME+"Save document button clicked.");
String path = main.ps.getTestDocs().get(0).getFilePath();
try {
BufferedWriter bw = new BufferedWriter(new FileWriter(path));
bw.write(main.getDocumentPane().getText());
bw.flush();
bw.close();
Logger.log("Saved contents of document to "+path);
GUIMain.saved = true;
} catch (IOException exc) {
Logger.logln(NAME+"Failed opening "+path+" for writing",LogOut.STDERR);
Logger.logln(NAME+exc.toString(),LogOut.STDERR);
JOptionPane.showMessageDialog(null,
"Failed saving contents of current tab into:\n"+path,
"Save Problem Set Failure",
JOptionPane.ERROR_MESSAGE);
}
}
public static int getSelection(JOptionPane oPane){
Object selectedValue = oPane.getValue();
if(selectedValue != null){
Object options[] = oPane.getOptions();
if (options == null){
return ((Integer) selectedValue).intValue();
}
else{
int i;
int j;
for(i=0, j= options.length; i<j;i++){
if(options[i].equals(selectedValue))
return i;
}
}
}
return 0;
}
public static void setSuggestions() {
SuggestionCalculator.placeSuggestions(GUIMain.inst);
}
}
class TheHighlighter extends DefaultHighlighter.DefaultHighlightPainter{
public TheHighlighter(Color color){
super(color);
}
}
class SuggestionCalculator {
private final static String PUNCTUATION = "?!,.\"`'";
private final static String CLEANWORD=".*([\\.,!?])+";
private static DocumentMagician magician;
protected static Highlighter editTracker;
protected static ArrayList<String[]> topToRemove;
protected static ArrayList<String> topToAdd;
public static void init(DocumentMagician magician) {
SuggestionCalculator.magician = magician;
}
/*
* Highlights the sentence that is currently in the editor box in the main document
* no return
*/
protected static void placeSuggestions(GUIMain main) {
//We must first clear any existing highlights the user has and remove all existing suggestions
Highlighter highlight = main.getDocumentPane().getHighlighter();
int highlightedObjectsSize = DriverEditor.selectedAddElements.size();
for (int i = 0; i < highlightedObjectsSize; i++)
highlight.removeHighlight(DriverEditor.selectedAddElements.get(i).getHighlightedObject());
DriverEditor.selectedAddElements.clear();
highlightedObjectsSize = DriverEditor.selectedRemoveElements.size();
for (int i = 0; i < highlightedObjectsSize; i++)
highlight.removeHighlight(DriverEditor.selectedRemoveElements.get(i).getHighlightedObject());
DriverEditor.selectedRemoveElements.clear();
//If the user had a word highlighted and we're updating the list, we want to keep the word highlighted if it's in the updated list
String prevSelectedElement = "";
if (main.elementsToAddPane.getSelectedValue() != null)
prevSelectedElement = main.elementsToAddPane.getSelectedValue();
if (main.elementsToRemoveTable.getSelectedRow() != -1)
prevSelectedElement = (String)main.elementsToRemoveTable.getModel().getValueAt(main.elementsToRemoveTable.getSelectedRow(), 0);
if (main.elementsToRemoveTable.getRowCount() > 0)
main.elementsToRemoveTable.removeAllElements();
if (main.elementsToAdd.getSize() > 0)
main.elementsToAdd.removeAllElements();
//Adding new suggestions
List<Document> documents = magician.getDocumentSets().get(1); //all the user's sample documents (written by them)
documents.add(magician.getDocumentSets().get(2).get(0)); //we also want to count the user's test document
topToRemove = ConsolidationStation.getPriorityWordsAndOccurances(documents, true, .1);
topToAdd = ConsolidationStation.getPriorityWords(ConsolidationStation.authorSampleTaggedDocs, false, 1);
ArrayList<String> sentences = DriverEditor.taggedDoc.getUntaggedSentences(false);
int sentNum = DriverEditor.getCurrentSentNum();
String sentence = sentences.get(sentNum);
int arrSize = topToRemove.size();
// String setString = "";
// int fromIndex = 0;
String tempString;
// ArrayList<Integer> tempArray;
// int indexOfTemp;
for (int i = 0; i < arrSize; i++) {//loops through top to remove list
// setString += topToRemove.get(i) + "\n";//sets the string to return
@SuppressWarnings("resource")
Scanner parser = new Scanner(sentence);
// fromIndex = 0;
while (parser.hasNext()) {//finds if the given word to remove is in the current sentence
//loops through current sentence
tempString = parser.next();
if (tempString.matches(CLEANWORD)) {//TODO: refine this.
tempString=tempString.substring(0,tempString.length()-1);
//Logger.logln("replaced a period in: "+tempString);
}
// if (tempString.equals(topToRemove.get(i))) {
// tempArray = new ArrayList<Integer>(2);
//
// indexOfTemp = sentence.indexOf(tempString, fromIndex);
// tempArray.add(indexOfTemp + startHighlight);//-numberTimesFixTabs
// tempArray.add(indexOfTemp+tempString.length() + startHighlight);
//
// added = false;
// for(int j=0;j<indexArray.size();j++){
// if(indexArray.get(j).get(0)>tempArray.get(0)){
// indexArray.add(j,tempArray);
// added=true;
// break;
// }
// }
// if(!added)
// indexArray.add(tempArray);
// //fromIndex=tempArray.get(1);
// }
// fromIndex+=tempString.length()+1;
}
if (!topToRemove.get(i).equals("''") && !topToRemove.get(i).equals("``")) {
String left, right;
//The element to remove
if (PUNCTUATION.contains(topToRemove.get(i)[0].trim()))
left = "Reduce " + topToRemove.get(i)[0] + "'s";
else
left = topToRemove.get(i)[0];
//The number of occurrences
if (topToRemove.get(i)[1].equals("0"))
right = "None";
else if (topToRemove.get(i)[1].equals("1"))
right = "1 time";
else
right = topToRemove.get(i)[1] + " times";
main.elementsToRemoveModel.insertRow(i, new String[] {left, right});
if (topToRemove.get(i)[0].trim().equals(prevSelectedElement)) {
main.elementsToRemoveTable.setRowSelectionInterval(i, i);
}
}
}
//main.elementsToRemoveTable.clearSelection();
main.elementsToAdd.removeAllElements();
arrSize = topToAdd.size();
for (int i=0;i<arrSize;i++) {
main.elementsToAdd.add(i, topToAdd.get(i));
if (topToAdd.get(i).equals(prevSelectedElement)) {
main.elementsToAddPane.setSelectedValue(topToAdd.get(i), true);
}
}
//main.elementsToAddPane.clearSelection();
//findSynonyms(main, sentence);
}
/**
* Finds the synonyms of the words to remove in the words to add list
*/
protected static void findSynonyms(GUIMain main, String currentSent) {
String[] tempArr;
//addTracker = new DefaultHighlighter();
// TODO make new painter!!! (this one doesn't exist) anymore // painter3 = new DefaultHighlighter.DefaultHighlightPainter(new Color(0,0,255,128));
String tempStr, synSetString = "";
int index;
synSetString = "";
boolean inSent;
Scanner parser;
HashMap<String,Integer> indexMap = new HashMap<String,Integer>();
for (String[] str : topToRemove) {
tempArr = DictionaryBinding.getSynonyms(str[0]);
if (tempArr!=null) {
//inSent=currentSent.contains(str);
inSent = DriverEditor.checkSentFor(currentSent,str[0]);
if (inSent)
synSetString+=str[0]+"=>";
for (int i = 0; i < tempArr.length; i++) {//looks through synonyms
tempStr=tempArr[i];
if (inSent) {
synSetString += tempStr + ", ";
for (String addString : topToAdd) {
if (addString.equalsIgnoreCase(tempStr)) {
index = synSetString.indexOf(tempStr);
indexMap.put(tempStr, index);
}
}
}
}
if (inSent)
synSetString = synSetString.substring(0, synSetString.length()-2)+"\n";
}
}
@SuppressWarnings("resource")
Scanner sentParser = new Scanner(currentSent);
String wordToSearch, wordSynMatch;
HashMap<String,String> wordsWithSynonyms = new HashMap<String,String>();
boolean added = false;
synSetString = "";
while (sentParser.hasNext()) {//loops through every word in the sentence
wordToSearch = sentParser.next();
tempArr = DictionaryBinding.getSynonyms(wordToSearch);
wordSynMatch = "";
if (!wordsWithSynonyms.containsKey(wordToSearch.toLowerCase().trim())) {
if (tempArr != null) {
for (int i = 0; i < tempArr.length; i++) {//looks through synonyms
tempStr = tempArr[i];
wordSynMatch += tempStr + " ";
added = false;
for (String addString:topToAdd) {//loops through the toAdd list
if (addString.trim().equalsIgnoreCase(tempStr.trim())) {//there is a match in topToAdd!
if (!synSetString.contains(wordToSearch))
synSetString += wordToSearch + " => ";
synSetString = synSetString + addString + ", ";
//index=synSetString.indexOf(tempStr);
//indexMap.put(tempStr, index);
added=true;
break;
}
}
if (added) {
//do something if the word was added like print to the box.
synSetString=synSetString.substring(0, synSetString.length()-2)+"\n";
}
}
if (wordSynMatch.length() > 2)
wordsWithSynonyms.put(wordToSearch.toLowerCase().trim(), wordSynMatch.substring(0, wordSynMatch.length()-1));
else
wordsWithSynonyms.put(wordToSearch.toLowerCase().trim(), "No Synonyms");
}
}
}
String tempStrToAdd;
Word possibleToAdd;
double topAnon = 0;
for (String[] wordToRem : topToRemove) {//adds ALL the synonyms in the wordsToRemove
if (wordsWithSynonyms.containsKey(wordToRem[0])) {
tempStr = wordsWithSynonyms.get(wordToRem[0]);
tempStrToAdd = "";
parser = new Scanner(tempStr);
topAnon = 0;
while (parser.hasNext()) {
possibleToAdd = new Word(parser.next().trim());
ConsolidationStation.setWordFeatures(possibleToAdd);
if (possibleToAdd.getAnonymityIndex() > topAnon) {
tempStrToAdd = possibleToAdd.getUntagged() + ", ";//changed for test
topAnon = possibleToAdd.getAnonymityIndex();
}
}
synSetString += wordToRem[0] + " => " + tempStrToAdd + "\n";
}
}
// Iterator<String> iter = indexMap.keySet().iterator();
// String key;
// while (iter.hasNext()) {
// key = (String) iter.next();
// index = indexMap.get(key);
//
// try {
// addTracker.addHighlight(index, index+key.length(), painter3);
// } catch (BadLocationException e) {
// e.printStackTrace();
// }
// }
}
}
/*
* Answer to puzzle:
* The "~" is a bitwise "NOT". "-1" (in binary) is represented by all 1's. So, a bitwise 'NOT' makes it equivalent to '0':
*
* ~-1 == 0
*/
| protected static void initListeners(final GUIMain main) {
/***********************************************************************************************************************************************
*############################################################################################################*
*########################################### BEGIN EDITING HANDLERS ###########################################*
*############################################################################################################*
***********************************************************************************************************************************************/
suggestionCalculator = new SuggestionCalculator();
main.getDocumentPane().addCaretListener(new CaretListener() {
@Override
public void caretUpdate(CaretEvent e) {
System.out.println("======================================================================================");
if (ignoreNumActions > 0) {
charsInserted = 0;
charsWereRemoved = false;
charsWereInserted = false;
charsRemoved = 0;
ignoreNumActions--;
} else if (taggedDoc != null) { //main.documentPane.getText().length() != 0
boolean setSelectionInfoAndHighlight = true;
startSelection = e.getDot();
endSelection = e.getMark();
currentCaretPosition = startSelection;
int[] currentSentSelectionInfo = null;
caretPositionPriorToCharInsertion = currentCaretPosition - charsInserted;
caretPositionPriorToCharRemoval = currentCaretPosition + charsRemoved;
if (charsRemoved > 0) {
caretPositionPriorToAction = caretPositionPriorToCharRemoval;
// update the EOSTracker, and from the value that it returns we can tell if sentences are being merged (EOS characters are being erased)
/**
* We must subtract all the indices by 1 because the InputFilter indices refuses to work with anything other than - 1, and as such
* the indices here and in TaggedDocument must be adjustest as well.
*/
if (skipDeletingEOSes) {
skipDeletingEOSes = false;
} else {
EOSJustRemoved = taggedDoc.specialCharTracker.removeEOSesInRange( currentCaretPosition-1, caretPositionPriorToCharRemoval-1);
}
if (EOSJustRemoved) {
try {
// note that 'currentCaretPosition' will always be less than 'caretPositionPriorToCharRemoval' if characters were removed!
int[][] activatedSentenceInfo = calculateIndicesOfSentences(currentCaretPosition, caretPositionPriorToCharRemoval);
int i;
int j = 0;
leftSentInfo = activatedSentenceInfo[0];
rightSentInfo = activatedSentenceInfo[1];
if (rightSentInfo[0] != leftSentInfo[0]) {
int numToDelete = rightSentInfo[0] - (leftSentInfo[0]+1); // add '1' because we don't want to count the lower bound (e.g. if midway through sentence '6' down to midway through sentence '3' was deleted, we want to delete "6 - (3+1) = 2" TaggedSentences.
int[] taggedSentsToDelete;
// Now we list the indices of sentences that need to be removed, which are the ones between the left and right sentence (though not including either the left or the right sentence).
if (wholeLastSentDeleted) {
//We want to ignore the rightmost sentence from our deletion process since we didn't actually delete anything from it.
taggedSentsToDelete = new int[numToDelete-1];
for (i = (leftSentInfo[0] + 1); i < rightSentInfo[0]-1; i++) {
taggedSentsToDelete[j] = leftSentInfo[0] + 1;
j++;
}
} else {
//We want to include the rightmost sentence in our deletion process since we are partially deleting some of it.
taggedSentsToDelete = new int[numToDelete];
for (i = (leftSentInfo[0] + 1); i < rightSentInfo[0]; i++) {
taggedSentsToDelete[j] = leftSentInfo[0] + 1;
j++;
}
}
//First delete every sentence the user has deleted wholly (there's no extra concatenation or tricks, just delete).
taggedDoc.removeTaggedSentences(taggedSentsToDelete);
System.out.println(NAME+"Ending whole sentence deletion, now handling left and right (if available) deletion");
// Then read the remaining strings from "left" and "right" sentence:
// for left: read from 'leftSentInfo[1]' (the beginning of the sentence) to 'currentCaretPosition' (where the "sentence" now ends)
// for right: read from 'caretPositionPriorToCharRemoval' (where the "sentence" now begins) to 'rightSentInfo[2]' (the end of the sentence)
// Once we have the string, we call removeAndReplace, once for each sentence (String)
String docText = main.getDocumentPane().getText();
String leftSentCurrent = docText.substring(leftSentInfo[1],currentCaretPosition);
taggedDoc.removeAndReplace(leftSentInfo[0], leftSentCurrent);
//Needed so that we don't delete more than we should if that be the case
//TODO integrate this better with wholeLastSentDeleted and wholeBeginningSentDeleted so it's cleaner, right now this is pretty sloppy and confusing
if (TaggedDocument.userDeletedSentence) {
rightSentInfo[0] = rightSentInfo[0]-1;
}
String rightSentCurrent = docText.substring((caretPositionPriorToCharRemoval-charsRemoved), (rightSentInfo[2]-charsRemoved));//we need to shift our indices over by the number of characters removed.
if (wholeLastSentDeleted && wholeBeginningSentDeleted) {
wholeLastSentDeleted = false;
wholeBeginningSentDeleted = false;
taggedDoc.removeAndReplace(leftSentInfo[0], "");
} else if (wholeLastSentDeleted && !wholeBeginningSentDeleted) {
wholeLastSentDeleted = false;
taggedDoc.removeAndReplace(leftSentInfo[0]+1, "");
taggedDoc.concatRemoveAndReplace(taggedDoc.getTaggedDocument().get(leftSentInfo[0]),leftSentInfo[0], taggedDoc.getTaggedDocument().get(leftSentInfo[0]+1), leftSentInfo[0]+1);
} else {
try {
taggedDoc.removeAndReplace(leftSentInfo[0]+1, rightSentCurrent);
taggedDoc.concatRemoveAndReplace(taggedDoc.getTaggedDocument().get(leftSentInfo[0]),leftSentInfo[0], taggedDoc.getTaggedDocument().get(leftSentInfo[0]+1), leftSentInfo[0]+1);
} catch (Exception e1) {
taggedDoc.removeAndReplace(leftSentInfo[0], rightSentCurrent);
}
}
// Now that we have internally gotten rid of the parts of left and right sentence that no longer exist in the editor box, we merge those two sentences so that they become a single TaggedSentence.
TaggedDocument.userDeletedSentence = false;
}
} catch (Exception e1) {
Logger.logln(NAME+"Error occured while attempting to delete an EOS character.", LogOut.STDERR);
Logger.logln(NAME+"-> leftSentInfo", LogOut.STDERR);
if (leftSentInfo != null) {
for (int i = 0; i < leftSentInfo.length; i++)
Logger.logln(NAME+"\tleftSentInfo["+i+"] = " + leftSentInfo[i], LogOut.STDERR);
} else {
Logger.logln(NAME+"\tleftSentInfo was null!", LogOut.STDERR);
}
Logger.logln(NAME+"-> rightSentInfo", LogOut.STDERR);
if (rightSentInfo != null) {
for (int i = 0; i < leftSentInfo.length; i++)
Logger.logln(NAME+"\rightSentInfo["+i+"] = " + rightSentInfo[i], LogOut.STDERR);
} else {
Logger.logln(NAME+"\rightSentInfo was null!", LogOut.STDERR);
}
Logger.logln(NAME+"->Document Text (What the user sees)", LogOut.STDERR);
Logger.logln(NAME+"\t" + main.getDocumentPane().getText(), LogOut.STDERR);
Logger.logln(NAME+"->Tagged Document Text (The Backend)", LogOut.STDERR);
int size = taggedDoc.getNumSentences();
for (int i = 0; i < size; i++) {
Logger.logln(NAME+"\t" + taggedDoc.getUntaggedSentences(false).get(i));
}
ErrorHandler.editorError("Editor Failure", "Anonymouth has encountered an internal problem\nprocessing your most recent action.\n\nWe are aware of and working on the issue,\nand we apologize for any inconvenience.");
return;
}
// now update the EOSTracker
taggedDoc.specialCharTracker.shiftAllEOSChars(false, caretPositionPriorToCharRemoval, charsRemoved);
// Then update the currentSentSelectionInfo, and fix variables
currentSentSelectionInfo = calculateIndicesOfSentences(currentCaretPosition)[0];
currentSentNum = currentSentSelectionInfo[0];
selectedSentIndexRange[0] = currentSentSelectionInfo[1];
selectedSentIndexRange[1] = currentSentSelectionInfo[2];
// Now set the number of characters removed to zero because the action has been dealt with, and we don't want the statement further down to execute and screw up our indices.
charsRemoved = 0;
EOSJustRemoved = false;
} else {
// update the EOSTracker
taggedDoc.specialCharTracker.shiftAllEOSChars(false, caretPositionPriorToAction, charsRemoved);
}
} else if (charsInserted > 0) {
caretPositionPriorToAction = caretPositionPriorToCharInsertion;
// update the EOSTracker. First shift the current EOS objects, and then create a new one
taggedDoc.specialCharTracker.shiftAllEOSChars(true, caretPositionPriorToAction, charsInserted);
} else {
caretPositionPriorToAction = currentCaretPosition;
}
// Then update the selection information so that when we move the highlight, it highlights "both" sentences (well, what used to be both sentences, but is now a single sentence)
try {
//Try-catch in place just in case the user tried clicking on an area that does not contain sentences.
currentSentSelectionInfo = calculateIndicesOfSentences(currentCaretPosition)[0];
} catch (ArrayIndexOutOfBoundsException exception) {
return;
}
if (currentSentSelectionInfo == null)
return; // don't do anything.
lastSentNum = currentSentNum;
currentSentNum = currentSentSelectionInfo[0];
boolean inRange = false;
//check to see if the current caret location is within the selectedSentIndexRange ([0] is min, [1] is max)
if ( caretPositionPriorToAction >= selectedSentIndexRange[0] && caretPositionPriorToAction < selectedSentIndexRange[1]) {
inRange = true;
// Caret is inside range of presently selected sentence.
// update from previous caret
if (charsInserted > 0 ) {// && lastSentNum != -1){
selectedSentIndexRange[1] += charsInserted;
charsInserted = ~-1; // puzzle: what does this mean? (scroll to bottom of file for answer) - AweM
charsWereInserted = true;
charsWereRemoved = false;
} else if (charsRemoved > 0) {// && lastSentNum != -1){
selectedSentIndexRange[1] -= charsRemoved;
charsRemoved = 0;
charsWereRemoved = true;
charsWereInserted = false;
}
} else if (!isFirstRun) {
/**
* Yet another thing that seems somewhat goofy but serves a distinct and important purpose. Since we're supposed to wait in InputFilter
* when the user types an EOS character since they may type more and we're not sure yet if they are actually done with the sentence, nothing
* will be removed, replaced, or updated until we have confirmation that it's the end of the sentence. This means that if they click/move away from the
* sentence after typing a period INSTEAD of finishing the sentence with a space or continuing the EOS characters, the sentence replacement will get
* all screwed up. This is to ensure that no matter what, when a sentence is created and we know it's a sentence it gets processed.
*/
if (changedCaret && InputFilter.isEOS) {
InputFilter.isEOS = false;
changedCaret = false;
shouldUpdate = true;
/**
* Exists for the sole purpose of pushing a sentence that has been edited and finished to the appropriate place in
* The Translation.java class so that it can be promptly translated. This will ONLY happen when the user has clicked
* away from the sentence they were editing to work on another one (the reason behind this being we don't want to be
* constantly pushing now sentences to be translated is the user's immediately going to replace them again, we only
* want to translate completed sentences).
*/
if (!originals.keySet().contains(main.getDocumentPane().getText().substring(selectedSentIndexRange[0],selectedSentIndexRange[1])))
translate = true;
}
}
// selectionInfo is an int array with 3 values: {selectedSentNum, startHighlight, endHighlight}
// xxx todo xxx get rid of this check (if possible... BEI sets the selectedSentIndexRange)....
if (isFirstRun) { //NOTE needed a way to make sure that the very first time a sentence is clicked (, we didn't break stuff... this may not be the best way...
isFirstRun = false;
} else {
lastSelectedSentIndexRange[0] = selectedSentIndexRange[0];
lastSelectedSentIndexRange[1] = selectedSentIndexRange[1];
currentSentenceString = main.getDocumentPane().getText().substring(lastSelectedSentIndexRange[0],lastSelectedSentIndexRange[1]);
if (!taggedDoc.getSentenceNumber(lastSentNum).getUntagged(false).equals(currentSentenceString)) {
main.anonymityDrawingPanel.updateAnonymityBar();
setSelectionInfoAndHighlight = false;
GUIMain.saved = false;
}
if ((currentCaretPosition-1 != lastCaretLocation && !charsWereRemoved && charsWereInserted) || (currentCaretPosition != lastCaretLocation-1) && !charsWereInserted && charsWereRemoved) {
charsWereInserted = false;
charsWereRemoved = false;
shouldUpdate = true;
/**
* Exists for the sole purpose of pushing a sentence that has been edited and finished to the appropriate place in
* The Translation.java class so that it can be promptly translated. This will ONLY happen when the user has clicked
* away from the sentence they were editing to work on another one (the reason behind this being we don't want to be
* constantly pushing now sentences to be translated is the user's immediately going to replace them again, we only
* want to translate completed sentences).
*/
if (!originals.keySet().contains(main.getDocumentPane().getText().substring(selectedSentIndexRange[0],selectedSentIndexRange[1])))
translate = true;
}
}
if (setSelectionInfoAndHighlight) {
currentSentSelectionInfo = calculateIndicesOfSentences(caretPositionPriorToAction)[0];
selectedSentIndexRange[0] = currentSentSelectionInfo[1]; //start highlight
selectedSentIndexRange[1] = currentSentSelectionInfo[2]; //end highlight
moveHighlight(main, selectedSentIndexRange);
}
lastCaretLocation = currentCaretPosition;
sentToTranslate = currentSentNum;
if (!inRange) {
if (shouldUpdate && !ignoreVersion) {
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
main.versionControl.addVersion(backedUpTaggedDoc, oldStartSelection);
}
DriverTranslationsTab.showTranslations(taggedDoc.getSentenceNumber(sentToTranslate));
}
if (shouldUpdate) {
shouldUpdate = false;
GUIMain.saved = false;
removeReplaceAndUpdate(main, lastSentNum, currentSentenceString, false);
}
oldSelectionInfo = currentSentSelectionInfo;
oldStartSelection = startSelection;
oldEndSelection = endSelection;
}
}
});
/**
* Key listener for the documentPane. Allows tracking the cursor while typing to make sure that indices of sentence start and ends
*/
main.getDocumentPane().addKeyListener(new KeyListener() {
@Override
public void keyPressed(KeyEvent arg0) {
if (arg0.getKeyCode() == KeyEvent.VK_RIGHT ||
arg0.getKeyCode() == KeyEvent.VK_LEFT ||
arg0.getKeyCode() == KeyEvent.VK_UP ||
arg0.getKeyCode() == KeyEvent.VK_DOWN) {
changedCaret = true;
main.clipboard.setEnabled(false, false, true);
}
if (arg0.getKeyCode() == KeyEvent.VK_BACK_SPACE)
deleting = true;
else
deleting = false;
}
@Override
public void keyReleased(KeyEvent arg0) {}
@Override
public void keyTyped(KeyEvent arg0) {}
});
main.getDocumentPane().getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
if (!GUIMain.processed){
return;
}
charsInserted = e.getLength();
if (main.versionControl.isUndoEmpty() && GUIMain.processed && !ignoreVersion) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
if (ignoreVersion) {
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
return;
}
if (e.getLength() > 1) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
} else {
if (InputFilter.shouldBackup) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset()+1);
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
}
}
@Override
public void removeUpdate(DocumentEvent e) {
if (!GUIMain.processed) {
return;
}
if (InputFilter.ignoreDeletion)
InputFilter.ignoreDeletion = false;
else
charsRemoved = e.getLength();
if (main.versionControl.isUndoEmpty() && GUIMain.processed && !ignoreVersion) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
System.out.println(ignoreVersion);
System.out.println(GUIMain.processed);
if (ignoreVersion) {
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
return;
}
if (e.getLength() > 1) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
} else {
if (InputFilter.shouldBackup) {
main.versionControl.addVersion(backedUpTaggedDoc, e.getOffset());
backedUpTaggedDoc = new TaggedDocument(taggedDoc);
}
}
}
@Override
public void changedUpdate(DocumentEvent e) {
DriverEditor.displayEditInfo(e);
}
});
main.getDocumentPane().addMouseListener(new MouseListener() {
@Override
public void mouseClicked(MouseEvent me) {
}
@Override
public void mousePressed(MouseEvent me) {
}
@Override
public void mouseReleased(MouseEvent me) {
changedCaret = true;
deleting = false;
if (main.getDocumentPane().getCaret().getDot() == main.getDocumentPane().getCaret().getMark())
main.clipboard.setEnabled(false, false, true);
else
main.clipboard.setEnabled(true);
}
@Override
public void mouseEntered(MouseEvent me) {
}
@Override
public void mouseExited(MouseEvent me) {
}
});
/***********************************************************************************************************************************************
*############################################################################################################*
*########################################### END EDITING HANDLERS ########################################### *
*############################################################################################################*
************************************************************************************************************************************************/
/**
* ActionListener for process button (bar).
*/
main.processButton.addActionListener(new ActionListener() {
@Override
public synchronized void actionPerformed(ActionEvent event) {
// ----- check if all requirements for processing are met
String errorMessage = "Oops! Found errors that must be taken care of prior to processing!\n\nErrors found:\n";
if (!main.mainDocReady())
errorMessage += "<html>• Main document not provided.</html>\n";
if (!main.sampleDocsReady())
errorMessage += "<html>• Sample documents not provided.</html>\n";
if (!main.trainDocsReady())
errorMessage += "<html>• Train documents not provided.</html>\n";
if (!main.featuresAreReady())
errorMessage += "<html>• Feature set not chosen.</html>\n";
if (!main.classifiersAreReady())
errorMessage += "<html>• Classifier not chosen.</html>\n";
if (!main.hasAtLeastThreeOtherAuthors())
errorMessage += "<html>• You must have at least 3 other authors.</html>";
System.out.println("BEFORE IF");
// ----- display error message if there are errors
if (errorMessage != "Oops! Found errors that must be taken care of prior to processing!\n\nErrors found:\n") {
JOptionPane.showMessageDialog(main, errorMessage, "Configuration Error!",
JOptionPane.ERROR_MESSAGE);
} else {
main.leftTabPane.setSelectedIndex(0);
// ----- confirm they want to process
if (true) {// ---- can be a confirm dialog to make sure they want to process.
setAllDocTabUseable(false, main);
// ----- if this is the first run, do everything that needs to be ran the first time
if (taggedDoc == null) {
// ----- create the main document and add it to the appropriate array list.
// ----- may not need the arraylist in the future since you only really can have one at a time
TaggedDocument taggedDocument = new TaggedDocument();
ConsolidationStation.toModifyTaggedDocs=new ArrayList<TaggedDocument>();
ConsolidationStation.toModifyTaggedDocs.add(taggedDocument);
taggedDoc = ConsolidationStation.toModifyTaggedDocs.get(0);
Logger.logln(NAME+"Initial processing starting...");
// initialize all arraylists needed for feature processing
sizeOfCfd = main.cfd.numOfFeatureDrivers();
featuresInCfd = new ArrayList<String>(sizeOfCfd);
noCalcHistFeatures = new ArrayList<FeatureList>(sizeOfCfd);
yesCalcHistFeatures = new ArrayList<FeatureList>(sizeOfCfd);
for(int i = 0; i < sizeOfCfd; i++) {
String theName = main.cfd.featureDriverAt(i).getName();
// capitalize the name and replace all " " and "-" with "_"
theName = theName.replaceAll("[ -]","_").toUpperCase();
if(isCalcHist == false) {
isCalcHist = main.cfd.featureDriverAt(i).isCalcHist();
yesCalcHistFeatures.add(FeatureList.valueOf(theName));
} else {
// these values will go in suggestion list... PLUS any
noCalcHistFeatures.add(FeatureList.valueOf(theName));
}
featuresInCfd.add(i,theName);
}
wizard = new DataAnalyzer(main.ps);
magician = new DocumentMagician(false);
} else {
isFirstRun = false;
//TODO ASK ANDREW: Should we erase the user's "this is a single sentence" actions upon reprocessing? Only only when they reset the highlighter?
taggedDoc.specialCharTracker.resetEOSCharacters();
taggedDoc = new TaggedDocument(main.getDocumentPane().getText());
Logger.logln(NAME+"Repeat processing starting....");
resetAll(main);
}
main.getDocumentPane().getHighlighter().removeAllHighlights();
elementsToRemoveInSentence.clear();
selectedAddElements.clear();
selectedRemoveElements.clear();
Logger.logln(NAME+"calling backendInterface for preTargetSelectionProcessing");
BackendInterface.preTargetSelectionProcessing(main,wizard,magician);
}
}
}
});
saveAsTestDoc = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Logger.logln(NAME+"Save As document button clicked.");
JFileChooser save = new JFileChooser();
save.setSelectedFile(new File("anonymizedDoc.txt"));
save.addChoosableFileFilter(new ExtFilter("txt files (*.txt)", "txt"));
int answer = save.showSaveDialog(main);
if (answer == JFileChooser.APPROVE_OPTION) {
File f = save.getSelectedFile();
String path = f.getAbsolutePath();
if (!path.toLowerCase().endsWith(".txt"))
path += ".txt";
try {
BufferedWriter bw = new BufferedWriter(new FileWriter(path));
bw.write(main.getDocumentPane().getText());
bw.flush();
bw.close();
Logger.log("Saved contents of current tab to "+path);
GUIMain.saved = true;
} catch (IOException exc) {
Logger.logln(NAME+"Failed opening "+path+" for writing",LogOut.STDERR);
Logger.logln(NAME+exc.toString(),LogOut.STDERR);
JOptionPane.showMessageDialog(null,
"Failed saving contents of current tab into:\n"+path,
"Save Problem Set Failure",
JOptionPane.ERROR_MESSAGE);
}
} else
Logger.logln(NAME+"Save As contents of current tab canceled");
}
};
main.saveButton.addActionListener(saveAsTestDoc);
}
/**
* Resets everything to their default values, to be used before reprocessing
* @param main - An instance of GUIMain
*/
public static void resetAll(GUIMain main) {
reset();
GUIMain.GUITranslator.reset();
DriverTranslationsTab.reset();
main.versionControl.reset();
main.anonymityDrawingPanel.reset();
main.resultsWindow.reset();
GUIUpdateInterface.updateResultsPrepColor(main);
main.elementsToRemoveTable.removeAllElements();
main.elementsToRemoveModel.addRow(new String[] {"Re-processing, please wait", ""});
main.elementsToAdd.removeAllElements();
main.elementsToAdd.add(0, "Re-processing, please wait");
}
public static void reset() {
currentCaretPosition = 0;
startSelection = -1;
endSelection = -1;
noCalcHistFeatures.clear();
yesCalcHistFeatures.clear();
originals.clear();
originalSents.clear();
currentSentNum = 0;
lastSentNum = -1;
sentToTranslate = 0;
selectedSentIndexRange = new int[]{-2,-2};
lastSelectedSentIndexRange = new int[]{-3,-3};
lastCaretLocation = -1;
charsInserted = -1;
charsRemoved = -1;
currentSentenceString = "";
ignoreNumActions = 0;
caretPositionPriorToCharInsertion = 0;
caretPositionPriorToCharRemoval = 0;
caretPositionPriorToAction = 0;
oldSelectionInfo = new int[3];
wordsToRemove.clear();
}
public static void save(GUIMain main) {
Logger.logln(NAME+"Save document button clicked.");
String path = main.ps.getTestDocs().get(0).getFilePath();
try {
BufferedWriter bw = new BufferedWriter(new FileWriter(path));
bw.write(main.getDocumentPane().getText());
bw.flush();
bw.close();
Logger.log("Saved contents of document to "+path);
GUIMain.saved = true;
} catch (IOException exc) {
Logger.logln(NAME+"Failed opening "+path+" for writing",LogOut.STDERR);
Logger.logln(NAME+exc.toString(),LogOut.STDERR);
JOptionPane.showMessageDialog(null,
"Failed saving contents of current tab into:\n"+path,
"Save Problem Set Failure",
JOptionPane.ERROR_MESSAGE);
}
}
public static int getSelection(JOptionPane oPane){
Object selectedValue = oPane.getValue();
if(selectedValue != null){
Object options[] = oPane.getOptions();
if (options == null){
return ((Integer) selectedValue).intValue();
}
else{
int i;
int j;
for(i=0, j= options.length; i<j;i++){
if(options[i].equals(selectedValue))
return i;
}
}
}
return 0;
}
public static void setSuggestions() {
SuggestionCalculator.placeSuggestions(GUIMain.inst);
}
}
class TheHighlighter extends DefaultHighlighter.DefaultHighlightPainter{
public TheHighlighter(Color color){
super(color);
}
}
class SuggestionCalculator {
private final static String PUNCTUATION = "?!,.\"`'";
private final static String CLEANWORD=".*([\\.,!?])+";
private static DocumentMagician magician;
protected static Highlighter editTracker;
protected static ArrayList<String[]> topToRemove;
protected static ArrayList<String> topToAdd;
public static void init(DocumentMagician magician) {
SuggestionCalculator.magician = magician;
}
/*
* Highlights the sentence that is currently in the editor box in the main document
* no return
*/
protected static void placeSuggestions(GUIMain main) {
//We must first clear any existing highlights the user has and remove all existing suggestions
Highlighter highlight = main.getDocumentPane().getHighlighter();
int highlightedObjectsSize = DriverEditor.selectedAddElements.size();
for (int i = 0; i < highlightedObjectsSize; i++)
highlight.removeHighlight(DriverEditor.selectedAddElements.get(i).getHighlightedObject());
DriverEditor.selectedAddElements.clear();
highlightedObjectsSize = DriverEditor.selectedRemoveElements.size();
for (int i = 0; i < highlightedObjectsSize; i++)
highlight.removeHighlight(DriverEditor.selectedRemoveElements.get(i).getHighlightedObject());
DriverEditor.selectedRemoveElements.clear();
//If the user had a word highlighted and we're updating the list, we want to keep the word highlighted if it's in the updated list
String prevSelectedElement = "";
if (main.elementsToAddPane.getSelectedValue() != null)
prevSelectedElement = main.elementsToAddPane.getSelectedValue();
if (main.elementsToRemoveTable.getSelectedRow() != -1)
prevSelectedElement = (String)main.elementsToRemoveTable.getModel().getValueAt(main.elementsToRemoveTable.getSelectedRow(), 0);
if (main.elementsToRemoveTable.getRowCount() > 0)
main.elementsToRemoveTable.removeAllElements();
if (main.elementsToAdd.getSize() > 0)
main.elementsToAdd.removeAllElements();
//Adding new suggestions
List<Document> documents = magician.getDocumentSets().get(1); //all the user's sample documents (written by them)
documents.add(magician.getDocumentSets().get(2).get(0)); //we also want to count the user's test document
topToRemove = ConsolidationStation.getPriorityWordsAndOccurances(documents, true, .1);
topToAdd = ConsolidationStation.getPriorityWords(ConsolidationStation.authorSampleTaggedDocs, false, 1);
ArrayList<String> sentences = DriverEditor.taggedDoc.getUntaggedSentences(false);
int sentNum = DriverEditor.getCurrentSentNum();
String sentence = sentences.get(sentNum);
int arrSize = topToRemove.size();
// String setString = "";
// int fromIndex = 0;
String tempString;
// ArrayList<Integer> tempArray;
// int indexOfTemp;
for (int i = 0; i < arrSize; i++) {//loops through top to remove list
// setString += topToRemove.get(i) + "\n";//sets the string to return
@SuppressWarnings("resource")
Scanner parser = new Scanner(sentence);
// fromIndex = 0;
while (parser.hasNext()) {//finds if the given word to remove is in the current sentence
//loops through current sentence
tempString = parser.next();
if (tempString.matches(CLEANWORD)) {//TODO: refine this.
tempString=tempString.substring(0,tempString.length()-1);
//Logger.logln("replaced a period in: "+tempString);
}
// if (tempString.equals(topToRemove.get(i))) {
// tempArray = new ArrayList<Integer>(2);
//
// indexOfTemp = sentence.indexOf(tempString, fromIndex);
// tempArray.add(indexOfTemp + startHighlight);//-numberTimesFixTabs
// tempArray.add(indexOfTemp+tempString.length() + startHighlight);
//
// added = false;
// for(int j=0;j<indexArray.size();j++){
// if(indexArray.get(j).get(0)>tempArray.get(0)){
// indexArray.add(j,tempArray);
// added=true;
// break;
// }
// }
// if(!added)
// indexArray.add(tempArray);
// //fromIndex=tempArray.get(1);
// }
// fromIndex+=tempString.length()+1;
}
if (!topToRemove.get(i).equals("''") && !topToRemove.get(i).equals("``")) {
String left, right;
//The element to remove
if (PUNCTUATION.contains(topToRemove.get(i)[0].trim()))
left = "Reduce " + topToRemove.get(i)[0] + "'s";
else
left = topToRemove.get(i)[0];
//The number of occurrences
if (topToRemove.get(i)[1].equals("0"))
right = "None";
else if (topToRemove.get(i)[1].equals("1"))
right = "1 time";
else
right = topToRemove.get(i)[1] + " times";
main.elementsToRemoveModel.insertRow(i, new String[] {left, right});
if (topToRemove.get(i)[0].trim().equals(prevSelectedElement)) {
main.elementsToRemoveTable.setRowSelectionInterval(i, i);
}
}
}
//main.elementsToRemoveTable.clearSelection();
main.elementsToAdd.removeAllElements();
arrSize = topToAdd.size();
for (int i=0;i<arrSize;i++) {
main.elementsToAdd.add(i, topToAdd.get(i));
if (topToAdd.get(i).equals(prevSelectedElement)) {
main.elementsToAddPane.setSelectedValue(topToAdd.get(i), true);
}
}
//main.elementsToAddPane.clearSelection();
//findSynonyms(main, sentence);
}
/**
* Finds the synonyms of the words to remove in the words to add list
*/
protected static void findSynonyms(GUIMain main, String currentSent) {
String[] tempArr;
//addTracker = new DefaultHighlighter();
// TODO make new painter!!! (this one doesn't exist) anymore // painter3 = new DefaultHighlighter.DefaultHighlightPainter(new Color(0,0,255,128));
String tempStr, synSetString = "";
int index;
synSetString = "";
boolean inSent;
Scanner parser;
HashMap<String,Integer> indexMap = new HashMap<String,Integer>();
for (String[] str : topToRemove) {
tempArr = DictionaryBinding.getSynonyms(str[0]);
if (tempArr!=null) {
//inSent=currentSent.contains(str);
inSent = DriverEditor.checkSentFor(currentSent,str[0]);
if (inSent)
synSetString+=str[0]+"=>";
for (int i = 0; i < tempArr.length; i++) {//looks through synonyms
tempStr=tempArr[i];
if (inSent) {
synSetString += tempStr + ", ";
for (String addString : topToAdd) {
if (addString.equalsIgnoreCase(tempStr)) {
index = synSetString.indexOf(tempStr);
indexMap.put(tempStr, index);
}
}
}
}
if (inSent)
synSetString = synSetString.substring(0, synSetString.length()-2)+"\n";
}
}
@SuppressWarnings("resource")
Scanner sentParser = new Scanner(currentSent);
String wordToSearch, wordSynMatch;
HashMap<String,String> wordsWithSynonyms = new HashMap<String,String>();
boolean added = false;
synSetString = "";
while (sentParser.hasNext()) {//loops through every word in the sentence
wordToSearch = sentParser.next();
tempArr = DictionaryBinding.getSynonyms(wordToSearch);
wordSynMatch = "";
if (!wordsWithSynonyms.containsKey(wordToSearch.toLowerCase().trim())) {
if (tempArr != null) {
for (int i = 0; i < tempArr.length; i++) {//looks through synonyms
tempStr = tempArr[i];
wordSynMatch += tempStr + " ";
added = false;
for (String addString:topToAdd) {//loops through the toAdd list
if (addString.trim().equalsIgnoreCase(tempStr.trim())) {//there is a match in topToAdd!
if (!synSetString.contains(wordToSearch))
synSetString += wordToSearch + " => ";
synSetString = synSetString + addString + ", ";
//index=synSetString.indexOf(tempStr);
//indexMap.put(tempStr, index);
added=true;
break;
}
}
if (added) {
//do something if the word was added like print to the box.
synSetString=synSetString.substring(0, synSetString.length()-2)+"\n";
}
}
if (wordSynMatch.length() > 2)
wordsWithSynonyms.put(wordToSearch.toLowerCase().trim(), wordSynMatch.substring(0, wordSynMatch.length()-1));
else
wordsWithSynonyms.put(wordToSearch.toLowerCase().trim(), "No Synonyms");
}
}
}
String tempStrToAdd;
Word possibleToAdd;
double topAnon = 0;
for (String[] wordToRem : topToRemove) {//adds ALL the synonyms in the wordsToRemove
if (wordsWithSynonyms.containsKey(wordToRem[0])) {
tempStr = wordsWithSynonyms.get(wordToRem[0]);
tempStrToAdd = "";
parser = new Scanner(tempStr);
topAnon = 0;
while (parser.hasNext()) {
possibleToAdd = new Word(parser.next().trim());
ConsolidationStation.setWordFeatures(possibleToAdd);
if (possibleToAdd.getAnonymityIndex() > topAnon) {
tempStrToAdd = possibleToAdd.getUntagged() + ", ";//changed for test
topAnon = possibleToAdd.getAnonymityIndex();
}
}
synSetString += wordToRem[0] + " => " + tempStrToAdd + "\n";
}
}
// Iterator<String> iter = indexMap.keySet().iterator();
// String key;
// while (iter.hasNext()) {
// key = (String) iter.next();
// index = indexMap.get(key);
//
// try {
// addTracker.addHighlight(index, index+key.length(), painter3);
// } catch (BadLocationException e) {
// e.printStackTrace();
// }
// }
}
}
/*
* Answer to puzzle:
* The "~" is a bitwise "NOT". "-1" (in binary) is represented by all 1's. So, a bitwise 'NOT' makes it equivalent to '0':
*
* ~-1 == 0
*/
|
diff --git a/VSPLogin/src/vsp/servlet/handler/SubmitPasswordUpdateHandler.java b/VSPLogin/src/vsp/servlet/handler/SubmitPasswordUpdateHandler.java
index ee58f30..6c32ce6 100644
--- a/VSPLogin/src/vsp/servlet/handler/SubmitPasswordUpdateHandler.java
+++ b/VSPLogin/src/vsp/servlet/handler/SubmitPasswordUpdateHandler.java
@@ -1,112 +1,112 @@
package vsp.servlet.handler;
import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import vsp.exception.SqlRequestException;
import vsp.exception.ValidationException;
import vsp.form.validator.FormValidator;
import vsp.form.validator.FormValidatorFactory;
import vsp.servlet.form.UpdatePasswordForm;
public class SubmitPasswordUpdateHandler extends BaseServletHandler implements
ServletHandler {
@Override
public void process(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
{
try{
errors.clear();
UpdatePasswordForm passwordForm = new UpdatePasswordForm();
String uri = request.getRequestURI();
int lastIndex = uri.lastIndexOf("/");
String action = uri.substring(lastIndex + 1);
String userName = (String)request.getSession().getAttribute("password_user");
if(userName == null || userName.isEmpty()){
userName = request.getRemoteUser();
if(userName == null || userName.isEmpty())
userName = (String) request.getSession().getAttribute("userName");
}
if(userName != null && !userName.isEmpty())
{
if(action.equals("submitUpdatePassword")){
if(!vsp.checkUserPassword(userName,
request.getParameter("current_password")))
{
- errors.add("User Password is invalid");
+ errors.add("Current User Password is invalid");
dispatchUrl = "updatePassword";
request.setAttribute("errors", errors);
return;
}
}
passwordForm.setUserName(userName);
passwordForm.setPassword(request.getParameter("password"));
passwordForm.setVerifyPassword(request.getParameter("verifyPassword"));
FormValidator passwordValidator = FormValidatorFactory.getUpdatePasswordValidator();
List<String> errors = passwordValidator.validate(passwordForm);
if(errors.isEmpty()){
try {
vsp.updateUserPassword(passwordForm.getUserName(), passwordForm.getPassword(), passwordForm.getVerifyPassword());
request.setAttribute("passwordUpdate", "Password has been successfully changed");
if(request.isUserInRole("admin")){
List<String> traders;
traders = vsp.getTraders();
if (traders.size() > 0){
request.setAttribute("traders", traders);
}
dispatchUrl = "/admin/Admin.jsp";
}
else if(action.equals("submitResetPassword"))
dispatchUrl = "login";
else if(action.equals("submitUpdatePassword"))
dispatchUrl = "updatePassword";
} catch (SQLException | SqlRequestException | ValidationException e) {
errors.add(e.getMessage());
request.setAttribute("errors", errors);
if(action.equals("submitResetPassword")){
dispatchUrl="Error.jsp";
}
else if(action.equals("submitUpdatePassword")){
dispatchUrl = "updatePassword";
}
}
}else{
request.setAttribute("errors", errors);
if(request.isUserInRole("admin")){
dispatchUrl="ResetUserPassword.jsp";
}
else if(action.equals("submitResetPassword")){
dispatchUrl="Error.jsp";
}
else if(action.equals("submitUpdatePassword")){
dispatchUrl = "updatePassword";
}
}
}else{
errors.add("Unknown user name");
if(action.equals("submitResetPassword")){
dispatchUrl="Error.jsp";
}
else if(action.equals("submitUpdatePassword")){
dispatchUrl = "updatePassword";
}
}
} catch (SQLException e) {
errors.add("Error verifying user password: " + e.getMessage());
dispatchUrl="Error.jsp";
request.setAttribute("errors", errors);
}
finally{
request.getSession().removeAttribute("userName");
}
}
}
| true | true | public void process(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
{
try{
errors.clear();
UpdatePasswordForm passwordForm = new UpdatePasswordForm();
String uri = request.getRequestURI();
int lastIndex = uri.lastIndexOf("/");
String action = uri.substring(lastIndex + 1);
String userName = (String)request.getSession().getAttribute("password_user");
if(userName == null || userName.isEmpty()){
userName = request.getRemoteUser();
if(userName == null || userName.isEmpty())
userName = (String) request.getSession().getAttribute("userName");
}
if(userName != null && !userName.isEmpty())
{
if(action.equals("submitUpdatePassword")){
if(!vsp.checkUserPassword(userName,
request.getParameter("current_password")))
{
errors.add("User Password is invalid");
dispatchUrl = "updatePassword";
request.setAttribute("errors", errors);
return;
}
}
passwordForm.setUserName(userName);
passwordForm.setPassword(request.getParameter("password"));
passwordForm.setVerifyPassword(request.getParameter("verifyPassword"));
FormValidator passwordValidator = FormValidatorFactory.getUpdatePasswordValidator();
List<String> errors = passwordValidator.validate(passwordForm);
if(errors.isEmpty()){
try {
vsp.updateUserPassword(passwordForm.getUserName(), passwordForm.getPassword(), passwordForm.getVerifyPassword());
request.setAttribute("passwordUpdate", "Password has been successfully changed");
if(request.isUserInRole("admin")){
List<String> traders;
traders = vsp.getTraders();
if (traders.size() > 0){
request.setAttribute("traders", traders);
}
dispatchUrl = "/admin/Admin.jsp";
}
else if(action.equals("submitResetPassword"))
dispatchUrl = "login";
else if(action.equals("submitUpdatePassword"))
dispatchUrl = "updatePassword";
} catch (SQLException | SqlRequestException | ValidationException e) {
errors.add(e.getMessage());
request.setAttribute("errors", errors);
if(action.equals("submitResetPassword")){
dispatchUrl="Error.jsp";
}
else if(action.equals("submitUpdatePassword")){
dispatchUrl = "updatePassword";
}
}
}else{
request.setAttribute("errors", errors);
if(request.isUserInRole("admin")){
dispatchUrl="ResetUserPassword.jsp";
}
else if(action.equals("submitResetPassword")){
dispatchUrl="Error.jsp";
}
else if(action.equals("submitUpdatePassword")){
dispatchUrl = "updatePassword";
}
}
}else{
errors.add("Unknown user name");
if(action.equals("submitResetPassword")){
dispatchUrl="Error.jsp";
}
else if(action.equals("submitUpdatePassword")){
dispatchUrl = "updatePassword";
}
}
} catch (SQLException e) {
errors.add("Error verifying user password: " + e.getMessage());
dispatchUrl="Error.jsp";
request.setAttribute("errors", errors);
}
finally{
request.getSession().removeAttribute("userName");
}
}
| public void process(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
{
try{
errors.clear();
UpdatePasswordForm passwordForm = new UpdatePasswordForm();
String uri = request.getRequestURI();
int lastIndex = uri.lastIndexOf("/");
String action = uri.substring(lastIndex + 1);
String userName = (String)request.getSession().getAttribute("password_user");
if(userName == null || userName.isEmpty()){
userName = request.getRemoteUser();
if(userName == null || userName.isEmpty())
userName = (String) request.getSession().getAttribute("userName");
}
if(userName != null && !userName.isEmpty())
{
if(action.equals("submitUpdatePassword")){
if(!vsp.checkUserPassword(userName,
request.getParameter("current_password")))
{
errors.add("Current User Password is invalid");
dispatchUrl = "updatePassword";
request.setAttribute("errors", errors);
return;
}
}
passwordForm.setUserName(userName);
passwordForm.setPassword(request.getParameter("password"));
passwordForm.setVerifyPassword(request.getParameter("verifyPassword"));
FormValidator passwordValidator = FormValidatorFactory.getUpdatePasswordValidator();
List<String> errors = passwordValidator.validate(passwordForm);
if(errors.isEmpty()){
try {
vsp.updateUserPassword(passwordForm.getUserName(), passwordForm.getPassword(), passwordForm.getVerifyPassword());
request.setAttribute("passwordUpdate", "Password has been successfully changed");
if(request.isUserInRole("admin")){
List<String> traders;
traders = vsp.getTraders();
if (traders.size() > 0){
request.setAttribute("traders", traders);
}
dispatchUrl = "/admin/Admin.jsp";
}
else if(action.equals("submitResetPassword"))
dispatchUrl = "login";
else if(action.equals("submitUpdatePassword"))
dispatchUrl = "updatePassword";
} catch (SQLException | SqlRequestException | ValidationException e) {
errors.add(e.getMessage());
request.setAttribute("errors", errors);
if(action.equals("submitResetPassword")){
dispatchUrl="Error.jsp";
}
else if(action.equals("submitUpdatePassword")){
dispatchUrl = "updatePassword";
}
}
}else{
request.setAttribute("errors", errors);
if(request.isUserInRole("admin")){
dispatchUrl="ResetUserPassword.jsp";
}
else if(action.equals("submitResetPassword")){
dispatchUrl="Error.jsp";
}
else if(action.equals("submitUpdatePassword")){
dispatchUrl = "updatePassword";
}
}
}else{
errors.add("Unknown user name");
if(action.equals("submitResetPassword")){
dispatchUrl="Error.jsp";
}
else if(action.equals("submitUpdatePassword")){
dispatchUrl = "updatePassword";
}
}
} catch (SQLException e) {
errors.add("Error verifying user password: " + e.getMessage());
dispatchUrl="Error.jsp";
request.setAttribute("errors", errors);
}
finally{
request.getSession().removeAttribute("userName");
}
}
|
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
index 69f13ce99..0d1bb1baf 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
@@ -1,1054 +1,1055 @@
/* *******************************************************************
* Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
* All rights reserved.
* This program and the accompanying materials are made available
* under the terms of the Eclipse Public License v1.0
* which accompanies this distribution and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* PARC initial implementation
* Mik Kersten 2004-07-26 extended to allow overloading of
* hierarchy builder
* ******************************************************************/
package org.aspectj.ajdt.internal.compiler.lookup;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration;
import org.aspectj.ajdt.internal.compiler.ast.AstUtil;
import org.aspectj.ajdt.internal.core.builder.AjBuildManager;
import org.aspectj.bridge.ISourceLocation;
import org.aspectj.bridge.IMessage.Kind;
import org.aspectj.org.eclipse.jdt.core.Flags;
import org.aspectj.org.eclipse.jdt.core.compiler.CharOperation;
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ASTNode;
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.EmptyStatement;
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.Wildcard;
import org.aspectj.org.eclipse.jdt.internal.compiler.impl.Constant;
import org.aspectj.org.eclipse.jdt.internal.compiler.impl.ReferenceContext;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ArrayBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.BaseTypes;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Binding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.FieldBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.LocalTypeBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ParameterizedTypeBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.RawTypeBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Scope;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeVariableBinding;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.WildcardBinding;
import org.aspectj.weaver.BoundedReferenceType;
import org.aspectj.weaver.ConcreteTypeMunger;
import org.aspectj.weaver.IHasPosition;
import org.aspectj.weaver.Member;
import org.aspectj.weaver.NameMangler;
import org.aspectj.weaver.NewFieldTypeMunger;
import org.aspectj.weaver.NewMethodTypeMunger;
import org.aspectj.weaver.ReferenceType;
import org.aspectj.weaver.ResolvedMember;
import org.aspectj.weaver.ResolvedMemberImpl;
import org.aspectj.weaver.ResolvedType;
import org.aspectj.weaver.Shadow;
import org.aspectj.weaver.TypeFactory;
import org.aspectj.weaver.TypeVariable;
import org.aspectj.weaver.TypeVariableDeclaringElement;
import org.aspectj.weaver.TypeVariableReference;
import org.aspectj.weaver.UnresolvedType;
import org.aspectj.weaver.UnresolvedTypeVariableReferenceType;
import org.aspectj.weaver.World;
import org.aspectj.weaver.UnresolvedType.TypeKind;
/**
* @author Jim Hugunin
*/
public class EclipseFactory {
public static boolean DEBUG = false;
public static int debug_mungerCount = -1;
private AjBuildManager buildManager;
private LookupEnvironment lookupEnvironment;
private boolean xSerializableAspects;
private World world;
public Collection finishedTypeMungers = null;
// We can get clashes if we don't treat raw types differently - we end up looking
// up a raw and getting the generic type (pr115788)
private Map/*UnresolvedType, TypeBinding*/ typexToBinding = new HashMap();
private Map/*UnresolvedType, TypeBinding*/ rawTypeXToBinding = new HashMap();
//XXX currently unused
// private Map/*TypeBinding, ResolvedType*/ bindingToResolvedTypeX = new HashMap();
public static EclipseFactory fromLookupEnvironment(LookupEnvironment env) {
AjLookupEnvironment aenv = (AjLookupEnvironment)env;
return aenv.factory;
}
public static EclipseFactory fromScopeLookupEnvironment(Scope scope) {
return fromLookupEnvironment(AstUtil.getCompilationUnitScope(scope).environment);
}
public EclipseFactory(LookupEnvironment lookupEnvironment,AjBuildManager buildManager) {
this.lookupEnvironment = lookupEnvironment;
this.buildManager = buildManager;
this.world = buildManager.getWorld();
this.xSerializableAspects = buildManager.buildConfig.isXserializableAspects();
}
public EclipseFactory(LookupEnvironment lookupEnvironment, World world, boolean xSer) {
this.lookupEnvironment = lookupEnvironment;
this.world = world;
this.xSerializableAspects = xSer;
this.buildManager = null;
}
public World getWorld() {
return world;
}
public void showMessage(
Kind kind,
String message,
ISourceLocation loc1,
ISourceLocation loc2)
{
getWorld().showMessage(kind, message, loc1, loc2);
}
public ResolvedType fromEclipse(ReferenceBinding binding) {
if (binding == null) return ResolvedType.MISSING;
//??? this seems terribly inefficient
//System.err.println("resolving: " + binding.getClass() + ", name = " + getName(binding));
ResolvedType ret = getWorld().resolve(fromBinding(binding));
//System.err.println(" got: " + ret);
return ret;
}
public ResolvedType fromTypeBindingToRTX(TypeBinding tb) {
if (tb == null) return ResolvedType.MISSING;
ResolvedType ret = getWorld().resolve(fromBinding(tb));
return ret;
}
public ResolvedType[] fromEclipse(ReferenceBinding[] bindings) {
if (bindings == null) {
return ResolvedType.NONE;
}
int len = bindings.length;
ResolvedType[] ret = new ResolvedType[len];
for (int i=0; i < len; i++) {
ret[i] = fromEclipse(bindings[i]);
}
return ret;
}
public static String getName(TypeBinding binding) {
if (binding instanceof TypeVariableBinding) {
// The first bound may be null - so default to object?
TypeVariableBinding tvb = (TypeVariableBinding)binding;
if (tvb.firstBound!=null) {
return getName(tvb.firstBound);
} else {
return getName(tvb.superclass);
}
}
if (binding instanceof ReferenceBinding) {
return new String(
CharOperation.concatWith(((ReferenceBinding)binding).compoundName, '.'));
}
String packageName = new String(binding.qualifiedPackageName());
String className = new String(binding.qualifiedSourceName()).replace('.', '$');
if (packageName.length() > 0) {
className = packageName + "." + className;
}
//XXX doesn't handle arrays correctly (or primitives?)
return new String(className);
}
/**
* Some generics notes:
*
* Andy 6-May-05
* We were having trouble with parameterized types in a couple of places - due to TypeVariableBindings. When we
* see a TypeVariableBinding now we default to either the firstBound if it is specified or java.lang.Object. Not
* sure when/if this gets us unstuck? It does mean we forget that it is a type variable when going back
* the other way from the UnresolvedType and that would seem a bad thing - but I've yet to see the reason we need to
* remember the type variable.
* Adrian 10-July-05
* When we forget it's a type variable we come unstuck when getting the declared members of a parameterized
* type - since we don't know it's a type variable we can't replace it with the type parameter.
*/
//??? going back and forth between strings and bindings is a waste of cycles
public UnresolvedType fromBinding(TypeBinding binding) {
if (binding instanceof HelperInterfaceBinding) {
return ((HelperInterfaceBinding) binding).getTypeX();
}
if (binding == null || binding.qualifiedSourceName() == null) {
return ResolvedType.MISSING;
}
// first piece of generics support!
if (binding instanceof TypeVariableBinding) {
TypeVariableBinding tb = (TypeVariableBinding) binding;
UnresolvedTypeVariableReferenceType utvrt = (UnresolvedTypeVariableReferenceType) fromTypeVariableBinding(tb);
return utvrt;
}
// handle arrays since the component type may need special treatment too...
if (binding instanceof ArrayBinding) {
ArrayBinding aBinding = (ArrayBinding) binding;
UnresolvedType componentType = fromBinding(aBinding.leafComponentType);
return UnresolvedType.makeArray(componentType, aBinding.dimensions);
}
if (binding instanceof WildcardBinding) {
WildcardBinding eWB = (WildcardBinding) binding;
UnresolvedType theType = TypeFactory.createTypeFromSignature(CharOperation.charToString(eWB.genericTypeSignature()));
// Repair the bound
// e.g. If the bound for the wildcard is a typevariable, e.g. '? extends E' then
// the type variable in the unresolvedtype will be correct only in name. In that
// case let's set it correctly based on the one in the eclipse WildcardBinding
UnresolvedType theBound = null;
if (eWB.bound instanceof TypeVariableBinding) {
theBound = fromTypeVariableBinding((TypeVariableBinding)eWB.bound);
} else {
theBound = fromBinding(eWB.bound);
}
if (theType.isGenericWildcard() && theType.isSuper()) theType.setLowerBound(theBound);
if (theType.isGenericWildcard() && theType.isExtends()) theType.setUpperBound(theBound);
return theType;
}
if (binding instanceof ParameterizedTypeBinding) {
if (binding instanceof RawTypeBinding) {
// special case where no parameters are specified!
return UnresolvedType.forRawTypeName(getName(binding));
}
ParameterizedTypeBinding ptb = (ParameterizedTypeBinding) binding;
UnresolvedType[] arguments = null;
if (ptb.arguments!=null) { // null can mean this is an inner type of a Parameterized Type with no bounds of its own (pr100227)
arguments = new UnresolvedType[ptb.arguments.length];
for (int i = 0; i < arguments.length; i++) {
arguments[i] = fromBinding(ptb.arguments[i]);
}
}
String baseTypeSignature = null;
ResolvedType baseType = getWorld().resolve(UnresolvedType.forName(getName(binding)),true);
if (!baseType.isMissing()) {
// can legitimately be missing if a bound refers to a type we haven't added to the world yet...
- if (!baseType.isGenericType() && arguments!=null) baseType = baseType.getGenericType();
+ // pr168044 - sometimes (whilst resolving types) we are working with 'half finished' types and so (for example) the underlying generic type for a raw type hasnt been set yet
+ //if (!baseType.isGenericType() && arguments!=null) baseType = baseType.getGenericType();
baseTypeSignature = baseType.getErasureSignature();
} else {
baseTypeSignature = UnresolvedType.forName(getName(binding)).getSignature();
}
// Create an unresolved parameterized type. We can't create a resolved one as the
// act of resolution here may cause recursion problems since the parameters may
// be type variables that we haven't fixed up yet.
if (arguments==null) arguments=new UnresolvedType[0];
String parameterizedSig = ResolvedType.PARAMETERIZED_TYPE_IDENTIFIER+CharOperation.charToString(binding.genericTypeSignature()).substring(1);
return TypeFactory.createUnresolvedParameterizedType(parameterizedSig,baseTypeSignature,arguments);
}
// Convert the source type binding for a generic type into a generic UnresolvedType
// notice we can easily determine the type variables from the eclipse object
// and we can recover the generic signature from it too - so we pass those
// to the forGenericType() method.
if (binding.isGenericType() &&
!binding.isParameterizedType() &&
!binding.isRawType()) {
TypeVariableBinding[] tvbs = binding.typeVariables();
TypeVariable[] tVars = new TypeVariable[tvbs.length];
for (int i = 0; i < tvbs.length; i++) {
TypeVariableBinding eclipseV = tvbs[i];
tVars[i] = ((TypeVariableReference)fromTypeVariableBinding(eclipseV)).getTypeVariable();
}
//TODO asc generics - temporary guard....
if (!(binding instanceof SourceTypeBinding))
throw new RuntimeException("Cant get the generic sig for "+binding.debugName());
return UnresolvedType.forGenericType(getName(binding),tVars,
CharOperation.charToString(((SourceTypeBinding)binding).genericSignature()));
}
// LocalTypeBinding have a name $Local$, we can get the real name by using the signature....
if (binding instanceof LocalTypeBinding) {
LocalTypeBinding ltb = (LocalTypeBinding) binding;
if (ltb.constantPoolName() != null && ltb.constantPoolName().length > 0) {
return UnresolvedType.forSignature(new String(binding.signature()));
} else {
// we're reporting a problem and don't have a resolved name for an
// anonymous local type yet, report the issue on the enclosing type
return UnresolvedType.forSignature(new String(ltb.enclosingType.signature()));
}
}
return UnresolvedType.forName(getName(binding));
}
/**
* Some type variables refer to themselves recursively, this enables us to avoid
* recursion problems.
*/
private static Map typeVariableBindingsInProgress = new HashMap();
/**
* Convert from the eclipse form of type variable (TypeVariableBinding) to the AspectJ
* form (TypeVariable).
*/
private UnresolvedType fromTypeVariableBinding(TypeVariableBinding aTypeVariableBinding) {
// first, check for recursive call to this method for the same tvBinding
if (typeVariableBindingsInProgress.containsKey(aTypeVariableBinding)) {
return (UnresolvedType) typeVariableBindingsInProgress.get(aTypeVariableBinding);
}
// Check if its a type variable binding that we need to recover to an alias...
if (typeVariablesForAliasRecovery!=null) {
String aliasname = (String)typeVariablesForAliasRecovery.get(aTypeVariableBinding);
if (aliasname!=null) {
UnresolvedTypeVariableReferenceType ret = new UnresolvedTypeVariableReferenceType();
ret.setTypeVariable(new TypeVariable(aliasname));
return ret;
}
}
if (typeVariablesForThisMember.containsKey(new String(aTypeVariableBinding.sourceName))) {
return (UnresolvedType)typeVariablesForThisMember.get(new String(aTypeVariableBinding.sourceName));
}
// Create the UnresolvedTypeVariableReferenceType for the type variable
String name = CharOperation.charToString(aTypeVariableBinding.sourceName());
UnresolvedTypeVariableReferenceType ret = new UnresolvedTypeVariableReferenceType();
typeVariableBindingsInProgress.put(aTypeVariableBinding,ret);
TypeVariable tv = new TypeVariable(name);
ret.setTypeVariable(tv);
// Dont set any bounds here, you'll get in a recursive mess
// TODO -- what about lower bounds??
UnresolvedType superclassType = fromBinding(aTypeVariableBinding.superclass());
UnresolvedType[] superinterfaces = new UnresolvedType[aTypeVariableBinding.superInterfaces.length];
for (int i = 0; i < superinterfaces.length; i++) {
superinterfaces[i] = fromBinding(aTypeVariableBinding.superInterfaces[i]);
}
tv.setUpperBound(superclassType);
tv.setAdditionalInterfaceBounds(superinterfaces);
tv.setRank(aTypeVariableBinding.rank);
if (aTypeVariableBinding.declaringElement instanceof MethodBinding) {
tv.setDeclaringElementKind(TypeVariable.METHOD);
// tv.setDeclaringElement(fromBinding((MethodBinding)aTypeVariableBinding.declaringElement);
} else {
tv.setDeclaringElementKind(TypeVariable.TYPE);
// // tv.setDeclaringElement(fromBinding(aTypeVariableBinding.declaringElement));
}
if (aTypeVariableBinding.declaringElement instanceof MethodBinding)
typeVariablesForThisMember.put(new String(aTypeVariableBinding.sourceName),ret);
typeVariableBindingsInProgress.remove(aTypeVariableBinding);
return ret;
}
public UnresolvedType[] fromBindings(TypeBinding[] bindings) {
if (bindings == null) return UnresolvedType.NONE;
int len = bindings.length;
UnresolvedType[] ret = new UnresolvedType[len];
for (int i=0; i<len; i++) {
ret[i] = fromBinding(bindings[i]);
}
return ret;
}
public static ASTNode astForLocation(IHasPosition location) {
return new EmptyStatement(location.getStart(), location.getEnd());
}
public Collection getDeclareParents() {
return getWorld().getDeclareParents();
}
public Collection getDeclareAnnotationOnTypes() {
return getWorld().getDeclareAnnotationOnTypes();
}
public Collection getDeclareAnnotationOnFields() {
return getWorld().getDeclareAnnotationOnFields();
}
public Collection getDeclareAnnotationOnMethods() {
return getWorld().getDeclareAnnotationOnMethods();
}
public boolean areTypeMungersFinished() {
return finishedTypeMungers != null;
}
public void finishTypeMungers() {
// make sure that type mungers are
Collection ret = new ArrayList();
Collection baseTypeMungers = getWorld().getCrosscuttingMembersSet().getTypeMungers();
// XXX by Andy: why do we mix up the mungers here? it means later we know about two sets
// and the late ones are a subset of the complete set? (see pr114436)
// XXX by Andy removed this line finally, see pr141956
// baseTypeMungers.addAll(getWorld().getCrosscuttingMembersSet().getLateTypeMungers());
debug_mungerCount=baseTypeMungers.size();
for (Iterator i = baseTypeMungers.iterator(); i.hasNext(); ) {
ConcreteTypeMunger munger = (ConcreteTypeMunger) i.next();
EclipseTypeMunger etm = makeEclipseTypeMunger(munger);
if (etm != null) ret.add(etm);
}
finishedTypeMungers = ret;
}
public EclipseTypeMunger makeEclipseTypeMunger(ConcreteTypeMunger concrete) {
//System.err.println("make munger: " + concrete);
//!!! can't do this if we want incremental to work right
//if (concrete instanceof EclipseTypeMunger) return (EclipseTypeMunger)concrete;
//System.err.println(" was not eclipse");
if (concrete.getMunger() != null && EclipseTypeMunger.supportsKind(concrete.getMunger().getKind())) {
AbstractMethodDeclaration method = null;
if (concrete instanceof EclipseTypeMunger) {
method = ((EclipseTypeMunger)concrete).getSourceMethod();
}
EclipseTypeMunger ret =
new EclipseTypeMunger(this, concrete.getMunger(), concrete.getAspectType(), method);
if (ret.getSourceLocation() == null) {
ret.setSourceLocation(concrete.getSourceLocation());
}
return ret;
} else {
return null;
}
}
public Collection getTypeMungers() {
//??? assert finishedTypeMungers != null
return finishedTypeMungers;
}
public ResolvedMember makeResolvedMember(MethodBinding binding) {
return makeResolvedMember(binding, binding.declaringClass);
}
public ResolvedMember makeResolvedMember(MethodBinding binding, Shadow.Kind shadowKind) {
Member.Kind memberKind = binding.isConstructor() ? Member.CONSTRUCTOR : Member.METHOD;
if (shadowKind == Shadow.AdviceExecution) memberKind = Member.ADVICE;
return makeResolvedMember(binding,binding.declaringClass,memberKind);
}
/**
* Conversion from a methodbinding (eclipse) to a resolvedmember (aspectj) is now done
* in the scope of some type variables. Before converting the parts of a methodbinding
* (params, return type) we store the type variables in this structure, then should any
* component of the method binding refer to them, we grab them from the map.
*/
private Map typeVariablesForThisMember = new HashMap();
/**
* This is a map from typevariablebindings (eclipsey things) to the names the user
* originally specified in their ITD. For example if the target is 'interface I<N extends Number> {}'
* and the ITD was 'public void I<X>.m(List<X> lxs) {}' then this map would contain a pointer
* from the eclipse type 'N extends Number' to the letter 'X'.
*/
private Map typeVariablesForAliasRecovery;
/**
* Construct a resolvedmember from a methodbinding. The supplied map tells us about any
* typevariablebindings that replaced typevariables whilst the compiler was resolving types -
* this only happens if it is a generic itd that shares type variables with its target type.
*/
public ResolvedMember makeResolvedMemberForITD(MethodBinding binding,TypeBinding declaringType,
Map /*TypeVariableBinding > original alias name*/ recoveryAliases) {
ResolvedMember result = null;
try {
typeVariablesForAliasRecovery = recoveryAliases;
result = makeResolvedMember(binding,declaringType);
} finally {
typeVariablesForAliasRecovery = null;
}
return result;
}
public ResolvedMember makeResolvedMember(MethodBinding binding, TypeBinding declaringType) {
return makeResolvedMember(binding,declaringType,
binding.isConstructor() ? Member.CONSTRUCTOR : Member.METHOD);
}
public ResolvedMember makeResolvedMember(MethodBinding binding, TypeBinding declaringType, Member.Kind memberKind) {
//System.err.println("member for: " + binding + ", " + new String(binding.declaringClass.sourceName));
// Convert the type variables and store them
UnresolvedType[] ajTypeRefs = null;
typeVariablesForThisMember.clear();
// This is the set of type variables available whilst building the resolved member...
if (binding.typeVariables!=null) {
ajTypeRefs = new UnresolvedType[binding.typeVariables.length];
for (int i = 0; i < binding.typeVariables.length; i++) {
ajTypeRefs[i] = fromBinding(binding.typeVariables[i]);
typeVariablesForThisMember.put(new String(binding.typeVariables[i].sourceName),/*new Integer(binding.typeVariables[i].rank),*/ajTypeRefs[i]);
}
}
// AMC these next two lines shouldn't be needed once we sort out generic types properly in the world map
ResolvedType realDeclaringType = world.resolve(fromBinding(declaringType));
if (realDeclaringType.isRawType()) realDeclaringType = realDeclaringType.getGenericType();
ResolvedMemberImpl ret = new EclipseResolvedMember(binding,
memberKind,
realDeclaringType,
binding.modifiers,
fromBinding(binding.returnType),
new String(binding.selector),
fromBindings(binding.parameters),
fromBindings(binding.thrownExceptions)
);
if (binding.isVarargs()) {
ret.setVarargsMethod();
}
if (ajTypeRefs!=null) {
TypeVariable[] tVars = new TypeVariable[ajTypeRefs.length];
for (int i=0;i<ajTypeRefs.length;i++) {
tVars[i]=((TypeVariableReference)ajTypeRefs[i]).getTypeVariable();
}
ret.setTypeVariables(tVars);
}
typeVariablesForThisMember.clear();
ret.resolve(world);
return ret;
}
public ResolvedMember makeResolvedMember(FieldBinding binding) {
return makeResolvedMember(binding, binding.declaringClass);
}
public ResolvedMember makeResolvedMember(FieldBinding binding, TypeBinding receiverType) {
// AMC these next two lines shouldn't be needed once we sort out generic types properly in the world map
ResolvedType realDeclaringType = world.resolve(fromBinding(receiverType));
if (realDeclaringType.isRawType()) realDeclaringType = realDeclaringType.getGenericType();
ResolvedMemberImpl ret = new EclipseResolvedMember(binding,
Member.FIELD,
realDeclaringType,
binding.modifiers,
world.resolve(fromBinding(binding.type)),
new String(binding.name),
UnresolvedType.NONE);
return ret;
}
public TypeBinding makeTypeBinding(UnresolvedType typeX) {
TypeBinding ret = null;
// looking up type variables can get us into trouble
if (!typeX.isTypeVariableReference()) {
if (typeX.isRawType()) {
ret = (TypeBinding)rawTypeXToBinding.get(typeX);
} else {
ret = (TypeBinding)typexToBinding.get(typeX);
}
}
if (ret == null) {
ret = makeTypeBinding1(typeX);
if (!(typeX instanceof BoundedReferenceType) &&
!(typeX instanceof UnresolvedTypeVariableReferenceType)
) {
if (typeX.isRawType()) {
rawTypeXToBinding.put(typeX,ret);
} else {
typexToBinding.put(typeX, ret);
}
}
}
if (ret == null) {
System.out.println("can't find: " + typeX);
}
return ret;
}
// When converting a parameterized type from our world to the eclipse world, these get set so that
// resolution of the type parameters may known in what context it is occurring (pr114744)
private ReferenceBinding baseTypeForParameterizedType;
private int indexOfTypeParameterBeingConverted;
private TypeBinding makeTypeBinding1(UnresolvedType typeX) {
if (typeX.isPrimitiveType()) {
if (typeX == ResolvedType.BOOLEAN) return BaseTypes.BooleanBinding;
if (typeX == ResolvedType.BYTE) return BaseTypes.ByteBinding;
if (typeX == ResolvedType.CHAR) return BaseTypes.CharBinding;
if (typeX == ResolvedType.DOUBLE) return BaseTypes.DoubleBinding;
if (typeX == ResolvedType.FLOAT) return BaseTypes.FloatBinding;
if (typeX == ResolvedType.INT) return BaseTypes.IntBinding;
if (typeX == ResolvedType.LONG) return BaseTypes.LongBinding;
if (typeX == ResolvedType.SHORT) return BaseTypes.ShortBinding;
if (typeX == ResolvedType.VOID) return BaseTypes.VoidBinding;
throw new RuntimeException("weird primitive type " + typeX);
} else if (typeX.isArray()) {
int dim = 0;
while (typeX.isArray()) {
dim++;
typeX = typeX.getComponentType();
}
return lookupEnvironment.createArrayType(makeTypeBinding(typeX), dim);
} else if (typeX.isParameterizedType()) {
// Converting back to a binding from a UnresolvedType
UnresolvedType[] typeParameters = typeX.getTypeParameters();
ReferenceBinding baseTypeBinding = lookupBinding(typeX.getBaseName());
TypeBinding[] argumentBindings = new TypeBinding[typeParameters.length];
baseTypeForParameterizedType = baseTypeBinding;
for (int i = 0; i < argumentBindings.length; i++) {
indexOfTypeParameterBeingConverted = i;
argumentBindings[i] = makeTypeBinding(typeParameters[i]);
}
indexOfTypeParameterBeingConverted = 0;
baseTypeForParameterizedType = null;
ParameterizedTypeBinding ptb =
lookupEnvironment.createParameterizedType(baseTypeBinding,argumentBindings,baseTypeBinding.enclosingType());
return ptb;
} else if (typeX.isTypeVariableReference()) {
// return makeTypeVariableBinding((TypeVariableReference)typeX);
return makeTypeVariableBindingFromAJTypeVariable(((TypeVariableReference)typeX).getTypeVariable());
} else if (typeX.isRawType()) {
ReferenceBinding baseTypeBinding = lookupBinding(typeX.getBaseName());
RawTypeBinding rtb = lookupEnvironment.createRawType(baseTypeBinding,baseTypeBinding.enclosingType());
return rtb;
} else if (typeX.isGenericWildcard()) {
// translate from boundedreferencetype to WildcardBinding
BoundedReferenceType brt = (BoundedReferenceType)typeX;
// Work out 'kind' for the WildcardBinding
int boundkind = Wildcard.UNBOUND;
TypeBinding bound = null;
if (brt.isExtends()) {
boundkind = Wildcard.EXTENDS;
bound = makeTypeBinding(brt.getUpperBound());
} else if (brt.isSuper()) {
boundkind = Wildcard.SUPER;
bound = makeTypeBinding(brt.getLowerBound());
}
TypeBinding[] otherBounds = null;
if (brt.getAdditionalBounds()!=null && brt.getAdditionalBounds().length!=0) otherBounds = makeTypeBindings(brt.getAdditionalBounds());
WildcardBinding wb = lookupEnvironment.createWildcard(baseTypeForParameterizedType,indexOfTypeParameterBeingConverted,bound,otherBounds,boundkind);
return wb;
} else {
return lookupBinding(typeX.getName());
}
}
private ReferenceBinding lookupBinding(String sname) {
char[][] name = CharOperation.splitOn('.', sname.toCharArray());
ReferenceBinding rb = lookupEnvironment.getType(name);
return rb;
}
public TypeBinding[] makeTypeBindings(UnresolvedType[] types) {
int len = types.length;
TypeBinding[] ret = new TypeBinding[len];
for (int i = 0; i < len; i++) {
ret[i] = makeTypeBinding(types[i]);
}
return ret;
}
// just like the code above except it returns an array of ReferenceBindings
private ReferenceBinding[] makeReferenceBindings(UnresolvedType[] types) {
int len = types.length;
ReferenceBinding[] ret = new ReferenceBinding[len];
for (int i = 0; i < len; i++) {
ret[i] = (ReferenceBinding)makeTypeBinding(types[i]);
}
return ret;
}
// field related
public FieldBinding makeFieldBinding(NewFieldTypeMunger nftm) {
return internalMakeFieldBinding(nftm.getSignature(),nftm.getTypeVariableAliases());
}
/**
* Convert a resolvedmember into an eclipse field binding
*/
public FieldBinding makeFieldBinding(ResolvedMember member,List aliases) {
return internalMakeFieldBinding(member,aliases);
}
/**
* Convert a resolvedmember into an eclipse field binding
*/
public FieldBinding makeFieldBinding(ResolvedMember member) {
return internalMakeFieldBinding(member,null);
}
/**
* Take a normal AJ member and convert it into an eclipse fieldBinding.
* Taking into account any aliases that it may include due to being
* a generic itd. Any aliases are put into the typeVariableToBinding
* map so that they will be substituted as appropriate in the returned
* fieldbinding.
*/
public FieldBinding internalMakeFieldBinding(ResolvedMember member,List aliases) {
typeVariableToTypeBinding.clear();
TypeVariableBinding[] tvbs = null;
ReferenceBinding declaringType = (ReferenceBinding)makeTypeBinding(member.getDeclaringType());
// If there are aliases, place them in the map
if (aliases!=null && aliases.size()>0) {
int i =0;
for (Iterator iter = aliases.iterator(); iter.hasNext();) {
String element = (String) iter.next();
typeVariableToTypeBinding.put(element,declaringType.typeVariables()[i++]);
}
}
currentType = declaringType;
FieldBinding fb = new FieldBinding(member.getName().toCharArray(),
makeTypeBinding(member.getReturnType()),
member.getModifiers(),
currentType,
Constant.NotAConstant);
typeVariableToTypeBinding.clear();
currentType = null;
if (member.getName().startsWith(NameMangler.PREFIX)) {
fb.modifiers |= Flags.AccSynthetic;
}
return fb;
}
private ReferenceBinding currentType = null;
// method binding related
public MethodBinding makeMethodBinding(NewMethodTypeMunger nmtm) {
return internalMakeMethodBinding(nmtm.getSignature(),nmtm.getTypeVariableAliases());
}
/**
* Convert a resolvedmember into an eclipse method binding.
*/
public MethodBinding makeMethodBinding(ResolvedMember member,List aliases) {
return internalMakeMethodBinding(member,aliases);
}
/**
* Creates a method binding for a resolvedmember taking into account type variable aliases -
* this variant can take an aliasTargetType and should be used when the alias target type
* cannot be retrieved from the resolvedmember.
*/
public MethodBinding makeMethodBinding(ResolvedMember member,List aliases,UnresolvedType aliasTargetType) {
return internalMakeMethodBinding(member,aliases,aliasTargetType);
}
/**
* Convert a resolvedmember into an eclipse method binding.
*/
public MethodBinding makeMethodBinding(ResolvedMember member) {
return internalMakeMethodBinding(member,null); // there are no aliases
}
public MethodBinding internalMakeMethodBinding(ResolvedMember member,List aliases) {
return internalMakeMethodBinding(member,aliases,member.getDeclaringType());
}
/**
* Take a normal AJ member and convert it into an eclipse methodBinding.
* Taking into account any aliases that it may include due to being a
* generic ITD. Any aliases are put into the typeVariableToBinding
* map so that they will be substituted as appropriate in the returned
* methodbinding
*/
public MethodBinding internalMakeMethodBinding(ResolvedMember member,List aliases,UnresolvedType aliasTargetType) {
typeVariableToTypeBinding.clear();
TypeVariableBinding[] tvbs = null;
if (member.getTypeVariables()!=null) {
if (member.getTypeVariables().length==0) {
tvbs = MethodBinding.NoTypeVariables;
} else {
tvbs = makeTypeVariableBindingsFromAJTypeVariables(member.getTypeVariables());
// QQQ do we need to bother fixing up the declaring element here?
}
}
ReferenceBinding declaringType = (ReferenceBinding)makeTypeBinding(member.getDeclaringType());
// If there are aliases, place them in the map
if (aliases!=null && aliases.size()!=0) {
int i=0;
ReferenceBinding aliasTarget = (ReferenceBinding)makeTypeBinding(aliasTargetType);
for (Iterator iter = aliases.iterator(); iter.hasNext();) {
String element = (String) iter.next();
typeVariableToTypeBinding.put(element,aliasTarget.typeVariables()[i++]);
}
}
currentType = declaringType;
MethodBinding mb = new MethodBinding(member.getModifiers(),
member.getName().toCharArray(),
makeTypeBinding(member.getReturnType()),
makeTypeBindings(member.getParameterTypes()),
makeReferenceBindings(member.getExceptions()),
declaringType);
if (tvbs!=null) mb.typeVariables = tvbs;
typeVariableToTypeBinding.clear();
currentType = null;
if (NameMangler.isSyntheticMethod(member.getName(), true)) {
mb.modifiers |= Flags.AccSynthetic;
}
return mb;
}
/**
* Convert a bunch of type variables in one go, from AspectJ form to Eclipse form.
*/
// private TypeVariableBinding[] makeTypeVariableBindings(UnresolvedType[] typeVariables) {
// int len = typeVariables.length;
// TypeVariableBinding[] ret = new TypeVariableBinding[len];
// for (int i = 0; i < len; i++) {
// ret[i] = makeTypeVariableBinding((TypeVariableReference)typeVariables[i]);
// }
// return ret;
// }
private TypeVariableBinding[] makeTypeVariableBindingsFromAJTypeVariables(TypeVariable[] typeVariables) {
int len = typeVariables.length;
TypeVariableBinding[] ret = new TypeVariableBinding[len];
for (int i = 0; i < len; i++) {
ret[i] = makeTypeVariableBindingFromAJTypeVariable(typeVariables[i]);
}
return ret;
}
// only accessed through private methods in this class. Ensures all type variables we encounter
// map back to the same type binding - this is important later when Eclipse code is processing
// a methodbinding trying to come up with possible bindings for the type variables.
// key is currently the name of the type variable...is that ok?
private Map typeVariableToTypeBinding = new HashMap();
/**
* Converts from an TypeVariableReference to a TypeVariableBinding. A TypeVariableReference
* in AspectJ world holds a TypeVariable and it is this type variable that is converted
* to the TypeVariableBinding.
*/
private TypeVariableBinding makeTypeVariableBinding(TypeVariableReference tvReference) {
TypeVariable tv = tvReference.getTypeVariable();
TypeVariableBinding tvBinding = (TypeVariableBinding)typeVariableToTypeBinding.get(tv.getName());
if (currentType!=null) {
TypeVariableBinding tvb = currentType.getTypeVariable(tv.getName().toCharArray());
if (tvb!=null) return tvb;
}
if (tvBinding==null) {
Binding declaringElement = null;
// this will cause an infinite loop or NPE... not required yet luckily.
// if (tVar.getDeclaringElement() instanceof Member) {
// declaringElement = makeMethodBinding((ResolvedMember)tVar.getDeclaringElement());
// } else {
// declaringElement = makeTypeBinding((UnresolvedType)tVar.getDeclaringElement());
// }
tvBinding = new TypeVariableBinding(tv.getName().toCharArray(),declaringElement,tv.getRank());
typeVariableToTypeBinding.put(tv.getName(),tvBinding);
tvBinding.superclass=(ReferenceBinding)makeTypeBinding(tv.getUpperBound());
tvBinding.firstBound=(ReferenceBinding)makeTypeBinding(tv.getFirstBound());
if (tv.getAdditionalInterfaceBounds()==null) {
tvBinding.superInterfaces=TypeVariableBinding.NoSuperInterfaces;
} else {
TypeBinding tbs[] = makeTypeBindings(tv.getAdditionalInterfaceBounds());
ReferenceBinding[] rbs= new ReferenceBinding[tbs.length];
for (int i = 0; i < tbs.length; i++) {
rbs[i] = (ReferenceBinding)tbs[i];
}
tvBinding.superInterfaces=rbs;
}
}
return tvBinding;
}
private TypeVariableBinding makeTypeVariableBindingFromAJTypeVariable(TypeVariable tv) {
TypeVariableBinding tvBinding = (TypeVariableBinding)typeVariableToTypeBinding.get(tv.getName());
if (currentType!=null) {
TypeVariableBinding tvb = currentType.getTypeVariable(tv.getName().toCharArray());
if (tvb!=null) return tvb;
}
if (tvBinding==null) {
Binding declaringElement = null;
// this will cause an infinite loop or NPE... not required yet luckily.
// if (tVar.getDeclaringElement() instanceof Member) {
// declaringElement = makeMethodBinding((ResolvedMember)tVar.getDeclaringElement());
// } else {
// declaringElement = makeTypeBinding((UnresolvedType)tVar.getDeclaringElement());
// }
tvBinding = new TypeVariableBinding(tv.getName().toCharArray(),declaringElement,tv.getRank());
typeVariableToTypeBinding.put(tv.getName(),tvBinding);
tvBinding.superclass=(ReferenceBinding)makeTypeBinding(tv.getUpperBound());
tvBinding.firstBound=(ReferenceBinding)makeTypeBinding(tv.getFirstBound());
if (tv.getAdditionalInterfaceBounds()==null) {
tvBinding.superInterfaces=TypeVariableBinding.NoSuperInterfaces;
} else {
TypeBinding tbs[] = makeTypeBindings(tv.getAdditionalInterfaceBounds());
ReferenceBinding[] rbs= new ReferenceBinding[tbs.length];
for (int i = 0; i < tbs.length; i++) {
rbs[i] = (ReferenceBinding)tbs[i];
}
tvBinding.superInterfaces=rbs;
}
}
return tvBinding;
}
public MethodBinding makeMethodBindingForCall(Member member) {
return new MethodBinding(member.getCallsiteModifiers(),
member.getName().toCharArray(),
makeTypeBinding(member.getReturnType()),
makeTypeBindings(member.getParameterTypes()),
new ReferenceBinding[0],
(ReferenceBinding)makeTypeBinding(member.getDeclaringType()));
}
public void finishedCompilationUnit(CompilationUnitDeclaration unit) {
if ((buildManager != null) && buildManager.doGenerateModel()) {
AjBuildManager.getAsmHierarchyBuilder().buildStructureForCompilationUnit(unit, buildManager.getStructureModel(), buildManager.buildConfig);
}
}
public void addTypeBinding(TypeBinding binding) {
typexToBinding.put(fromBinding(binding), binding);
}
public void addTypeBindingAndStoreInWorld(TypeBinding binding) {
UnresolvedType ut = fromBinding(binding);
typexToBinding.put(ut, binding);
world.lookupOrCreateName(ut);
}
public Shadow makeShadow(ASTNode location, ReferenceContext context) {
return EclipseShadow.makeShadow(this, location, context);
}
public Shadow makeShadow(ReferenceContext context) {
return EclipseShadow.makeShadow(this, (ASTNode) context, context);
}
public void addSourceTypeBinding(SourceTypeBinding binding, CompilationUnitDeclaration unit) {
TypeDeclaration decl = binding.scope.referenceContext;
// Deal with the raw/basic type to give us an entry in the world type map
UnresolvedType simpleTx = null;
if (binding.isGenericType()) {
simpleTx = UnresolvedType.forRawTypeName(getName(binding));
} else if (binding.isLocalType()) {
LocalTypeBinding ltb = (LocalTypeBinding) binding;
if (ltb.constantPoolName() != null && ltb.constantPoolName().length > 0) {
simpleTx = UnresolvedType.forSignature(new String(binding.signature()));
} else {
simpleTx = UnresolvedType.forName(getName(binding));
}
}else {
simpleTx = UnresolvedType.forName(getName(binding));
}
ReferenceType name = getWorld().lookupOrCreateName(simpleTx);
// A type can change from simple > generic > simple across a set of compiles. We need
// to ensure the entry in the typemap is promoted and demoted correctly. The call
// to setGenericType() below promotes a simple to a raw. This call demotes it back
// to simple
// pr125405
if (!binding.isRawType() && !binding.isGenericType() && name.getTypekind()==TypeKind.RAW) {
name.demoteToSimpleType();
}
EclipseSourceType t = new EclipseSourceType(name, this, binding, decl, unit);
// For generics, go a bit further - build a typex for the generic type
// give it the same delegate and link it to the raw type
if (binding.isGenericType()) {
UnresolvedType complexTx = fromBinding(binding); // fully aware of any generics info
ResolvedType cName = world.resolve(complexTx,true);
ReferenceType complexName = null;
if (!cName.isMissing()) {
complexName = (ReferenceType) cName;
complexName = (ReferenceType) complexName.getGenericType();
if (complexName == null) complexName = new ReferenceType(complexTx,world);
} else {
complexName = new ReferenceType(complexTx,world);
}
name.setGenericType(complexName);
complexName.setDelegate(t);
}
name.setDelegate(t);
if (decl instanceof AspectDeclaration) {
((AspectDeclaration)decl).typeX = name;
((AspectDeclaration)decl).concreteName = t;
}
ReferenceBinding[] memberTypes = binding.memberTypes;
for (int i = 0, length = memberTypes.length; i < length; i++) {
addSourceTypeBinding((SourceTypeBinding) memberTypes[i], unit);
}
}
// XXX this doesn't feel like it belongs here, but it breaks a hard dependency on
// exposing AjBuildManager (needed by AspectDeclaration).
public boolean isXSerializableAspects() {
return xSerializableAspects;
}
public ResolvedMember fromBinding(MethodBinding binding) {
return new ResolvedMemberImpl(Member.METHOD,fromBinding(binding.declaringClass),binding.modifiers,
fromBinding(binding.returnType),CharOperation.charToString(binding.selector),fromBindings(binding.parameters));
}
public TypeVariableDeclaringElement fromBinding(Binding declaringElement) {
if (declaringElement instanceof TypeBinding) {
return fromBinding(((TypeBinding)declaringElement));
} else {
return fromBinding((MethodBinding)declaringElement);
}
}
public void cleanup() {
this.typexToBinding.clear();
this.rawTypeXToBinding.clear();
this.finishedTypeMungers = null;
}
public void minicleanup() {
this.typexToBinding.clear();
this.rawTypeXToBinding.clear();
}
}
| true | true | public UnresolvedType fromBinding(TypeBinding binding) {
if (binding instanceof HelperInterfaceBinding) {
return ((HelperInterfaceBinding) binding).getTypeX();
}
if (binding == null || binding.qualifiedSourceName() == null) {
return ResolvedType.MISSING;
}
// first piece of generics support!
if (binding instanceof TypeVariableBinding) {
TypeVariableBinding tb = (TypeVariableBinding) binding;
UnresolvedTypeVariableReferenceType utvrt = (UnresolvedTypeVariableReferenceType) fromTypeVariableBinding(tb);
return utvrt;
}
// handle arrays since the component type may need special treatment too...
if (binding instanceof ArrayBinding) {
ArrayBinding aBinding = (ArrayBinding) binding;
UnresolvedType componentType = fromBinding(aBinding.leafComponentType);
return UnresolvedType.makeArray(componentType, aBinding.dimensions);
}
if (binding instanceof WildcardBinding) {
WildcardBinding eWB = (WildcardBinding) binding;
UnresolvedType theType = TypeFactory.createTypeFromSignature(CharOperation.charToString(eWB.genericTypeSignature()));
// Repair the bound
// e.g. If the bound for the wildcard is a typevariable, e.g. '? extends E' then
// the type variable in the unresolvedtype will be correct only in name. In that
// case let's set it correctly based on the one in the eclipse WildcardBinding
UnresolvedType theBound = null;
if (eWB.bound instanceof TypeVariableBinding) {
theBound = fromTypeVariableBinding((TypeVariableBinding)eWB.bound);
} else {
theBound = fromBinding(eWB.bound);
}
if (theType.isGenericWildcard() && theType.isSuper()) theType.setLowerBound(theBound);
if (theType.isGenericWildcard() && theType.isExtends()) theType.setUpperBound(theBound);
return theType;
}
if (binding instanceof ParameterizedTypeBinding) {
if (binding instanceof RawTypeBinding) {
// special case where no parameters are specified!
return UnresolvedType.forRawTypeName(getName(binding));
}
ParameterizedTypeBinding ptb = (ParameterizedTypeBinding) binding;
UnresolvedType[] arguments = null;
if (ptb.arguments!=null) { // null can mean this is an inner type of a Parameterized Type with no bounds of its own (pr100227)
arguments = new UnresolvedType[ptb.arguments.length];
for (int i = 0; i < arguments.length; i++) {
arguments[i] = fromBinding(ptb.arguments[i]);
}
}
String baseTypeSignature = null;
ResolvedType baseType = getWorld().resolve(UnresolvedType.forName(getName(binding)),true);
if (!baseType.isMissing()) {
// can legitimately be missing if a bound refers to a type we haven't added to the world yet...
if (!baseType.isGenericType() && arguments!=null) baseType = baseType.getGenericType();
baseTypeSignature = baseType.getErasureSignature();
} else {
baseTypeSignature = UnresolvedType.forName(getName(binding)).getSignature();
}
// Create an unresolved parameterized type. We can't create a resolved one as the
// act of resolution here may cause recursion problems since the parameters may
// be type variables that we haven't fixed up yet.
if (arguments==null) arguments=new UnresolvedType[0];
String parameterizedSig = ResolvedType.PARAMETERIZED_TYPE_IDENTIFIER+CharOperation.charToString(binding.genericTypeSignature()).substring(1);
return TypeFactory.createUnresolvedParameterizedType(parameterizedSig,baseTypeSignature,arguments);
}
// Convert the source type binding for a generic type into a generic UnresolvedType
// notice we can easily determine the type variables from the eclipse object
// and we can recover the generic signature from it too - so we pass those
// to the forGenericType() method.
if (binding.isGenericType() &&
!binding.isParameterizedType() &&
!binding.isRawType()) {
TypeVariableBinding[] tvbs = binding.typeVariables();
TypeVariable[] tVars = new TypeVariable[tvbs.length];
for (int i = 0; i < tvbs.length; i++) {
TypeVariableBinding eclipseV = tvbs[i];
tVars[i] = ((TypeVariableReference)fromTypeVariableBinding(eclipseV)).getTypeVariable();
}
//TODO asc generics - temporary guard....
if (!(binding instanceof SourceTypeBinding))
throw new RuntimeException("Cant get the generic sig for "+binding.debugName());
return UnresolvedType.forGenericType(getName(binding),tVars,
CharOperation.charToString(((SourceTypeBinding)binding).genericSignature()));
}
// LocalTypeBinding have a name $Local$, we can get the real name by using the signature....
if (binding instanceof LocalTypeBinding) {
LocalTypeBinding ltb = (LocalTypeBinding) binding;
if (ltb.constantPoolName() != null && ltb.constantPoolName().length > 0) {
return UnresolvedType.forSignature(new String(binding.signature()));
} else {
// we're reporting a problem and don't have a resolved name for an
// anonymous local type yet, report the issue on the enclosing type
return UnresolvedType.forSignature(new String(ltb.enclosingType.signature()));
}
}
return UnresolvedType.forName(getName(binding));
}
| public UnresolvedType fromBinding(TypeBinding binding) {
if (binding instanceof HelperInterfaceBinding) {
return ((HelperInterfaceBinding) binding).getTypeX();
}
if (binding == null || binding.qualifiedSourceName() == null) {
return ResolvedType.MISSING;
}
// first piece of generics support!
if (binding instanceof TypeVariableBinding) {
TypeVariableBinding tb = (TypeVariableBinding) binding;
UnresolvedTypeVariableReferenceType utvrt = (UnresolvedTypeVariableReferenceType) fromTypeVariableBinding(tb);
return utvrt;
}
// handle arrays since the component type may need special treatment too...
if (binding instanceof ArrayBinding) {
ArrayBinding aBinding = (ArrayBinding) binding;
UnresolvedType componentType = fromBinding(aBinding.leafComponentType);
return UnresolvedType.makeArray(componentType, aBinding.dimensions);
}
if (binding instanceof WildcardBinding) {
WildcardBinding eWB = (WildcardBinding) binding;
UnresolvedType theType = TypeFactory.createTypeFromSignature(CharOperation.charToString(eWB.genericTypeSignature()));
// Repair the bound
// e.g. If the bound for the wildcard is a typevariable, e.g. '? extends E' then
// the type variable in the unresolvedtype will be correct only in name. In that
// case let's set it correctly based on the one in the eclipse WildcardBinding
UnresolvedType theBound = null;
if (eWB.bound instanceof TypeVariableBinding) {
theBound = fromTypeVariableBinding((TypeVariableBinding)eWB.bound);
} else {
theBound = fromBinding(eWB.bound);
}
if (theType.isGenericWildcard() && theType.isSuper()) theType.setLowerBound(theBound);
if (theType.isGenericWildcard() && theType.isExtends()) theType.setUpperBound(theBound);
return theType;
}
if (binding instanceof ParameterizedTypeBinding) {
if (binding instanceof RawTypeBinding) {
// special case where no parameters are specified!
return UnresolvedType.forRawTypeName(getName(binding));
}
ParameterizedTypeBinding ptb = (ParameterizedTypeBinding) binding;
UnresolvedType[] arguments = null;
if (ptb.arguments!=null) { // null can mean this is an inner type of a Parameterized Type with no bounds of its own (pr100227)
arguments = new UnresolvedType[ptb.arguments.length];
for (int i = 0; i < arguments.length; i++) {
arguments[i] = fromBinding(ptb.arguments[i]);
}
}
String baseTypeSignature = null;
ResolvedType baseType = getWorld().resolve(UnresolvedType.forName(getName(binding)),true);
if (!baseType.isMissing()) {
// can legitimately be missing if a bound refers to a type we haven't added to the world yet...
// pr168044 - sometimes (whilst resolving types) we are working with 'half finished' types and so (for example) the underlying generic type for a raw type hasnt been set yet
//if (!baseType.isGenericType() && arguments!=null) baseType = baseType.getGenericType();
baseTypeSignature = baseType.getErasureSignature();
} else {
baseTypeSignature = UnresolvedType.forName(getName(binding)).getSignature();
}
// Create an unresolved parameterized type. We can't create a resolved one as the
// act of resolution here may cause recursion problems since the parameters may
// be type variables that we haven't fixed up yet.
if (arguments==null) arguments=new UnresolvedType[0];
String parameterizedSig = ResolvedType.PARAMETERIZED_TYPE_IDENTIFIER+CharOperation.charToString(binding.genericTypeSignature()).substring(1);
return TypeFactory.createUnresolvedParameterizedType(parameterizedSig,baseTypeSignature,arguments);
}
// Convert the source type binding for a generic type into a generic UnresolvedType
// notice we can easily determine the type variables from the eclipse object
// and we can recover the generic signature from it too - so we pass those
// to the forGenericType() method.
if (binding.isGenericType() &&
!binding.isParameterizedType() &&
!binding.isRawType()) {
TypeVariableBinding[] tvbs = binding.typeVariables();
TypeVariable[] tVars = new TypeVariable[tvbs.length];
for (int i = 0; i < tvbs.length; i++) {
TypeVariableBinding eclipseV = tvbs[i];
tVars[i] = ((TypeVariableReference)fromTypeVariableBinding(eclipseV)).getTypeVariable();
}
//TODO asc generics - temporary guard....
if (!(binding instanceof SourceTypeBinding))
throw new RuntimeException("Cant get the generic sig for "+binding.debugName());
return UnresolvedType.forGenericType(getName(binding),tVars,
CharOperation.charToString(((SourceTypeBinding)binding).genericSignature()));
}
// LocalTypeBinding have a name $Local$, we can get the real name by using the signature....
if (binding instanceof LocalTypeBinding) {
LocalTypeBinding ltb = (LocalTypeBinding) binding;
if (ltb.constantPoolName() != null && ltb.constantPoolName().length > 0) {
return UnresolvedType.forSignature(new String(binding.signature()));
} else {
// we're reporting a problem and don't have a resolved name for an
// anonymous local type yet, report the issue on the enclosing type
return UnresolvedType.forSignature(new String(ltb.enclosingType.signature()));
}
}
return UnresolvedType.forName(getName(binding));
}
|
diff --git a/src/main/java/nl/topicus/onderwijs/dashboard/datatypes/Event.java b/src/main/java/nl/topicus/onderwijs/dashboard/datatypes/Event.java
index ae7bdf3..6f04755 100644
--- a/src/main/java/nl/topicus/onderwijs/dashboard/datatypes/Event.java
+++ b/src/main/java/nl/topicus/onderwijs/dashboard/datatypes/Event.java
@@ -1,131 +1,131 @@
package nl.topicus.onderwijs.dashboard.datatypes;
import java.io.IOException;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.Set;
import java.util.TreeSet;
import nl.topicus.onderwijs.dashboard.keys.Key;
import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
public class Event implements Serializable {
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat(
"dd-MM-yyyy");
private static final long serialVersionUID = 1L;
private Key key;
private String title;
private Date dateTime;
private boolean major;
private Set<String> tags = new TreeSet<String>();
private String color;
public Key getKey() {
return key;
}
public void setKey(Key key) {
this.key = key;
}
public String getKeyName() {
return getKey().getName();
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public int getDaysUntil() {
Calendar nowDate = Calendar.getInstance();
nowDate.set(Calendar.MILLISECOND, 0);
nowDate.set(Calendar.SECOND, 0);
nowDate.set(Calendar.MINUTE, 0);
- nowDate.set(Calendar.HOUR, 0);
+ nowDate.set(Calendar.HOUR_OF_DAY, 0);
Calendar eventDate = Calendar.getInstance();
eventDate.setTime(getDateTime());
eventDate.set(Calendar.MILLISECOND, 0);
eventDate.set(Calendar.SECOND, 0);
eventDate.set(Calendar.MINUTE, 0);
- eventDate.set(Calendar.HOUR, 0);
+ eventDate.set(Calendar.HOUR_OF_DAY, 0);
long diffInMs = eventDate.getTimeInMillis() - nowDate.getTimeInMillis();
return (int) (diffInMs / (24 * 3600 * 1000));
}
public String getDaysUntilAsString() {
int days = getDaysUntil();
if (days == 0)
return "Today";
if (days == 1)
return "Tomorrow";
if (days < 7) {
Calendar cal = Calendar.getInstance();
cal.add(Calendar.DAY_OF_YEAR, days);
return cal.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG,
Locale.getDefault());
}
return days + " days until";
}
public String getDateAsString() {
return DATE_FORMAT.format(getDateTime());
}
public Date getDateTime() {
return dateTime;
}
public void setDateTime(Date dateTime) {
this.dateTime = dateTime;
}
public boolean isMajor() {
return major;
}
public void setMajor(boolean major) {
this.major = major;
}
public Set<String> getTags() {
return tags;
}
public void setTags(Set<String> tags) {
this.tags = tags;
}
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
@Override
public String toString() {
ObjectMapper mapper = new ObjectMapper();
try {
return mapper.writeValueAsString(this);
} catch (JsonGenerationException e) {
throw new RuntimeException(e);
} catch (JsonMappingException e) {
throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
| false | true | public int getDaysUntil() {
Calendar nowDate = Calendar.getInstance();
nowDate.set(Calendar.MILLISECOND, 0);
nowDate.set(Calendar.SECOND, 0);
nowDate.set(Calendar.MINUTE, 0);
nowDate.set(Calendar.HOUR, 0);
Calendar eventDate = Calendar.getInstance();
eventDate.setTime(getDateTime());
eventDate.set(Calendar.MILLISECOND, 0);
eventDate.set(Calendar.SECOND, 0);
eventDate.set(Calendar.MINUTE, 0);
eventDate.set(Calendar.HOUR, 0);
long diffInMs = eventDate.getTimeInMillis() - nowDate.getTimeInMillis();
return (int) (diffInMs / (24 * 3600 * 1000));
}
| public int getDaysUntil() {
Calendar nowDate = Calendar.getInstance();
nowDate.set(Calendar.MILLISECOND, 0);
nowDate.set(Calendar.SECOND, 0);
nowDate.set(Calendar.MINUTE, 0);
nowDate.set(Calendar.HOUR_OF_DAY, 0);
Calendar eventDate = Calendar.getInstance();
eventDate.setTime(getDateTime());
eventDate.set(Calendar.MILLISECOND, 0);
eventDate.set(Calendar.SECOND, 0);
eventDate.set(Calendar.MINUTE, 0);
eventDate.set(Calendar.HOUR_OF_DAY, 0);
long diffInMs = eventDate.getTimeInMillis() - nowDate.getTimeInMillis();
return (int) (diffInMs / (24 * 3600 * 1000));
}
|
diff --git a/fabric/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/ZNodeCompleter.java b/fabric/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/ZNodeCompleter.java
index 0fed76d7d..4f4db31df 100644
--- a/fabric/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/ZNodeCompleter.java
+++ b/fabric/fabric-zookeeper-commands/src/main/java/org/fusesource/fabric/zookeeper/commands/ZNodeCompleter.java
@@ -1,63 +1,65 @@
/**
* Copyright (C) FuseSource, Inc.
* http://fusesource.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.fusesource.fabric.zookeeper.commands;
import java.util.List;
import org.apache.karaf.shell.console.Completer;
import org.apache.zookeeper.KeeperException;
import org.linkedin.zookeeper.client.IZKClient;
public class ZNodeCompleter implements Completer {
private IZKClient zk;
public ZNodeCompleter() {
this.zk = zk;
}
public void setZooKeeper(IZKClient zk) {
this.zk = zk;
}
@SuppressWarnings("unchecked")
public int complete(String buffer, int cursor, List candidates) {
// Guarantee that the final token is the one we're expanding
if (buffer == null) {
candidates.add("/");
return 1;
+ } else if (!buffer.startsWith("/")) {
+ return 0;
}
buffer = buffer.substring(0, cursor);
String path = buffer;
int idx = path.lastIndexOf("/") + 1;
String prefix = path.substring(idx);
try {
// Only the root path can end in a /, so strip it off every other prefix
String dir = idx == 1 ? "/" : path.substring(0, idx - 1);
List<String> children = zk.getChildren(dir, false);
for (String child : children) {
if (child.startsWith(prefix)) {
candidates.add(child);
}
}
} catch (InterruptedException e) {
return 0;
} catch (KeeperException e) {
return 0;
}
return candidates.size() == 0 ? buffer.length() : buffer.lastIndexOf("/") + 1;
}
}
| true | true | public int complete(String buffer, int cursor, List candidates) {
// Guarantee that the final token is the one we're expanding
if (buffer == null) {
candidates.add("/");
return 1;
}
buffer = buffer.substring(0, cursor);
String path = buffer;
int idx = path.lastIndexOf("/") + 1;
String prefix = path.substring(idx);
try {
// Only the root path can end in a /, so strip it off every other prefix
String dir = idx == 1 ? "/" : path.substring(0, idx - 1);
List<String> children = zk.getChildren(dir, false);
for (String child : children) {
if (child.startsWith(prefix)) {
candidates.add(child);
}
}
} catch (InterruptedException e) {
return 0;
} catch (KeeperException e) {
return 0;
}
return candidates.size() == 0 ? buffer.length() : buffer.lastIndexOf("/") + 1;
}
| public int complete(String buffer, int cursor, List candidates) {
// Guarantee that the final token is the one we're expanding
if (buffer == null) {
candidates.add("/");
return 1;
} else if (!buffer.startsWith("/")) {
return 0;
}
buffer = buffer.substring(0, cursor);
String path = buffer;
int idx = path.lastIndexOf("/") + 1;
String prefix = path.substring(idx);
try {
// Only the root path can end in a /, so strip it off every other prefix
String dir = idx == 1 ? "/" : path.substring(0, idx - 1);
List<String> children = zk.getChildren(dir, false);
for (String child : children) {
if (child.startsWith(prefix)) {
candidates.add(child);
}
}
} catch (InterruptedException e) {
return 0;
} catch (KeeperException e) {
return 0;
}
return candidates.size() == 0 ? buffer.length() : buffer.lastIndexOf("/") + 1;
}
|
diff --git a/source/com/mucommander/ui/dialog/file/PackDialog.java b/source/com/mucommander/ui/dialog/file/PackDialog.java
index 2e52b693..723eb854 100644
--- a/source/com/mucommander/ui/dialog/file/PackDialog.java
+++ b/source/com/mucommander/ui/dialog/file/PackDialog.java
@@ -1,263 +1,263 @@
/*
* This file is part of muCommander, http://www.mucommander.com
* Copyright (C) 2002-2007 Maxence Bernard
*
* muCommander is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* muCommander is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.mucommander.ui.dialog.file;
import com.mucommander.file.AbstractFile;
import com.mucommander.file.FileFactory;
import com.mucommander.file.archiver.Archiver;
import com.mucommander.file.util.FileSet;
import com.mucommander.file.util.FileToolkit;
import com.mucommander.job.ArchiveJob;
import com.mucommander.text.Translator;
import com.mucommander.ui.dialog.DialogToolkit;
import com.mucommander.ui.dialog.FocusDialog;
import com.mucommander.ui.dialog.QuestionDialog;
import com.mucommander.ui.layout.YBoxPanel;
import com.mucommander.ui.main.MainFrame;
import com.mucommander.ui.main.table.FileTable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
/**
* This dialog allows the user to pack marked files to an archive file of a selected format (Zip, TAR, ...)
* and add an optional comment to the archive (for the formats that support it).
*
* @author Maxence Bernard
*/
public class PackDialog extends FocusDialog implements ActionListener, ItemListener {
private MainFrame mainFrame;
/** Files to archive */
private FileSet files;
private JTextField filePathField;
private JComboBox formatsComboBox;
private int formats[];
private JTextArea commentArea;
private JButton okButton;
private JButton cancelButton;
/** Used to keep track of the last selected archive format. */
private int oldFormatIndex;
// Dialog's width has to be at least 240
private final static Dimension MINIMUM_DIALOG_DIMENSION = new Dimension(320,0);
// Dialog's width has to be at most 320
private final static Dimension MAXIMUM_DIALOG_DIMENSION = new Dimension(400,10000);
/** Last archive format used (Zip initially), selected by default when this dialog is created */
private static int lastFormat = Archiver.ZIP_FORMAT;
public PackDialog(MainFrame mainFrame, FileSet files, boolean isShiftDown) {
super(mainFrame, Translator.get(com.mucommander.ui.action.PackAction.class.getName()+".label"), mainFrame);
this.mainFrame = mainFrame;
this.files = files;
// Retrieve available formats for single file or many file archives
int nbFiles = files.size();
this.formats = Archiver.getFormats(nbFiles>1 || (nbFiles>0 && files.fileAt(0).isDirectory()));
int nbFormats = formats.length;
int initialFormat = formats[0]; // this value will only be used if last format is not available
int initialFormatIndex = 0; // this value will only be used if last format is not available
for(int i=0; i<nbFormats; i++) {
if(formats[i]==lastFormat) {
initialFormat = formats[i];
initialFormatIndex = i;
break;
}
}
- oldFormatIndex = initialFormat;
+ oldFormatIndex = initialFormatIndex;
Container contentPane = getContentPane();
YBoxPanel mainPanel = new YBoxPanel(5);
JLabel label = new JLabel(Translator.get("pack_dialog_description")+" :");
mainPanel.add(label);
FileTable activeTable = mainFrame.getInactiveTable();
String initialPath = (isShiftDown?"":activeTable.getCurrentFolder().getAbsolutePath(true));
String fileName;
// Computes the archive's default name:
// - if it only contains one file, uses that file's name.
// - if it contains more than one file, uses the FileSet's parent folder's name.
if(files.size() == 1)
fileName = files.fileAt(0).getNameWithoutExtension();
else if(files.getBaseFolder().getParent() != null)
fileName = files.getBaseFolder().getName();
else
fileName = "";
filePathField = new JTextField(initialPath + fileName + "." + Archiver.getFormatExtension(initialFormat));
// Selects the file name.
filePathField.setSelectionStart(initialPath.length());
filePathField.setSelectionEnd(initialPath.length() + fileName.length());
mainPanel.add(filePathField);
mainPanel.addSpace(10);
// Archive formats combo box
JPanel tempPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
tempPanel.add(new JLabel(Translator.get("pack_dialog.archive_format")));
this.formatsComboBox = new JComboBox();
for(int i=0; i<nbFormats; i++)
formatsComboBox.addItem(Archiver.getFormatName(formats[i]));
formatsComboBox.setSelectedIndex(initialFormatIndex);
formatsComboBox.addItemListener(this);
tempPanel.add(formatsComboBox);
mainPanel.add(tempPanel);
mainPanel.addSpace(10);
// Comment area, enabled only if selected archive format has comment support
label = new JLabel(Translator.get("pack_dialog.comment"));
mainPanel.add(label);
commentArea = new JTextArea();
commentArea.setRows(4);
mainPanel.add(commentArea);
mainPanel.addSpace(10);
contentPane.add(mainPanel, BorderLayout.NORTH);
okButton = new JButton(Translator.get("pack_dialog.pack"));
cancelButton = new JButton(Translator.get("cancel"));
contentPane.add(DialogToolkit.createOKCancelPanel(okButton, cancelButton, this), BorderLayout.SOUTH);
// Text field will receive initial focus
setInitialFocusComponent(filePathField);
// Selects OK when enter is pressed
getRootPane().setDefaultButton(okButton);
// Packs dialog
setMinimumSize(MINIMUM_DIALOG_DIMENSION);
setMaximumSize(MAXIMUM_DIALOG_DIMENSION);
showDialog();
}
////////////////////////////
// ActionListener methods //
////////////////////////////
public void actionPerformed(ActionEvent e) {
Object source = e.getSource();
if (source==okButton) {
// Start by disposing the dialog
dispose();
// Check that destination file can be resolved
String filePath = filePathField.getText();
// TODO: move those I/O bound calls to job as they can lock the main thread
Object dest[] = FileToolkit.resolvePath(filePath, mainFrame.getActiveTable().getCurrentFolder());
if (dest==null || dest[1]==null) {
// Incorrect destination
QuestionDialog dialog = new QuestionDialog(mainFrame, Translator.get("pack_dialog.error_title"), Translator.get("this_folder_does_not_exist", filePath), mainFrame,
new String[] {Translator.get("ok")},
new int[] {0},
0);
dialog.getActionValue();
return;
}
// TODO: move those I/O bound calls to job as they can lock the main thread
// TODO: destFile could potentially be null !
AbstractFile destFile = FileFactory.getFile(((AbstractFile)dest[0]).getAbsolutePath(true)+(String)dest[1]);
// Start packing
ProgressDialog progressDialog = new ProgressDialog(mainFrame, Translator.get("pack_dialog.packing"));
int format = formats[formatsComboBox.getSelectedIndex()];
ArchiveJob archiveJob = new ArchiveJob(progressDialog, mainFrame, files, destFile, format, Archiver.formatSupportsComment(format)?commentArea.getText():null);
progressDialog.start(archiveJob);
// Remember last format used, for next time this dialog is invoked
lastFormat = format;
}
else if (source==cancelButton) {
// Simply dispose the dialog
dispose();
}
}
//////////////////////////
// ItemListener methods //
//////////////////////////
public void itemStateChanged(ItemEvent e) {
int newFormatIndex;
// Updates the GUI if, and only if, the format selection has changed.
if(oldFormatIndex != (newFormatIndex = formatsComboBox.getSelectedIndex())) {
String fileName = filePathField.getText(); // Name of the destination archive file.
String oldFormatExtension = Archiver.getFormatExtension(formats[oldFormatIndex]); // Old/current format's extension
if(fileName.endsWith("." + oldFormatExtension)) {
int selectionStart;
int selectionEnd;
// Saves the old selection.
selectionStart = filePathField.getSelectionStart();
selectionEnd = filePathField.getSelectionEnd();
// Computes the new file name.
fileName = fileName.substring(0, fileName.length() - oldFormatExtension.length()) +
Archiver.getFormatExtension(formats[newFormatIndex]);
// Makes sure that the selection stays somewhat coherent.
if(selectionEnd == filePathField.getText().length())
selectionEnd = fileName.length();
// Resets the file path field.
filePathField.setText(fileName);
filePathField.setSelectionStart(selectionStart);
filePathField.setSelectionEnd(selectionEnd);
}
commentArea.setEnabled(Archiver.formatSupportsComment(formats[formatsComboBox.getSelectedIndex()]));
oldFormatIndex = newFormatIndex;
}
// Transfer focus back to the text field
filePathField.requestFocus();
}
}
| true | true | public PackDialog(MainFrame mainFrame, FileSet files, boolean isShiftDown) {
super(mainFrame, Translator.get(com.mucommander.ui.action.PackAction.class.getName()+".label"), mainFrame);
this.mainFrame = mainFrame;
this.files = files;
// Retrieve available formats for single file or many file archives
int nbFiles = files.size();
this.formats = Archiver.getFormats(nbFiles>1 || (nbFiles>0 && files.fileAt(0).isDirectory()));
int nbFormats = formats.length;
int initialFormat = formats[0]; // this value will only be used if last format is not available
int initialFormatIndex = 0; // this value will only be used if last format is not available
for(int i=0; i<nbFormats; i++) {
if(formats[i]==lastFormat) {
initialFormat = formats[i];
initialFormatIndex = i;
break;
}
}
oldFormatIndex = initialFormat;
Container contentPane = getContentPane();
YBoxPanel mainPanel = new YBoxPanel(5);
JLabel label = new JLabel(Translator.get("pack_dialog_description")+" :");
mainPanel.add(label);
FileTable activeTable = mainFrame.getInactiveTable();
String initialPath = (isShiftDown?"":activeTable.getCurrentFolder().getAbsolutePath(true));
String fileName;
// Computes the archive's default name:
// - if it only contains one file, uses that file's name.
// - if it contains more than one file, uses the FileSet's parent folder's name.
if(files.size() == 1)
fileName = files.fileAt(0).getNameWithoutExtension();
else if(files.getBaseFolder().getParent() != null)
fileName = files.getBaseFolder().getName();
else
fileName = "";
filePathField = new JTextField(initialPath + fileName + "." + Archiver.getFormatExtension(initialFormat));
// Selects the file name.
filePathField.setSelectionStart(initialPath.length());
filePathField.setSelectionEnd(initialPath.length() + fileName.length());
mainPanel.add(filePathField);
mainPanel.addSpace(10);
// Archive formats combo box
JPanel tempPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
tempPanel.add(new JLabel(Translator.get("pack_dialog.archive_format")));
this.formatsComboBox = new JComboBox();
for(int i=0; i<nbFormats; i++)
formatsComboBox.addItem(Archiver.getFormatName(formats[i]));
formatsComboBox.setSelectedIndex(initialFormatIndex);
formatsComboBox.addItemListener(this);
tempPanel.add(formatsComboBox);
mainPanel.add(tempPanel);
mainPanel.addSpace(10);
// Comment area, enabled only if selected archive format has comment support
label = new JLabel(Translator.get("pack_dialog.comment"));
mainPanel.add(label);
commentArea = new JTextArea();
commentArea.setRows(4);
mainPanel.add(commentArea);
mainPanel.addSpace(10);
contentPane.add(mainPanel, BorderLayout.NORTH);
okButton = new JButton(Translator.get("pack_dialog.pack"));
cancelButton = new JButton(Translator.get("cancel"));
contentPane.add(DialogToolkit.createOKCancelPanel(okButton, cancelButton, this), BorderLayout.SOUTH);
// Text field will receive initial focus
setInitialFocusComponent(filePathField);
// Selects OK when enter is pressed
getRootPane().setDefaultButton(okButton);
// Packs dialog
setMinimumSize(MINIMUM_DIALOG_DIMENSION);
setMaximumSize(MAXIMUM_DIALOG_DIMENSION);
showDialog();
}
| public PackDialog(MainFrame mainFrame, FileSet files, boolean isShiftDown) {
super(mainFrame, Translator.get(com.mucommander.ui.action.PackAction.class.getName()+".label"), mainFrame);
this.mainFrame = mainFrame;
this.files = files;
// Retrieve available formats for single file or many file archives
int nbFiles = files.size();
this.formats = Archiver.getFormats(nbFiles>1 || (nbFiles>0 && files.fileAt(0).isDirectory()));
int nbFormats = formats.length;
int initialFormat = formats[0]; // this value will only be used if last format is not available
int initialFormatIndex = 0; // this value will only be used if last format is not available
for(int i=0; i<nbFormats; i++) {
if(formats[i]==lastFormat) {
initialFormat = formats[i];
initialFormatIndex = i;
break;
}
}
oldFormatIndex = initialFormatIndex;
Container contentPane = getContentPane();
YBoxPanel mainPanel = new YBoxPanel(5);
JLabel label = new JLabel(Translator.get("pack_dialog_description")+" :");
mainPanel.add(label);
FileTable activeTable = mainFrame.getInactiveTable();
String initialPath = (isShiftDown?"":activeTable.getCurrentFolder().getAbsolutePath(true));
String fileName;
// Computes the archive's default name:
// - if it only contains one file, uses that file's name.
// - if it contains more than one file, uses the FileSet's parent folder's name.
if(files.size() == 1)
fileName = files.fileAt(0).getNameWithoutExtension();
else if(files.getBaseFolder().getParent() != null)
fileName = files.getBaseFolder().getName();
else
fileName = "";
filePathField = new JTextField(initialPath + fileName + "." + Archiver.getFormatExtension(initialFormat));
// Selects the file name.
filePathField.setSelectionStart(initialPath.length());
filePathField.setSelectionEnd(initialPath.length() + fileName.length());
mainPanel.add(filePathField);
mainPanel.addSpace(10);
// Archive formats combo box
JPanel tempPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
tempPanel.add(new JLabel(Translator.get("pack_dialog.archive_format")));
this.formatsComboBox = new JComboBox();
for(int i=0; i<nbFormats; i++)
formatsComboBox.addItem(Archiver.getFormatName(formats[i]));
formatsComboBox.setSelectedIndex(initialFormatIndex);
formatsComboBox.addItemListener(this);
tempPanel.add(formatsComboBox);
mainPanel.add(tempPanel);
mainPanel.addSpace(10);
// Comment area, enabled only if selected archive format has comment support
label = new JLabel(Translator.get("pack_dialog.comment"));
mainPanel.add(label);
commentArea = new JTextArea();
commentArea.setRows(4);
mainPanel.add(commentArea);
mainPanel.addSpace(10);
contentPane.add(mainPanel, BorderLayout.NORTH);
okButton = new JButton(Translator.get("pack_dialog.pack"));
cancelButton = new JButton(Translator.get("cancel"));
contentPane.add(DialogToolkit.createOKCancelPanel(okButton, cancelButton, this), BorderLayout.SOUTH);
// Text field will receive initial focus
setInitialFocusComponent(filePathField);
// Selects OK when enter is pressed
getRootPane().setDefaultButton(okButton);
// Packs dialog
setMinimumSize(MINIMUM_DIALOG_DIMENSION);
setMaximumSize(MAXIMUM_DIALOG_DIMENSION);
showDialog();
}
|
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/ui/actions/AbstractApplyMylarAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/ui/actions/AbstractApplyMylarAction.java
index 6962291fd..acaa926a8 100644
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/ui/actions/AbstractApplyMylarAction.java
+++ b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/ui/actions/AbstractApplyMylarAction.java
@@ -1,230 +1,230 @@
/*******************************************************************************
* Copyright (c) 2004 - 2006 University Of British Columbia and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* University Of British Columbia - initial API and implementation
*******************************************************************************/
package org.eclipse.mylar.internal.ui.actions;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.mylar.internal.core.util.MylarStatusHandler;
import org.eclipse.mylar.internal.ui.MylarImages;
import org.eclipse.mylar.provisional.core.MylarPlugin;
import org.eclipse.mylar.provisional.ui.InterestFilter;
import org.eclipse.mylar.provisional.ui.MylarUiPlugin;
import org.eclipse.swt.widgets.Event;
import org.eclipse.ui.IActionDelegate2;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
/**
* Extending this class makes it possible to apply Mylar management to a
* structured view (e.g. to provide interest-based filtering).
*
* @author Mik Kersten
*/
public abstract class AbstractApplyMylarAction extends Action implements IViewActionDelegate, IActionDelegate2,
IPropertyChangeListener {
private static final String ACTION_LABEL = "Apply Mylar";
public static final String PREF_ID_PREFIX = "org.eclipse.mylar.ui.interest.filter.";
protected String prefId;
protected IAction initAction = null;
protected final InterestFilter interestFilter;
protected IViewPart viewPart;
protected List<ViewerFilter> previousFilters = new ArrayList<ViewerFilter>();
public AbstractApplyMylarAction(InterestFilter interestFilter) {
super();
this.interestFilter = interestFilter;
setText(ACTION_LABEL);
setToolTipText(ACTION_LABEL);
setImageDescriptor(MylarImages.INTEREST_FILTERING);
}
public void init(IAction action) {
initAction = action;
setChecked(action.isChecked());
}
public void init(IViewPart view) {
String id = view.getSite().getId();
prefId = PREF_ID_PREFIX + id;
viewPart = view;
}
public void run(IAction action) {
setChecked(action.isChecked());
valueChanged(action, action.isChecked(), true);
}
/**
* Don't update if the preference has not been initialized.
*/
public void update() {
if (prefId != null) {
update(MylarPlugin.getDefault().getPreferenceStore().getBoolean(prefId));
}
}
/**
* This operation is expensive.
*/
public void update(boolean on) {
valueChanged(initAction, on, false);
}
protected void valueChanged(IAction action, final boolean on, boolean store) {
try {
MylarPlugin.getContextManager().setContextCapturePaused(true);
setChecked(on);
action.setChecked(on);
if (store && MylarPlugin.getDefault() != null)
MylarPlugin.getDefault().getPreferenceStore().setValue(prefId, on);
for (StructuredViewer viewer : getViewers()) {
MylarUiPlugin.getDefault().getViewerManager().addManagedViewer(viewer, viewPart);
installInterestFilter(on, viewer);
}
} catch (Throwable t) {
MylarStatusHandler.fail(t, "Could not install viewer manager on: " + prefId, false);
} finally {
MylarPlugin.getContextManager().setContextCapturePaused(false);
}
}
/**
* Public for testing
*/
public void installInterestFilter(final boolean on, StructuredViewer viewer) {
if (viewer != null) {
boolean installed = false;
if (on) {
installed = installInterestFilter(viewer);
MylarUiPlugin.getDefault().getViewerManager().addFilteredViewer(viewer);
} else {
MylarUiPlugin.getDefault().getViewerManager().removeFilteredViewer(viewer);
uninstallInterestFilter(viewer);
}
if (installed && on && viewer instanceof TreeViewer) {
((TreeViewer)viewer).expandAll();
}
}
}
/**
* Public for testing
*/
public abstract List<StructuredViewer> getViewers();
/**
* @return filters that should not be removed when the interest filter is installed
*/
public abstract List<Class> getPreservedFilters();
protected boolean installInterestFilter(StructuredViewer viewer) {
if (viewer == null) {
MylarStatusHandler.log("The viewer to install InterestFilter is null", this);
return false;
}
try {
viewer.getControl().setRedraw(false);
- viewer.addFilter(interestFilter);
previousFilters.addAll(Arrays.asList(viewer.getFilters()));
List<Class> excludedFilters = getPreservedFilters();
for (ViewerFilter filter : previousFilters) {
if (!excludedFilters.contains(filter.getClass())) {
try {
viewer.removeFilter(filter);
} catch (Throwable t) {
MylarStatusHandler.fail(t, "Failed to remove filter: " + filter, false);
}
}
}
+ viewer.addFilter(interestFilter);
viewer.getControl().setRedraw(true);
return true;
} catch (Throwable t) {
MylarStatusHandler.fail(t, "Could not install viewer filter on: " + prefId, false);
}
return false;
}
protected void uninstallInterestFilter(StructuredViewer viewer) {
if (viewer == null) {
MylarStatusHandler.log("Could not uninstall interest filter", this);
return;
}
viewer.getControl().setRedraw(false);
List<Class> excludedFilters = getPreservedFilters();
for (ViewerFilter filter : previousFilters) {
if (!excludedFilters.contains(filter.getClass())) {
try {
viewer.addFilter(filter);
} catch (Throwable t) {
MylarStatusHandler.fail(t, "Failed to remove filter: " + filter, false);
}
}
}
previousFilters.clear();
viewer.removeFilter(interestFilter);
viewer.getControl().setRedraw(true);
}
public void selectionChanged(IAction action, ISelection selection) {
// ignore
}
public void dispose() {
for (StructuredViewer viewer : getViewers()) {
MylarUiPlugin.getDefault().getViewerManager().removeManagedViewer(viewer, viewPart);
}
}
public void runWithEvent(IAction action, Event event) {
run(action);
}
public String getPrefId() {
return prefId;
}
/**
* For testing.
*/
public InterestFilter getInterestFilter() {
return interestFilter;
}
protected IViewPart getView(String id) {
IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
if (activePage == null)
return null;
IViewPart view = activePage.findView(id);
return view;
}
}
| false | true | protected boolean installInterestFilter(StructuredViewer viewer) {
if (viewer == null) {
MylarStatusHandler.log("The viewer to install InterestFilter is null", this);
return false;
}
try {
viewer.getControl().setRedraw(false);
viewer.addFilter(interestFilter);
previousFilters.addAll(Arrays.asList(viewer.getFilters()));
List<Class> excludedFilters = getPreservedFilters();
for (ViewerFilter filter : previousFilters) {
if (!excludedFilters.contains(filter.getClass())) {
try {
viewer.removeFilter(filter);
} catch (Throwable t) {
MylarStatusHandler.fail(t, "Failed to remove filter: " + filter, false);
}
}
}
viewer.getControl().setRedraw(true);
return true;
} catch (Throwable t) {
MylarStatusHandler.fail(t, "Could not install viewer filter on: " + prefId, false);
}
return false;
}
| protected boolean installInterestFilter(StructuredViewer viewer) {
if (viewer == null) {
MylarStatusHandler.log("The viewer to install InterestFilter is null", this);
return false;
}
try {
viewer.getControl().setRedraw(false);
previousFilters.addAll(Arrays.asList(viewer.getFilters()));
List<Class> excludedFilters = getPreservedFilters();
for (ViewerFilter filter : previousFilters) {
if (!excludedFilters.contains(filter.getClass())) {
try {
viewer.removeFilter(filter);
} catch (Throwable t) {
MylarStatusHandler.fail(t, "Failed to remove filter: " + filter, false);
}
}
}
viewer.addFilter(interestFilter);
viewer.getControl().setRedraw(true);
return true;
} catch (Throwable t) {
MylarStatusHandler.fail(t, "Could not install viewer filter on: " + prefId, false);
}
return false;
}
|
diff --git a/plugins/javalib/org/munin/plugin/jmx/GetUsage.java b/plugins/javalib/org/munin/plugin/jmx/GetUsage.java
index 085a1f0b..8e58c371 100644
--- a/plugins/javalib/org/munin/plugin/jmx/GetUsage.java
+++ b/plugins/javalib/org/munin/plugin/jmx/GetUsage.java
@@ -1,69 +1,69 @@
package org.munin.plugin.jmx;
import java.io.IOException;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryPoolMXBean;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Set;
import javax.management.MBeanServerConnection;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
class GetUsage {
private ArrayList<MemoryPoolMXBean> gcmbeans;
private String[] GCresult = new String[5];
private MBeanServerConnection connection;
private int memtype;
public GetUsage(MBeanServerConnection connection, int memtype)
{ this.memtype = memtype;
this.connection = connection;
}
public String[] GC() throws IOException, MalformedObjectNameException {
ObjectName gcName = null;
gcName = new ObjectName(ManagementFactory.MEMORY_POOL_MXBEAN_DOMAIN_TYPE+",*");//GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",*");
Set mbeans = connection.queryNames(gcName, null);
if (mbeans != null) {
gcmbeans = new ArrayList<MemoryPoolMXBean>();
Iterator iterator = mbeans.iterator();
while (iterator.hasNext()) {
ObjectName objName = (ObjectName) iterator.next();
MemoryPoolMXBean gc = ManagementFactory.newPlatformMXBeanProxy(connection, objName.getCanonicalName(),
MemoryPoolMXBean.class);
gcmbeans.add(gc);
}
}
int i = 0;
GCresult[i++] =gcmbeans.get(memtype).getUsage().getCommitted()+ "";
GCresult[i++] = gcmbeans.get(memtype).getUsage().getInit()+"";
GCresult[i++] = gcmbeans.get(memtype).getUsage().getMax()+"";
GCresult[i++] = gcmbeans.get(memtype).getUsage().getUsed()+"";
// System.out.println(gcmbeans.get(memtype).getName());// denne printer Tenured Gen
- GCresult[i++]=gcmbeans.get(memtype).getCollectionUsageThreshold()+"";
+ GCresult[i++]=gcmbeans.get(memtype).getUsageThreshold()+"";
return GCresult;
}
private String formatMillis(long ms) {
return String.format("%.4f", ms / (double) 1000);
}
private String formatBytes(long bytes) {
long kb = bytes;
if (bytes > 0) {
kb = bytes / 1024;
}
return kb + "";
}
}
| true | true | public String[] GC() throws IOException, MalformedObjectNameException {
ObjectName gcName = null;
gcName = new ObjectName(ManagementFactory.MEMORY_POOL_MXBEAN_DOMAIN_TYPE+",*");//GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",*");
Set mbeans = connection.queryNames(gcName, null);
if (mbeans != null) {
gcmbeans = new ArrayList<MemoryPoolMXBean>();
Iterator iterator = mbeans.iterator();
while (iterator.hasNext()) {
ObjectName objName = (ObjectName) iterator.next();
MemoryPoolMXBean gc = ManagementFactory.newPlatformMXBeanProxy(connection, objName.getCanonicalName(),
MemoryPoolMXBean.class);
gcmbeans.add(gc);
}
}
int i = 0;
GCresult[i++] =gcmbeans.get(memtype).getUsage().getCommitted()+ "";
GCresult[i++] = gcmbeans.get(memtype).getUsage().getInit()+"";
GCresult[i++] = gcmbeans.get(memtype).getUsage().getMax()+"";
GCresult[i++] = gcmbeans.get(memtype).getUsage().getUsed()+"";
// System.out.println(gcmbeans.get(memtype).getName());// denne printer Tenured Gen
GCresult[i++]=gcmbeans.get(memtype).getCollectionUsageThreshold()+"";
return GCresult;
}
| public String[] GC() throws IOException, MalformedObjectNameException {
ObjectName gcName = null;
gcName = new ObjectName(ManagementFactory.MEMORY_POOL_MXBEAN_DOMAIN_TYPE+",*");//GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",*");
Set mbeans = connection.queryNames(gcName, null);
if (mbeans != null) {
gcmbeans = new ArrayList<MemoryPoolMXBean>();
Iterator iterator = mbeans.iterator();
while (iterator.hasNext()) {
ObjectName objName = (ObjectName) iterator.next();
MemoryPoolMXBean gc = ManagementFactory.newPlatformMXBeanProxy(connection, objName.getCanonicalName(),
MemoryPoolMXBean.class);
gcmbeans.add(gc);
}
}
int i = 0;
GCresult[i++] =gcmbeans.get(memtype).getUsage().getCommitted()+ "";
GCresult[i++] = gcmbeans.get(memtype).getUsage().getInit()+"";
GCresult[i++] = gcmbeans.get(memtype).getUsage().getMax()+"";
GCresult[i++] = gcmbeans.get(memtype).getUsage().getUsed()+"";
// System.out.println(gcmbeans.get(memtype).getName());// denne printer Tenured Gen
GCresult[i++]=gcmbeans.get(memtype).getUsageThreshold()+"";
return GCresult;
}
|
diff --git a/framework/restlet/src/main/java/org/tuml/restlet/visitor/clazz/AddIdLiteralsToRuntimeEnum.java b/framework/restlet/src/main/java/org/tuml/restlet/visitor/clazz/AddIdLiteralsToRuntimeEnum.java
index 0b850d59..0c8d5b97 100644
--- a/framework/restlet/src/main/java/org/tuml/restlet/visitor/clazz/AddIdLiteralsToRuntimeEnum.java
+++ b/framework/restlet/src/main/java/org/tuml/restlet/visitor/clazz/AddIdLiteralsToRuntimeEnum.java
@@ -1,42 +1,42 @@
package org.tuml.restlet.visitor.clazz;
import java.util.Collections;
import org.eclipse.uml2.uml.Class;
import org.opaeum.java.metamodel.OJPathName;
import org.opaeum.java.metamodel.annotation.OJAnnotatedClass;
import org.opaeum.java.metamodel.annotation.OJAnnotatedOperation;
import org.opaeum.java.metamodel.annotation.OJEnum;
import org.tuml.framework.Visitor;
import org.tuml.generation.Workspace;
import org.tuml.javageneration.util.TumlClassOperations;
import org.tuml.javageneration.validation.Validation;
import org.tuml.javageneration.visitor.BaseVisitor;
import org.tuml.javageneration.visitor.clazz.RuntimePropertyImplementor;
public class AddIdLiteralsToRuntimeEnum extends BaseVisitor implements Visitor<Class> {
public AddIdLiteralsToRuntimeEnum(Workspace workspace) {
super(workspace);
}
@Override
public void visitBefore(Class clazz) {
OJAnnotatedClass annotatedClass = findOJClass(clazz);
OJEnum ojEnum = annotatedClass.findEnum(TumlClassOperations.propertyEnumName(clazz));
addField(annotatedClass, ojEnum, "id");
}
@Override
public void visitAfter(Class element) {
}
private void addField(OJAnnotatedClass annotatedClass, OJEnum ojEnum, String fieldName) {
OJAnnotatedOperation fromLabel = ojEnum.findOperation("fromLabel", new OJPathName("String"));
OJAnnotatedOperation fromQualifiedName = ojEnum.findOperation("fromQualifiedName", new OJPathName("String"));
OJAnnotatedOperation fromInverseQualifiedName = ojEnum.findOperation("fromInverseQualifiedName", new OJPathName("String"));
- RuntimePropertyImplementor.addEnumLiteral(ojEnum, fromLabel, fromQualifiedName, fromQualifiedName, fieldName, "not_applicable", "inverseOf::not_applicable", true, null,
+ RuntimePropertyImplementor.addEnumLiteral(ojEnum, fromLabel, fromQualifiedName, fromInverseQualifiedName, fieldName, "not_applicable", "inverseOf::not_applicable", true, null,
Collections.<Validation> emptyList(), false, false, false, false, false, false, true, false, false, 1, 1, false, false, false, false, true, "");
}
}
| true | true | private void addField(OJAnnotatedClass annotatedClass, OJEnum ojEnum, String fieldName) {
OJAnnotatedOperation fromLabel = ojEnum.findOperation("fromLabel", new OJPathName("String"));
OJAnnotatedOperation fromQualifiedName = ojEnum.findOperation("fromQualifiedName", new OJPathName("String"));
OJAnnotatedOperation fromInverseQualifiedName = ojEnum.findOperation("fromInverseQualifiedName", new OJPathName("String"));
RuntimePropertyImplementor.addEnumLiteral(ojEnum, fromLabel, fromQualifiedName, fromQualifiedName, fieldName, "not_applicable", "inverseOf::not_applicable", true, null,
Collections.<Validation> emptyList(), false, false, false, false, false, false, true, false, false, 1, 1, false, false, false, false, true, "");
}
| private void addField(OJAnnotatedClass annotatedClass, OJEnum ojEnum, String fieldName) {
OJAnnotatedOperation fromLabel = ojEnum.findOperation("fromLabel", new OJPathName("String"));
OJAnnotatedOperation fromQualifiedName = ojEnum.findOperation("fromQualifiedName", new OJPathName("String"));
OJAnnotatedOperation fromInverseQualifiedName = ojEnum.findOperation("fromInverseQualifiedName", new OJPathName("String"));
RuntimePropertyImplementor.addEnumLiteral(ojEnum, fromLabel, fromQualifiedName, fromInverseQualifiedName, fieldName, "not_applicable", "inverseOf::not_applicable", true, null,
Collections.<Validation> emptyList(), false, false, false, false, false, false, true, false, false, 1, 1, false, false, false, false, true, "");
}
|
diff --git a/src/edu/grinnell/csc207/nikakath/hw4/Fraction.java b/src/edu/grinnell/csc207/nikakath/hw4/Fraction.java
index ef782cd..1edeea9 100644
--- a/src/edu/grinnell/csc207/nikakath/hw4/Fraction.java
+++ b/src/edu/grinnell/csc207/nikakath/hw4/Fraction.java
@@ -1,287 +1,287 @@
package edu.grinnell.csc207.nikakath.hw4;
import java.math.BigDecimal;
import java.math.BigInteger;
public class Fraction {
private BigInteger numerator;
private BigInteger denominator;
/*
* +--------------+ | Constructors | +--------------+
*/
/*
* Construct Fractions from a variety of input parameters
*/
public Fraction(int num, int den) {
this.numerator = BigInteger.valueOf(num);
this.denominator = BigInteger.valueOf(den);
this.simplify();
} // Fraction(int, int)
public Fraction(int num) {
this.numerator = BigInteger.valueOf(num);
this.denominator = BigInteger.ONE;
this.simplify();
} // Fraction(int)
public Fraction(BigInteger num, BigInteger den) {
this.numerator = num;
this.denominator = den;
this.simplify();
} // Fraction(BigInteger,BigInteger)
public Fraction(BigInteger num) {
this.numerator = num;
this.denominator = BigInteger.ONE;
this.simplify();
} // Fraction(BigInteger)
public Fraction(long num, long den) {
this.numerator = BigInteger.valueOf(num);
this.denominator = BigInteger.valueOf(den);
this.simplify();
} // Fraction(long, long)
public Fraction(long num) {
this.numerator = BigInteger.valueOf(num);
this.denominator = BigInteger.ONE;
this.simplify();
} // Fraction(long)
public Fraction(double num) {
int j = 0;
String doub = Double.toString(num);
boolean afterDot = false;
for (int i = 0; i < doub.length(); i++) {
if (doub.charAt(i) == '.') {
afterDot = true;
}
if (afterDot) {
j++;
}
}
this.numerator = BigInteger.valueOf((long) (num * Math.pow(10, j)));
this.denominator = BigInteger.valueOf((long) (Math.pow(10, j)));
this.simplify();
} // Fraction(double)
public Fraction(String fraction) {
if (!fraction.contains("/")) {
this.numerator = new BigInteger(fraction);
this.denominator = BigInteger.ONE;
} else {
int j = 0;
boolean afterSlash = false;
for (int i = 0; i < fraction.length(); i++) {
if (fraction.charAt(i) == '/') {
afterSlash = true;
} // if
if (afterSlash) {
j++;
} // if
} // for
this.numerator = new BigInteger(fraction.substring(0,
(fraction.length() - j)));
- this.denominator = new BigInteger(fraction.substring(j));
+ this.denominator = new BigInteger(fraction.substring(j+1));
this.simplify();
} // if
} // Fraction(String)
/*
* +----------------+ | Public methods | +----------------+
*/
/* Returns the numerator of the Fraction as a BigInt */
public BigInteger numerator() {
return this.numerator;
} // numerator()
/* Returns the denominator of the Fraction as a BigInt */
public BigInteger denominator() {
return this.denominator;
} // denominator()
/* Add a Fraction to another Fraction */
public Fraction add(Fraction other) {
BigInteger num = this.numerator().multiply(other.denominator())
.add(other.numerator().multiply(this.denominator()));
BigInteger den = this.denominator().multiply(other.denominator());
Fraction sum = new Fraction(num, den);
sum.simplify();
return sum;
} // add(Fraction)
/* Subtract a Fraction from another Fraction */
public Fraction subtract(Fraction other) {
BigInteger num = this.numerator().multiply(other.denominator())
.subtract(other.numerator().multiply(this.denominator()));
BigInteger den = this.denominator().multiply(other.denominator());
Fraction difference = new Fraction(num, den);
difference.simplify();
return difference;
} // subtract(Fraction)
/* Multiply a Fraction by another Fraction */
public Fraction multiply(Fraction other) {
BigInteger num = this.numerator().multiply(other.numerator());
BigInteger den = this.denominator().multiply(other.denominator());
Fraction product = new Fraction(num, den);
product.simplify();
return product;
} // multiply(Fraction)
/* Divide a Fraction by another Fraction */
public Fraction divide(Fraction other) {
if (other.numerator().intValue() != 0) {
BigInteger num = this.numerator().multiply(other.denominator());
BigInteger den = this.denominator().multiply(other.numerator());
Fraction quotient = new Fraction(num, den);
quotient.simplify();
return quotient;
} else {
throw new ArithmeticException("Division by 0");
}
} // divide(Fraction)
/* Raise a Fraction to an integer exponent */
public Fraction pow(int expt) {
Fraction result = this.clone();
for(int i=0; i<expt; i++){
result = result.multiply(this);
}
return result;
} // pow(int)
/* Return the reciprocal of a Fraction */
public Fraction reciprocal() {
BigInteger num = this.denominator();
BigInteger den = this.numerator();
Fraction recip = new Fraction(num, den);
recip.simplify();
return recip;
} // reciprocal()
/* Negate a Fraction */
public Fraction negate() {
Fraction neg = new Fraction(this.numerator().negate(),
this.denominator());
neg.simplify();
return neg;
} // negate()
/* Return a Fraction in double form */
public double doubleValue() {
return this.numerator().doubleValue()
/ this.denominator().doubleValue();
} // doubleValue()
/* Return a Fraction in BigDecimal form */
public BigDecimal bigDecimalValue() {
return new BigDecimal(this.numerator()).divide(new BigDecimal(this
.denominator()));
} // bigDecimalValue()
/* Return the fractional part of an improper fraction when represented
* as a mixed number */
public Fraction fractionalPart() {
BigInteger num = this.numerator();
while (num.compareTo(this.denominator()) > 0) {
num.subtract(this.numerator());
}
Fraction frac = new Fraction(num, this.denominator());
frac.simplify();
return frac;
} // fractionalPart()
/* Return the whole number part of an improper fraction when represented
* as a mixed number */
public BigInteger wholePart() {
Fraction whole = this.subtract(this.fractionalPart());
whole.simplify();
return whole.numerator();
} // wholePart()
/*
* +------------------+ | Standard methods | +------------------+
*/
/* Creates a new identical Fraction*/
public Fraction clone() {
Fraction frac = new Fraction(this.numerator(), this.denominator());
return frac;
} // clone()
/* Converts a Fraction as a string of form "x/y" */
public String toString() {
if (denominator.intValue() == 1) {
return "" + this.numerator();
} else {
return (this.numerator + "/" + this.denominator);
}
} // toString()
/* Returns a relatively unique integer identifier */
public int hashCode() {
return numerator.hashCode() * denominator.hashCode();
} // hashCode()
/* Compares Fraction this to Fraction other. Return 1 if this is greater
* than other, 0 if this is equal to other and -1 if is this is less than
* other */
public int compareTo(Fraction other) {
Fraction f = this.subtract(other);
f.simplify();
return f.numerator().compareTo(BigInteger.ZERO);
} // compareTo(Fraction)
/* Compares a Fraction to an object. Returns true if the object is a
* Fraction of equal value; otherwise returns false */
public boolean equals(Object other) {
if (other instanceof Fraction) {
return this.equals((Fraction) other);
} else {
return false;
}
} // equals(Object)
/* Returns true if both Fractions have the same numerator and denominator;
* otherwise return false */
public boolean equals(Fraction other) {
return this.numerator.equals(other.numerator)
&& this.denominator.equals(other.denominator);
} // equals(Fraction)
/*
* +-----------------+ | Private methods | +-----------------+
*/
/* Simplifies a Fraction using its greatest common divisor and moves
* the negative sign to the numerator if applicable */
private void simplify() {
// Find Greatest Common Divisor
BigInteger gcd = this.numerator().gcd(this.denominator());
// Simplify by dividing both parts by GCD
BigInteger num = this.numerator().divide(gcd);
BigInteger den = this.denominator().divide(gcd);
// Move negative sign to numerator
if (denominator().compareTo(BigInteger.ZERO) < 0) {
num = num.negate();
den = den.negate();
}
// Change values
this.numerator = num;
this.denominator = den;
} // simplify()
} // Fraction
| true | true | public Fraction(String fraction) {
if (!fraction.contains("/")) {
this.numerator = new BigInteger(fraction);
this.denominator = BigInteger.ONE;
} else {
int j = 0;
boolean afterSlash = false;
for (int i = 0; i < fraction.length(); i++) {
if (fraction.charAt(i) == '/') {
afterSlash = true;
} // if
if (afterSlash) {
j++;
} // if
} // for
this.numerator = new BigInteger(fraction.substring(0,
(fraction.length() - j)));
this.denominator = new BigInteger(fraction.substring(j));
this.simplify();
} // if
} // Fraction(String)
| public Fraction(String fraction) {
if (!fraction.contains("/")) {
this.numerator = new BigInteger(fraction);
this.denominator = BigInteger.ONE;
} else {
int j = 0;
boolean afterSlash = false;
for (int i = 0; i < fraction.length(); i++) {
if (fraction.charAt(i) == '/') {
afterSlash = true;
} // if
if (afterSlash) {
j++;
} // if
} // for
this.numerator = new BigInteger(fraction.substring(0,
(fraction.length() - j)));
this.denominator = new BigInteger(fraction.substring(j+1));
this.simplify();
} // if
} // Fraction(String)
|
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
index 2d739ea1a..afcfccd34 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
@@ -1,155 +1,155 @@
// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.mail;
import com.google.gerrit.common.data.ParamertizedString;
import com.google.gerrit.reviewdb.Account;
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.PersonIdent;
/** Creates a {@link FromAddressGenerator} from the {@link GerritServerConfig} */
@Singleton
public class FromAddressGeneratorProvider implements
Provider<FromAddressGenerator> {
private final FromAddressGenerator generator;
@Inject
FromAddressGeneratorProvider(@GerritServerConfig final Config cfg,
@GerritPersonIdent final PersonIdent myIdent,
final AccountCache accountCache) {
final String from = cfg.getString("sendemail", null, "from");
final Address srvAddr = toAddress(myIdent);
if (from == null || "MIXED".equalsIgnoreCase(from)) {
ParamertizedString name = new ParamertizedString("${user} (Code Review)");
generator = new PatternGen(srvAddr, accountCache, name, srvAddr.email);
} else if ("USER".equalsIgnoreCase(from)) {
generator = new UserGen(accountCache, srvAddr);
} else if ("SERVER".equalsIgnoreCase(from)) {
generator = new ServerGen(srvAddr);
} else {
final Address a = Address.parse(from);
- final ParamertizedString name = new ParamertizedString(a.name);
- if (name.getParameterNames().isEmpty()) {
+ final ParamertizedString name = a.name != null ? new ParamertizedString(a.name) : null;
+ if (name == null || name.getParameterNames().isEmpty()) {
generator = new ServerGen(a);
} else {
generator = new PatternGen(srvAddr, accountCache, name, a.email);
}
}
}
private static Address toAddress(final PersonIdent myIdent) {
return new Address(myIdent.getName(), myIdent.getEmailAddress());
}
@Override
public FromAddressGenerator get() {
return generator;
}
static final class UserGen implements FromAddressGenerator {
private final AccountCache accountCache;
private final Address srvAddr;
UserGen(AccountCache accountCache, Address srvAddr) {
this.accountCache = accountCache;
this.srvAddr = srvAddr;
}
@Override
public boolean isGenericAddress(Account.Id fromId) {
return false;
}
@Override
public Address from(final Account.Id fromId) {
if (fromId != null) {
final Account a = accountCache.get(fromId).getAccount();
if (a.getPreferredEmail() != null) {
return new Address(a.getFullName(), a.getPreferredEmail());
}
}
return srvAddr;
}
}
static final class ServerGen implements FromAddressGenerator {
private final Address srvAddr;
ServerGen(Address srvAddr) {
this.srvAddr = srvAddr;
}
@Override
public boolean isGenericAddress(Account.Id fromId) {
return true;
}
@Override
public Address from(final Account.Id fromId) {
return srvAddr;
}
}
static final class PatternGen implements FromAddressGenerator {
private final String senderEmail;
private final Address serverAddress;
private final AccountCache accountCache;
private final ParamertizedString namePattern;
PatternGen(final Address serverAddress, final AccountCache accountCache,
final ParamertizedString namePattern, final String senderEmail) {
this.senderEmail = senderEmail;
this.serverAddress = serverAddress;
this.accountCache = accountCache;
this.namePattern = namePattern;
}
@Override
public boolean isGenericAddress(Account.Id fromId) {
return false;
}
@Override
public Address from(final Account.Id fromId) {
final String senderName;
if (fromId != null) {
final Account account = accountCache.get(fromId).getAccount();
String fullName = account.getFullName();
if (fullName == null || "".equals(fullName)) {
fullName = "Anonymous Coward";
}
senderName = namePattern.replace("user", fullName).toString();
} else {
senderName = serverAddress.name;
}
return new Address(senderName, senderEmail);
}
}
}
| true | true | FromAddressGeneratorProvider(@GerritServerConfig final Config cfg,
@GerritPersonIdent final PersonIdent myIdent,
final AccountCache accountCache) {
final String from = cfg.getString("sendemail", null, "from");
final Address srvAddr = toAddress(myIdent);
if (from == null || "MIXED".equalsIgnoreCase(from)) {
ParamertizedString name = new ParamertizedString("${user} (Code Review)");
generator = new PatternGen(srvAddr, accountCache, name, srvAddr.email);
} else if ("USER".equalsIgnoreCase(from)) {
generator = new UserGen(accountCache, srvAddr);
} else if ("SERVER".equalsIgnoreCase(from)) {
generator = new ServerGen(srvAddr);
} else {
final Address a = Address.parse(from);
final ParamertizedString name = new ParamertizedString(a.name);
if (name.getParameterNames().isEmpty()) {
generator = new ServerGen(a);
} else {
generator = new PatternGen(srvAddr, accountCache, name, a.email);
}
}
}
| FromAddressGeneratorProvider(@GerritServerConfig final Config cfg,
@GerritPersonIdent final PersonIdent myIdent,
final AccountCache accountCache) {
final String from = cfg.getString("sendemail", null, "from");
final Address srvAddr = toAddress(myIdent);
if (from == null || "MIXED".equalsIgnoreCase(from)) {
ParamertizedString name = new ParamertizedString("${user} (Code Review)");
generator = new PatternGen(srvAddr, accountCache, name, srvAddr.email);
} else if ("USER".equalsIgnoreCase(from)) {
generator = new UserGen(accountCache, srvAddr);
} else if ("SERVER".equalsIgnoreCase(from)) {
generator = new ServerGen(srvAddr);
} else {
final Address a = Address.parse(from);
final ParamertizedString name = a.name != null ? new ParamertizedString(a.name) : null;
if (name == null || name.getParameterNames().isEmpty()) {
generator = new ServerGen(a);
} else {
generator = new PatternGen(srvAddr, accountCache, name, a.email);
}
}
}
|
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
index 9a155bd27..cfdab447f 100644
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
+++ b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
@@ -1,99 +1,99 @@
package org.eclipse.wst.xml.catalog.tests.internal;
import java.net.URL;
import java.util.List;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.wst.xml.core.internal.catalog.Catalog;
import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
public class CatalogWriterTest extends AbstractCatalogTest {
protected void setUp() throws Exception {
super.setUp();
}
protected void tearDown() throws Exception {
super.tearDown();
}
public CatalogWriterTest(String name) {
super(name);
}
public final void testWrite() throws Exception {
// read catalog
String catalogFile = "/data/catalog1.xml";
URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(
catalogFile);
assertNotNull(catalogUrl);
URL resolvedURL = Platform.resolve(catalogUrl);
Catalog testCatalog = (Catalog) getCatalog("catalog1", resolvedURL
.toString());
assertNotNull(testCatalog);
testCatalog.setBase(resolvedURL.toString());
// CatalogReader.read(testCatalog, resolvedURL.getFile());
assertNotNull(testCatalog);
// write catalog
URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
- "/actual_results");
+ "/");
IPath path = new Path(Platform.resolve(resultsFolder).getFile());
- String resultCatalogFile = path.append("catalog1.xml").toFile().toURI().toString();
+ String resultCatalogFile = path.append("actual_results/catalog1.xml").toFile().toURI().toString();
testCatalog.setLocation(resultCatalogFile);
// write catalog
testCatalog.save();
// read catalog file from the saved location and test its content
Catalog catalog = (Catalog) getCatalog("catalog2", testCatalog.getLocation());
assertNotNull(catalog);
// test saved catalog - catalog1.xml
assertEquals(3, catalog.getCatalogEntries().length);
// test public entries
List entries = CatalogTest.getCatalogEntries(catalog,
ICatalogEntry.ENTRY_TYPE_PUBLIC);
assertEquals(1, entries.size());
ICatalogEntry entry = (ICatalogEntry) entries.get(0);
assertEquals("./Invoice/Invoice.dtd", entry.getURI());
assertEquals("InvoiceId_test", entry.getKey());
assertEquals("http://webURL", entry.getAttributeValue("webURL"));
// test system entries
entries = CatalogTest.getCatalogEntries(catalog,
ICatalogEntry.ENTRY_TYPE_SYSTEM);
assertEquals(1, entries.size());
entry = (ICatalogEntry) entries.get(0);
assertEquals("./Invoice/Invoice.dtd", entry.getURI());
assertEquals("Invoice.dtd", entry.getKey());
assertEquals("yes", entry.getAttributeValue("chached"));
assertEquals("value1", entry.getAttributeValue("property"));
// test uri entries
entries = CatalogTest.getCatalogEntries(catalog,
ICatalogEntry.ENTRY_TYPE_URI);
assertEquals(1, entries.size());
entry = (ICatalogEntry) entries.get(0);
assertEquals("./Invoice/Invoice.dtd", entry.getURI());
assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
assertEquals("no", entry.getAttributeValue("chached"));
assertEquals("value2", entry.getAttributeValue("property"));
// test next catalog - catalog2.xml
INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
assertEquals(1, nextCatalogEntries.length);
INextCatalog nextCatalogEntry = (INextCatalog) nextCatalogEntries[0];
assertNotNull(nextCatalogEntry);
assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
}
}
| false | true | public final void testWrite() throws Exception {
// read catalog
String catalogFile = "/data/catalog1.xml";
URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(
catalogFile);
assertNotNull(catalogUrl);
URL resolvedURL = Platform.resolve(catalogUrl);
Catalog testCatalog = (Catalog) getCatalog("catalog1", resolvedURL
.toString());
assertNotNull(testCatalog);
testCatalog.setBase(resolvedURL.toString());
// CatalogReader.read(testCatalog, resolvedURL.getFile());
assertNotNull(testCatalog);
// write catalog
URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
"/actual_results");
IPath path = new Path(Platform.resolve(resultsFolder).getFile());
String resultCatalogFile = path.append("catalog1.xml").toFile().toURI().toString();
testCatalog.setLocation(resultCatalogFile);
// write catalog
testCatalog.save();
// read catalog file from the saved location and test its content
Catalog catalog = (Catalog) getCatalog("catalog2", testCatalog.getLocation());
assertNotNull(catalog);
// test saved catalog - catalog1.xml
assertEquals(3, catalog.getCatalogEntries().length);
// test public entries
List entries = CatalogTest.getCatalogEntries(catalog,
ICatalogEntry.ENTRY_TYPE_PUBLIC);
assertEquals(1, entries.size());
ICatalogEntry entry = (ICatalogEntry) entries.get(0);
assertEquals("./Invoice/Invoice.dtd", entry.getURI());
assertEquals("InvoiceId_test", entry.getKey());
assertEquals("http://webURL", entry.getAttributeValue("webURL"));
// test system entries
entries = CatalogTest.getCatalogEntries(catalog,
ICatalogEntry.ENTRY_TYPE_SYSTEM);
assertEquals(1, entries.size());
entry = (ICatalogEntry) entries.get(0);
assertEquals("./Invoice/Invoice.dtd", entry.getURI());
assertEquals("Invoice.dtd", entry.getKey());
assertEquals("yes", entry.getAttributeValue("chached"));
assertEquals("value1", entry.getAttributeValue("property"));
// test uri entries
entries = CatalogTest.getCatalogEntries(catalog,
ICatalogEntry.ENTRY_TYPE_URI);
assertEquals(1, entries.size());
entry = (ICatalogEntry) entries.get(0);
assertEquals("./Invoice/Invoice.dtd", entry.getURI());
assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
assertEquals("no", entry.getAttributeValue("chached"));
assertEquals("value2", entry.getAttributeValue("property"));
// test next catalog - catalog2.xml
INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
assertEquals(1, nextCatalogEntries.length);
INextCatalog nextCatalogEntry = (INextCatalog) nextCatalogEntries[0];
assertNotNull(nextCatalogEntry);
assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
}
| public final void testWrite() throws Exception {
// read catalog
String catalogFile = "/data/catalog1.xml";
URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(
catalogFile);
assertNotNull(catalogUrl);
URL resolvedURL = Platform.resolve(catalogUrl);
Catalog testCatalog = (Catalog) getCatalog("catalog1", resolvedURL
.toString());
assertNotNull(testCatalog);
testCatalog.setBase(resolvedURL.toString());
// CatalogReader.read(testCatalog, resolvedURL.getFile());
assertNotNull(testCatalog);
// write catalog
URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
"/");
IPath path = new Path(Platform.resolve(resultsFolder).getFile());
String resultCatalogFile = path.append("actual_results/catalog1.xml").toFile().toURI().toString();
testCatalog.setLocation(resultCatalogFile);
// write catalog
testCatalog.save();
// read catalog file from the saved location and test its content
Catalog catalog = (Catalog) getCatalog("catalog2", testCatalog.getLocation());
assertNotNull(catalog);
// test saved catalog - catalog1.xml
assertEquals(3, catalog.getCatalogEntries().length);
// test public entries
List entries = CatalogTest.getCatalogEntries(catalog,
ICatalogEntry.ENTRY_TYPE_PUBLIC);
assertEquals(1, entries.size());
ICatalogEntry entry = (ICatalogEntry) entries.get(0);
assertEquals("./Invoice/Invoice.dtd", entry.getURI());
assertEquals("InvoiceId_test", entry.getKey());
assertEquals("http://webURL", entry.getAttributeValue("webURL"));
// test system entries
entries = CatalogTest.getCatalogEntries(catalog,
ICatalogEntry.ENTRY_TYPE_SYSTEM);
assertEquals(1, entries.size());
entry = (ICatalogEntry) entries.get(0);
assertEquals("./Invoice/Invoice.dtd", entry.getURI());
assertEquals("Invoice.dtd", entry.getKey());
assertEquals("yes", entry.getAttributeValue("chached"));
assertEquals("value1", entry.getAttributeValue("property"));
// test uri entries
entries = CatalogTest.getCatalogEntries(catalog,
ICatalogEntry.ENTRY_TYPE_URI);
assertEquals(1, entries.size());
entry = (ICatalogEntry) entries.get(0);
assertEquals("./Invoice/Invoice.dtd", entry.getURI());
assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
assertEquals("no", entry.getAttributeValue("chached"));
assertEquals("value2", entry.getAttributeValue("property"));
// test next catalog - catalog2.xml
INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
assertEquals(1, nextCatalogEntries.length);
INextCatalog nextCatalogEntry = (INextCatalog) nextCatalogEntries[0];
assertNotNull(nextCatalogEntry);
assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
}
|
diff --git a/src/test/java/com/db/exporter/main/DumpTest.java b/src/test/java/com/db/exporter/main/DumpTest.java
index 9ae8c6a..8379d86 100644
--- a/src/test/java/com/db/exporter/main/DumpTest.java
+++ b/src/test/java/com/db/exporter/main/DumpTest.java
@@ -1,107 +1,107 @@
package com.db.exporter.main;
import com.db.exporter.config.Configuration;
import com.db.exporter.utils.DBConnectionManager;
import com.db.exporter.utils.StringUtils;
import com.db.exporter.writer.BufferManager;
import com.db.exporter.writer.DatabaseReader;
import com.db.exporter.writer.FileWriter;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.sql.Connection;
import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.Statement;
import static junit.framework.Assert.assertTrue;
public class DumpTest {
private static final String TABLE_NAME = "DumperTest";
private static final String RESOURCE_DATABASE_PATH = "memory:testdb";
private static final String RESOURCE_DRIVER_NAME = "org.apache.derby.jdbc.EmbeddedDriver";
private static final String RESOURCE_SCHEMA_NAME = "app";
private static final String RESOURCE_DUMP_LOCATION = "./target/test.sql";
private static final int RESOURCE_MAX_BUFFER_SIZE = 200;
private static final String GOOD_QUERY = "LOCK TABLES `DUMPERTEST` WRITE;\nINSERT INTO DUMPERTEST (ID, DES, TIME, NULLTIME, TYPE, LOCATION, ALERT) VALUES \n(1,'TestData','1970-01-01',null,'漢字',10,10);\nUNLOCK TABLES;";
private static Connection connection;
private static Configuration config;
@BeforeClass
public static void setUp() throws Exception {
String url = StringUtils.getDerbyUrl("memory:testdb", "", "");
- url.replace("create=false", "create=true");
+ url = url.replace("create=false", "create=true");
connection = DBConnectionManager.getConnection(url);
config = Configuration.getConfiguration("", "", RESOURCE_DATABASE_PATH,
RESOURCE_DRIVER_NAME, RESOURCE_SCHEMA_NAME,
RESOURCE_MAX_BUFFER_SIZE,
new File(RESOURCE_DUMP_LOCATION).getCanonicalPath());
String sql = "CREATE TABLE "
+ Configuration.getConfiguration().getSchemaName()
+ "."
+ TABLE_NAME
+ "(Id INTEGER NOT NULL,Des VARCHAR(25),Time DATE,nullTime TIMESTAMP, Type VARCHAR(25),Location INTEGER,Alert INTEGER)";
Statement statement = connection.createStatement();
statement.execute(sql);
connection.commit();
statement.close();
Thread.sleep(2000);
PreparedStatement ps = connection.prepareStatement("INSERT INTO "
+ config.getSchemaName() + "." + TABLE_NAME
+ " VALUES (?,?,?,?,?,?,?)");
ps.setInt(1, 1);
ps.setString(2, "TestData");
ps.setDate(3, new Date(2000));
//Test for null TIMESTAMP
ps.setTimestamp(4, null);
//The below will make sure that chinese characters e.g. UTF-8 encoded streams are properly read.
ps.setString(5, "漢字");
ps.setInt(6, 10);
ps.setInt(7, 10);
ps.execute();
connection.commit();
ps.close();
}
@Test
public void test() throws Exception {
Thread reader = new Thread(new DatabaseReader(config,
BufferManager.getBufferInstance()), "Database_reader");
Thread writer = new Thread(new FileWriter(config,
BufferManager.getBufferInstance()), "File_Writer");
reader.start();
writer.start();
Thread.sleep(2000);
File file = new File(config.getDumpFilePath());
StringBuilder sb = new StringBuilder(1000);
InputStreamReader r = new InputStreamReader(new FileInputStream(file), "UTF-8");
char[] buffer = new char[1024];
while ((r.read(buffer, 0, 1024)) > -1) {
sb.append(buffer);
}
assertTrue("Error creating dump: ", file.exists() && file.length() > 0);
assertTrue("Wrong dump created", sb.toString().contains(GOOD_QUERY));
r.close();
}
@AfterClass
public static void cleanUp() throws Exception {
new File(RESOURCE_DUMP_LOCATION).delete();
connection.close();
}
}
| true | true | public static void setUp() throws Exception {
String url = StringUtils.getDerbyUrl("memory:testdb", "", "");
url.replace("create=false", "create=true");
connection = DBConnectionManager.getConnection(url);
config = Configuration.getConfiguration("", "", RESOURCE_DATABASE_PATH,
RESOURCE_DRIVER_NAME, RESOURCE_SCHEMA_NAME,
RESOURCE_MAX_BUFFER_SIZE,
new File(RESOURCE_DUMP_LOCATION).getCanonicalPath());
String sql = "CREATE TABLE "
+ Configuration.getConfiguration().getSchemaName()
+ "."
+ TABLE_NAME
+ "(Id INTEGER NOT NULL,Des VARCHAR(25),Time DATE,nullTime TIMESTAMP, Type VARCHAR(25),Location INTEGER,Alert INTEGER)";
Statement statement = connection.createStatement();
statement.execute(sql);
connection.commit();
statement.close();
Thread.sleep(2000);
PreparedStatement ps = connection.prepareStatement("INSERT INTO "
+ config.getSchemaName() + "." + TABLE_NAME
+ " VALUES (?,?,?,?,?,?,?)");
ps.setInt(1, 1);
ps.setString(2, "TestData");
ps.setDate(3, new Date(2000));
//Test for null TIMESTAMP
ps.setTimestamp(4, null);
//The below will make sure that chinese characters e.g. UTF-8 encoded streams are properly read.
ps.setString(5, "漢字");
ps.setInt(6, 10);
ps.setInt(7, 10);
ps.execute();
connection.commit();
ps.close();
}
| public static void setUp() throws Exception {
String url = StringUtils.getDerbyUrl("memory:testdb", "", "");
url = url.replace("create=false", "create=true");
connection = DBConnectionManager.getConnection(url);
config = Configuration.getConfiguration("", "", RESOURCE_DATABASE_PATH,
RESOURCE_DRIVER_NAME, RESOURCE_SCHEMA_NAME,
RESOURCE_MAX_BUFFER_SIZE,
new File(RESOURCE_DUMP_LOCATION).getCanonicalPath());
String sql = "CREATE TABLE "
+ Configuration.getConfiguration().getSchemaName()
+ "."
+ TABLE_NAME
+ "(Id INTEGER NOT NULL,Des VARCHAR(25),Time DATE,nullTime TIMESTAMP, Type VARCHAR(25),Location INTEGER,Alert INTEGER)";
Statement statement = connection.createStatement();
statement.execute(sql);
connection.commit();
statement.close();
Thread.sleep(2000);
PreparedStatement ps = connection.prepareStatement("INSERT INTO "
+ config.getSchemaName() + "." + TABLE_NAME
+ " VALUES (?,?,?,?,?,?,?)");
ps.setInt(1, 1);
ps.setString(2, "TestData");
ps.setDate(3, new Date(2000));
//Test for null TIMESTAMP
ps.setTimestamp(4, null);
//The below will make sure that chinese characters e.g. UTF-8 encoded streams are properly read.
ps.setString(5, "漢字");
ps.setInt(6, 10);
ps.setInt(7, 10);
ps.execute();
connection.commit();
ps.close();
}
|
diff --git a/src/main/java/dmk/mail/MailSenderServiceDefaultImpl.java b/src/main/java/dmk/mail/MailSenderServiceDefaultImpl.java
index 5dec27c..7f52ade 100644
--- a/src/main/java/dmk/mail/MailSenderServiceDefaultImpl.java
+++ b/src/main/java/dmk/mail/MailSenderServiceDefaultImpl.java
@@ -1,104 +1,104 @@
package dmk.mail;
import java.util.Properties;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.PasswordAuthentication;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import org.apache.commons.lang3.Validate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MailSenderServiceDefaultImpl implements MailSenderService {
Logger logger = LoggerFactory.getLogger(MailSenderServiceDefaultImpl.class);
protected String emailAddr;
protected String pass;
public MailSenderServiceDefaultImpl() {
super();
}
public MailSenderServiceDefaultImpl(final String emailAddr, final String pass) {
super();
this.emailAddr = emailAddr;
this.pass = pass;
}
public void send(final String subject, final String content, final String... recipients) {
Validate.notBlank(subject);
Validate.notBlank(content);
Validate.notNull(recipients);
Validate.notEmpty(recipients);
logger.debug("sending message to " + recipients.toString());
Properties props = new Properties();
props.put("mail.smtp.host", "smtp.gmail.com");
props.put("mail.smtp.socketFactory.port", "465");
props.put("mail.smtp.socketFactory.class",
"javax.net.ssl.SSLSocketFactory");
props.put("mail.smtp.auth", "true");
props.put("mail.smtp.port", "465"); //465, 587
Session session = Session.getDefaultInstance(props,
new javax.mail.Authenticator() {
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(emailAddr,
pass);
}
});
if(logger.isDebugEnabled()){
session.setDebug(true);
System.setProperty("javax.net.debug", "ssl");
}
try {
StringBuilder sb = new StringBuilder(64);
int index = 0;
for(String recipient: recipients){
if(index++ > 1){
sb.append(";");
}
sb.append(recipient);
}
Message message = new MimeMessage(session);
message.setFrom(new InternetAddress("dmknopp@no-reply"));
message.setRecipients(Message.RecipientType.TO,
InternetAddress.parse(sb.toString()));
- message.setSubject("Test subject");
+ message.setSubject(subject);
message.setText(content);
Transport.send(message);
if(logger.isDebugEnabled()){
logger.debug("sent message");
}
} catch (MessagingException e) {
throw new RuntimeException(e);
}
}
public String getEmailAddr() {
return emailAddr;
}
public void setEmailAddr(String emailAddr) {
this.emailAddr = emailAddr;
}
public String getPass() {
return pass;
}
public void setPass(String pass) {
this.pass = pass;
}
}
| true | true | public void send(final String subject, final String content, final String... recipients) {
Validate.notBlank(subject);
Validate.notBlank(content);
Validate.notNull(recipients);
Validate.notEmpty(recipients);
logger.debug("sending message to " + recipients.toString());
Properties props = new Properties();
props.put("mail.smtp.host", "smtp.gmail.com");
props.put("mail.smtp.socketFactory.port", "465");
props.put("mail.smtp.socketFactory.class",
"javax.net.ssl.SSLSocketFactory");
props.put("mail.smtp.auth", "true");
props.put("mail.smtp.port", "465"); //465, 587
Session session = Session.getDefaultInstance(props,
new javax.mail.Authenticator() {
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(emailAddr,
pass);
}
});
if(logger.isDebugEnabled()){
session.setDebug(true);
System.setProperty("javax.net.debug", "ssl");
}
try {
StringBuilder sb = new StringBuilder(64);
int index = 0;
for(String recipient: recipients){
if(index++ > 1){
sb.append(";");
}
sb.append(recipient);
}
Message message = new MimeMessage(session);
message.setFrom(new InternetAddress("dmknopp@no-reply"));
message.setRecipients(Message.RecipientType.TO,
InternetAddress.parse(sb.toString()));
message.setSubject("Test subject");
message.setText(content);
Transport.send(message);
if(logger.isDebugEnabled()){
logger.debug("sent message");
}
} catch (MessagingException e) {
throw new RuntimeException(e);
}
}
| public void send(final String subject, final String content, final String... recipients) {
Validate.notBlank(subject);
Validate.notBlank(content);
Validate.notNull(recipients);
Validate.notEmpty(recipients);
logger.debug("sending message to " + recipients.toString());
Properties props = new Properties();
props.put("mail.smtp.host", "smtp.gmail.com");
props.put("mail.smtp.socketFactory.port", "465");
props.put("mail.smtp.socketFactory.class",
"javax.net.ssl.SSLSocketFactory");
props.put("mail.smtp.auth", "true");
props.put("mail.smtp.port", "465"); //465, 587
Session session = Session.getDefaultInstance(props,
new javax.mail.Authenticator() {
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(emailAddr,
pass);
}
});
if(logger.isDebugEnabled()){
session.setDebug(true);
System.setProperty("javax.net.debug", "ssl");
}
try {
StringBuilder sb = new StringBuilder(64);
int index = 0;
for(String recipient: recipients){
if(index++ > 1){
sb.append(";");
}
sb.append(recipient);
}
Message message = new MimeMessage(session);
message.setFrom(new InternetAddress("dmknopp@no-reply"));
message.setRecipients(Message.RecipientType.TO,
InternetAddress.parse(sb.toString()));
message.setSubject(subject);
message.setText(content);
Transport.send(message);
if(logger.isDebugEnabled()){
logger.debug("sent message");
}
} catch (MessagingException e) {
throw new RuntimeException(e);
}
}
|
diff --git a/org.openscada.hd.server.storage/src/org/openscada/hd/server/storage/ShiService.java b/org.openscada.hd.server.storage/src/org/openscada/hd/server/storage/ShiService.java
index 8e0ff2222..aa26fe1e2 100644
--- a/org.openscada.hd.server.storage/src/org/openscada/hd/server/storage/ShiService.java
+++ b/org.openscada.hd.server.storage/src/org/openscada/hd/server/storage/ShiService.java
@@ -1,543 +1,543 @@
package org.openscada.hd.server.storage;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.openscada.ca.Configuration;
import org.openscada.core.Variant;
import org.openscada.da.client.DataItemValue;
import org.openscada.hd.HistoricalItemInformation;
import org.openscada.hd.Query;
import org.openscada.hd.QueryListener;
import org.openscada.hd.QueryParameters;
import org.openscada.hd.server.common.StorageHistoricalItem;
import org.openscada.hd.server.storage.internal.ConfigurationImpl;
import org.openscada.hd.server.storage.internal.Conversions;
import org.openscada.hd.server.storage.internal.QueryImpl;
import org.openscada.hsdb.ExtendedStorageChannel;
import org.openscada.hsdb.StorageChannelMetaData;
import org.openscada.hsdb.calculation.CalculationMethod;
import org.openscada.hsdb.concurrent.HsdbThreadFactory;
import org.openscada.hsdb.datatypes.BaseValue;
import org.openscada.hsdb.datatypes.DataType;
import org.openscada.hsdb.datatypes.DoubleValue;
import org.openscada.hsdb.datatypes.LongValue;
import org.openscada.hsdb.relict.RelictCleaner;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Implementation of StorageHistoricalItem as OSGi service.
* @see org.openscada.hd.server.common.StorageHistoricalItem
* @author Ludwig Straub
*/
public class ShiService implements StorageHistoricalItem, RelictCleaner
{
/** The default logger. */
private final static Logger logger = LoggerFactory.getLogger ( ShiService.class );
/** Id of the data receiver thread. */
private final static String DATA_RECEIVER_THREAD_ID = "DataReceiver";
/** Configuration of the service. */
private final Configuration configuration;
/** Set of all calculation methods except NATIVE. */
private final Set<CalculationMethod> calculationMethods;
/** All available storage channels mapped via calculation method. */
private final Map<StorageChannelMetaData, ExtendedStorageChannel> storageChannels;
/** Reference to the main input storage channel that is also available in the storage channels map. */
private ExtendedStorageChannel rootStorageChannel;
/** Flag indicating whether the service is currently running or not. */
private boolean started;
/** List of currently open queries. */
private final Collection<QueryImpl> openQueries;
/** Expected input data type. */
private DataType expectedDataType;
/** Latest time of known valid information. */
private final long latestReliableTime;
/** Flag indicating whether old data should be deleted or not. */
private final boolean importMode;
/** Maximum age of data that will be processed by the service if not running in import mode. */
private final long proposedDataAge;
/** Registration of this service. */
private ServiceRegistration registration;
/** Task that receives the incoming data. */
private ExecutorService dataReceiver;
/** Latest processed value. */
private BaseValue latestProcessedValue;
/**
* Constructor.
* @param configuration configuration of the service
* @param latestReliableTime latest time of known valid information
* @param importMode flag indicating whether old data should be deleted or not
*/
public ShiService ( final Configuration configuration, final long latestReliableTime, final boolean importMode )
{
this.configuration = new ConfigurationImpl ( configuration );
calculationMethods = new HashSet<CalculationMethod> ( Conversions.getCalculationMethods ( configuration ) );
this.storageChannels = new HashMap<StorageChannelMetaData, ExtendedStorageChannel> ();
this.rootStorageChannel = null;
this.started = false;
this.openQueries = new LinkedList<QueryImpl> ();
expectedDataType = DataType.UNKNOWN;
this.latestReliableTime = latestReliableTime;
this.importMode = importMode;
this.proposedDataAge = Conversions.decodeTimeSpan ( configuration.getData ().get ( Conversions.PROPOSED_DATA_AGE_KEY_PREFIX + 0 ) );
registration = null;
}
/**
* This method adds a query to the collection of currently open queries.
* @param query query to be added
*/
public synchronized void addQuery ( final QueryImpl query )
{
openQueries.add ( query );
}
/**
* This method removes a query from the collection of currently open queries.
* If the query is not found in the collection then no action is performed.
* @param query query to be removed
*/
public synchronized void removeQuery ( final QueryImpl query )
{
openQueries.remove ( query );
}
/**
* This method returns the maximum available compression level of all storage channels.
* @return maximum available compression level of all storage channels or negative value if no storage channel is availavle
*/
public synchronized long getMaximumCompressionLevel ()
{
long maximumAvailableCompressionLevel = Long.MIN_VALUE;
for ( final StorageChannelMetaData metaData : storageChannels.keySet () )
{
maximumAvailableCompressionLevel = Math.max ( maximumAvailableCompressionLevel, metaData.getDetailLevelId () );
}
return maximumAvailableCompressionLevel;
}
/**
* This method returns the latest NATIVE value or null, if no value is available at all.
* @return latest NATIVE value or null, if no value is available at all
*/
public synchronized BaseValue getLatestValue ()
{
if ( rootStorageChannel != null )
{
try
{
final BaseValue[] result = rootStorageChannel.getMetaData ().getDataType () == DataType.LONG_VALUE ? rootStorageChannel.getLongValues ( Long.MAX_VALUE - 1, Long.MAX_VALUE ) : rootStorageChannel.getDoubleValues ( Long.MAX_VALUE - 1, Long.MAX_VALUE );
return ( result != null ) && ( result.length > 0 ) ? result[0] : null;
}
catch ( final Exception e )
{
logger.error ( "unable to retriebe latest value from root storage channel", e );
}
}
return null;
}
/**
* This method returns the currently available values for the given time span.
* The returned map contains all available storage channels for the given level.
* @param compressionLevel compression level for which data has to be retrieved
* @param startTime start time of the requested data
* @param endTime end time of the requested data
* @return map containing all available storage channels for the given level
* @throws Exception in case of problems retrieving the requested data
*/
public synchronized Map<StorageChannelMetaData, BaseValue[]> getValues ( final long compressionLevel, final long startTime, final long endTime ) throws Exception
{
final Map<StorageChannelMetaData, BaseValue[]> result = new HashMap<StorageChannelMetaData, BaseValue[]> ();
try
{
for ( final Entry<StorageChannelMetaData, ExtendedStorageChannel> entry : storageChannels.entrySet () )
{
final StorageChannelMetaData metaData = entry.getKey ();
if ( metaData.getDetailLevelId () == compressionLevel )
{
final ExtendedStorageChannel storageChannel = entry.getValue ();
BaseValue[] values = null;
switch ( expectedDataType )
{
case LONG_VALUE:
{
values = storageChannel.getLongValues ( startTime, endTime );
break;
}
case DOUBLE_VALUE:
{
values = storageChannel.getDoubleValues ( startTime, endTime );
break;
}
}
if ( compressionLevel == 0 )
{
// create a virtual entry for each required calculation method
for ( final CalculationMethod calculationMethod : calculationMethods )
{
final StorageChannelMetaData subMetaData = new StorageChannelMetaData ( metaData );
subMetaData.setCalculationMethod ( calculationMethod );
result.put ( subMetaData, values );
}
}
else
{
result.put ( storageChannel.getMetaData (), values );
}
}
}
}
catch ( final Exception e )
{
final String message = "unable to retrieve values from storage channel";
logger.error ( message, e );
throw new Exception ( message, e );
}
return result;
}
/**
* This method returns a reference to the current configuration of the service.
* @return reference to the current configuration of the service
*/
public synchronized Configuration getConfiguration ()
{
return new ConfigurationImpl ( configuration );
}
/**
* @see org.openscada.hd.server.common.StorageHistoricalItem#createQuery
*/
public synchronized Query createQuery ( final QueryParameters parameters, final QueryListener listener, final boolean updateData )
{
try
{
return new QueryImpl ( this, listener, parameters, calculationMethods, updateData );
}
catch ( final Exception e )
{
logger.warn ( "Failed to create query", e );
}
return null;
}
/**
* @see org.openscada.hd.server.common.StorageHistoricalItem#getInformation
*/
public synchronized HistoricalItemInformation getInformation ()
{
return Conversions.convertConfigurationToHistoricalItemInformation ( configuration );
}
/**
* @see org.openscada.hd.server.common.StorageHistoricalItem#updateData
*/
public void updateData ( final DataItemValue value )
{
final long now = System.currentTimeMillis ();
logger.debug ( "receiving data at: " + now );
if ( dataReceiver != null )
{
dataReceiver.submit ( new Runnable () {
public void run ()
{
// check if input is valid
logger.debug ( "processing data after: " + ( System.currentTimeMillis () - now ) );
if ( value == null )
{
createInvalidEntry ( now );
return;
}
final Variant variant = value.getValue ();
if ( variant == null )
{
createInvalidEntry ( now );
return;
}
final Calendar calendar = value.getTimestamp ();
final long time = calendar == null ? now : calendar.getTimeInMillis ();
if ( !importMode && ( ( now - proposedDataAge ) > time ) )
{
- logger.warn ( "data that is too old for being processed was received! data will be ignored: (configuration: '%s'; time: %s)", configuration.getId (), time );
+ logger.warn ( String.format ( "data that is too old for being processed was received! data will be ignored: (configuration: '%s'; time: %s)", configuration.getId (), time ) );
return;
}
// process data
final double qualityIndicator = !value.isConnected () || value.isError () ? 0 : 1;
if ( expectedDataType == DataType.LONG_VALUE )
{
processData ( new LongValue ( time, qualityIndicator, 1, variant.asLong ( 0L ) ) );
}
else
{
processData ( new DoubleValue ( time, qualityIndicator, 1, variant.asDouble ( 0.0 ) ) );
}
logger.debug ( "data processing time: " + ( System.currentTimeMillis () - now ) );
// check processed data type and give warning if type does not match the expected type
final DataType receivedDataType = variant.isBoolean () || variant.isInteger () || variant.isLong () ? DataType.LONG_VALUE : DataType.DOUBLE_VALUE;
if ( !variant.isNull () && ( expectedDataType != receivedDataType ) )
{
logger.warn ( String.format ( "received data type (%s) does not match expected data type (%s)!", receivedDataType, expectedDataType ) );
}
}
} );
}
}
/**
* This method processes the data tha is received via the data receiver task.
* @param value data that has to be processed
*/
public synchronized void processData ( final BaseValue value )
{
if ( !this.started || ( this.rootStorageChannel == null ) || ( value == null ) )
{
return;
}
if ( latestProcessedValue == null )
{
latestProcessedValue = getLatestValue ();
}
if ( latestProcessedValue == null )
{
latestProcessedValue = value;
}
if ( value.getTime () < latestProcessedValue.getTime () )
{
logger.warn ( "older value for configuration '%s' received than latest available value", configuration.getId () );
}
try
{
// process data
if ( value instanceof LongValue )
{
final LongValue longValue = (LongValue)value;
this.rootStorageChannel.updateLong ( longValue );
for ( final QueryImpl query : this.openQueries )
{
query.updateLong ( longValue );
}
}
else
{
final DoubleValue doubleValue = (DoubleValue)value;
this.rootStorageChannel.updateDouble ( doubleValue );
for ( final QueryImpl query : this.openQueries )
{
query.updateDouble ( doubleValue );
}
}
// when importing data, the values are most likely strongly differing from each other in time.
// this causes additional files to be generated that can be cleaned to increase performance
if ( importMode )
{
cleanupRelicts ();
}
}
catch ( final Exception e )
{
logger.error ( "could not process value", e );
}
}
/**
* This method adds a storage channel.
* @param storageChannel storage channel that has to be added
*/
public synchronized void addStorageChannel ( final ExtendedStorageChannel storageChannel )
{
if ( storageChannel != null )
{
try
{
final StorageChannelMetaData metaData = storageChannel.getMetaData ();
if ( metaData != null )
{
storageChannels.put ( metaData, storageChannel );
if ( metaData.getCalculationMethod () == CalculationMethod.NATIVE )
{
rootStorageChannel = storageChannel;
expectedDataType = metaData.getDataType ();
}
}
}
catch ( final Exception e )
{
logger.error ( "could not retrieve meta data information of storage channel", e );
}
}
}
/**
* This method creates an invalid entry using the data of the latest existing entry.
* No entry is made if no data at all is available in the root storage channel.
* It is assured that the time of the new entry is after the latest existing entry.
* If necessary, the passed time will be increased to fit this requirement.
* @param time time of the entry that has to be created
*/
private void createInvalidEntry ( final long time )
{
if ( rootStorageChannel != null )
{
BaseValue[] values = null;
try
{
if ( expectedDataType == DataType.LONG_VALUE )
{
values = rootStorageChannel.getLongValues ( Long.MAX_VALUE - 1, Long.MAX_VALUE );
}
else
{
values = rootStorageChannel.getDoubleValues ( Long.MAX_VALUE - 1, Long.MAX_VALUE );
}
}
catch ( final Exception e )
{
logger.error ( "could not retrieve latest value from root storage channel", e );
}
if ( ( values != null ) && ( values.length > 0 ) )
{
final BaseValue value = values[values.length - 1];
if ( value instanceof LongValue )
{
processData ( new LongValue ( Math.max ( value.getTime () + 1, time ), 0, 0, ( (LongValue)value ).getValue () ) );
}
else
{
processData ( new DoubleValue ( Math.max ( value.getTime () + 1, time ), 0, 0, ( (DoubleValue)value ).getValue () ) );
}
}
}
}
/**
* This method activates the service processing and registers the service as OSGi service.
* The methods updateData and createQuery only have effect after calling this method.
* @param bundleContext OSGi bundle context
*/
public synchronized void start ( final BundleContext bundleContext )
{
stop ();
started = true;
if ( !importMode )
{
createInvalidEntry ( latestReliableTime );
}
dataReceiver = Executors.newSingleThreadExecutor ( HsdbThreadFactory.createFactory ( DATA_RECEIVER_THREAD_ID ) );
registerService ( bundleContext );
}
/**
* This method registers the service via OSGi.
* @param bundleContext OSGi bundle context
*/
private synchronized void registerService ( final BundleContext bundleContext )
{
unregisterService ();
final Dictionary<String, String> serviceProperties = new Hashtable<String, String> ();
serviceProperties.put ( Constants.SERVICE_PID, configuration.getId () );
serviceProperties.put ( Constants.SERVICE_VENDOR, "inavare GmbH" );
serviceProperties.put ( Constants.SERVICE_DESCRIPTION, "A OpenSCADA Storage Historical Item Implementation" );
registration = bundleContext.registerService ( new String[] { ShiService.class.getName (), StorageHistoricalItem.class.getName () }, this, serviceProperties );
}
/**
* This method unregisters a previously registered service.
*/
private synchronized void unregisterService ()
{
if ( registration != null )
{
registration.unregister ();
registration = null;
}
}
/**
* This method stops the service from processing and destroys its internal structure.
* The service cannot be started again, after stop has been called.
* After calling this method, no further call to this service can be made.
* Before the service is stopped, an invalid value is processed in order to mark
* future values as invalid until a valid value is processed again.
*/
public synchronized void stop ()
{
// close existing queries
for ( final QueryImpl query : new ArrayList<QueryImpl> ( openQueries ) )
{
query.close ();
}
// unregister service
unregisterService ();
// stop data receiver
if ( dataReceiver != null )
{
dataReceiver.shutdown ();
dataReceiver = null;
}
// create entry with data marked as invalid
if ( started && !importMode )
{
createInvalidEntry ( System.currentTimeMillis () );
}
// set running flag
started = false;
}
/**
* This method cleans old data.
* @see org.openscada.hsdb.relict.RelictCleaner#cleanupRelicts
*/
public synchronized void cleanupRelicts () throws Exception
{
if ( started && ( rootStorageChannel != null ) )
{
try
{
logger.info ( "cleaning old data" );
rootStorageChannel.cleanupRelicts ();
}
catch ( final Exception e )
{
logger.error ( "could not clean old data", e );
}
}
}
}
| true | true | public void updateData ( final DataItemValue value )
{
final long now = System.currentTimeMillis ();
logger.debug ( "receiving data at: " + now );
if ( dataReceiver != null )
{
dataReceiver.submit ( new Runnable () {
public void run ()
{
// check if input is valid
logger.debug ( "processing data after: " + ( System.currentTimeMillis () - now ) );
if ( value == null )
{
createInvalidEntry ( now );
return;
}
final Variant variant = value.getValue ();
if ( variant == null )
{
createInvalidEntry ( now );
return;
}
final Calendar calendar = value.getTimestamp ();
final long time = calendar == null ? now : calendar.getTimeInMillis ();
if ( !importMode && ( ( now - proposedDataAge ) > time ) )
{
logger.warn ( "data that is too old for being processed was received! data will be ignored: (configuration: '%s'; time: %s)", configuration.getId (), time );
return;
}
// process data
final double qualityIndicator = !value.isConnected () || value.isError () ? 0 : 1;
if ( expectedDataType == DataType.LONG_VALUE )
{
processData ( new LongValue ( time, qualityIndicator, 1, variant.asLong ( 0L ) ) );
}
else
{
processData ( new DoubleValue ( time, qualityIndicator, 1, variant.asDouble ( 0.0 ) ) );
}
logger.debug ( "data processing time: " + ( System.currentTimeMillis () - now ) );
// check processed data type and give warning if type does not match the expected type
final DataType receivedDataType = variant.isBoolean () || variant.isInteger () || variant.isLong () ? DataType.LONG_VALUE : DataType.DOUBLE_VALUE;
if ( !variant.isNull () && ( expectedDataType != receivedDataType ) )
{
logger.warn ( String.format ( "received data type (%s) does not match expected data type (%s)!", receivedDataType, expectedDataType ) );
}
}
} );
}
}
| public void updateData ( final DataItemValue value )
{
final long now = System.currentTimeMillis ();
logger.debug ( "receiving data at: " + now );
if ( dataReceiver != null )
{
dataReceiver.submit ( new Runnable () {
public void run ()
{
// check if input is valid
logger.debug ( "processing data after: " + ( System.currentTimeMillis () - now ) );
if ( value == null )
{
createInvalidEntry ( now );
return;
}
final Variant variant = value.getValue ();
if ( variant == null )
{
createInvalidEntry ( now );
return;
}
final Calendar calendar = value.getTimestamp ();
final long time = calendar == null ? now : calendar.getTimeInMillis ();
if ( !importMode && ( ( now - proposedDataAge ) > time ) )
{
logger.warn ( String.format ( "data that is too old for being processed was received! data will be ignored: (configuration: '%s'; time: %s)", configuration.getId (), time ) );
return;
}
// process data
final double qualityIndicator = !value.isConnected () || value.isError () ? 0 : 1;
if ( expectedDataType == DataType.LONG_VALUE )
{
processData ( new LongValue ( time, qualityIndicator, 1, variant.asLong ( 0L ) ) );
}
else
{
processData ( new DoubleValue ( time, qualityIndicator, 1, variant.asDouble ( 0.0 ) ) );
}
logger.debug ( "data processing time: " + ( System.currentTimeMillis () - now ) );
// check processed data type and give warning if type does not match the expected type
final DataType receivedDataType = variant.isBoolean () || variant.isInteger () || variant.isLong () ? DataType.LONG_VALUE : DataType.DOUBLE_VALUE;
if ( !variant.isNull () && ( expectedDataType != receivedDataType ) )
{
logger.warn ( String.format ( "received data type (%s) does not match expected data type (%s)!", receivedDataType, expectedDataType ) );
}
}
} );
}
}
|
diff --git a/src/gnu/io/RXTXCommDriver.java b/src/gnu/io/RXTXCommDriver.java
index 8aa2797..7ebd3e7 100644
--- a/src/gnu/io/RXTXCommDriver.java
+++ b/src/gnu/io/RXTXCommDriver.java
@@ -1,693 +1,693 @@
/*-------------------------------------------------------------------------
| A wrapper to convert RXTX into Linux Java Comm
| Copyright 1998 Kevin Hester, [email protected]
| Copyright 2000-2001 Trent Jarvi, [email protected]
|
| This library is free software; you can redistribute it and/or
| modify it under the terms of the GNU Library General Public
| License as published by the Free Software Foundation; either
| version 2 of the License, or (at your option) any later version.
|
| This library is distributed in the hope that it will be useful,
| but WITHOUT ANY WARRANTY; without even the implied warranty of
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
| Library General Public License for more details.
|
| You should have received a copy of the GNU Library General Public
| License along with this library; if not, write to the Free
| Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--------------------------------------------------------------------------*/
/* Martin Pool <[email protected]> added support for explicitly-specified
* lists of ports, October 2000. */
/* Joseph Goldstone <[email protected]> reorganized to support registered ports,
* known ports, and scanned ports, July 2001 */
package gnu.io;
import java.util.*;
import java.io.*;
import gnu.io.*;
import java.util.StringTokenizer;
/**
This is the JavaComm for Linux driver.
*/
public class RXTXCommDriver implements CommDriver
{
private static boolean debug = false;
static
{
if(debug ) System.out.println("RXTXCommDriver {}");
System.loadLibrary( "Serial" );
}
/** Get the Serial port prefixes for the running OS */
private String deviceDirectory;
private String osName;
private native boolean registerKnownPorts(int PortType);
private native boolean isPortPrefixValid(String dev);
private native boolean testRead(String dev, int type);
private native String getDeviceDirectory();
private final String[] getValidPortPrefixes(String CandidatePortPrefixes[])
{
/*
256 is the number of prefixes ( COM, cua, ttyS, ...) not
the number of devices (ttyS0, ttyS1, ttyS2, ...)
On a Linux system there are about 400 prefixes in
deviceDirectory.
registerScannedPorts() assigns CandidatePortPrefixes to
something less than 50 prefixes.
Trent
*/
String ValidPortPrefixes[]=new String [256];
if (debug)
System.out.println("\nRXTXCommDriver:getValidPortPrefixes()");
if(CandidatePortPrefixes==null)
{
if (debug)
System.out.println("\nRXTXCommDriver:getValidPortPrefixes() No ports prefixes known for this System.\nPlease check the port prefixes listed for " + osName + " in RXTXCommDriver:registerScannedPorts()\n");
}
int i=0;
for(int j=0;j<CandidatePortPrefixes.length;j++){
if(isPortPrefixValid(CandidatePortPrefixes[j])) {
ValidPortPrefixes[i++]=
new String(CandidatePortPrefixes[j]);
}
}
String[] returnArray=new String[i];
System.arraycopy(ValidPortPrefixes, 0, returnArray, 0, i);
if(ValidPortPrefixes[0]==null)
{
if (debug)
{
System.out.println("\nRXTXCommDriver:getValidPortPrefixes() No ports matched the list assumed for this\nSystem in the directory " + deviceDirectory + ". Please check the ports listed for \"" + osName + "\" in\nRXTXCommDriver:registerScannedPorts()\nTried:");
for(int j=0;j<CandidatePortPrefixes.length;j++){
System.out.println("\t" +
CandidatePortPrefixes[i]);
}
}
}
else
{
if (debug)
System.out.println("\nRXTXCommDriver:getValidPortPrefixes()\nThe following port prefixes have been identified as valid on " + osName + ":\n");
/*
for(int j=0;j<returnArray.length;j++)
{
if (debug)
System.out.println("\t" + j + " " +
returnArray[j]);
}
*/
}
return returnArray;
}
/** handle solaris/sunos /dev/cua/a convention */
private void checkSolaris(String PortName, int PortType)
{
char p[] = { 91 };
for( p[0] =91 ;p[0] < 123; p[0]++ )
{
if (testRead(PortName.concat(new String(p)),PortType))
{
CommPortIdentifier.addPortName(
PortName.concat(new String(p)),
PortType,
this
);
}
}
}
private void registerValidPorts(
String CandidateDeviceNames[],
String ValidPortPrefixes[],
int PortType
) {
int p =0 ;
int i =0;
if (debug)
{
System.out.println("Entering registerValidPorts()");
/* */
System.out.println(" Candidate devices:");
for (int dn=0;dn<CandidateDeviceNames.length;dn++)
System.out.println(" " +
CandidateDeviceNames[dn]);
System.out.println(" valid port prefixes:");
for (int pp=0;pp<ValidPortPrefixes.length;pp++)
System.out.println(" "+ValidPortPrefixes[pp]);
/* */
}
if ( CandidateDeviceNames!=null && ValidPortPrefixes!=null)
{
for( i = 0;i<CandidateDeviceNames.length; i++ ) {
for( p = 0;p<ValidPortPrefixes.length; p++ ) {
/* this determines:
* device file Valid ports
* /dev/ttyR[0-9]* != /dev/ttyS[0-9]*
* /dev/ttySI[0-9]* != /dev/ttyS[0-9]*
* /dev/ttyS[0-9]* == /dev/ttyS[0-9]*
* Otherwise we check some ports
* multiple times. Perl would rock
* here.
*
* If the above passes, we try to read
* from the port. If there is no err
* the port is added.
* Trent
*/
String V = ValidPortPrefixes[ p ];
int VL = V.length();
String C = CandidateDeviceNames[ i ];
if( C.length() < VL ) continue;
String CU =
C.substring(VL).toUpperCase();
String Cl =
C.substring(VL).toLowerCase();
if( !( C.regionMatches(0, V, 0, VL ) &&
CU.equals( Cl ) ) )
{
continue;
}
String PortName =
new String(deviceDirectory +
C );
if (debug)
{
System.out.println( C +
" " + V );
System.out.println( CU +
" " + Cl );
}
if( osName.equals("Solaris") ||
osName.equals("SunOS"))
checkSolaris(PortName,PortType);
else if (testRead(PortName, PortType))
{
CommPortIdentifier.addPortName(
PortName,
PortType,
this
);
}
}
}
}
if (debug)
System.out.println("Leaving registerValidPorts()");
}
/*
* initialize() will be called by the CommPortIdentifier's static
* initializer. The responsibility of this method is:
* 1) Ensure that that the hardware is present.
* 2) Load any required native libraries.
* 3) Register the port names with the CommPortIdentifier.
*
* <p>From the NullDriver.java CommAPI sample.
*
* added printerport stuff
* Holger Lehmann
* July 12, 1999
* IBM
* Added ttyM for Moxa boards
* Removed obsolete device cuaa
* Peter Bennett
* January 02, 2000
* Bencom
*/
/**
* Determine the OS and where the OS has the devices located
*/
public void initialize()
{
if (debug) System.out.println("RXTXCommDriver:initialize()");
osName=System.getProperty("os.name");
deviceDirectory=getDeviceDirectory();
/*
First try to register ports specified in the properties
file. If that doesn't exist, then scan for ports.
*/
for (int PortType=CommPortIdentifier.PORT_SERIAL;PortType<=CommPortIdentifier.PORT_PARALLEL;PortType++) {
if (!registerSpecifiedPorts(PortType)) {
if (!registerKnownPorts(PortType)) {
registerScannedPorts(PortType);
}
}
}
}
private void addSpecifiedPorts(String names, int PortType)
{
final String pathSep = System.getProperty("path.separator", ":");
final StringTokenizer tok = new StringTokenizer(names, pathSep);
if (debug)
System.out.println("\nRXTXCommDriver:addSpecifiedPorts()");
while (tok.hasMoreElements())
{
String PortName = tok.nextToken();
if (testRead(PortName, PortType))
CommPortIdentifier.addPortName(PortName,
PortType, this);
}
}
/*
* Register ports specified in the file "gnu.io.rxtx.properties"
* Key system properties:
* gnu.io.rxtx.SerialPorts
* gnu.io.rxtx.ParallelPorts
*
* Tested only with sun jdk1.3
* The file gnu.io.rxtx.properties must reside in the java extension dir
*
* Example: /usr/local/java/jre/lib/ext/gnu.io.rxtx.properties
*
* The file contains the following key properties:
*
* gnu.io.rxtx.SerialPorts=/dev/ttyS0:/dev/ttyS1:
* gnu.io.rxtx.ParallelPorts=/dev/lp0:
*
*/
private boolean registerSpecifiedPorts(int PortType)
{
String val = null;
try
{
String ext_dir=System.getProperty("java.ext.dirs")+System.getProperty("file.separator");
FileInputStream rxtx_prop=new FileInputStream(ext_dir+"gnu.io.rxtx.properties");
Properties p=new Properties(System.getProperties());
p.load(rxtx_prop);
System.setProperties(p);
}catch(Exception e){
if (debug){
System.out.println("The file: gnu.io.rxtx.properties doesn't exists.");
System.out.println(e.toString());
}//end if
}//end catch
if (debug)
System.out.println("checking for system-known ports of type "+PortType);
if (debug)
System.out.println("checking registry for ports of type "+PortType);
switch (PortType) {
case CommPortIdentifier.PORT_SERIAL:
if ((val = System.getProperty("gnu.io.rxtx.SerialPorts")) == null)
val = System.getProperty("gnu.io.SerialPorts");
break;
case CommPortIdentifier.PORT_PARALLEL:
if ((val = System.getProperty("gnu.io.rxtx.ParallelPorts")) == null)
val = System.getProperty("gnu.io.ParallelPorts");
break;
default:
if (debug)
System.out.println("unknown port type "+PortType+" passed to RXTXCommDriver.registerSpecifiedPorts()");
}
if (val != null) {
addSpecifiedPorts(val, PortType);
return true;
} else return false;
}
/*
* Look for all entries in deviceDirectory, and if they look like they should
* be serial ports on this OS and they can be opened then register
* them.
*
*/
private void registerScannedPorts(int PortType)
{
String[] CandidateDeviceNames;
if (debug)
System.out.println("scanning device directory "+deviceDirectory+" for ports of type "+PortType);
if(osName.toLowerCase().indexOf("windows") != -1 )
{
String[] temp = { "COM1", "COM2","COM3","COM4" };
/*FIXME Untested , "COM5", COM6", COM7", "COM8" */
CandidateDeviceNames=temp;
}
else if ( osName.equals("Solaris") || osName.equals("SunOS"))
{
/* Solaris uses a few different ways to identify ports.
They could be /dev/term/a /dev/term0 /dev/cua/a /dev/cuaa
the /dev/???/a appears to be on more systems.
The uucp lock files should not cause problems.
*/
/*
File dev = new File( "/dev/term" );
String deva[] = dev.list();
dev = new File( "/dev/cua" );
String devb[] = dev.list();
String[] temp = new String[ deva.length + devb.length ];
for(int j =0;j<deva.length;j++)
deva[j] = "term/" + deva[j];
for(int j =0;j<devb.length;j++)
devb[j] = "cua/" + devb[j];
System.arraycopy( deva, 0, temp, 0, deva.length );
System.arraycopy( devb, 0, temp,
deva.length, devb.length );
if( debug ) {
for( int j = 0; j< temp.length;j++)
System.out.println( temp[j] );
}
CandidateDeviceNames=temp;
*/
/*
ok.. Look the the dirctories representing the port
kernel driver interface.
If there are entries there are possibly ports we can
use and need to enumerate.
*/
String term[] = new String[2];
int l = 0;
File dev = null;
dev = new File( "/dev/term" );
if( dev.list().length > 0 );
term[l++] = new String( "term/" );
dev = new File( "/dev/cua0" );
if( dev.list().length > 0 );
term[l++] = new String( "cua/" );
String[] temp = new String[l];
for(l--;l >= 0;l--)
temp[l] = term[l];
CandidateDeviceNames=temp;
}
else
{
File dev = new File( deviceDirectory );
String[] temp = dev.list();
CandidateDeviceNames=temp;
}
if (CandidateDeviceNames==null)
{
if (debug)
System.out.println("RXTXCommDriver:registerScannedPorts() no Device files to check ");
return;
}
String CandidatePortPrefixes[] = {};
switch (PortType) {
case CommPortIdentifier.PORT_SERIAL:
if (debug)
System.out.println("scanning for serial ports for os "+osName);
if(osName.equals("Linux"))
{
String[] Temp = {
"ttyS" // linux Serial Ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("Linux-all-ports"))
{
/* if you want to enumerate all ports ~5000
possible, then replace the above with this
*/
String[] Temp = {
"comx", // linux COMMX synchronous serial card
"holter", // custom card for heart monitoring
"modem", // linux symbolic link to modem.
"ttyircomm", // linux IrCommdevices (IrDA serial emu)
"ttycosa0c", // linux COSA/SRP synchronous serial card
"ttycosa1c", // linux COSA/SRP synchronous serial card
"ttyC", // linux cyclades cards
"ttyCH",// linux Chase Research AT/PCI-Fast serial card
"ttyD", // linux Digiboard serial card
"ttyE", // linux Stallion serial card
"ttyF", // linux Computone IntelliPort serial card
"ttyH", // linux Chase serial card
"ttyI", // linux virtual modems
"ttyL", // linux SDL RISCom serial card
"ttyM", // linux PAM Software's multimodem boards
// linux ISI serial card
"ttyMX",// linux Moxa Smart IO cards
"ttyP", // linux Hayes ESP serial card
"ttyR", // linux comtrol cards
// linux Specialix RIO serial card
"ttyS", // linux Serial Ports
"ttySI",// linux SmartIO serial card
"ttySR",// linux Specialix RIO serial card 257+
"ttyT", // linux Technology Concepts serial card
"ttyUSB",//linux USB serial converters
"ttyV", // linux Comtrol VS-1000 serial controller
"ttyW", // linux specialix cards
"ttyX" // linux SpecialX serial card
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("Irix"))
{
String[] Temp = {
"ttyc", // irix raw character devices
"ttyd", // irix basic serial ports
"ttyf", // irix serial ports with hardware flow
"ttym", // irix modems
"ttyq", // irix pseudo ttys
"tty4d",// irix RS422
"tty4f",// irix RS422 with HSKo/HSki
"midi", // irix serial midi
"us" // irix mapped interface
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("FreeBSD")) //FIXME this is probably wrong
{
String[] Temp = {
"cuaa" // FreeBSD Serial Ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("NetBSD")) // FIXME this is probably wrong
{
String[] Temp = {
"tty0" // netbsd serial ports
};
CandidatePortPrefixes=Temp;
}
else if ( osName.equals("Solaris")
|| osName.equals("SunOS"))
{
String[] Temp = {
"term/",
"cua/"
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("HP-UX"))
{
String[] Temp = {
"tty0p",// HP-UX serial ports
"tty1p" // HP-UX serial ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("UnixWare") ||
osName.equals("OpenUNIX"))
{
String[] Temp = {
"tty00s", // UW7/OU8 serial ports
"tty01s",
"tty02s",
"tty03s"
};
CandidatePortPrefixes=Temp;
}
else if (osName.equals("OpenServer"))
{
String[] Temp = {
"tty1A", // OSR5 serial ports
"tty2A",
"tty3A",
"tty4A",
"tty5A",
"tty6A",
"tty7A",
"tty8A",
"tty9A",
"tty10A",
"tty11A",
"tty12A",
"tty13A",
"tty14A",
"tty15A",
"tty16A",
"ttyu1A", // OSR5 USB-serial ports
"ttyu2A",
"ttyu3A",
"ttyu4A",
"ttyu5A",
"ttyu6A",
"ttyu7A",
"ttyu8A",
"ttyu9A",
"ttyu10A",
"ttyu11A",
"ttyu12A",
"ttyu13A",
"ttyu14A",
"ttyu15A",
"ttyu16A"
};
CandidatePortPrefixes=Temp;
}
- else if (osName.equals("Compaq's Digital UNIX"))
+ else if (osName.equals("Compaq's Digital UNIX") || osName.equals("OSF1"))
{
String[] Temp = {
"tty0" // Digital Unix serial ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("BeOS"))
{
String[] Temp = {
"serial" // BeOS serial ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("Mac OS X"))
{
String[] Temp = {
// Keyspan USA-28X adapter, USB port 1
"cu.KeyUSA28X191.",
// Keyspan USA-28X adapter, USB port 1
"tty.KeyUSA28X191.",
// Keyspan USA-28X adapter, USB port 2
"cu.KeyUSA28X181.",
// Keyspan USA-28X adapter, USB port 2
"tty.KeyUSA28X181.",
// Keyspan USA-19 adapter
"cu.KeyUSA19181.",
// Keyspan USA-19 adapter
"tty.KeyUSA19181."
};
CandidatePortPrefixes=Temp;
}
else if(osName.toLowerCase().indexOf("windows") != -1 )
{
String[] Temp = {
"COM" // win32 serial ports
};
CandidatePortPrefixes=Temp;
}
else
{
if (debug)
System.out.println("No valid prefixes for serial ports have been entered for "+osName + " in RXTXCommDriver.java. This may just be a typo in the method registerScanPorts().");
}
break;
case CommPortIdentifier.PORT_PARALLEL:
if (debug)
System.out.println("scanning for parallel ports for os "+osName);
/** Get the Parallel port prefixes for the running os
* Holger Lehmann
* July 12, 1999
* IBM
*/
if(osName.equals("Linux")
/*
|| osName.equals("NetBSD") FIXME
|| osName.equals("HP-UX") FIXME
|| osName.equals("Irix") FIXME
|| osName.equals("BeOS") FIXME
|| osName.equals("Compaq's Digital UNIX") FIXME
*/
)
{
String[] temp={
"lp" // linux printer port
};
CandidatePortPrefixes=temp;
}
else if(osName.equals("FreeBSD"))
{
String[] temp={
"lpt"
};
CandidatePortPrefixes=temp;
}
else /* printer support is green */
{
String [] temp={};
CandidatePortPrefixes=temp;
}
break;
default:
if (debug)
System.out.println("Unknown PortType "+PortType+" passed to RXTXCommDriver.registerScannedPorts()");
}
registerValidPorts(CandidateDeviceNames, CandidatePortPrefixes, PortType);
}
/*
* <p>From the NullDriver.java CommAPI sample.
*/
/**
* @param PortName The name of the port the OS recognizes
* @param PortType CommPortIdentifier.PORT_SERIAL or PORT_PARALLEL
* @returns CommPort
* getCommPort() will be called by CommPortIdentifier from its
* openPort() method. PortName is a string that was registered earlier
* using the CommPortIdentifier.addPortName() method. getCommPort()
* returns an object that extends either SerialPort or ParallelPort.
*/
public CommPort getCommPort( String PortName, int PortType )
{
if (debug) System.out.println("RXTXCommDriver:getCommPort("
+PortName+","+PortType+")");
try {
switch (PortType) {
case CommPortIdentifier.PORT_SERIAL:
return new RXTXPort( PortName );
case CommPortIdentifier.PORT_PARALLEL:
return new LPRPort( PortName );
default:
if (debug)
System.out.println("unknown PortType "+PortType+" passed to RXTXCommDriver.getCommPort()");
}
} catch( PortInUseException e ) {
if (debug)
System.out.println(
"Port "+PortName+" in use by another application");
}
return null;
}
/* Yikes. Trying to call println from C for odd reasons */
public void Report( String arg )
{
System.out.println(arg);
}
}
| true | true | private void registerScannedPorts(int PortType)
{
String[] CandidateDeviceNames;
if (debug)
System.out.println("scanning device directory "+deviceDirectory+" for ports of type "+PortType);
if(osName.toLowerCase().indexOf("windows") != -1 )
{
String[] temp = { "COM1", "COM2","COM3","COM4" };
/*FIXME Untested , "COM5", COM6", COM7", "COM8" */
CandidateDeviceNames=temp;
}
else if ( osName.equals("Solaris") || osName.equals("SunOS"))
{
/* Solaris uses a few different ways to identify ports.
They could be /dev/term/a /dev/term0 /dev/cua/a /dev/cuaa
the /dev/???/a appears to be on more systems.
The uucp lock files should not cause problems.
*/
/*
File dev = new File( "/dev/term" );
String deva[] = dev.list();
dev = new File( "/dev/cua" );
String devb[] = dev.list();
String[] temp = new String[ deva.length + devb.length ];
for(int j =0;j<deva.length;j++)
deva[j] = "term/" + deva[j];
for(int j =0;j<devb.length;j++)
devb[j] = "cua/" + devb[j];
System.arraycopy( deva, 0, temp, 0, deva.length );
System.arraycopy( devb, 0, temp,
deva.length, devb.length );
if( debug ) {
for( int j = 0; j< temp.length;j++)
System.out.println( temp[j] );
}
CandidateDeviceNames=temp;
*/
/*
ok.. Look the the dirctories representing the port
kernel driver interface.
If there are entries there are possibly ports we can
use and need to enumerate.
*/
String term[] = new String[2];
int l = 0;
File dev = null;
dev = new File( "/dev/term" );
if( dev.list().length > 0 );
term[l++] = new String( "term/" );
dev = new File( "/dev/cua0" );
if( dev.list().length > 0 );
term[l++] = new String( "cua/" );
String[] temp = new String[l];
for(l--;l >= 0;l--)
temp[l] = term[l];
CandidateDeviceNames=temp;
}
else
{
File dev = new File( deviceDirectory );
String[] temp = dev.list();
CandidateDeviceNames=temp;
}
if (CandidateDeviceNames==null)
{
if (debug)
System.out.println("RXTXCommDriver:registerScannedPorts() no Device files to check ");
return;
}
String CandidatePortPrefixes[] = {};
switch (PortType) {
case CommPortIdentifier.PORT_SERIAL:
if (debug)
System.out.println("scanning for serial ports for os "+osName);
if(osName.equals("Linux"))
{
String[] Temp = {
"ttyS" // linux Serial Ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("Linux-all-ports"))
{
/* if you want to enumerate all ports ~5000
possible, then replace the above with this
*/
String[] Temp = {
"comx", // linux COMMX synchronous serial card
"holter", // custom card for heart monitoring
"modem", // linux symbolic link to modem.
"ttyircomm", // linux IrCommdevices (IrDA serial emu)
"ttycosa0c", // linux COSA/SRP synchronous serial card
"ttycosa1c", // linux COSA/SRP synchronous serial card
"ttyC", // linux cyclades cards
"ttyCH",// linux Chase Research AT/PCI-Fast serial card
"ttyD", // linux Digiboard serial card
"ttyE", // linux Stallion serial card
"ttyF", // linux Computone IntelliPort serial card
"ttyH", // linux Chase serial card
"ttyI", // linux virtual modems
"ttyL", // linux SDL RISCom serial card
"ttyM", // linux PAM Software's multimodem boards
// linux ISI serial card
"ttyMX",// linux Moxa Smart IO cards
"ttyP", // linux Hayes ESP serial card
"ttyR", // linux comtrol cards
// linux Specialix RIO serial card
"ttyS", // linux Serial Ports
"ttySI",// linux SmartIO serial card
"ttySR",// linux Specialix RIO serial card 257+
"ttyT", // linux Technology Concepts serial card
"ttyUSB",//linux USB serial converters
"ttyV", // linux Comtrol VS-1000 serial controller
"ttyW", // linux specialix cards
"ttyX" // linux SpecialX serial card
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("Irix"))
{
String[] Temp = {
"ttyc", // irix raw character devices
"ttyd", // irix basic serial ports
"ttyf", // irix serial ports with hardware flow
"ttym", // irix modems
"ttyq", // irix pseudo ttys
"tty4d",// irix RS422
"tty4f",// irix RS422 with HSKo/HSki
"midi", // irix serial midi
"us" // irix mapped interface
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("FreeBSD")) //FIXME this is probably wrong
{
String[] Temp = {
"cuaa" // FreeBSD Serial Ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("NetBSD")) // FIXME this is probably wrong
{
String[] Temp = {
"tty0" // netbsd serial ports
};
CandidatePortPrefixes=Temp;
}
else if ( osName.equals("Solaris")
|| osName.equals("SunOS"))
{
String[] Temp = {
"term/",
"cua/"
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("HP-UX"))
{
String[] Temp = {
"tty0p",// HP-UX serial ports
"tty1p" // HP-UX serial ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("UnixWare") ||
osName.equals("OpenUNIX"))
{
String[] Temp = {
"tty00s", // UW7/OU8 serial ports
"tty01s",
"tty02s",
"tty03s"
};
CandidatePortPrefixes=Temp;
}
else if (osName.equals("OpenServer"))
{
String[] Temp = {
"tty1A", // OSR5 serial ports
"tty2A",
"tty3A",
"tty4A",
"tty5A",
"tty6A",
"tty7A",
"tty8A",
"tty9A",
"tty10A",
"tty11A",
"tty12A",
"tty13A",
"tty14A",
"tty15A",
"tty16A",
"ttyu1A", // OSR5 USB-serial ports
"ttyu2A",
"ttyu3A",
"ttyu4A",
"ttyu5A",
"ttyu6A",
"ttyu7A",
"ttyu8A",
"ttyu9A",
"ttyu10A",
"ttyu11A",
"ttyu12A",
"ttyu13A",
"ttyu14A",
"ttyu15A",
"ttyu16A"
};
CandidatePortPrefixes=Temp;
}
else if (osName.equals("Compaq's Digital UNIX"))
{
String[] Temp = {
"tty0" // Digital Unix serial ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("BeOS"))
{
String[] Temp = {
"serial" // BeOS serial ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("Mac OS X"))
{
String[] Temp = {
// Keyspan USA-28X adapter, USB port 1
"cu.KeyUSA28X191.",
// Keyspan USA-28X adapter, USB port 1
"tty.KeyUSA28X191.",
// Keyspan USA-28X adapter, USB port 2
"cu.KeyUSA28X181.",
// Keyspan USA-28X adapter, USB port 2
"tty.KeyUSA28X181.",
// Keyspan USA-19 adapter
"cu.KeyUSA19181.",
// Keyspan USA-19 adapter
"tty.KeyUSA19181."
};
CandidatePortPrefixes=Temp;
}
else if(osName.toLowerCase().indexOf("windows") != -1 )
{
String[] Temp = {
"COM" // win32 serial ports
};
CandidatePortPrefixes=Temp;
}
else
{
if (debug)
System.out.println("No valid prefixes for serial ports have been entered for "+osName + " in RXTXCommDriver.java. This may just be a typo in the method registerScanPorts().");
}
break;
case CommPortIdentifier.PORT_PARALLEL:
if (debug)
System.out.println("scanning for parallel ports for os "+osName);
/** Get the Parallel port prefixes for the running os
* Holger Lehmann
* July 12, 1999
* IBM
*/
if(osName.equals("Linux")
/*
|| osName.equals("NetBSD") FIXME
|| osName.equals("HP-UX") FIXME
|| osName.equals("Irix") FIXME
|| osName.equals("BeOS") FIXME
|| osName.equals("Compaq's Digital UNIX") FIXME
*/
)
{
String[] temp={
"lp" // linux printer port
};
CandidatePortPrefixes=temp;
}
else if(osName.equals("FreeBSD"))
{
String[] temp={
"lpt"
};
CandidatePortPrefixes=temp;
}
else /* printer support is green */
{
String [] temp={};
CandidatePortPrefixes=temp;
}
break;
default:
if (debug)
System.out.println("Unknown PortType "+PortType+" passed to RXTXCommDriver.registerScannedPorts()");
}
registerValidPorts(CandidateDeviceNames, CandidatePortPrefixes, PortType);
}
| private void registerScannedPorts(int PortType)
{
String[] CandidateDeviceNames;
if (debug)
System.out.println("scanning device directory "+deviceDirectory+" for ports of type "+PortType);
if(osName.toLowerCase().indexOf("windows") != -1 )
{
String[] temp = { "COM1", "COM2","COM3","COM4" };
/*FIXME Untested , "COM5", COM6", COM7", "COM8" */
CandidateDeviceNames=temp;
}
else if ( osName.equals("Solaris") || osName.equals("SunOS"))
{
/* Solaris uses a few different ways to identify ports.
They could be /dev/term/a /dev/term0 /dev/cua/a /dev/cuaa
the /dev/???/a appears to be on more systems.
The uucp lock files should not cause problems.
*/
/*
File dev = new File( "/dev/term" );
String deva[] = dev.list();
dev = new File( "/dev/cua" );
String devb[] = dev.list();
String[] temp = new String[ deva.length + devb.length ];
for(int j =0;j<deva.length;j++)
deva[j] = "term/" + deva[j];
for(int j =0;j<devb.length;j++)
devb[j] = "cua/" + devb[j];
System.arraycopy( deva, 0, temp, 0, deva.length );
System.arraycopy( devb, 0, temp,
deva.length, devb.length );
if( debug ) {
for( int j = 0; j< temp.length;j++)
System.out.println( temp[j] );
}
CandidateDeviceNames=temp;
*/
/*
ok.. Look the the dirctories representing the port
kernel driver interface.
If there are entries there are possibly ports we can
use and need to enumerate.
*/
String term[] = new String[2];
int l = 0;
File dev = null;
dev = new File( "/dev/term" );
if( dev.list().length > 0 );
term[l++] = new String( "term/" );
dev = new File( "/dev/cua0" );
if( dev.list().length > 0 );
term[l++] = new String( "cua/" );
String[] temp = new String[l];
for(l--;l >= 0;l--)
temp[l] = term[l];
CandidateDeviceNames=temp;
}
else
{
File dev = new File( deviceDirectory );
String[] temp = dev.list();
CandidateDeviceNames=temp;
}
if (CandidateDeviceNames==null)
{
if (debug)
System.out.println("RXTXCommDriver:registerScannedPorts() no Device files to check ");
return;
}
String CandidatePortPrefixes[] = {};
switch (PortType) {
case CommPortIdentifier.PORT_SERIAL:
if (debug)
System.out.println("scanning for serial ports for os "+osName);
if(osName.equals("Linux"))
{
String[] Temp = {
"ttyS" // linux Serial Ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("Linux-all-ports"))
{
/* if you want to enumerate all ports ~5000
possible, then replace the above with this
*/
String[] Temp = {
"comx", // linux COMMX synchronous serial card
"holter", // custom card for heart monitoring
"modem", // linux symbolic link to modem.
"ttyircomm", // linux IrCommdevices (IrDA serial emu)
"ttycosa0c", // linux COSA/SRP synchronous serial card
"ttycosa1c", // linux COSA/SRP synchronous serial card
"ttyC", // linux cyclades cards
"ttyCH",// linux Chase Research AT/PCI-Fast serial card
"ttyD", // linux Digiboard serial card
"ttyE", // linux Stallion serial card
"ttyF", // linux Computone IntelliPort serial card
"ttyH", // linux Chase serial card
"ttyI", // linux virtual modems
"ttyL", // linux SDL RISCom serial card
"ttyM", // linux PAM Software's multimodem boards
// linux ISI serial card
"ttyMX",// linux Moxa Smart IO cards
"ttyP", // linux Hayes ESP serial card
"ttyR", // linux comtrol cards
// linux Specialix RIO serial card
"ttyS", // linux Serial Ports
"ttySI",// linux SmartIO serial card
"ttySR",// linux Specialix RIO serial card 257+
"ttyT", // linux Technology Concepts serial card
"ttyUSB",//linux USB serial converters
"ttyV", // linux Comtrol VS-1000 serial controller
"ttyW", // linux specialix cards
"ttyX" // linux SpecialX serial card
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("Irix"))
{
String[] Temp = {
"ttyc", // irix raw character devices
"ttyd", // irix basic serial ports
"ttyf", // irix serial ports with hardware flow
"ttym", // irix modems
"ttyq", // irix pseudo ttys
"tty4d",// irix RS422
"tty4f",// irix RS422 with HSKo/HSki
"midi", // irix serial midi
"us" // irix mapped interface
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("FreeBSD")) //FIXME this is probably wrong
{
String[] Temp = {
"cuaa" // FreeBSD Serial Ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("NetBSD")) // FIXME this is probably wrong
{
String[] Temp = {
"tty0" // netbsd serial ports
};
CandidatePortPrefixes=Temp;
}
else if ( osName.equals("Solaris")
|| osName.equals("SunOS"))
{
String[] Temp = {
"term/",
"cua/"
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("HP-UX"))
{
String[] Temp = {
"tty0p",// HP-UX serial ports
"tty1p" // HP-UX serial ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("UnixWare") ||
osName.equals("OpenUNIX"))
{
String[] Temp = {
"tty00s", // UW7/OU8 serial ports
"tty01s",
"tty02s",
"tty03s"
};
CandidatePortPrefixes=Temp;
}
else if (osName.equals("OpenServer"))
{
String[] Temp = {
"tty1A", // OSR5 serial ports
"tty2A",
"tty3A",
"tty4A",
"tty5A",
"tty6A",
"tty7A",
"tty8A",
"tty9A",
"tty10A",
"tty11A",
"tty12A",
"tty13A",
"tty14A",
"tty15A",
"tty16A",
"ttyu1A", // OSR5 USB-serial ports
"ttyu2A",
"ttyu3A",
"ttyu4A",
"ttyu5A",
"ttyu6A",
"ttyu7A",
"ttyu8A",
"ttyu9A",
"ttyu10A",
"ttyu11A",
"ttyu12A",
"ttyu13A",
"ttyu14A",
"ttyu15A",
"ttyu16A"
};
CandidatePortPrefixes=Temp;
}
else if (osName.equals("Compaq's Digital UNIX") || osName.equals("OSF1"))
{
String[] Temp = {
"tty0" // Digital Unix serial ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("BeOS"))
{
String[] Temp = {
"serial" // BeOS serial ports
};
CandidatePortPrefixes=Temp;
}
else if(osName.equals("Mac OS X"))
{
String[] Temp = {
// Keyspan USA-28X adapter, USB port 1
"cu.KeyUSA28X191.",
// Keyspan USA-28X adapter, USB port 1
"tty.KeyUSA28X191.",
// Keyspan USA-28X adapter, USB port 2
"cu.KeyUSA28X181.",
// Keyspan USA-28X adapter, USB port 2
"tty.KeyUSA28X181.",
// Keyspan USA-19 adapter
"cu.KeyUSA19181.",
// Keyspan USA-19 adapter
"tty.KeyUSA19181."
};
CandidatePortPrefixes=Temp;
}
else if(osName.toLowerCase().indexOf("windows") != -1 )
{
String[] Temp = {
"COM" // win32 serial ports
};
CandidatePortPrefixes=Temp;
}
else
{
if (debug)
System.out.println("No valid prefixes for serial ports have been entered for "+osName + " in RXTXCommDriver.java. This may just be a typo in the method registerScanPorts().");
}
break;
case CommPortIdentifier.PORT_PARALLEL:
if (debug)
System.out.println("scanning for parallel ports for os "+osName);
/** Get the Parallel port prefixes for the running os
* Holger Lehmann
* July 12, 1999
* IBM
*/
if(osName.equals("Linux")
/*
|| osName.equals("NetBSD") FIXME
|| osName.equals("HP-UX") FIXME
|| osName.equals("Irix") FIXME
|| osName.equals("BeOS") FIXME
|| osName.equals("Compaq's Digital UNIX") FIXME
*/
)
{
String[] temp={
"lp" // linux printer port
};
CandidatePortPrefixes=temp;
}
else if(osName.equals("FreeBSD"))
{
String[] temp={
"lpt"
};
CandidatePortPrefixes=temp;
}
else /* printer support is green */
{
String [] temp={};
CandidatePortPrefixes=temp;
}
break;
default:
if (debug)
System.out.println("Unknown PortType "+PortType+" passed to RXTXCommDriver.registerScannedPorts()");
}
registerValidPorts(CandidateDeviceNames, CandidatePortPrefixes, PortType);
}
|
diff --git a/src/com/github/nutomic/controldlna/gui/MainActivity.java b/src/com/github/nutomic/controldlna/gui/MainActivity.java
index 79a4399..d50ecd9 100644
--- a/src/com/github/nutomic/controldlna/gui/MainActivity.java
+++ b/src/com/github/nutomic/controldlna/gui/MainActivity.java
@@ -1,240 +1,240 @@
/*
Copyright (c) 2013, Felix Ableitner
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the <organization> nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.github.nutomic.controldlna.gui;
import java.util.List;
import org.teleal.cling.support.model.item.Item;
import android.app.AlertDialog;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBar.Tab;
import android.support.v7.app.ActionBar.TabListener;
import android.support.v7.app.ActionBarActivity;
import android.view.KeyEvent;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import com.github.nutomic.controldlna.R;
/**
* Main activity, with tabs for media servers and media routes.
*
* @author Felix Ableitner
*
*/
public class MainActivity extends ActionBarActivity {
/**
* Interface which allows listening to "back" button presses.
*/
public interface OnBackPressedListener {
boolean onBackPressed();
}
FragmentStatePagerAdapter mSectionsPagerAdapter =
new FragmentStatePagerAdapter(getSupportFragmentManager()) {
@Override
public Fragment getItem(int position) {
switch (position) {
case 0: return mServerFragment;
case 1: return mRouteFragment;
default: return null;
}
}
@Override
public int getCount() {
return 2;
}
};
private ServerFragment mServerFragment;
private RouteFragment mRouteFragment;
ViewPager mViewPager;
/**
* Initializes tab navigation. If wifi is not connected,
* shows a warning dialog.
*/
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- onNewIntent(getIntent());
final ActionBar actionBar = getSupportActionBar();
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
actionBar.setDisplayShowTitleEnabled(false);
actionBar.setDisplayShowHomeEnabled(false);
setContentView(R.layout.activity_main);
mViewPager = (ViewPager) findViewById(R.id.pager);
mViewPager.setAdapter(mSectionsPagerAdapter);
mViewPager.setOnPageChangeListener(
new ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
actionBar.setSelectedNavigationItem(position);
}
});
TabListener tabListener = new ActionBar.TabListener() {
public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
mViewPager.setCurrentItem(tab.getPosition());
}
@Override
public void onTabReselected(Tab arg0, FragmentTransaction arg1) {
}
@Override
public void onTabUnselected(Tab arg0, FragmentTransaction arg1) {
}
};
actionBar.addTab(actionBar.newTab()
.setText(R.string.title_server)
.setTabListener(tabListener));
actionBar.addTab(actionBar.newTab()
.setText(R.string.title_route)
.setTabListener(tabListener));
ConnectivityManager connManager = (ConnectivityManager)
getSystemService(CONNECTIVITY_SERVICE);
NetworkInfo wifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
final SharedPreferences prefs = getSharedPreferences("preferences.db", 0);
if (!wifi.isConnected() && !prefs.getBoolean("wifi_skip_dialog", false)) {
View checkBoxView = View.inflate(this, R.layout.dialog_wifi_disabled, null);
CheckBox checkBox = (CheckBox) checkBoxView.findViewById(R.id.dont_show_again);
checkBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
prefs.edit().putBoolean("wifi_skip_dialog", isChecked)
.commit();
}
});
new AlertDialog.Builder(this)
.setView(checkBoxView)
.setTitle(R.string.warning_wifi_not_connected)
.setPositiveButton(android.R.string.ok, null)
.show();
}
if (savedInstanceState != null) {
FragmentManager fm = getSupportFragmentManager();
mServerFragment = (ServerFragment) fm.getFragment(
savedInstanceState, ServerFragment.class.getName());
mRouteFragment = (RouteFragment) fm.getFragment(
savedInstanceState, RouteFragment.class.getName());
mViewPager.setCurrentItem(savedInstanceState.getInt("currentTab"));
}
else {
mServerFragment = new ServerFragment();
mRouteFragment = new RouteFragment();
}
+ onNewIntent(getIntent());
}
/**
* Displays the RouteFragment immediately (instead of ServerFragment).
*/
@Override
protected void onNewIntent(Intent intent) {
if (intent.getAction().equals("showRouteFragment"))
mViewPager.setCurrentItem(1);
}
/**
* Saves fragments.
*/
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
FragmentManager fm = getSupportFragmentManager();
fm.putFragment(outState, ServerFragment.class.getName(), mServerFragment);
fm.putFragment(outState, RouteFragment.class.getName(), mRouteFragment);
outState.putInt("currentTab", mViewPager.getCurrentItem());
}
/**
* Forwards back press to active Fragment (unless the fragment is
* showing its root view).
*/
@Override
public void onBackPressed() {
OnBackPressedListener currentFragment = (OnBackPressedListener)
mSectionsPagerAdapter.getItem(mViewPager.getCurrentItem());
if (!currentFragment.onBackPressed())
super.onBackPressed();
}
/**
* Changes volume on key press (via RouteFragment).
*/
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
switch (event.getKeyCode()) {
case KeyEvent.KEYCODE_VOLUME_UP:
if (event.getAction() == KeyEvent.ACTION_DOWN)
mRouteFragment.increaseVolume();
return true;
case KeyEvent.KEYCODE_VOLUME_DOWN:
if (event.getAction() == KeyEvent.ACTION_DOWN)
mRouteFragment.decreaseVolume();
return true;
default:
return super.dispatchKeyEvent(event);
}
}
/**
* Starts playing the playlist from item start (via RouteFragment).
*/
public void play(List<Item> playlist, int start) {
mViewPager.setCurrentItem(1);
mRouteFragment.play(playlist, start);
}
}
| false | true | public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
onNewIntent(getIntent());
final ActionBar actionBar = getSupportActionBar();
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
actionBar.setDisplayShowTitleEnabled(false);
actionBar.setDisplayShowHomeEnabled(false);
setContentView(R.layout.activity_main);
mViewPager = (ViewPager) findViewById(R.id.pager);
mViewPager.setAdapter(mSectionsPagerAdapter);
mViewPager.setOnPageChangeListener(
new ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
actionBar.setSelectedNavigationItem(position);
}
});
TabListener tabListener = new ActionBar.TabListener() {
public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
mViewPager.setCurrentItem(tab.getPosition());
}
@Override
public void onTabReselected(Tab arg0, FragmentTransaction arg1) {
}
@Override
public void onTabUnselected(Tab arg0, FragmentTransaction arg1) {
}
};
actionBar.addTab(actionBar.newTab()
.setText(R.string.title_server)
.setTabListener(tabListener));
actionBar.addTab(actionBar.newTab()
.setText(R.string.title_route)
.setTabListener(tabListener));
ConnectivityManager connManager = (ConnectivityManager)
getSystemService(CONNECTIVITY_SERVICE);
NetworkInfo wifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
final SharedPreferences prefs = getSharedPreferences("preferences.db", 0);
if (!wifi.isConnected() && !prefs.getBoolean("wifi_skip_dialog", false)) {
View checkBoxView = View.inflate(this, R.layout.dialog_wifi_disabled, null);
CheckBox checkBox = (CheckBox) checkBoxView.findViewById(R.id.dont_show_again);
checkBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
prefs.edit().putBoolean("wifi_skip_dialog", isChecked)
.commit();
}
});
new AlertDialog.Builder(this)
.setView(checkBoxView)
.setTitle(R.string.warning_wifi_not_connected)
.setPositiveButton(android.R.string.ok, null)
.show();
}
if (savedInstanceState != null) {
FragmentManager fm = getSupportFragmentManager();
mServerFragment = (ServerFragment) fm.getFragment(
savedInstanceState, ServerFragment.class.getName());
mRouteFragment = (RouteFragment) fm.getFragment(
savedInstanceState, RouteFragment.class.getName());
mViewPager.setCurrentItem(savedInstanceState.getInt("currentTab"));
}
else {
mServerFragment = new ServerFragment();
mRouteFragment = new RouteFragment();
}
}
| public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final ActionBar actionBar = getSupportActionBar();
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
actionBar.setDisplayShowTitleEnabled(false);
actionBar.setDisplayShowHomeEnabled(false);
setContentView(R.layout.activity_main);
mViewPager = (ViewPager) findViewById(R.id.pager);
mViewPager.setAdapter(mSectionsPagerAdapter);
mViewPager.setOnPageChangeListener(
new ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
actionBar.setSelectedNavigationItem(position);
}
});
TabListener tabListener = new ActionBar.TabListener() {
public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
mViewPager.setCurrentItem(tab.getPosition());
}
@Override
public void onTabReselected(Tab arg0, FragmentTransaction arg1) {
}
@Override
public void onTabUnselected(Tab arg0, FragmentTransaction arg1) {
}
};
actionBar.addTab(actionBar.newTab()
.setText(R.string.title_server)
.setTabListener(tabListener));
actionBar.addTab(actionBar.newTab()
.setText(R.string.title_route)
.setTabListener(tabListener));
ConnectivityManager connManager = (ConnectivityManager)
getSystemService(CONNECTIVITY_SERVICE);
NetworkInfo wifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
final SharedPreferences prefs = getSharedPreferences("preferences.db", 0);
if (!wifi.isConnected() && !prefs.getBoolean("wifi_skip_dialog", false)) {
View checkBoxView = View.inflate(this, R.layout.dialog_wifi_disabled, null);
CheckBox checkBox = (CheckBox) checkBoxView.findViewById(R.id.dont_show_again);
checkBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
prefs.edit().putBoolean("wifi_skip_dialog", isChecked)
.commit();
}
});
new AlertDialog.Builder(this)
.setView(checkBoxView)
.setTitle(R.string.warning_wifi_not_connected)
.setPositiveButton(android.R.string.ok, null)
.show();
}
if (savedInstanceState != null) {
FragmentManager fm = getSupportFragmentManager();
mServerFragment = (ServerFragment) fm.getFragment(
savedInstanceState, ServerFragment.class.getName());
mRouteFragment = (RouteFragment) fm.getFragment(
savedInstanceState, RouteFragment.class.getName());
mViewPager.setCurrentItem(savedInstanceState.getInt("currentTab"));
}
else {
mServerFragment = new ServerFragment();
mRouteFragment = new RouteFragment();
}
onNewIntent(getIntent());
}
|
diff --git a/src/main/java/me/limebyte/endercraftessentials/commands/FixMobsCommand.java b/src/main/java/me/limebyte/endercraftessentials/commands/FixMobsCommand.java
index 685042c..7a4b2da 100644
--- a/src/main/java/me/limebyte/endercraftessentials/commands/FixMobsCommand.java
+++ b/src/main/java/me/limebyte/endercraftessentials/commands/FixMobsCommand.java
@@ -1,50 +1,50 @@
package me.limebyte.endercraftessentials.commands;
import me.limebyte.endercraftessentials.EndercraftEssentials;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Difficulty;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class FixMobsCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
- if (args[0] == null) {
+ if (args[0].isEmpty()) {
if (sender instanceof Player) {
Player player = (Player) sender;
fixMobs(player.getWorld());
player.sendMessage(ChatColor.GREEN + "Mobs Fixed!");
}
} else {
if (Bukkit.getWorld(args[0]) == null) {
sender.sendMessage(ChatColor.RED + "Invaild world!");
} else {
fixMobs(Bukkit.getWorld(args[0]));
sender.sendMessage(ChatColor.GREEN + "Mobs Fixed!");
}
}
return false;
}
private void fixMobs(final World world) {
// Store current difficulty
final Difficulty worldDifficulty = world.getDifficulty();
// Set it to peaceful
world.setDifficulty(Difficulty.PEACEFUL);
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(EndercraftEssentials.getInstance(), new Runnable() {
public void run() {
// Set it back to the original difficulty
world.setDifficulty(worldDifficulty);
}
}, 20L);
}
}
| true | true | public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (args[0] == null) {
if (sender instanceof Player) {
Player player = (Player) sender;
fixMobs(player.getWorld());
player.sendMessage(ChatColor.GREEN + "Mobs Fixed!");
}
} else {
if (Bukkit.getWorld(args[0]) == null) {
sender.sendMessage(ChatColor.RED + "Invaild world!");
} else {
fixMobs(Bukkit.getWorld(args[0]));
sender.sendMessage(ChatColor.GREEN + "Mobs Fixed!");
}
}
return false;
}
| public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (args[0].isEmpty()) {
if (sender instanceof Player) {
Player player = (Player) sender;
fixMobs(player.getWorld());
player.sendMessage(ChatColor.GREEN + "Mobs Fixed!");
}
} else {
if (Bukkit.getWorld(args[0]) == null) {
sender.sendMessage(ChatColor.RED + "Invaild world!");
} else {
fixMobs(Bukkit.getWorld(args[0]));
sender.sendMessage(ChatColor.GREEN + "Mobs Fixed!");
}
}
return false;
}
|
diff --git a/src/main/java/org/basex/core/MainProp.java b/src/main/java/org/basex/core/MainProp.java
index c3ecb1b44..2ddf7ad8e 100644
--- a/src/main/java/org/basex/core/MainProp.java
+++ b/src/main/java/org/basex/core/MainProp.java
@@ -1,133 +1,137 @@
package org.basex.core;
import java.util.*;
import org.basex.io.*;
/**
* This class assembles admin properties which are used all around the project.
* They are also stored in the project's home directory.
*
* @author BaseX Team 2005-12, BSD License
* @author Christian Gruen
*/
public final class MainProp extends AProp {
/** Indicates if the user's home directory has been chosen as home directory. */
private static final boolean USERHOME = Prop.HOME.equals(Prop.USERHOME);
/** Database path. */
public static final Object[] DBPATH = { "DBPATH",
Prop.HOME + (USERHOME ? Prop.NAME + "Data" : "data") };
/** HTTP path. */
public static final Object[] HTTPPATH = { "HTTPPATH",
Prop.HOME + (USERHOME ? Prop.NAME + "HTTP" : "http") };
/** Package repository path. */
public static final Object[] REPOPATH = { "REPOPATH",
Prop.HOME + (USERHOME ? Prop.NAME + "Repo" : "repo") };
/** Language name. */
public static final Object[] LANG = { "LANG", Prop.language };
/** Flag to include key names in the language strings. */
public static final Object[] LANGKEYS = { "LANGKEYS", false };
/** Server: host, used for connecting new clients. */
public static final Object[] HOST = { "HOST", Text.LOCALHOST };
/** Server: port, used for connecting new clients. */
public static final Object[] PORT = { "PORT", 1984 };
/** Server: host, used for binding the server. Empty
* string for wildcard.*/
public static final Object[] SERVERHOST = { "SERVERHOST", "" };
/** Server: port, used for binding the server. */
public static final Object[] SERVERPORT = { "SERVERPORT", 1984 };
/** Server: port, used for sending events. */
public static final Object[] EVENTPORT = { "EVENTPORT", 1985 };
/** Server: port, used for starting the HTTP server. */
public static final Object[] HTTPPORT = { "HTTPPORT", 8984 };
/** Server: port, used for stopping the HTTP server. */
public static final Object[] STOPPORT = { "STOPPORT", 8985 };
/** Server: proxy host. */
public static final Object[] PROXYHOST = { "PROXYHOST", "" };
/** Server: proxy port. */
public static final Object[] PROXYPORT = { "PROXYPORT", 80 };
/** Server: non-proxy host. */
public static final Object[] NONPROXYHOSTS = { "NONPROXYHOSTS", "" };
/** Timeout (seconds) for processing client requests; deactivated if set to 0. */
public static final Object[] TIMEOUT = { "TIMEOUT", 0 };
/** Keep alive time of clients; deactivated if set to 0. */
public static final Object[] KEEPALIVE = { "KEEPALIVE", 0 };
/** Debug mode. */
public static final Object[] DEBUG = { "DEBUG", false };
/** Defines the number of parallel readers. */
public static final Object[] PARALLEL = { "PARALLEL", 8 };
/**
* Constructor, reading properties from disk.
*/
MainProp() {
read("");
finish();
}
/**
* Constructor, assigning the specified properties.
* @param map initial properties
*/
MainProp(final HashMap<String, String> map) {
for(final Map.Entry<String, String> entry : map.entrySet()) {
set(entry.getKey(), entry.getValue());
}
finish();
}
/**
* Returns a reference to a database directory.
* @param db name of the database
* @return database directory
*/
public IOFile dbpath(final String db) {
return new IOFile(get(DBPATH), db);
}
/**
* Returns a random temporary name for the specified database.
* @param db name of database
* @return random name
*/
public String random(final String db) {
String nm;
do {
nm = db + '_' + new Random().nextInt(0x7FFFFFFF);
} while(dbpath(nm).exists());
return nm;
}
/**
* Returns the current database path.
* @return database filename
*/
public IOFile dbpath() {
return new IOFile(get(DBPATH));
}
/**
* Checks if the specified database exists.
* @param db name of the database
* @return result of check
*/
public boolean dbexists(final String db) {
return !db.isEmpty() && dbpath(db).exists();
}
@Override
protected void finish() {
// set some static properties
Prop.language = get(LANG);
Prop.langkeys = is(LANGKEYS);
Prop.debug = is(DEBUG);
- System.setProperty("http.proxyHost", get(PROXYHOST));
- System.setProperty("http.proxyPort", Integer.toString(num(PROXYPORT)));
+ final String ph = get(PROXYHOST);
+ final String pp = Integer.toString(num(PROXYPORT));
+ System.setProperty("http.proxyHost", ph);
+ System.setProperty("http.proxyPort", pp);
+ System.setProperty("https.proxyHost", ph);
+ System.setProperty("https.proxyPort", pp);
System.setProperty("http.nonProxyHosts", get(NONPROXYHOSTS));
}
}
| true | true | protected void finish() {
// set some static properties
Prop.language = get(LANG);
Prop.langkeys = is(LANGKEYS);
Prop.debug = is(DEBUG);
System.setProperty("http.proxyHost", get(PROXYHOST));
System.setProperty("http.proxyPort", Integer.toString(num(PROXYPORT)));
System.setProperty("http.nonProxyHosts", get(NONPROXYHOSTS));
}
| protected void finish() {
// set some static properties
Prop.language = get(LANG);
Prop.langkeys = is(LANGKEYS);
Prop.debug = is(DEBUG);
final String ph = get(PROXYHOST);
final String pp = Integer.toString(num(PROXYPORT));
System.setProperty("http.proxyHost", ph);
System.setProperty("http.proxyPort", pp);
System.setProperty("https.proxyHost", ph);
System.setProperty("https.proxyPort", pp);
System.setProperty("http.nonProxyHosts", get(NONPROXYHOSTS));
}
|
diff --git a/src/main/java/org/mule/tools/jshint/JSHint.java b/src/main/java/org/mule/tools/jshint/JSHint.java
index 95837df..706043b 100644
--- a/src/main/java/org/mule/tools/jshint/JSHint.java
+++ b/src/main/java/org/mule/tools/jshint/JSHint.java
@@ -1,99 +1,99 @@
/**
* Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
*
* The software in this package is published under the terms of the CPAL v1.0
* license, a copy of which has been included with this distribution in the
* LICENSE.txt file.
*/
package org.mule.tools.jshint;
import org.apache.commons.io.IOUtils;
import org.mozilla.javascript.*;
import org.mozilla.javascript.tools.shell.Global;
import org.mule.tools.rhinodo.api.ConsoleFactory;
import org.mule.tools.rhinodo.api.NodeModule;
import org.mule.tools.rhinodo.api.Runnable;
import org.mule.tools.rhinodo.impl.JavascriptRunner;
import org.mule.tools.rhinodo.impl.NodeModuleFactoryImpl;
import org.mule.tools.rhinodo.impl.NodeModuleImpl;
import org.mule.tools.rhinodo.rhino.RhinoHelper;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
public class JSHint implements Runnable {
private NodeModuleImpl jshintModule;
private JavascriptRunner javascriptRunner;
private InputStream inputStream;
private String fileName;
private NativeArray errors;
private Map config;
private RhinoHelper rhinoHelper;
public JSHint(ConsoleFactory consoleFactory, String destDir) {
this.rhinoHelper = new RhinoHelper();
jshintModule = NodeModuleImpl.fromJar(this.getClass(), "META-INF/jshint", destDir);
List<? extends NodeModule> nodeModuleList = Arrays.asList(
NodeModuleImpl.fromJar(this.getClass(), "META-INF/cli", destDir),
NodeModuleImpl.fromJar(this.getClass(), "META-INF/glob", destDir),
NodeModuleImpl.fromJar(this.getClass(), "META-INF/jshint", destDir),
NodeModuleImpl.fromJar(this.getClass(), "META-INF/lru-cache", destDir),
NodeModuleImpl.fromJar(this.getClass(), "META-INF/minimatch", destDir),
jshintModule);
javascriptRunner = JavascriptRunner.withConsoleFactory(consoleFactory,new NodeModuleFactoryImpl(nodeModuleList), this, destDir);
}
public boolean check(String fileName, InputStream inputStream, Map config) {
this.inputStream = inputStream;
this.fileName = fileName;
this.config = config;
javascriptRunner.run();
return errors == null;
}
@Override
public void executeJavascript(Context ctx, Global global) {
global.put("__dirname", global, Context.toString(jshintModule.getPath()));
Function require = (Function)global.get("require", global);
Object jshintRequire = require.call(ctx,global,global,new String [] {"jshint"});
NativeObject jshintContainer = (NativeObject) Context.jsToJava(jshintRequire, NativeObject.class);
NativeFunction jshint = (NativeFunction) Context.jsToJava(jshintContainer.get("JSHINT",global), Function.class);
String s;
try {
s = IOUtils.toString(inputStream, "UTF-8");
} catch (IOException e) {
throw new RuntimeException(e);
}
Object[] args = config != null ? new Object[]{s,rhinoHelper.mapToNativeObject(config)} : new Object[]{s};
jshint.call(ctx, global, global, args);
NativeFunction data = (NativeFunction) jshint.get("data");
NativeObject dataFunctionResult = (NativeObject) data.call(ctx, global, jshint, new Object[]{});
errors = (NativeArray) dataFunctionResult.get("errors");
Scriptable console = javascriptRunner.getConsole();
Function log = (Function) console.get("error", global);
if (errors!= null && errors.size() > 0) {
log.call(ctx,global,console,new Object[] {
String.format("The following errors were found in file [%s]: ", fileName)});
for (Object errorAsObject : errors) {
NativeObject error = (NativeObject) errorAsObject;
- String message = String.format("Line: %d col: %d, %s", ((Double) error.get("line")).longValue(),
- ((Double) error.get("character")).longValue(), error.get("reason"));
+ String message = String.format("Line: %d col: %s, %s", ((Double) error.get("line")).longValue(),
+ error.get("character").toString().replaceAll("\\.0*$", ""), error.get("reason"));
log.call(ctx, global, console, new Object[]{message});
}
}
}
}
| true | true | public void executeJavascript(Context ctx, Global global) {
global.put("__dirname", global, Context.toString(jshintModule.getPath()));
Function require = (Function)global.get("require", global);
Object jshintRequire = require.call(ctx,global,global,new String [] {"jshint"});
NativeObject jshintContainer = (NativeObject) Context.jsToJava(jshintRequire, NativeObject.class);
NativeFunction jshint = (NativeFunction) Context.jsToJava(jshintContainer.get("JSHINT",global), Function.class);
String s;
try {
s = IOUtils.toString(inputStream, "UTF-8");
} catch (IOException e) {
throw new RuntimeException(e);
}
Object[] args = config != null ? new Object[]{s,rhinoHelper.mapToNativeObject(config)} : new Object[]{s};
jshint.call(ctx, global, global, args);
NativeFunction data = (NativeFunction) jshint.get("data");
NativeObject dataFunctionResult = (NativeObject) data.call(ctx, global, jshint, new Object[]{});
errors = (NativeArray) dataFunctionResult.get("errors");
Scriptable console = javascriptRunner.getConsole();
Function log = (Function) console.get("error", global);
if (errors!= null && errors.size() > 0) {
log.call(ctx,global,console,new Object[] {
String.format("The following errors were found in file [%s]: ", fileName)});
for (Object errorAsObject : errors) {
NativeObject error = (NativeObject) errorAsObject;
String message = String.format("Line: %d col: %d, %s", ((Double) error.get("line")).longValue(),
((Double) error.get("character")).longValue(), error.get("reason"));
log.call(ctx, global, console, new Object[]{message});
}
}
}
| public void executeJavascript(Context ctx, Global global) {
global.put("__dirname", global, Context.toString(jshintModule.getPath()));
Function require = (Function)global.get("require", global);
Object jshintRequire = require.call(ctx,global,global,new String [] {"jshint"});
NativeObject jshintContainer = (NativeObject) Context.jsToJava(jshintRequire, NativeObject.class);
NativeFunction jshint = (NativeFunction) Context.jsToJava(jshintContainer.get("JSHINT",global), Function.class);
String s;
try {
s = IOUtils.toString(inputStream, "UTF-8");
} catch (IOException e) {
throw new RuntimeException(e);
}
Object[] args = config != null ? new Object[]{s,rhinoHelper.mapToNativeObject(config)} : new Object[]{s};
jshint.call(ctx, global, global, args);
NativeFunction data = (NativeFunction) jshint.get("data");
NativeObject dataFunctionResult = (NativeObject) data.call(ctx, global, jshint, new Object[]{});
errors = (NativeArray) dataFunctionResult.get("errors");
Scriptable console = javascriptRunner.getConsole();
Function log = (Function) console.get("error", global);
if (errors!= null && errors.size() > 0) {
log.call(ctx,global,console,new Object[] {
String.format("The following errors were found in file [%s]: ", fileName)});
for (Object errorAsObject : errors) {
NativeObject error = (NativeObject) errorAsObject;
String message = String.format("Line: %d col: %s, %s", ((Double) error.get("line")).longValue(),
error.get("character").toString().replaceAll("\\.0*$", ""), error.get("reason"));
log.call(ctx, global, console, new Object[]{message});
}
}
}
|
diff --git a/src/de/snertlab/xdccBee/ui/PacketFilterComposite.java b/src/de/snertlab/xdccBee/ui/PacketFilterComposite.java
index 1077f07..cc933b2 100644
--- a/src/de/snertlab/xdccBee/ui/PacketFilterComposite.java
+++ b/src/de/snertlab/xdccBee/ui/PacketFilterComposite.java
@@ -1,122 +1,124 @@
/*
* Project: xdccBee
* Copyright (C) 2009 [email protected],
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.snertlab.xdccBee.ui;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Layout;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
import de.snertlab.xdccBee.messages.XdccBeeMessages;
import de.snertlab.xdccBee.tools.swt.filtertext.FilterTextComposite;
import de.snertlab.xdccBee.tools.swt.filtertext.IFilterTextClearTextListener;
/**
* @author holgi
*
*/
public class PacketFilterComposite extends Composite {
private Text txtFilter;
public PacketFilterComposite(Composite parent, FormData formData, final PacketViewer packetViewer) {
super(parent, SWT.NONE);
setLayoutData(formData);
Layout layout = new GridLayout(4, false);
setLayout(layout);
GridData gridDataCompControls = new GridData(SWT.FILL, SWT.FILL, true, false);
gridDataCompControls.verticalIndent = -5;
if( Application.isMac() ){
txtFilter = new Text(this, SWT.SEARCH | SWT.ICON_CANCEL | SWT.ICON_SEARCH);
txtFilter.setLayoutData( gridDataCompControls );
Listener listener = new Listener() {
public void handleEvent(Event event) {
if (event.detail == SWT.ICON_CANCEL) {
packetViewer.setFileNameFilterText("");
}
}
};
txtFilter.addListener(SWT.DefaultSelection, listener);
}else{
FilterTextComposite filterTextComposite = new FilterTextComposite(this);
filterTextComposite.setLayoutData(gridDataCompControls);
txtFilter = filterTextComposite.getFilterControl();
filterTextComposite.addFilterTextClearTextListener( new IFilterTextClearTextListener() {
@Override
public void clearText() {
packetViewer.setFileNameFilterText(""); }
});
}
txtFilter.setMessage(XdccBeeMessages.getString("FileFilterComposite_FILTER_DUMMY_TEXT")); //$NON-NLS-1$
txtFilter.addKeyListener(new KeyListener() {
@Override
public void keyReleased(KeyEvent e) {
packetViewer.setFileNameFilterText(txtFilter.getText());
}
@Override
public void keyPressed(KeyEvent e) {
// Do Nothing
}
});
final Button checkIgnoreCase = new Button(this, SWT.CHECK);
checkIgnoreCase.setLayoutData(makeGridDataCheckboxes());
checkIgnoreCase.setText("Ignore case");
checkIgnoreCase.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
packetViewer.setFilterIgnoreCase(checkIgnoreCase.getSelection());
+ packetViewer.refresh();
}
});
final Button checkRegExp = new Button(this, SWT.CHECK);
checkRegExp.setLayoutData(makeGridDataCheckboxes());
checkRegExp.setText("Regular expression");
checkRegExp.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
packetViewer.setFilterRegExp(checkRegExp.getSelection());
+ packetViewer.refresh();
}
});
Label lblSpacer = new Label(this, SWT.NONE); //Spacer
GridData gridDataSpacer = new GridData(SWT.FILL, SWT.CENTER, true, false);
lblSpacer.setLayoutData(gridDataSpacer);
}
private GridData makeGridDataCheckboxes(){
GridData gridDataCheckbox = new GridData(SWT.LEFT, SWT.CENTER, false, false);
gridDataCheckbox.verticalIndent = -5;
return gridDataCheckbox;
}
}
| false | true | public PacketFilterComposite(Composite parent, FormData formData, final PacketViewer packetViewer) {
super(parent, SWT.NONE);
setLayoutData(formData);
Layout layout = new GridLayout(4, false);
setLayout(layout);
GridData gridDataCompControls = new GridData(SWT.FILL, SWT.FILL, true, false);
gridDataCompControls.verticalIndent = -5;
if( Application.isMac() ){
txtFilter = new Text(this, SWT.SEARCH | SWT.ICON_CANCEL | SWT.ICON_SEARCH);
txtFilter.setLayoutData( gridDataCompControls );
Listener listener = new Listener() {
public void handleEvent(Event event) {
if (event.detail == SWT.ICON_CANCEL) {
packetViewer.setFileNameFilterText("");
}
}
};
txtFilter.addListener(SWT.DefaultSelection, listener);
}else{
FilterTextComposite filterTextComposite = new FilterTextComposite(this);
filterTextComposite.setLayoutData(gridDataCompControls);
txtFilter = filterTextComposite.getFilterControl();
filterTextComposite.addFilterTextClearTextListener( new IFilterTextClearTextListener() {
@Override
public void clearText() {
packetViewer.setFileNameFilterText(""); }
});
}
txtFilter.setMessage(XdccBeeMessages.getString("FileFilterComposite_FILTER_DUMMY_TEXT")); //$NON-NLS-1$
txtFilter.addKeyListener(new KeyListener() {
@Override
public void keyReleased(KeyEvent e) {
packetViewer.setFileNameFilterText(txtFilter.getText());
}
@Override
public void keyPressed(KeyEvent e) {
// Do Nothing
}
});
final Button checkIgnoreCase = new Button(this, SWT.CHECK);
checkIgnoreCase.setLayoutData(makeGridDataCheckboxes());
checkIgnoreCase.setText("Ignore case");
checkIgnoreCase.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
packetViewer.setFilterIgnoreCase(checkIgnoreCase.getSelection());
}
});
final Button checkRegExp = new Button(this, SWT.CHECK);
checkRegExp.setLayoutData(makeGridDataCheckboxes());
checkRegExp.setText("Regular expression");
checkRegExp.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
packetViewer.setFilterRegExp(checkRegExp.getSelection());
}
});
Label lblSpacer = new Label(this, SWT.NONE); //Spacer
GridData gridDataSpacer = new GridData(SWT.FILL, SWT.CENTER, true, false);
lblSpacer.setLayoutData(gridDataSpacer);
}
| public PacketFilterComposite(Composite parent, FormData formData, final PacketViewer packetViewer) {
super(parent, SWT.NONE);
setLayoutData(formData);
Layout layout = new GridLayout(4, false);
setLayout(layout);
GridData gridDataCompControls = new GridData(SWT.FILL, SWT.FILL, true, false);
gridDataCompControls.verticalIndent = -5;
if( Application.isMac() ){
txtFilter = new Text(this, SWT.SEARCH | SWT.ICON_CANCEL | SWT.ICON_SEARCH);
txtFilter.setLayoutData( gridDataCompControls );
Listener listener = new Listener() {
public void handleEvent(Event event) {
if (event.detail == SWT.ICON_CANCEL) {
packetViewer.setFileNameFilterText("");
}
}
};
txtFilter.addListener(SWT.DefaultSelection, listener);
}else{
FilterTextComposite filterTextComposite = new FilterTextComposite(this);
filterTextComposite.setLayoutData(gridDataCompControls);
txtFilter = filterTextComposite.getFilterControl();
filterTextComposite.addFilterTextClearTextListener( new IFilterTextClearTextListener() {
@Override
public void clearText() {
packetViewer.setFileNameFilterText(""); }
});
}
txtFilter.setMessage(XdccBeeMessages.getString("FileFilterComposite_FILTER_DUMMY_TEXT")); //$NON-NLS-1$
txtFilter.addKeyListener(new KeyListener() {
@Override
public void keyReleased(KeyEvent e) {
packetViewer.setFileNameFilterText(txtFilter.getText());
}
@Override
public void keyPressed(KeyEvent e) {
// Do Nothing
}
});
final Button checkIgnoreCase = new Button(this, SWT.CHECK);
checkIgnoreCase.setLayoutData(makeGridDataCheckboxes());
checkIgnoreCase.setText("Ignore case");
checkIgnoreCase.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
packetViewer.setFilterIgnoreCase(checkIgnoreCase.getSelection());
packetViewer.refresh();
}
});
final Button checkRegExp = new Button(this, SWT.CHECK);
checkRegExp.setLayoutData(makeGridDataCheckboxes());
checkRegExp.setText("Regular expression");
checkRegExp.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
packetViewer.setFilterRegExp(checkRegExp.getSelection());
packetViewer.refresh();
}
});
Label lblSpacer = new Label(this, SWT.NONE); //Spacer
GridData gridDataSpacer = new GridData(SWT.FILL, SWT.CENTER, true, false);
lblSpacer.setLayoutData(gridDataSpacer);
}
|
diff --git a/NPlayer/src/main/java/fr/ribesg/bukkit/nplayer/punishment/PunishmentListener.java b/NPlayer/src/main/java/fr/ribesg/bukkit/nplayer/punishment/PunishmentListener.java
index 9fef9fdc..a6b5c790 100644
--- a/NPlayer/src/main/java/fr/ribesg/bukkit/nplayer/punishment/PunishmentListener.java
+++ b/NPlayer/src/main/java/fr/ribesg/bukkit/nplayer/punishment/PunishmentListener.java
@@ -1,85 +1,85 @@
/***************************************************************************
* Project file: NPlugins - NPlayer - PunishmentListener.java *
* Full Class name: fr.ribesg.bukkit.nplayer.punishment.PunishmentListener *
* *
* Copyright (c) 2012-2014 Ribesg - www.ribesg.fr *
* This file is under GPLv3 -> http://www.gnu.org/licenses/gpl-3.0.txt *
* Please contact me at ribesg[at]yahoo.fr if you improve this file! *
***************************************************************************/
package fr.ribesg.bukkit.nplayer.punishment;
import fr.ribesg.bukkit.ncore.lang.MessageId;
import fr.ribesg.bukkit.ncore.utils.TimeUtils;
import fr.ribesg.bukkit.nplayer.NPlayer;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerKickEvent;
import org.bukkit.event.player.PlayerLoginEvent;
/** @author Ribesg */
public class PunishmentListener implements Listener {
private final NPlayer plugin;
private final PunishmentDb punishmentDb;
public PunishmentListener(final NPlayer instance) {
this.plugin = instance;
this.punishmentDb = plugin.getPunishmentDb();
}
@EventHandler(priority = EventPriority.NORMAL)
public void onPlayerLogin(final PlayerLoginEvent event) {
if (event.getResult() == PlayerLoginEvent.Result.ALLOWED) {
final String playerName = event.getPlayer().getName();
final String playerIp = event.getAddress().getHostAddress();
if (punishmentDb.isNickBanned(playerName)) {
final Punishment ban = punishmentDb.get(playerName, PunishmentType.BAN);
final String playerBannedMessage;
if (ban.isPermanent()) {
playerBannedMessage = plugin.getMessages().get(MessageId.player_deniedPermBanned, ban.getReason())[0];
} else {
playerBannedMessage = plugin.getMessages().get(MessageId.player_deniedTempBanned, ban.getReason(), TimeUtils.toString((ban.getEndDate() - System.currentTimeMillis()) / 1000))[0];
}
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, playerBannedMessage);
} else if (punishmentDb.isIpBanned(playerIp)) {
- final Punishment ipBan = punishmentDb.get(playerName, PunishmentType.IPBAN);
+ final Punishment ipBan = punishmentDb.get(playerIp, PunishmentType.IPBAN);
final String ipBannedMessage;
if (ipBan.isPermanent()) {
ipBannedMessage = plugin.getMessages().get(MessageId.player_deniedPermIpBanned, ipBan.getReason())[0];
} else {
ipBannedMessage = plugin.getMessages().get(MessageId.player_deniedTempIpBanned, ipBan.getReason(), TimeUtils.toString((ipBan.getEndDate() - System.currentTimeMillis()) / 1000))[0];
}
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, ipBannedMessage);
}
}
}
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPlayerChat(final AsyncPlayerChatEvent event) {
final String playerName = event.getPlayer().getName();
final Punishment mute;
synchronized (this.punishmentDb) {
mute = punishmentDb.get(playerName, PunishmentType.MUTE);
}
if (mute != null) {
if (mute.isPermanent()) {
plugin.sendMessage(event.getPlayer(), MessageId.player_deniedPermMuted, mute.getReason());
} else {
plugin.sendMessage(event.getPlayer(), MessageId.player_deniedTempMuted, mute.getReason(), TimeUtils.toString((mute.getEndDate() - System.currentTimeMillis()) / 1000));
}
event.setCancelled(true);
}
}
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPlayerKick(final PlayerKickEvent event) {
final String msg = punishmentDb.getLeaveMessages().get(event.getPlayer().getName());
if (msg != null) {
event.setLeaveMessage(msg);
} else {
event.setLeaveMessage(plugin.getMessages().get(MessageId.player_standardKickMessage, event.getPlayer().getName())[0]);
}
}
}
| true | true | public void onPlayerLogin(final PlayerLoginEvent event) {
if (event.getResult() == PlayerLoginEvent.Result.ALLOWED) {
final String playerName = event.getPlayer().getName();
final String playerIp = event.getAddress().getHostAddress();
if (punishmentDb.isNickBanned(playerName)) {
final Punishment ban = punishmentDb.get(playerName, PunishmentType.BAN);
final String playerBannedMessage;
if (ban.isPermanent()) {
playerBannedMessage = plugin.getMessages().get(MessageId.player_deniedPermBanned, ban.getReason())[0];
} else {
playerBannedMessage = plugin.getMessages().get(MessageId.player_deniedTempBanned, ban.getReason(), TimeUtils.toString((ban.getEndDate() - System.currentTimeMillis()) / 1000))[0];
}
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, playerBannedMessage);
} else if (punishmentDb.isIpBanned(playerIp)) {
final Punishment ipBan = punishmentDb.get(playerName, PunishmentType.IPBAN);
final String ipBannedMessage;
if (ipBan.isPermanent()) {
ipBannedMessage = plugin.getMessages().get(MessageId.player_deniedPermIpBanned, ipBan.getReason())[0];
} else {
ipBannedMessage = plugin.getMessages().get(MessageId.player_deniedTempIpBanned, ipBan.getReason(), TimeUtils.toString((ipBan.getEndDate() - System.currentTimeMillis()) / 1000))[0];
}
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, ipBannedMessage);
}
}
}
| public void onPlayerLogin(final PlayerLoginEvent event) {
if (event.getResult() == PlayerLoginEvent.Result.ALLOWED) {
final String playerName = event.getPlayer().getName();
final String playerIp = event.getAddress().getHostAddress();
if (punishmentDb.isNickBanned(playerName)) {
final Punishment ban = punishmentDb.get(playerName, PunishmentType.BAN);
final String playerBannedMessage;
if (ban.isPermanent()) {
playerBannedMessage = plugin.getMessages().get(MessageId.player_deniedPermBanned, ban.getReason())[0];
} else {
playerBannedMessage = plugin.getMessages().get(MessageId.player_deniedTempBanned, ban.getReason(), TimeUtils.toString((ban.getEndDate() - System.currentTimeMillis()) / 1000))[0];
}
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, playerBannedMessage);
} else if (punishmentDb.isIpBanned(playerIp)) {
final Punishment ipBan = punishmentDb.get(playerIp, PunishmentType.IPBAN);
final String ipBannedMessage;
if (ipBan.isPermanent()) {
ipBannedMessage = plugin.getMessages().get(MessageId.player_deniedPermIpBanned, ipBan.getReason())[0];
} else {
ipBannedMessage = plugin.getMessages().get(MessageId.player_deniedTempIpBanned, ipBan.getReason(), TimeUtils.toString((ipBan.getEndDate() - System.currentTimeMillis()) / 1000))[0];
}
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, ipBannedMessage);
}
}
}
|
diff --git a/Game/src/game/Game.java b/Game/src/game/Game.java
index cf7fe45..707a73a 100644
--- a/Game/src/game/Game.java
+++ b/Game/src/game/Game.java
@@ -1,230 +1,230 @@
package game;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.DisplayMode;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Toolkit;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferStrategy;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.swing.JFrame;
import player.Player;
import environment.BaseEnvironment;
import environment.StandardFloor;
/**
* Klassen som ritar ut allt och kör Game-loopen Senast uppdaterad av: Jacob
* Pålsson Senast uppdaterad den: 4/30/2013
*/
public class Game implements Runnable {
private Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
private int SCREENWIDTH = (int) screenSize.getWidth();
private int SCREENHEIGHT = (int) screenSize.getHeight();
private List<BaseEnvironment> environment = Collections.synchronizedList(new ArrayList<BaseEnvironment>());
private Player player = new Player();
private JFrame app = new JFrame();
public boolean running = false;
private BufferedImage bi;
private int fps = 0;
public static void main(String[] args) {
new Game().start();
}
public Game() {
environment.add(new StandardFloor(0, 500, 1000, 50));
environment.add(new StandardFloor(60, 450, 100, 50));
}
public synchronized void start() {
running = true;
new Thread(this).start();
}
public synchronized void stop() {
if (!this.running) {
return;
}
this.running = false;
}
@Override
/**
* Nedan kommer en funktion som kör gameloopen, anpassat för 60 UPS
*/
public void run() {
// Create game window...
int ups = 0;
app.setIgnoreRepaint(true);
app.setUndecorated(true);
// Sätter muspekaren till ett hårkors
app.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
// Add ESC listener to quit...
app.addKeyListener(new KeyAdapter() {
public void keyPressed(KeyEvent e) {
player.keyPressed(e);
if (e.getKeyCode() == KeyEvent.VK_ESCAPE)
stop();
}
public void keyReleased(KeyEvent e) {
player.keyReleased(e);
}
});
app.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent m) {
player.mouseClicked(m);
}
public void mousePressed(MouseEvent m) {
player.mousePressed(m);
}
public void mouseReleased(MouseEvent m) {
player.mousePressed(m);
}
});
// Get graphics configuration...
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsDevice gd = ge.getDefaultScreenDevice();
GraphicsConfiguration gc = gd.getDefaultConfiguration();
// Change to full screen
gd.setFullScreenWindow(app);
if (gd.isDisplayChangeSupported()) {
- gd.setDisplayMode(new DisplayMode(SCREENWIDTH, SCREENHEIGHT, 32, DisplayMode.REFRESH_RATE_UNKNOWN));
+ gd.setDisplayMode(new DisplayMode(SCREENWIDTH, SCREENHEIGHT, 32, 60));
}
// Create BackBuffer...
app.createBufferStrategy(2);
BufferStrategy buffer = app.getBufferStrategy();
// Create off-screen drawing surface
bi = gc.createCompatibleImage(SCREENWIDTH, SCREENHEIGHT);
// Objects needed for rendering...
Graphics graphics = null;
Graphics2D g2d = null;
// Variables for counting frames per seconds
fps = 0;
int frames = 0;
long totalTime = 0;
long curTime = System.currentTimeMillis();
long lastTime = curTime;
long currentTime = System.currentTimeMillis();
while (running) {
try {
// count Frames per second...
lastTime = curTime;
curTime = System.currentTimeMillis();
totalTime += curTime - lastTime;
if (totalTime > 1000) {
totalTime -= 1000;
fps = frames;
frames = 0;
}
++frames;
// draw some rectangles...
render(g2d);
if (ups <= 100) {
update();
ups++;
}
if (System.currentTimeMillis() - currentTime > 1000) {
currentTime = System.currentTimeMillis();
ups = 0;
}
// Blit image and flip...
graphics = buffer.getDrawGraphics();
graphics.drawImage(bi, 0, 0, null);
if (!buffer.contentsLost())
buffer.show();
} finally {
// release resources
if (graphics != null)
graphics.dispose();
}
}
gd.setFullScreenWindow(null);
System.exit(0);
}
public void update() {
player.move(environment);
}
public void render(Graphics2D g2d) {
g2d = bi.createGraphics();
// draw background
g2d.setColor(Color.BLACK);
g2d.fillRect(0, 0, SCREENWIDTH, SCREENHEIGHT);
// display frames per second...
g2d.setFont(new Font("Courier New", Font.PLAIN, 12));
g2d.setColor(Color.GREEN);
g2d.drawString(String.format("FPS: %s", fps), 20, 20);
player.render(g2d); // Ritar ut spelare
for (int i = 0; i < environment.size(); i++)
// Ritar ut miljö
environment.get(i).render(g2d);
g2d.dispose();
}
}
| true | true | public void run() {
// Create game window...
int ups = 0;
app.setIgnoreRepaint(true);
app.setUndecorated(true);
// Sätter muspekaren till ett hårkors
app.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
// Add ESC listener to quit...
app.addKeyListener(new KeyAdapter() {
public void keyPressed(KeyEvent e) {
player.keyPressed(e);
if (e.getKeyCode() == KeyEvent.VK_ESCAPE)
stop();
}
public void keyReleased(KeyEvent e) {
player.keyReleased(e);
}
});
app.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent m) {
player.mouseClicked(m);
}
public void mousePressed(MouseEvent m) {
player.mousePressed(m);
}
public void mouseReleased(MouseEvent m) {
player.mousePressed(m);
}
});
// Get graphics configuration...
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsDevice gd = ge.getDefaultScreenDevice();
GraphicsConfiguration gc = gd.getDefaultConfiguration();
// Change to full screen
gd.setFullScreenWindow(app);
if (gd.isDisplayChangeSupported()) {
gd.setDisplayMode(new DisplayMode(SCREENWIDTH, SCREENHEIGHT, 32, DisplayMode.REFRESH_RATE_UNKNOWN));
}
// Create BackBuffer...
app.createBufferStrategy(2);
BufferStrategy buffer = app.getBufferStrategy();
// Create off-screen drawing surface
bi = gc.createCompatibleImage(SCREENWIDTH, SCREENHEIGHT);
// Objects needed for rendering...
Graphics graphics = null;
Graphics2D g2d = null;
// Variables for counting frames per seconds
fps = 0;
int frames = 0;
long totalTime = 0;
long curTime = System.currentTimeMillis();
long lastTime = curTime;
long currentTime = System.currentTimeMillis();
while (running) {
try {
// count Frames per second...
lastTime = curTime;
curTime = System.currentTimeMillis();
totalTime += curTime - lastTime;
if (totalTime > 1000) {
totalTime -= 1000;
fps = frames;
frames = 0;
}
++frames;
// draw some rectangles...
render(g2d);
if (ups <= 100) {
update();
ups++;
}
if (System.currentTimeMillis() - currentTime > 1000) {
currentTime = System.currentTimeMillis();
ups = 0;
}
// Blit image and flip...
graphics = buffer.getDrawGraphics();
graphics.drawImage(bi, 0, 0, null);
if (!buffer.contentsLost())
buffer.show();
} finally {
// release resources
if (graphics != null)
graphics.dispose();
}
}
gd.setFullScreenWindow(null);
System.exit(0);
}
| public void run() {
// Create game window...
int ups = 0;
app.setIgnoreRepaint(true);
app.setUndecorated(true);
// Sätter muspekaren till ett hårkors
app.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
// Add ESC listener to quit...
app.addKeyListener(new KeyAdapter() {
public void keyPressed(KeyEvent e) {
player.keyPressed(e);
if (e.getKeyCode() == KeyEvent.VK_ESCAPE)
stop();
}
public void keyReleased(KeyEvent e) {
player.keyReleased(e);
}
});
app.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent m) {
player.mouseClicked(m);
}
public void mousePressed(MouseEvent m) {
player.mousePressed(m);
}
public void mouseReleased(MouseEvent m) {
player.mousePressed(m);
}
});
// Get graphics configuration...
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsDevice gd = ge.getDefaultScreenDevice();
GraphicsConfiguration gc = gd.getDefaultConfiguration();
// Change to full screen
gd.setFullScreenWindow(app);
if (gd.isDisplayChangeSupported()) {
gd.setDisplayMode(new DisplayMode(SCREENWIDTH, SCREENHEIGHT, 32, 60));
}
// Create BackBuffer...
app.createBufferStrategy(2);
BufferStrategy buffer = app.getBufferStrategy();
// Create off-screen drawing surface
bi = gc.createCompatibleImage(SCREENWIDTH, SCREENHEIGHT);
// Objects needed for rendering...
Graphics graphics = null;
Graphics2D g2d = null;
// Variables for counting frames per seconds
fps = 0;
int frames = 0;
long totalTime = 0;
long curTime = System.currentTimeMillis();
long lastTime = curTime;
long currentTime = System.currentTimeMillis();
while (running) {
try {
// count Frames per second...
lastTime = curTime;
curTime = System.currentTimeMillis();
totalTime += curTime - lastTime;
if (totalTime > 1000) {
totalTime -= 1000;
fps = frames;
frames = 0;
}
++frames;
// draw some rectangles...
render(g2d);
if (ups <= 100) {
update();
ups++;
}
if (System.currentTimeMillis() - currentTime > 1000) {
currentTime = System.currentTimeMillis();
ups = 0;
}
// Blit image and flip...
graphics = buffer.getDrawGraphics();
graphics.drawImage(bi, 0, 0, null);
if (!buffer.contentsLost())
buffer.show();
} finally {
// release resources
if (graphics != null)
graphics.dispose();
}
}
gd.setFullScreenWindow(null);
System.exit(0);
}
|
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
index ec460d1e5..3bd6f656f 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
@@ -1,140 +1,140 @@
/*
@ITMillApache2LicenseForJavaFiles@
*/
package com.vaadin.terminal.gwt.client.ui;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Event;
import com.vaadin.terminal.gwt.client.ApplicationConnection;
import com.vaadin.terminal.gwt.client.Paintable;
import com.vaadin.terminal.gwt.client.UIDL;
import com.vaadin.terminal.gwt.client.Util;
import com.vaadin.terminal.gwt.client.VTooltip;
public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
Paintable, Field {
public static final String CLASSNAME = "v-checkbox";
String id;
boolean immediate;
ApplicationConnection client;
private Element errorIndicatorElement;
private Icon icon;
private boolean isBlockMode = false;
public VCheckBox() {
setStyleName(CLASSNAME);
addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
if (id == null || client == null) {
return;
}
client.updateVariable(id, "state", getValue(), immediate);
}
});
sinkEvents(VTooltip.TOOLTIP_EVENTS);
Element el = DOM.getFirstChild(getElement());
while (el != null) {
DOM.sinkEvents(el,
(DOM.getEventsSunk(el) | VTooltip.TOOLTIP_EVENTS));
el = DOM.getNextSibling(el);
}
}
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
// Save details
this.client = client;
id = uidl.getId();
// Ensure correct implementation
if (client.updateComponent(this, uidl, false)) {
return;
}
if (uidl.hasAttribute("error")) {
if (errorIndicatorElement == null) {
- errorIndicatorElement = DOM.createDiv();
+ errorIndicatorElement = DOM.createSpan();
errorIndicatorElement.setInnerHTML(" ");
DOM.setElementProperty(errorIndicatorElement, "className",
"v-errorindicator");
DOM.appendChild(getElement(), errorIndicatorElement);
DOM.sinkEvents(errorIndicatorElement, VTooltip.TOOLTIP_EVENTS
| Event.ONCLICK);
}
} else if (errorIndicatorElement != null) {
DOM.setStyleAttribute(errorIndicatorElement, "display", "none");
}
if (uidl.hasAttribute("readonly")) {
setEnabled(false);
}
if (uidl.hasAttribute("icon")) {
if (icon == null) {
icon = new Icon(client);
DOM.insertChild(getElement(), icon.getElement(), 1);
icon.sinkEvents(VTooltip.TOOLTIP_EVENTS);
icon.sinkEvents(Event.ONCLICK);
}
icon.setUri(uidl.getStringAttribute("icon"));
} else if (icon != null) {
// detach icon
DOM.removeChild(getElement(), icon.getElement());
icon = null;
}
// Set text
setText(uidl.getStringAttribute("caption"));
setValue(uidl.getBooleanVariable("state"));
immediate = uidl.getBooleanAttribute("immediate");
}
@Override
public void onBrowserEvent(Event event) {
if (icon != null && (event.getTypeInt() == Event.ONCLICK)
&& (DOM.eventGetTarget(event) == icon.getElement())) {
setValue(!getValue());
}
super.onBrowserEvent(event);
if (event.getTypeInt() == Event.ONLOAD) {
Util.notifyParentOfSizeChange(this, true);
}
if (client != null) {
client.handleTooltipEvent(event, this);
}
}
@Override
public void setWidth(String width) {
setBlockMode();
super.setWidth(width);
}
@Override
public void setHeight(String height) {
setBlockMode();
super.setHeight(height);
}
/**
* makes container element (span) to be block element to enable sizing.
*/
private void setBlockMode() {
if (!isBlockMode) {
DOM.setStyleAttribute(getElement(), "display", "block");
isBlockMode = true;
}
}
}
| true | true | public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
// Save details
this.client = client;
id = uidl.getId();
// Ensure correct implementation
if (client.updateComponent(this, uidl, false)) {
return;
}
if (uidl.hasAttribute("error")) {
if (errorIndicatorElement == null) {
errorIndicatorElement = DOM.createDiv();
errorIndicatorElement.setInnerHTML(" ");
DOM.setElementProperty(errorIndicatorElement, "className",
"v-errorindicator");
DOM.appendChild(getElement(), errorIndicatorElement);
DOM.sinkEvents(errorIndicatorElement, VTooltip.TOOLTIP_EVENTS
| Event.ONCLICK);
}
} else if (errorIndicatorElement != null) {
DOM.setStyleAttribute(errorIndicatorElement, "display", "none");
}
if (uidl.hasAttribute("readonly")) {
setEnabled(false);
}
if (uidl.hasAttribute("icon")) {
if (icon == null) {
icon = new Icon(client);
DOM.insertChild(getElement(), icon.getElement(), 1);
icon.sinkEvents(VTooltip.TOOLTIP_EVENTS);
icon.sinkEvents(Event.ONCLICK);
}
icon.setUri(uidl.getStringAttribute("icon"));
} else if (icon != null) {
// detach icon
DOM.removeChild(getElement(), icon.getElement());
icon = null;
}
// Set text
setText(uidl.getStringAttribute("caption"));
setValue(uidl.getBooleanVariable("state"));
immediate = uidl.getBooleanAttribute("immediate");
}
| public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
// Save details
this.client = client;
id = uidl.getId();
// Ensure correct implementation
if (client.updateComponent(this, uidl, false)) {
return;
}
if (uidl.hasAttribute("error")) {
if (errorIndicatorElement == null) {
errorIndicatorElement = DOM.createSpan();
errorIndicatorElement.setInnerHTML(" ");
DOM.setElementProperty(errorIndicatorElement, "className",
"v-errorindicator");
DOM.appendChild(getElement(), errorIndicatorElement);
DOM.sinkEvents(errorIndicatorElement, VTooltip.TOOLTIP_EVENTS
| Event.ONCLICK);
}
} else if (errorIndicatorElement != null) {
DOM.setStyleAttribute(errorIndicatorElement, "display", "none");
}
if (uidl.hasAttribute("readonly")) {
setEnabled(false);
}
if (uidl.hasAttribute("icon")) {
if (icon == null) {
icon = new Icon(client);
DOM.insertChild(getElement(), icon.getElement(), 1);
icon.sinkEvents(VTooltip.TOOLTIP_EVENTS);
icon.sinkEvents(Event.ONCLICK);
}
icon.setUri(uidl.getStringAttribute("icon"));
} else if (icon != null) {
// detach icon
DOM.removeChild(getElement(), icon.getElement());
icon = null;
}
// Set text
setText(uidl.getStringAttribute("caption"));
setValue(uidl.getBooleanVariable("state"));
immediate = uidl.getBooleanAttribute("immediate");
}
|
diff --git a/src/org/jacorb/idl/MultExpr.java b/src/org/jacorb/idl/MultExpr.java
index 6d77b6750..8df9dbd4a 100644
--- a/src/org/jacorb/idl/MultExpr.java
+++ b/src/org/jacorb/idl/MultExpr.java
@@ -1,119 +1,125 @@
package org.jacorb.idl;
/*
* JacORB - a free Java ORB
*
* Copyright (C) 1997-2004 Gerald Brose.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
import java.io.PrintWriter;
/**
* @author Gerald Brose
* @version $Id$
*/
public class MultExpr extends IdlSymbol
{
public String operator;
public MultExpr mult_expr = null;
public UnaryExpr unary_expr;
public MultExpr( int num )
{
super( num );
}
public void print( PrintWriter ps )
{
if( mult_expr != null )
{
mult_expr.print( ps );
ps.print( operator );
}
unary_expr.print( ps );
}
public void setDeclaration( ConstDecl declared_in )
{
unary_expr.setDeclaration( declared_in );
}
public void setPackage( String s )
{
s = parser.pack_replace( s );
if( pack_name.length() > 0 )
pack_name = s + "." + pack_name;
else
pack_name = s;
if( mult_expr != null )
{
mult_expr.setPackage( s );
}
unary_expr.setPackage( s );
}
public void parse()
{
if( mult_expr != null )
{
mult_expr.parse();
}
unary_expr.parse();
}
int pos_int_const()
{
int y = unary_expr.pos_int_const();
if( mult_expr != null )
{
int z = mult_expr.pos_int_const();
if( operator.equals( "*" ) )
- y *= z;
+ {
+ y = z * y;
+ }
else if( operator.equals( "/" ) )
- y /= z;
+ {
+ y = z / y;
+ }
else if( operator.equals( "%" ) )
- y %= z;
+ {
+ y = z % y;
+ }
}
return y;
}
public String value()
{
String x = "";
if( mult_expr != null )
{
x = mult_expr.value() + operator;
}
return x + unary_expr.value();
}
public String toString()
{
String x = "";
if( mult_expr != null )
{
x = mult_expr.toString () + ' ' + operator + ' ';
}
return x + unary_expr.toString();
}
public str_token get_token()
{
return unary_expr.get_token();
}
}
| false | true | int pos_int_const()
{
int y = unary_expr.pos_int_const();
if( mult_expr != null )
{
int z = mult_expr.pos_int_const();
if( operator.equals( "*" ) )
y *= z;
else if( operator.equals( "/" ) )
y /= z;
else if( operator.equals( "%" ) )
y %= z;
}
return y;
}
| int pos_int_const()
{
int y = unary_expr.pos_int_const();
if( mult_expr != null )
{
int z = mult_expr.pos_int_const();
if( operator.equals( "*" ) )
{
y = z * y;
}
else if( operator.equals( "/" ) )
{
y = z / y;
}
else if( operator.equals( "%" ) )
{
y = z % y;
}
}
return y;
}
|
diff --git a/OpERP/src/main/java/devopsdistilled/operp/client/items/panes/EditItemPane.java b/OpERP/src/main/java/devopsdistilled/operp/client/items/panes/EditItemPane.java
index e5090c0f..53ddba93 100644
--- a/OpERP/src/main/java/devopsdistilled/operp/client/items/panes/EditItemPane.java
+++ b/OpERP/src/main/java/devopsdistilled/operp/client/items/panes/EditItemPane.java
@@ -1,215 +1,216 @@
package devopsdistilled.operp.client.items.panes;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.List;
import javax.inject.Inject;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import net.miginfocom.swing.MigLayout;
import devopsdistilled.operp.client.abstracts.SubTaskPane;
import devopsdistilled.operp.client.items.controllers.BrandController;
import devopsdistilled.operp.client.items.controllers.ProductController;
import devopsdistilled.operp.client.items.models.observers.BrandModelObserver;
import devopsdistilled.operp.client.items.models.observers.ProductModelObserver;
import devopsdistilled.operp.client.items.panes.controllers.EditItemPaneController;
import devopsdistilled.operp.client.items.panes.details.ItemDetailsPane;
import devopsdistilled.operp.client.items.panes.models.observers.EditItemPaneModelObserver;
import devopsdistilled.operp.server.data.entity.items.Brand;
import devopsdistilled.operp.server.data.entity.items.Item;
import devopsdistilled.operp.server.data.entity.items.Product;
public class EditItemPane extends SubTaskPane implements
EditItemPaneModelObserver, ProductModelObserver, BrandModelObserver {
@Inject
private EditItemPaneController controller;
@Inject
private ItemDetailsPane itemDetailsPane;
@Inject
private ProductController productController;
@Inject
private BrandController brandController;
private final JPanel pane;
private final JTextField itemNameField;
private final JTextField priceField;
private final JComboBox<Brand> comboBrands;
private final JComboBox<Product> comboProducts;
private final JTextField itemIdField;
private Item item;
public EditItemPane() {
pane = new JPanel();
pane.setLayout(new MigLayout("debug, flowy", "[][][grow][]",
"[][][][][][]"));
JLabel lblItemId_1 = new JLabel("Item ID");
pane.add(lblItemId_1, "cell 0 0,alignx right");
itemIdField = new JTextField();
itemIdField.setEditable(false);
pane.add(itemIdField, "cell 2 0,growx");
itemIdField.setColumns(10);
JLabel lblProductName = new JLabel("Product Name");
pane.add(lblProductName, "cell 0 1,alignx trailing");
comboProducts = new JComboBox<>();
comboProducts.setSelectedItem(null);
pane.add(comboProducts, "flowx,cell 2 1,growx");
JLabel lblBrandName = new JLabel("Brand Name");
pane.add(lblBrandName, "cell 0 2,alignx trailing");
comboBrands = new JComboBox<>();
comboBrands.setSelectedItem(null);
pane.add(comboBrands, "flowx,cell 2 2,growx");
JLabel lblItemId = new JLabel("Item Name");
pane.add(lblItemId, "cell 0 3,alignx trailing");
itemNameField = new JTextField();
pane.add(itemNameField, "cell 2 3,growx");
itemNameField.setColumns(10);
JLabel lblPrice = new JLabel("Price");
pane.add(lblPrice, "cell 0 4,alignx trailing");
priceField = new JTextField();
pane.add(priceField, "cell 2 4,growx");
priceField.setColumns(10);
JButton btnCancel = new JButton("Cancel");
btnCancel.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
getDialog().dispose();
}
});
pane.add(btnCancel, "flowx,cell 2 5");
JButton btnUpdate = new JButton("Update");
btnUpdate.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Item item = new Item();
Long itemId = Long.parseLong(itemIdField.getText().trim());
item.setItemId(itemId);
Brand brand = (Brand) comboBrands.getSelectedItem();
item.setBrand(brand);
Product product = (Product) comboProducts.getSelectedItem();
item.setProduct(product);
String itemName = itemNameField.getText().trim();
item.setItemName(itemName);
String itemPrice = priceField.getText().trim();
try {
Double price = Double.parseDouble(itemPrice);
item.setPrice(price);
try {
controller.validate(item);
// validated
item = controller.save(item);
getDialog().dispose();
itemDetailsPane.show(item);
} catch (Exception e1) {
JOptionPane.showMessageDialog(getPane(),
e1.getMessage());
}
} catch (NumberFormatException ex) {
JOptionPane.showMessageDialog(getPane(),
"Price must be a Numeric value");
}
}
});
JButton btnReset = new JButton("Reset");
btnReset.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
+ updateEntity(item);
}
});
pane.add(btnReset, "cell 2 5");
pane.add(btnUpdate, "cell 2 5");
JButton btnNewProduct = new JButton("New Product");
btnNewProduct.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
productController.create();
}
});
pane.add(btnNewProduct, "cell 2 1");
JButton btnNewBrand = new JButton("New Brand");
btnNewBrand.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
brandController.create();
}
});
pane.add(btnNewBrand, "cell 2 2");
}
@Override
public JComponent getPane() {
return pane;
}
@Override
public void updateProducts(List<Product> products) {
Product prevSelected = (Product) comboProducts.getSelectedItem();
comboProducts.removeAllItems();
for (Product product : products) {
comboProducts.addItem(product);
if (prevSelected != null)
if (prevSelected.compareTo(product) == 0)
comboProducts.setSelectedItem(product);
}
}
@Override
public void updateBrands(List<Brand> brands) {
Brand prevSelected = (Brand) comboBrands.getSelectedItem();
comboBrands.removeAllItems();
for (Brand brand : brands) {
comboBrands.addItem(brand);
if (prevSelected != null)
if (prevSelected.compareTo(brand) == 0)
comboBrands.setSelectedItem(brand);
}
}
@Override
public void updateEntity(Item item) {
this.item = item;
itemIdField.setText(item.getItemId().toString());
itemNameField.setText(item.getItemName());
priceField.setText(item.getPrice().toString());
comboProducts.setSelectedItem(item.getProduct());
comboBrands.setSelectedItem(item.getBrand());
}
}
| true | true | public EditItemPane() {
pane = new JPanel();
pane.setLayout(new MigLayout("debug, flowy", "[][][grow][]",
"[][][][][][]"));
JLabel lblItemId_1 = new JLabel("Item ID");
pane.add(lblItemId_1, "cell 0 0,alignx right");
itemIdField = new JTextField();
itemIdField.setEditable(false);
pane.add(itemIdField, "cell 2 0,growx");
itemIdField.setColumns(10);
JLabel lblProductName = new JLabel("Product Name");
pane.add(lblProductName, "cell 0 1,alignx trailing");
comboProducts = new JComboBox<>();
comboProducts.setSelectedItem(null);
pane.add(comboProducts, "flowx,cell 2 1,growx");
JLabel lblBrandName = new JLabel("Brand Name");
pane.add(lblBrandName, "cell 0 2,alignx trailing");
comboBrands = new JComboBox<>();
comboBrands.setSelectedItem(null);
pane.add(comboBrands, "flowx,cell 2 2,growx");
JLabel lblItemId = new JLabel("Item Name");
pane.add(lblItemId, "cell 0 3,alignx trailing");
itemNameField = new JTextField();
pane.add(itemNameField, "cell 2 3,growx");
itemNameField.setColumns(10);
JLabel lblPrice = new JLabel("Price");
pane.add(lblPrice, "cell 0 4,alignx trailing");
priceField = new JTextField();
pane.add(priceField, "cell 2 4,growx");
priceField.setColumns(10);
JButton btnCancel = new JButton("Cancel");
btnCancel.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
getDialog().dispose();
}
});
pane.add(btnCancel, "flowx,cell 2 5");
JButton btnUpdate = new JButton("Update");
btnUpdate.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Item item = new Item();
Long itemId = Long.parseLong(itemIdField.getText().trim());
item.setItemId(itemId);
Brand brand = (Brand) comboBrands.getSelectedItem();
item.setBrand(brand);
Product product = (Product) comboProducts.getSelectedItem();
item.setProduct(product);
String itemName = itemNameField.getText().trim();
item.setItemName(itemName);
String itemPrice = priceField.getText().trim();
try {
Double price = Double.parseDouble(itemPrice);
item.setPrice(price);
try {
controller.validate(item);
// validated
item = controller.save(item);
getDialog().dispose();
itemDetailsPane.show(item);
} catch (Exception e1) {
JOptionPane.showMessageDialog(getPane(),
e1.getMessage());
}
} catch (NumberFormatException ex) {
JOptionPane.showMessageDialog(getPane(),
"Price must be a Numeric value");
}
}
});
JButton btnReset = new JButton("Reset");
btnReset.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
}
});
pane.add(btnReset, "cell 2 5");
pane.add(btnUpdate, "cell 2 5");
JButton btnNewProduct = new JButton("New Product");
btnNewProduct.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
productController.create();
}
});
pane.add(btnNewProduct, "cell 2 1");
JButton btnNewBrand = new JButton("New Brand");
btnNewBrand.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
brandController.create();
}
});
pane.add(btnNewBrand, "cell 2 2");
}
| public EditItemPane() {
pane = new JPanel();
pane.setLayout(new MigLayout("debug, flowy", "[][][grow][]",
"[][][][][][]"));
JLabel lblItemId_1 = new JLabel("Item ID");
pane.add(lblItemId_1, "cell 0 0,alignx right");
itemIdField = new JTextField();
itemIdField.setEditable(false);
pane.add(itemIdField, "cell 2 0,growx");
itemIdField.setColumns(10);
JLabel lblProductName = new JLabel("Product Name");
pane.add(lblProductName, "cell 0 1,alignx trailing");
comboProducts = new JComboBox<>();
comboProducts.setSelectedItem(null);
pane.add(comboProducts, "flowx,cell 2 1,growx");
JLabel lblBrandName = new JLabel("Brand Name");
pane.add(lblBrandName, "cell 0 2,alignx trailing");
comboBrands = new JComboBox<>();
comboBrands.setSelectedItem(null);
pane.add(comboBrands, "flowx,cell 2 2,growx");
JLabel lblItemId = new JLabel("Item Name");
pane.add(lblItemId, "cell 0 3,alignx trailing");
itemNameField = new JTextField();
pane.add(itemNameField, "cell 2 3,growx");
itemNameField.setColumns(10);
JLabel lblPrice = new JLabel("Price");
pane.add(lblPrice, "cell 0 4,alignx trailing");
priceField = new JTextField();
pane.add(priceField, "cell 2 4,growx");
priceField.setColumns(10);
JButton btnCancel = new JButton("Cancel");
btnCancel.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
getDialog().dispose();
}
});
pane.add(btnCancel, "flowx,cell 2 5");
JButton btnUpdate = new JButton("Update");
btnUpdate.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Item item = new Item();
Long itemId = Long.parseLong(itemIdField.getText().trim());
item.setItemId(itemId);
Brand brand = (Brand) comboBrands.getSelectedItem();
item.setBrand(brand);
Product product = (Product) comboProducts.getSelectedItem();
item.setProduct(product);
String itemName = itemNameField.getText().trim();
item.setItemName(itemName);
String itemPrice = priceField.getText().trim();
try {
Double price = Double.parseDouble(itemPrice);
item.setPrice(price);
try {
controller.validate(item);
// validated
item = controller.save(item);
getDialog().dispose();
itemDetailsPane.show(item);
} catch (Exception e1) {
JOptionPane.showMessageDialog(getPane(),
e1.getMessage());
}
} catch (NumberFormatException ex) {
JOptionPane.showMessageDialog(getPane(),
"Price must be a Numeric value");
}
}
});
JButton btnReset = new JButton("Reset");
btnReset.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
updateEntity(item);
}
});
pane.add(btnReset, "cell 2 5");
pane.add(btnUpdate, "cell 2 5");
JButton btnNewProduct = new JButton("New Product");
btnNewProduct.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
productController.create();
}
});
pane.add(btnNewProduct, "cell 2 1");
JButton btnNewBrand = new JButton("New Brand");
btnNewBrand.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
brandController.create();
}
});
pane.add(btnNewBrand, "cell 2 2");
}
|
diff --git a/src/com/herocraftonline/dev/heroes/damage/HeroesDamageListener.java b/src/com/herocraftonline/dev/heroes/damage/HeroesDamageListener.java
index 7391147c..12f00a3b 100644
--- a/src/com/herocraftonline/dev/heroes/damage/HeroesDamageListener.java
+++ b/src/com/herocraftonline/dev/heroes/damage/HeroesDamageListener.java
@@ -1,565 +1,567 @@
package com.herocraftonline.dev.heroes.damage;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Creature;
import org.bukkit.entity.CreatureType;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityListener;
import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import com.herocraftonline.dev.heroes.Heroes;
import com.herocraftonline.dev.heroes.api.HeroAttackDamageCause;
import com.herocraftonline.dev.heroes.api.HeroDamageCause;
import com.herocraftonline.dev.heroes.api.HeroSkillDamageCause;
import com.herocraftonline.dev.heroes.api.SkillDamageEvent;
import com.herocraftonline.dev.heroes.api.SkillUseInfo;
import com.herocraftonline.dev.heroes.api.WeaponDamageEvent;
import com.herocraftonline.dev.heroes.damage.DamageManager.ProjectileType;
import com.herocraftonline.dev.heroes.effects.Effect;
import com.herocraftonline.dev.heroes.effects.EffectManager;
import com.herocraftonline.dev.heroes.effects.EffectType;
import com.herocraftonline.dev.heroes.hero.Hero;
import com.herocraftonline.dev.heroes.party.HeroParty;
import com.herocraftonline.dev.heroes.skill.Skill;
import com.herocraftonline.dev.heroes.skill.SkillType;
import com.herocraftonline.dev.heroes.util.Messaging;
import com.herocraftonline.dev.heroes.util.Util;
public class HeroesDamageListener extends EntityListener {
private Heroes plugin;
private DamageManager damageManager;
private static final Map<Material, Integer> armorPoints;
private boolean ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR = false;
private boolean ignoreNextDamageEventBecauseWolvesAreOnCrack = true;
public HeroesDamageListener(Heroes plugin, DamageManager damageManager) {
this.plugin = plugin;
this.damageManager = damageManager;
}
@Override
public void onCreatureSpawn(CreatureSpawnEvent event) {
LivingEntity entity = (LivingEntity) event.getEntity();
CreatureType type = event.getCreatureType();
Integer maxHealth = damageManager.getCreatureHealth(type);
if (maxHealth != null) {
entity.setHealth(maxHealth);
}
}
private void onEntityDamageCore(EntityDamageEvent event) {
if (event.isCancelled() || plugin.getConfigManager().getProperties().disabledWorlds.contains(event.getEntity().getWorld().getName()))
return;
if (ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR) {
ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR = false;
plugin.debugLog(Level.SEVERE, "Detected second projectile damage attack on: " + event.getEntity().toString() + " with event type: " + event.getType().toString());
return;
}
if (event.getCause() == DamageCause.SUICIDE && event.getEntity() instanceof Player) {
Player player = (Player) event.getEntity();
plugin.getHeroManager().getHero(player).setHealth(0D);
return;
}
Entity defender = event.getEntity();
Entity attacker = null;
HeroDamageCause heroLastDamage = null;
DamageCause cause = event.getCause();
int damage = event.getDamage();
if (cause == DamageCause.PROJECTILE)
ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR = true;
if (damageManager.isSpellTarget(defender)) {
SkillUseInfo skillInfo = damageManager.getSpellTargetInfo(defender);
damageManager.removeSpellTarget(defender);
if (event instanceof EntityDamageByEntityEvent) {
if (resistanceCheck(defender, skillInfo.getSkill())) {
if (defender instanceof Player)
skillInfo.getSkill().broadcast(defender.getLocation(), "$1 has resisted $2", ((Player) defender).getDisplayName(), skillInfo.getSkill().getName());
if (defender instanceof Creature)
skillInfo.getSkill().broadcast(defender.getLocation(), "$1 has resisted $2", Messaging.getCreatureName((Creature) defender), skillInfo.getSkill().getName());
event.setCancelled(true);
return;
}
SkillDamageEvent spellDamageEvent = new SkillDamageEvent(damage, defender, skillInfo);
plugin.getServer().getPluginManager().callEvent(spellDamageEvent);
if (spellDamageEvent.isCancelled()) {
event.setCancelled(true);
return;
}
damage = spellDamageEvent.getDamage();
if (defender instanceof Player) {
heroLastDamage = new HeroSkillDamageCause(damage, cause, skillInfo.getHero().getPlayer(), skillInfo.getSkill());
}
}
} else if (cause == DamageCause.ENTITY_ATTACK || cause == DamageCause.ENTITY_EXPLOSION || cause == DamageCause.PROJECTILE) {
if (event instanceof EntityDamageByEntityEvent) {
attacker = ((EntityDamageByEntityEvent) event).getDamager();
if (attacker instanceof Player) {
Player attackingPlayer = (Player) attacker;
Hero hero = plugin.getHeroManager().getHero(attackingPlayer);
if (!hero.canEquipItem(attackingPlayer.getInventory().getHeldItemSlot()) || hero.hasEffectType(EffectType.STUN)) {
event.setCancelled(true);
return;
}
// Get the damage this player should deal for the weapon they are using
damage = getPlayerDamage(attackingPlayer, damage);
} else if (attacker instanceof LivingEntity) {
CreatureType type = Util.getCreatureFromEntity(attacker);
if (type != null) {
if (type == CreatureType.WOLF) {
if (ignoreNextDamageEventBecauseWolvesAreOnCrack) {
ignoreNextDamageEventBecauseWolvesAreOnCrack = false;
return;
} else {
ignoreNextDamageEventBecauseWolvesAreOnCrack = true;
}
}
Integer tmpDamage = damageManager.getCreatureDamage(type);
if (tmpDamage != null) {
damage = tmpDamage;
}
}
} else if (attacker instanceof Projectile) {
Projectile projectile = (Projectile) attacker;
if (projectile.getShooter() instanceof Player) {
attacker = projectile.getShooter();
// Allow alteration of player damage
damage = getPlayerProjectileDamage((Player) projectile.getShooter(), projectile, damage);
damage = (int) Math.ceil(damage / 3.0 * projectile.getVelocity().length());
} else {
attacker = projectile.getShooter();
CreatureType type = Util.getCreatureFromEntity(projectile.getShooter());
if (type != null) {
Integer tmpDamage = damageManager.getCreatureDamage(type);
if (tmpDamage != null) {
damage = tmpDamage;
}
}
}
}
// Call the custom event to allow skills to adjust weapon damage
WeaponDamageEvent weaponDamageEvent = new WeaponDamageEvent(damage, (EntityDamageByEntityEvent) event);
plugin.getServer().getPluginManager().callEvent(weaponDamageEvent);
if (weaponDamageEvent.isCancelled()) {
event.setCancelled(true);
return;
}
damage = weaponDamageEvent.getDamage();
heroLastDamage = new HeroAttackDamageCause(damage, cause, attacker);
}
} else if (cause != DamageCause.CUSTOM) {
Double tmpDamage = damageManager.getEnvironmentalDamage(cause);
boolean skipAdjustment = false;
if (tmpDamage == null) {
tmpDamage = (double) event.getDamage();
skipAdjustment = true;
}
if (!skipAdjustment) {
switch (cause) {
case FALL:
damage = onEntityFall(event.getDamage(), tmpDamage, defender);
break;
case SUFFOCATION:
damage = onEntitySuffocate(tmpDamage, defender);
break;
case DROWNING:
damage = onEntityDrown(tmpDamage, defender);
break;
case STARVATION:
damage = onEntityStarve(tmpDamage, defender);
break;
case FIRE:
case LAVA:
case FIRE_TICK:
damage = onEntityFlame(tmpDamage, cause, defender);
break;
default:
damage = (int) (double) tmpDamage;
break;
}
}
if (damage == 0) {
event.setCancelled(true);
return;
}
heroLastDamage = new HeroDamageCause(damage, cause);
} else {
heroLastDamage = new HeroDamageCause(damage, cause);
}
if (defender instanceof Player) {
Player player = (Player) defender;
if (player.getNoDamageTicks() > 10 || player.isDead() || player.getHealth() <= 0) {
event.setCancelled(true);
return;
}
final Hero hero = plugin.getHeroManager().getHero(player);
+ //check player inventory to make sure they aren't wearing restricted items
+ hero.checkInventory();
//Loop through the player's effects and check to see if we need to remove them
if (hero.hasEffectType(EffectType.INVULNERABILITY)) {
event.setCancelled(true);
return;
}
for (Effect effect : hero.getEffects()) {
if ((effect.isType(EffectType.ROOT) || effect.isType(EffectType.INVIS)) && !effect.isType(EffectType.UNBREAKABLE)) {
hero.removeEffect(effect);
}
}
// Party damage & PvPable test
if (attacker instanceof Player) {
// If the players aren't within the level range then deny the PvP
int aLevel = plugin.getHeroManager().getHero((Player) attacker).getTieredLevel(false);
if (Math.abs(aLevel - hero.getTieredLevel(false)) > plugin.getConfigManager().getProperties().pvpLevelRange) {
Messaging.send((Player) attacker, "That player is outside of your level range!");
event.setCancelled(true);
return;
}
HeroParty party = hero.getParty();
if (party != null && party.isNoPvp()) {
if (party.isPartyMember((Player) attacker)) {
event.setCancelled(true);
return;
}
}
}
if (damage == 0) {
event.setDamage(0);
return;
}
int damageReduction = calculateArmorReduction(player.getInventory(), damage);
damage -= damageReduction;
if (damage < 0) {
damage = 0;
}
hero.setLastDamageCause(heroLastDamage);
double iHeroHP = hero.getHealth();
double fHeroHP = iHeroHP - damage;
// Never set HP less than 0
if (fHeroHP < 0) {
fHeroHP = 0;
}
// Round up to get the number of remaining Hearts
int fPlayerHP = (int) (fHeroHP / hero.getMaxHealth() * 20);
if (fPlayerHP == 0 && fHeroHP > 0)
fPlayerHP = 1;
plugin.debugLog(Level.INFO, damage + " damage done to " + player.getName() + " by " + cause + ": " + iHeroHP + " -> " + fHeroHP + " | " + player.getHealth() + " -> " + fPlayerHP);
hero.setHealth(fHeroHP);
// If final HP is 0, make sure we kill the player
if (fHeroHP == 0) {
event.setDamage(200);
} else {
player.setHealth(fPlayerHP + damage);
event.setDamage(damage + damageReduction);
// Make sure health syncs on the next tick
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
hero.syncHealth();
}
}, 1);
}
HeroParty party = hero.getParty();
if (party != null && event.getDamage() > 0) {
party.update();
}
} else if (defender instanceof LivingEntity) {
event.setDamage(damage);
}
}
@Override
public void onEntityDamage(EntityDamageEvent event) {
Heroes.debug.startTask("HeroesDamageListener.onEntityDamage");
onEntityDamageCore(event);
Heroes.debug.stopTask("HeroesDamageListener.onEntityDamage");
}
@Override
public void onEntityRegainHealth(EntityRegainHealthEvent event) {
Heroes.debug.startTask("HeroesDamageListener.onEntityRegainHealth");
if (event.isCancelled() || !(event.getEntity() instanceof Player)) {
Heroes.debug.stopTask("HeroesDamageListener.onEntityRegainHealth");
return;
}
double amount = event.getAmount();
Player player = (Player) event.getEntity();
Hero hero = plugin.getHeroManager().getHero(player);
double maxHealth = hero.getMaxHealth();
// Satiated players regenerate % of total HP rather than 1 HP
if (event.getRegainReason() == RegainReason.SATIATED) {
double healPercent = plugin.getConfigManager().getProperties().foodHealPercent;
amount = maxHealth * healPercent;
}
double newHeroHealth = hero.getHealth() + amount;
if (newHeroHealth > maxHealth)
newHeroHealth = maxHealth;
int newPlayerHealth = (int) (newHeroHealth / maxHealth * 20);
hero.setHealth(newHeroHealth);
//Sanity test
int newAmount = newPlayerHealth - player.getHealth();
if (newAmount < 0)
newAmount = 0;
event.setAmount(newAmount);
Heroes.debug.stopTask("HeroesDamageListener.onEntityRegainHealth");
}
/**
* Returns a percentage adjusted damage value for starvation
*
* @param percent
* @param entity
* @return
*/
private int onEntityStarve(double percent, Entity entity) {
if (entity instanceof Creature) {
Integer creatureHealth = damageManager.getCreatureHealth(Util.getCreatureFromEntity(entity));
if (creatureHealth != null)
percent *= creatureHealth;
} else if (entity instanceof Player) {
Hero hero = plugin.getHeroManager().getHero((Player) entity);
percent *= hero.getMaxHealth();
}
return percent < 1 ? 1 : (int) percent;
}
/**
* Returns a percentage adjusted damage value for suffocation
*
* @param percent
* @param entity
* @return
*/
private int onEntitySuffocate(double percent, Entity entity) {
if (entity instanceof Creature) {
Integer creatureHealth = damageManager.getCreatureHealth(Util.getCreatureFromEntity(entity));
if (creatureHealth != null)
percent *= creatureHealth;
} else if (entity instanceof Player) {
Hero hero = plugin.getHeroManager().getHero((Player) entity);
percent *= hero.getMaxHealth();
}
return percent < 1 ? 1 : (int) percent;
}
/**
* Returns a percentage adjusted damage value for drowning
*
* @param percent
* @param entity
* @return
*/
private int onEntityDrown(double percent, Entity entity) {
if (entity instanceof Creature) {
if (plugin.getEffectManager().creatureHasEffectType((Creature) entity, EffectType.WATER_BREATHING))
return 0;
Integer creatureHealth = damageManager.getCreatureHealth(Util.getCreatureFromEntity(entity));
if (creatureHealth != null)
percent *= creatureHealth;
} else if (entity instanceof Player) {
Hero hero = plugin.getHeroManager().getHero((Player) entity);
if (hero.hasEffectType(EffectType.WATER_BREATHING))
return 0;
percent *= hero.getMaxHealth();
}
return percent < 1 ? 1 : (int) percent;
}
/**
* Adjusts damage for Fire damage events.
*
* @param damage
* @param cause
* @param entity
* @return
*/
private int onEntityFlame(double damage, DamageCause cause, Entity entity) {
if (damage == 0)
return 0;
if (entity instanceof Player) {
Hero hero = plugin.getHeroManager().getHero((Player) entity);
if (hero.hasEffectType(EffectType.RESIST_FIRE)) {
return 0;
}
if (cause != DamageCause.FIRE_TICK)
damage *= hero.getMaxHealth();
} else if (entity instanceof Creature) {
if (plugin.getEffectManager().creatureHasEffectType((Creature) entity, EffectType.RESIST_FIRE))
return 0;
if (cause != DamageCause.FIRE_TICK) {
Integer creatureHealth = damageManager.getCreatureHealth(Util.getCreatureFromEntity(entity));
if (creatureHealth != null)
damage *= creatureHealth;
}
}
return damage < 1 ? 1 : (int) damage;
}
/**
* Adjusts the damage being dealt during a fall
*
* @param damage
* @param entity
* @return
*/
private int onEntityFall(int damage, double damagePercent, Entity entity) {
if (damage == 0)
return 0;
if (entity instanceof Player) {
Hero dHero = plugin.getHeroManager().getHero((Player) entity);
if (dHero.hasEffectType(EffectType.SAFEFALL))
return 0;
damage = (int) (damage * damagePercent * dHero.getMaxHealth());
} else if (entity instanceof Creature) {
if (plugin.getEffectManager().creatureHasEffectType((Creature) entity, EffectType.SAFEFALL))
return 0;
Integer creatureHealth = damageManager.getCreatureHealth(Util.getCreatureFromEntity(entity));
if (creatureHealth != null)
damage = (int) (damage * damagePercent * creatureHealth);
}
return damage < 1 ? 1 : damage;
}
private int calculateArmorReduction(PlayerInventory inventory, int damage) {
ItemStack[] armorContents = inventory.getArmorContents();
int missingDurability = 0;
int maxDurability = 0;
int baseArmorPoints = 0;
boolean hasArmor = false;
for (ItemStack armor : armorContents) {
Material armorType = armor.getType();
if (armorPoints.containsKey(armorType)) {
short armorDurability = armor.getDurability();
// Ignore non-durable items
if (armorDurability == -1) {
continue;
}
missingDurability += armorDurability;
maxDurability += armorType.getMaxDurability();
baseArmorPoints += armorPoints.get(armorType);
hasArmor = true;
}
}
if (!hasArmor)
return 0;
double armorPoints = (double) baseArmorPoints * (maxDurability - missingDurability) / maxDurability;
double damageReduction = 0.04 * armorPoints;
return (int) (damageReduction * damage);
}
private int getPlayerDamage(Player attacker, int damage) {
ItemStack weapon = attacker.getItemInHand();
Material weaponType = weapon.getType();
Integer tmpDamage = damageManager.getItemDamage(weaponType, attacker);
return tmpDamage == null ? damage : tmpDamage;
}
private int getPlayerProjectileDamage(Player attacker, Projectile projectile, int damage) {
Integer tmpDamage = damageManager.getProjectileDamage(ProjectileType.valueOf(projectile), attacker);
return tmpDamage == null ? damage : tmpDamage;
}
private boolean resistanceCheck(Entity defender, Skill skill) {
if (defender instanceof Player) {
Hero hero = plugin.getHeroManager().getHero((Player) defender);
if (hero.hasEffectType(EffectType.RESIST_FIRE) && skill.isType(SkillType.FIRE))
return true;
else if (hero.hasEffectType(EffectType.RESIST_DARK) && skill.isType(SkillType.DARK))
return true;
else if (hero.hasEffectType(EffectType.LIGHT) && skill.isType(SkillType.LIGHT))
return true;
else if (hero.hasEffectType(EffectType.RESIST_LIGHTNING) && skill.isType(SkillType.LIGHTNING))
return true;
else if (hero.hasEffectType(EffectType.RESIST_ICE) && skill.isType(SkillType.ICE))
return true;
} else if (defender instanceof Creature) {
EffectManager em = plugin.getEffectManager();
Creature c = (Creature) defender;
if (em.creatureHasEffectType(c, EffectType.RESIST_FIRE) && skill.isType(SkillType.FIRE))
return true;
else if (em.creatureHasEffectType(c, EffectType.RESIST_DARK) && skill.isType(SkillType.DARK))
return true;
else if (em.creatureHasEffectType(c, EffectType.LIGHT) && skill.isType(SkillType.LIGHT))
return true;
else if (em.creatureHasEffectType(c, EffectType.RESIST_LIGHTNING) && skill.isType(SkillType.LIGHTNING))
return true;
else if (em.creatureHasEffectType(c, EffectType.RESIST_ICE) && skill.isType(SkillType.ICE))
return true;
}
return false;
}
static {
Map<Material, Integer> aMap = new HashMap<Material, Integer>();
aMap.put(Material.LEATHER_HELMET, 3);
aMap.put(Material.LEATHER_CHESTPLATE, 8);
aMap.put(Material.LEATHER_LEGGINGS, 6);
aMap.put(Material.LEATHER_BOOTS, 3);
aMap.put(Material.GOLD_HELMET, 3);
aMap.put(Material.GOLD_CHESTPLATE, 8);
aMap.put(Material.GOLD_LEGGINGS, 6);
aMap.put(Material.GOLD_BOOTS, 3);
aMap.put(Material.CHAINMAIL_HELMET, 3);
aMap.put(Material.CHAINMAIL_CHESTPLATE, 8);
aMap.put(Material.CHAINMAIL_LEGGINGS, 6);
aMap.put(Material.CHAINMAIL_BOOTS, 3);
aMap.put(Material.IRON_HELMET, 3);
aMap.put(Material.IRON_CHESTPLATE, 8);
aMap.put(Material.IRON_LEGGINGS, 6);
aMap.put(Material.IRON_BOOTS, 3);
aMap.put(Material.DIAMOND_HELMET, 3);
aMap.put(Material.DIAMOND_CHESTPLATE, 8);
aMap.put(Material.DIAMOND_LEGGINGS, 6);
aMap.put(Material.DIAMOND_BOOTS, 3);
armorPoints = Collections.unmodifiableMap(aMap);
}
}
| true | true | private void onEntityDamageCore(EntityDamageEvent event) {
if (event.isCancelled() || plugin.getConfigManager().getProperties().disabledWorlds.contains(event.getEntity().getWorld().getName()))
return;
if (ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR) {
ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR = false;
plugin.debugLog(Level.SEVERE, "Detected second projectile damage attack on: " + event.getEntity().toString() + " with event type: " + event.getType().toString());
return;
}
if (event.getCause() == DamageCause.SUICIDE && event.getEntity() instanceof Player) {
Player player = (Player) event.getEntity();
plugin.getHeroManager().getHero(player).setHealth(0D);
return;
}
Entity defender = event.getEntity();
Entity attacker = null;
HeroDamageCause heroLastDamage = null;
DamageCause cause = event.getCause();
int damage = event.getDamage();
if (cause == DamageCause.PROJECTILE)
ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR = true;
if (damageManager.isSpellTarget(defender)) {
SkillUseInfo skillInfo = damageManager.getSpellTargetInfo(defender);
damageManager.removeSpellTarget(defender);
if (event instanceof EntityDamageByEntityEvent) {
if (resistanceCheck(defender, skillInfo.getSkill())) {
if (defender instanceof Player)
skillInfo.getSkill().broadcast(defender.getLocation(), "$1 has resisted $2", ((Player) defender).getDisplayName(), skillInfo.getSkill().getName());
if (defender instanceof Creature)
skillInfo.getSkill().broadcast(defender.getLocation(), "$1 has resisted $2", Messaging.getCreatureName((Creature) defender), skillInfo.getSkill().getName());
event.setCancelled(true);
return;
}
SkillDamageEvent spellDamageEvent = new SkillDamageEvent(damage, defender, skillInfo);
plugin.getServer().getPluginManager().callEvent(spellDamageEvent);
if (spellDamageEvent.isCancelled()) {
event.setCancelled(true);
return;
}
damage = spellDamageEvent.getDamage();
if (defender instanceof Player) {
heroLastDamage = new HeroSkillDamageCause(damage, cause, skillInfo.getHero().getPlayer(), skillInfo.getSkill());
}
}
} else if (cause == DamageCause.ENTITY_ATTACK || cause == DamageCause.ENTITY_EXPLOSION || cause == DamageCause.PROJECTILE) {
if (event instanceof EntityDamageByEntityEvent) {
attacker = ((EntityDamageByEntityEvent) event).getDamager();
if (attacker instanceof Player) {
Player attackingPlayer = (Player) attacker;
Hero hero = plugin.getHeroManager().getHero(attackingPlayer);
if (!hero.canEquipItem(attackingPlayer.getInventory().getHeldItemSlot()) || hero.hasEffectType(EffectType.STUN)) {
event.setCancelled(true);
return;
}
// Get the damage this player should deal for the weapon they are using
damage = getPlayerDamage(attackingPlayer, damage);
} else if (attacker instanceof LivingEntity) {
CreatureType type = Util.getCreatureFromEntity(attacker);
if (type != null) {
if (type == CreatureType.WOLF) {
if (ignoreNextDamageEventBecauseWolvesAreOnCrack) {
ignoreNextDamageEventBecauseWolvesAreOnCrack = false;
return;
} else {
ignoreNextDamageEventBecauseWolvesAreOnCrack = true;
}
}
Integer tmpDamage = damageManager.getCreatureDamage(type);
if (tmpDamage != null) {
damage = tmpDamage;
}
}
} else if (attacker instanceof Projectile) {
Projectile projectile = (Projectile) attacker;
if (projectile.getShooter() instanceof Player) {
attacker = projectile.getShooter();
// Allow alteration of player damage
damage = getPlayerProjectileDamage((Player) projectile.getShooter(), projectile, damage);
damage = (int) Math.ceil(damage / 3.0 * projectile.getVelocity().length());
} else {
attacker = projectile.getShooter();
CreatureType type = Util.getCreatureFromEntity(projectile.getShooter());
if (type != null) {
Integer tmpDamage = damageManager.getCreatureDamage(type);
if (tmpDamage != null) {
damage = tmpDamage;
}
}
}
}
// Call the custom event to allow skills to adjust weapon damage
WeaponDamageEvent weaponDamageEvent = new WeaponDamageEvent(damage, (EntityDamageByEntityEvent) event);
plugin.getServer().getPluginManager().callEvent(weaponDamageEvent);
if (weaponDamageEvent.isCancelled()) {
event.setCancelled(true);
return;
}
damage = weaponDamageEvent.getDamage();
heroLastDamage = new HeroAttackDamageCause(damage, cause, attacker);
}
} else if (cause != DamageCause.CUSTOM) {
Double tmpDamage = damageManager.getEnvironmentalDamage(cause);
boolean skipAdjustment = false;
if (tmpDamage == null) {
tmpDamage = (double) event.getDamage();
skipAdjustment = true;
}
if (!skipAdjustment) {
switch (cause) {
case FALL:
damage = onEntityFall(event.getDamage(), tmpDamage, defender);
break;
case SUFFOCATION:
damage = onEntitySuffocate(tmpDamage, defender);
break;
case DROWNING:
damage = onEntityDrown(tmpDamage, defender);
break;
case STARVATION:
damage = onEntityStarve(tmpDamage, defender);
break;
case FIRE:
case LAVA:
case FIRE_TICK:
damage = onEntityFlame(tmpDamage, cause, defender);
break;
default:
damage = (int) (double) tmpDamage;
break;
}
}
if (damage == 0) {
event.setCancelled(true);
return;
}
heroLastDamage = new HeroDamageCause(damage, cause);
} else {
heroLastDamage = new HeroDamageCause(damage, cause);
}
if (defender instanceof Player) {
Player player = (Player) defender;
if (player.getNoDamageTicks() > 10 || player.isDead() || player.getHealth() <= 0) {
event.setCancelled(true);
return;
}
final Hero hero = plugin.getHeroManager().getHero(player);
//Loop through the player's effects and check to see if we need to remove them
if (hero.hasEffectType(EffectType.INVULNERABILITY)) {
event.setCancelled(true);
return;
}
for (Effect effect : hero.getEffects()) {
if ((effect.isType(EffectType.ROOT) || effect.isType(EffectType.INVIS)) && !effect.isType(EffectType.UNBREAKABLE)) {
hero.removeEffect(effect);
}
}
// Party damage & PvPable test
if (attacker instanceof Player) {
// If the players aren't within the level range then deny the PvP
int aLevel = plugin.getHeroManager().getHero((Player) attacker).getTieredLevel(false);
if (Math.abs(aLevel - hero.getTieredLevel(false)) > plugin.getConfigManager().getProperties().pvpLevelRange) {
Messaging.send((Player) attacker, "That player is outside of your level range!");
event.setCancelled(true);
return;
}
HeroParty party = hero.getParty();
if (party != null && party.isNoPvp()) {
if (party.isPartyMember((Player) attacker)) {
event.setCancelled(true);
return;
}
}
}
if (damage == 0) {
event.setDamage(0);
return;
}
int damageReduction = calculateArmorReduction(player.getInventory(), damage);
damage -= damageReduction;
if (damage < 0) {
damage = 0;
}
hero.setLastDamageCause(heroLastDamage);
double iHeroHP = hero.getHealth();
double fHeroHP = iHeroHP - damage;
// Never set HP less than 0
if (fHeroHP < 0) {
fHeroHP = 0;
}
// Round up to get the number of remaining Hearts
int fPlayerHP = (int) (fHeroHP / hero.getMaxHealth() * 20);
if (fPlayerHP == 0 && fHeroHP > 0)
fPlayerHP = 1;
plugin.debugLog(Level.INFO, damage + " damage done to " + player.getName() + " by " + cause + ": " + iHeroHP + " -> " + fHeroHP + " | " + player.getHealth() + " -> " + fPlayerHP);
hero.setHealth(fHeroHP);
// If final HP is 0, make sure we kill the player
if (fHeroHP == 0) {
event.setDamage(200);
} else {
player.setHealth(fPlayerHP + damage);
event.setDamage(damage + damageReduction);
// Make sure health syncs on the next tick
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
hero.syncHealth();
}
}, 1);
}
HeroParty party = hero.getParty();
if (party != null && event.getDamage() > 0) {
party.update();
}
} else if (defender instanceof LivingEntity) {
event.setDamage(damage);
}
}
| private void onEntityDamageCore(EntityDamageEvent event) {
if (event.isCancelled() || plugin.getConfigManager().getProperties().disabledWorlds.contains(event.getEntity().getWorld().getName()))
return;
if (ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR) {
ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR = false;
plugin.debugLog(Level.SEVERE, "Detected second projectile damage attack on: " + event.getEntity().toString() + " with event type: " + event.getType().toString());
return;
}
if (event.getCause() == DamageCause.SUICIDE && event.getEntity() instanceof Player) {
Player player = (Player) event.getEntity();
plugin.getHeroManager().getHero(player).setHealth(0D);
return;
}
Entity defender = event.getEntity();
Entity attacker = null;
HeroDamageCause heroLastDamage = null;
DamageCause cause = event.getCause();
int damage = event.getDamage();
if (cause == DamageCause.PROJECTILE)
ignoreNextDamageEventBecauseBukkitCallsTwoEventsGRRR = true;
if (damageManager.isSpellTarget(defender)) {
SkillUseInfo skillInfo = damageManager.getSpellTargetInfo(defender);
damageManager.removeSpellTarget(defender);
if (event instanceof EntityDamageByEntityEvent) {
if (resistanceCheck(defender, skillInfo.getSkill())) {
if (defender instanceof Player)
skillInfo.getSkill().broadcast(defender.getLocation(), "$1 has resisted $2", ((Player) defender).getDisplayName(), skillInfo.getSkill().getName());
if (defender instanceof Creature)
skillInfo.getSkill().broadcast(defender.getLocation(), "$1 has resisted $2", Messaging.getCreatureName((Creature) defender), skillInfo.getSkill().getName());
event.setCancelled(true);
return;
}
SkillDamageEvent spellDamageEvent = new SkillDamageEvent(damage, defender, skillInfo);
plugin.getServer().getPluginManager().callEvent(spellDamageEvent);
if (spellDamageEvent.isCancelled()) {
event.setCancelled(true);
return;
}
damage = spellDamageEvent.getDamage();
if (defender instanceof Player) {
heroLastDamage = new HeroSkillDamageCause(damage, cause, skillInfo.getHero().getPlayer(), skillInfo.getSkill());
}
}
} else if (cause == DamageCause.ENTITY_ATTACK || cause == DamageCause.ENTITY_EXPLOSION || cause == DamageCause.PROJECTILE) {
if (event instanceof EntityDamageByEntityEvent) {
attacker = ((EntityDamageByEntityEvent) event).getDamager();
if (attacker instanceof Player) {
Player attackingPlayer = (Player) attacker;
Hero hero = plugin.getHeroManager().getHero(attackingPlayer);
if (!hero.canEquipItem(attackingPlayer.getInventory().getHeldItemSlot()) || hero.hasEffectType(EffectType.STUN)) {
event.setCancelled(true);
return;
}
// Get the damage this player should deal for the weapon they are using
damage = getPlayerDamage(attackingPlayer, damage);
} else if (attacker instanceof LivingEntity) {
CreatureType type = Util.getCreatureFromEntity(attacker);
if (type != null) {
if (type == CreatureType.WOLF) {
if (ignoreNextDamageEventBecauseWolvesAreOnCrack) {
ignoreNextDamageEventBecauseWolvesAreOnCrack = false;
return;
} else {
ignoreNextDamageEventBecauseWolvesAreOnCrack = true;
}
}
Integer tmpDamage = damageManager.getCreatureDamage(type);
if (tmpDamage != null) {
damage = tmpDamage;
}
}
} else if (attacker instanceof Projectile) {
Projectile projectile = (Projectile) attacker;
if (projectile.getShooter() instanceof Player) {
attacker = projectile.getShooter();
// Allow alteration of player damage
damage = getPlayerProjectileDamage((Player) projectile.getShooter(), projectile, damage);
damage = (int) Math.ceil(damage / 3.0 * projectile.getVelocity().length());
} else {
attacker = projectile.getShooter();
CreatureType type = Util.getCreatureFromEntity(projectile.getShooter());
if (type != null) {
Integer tmpDamage = damageManager.getCreatureDamage(type);
if (tmpDamage != null) {
damage = tmpDamage;
}
}
}
}
// Call the custom event to allow skills to adjust weapon damage
WeaponDamageEvent weaponDamageEvent = new WeaponDamageEvent(damage, (EntityDamageByEntityEvent) event);
plugin.getServer().getPluginManager().callEvent(weaponDamageEvent);
if (weaponDamageEvent.isCancelled()) {
event.setCancelled(true);
return;
}
damage = weaponDamageEvent.getDamage();
heroLastDamage = new HeroAttackDamageCause(damage, cause, attacker);
}
} else if (cause != DamageCause.CUSTOM) {
Double tmpDamage = damageManager.getEnvironmentalDamage(cause);
boolean skipAdjustment = false;
if (tmpDamage == null) {
tmpDamage = (double) event.getDamage();
skipAdjustment = true;
}
if (!skipAdjustment) {
switch (cause) {
case FALL:
damage = onEntityFall(event.getDamage(), tmpDamage, defender);
break;
case SUFFOCATION:
damage = onEntitySuffocate(tmpDamage, defender);
break;
case DROWNING:
damage = onEntityDrown(tmpDamage, defender);
break;
case STARVATION:
damage = onEntityStarve(tmpDamage, defender);
break;
case FIRE:
case LAVA:
case FIRE_TICK:
damage = onEntityFlame(tmpDamage, cause, defender);
break;
default:
damage = (int) (double) tmpDamage;
break;
}
}
if (damage == 0) {
event.setCancelled(true);
return;
}
heroLastDamage = new HeroDamageCause(damage, cause);
} else {
heroLastDamage = new HeroDamageCause(damage, cause);
}
if (defender instanceof Player) {
Player player = (Player) defender;
if (player.getNoDamageTicks() > 10 || player.isDead() || player.getHealth() <= 0) {
event.setCancelled(true);
return;
}
final Hero hero = plugin.getHeroManager().getHero(player);
//check player inventory to make sure they aren't wearing restricted items
hero.checkInventory();
//Loop through the player's effects and check to see if we need to remove them
if (hero.hasEffectType(EffectType.INVULNERABILITY)) {
event.setCancelled(true);
return;
}
for (Effect effect : hero.getEffects()) {
if ((effect.isType(EffectType.ROOT) || effect.isType(EffectType.INVIS)) && !effect.isType(EffectType.UNBREAKABLE)) {
hero.removeEffect(effect);
}
}
// Party damage & PvPable test
if (attacker instanceof Player) {
// If the players aren't within the level range then deny the PvP
int aLevel = plugin.getHeroManager().getHero((Player) attacker).getTieredLevel(false);
if (Math.abs(aLevel - hero.getTieredLevel(false)) > plugin.getConfigManager().getProperties().pvpLevelRange) {
Messaging.send((Player) attacker, "That player is outside of your level range!");
event.setCancelled(true);
return;
}
HeroParty party = hero.getParty();
if (party != null && party.isNoPvp()) {
if (party.isPartyMember((Player) attacker)) {
event.setCancelled(true);
return;
}
}
}
if (damage == 0) {
event.setDamage(0);
return;
}
int damageReduction = calculateArmorReduction(player.getInventory(), damage);
damage -= damageReduction;
if (damage < 0) {
damage = 0;
}
hero.setLastDamageCause(heroLastDamage);
double iHeroHP = hero.getHealth();
double fHeroHP = iHeroHP - damage;
// Never set HP less than 0
if (fHeroHP < 0) {
fHeroHP = 0;
}
// Round up to get the number of remaining Hearts
int fPlayerHP = (int) (fHeroHP / hero.getMaxHealth() * 20);
if (fPlayerHP == 0 && fHeroHP > 0)
fPlayerHP = 1;
plugin.debugLog(Level.INFO, damage + " damage done to " + player.getName() + " by " + cause + ": " + iHeroHP + " -> " + fHeroHP + " | " + player.getHealth() + " -> " + fPlayerHP);
hero.setHealth(fHeroHP);
// If final HP is 0, make sure we kill the player
if (fHeroHP == 0) {
event.setDamage(200);
} else {
player.setHealth(fPlayerHP + damage);
event.setDamage(damage + damageReduction);
// Make sure health syncs on the next tick
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
hero.syncHealth();
}
}, 1);
}
HeroParty party = hero.getParty();
if (party != null && event.getDamage() > 0) {
party.update();
}
} else if (defender instanceof LivingEntity) {
event.setDamage(damage);
}
}
|
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/CertificateValidationPreferencePage.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/CertificateValidationPreferencePage.java
index fc2bcdf2e..af771a07b 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/CertificateValidationPreferencePage.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/CertificateValidationPreferencePage.java
@@ -1,157 +1,153 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*/
package org.apache.directory.studio.connection.ui.preferences;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
import org.apache.directory.studio.connection.ui.widgets.CertificateListComposite;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
/**
* The certificate validation preference page is used to manage trusted certificates.
*
* @author <a href="mailto:[email protected]">Apache Directory Project</a>
*/
public class CertificateValidationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
{
/** The verify certificates button. */
private Button verifyCertificatesButton;
/** The tab folder. */
private TabFolder tabFolder;
/** The composite containing permanent trusted certificates */
private CertificateListComposite permanentCLComposite;
/** The composite containing temporary trusted certificates */
private CertificateListComposite sessionCLComposite;
/**
*
* Creates a new instance of MainPreferencePage.
*/
public CertificateValidationPreferencePage()
{
super( Messages.getString( "CertificateValidationPreferencePage.CertificateValidation" ) ); //$NON-NLS-1$
super.setPreferenceStore( ConnectionUIPlugin.getDefault().getPreferenceStore() );
//super.setDescription( Messages.getString( "SecurityPreferencePage.GeneralSettings" ) ); //$NON-NLS-1$
}
/**
* {@inheritDoc}
*/
public void init( IWorkbench workbench )
{
}
/**
* {@inheritDoc}
*/
protected Control createContents( Composite parent )
{
Composite composite = BaseWidgetUtils.createColumnContainer( parent, 1, 1 );
// enable/disable certificate validation
Preferences preferences = ConnectionCorePlugin.getDefault().getPluginPreferences();
boolean validateCertificates = preferences
.getBoolean( ConnectionCoreConstants.PREFERENCE_VALIDATE_CERTIFICATES );
verifyCertificatesButton = BaseWidgetUtils.createCheckbox( composite, Messages
.getString( "CertificateValidationPreferencePage.ValidateCertificates" ), 1 ); //$NON-NLS-1$
verifyCertificatesButton.setSelection( validateCertificates );
verifyCertificatesButton.addSelectionListener( new SelectionAdapter()
{
@Override
public void widgetSelected( SelectionEvent e )
{
tabFolder.setEnabled( verifyCertificatesButton.getSelection() );
}
} );
// certificate list widget
tabFolder = new TabFolder( composite, SWT.TOP );
- GridLayout mainLayout = new GridLayout();
- mainLayout.marginWidth = 0;
- mainLayout.marginHeight = 0;
- tabFolder.setLayout( mainLayout );
tabFolder.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
permanentCLComposite = new CertificateListComposite( tabFolder, SWT.NONE );
permanentCLComposite.setInput( ConnectionCorePlugin.getDefault().getPermanentTrustStoreManager() );
TabItem permanentTab = new TabItem( tabFolder, SWT.NONE, 0 );
permanentTab.setText( Messages.getString( "CertificateValidationPreferencePage.PermanentTrusted" ) ); //$NON-NLS-1$
permanentTab.setControl( permanentCLComposite );
sessionCLComposite = new CertificateListComposite( tabFolder, SWT.NONE );
sessionCLComposite.setInput( ConnectionCorePlugin.getDefault().getSessionTrustStoreManager() );
TabItem sessionTab = new TabItem( tabFolder, SWT.NONE, 1 );
sessionTab.setText( Messages.getString( "CertificateValidationPreferencePage.TemporaryTrusted" ) ); //$NON-NLS-1$
sessionTab.setControl( sessionCLComposite );
tabFolder.setEnabled( verifyCertificatesButton.getSelection() );
return composite;
}
/**
* {@inheritDoc}
*/
protected void performDefaults()
{
verifyCertificatesButton.setSelection( ConnectionCorePlugin.getDefault().getPluginPreferences()
.getDefaultBoolean( ConnectionCoreConstants.PREFERENCE_VALIDATE_CERTIFICATES ) );
ConnectionCorePlugin.getDefault().savePluginPreferences();
super.performDefaults();
}
/**
* {@inheritDoc}
*/
public boolean performOk()
{
ConnectionCorePlugin.getDefault().getPluginPreferences().setValue(
ConnectionCoreConstants.PREFERENCE_VALIDATE_CERTIFICATES, verifyCertificatesButton.getSelection() );
ConnectionCorePlugin.getDefault().savePluginPreferences();
return true;
}
}
| true | true | protected Control createContents( Composite parent )
{
Composite composite = BaseWidgetUtils.createColumnContainer( parent, 1, 1 );
// enable/disable certificate validation
Preferences preferences = ConnectionCorePlugin.getDefault().getPluginPreferences();
boolean validateCertificates = preferences
.getBoolean( ConnectionCoreConstants.PREFERENCE_VALIDATE_CERTIFICATES );
verifyCertificatesButton = BaseWidgetUtils.createCheckbox( composite, Messages
.getString( "CertificateValidationPreferencePage.ValidateCertificates" ), 1 ); //$NON-NLS-1$
verifyCertificatesButton.setSelection( validateCertificates );
verifyCertificatesButton.addSelectionListener( new SelectionAdapter()
{
@Override
public void widgetSelected( SelectionEvent e )
{
tabFolder.setEnabled( verifyCertificatesButton.getSelection() );
}
} );
// certificate list widget
tabFolder = new TabFolder( composite, SWT.TOP );
GridLayout mainLayout = new GridLayout();
mainLayout.marginWidth = 0;
mainLayout.marginHeight = 0;
tabFolder.setLayout( mainLayout );
tabFolder.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
permanentCLComposite = new CertificateListComposite( tabFolder, SWT.NONE );
permanentCLComposite.setInput( ConnectionCorePlugin.getDefault().getPermanentTrustStoreManager() );
TabItem permanentTab = new TabItem( tabFolder, SWT.NONE, 0 );
permanentTab.setText( Messages.getString( "CertificateValidationPreferencePage.PermanentTrusted" ) ); //$NON-NLS-1$
permanentTab.setControl( permanentCLComposite );
sessionCLComposite = new CertificateListComposite( tabFolder, SWT.NONE );
sessionCLComposite.setInput( ConnectionCorePlugin.getDefault().getSessionTrustStoreManager() );
TabItem sessionTab = new TabItem( tabFolder, SWT.NONE, 1 );
sessionTab.setText( Messages.getString( "CertificateValidationPreferencePage.TemporaryTrusted" ) ); //$NON-NLS-1$
sessionTab.setControl( sessionCLComposite );
tabFolder.setEnabled( verifyCertificatesButton.getSelection() );
return composite;
}
| protected Control createContents( Composite parent )
{
Composite composite = BaseWidgetUtils.createColumnContainer( parent, 1, 1 );
// enable/disable certificate validation
Preferences preferences = ConnectionCorePlugin.getDefault().getPluginPreferences();
boolean validateCertificates = preferences
.getBoolean( ConnectionCoreConstants.PREFERENCE_VALIDATE_CERTIFICATES );
verifyCertificatesButton = BaseWidgetUtils.createCheckbox( composite, Messages
.getString( "CertificateValidationPreferencePage.ValidateCertificates" ), 1 ); //$NON-NLS-1$
verifyCertificatesButton.setSelection( validateCertificates );
verifyCertificatesButton.addSelectionListener( new SelectionAdapter()
{
@Override
public void widgetSelected( SelectionEvent e )
{
tabFolder.setEnabled( verifyCertificatesButton.getSelection() );
}
} );
// certificate list widget
tabFolder = new TabFolder( composite, SWT.TOP );
tabFolder.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
permanentCLComposite = new CertificateListComposite( tabFolder, SWT.NONE );
permanentCLComposite.setInput( ConnectionCorePlugin.getDefault().getPermanentTrustStoreManager() );
TabItem permanentTab = new TabItem( tabFolder, SWT.NONE, 0 );
permanentTab.setText( Messages.getString( "CertificateValidationPreferencePage.PermanentTrusted" ) ); //$NON-NLS-1$
permanentTab.setControl( permanentCLComposite );
sessionCLComposite = new CertificateListComposite( tabFolder, SWT.NONE );
sessionCLComposite.setInput( ConnectionCorePlugin.getDefault().getSessionTrustStoreManager() );
TabItem sessionTab = new TabItem( tabFolder, SWT.NONE, 1 );
sessionTab.setText( Messages.getString( "CertificateValidationPreferencePage.TemporaryTrusted" ) ); //$NON-NLS-1$
sessionTab.setControl( sessionCLComposite );
tabFolder.setEnabled( verifyCertificatesButton.getSelection() );
return composite;
}
|
diff --git a/core/src/main/java/hudson/tasks/_ant/AntTargetNote.java b/core/src/main/java/hudson/tasks/_ant/AntTargetNote.java
index f123cdf..39586bc 100644
--- a/core/src/main/java/hudson/tasks/_ant/AntTargetNote.java
+++ b/core/src/main/java/hudson/tasks/_ant/AntTargetNote.java
@@ -1,61 +1,61 @@
/*
* The MIT License
*
* Copyright (c) 2004-2010, Sun Microsystems, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package hudson.tasks._ant;
import hudson.Extension;
import hudson.MarkupText;
import hudson.console.ConsoleNote;
import hudson.console.ConsoleAnnotationDescriptor;
import hudson.console.ConsoleAnnotator;
import java.util.regex.Pattern;
/**
* Marks the log line "TARGET:" that Ant uses to mark the beginning of the new target.
* @sine 1.349
*/
public final class AntTargetNote extends ConsoleNote {
public AntTargetNote() {
}
@Override
public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
// still under development. too early to put into production
if (!ENABLED) return null;
- MarkupText.SubText t = text.findToken(Pattern.compile("^[^:]+(?=:)"));
+ MarkupText.SubText t = text.findToken(Pattern.compile(".*(?=:)"));
if (t!=null)
t.addMarkup(0,t.length(),"<b class=ant-target>","</b>");
return null;
}
@Extension
public static final class DescriptorImpl extends ConsoleAnnotationDescriptor {
public String getDisplayName() {
return "Ant targets";
}
}
public static boolean ENABLED = !Boolean.getBoolean(AntTargetNote.class.getName()+".disabled");
}
| true | true | public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
// still under development. too early to put into production
if (!ENABLED) return null;
MarkupText.SubText t = text.findToken(Pattern.compile("^[^:]+(?=:)"));
if (t!=null)
t.addMarkup(0,t.length(),"<b class=ant-target>","</b>");
return null;
}
| public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
// still under development. too early to put into production
if (!ENABLED) return null;
MarkupText.SubText t = text.findToken(Pattern.compile(".*(?=:)"));
if (t!=null)
t.addMarkup(0,t.length(),"<b class=ant-target>","</b>");
return null;
}
|
diff --git a/source/RMG/jing/rxn/Reaction.java b/source/RMG/jing/rxn/Reaction.java
index a9f59243..13eecb70 100644
--- a/source/RMG/jing/rxn/Reaction.java
+++ b/source/RMG/jing/rxn/Reaction.java
@@ -1,1661 +1,1662 @@
////////////////////////////////////////////////////////////////////////////////
//
// RMG - Reaction Mechanism Generator
//
// Copyright (c) 2002-2009 Prof. William H. Green ([email protected]) and the
// RMG Team ([email protected])
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
////////////////////////////////////////////////////////////////////////////////
package jing.rxn;
import java.io.*;
import jing.chem.*;
import java.util.*;
import jing.param.*;
import jing.mathTool.*;
import jing.chemParser.*;
import jing.chem.Species;
import jing.param.Temperature;
import jing.rxnSys.NegativeConcentrationException;
import jing.rxnSys.ReactionModelGenerator;
import jing.rxnSys.SystemSnapshot;
//## package jing::rxn
//----------------------------------------------------------------------------
//jing\rxn\Reaction.java
//----------------------------------------------------------------------------
/**
Immutable objects.
*/
//## class Reaction
public class Reaction {
protected static double BIMOLECULAR_RATE_UPPER = 1.0E100; //## attribute BIMOLECULAR_RATE_UPPER
protected static double UNIMOLECULAR_RATE_UPPER = 1.0E100; //## attribute UNIMOLECULAR_RATE_UPPER
protected String comments = "No comment"; //## attribute comments
protected Kinetics[] fittedReverseKinetics = null; //## attribute fittedReverseKinetics
protected double rateConstant;
protected Reaction reverseReaction = null; //## attribute reverseReaction
protected Kinetics[] kinetics;
protected Structure structure;
protected double UpperBoundRate;//svp
protected double LowerBoundRate;//svp
//protected Kinetics additionalKinetics = null; //This is incase a reaction has two completely different transition states.
protected boolean finalized = false;
protected String ChemkinString = null;
protected boolean ratesForKineticsAndAdditionalKineticsCross = false; //10/29/07 gmagoon: added variable to keep track of whether both rate constants are maximum for some temperature in the temperature range
protected boolean kineticsFromPrimaryReactionLibrary = false;
protected ReactionTemplate rxnTemplate;
// Constructors
//## operation Reaction()
public Reaction() {
//#[ operation Reaction()
//#]
}
//## operation Reaction(Structure,RateConstant)
private Reaction(Structure p_structure, Kinetics[] p_kinetics) {
//#[ operation Reaction(Structure,RateConstant)
structure = p_structure;
kinetics = p_kinetics;
//rateConstant = calculateTotalRate(Global.temperature);
//#]
}
/*public Reaction(Reaction rxn) {
structure = rxn.structure;
kinetics = rxn.kinetics;
comments = rxn.comments;
fittedReverseKinetics = rxn.fittedReverseKinetics;
rateConstant = rxn.rateConstant;
reverseReaction = rxn.reverseReaction;
UpperBoundRate = rxn.UpperBoundRate;
LowerBoundRate = rxn.LowerBoundRate;
additionalKinetics = rxn.additionalKinetics;
finalized = rxn.finalized;
ChemkinString = rxn.ChemkinString;
ratesForKineticsAndAdditionalKineticsCross = rxn.ratesForKineticsAndAdditionalKineticsCross;
}*/
//## operation allProductsIncluded(HashSet)
public boolean allProductsIncluded(HashSet p_speciesSet) {
//#[ operation allProductsIncluded(HashSet)
Iterator iter = getProducts();
while (iter.hasNext()) {
Species spe = ((Species)iter.next());
if (!p_speciesSet.contains(spe)) return false;
}
return true;
//#]
}
//## operation allReactantsIncluded(HashSet)
public boolean allReactantsIncluded(HashSet p_speciesSet) {
//#[ operation allReactantsIncluded(HashSet)
if (p_speciesSet == null) throw new NullPointerException();
Iterator iter = getReactants();
while (iter.hasNext()) {
Species spe = ((Species)iter.next());
if (!p_speciesSet.contains(spe)) return false;
}
return true;
//#]
}
/**
Calculate this reaction's thermo parameter. Basically, make addition of the thermo parameters of all the reactants and products.
*/
//## operation calculateHrxn(Temperature)
public double calculateHrxn(Temperature p_temperature) {
//#[ operation calculateHrxn(Temperature)
return structure.calculateHrxn(p_temperature);
//#]
}
//## operation calculateKeq(Temperature)
public double calculateKeq(Temperature p_temperature) {
//#[ operation calculateKeq(Temperature)
return structure.calculateKeq(p_temperature);
//#]
}
//## operation calculateKeqUpperBound(Temperature)
//svp
public double calculateKeqUpperBound(Temperature p_temperature) {
//#[ operation calculateKeqUpperBound(Temperature)
return structure.calculateKeqUpperBound(p_temperature);
//#]
}
//## operation calculateKeqLowerBound(Temperature)
//svp
public double calculateKeqLowerBound(Temperature p_temperature) {
//#[ operation calculateKeqLowerBound(Temperature)
return structure.calculateKeqLowerBound(p_temperature);
//#]
}
public double calculateTotalRate(Temperature p_temperature){
double rate =0;
Temperature stdtemp = new Temperature(298,"K");
double Hrxn = calculateHrxn(stdtemp);
/*
* 29Jun2009-MRH: Added a kinetics from PRL check
* If the kinetics for this reaction is from a PRL, use those numbers
* to compute the rate. Else, proceed as before.
*/
/*
* MRH 18MAR2010:
* Changing the structure of a reaction's kinetics
* If the kinetics are from a primary reaction library, we assume the user
* has supplied the total pre-exponential factor for the reaction (and
* not the per-event pre-exponential facor).
* If the kinetics were estimated by RMG, the pre-exponential factor must
* be multiplied by the "redundancy" (# of events)
*/
if (kineticsFromPrimaryReactionLibrary) {
Kinetics[] k_All = kinetics;
for (int numKinetics=0; numKinetics<kinetics.length; numKinetics++) {
Kinetics k = k_All[numKinetics];
if (k instanceof ArrheniusEPKinetics)
rate += k.calculateRate(p_temperature,Hrxn);
else
rate += k.calculateRate(p_temperature);
}
return rate;
}
else if (isForward()){
Kinetics[] k_All = kinetics;
for (int numKinetics=0; numKinetics<kinetics.length; numKinetics++) {
Kinetics k = k_All[numKinetics].multiply(structure.redundancy);
if (k instanceof ArrheniusEPKinetics)
rate += k.calculateRate(p_temperature,Hrxn);
else
rate += k.calculateRate(p_temperature);
}
return rate;
// Iterator kineticIter = getAllKinetics().iterator();
// while (kineticIter.hasNext()){
// Kinetics k = (Kinetics)kineticIter.next();
// if (k instanceof ArrheniusEPKinetics)
// rate = rate + k.calculateRate(p_temperature,Hrxn);
// else
// rate = rate + k.calculateRate(p_temperature);
// }
//
// return rate;
}
else if (isBackward()){
Reaction r = getReverseReaction();
rate = r.calculateTotalRate(p_temperature);
return rate*calculateKeq(p_temperature);
}
else {
throw new InvalidReactionDirectionException();
}
}
//## operation calculateUpperBoundRate(Temperature)
//svp
public double calculateUpperBoundRate(Temperature p_temperature){
//#[ operation calculateUpperBoundRate(Temperature)
if (isForward()){
double A;
double E;
double n;
for (int numKinetics=0; numKinetics<kinetics.length; numKinetics++) {
A = kinetics[numKinetics].getA().getUpperBound();
E = kinetics[numKinetics].getE().getLowerBound();
n = kinetics[numKinetics].getN().getUpperBound();
if (A > 1E300) {
A = kinetics[numKinetics].getA().getValue()*1.2;
}
//Kinetics kinetics = getRateConstant().getKinetics();
if (kinetics[numKinetics] instanceof ArrheniusEPKinetics){
ArrheniusEPKinetics arrhenius = (ArrheniusEPKinetics)kinetics[numKinetics];
double H = calculateHrxn(p_temperature);
if (H < 0) {
if (arrhenius.getAlpha().getValue() > 0){
double alpha = arrhenius.getAlpha().getUpperBound();
E = E + alpha * H;
}
else{
double alpha = arrhenius.getAlpha().getLowerBound();
E = E + alpha*H;
}
}
else {
if (arrhenius.getAlpha().getValue() > 0){
double alpha = arrhenius.getAlpha().getLowerBound();
E = E + alpha * H;
}
else{
double alpha = arrhenius.getAlpha().getUpperBound();
E = E + alpha*H;
}
}
}
if (E < 0){
E = 0;
}
double indiv_k = 0.0;
indiv_k = A*Math.pow(p_temperature.getK(),n)*Math.exp(-E/GasConstant.getKcalMolK()/p_temperature.getK());
indiv_k *= getStructure().getRedundancy();
UpperBoundRate += indiv_k;
}
return UpperBoundRate;
}
else if (isBackward()) {
Reaction r = getReverseReaction();
if (r == null) throw new NullPointerException("Reverse reaction is null.\n" + structure.toString());
if (!r.isForward()) throw new InvalidReactionDirectionException();
for (int numKinetics=0; numKinetics<kinetics.length; numKinetics++) {
double A = kinetics[numKinetics].getA().getUpperBound();
double E = kinetics[numKinetics].getE().getLowerBound();
double n = kinetics[numKinetics].getN().getUpperBound();
if (A > 1E300) {
A = kinetics[numKinetics].getA().getValue()*1.2;
}
//Kinetics kinetics = getRateConstant().getKinetics();
if (kinetics[numKinetics] instanceof ArrheniusEPKinetics){
ArrheniusEPKinetics arrhenius = (ArrheniusEPKinetics)kinetics[numKinetics];
double H = calculateHrxn(p_temperature);
if (H < 0) {
if (arrhenius.getAlpha().getValue() > 0){
double alpha = arrhenius.getAlpha().getUpperBound();
E = E + alpha * H;
}
else{
double alpha = arrhenius.getAlpha().getLowerBound();
E = E + alpha*H;
}
}
else {
if (arrhenius.getAlpha().getValue() > 0){
double alpha = arrhenius.getAlpha().getLowerBound();
E = E + alpha * H;
}
else{
double alpha = arrhenius.getAlpha().getUpperBound();
E = E + alpha*H;
}
}
}
if (E < 0){
E = 0;
}
double indiv_k = 0.0;
indiv_k = A*Math.pow(p_temperature.getK(),n)*Math.exp(-E/GasConstant.getKcalMolK()/p_temperature.getK());
indiv_k *= getStructure().getRedundancy();
UpperBoundRate += indiv_k*calculateKeqUpperBound(p_temperature);
}
return UpperBoundRate;
}
else{
throw new InvalidReactionDirectionException();
}
//#]
}
//## operation calculateLowerBoundRate(Temperature)
//svp
public double calculateLowerBoundRate(Temperature p_temperature){
//#[ operation calculateLowerBoundRate(Temperature)
if (isForward()){
for (int numKinetics=0; numKinetics<kinetics.length; ++numKinetics) {
double A = kinetics[numKinetics].getA().getLowerBound();
double E = kinetics[numKinetics].getE().getUpperBound();
double n = kinetics[numKinetics].getN().getLowerBound();
if (A > 1E300 || A <= 0) {
A = kinetics[numKinetics].getA().getValue()/1.2;
}
//Kinetics kinetics = getRateConstant().getKinetics();
if (kinetics[numKinetics] instanceof ArrheniusEPKinetics){
ArrheniusEPKinetics arrhenius = (ArrheniusEPKinetics)kinetics[numKinetics];
double H = calculateHrxn(p_temperature);
if (H < 0) {
if (arrhenius.getAlpha().getValue()>0){
double alpha = arrhenius.getAlpha().getLowerBound();
E = E + alpha * H;
}
else{
double alpha = arrhenius.getAlpha().getUpperBound();
E = E + alpha*H;
}
}
else {
if (arrhenius.getAlpha().getValue()>0){
double alpha = arrhenius.getAlpha().getUpperBound();
E = E + alpha * H;
}
else{
double alpha = arrhenius.getAlpha().getLowerBound();
E = E + alpha*H;
}
}
}
double indiv_k = 0.0;
indiv_k = A*Math.pow(p_temperature.getK(),n)*Math.exp(-E/GasConstant.getKcalMolK()/p_temperature.getK());
indiv_k *= getStructure().getRedundancy();
LowerBoundRate += indiv_k;
}
return LowerBoundRate;
}
else if (isBackward()) {
Reaction r = getReverseReaction();
if (r == null) throw new NullPointerException("Reverse reaction is null.\n" + structure.toString());
if (!r.isForward()) throw new InvalidReactionDirectionException();
for (int numKinetics=0; numKinetics<kinetics.length; ++numKinetics) {
double A = kinetics[numKinetics].getA().getLowerBound();
double E = kinetics[numKinetics].getE().getUpperBound();
double n = kinetics[numKinetics].getN().getLowerBound();
if (A > 1E300) {
A = kinetics[numKinetics].getA().getValue()/1.2;
}
if (kinetics[numKinetics] instanceof ArrheniusEPKinetics){
ArrheniusEPKinetics arrhenius = (ArrheniusEPKinetics)kinetics[numKinetics];
double H = calculateHrxn(p_temperature);
if (H < 0) {
if (arrhenius.getAlpha().getValue() > 0){
double alpha = arrhenius.getAlpha().getLowerBound();
E = E + alpha * H;
}
else{
double alpha = arrhenius.getAlpha().getUpperBound();
E = E + alpha*H;
}
}
else {
if (arrhenius.getAlpha().getValue() > 0){
double alpha = arrhenius.getAlpha().getUpperBound();
E = E + alpha * H;
}
else{
double alpha = arrhenius.getAlpha().getLowerBound();
E = E + alpha*H;
}
}
}
double indiv_k = 0.0;
indiv_k = A*Math.pow(p_temperature.getK(),n)*Math.exp(-E/GasConstant.getKcalMolK()/p_temperature.getK());
indiv_k *= getStructure().getRedundancy();
LowerBoundRate += indiv_k*calculateKeqLowerBound(p_temperature);
}
return LowerBoundRate;
}
else{
throw new InvalidReactionDirectionException();
}
//#]
}
//## operation calculateSrxn(Temperature)
public double calculateSrxn(Temperature p_temperature) {
//#[ operation calculateSrxn(Temperature)
return structure.calculateSrxn(p_temperature);
//#]
}
//## operation calculateThirdBodyCoefficient(SystemSnapshot)
public double calculateThirdBodyCoefficient(SystemSnapshot p_presentStatus) {
//#[ operation calculateThirdBodyCoefficient(SystemSnapshot)
if (!(this instanceof ThirdBodyReaction)) return 1;
else {
return ((ThirdBodyReaction)this).calculateThirdBodyCoefficient(p_presentStatus);
}
//#]
}
//## operation checkRateRange()
public boolean checkRateRange() {
//#[ operation checkRateRange()
Temperature t = new Temperature(1500,"K");
double rate = calculateTotalRate(t);
if (getReactantNumber() == 2) {
if (rate > BIMOLECULAR_RATE_UPPER) return false;
}
else if (getReactantNumber() == 1) {
if (rate > UNIMOLECULAR_RATE_UPPER) return false;
}
else throw new InvalidReactantNumberException();
return true;
//#]
}
//## operation contains(Species)
public boolean contains(Species p_species) {
//#[ operation contains(Species)
if (containsAsReactant(p_species) || containsAsProduct(p_species)) return true;
else return false;
//#]
}
//## operation containsAsProduct(Species)
public boolean containsAsProduct(Species p_species) {
//#[ operation containsAsProduct(Species)
Iterator iter = getProducts();
while (iter.hasNext()) {
//ChemGraph cg = (ChemGraph)iter.next();
Species spe = (Species)iter.next();
if (spe.equals(p_species)) return true;
}
return false;
//#]
}
//## operation containsAsReactant(Species)
public boolean containsAsReactant(Species p_species) {
//#[ operation containsAsReactant(Species)
Iterator iter = getReactants();
while (iter.hasNext()) {
//ChemGraph cg = (ChemGraph)iter.next();
Species spe = (Species)iter.next();
if (spe.equals(p_species)) return true;
}
return false;
//#]
}
/**
* Checks if the structure of the reaction is the same. Does not check the rate constant.
* Two reactions with the same structure but different rate constants will be equal.
*/
//## operation equals(Object)
public boolean equals(Object p_reaction) {
//#[ operation equals(Object)
if (this == p_reaction) return true;
if (!(p_reaction instanceof Reaction)) return false;
Reaction r = (Reaction)p_reaction;
if (!getStructure().equals(r.getStructure())) return false;
return true;
//#]
}
/*
// fitReverseKineticsPrecisely and getPreciseReverseKinetics
// are not used, not maintained, and we have clue what they do,
// so we're commenting them out so we don't keep looking at them.
// (oh, and they look pretty similar to each other!)
// - RWest & JWAllen, June 2009
//## operation fitReverseKineticsPrecisely()
public void fitReverseKineticsPrecisely() {
//#[ operation fitReverseKineticsPrecisely()
if (isForward()) {
fittedReverseKinetics = null;
}
else {
String result = "";
for (double t = 300.0; t<1500.0; t+=50.0) {
double rate = calculateTotalRate(new Temperature(t,"K"));
result += String.valueOf(t) + '\t' + String.valueOf(rate) + '\n';
}
// run fit3p
String dir = System.getProperty("RMG.workingDirectory");
File fit3p_input;
try {
// prepare fit3p input file, "input.dat" is the input file name
fit3p_input = new File("fit3p/input.dat");
FileWriter fw = new FileWriter(fit3p_input);
fw.write(result);
fw.close();
}
catch (IOException e) {
System.out.println("Wrong input file for fit3p!");
System.out.println(e.getMessage());
System.exit(0);
}
try {
// system call for fit3p
String[] command = {dir+ "/bin/fit3pbnd.exe"};
File runningDir = new File("fit3p");
Process fit = Runtime.getRuntime().exec(command, null, runningDir);
int exitValue = fit.waitFor();
}
catch (Exception e) {
System.out.println("Error in run fit3p!");
System.out.println(e.getMessage());
System.exit(0);
}
// parse the output file from chemdis
try {
String fit3p_output = "fit3p/output.dat";
FileReader in = new FileReader(fit3p_output);
BufferedReader data = new BufferedReader(in);
String line = ChemParser.readMeaningfulLine(data);
line = line.trim();
StringTokenizer st = new StringTokenizer(line);
String A = st.nextToken();
String temp = st.nextToken();
temp = st.nextToken();
temp = st.nextToken();
double Ar = Double.parseDouble(temp);
line = ChemParser.readMeaningfulLine(data);
line = line.trim();
st = new StringTokenizer(line);
String n = st.nextToken();
temp = st.nextToken();
temp = st.nextToken();
double nr = Double.parseDouble(temp);
line = ChemParser.readMeaningfulLine(data);
line = line.trim();
st = new StringTokenizer(line);
String E = st.nextToken();
temp = st.nextToken();
temp = st.nextToken();
temp = st.nextToken();
double Er = Double.parseDouble(temp);
if (Er < 0) {
System.err.println(getStructure().toString());
System.err.println("fitted Er < 0: "+Double.toString(Er));
double increase = Math.exp(-Er/GasConstant.getKcalMolK()/715.0);
double deltan = Math.log(increase)/Math.log(715.0);
System.err.println("n enlarged by factor of: " + Double.toString(deltan));
nr += deltan;
Er = 0;
}
UncertainDouble udAr = new UncertainDouble(Ar, 0, "Adder");
UncertainDouble udnr = new UncertainDouble(nr, 0, "Adder");
UncertainDouble udEr = new UncertainDouble(Er, 0, "Adder");
fittedReverseKinetics = new ArrheniusKinetics(udAr, udnr , udEr, "300-1500", 1, "fitting from forward and thermal",null);
in.close();
}
catch (Exception e) {
System.out.println("Error in read output.dat from fit3p!");
System.out.println(e.getMessage());
System.exit(0);
}
}
return;
//#]
}
//## operation fitReverseKineticsPrecisely()
public Kinetics getPreciseReverseKinetics() {
//#[ operation fitReverseKineticsPrecisely()
Kinetics fittedReverseKinetics =null;
String result = "";
for (double t = 300.0; t<1500.0; t+=50.0) {
double rate = calculateTotalRate(new Temperature(t,"K"));
result += String.valueOf(t) + '\t' + String.valueOf(rate) + '\n';
}
// run fit3p
String dir = System.getProperty("RMG.workingDirectory");
File fit3p_input;
try {
// prepare fit3p input file, "input.dat" is the input file name
fit3p_input = new File("fit3p/input.dat");
FileWriter fw = new FileWriter(fit3p_input);
fw.write(result);
fw.close();
}
catch (IOException e) {
System.out.println("Wrong input file for fit3p!");
System.out.println(e.getMessage());
System.exit(0);
}
try {
// system call for fit3p
String[] command = {dir+ "/bin/fit3pbnd.exe"};
File runningDir = new File("fit3p");
Process fit = Runtime.getRuntime().exec(command, null, runningDir);
int exitValue = fit.waitFor();
}
catch (Exception e) {
System.out.println("Error in run fit3p!");
System.out.println(e.getMessage());
System.exit(0);
}
// parse the output file from chemdis
try {
String fit3p_output = "fit3p/output.dat";
FileReader in = new FileReader(fit3p_output);
BufferedReader data = new BufferedReader(in);
String line = ChemParser.readMeaningfulLine(data);
line = line.trim();
StringTokenizer st = new StringTokenizer(line);
String A = st.nextToken();
String temp = st.nextToken();
temp = st.nextToken();
temp = st.nextToken();
double Ar = Double.parseDouble(temp);
line = ChemParser.readMeaningfulLine(data);
line = line.trim();
st = new StringTokenizer(line);
String n = st.nextToken();
temp = st.nextToken();
temp = st.nextToken();
double nr = Double.parseDouble(temp);
line = ChemParser.readMeaningfulLine(data);
line = line.trim();
st = new StringTokenizer(line);
String E = st.nextToken();
temp = st.nextToken();
temp = st.nextToken();
temp = st.nextToken();
double Er = Double.parseDouble(temp);
if (Er < 0) {
System.err.println(getStructure().toString());
System.err.println("fitted Er < 0: "+Double.toString(Er));
double increase = Math.exp(-Er/GasConstant.getKcalMolK()/715.0);
double deltan = Math.log(increase)/Math.log(715.0);
System.err.println("n enlarged by factor of: " + Double.toString(deltan));
nr += deltan;
Er = 0;
}
UncertainDouble udAr = new UncertainDouble(Ar, 0, "Adder");
UncertainDouble udnr = new UncertainDouble(nr, 0, "Adder");
UncertainDouble udEr = new UncertainDouble(Er, 0, "Adder");
fittedReverseKinetics = new ArrheniusKinetics(udAr, udnr , udEr, "300-1500", 1, "fitting from forward and thermal",null);
in.close();
}
catch (Exception e) {
System.out.println("Error in read output.dat from fit3p!");
System.out.println(e.getMessage());
System.exit(0);
}
return fittedReverseKinetics;
//#]
}
// */
//## operation fitReverseKineticsRoughly()
public void fitReverseKineticsRoughly() {
//#[ operation fitReverseKineticsRoughly()
// now is a rough fitting
if (isForward()) {
fittedReverseKinetics = null;
}
else {
//double temp = 715;
// double temp = 298.15; //10/29/07 gmagoon: Sandeep made change to temp = 298 on his computer locally
// double temp = 1350; //11/6/07 gmagoon:**** changed to actual temperature in my condition file to create agreement with old version; apparently, choice of temp has large effect; //11/9/07 gmagoon: commented out
double temp = 298.15; //11/9/07 gmagoon: restored use of 298.15 per discussion with Sandeep
//double temp = Global.temperature.getK();
Kinetics[] k = getKinetics();
fittedReverseKinetics = new Kinetics[k.length];
double doubleAlpha;
for (int numKinetics=0; numKinetics<k.length; numKinetics++) {
if (k[numKinetics] instanceof ArrheniusEPKinetics) doubleAlpha = ((ArrheniusEPKinetics)k[numKinetics]).getAlphaValue();
else doubleAlpha = 0;
double Hrxn = calculateHrxn(new Temperature(temp,"K"));
double Srxn = calculateSrxn(new Temperature(temp, "K"));
// for EvansPolyani kinetics (Ea = Eo + alpha * Hrxn) remember that k.getEValue() gets Eo not Ea
// this Hrxn is for the reverse reaction (ie. -Hrxn_forward)
double doubleEr = k[numKinetics].getEValue() - (doubleAlpha-1)*Hrxn;
if (doubleEr < 0) {
System.err.println("fitted Er < 0: "+Double.toString(doubleEr));
System.err.println(getStructure().toString());
//doubleEr = 0;
}
UncertainDouble Er = new UncertainDouble(doubleEr, k[numKinetics].getE().getUncertainty(), k[numKinetics].getE().getType());
UncertainDouble n = new UncertainDouble(0,0, "Adder");
double doubleA = k[numKinetics].getAValue()* Math.pow(temp, k[numKinetics].getNValue())* Math.exp(Srxn/GasConstant.getCalMolK());
doubleA *= Math.pow(GasConstant.getCCAtmMolK()*temp, -getStructure().getDeltaN()); // assumes Ideal gas law concentration and 1 Atm reference state
fittedReverseKinetics[numKinetics] = new ArrheniusKinetics(new UncertainDouble(doubleA, 0, "Adder"), n , Er, "300-1500", 1, "fitting from forward and thermal",null);
}
}
return;
//#]
}
/**
* Generates a reaction whose structure is opposite to that of the present reaction.
* Just appends the rate constant of this reaction to the reverse reaction.
*
*/
//## operation generateReverseReaction()
public void generateReverseReaction() {
//#[ operation generateReverseReaction()
Structure s = getStructure();
//Kinetics k = getKinetics();
Kinetics[] k = kinetics;
if (kinetics == null)
throw new NullPointerException();
Structure newS = s.generateReverseStructure();
newS.setRedundancy(s.getRedundancy());
Reaction r = new Reaction(newS, k);
// if (hasAdditionalKinetics()){
// r.addAdditionalKinetics(additionalKinetics,1);
// }
r.setReverseReaction(this);
this.setReverseReaction(r);
return;
//#]
}
//## operation getComments()
public String getComments() {
//#[ operation getComments()
return comments;
//#]
}
//## operation getDirection()
public int getDirection() {
//#[ operation getDirection()
return getStructure().getDirection();
//#]
}
//## operation getFittedReverseKinetics()
public Kinetics[] getFittedReverseKinetics() {
//#[ operation getFittedReverseKinetics()
if (fittedReverseKinetics == null) fitReverseKineticsRoughly();
return fittedReverseKinetics;
//#]
}
/*//## operation getForwardRateConstant()
public Kinetics getForwardRateConstant() {
//#[ operation getForwardRateConstant()
if (isForward()) return kinetics;
else return null;
//#]
}
*/
//## operation getKinetics()
public Kinetics[] getKinetics() {
//#[ operation getKinetics()
// returns the kinetics OF THE FORWARD REACTION
// ie. if THIS is reverse, it calls this.getReverseReaction().getKinetics()
/*
* 29Jun2009-MRH:
* When getting kinetics, check whether it comes from a PRL or not.
* If so, return the kinetics. We are not worried about the redundancy
* because I assume the user inputs the Arrhenius kinetics for the overall
* reaction A = B + C
*
* E.g. CH4 = CH3 + H A n E
* The Arrhenius parameters would be for the overall decomposition of CH4,
* not for each carbon-hydrogen bond fission
*/
if (isFromPrimaryReactionLibrary()) {
return kinetics;
}
if (isForward()) {
int red = structure.getRedundancy();
Kinetics[] kinetics2return = new Kinetics[kinetics.length];
for (int numKinetics=0; numKinetics<kinetics.length; ++numKinetics) {
kinetics2return[numKinetics] = kinetics[numKinetics].multiply(red);
}
return kinetics2return;
}
else if (isBackward()) {
Reaction rr = getReverseReaction();
// Added by MRH on 7/Sept/2009
// Required when reading in the restart files
if (rr == null) {
generateReverseReaction();
rr = getReverseReaction();
}
if (rr == null) throw new NullPointerException("Reverse reaction is null.\n" + structure.toString());
if (!rr.isForward()) throw new InvalidReactionDirectionException(structure.toString());
return rr.getKinetics();
}
else
throw new InvalidReactionDirectionException(structure.toString());
//#]
}
public void setKineticsComments(String p_string, int num_k){
kinetics[num_k].setComments(p_string);
}
public void setKineticsSource(String p_string, int num_k){
kinetics[num_k].setSource(p_string);
}
//## operation getUpperBoundRate(Temperature)
public double getUpperBoundRate(Temperature p_temperature){//svp
//#[ operation getUpperBoundRate(Temperature)
if (UpperBoundRate == 0.0){
calculateUpperBoundRate(p_temperature);
}
return UpperBoundRate;
//#]
}
//## operation getLowerBoundRate(Temperature)
public double getLowerBoundRate(Temperature p_temperature){//svp
//#[ operation getLowerBoundRate(Temperature)
if (LowerBoundRate == 0.0){
calculateLowerBoundRate(p_temperature);
}
return LowerBoundRate;
//#]
}
//## operation getProductList()
public LinkedList getProductList() {
//#[ operation getProductList()
return structure.getProductList();
//#]
}
//10/26/07 gmagoon: changed to have temperature and pressure passed as parameters (part of eliminating use of Global.temperature)
public double getRateConstant(Temperature p_temperature){
//public double getRateConstant(){
if (rateConstant == 0)
rateConstant = calculateTotalRate(p_temperature);
// rateConstant = calculateTotalRate(Global.temperature);
return rateConstant;
}
//## operation getProductNumber()
public int getProductNumber() {
//#[ operation getProductNumber()
return getStructure().getProductNumber();
//#]
}
//## operation getProducts()
public ListIterator getProducts() {
//#[ operation getProducts()
return structure.getProducts();
//#]
}
/*//## operation getRateConstant()
public Kinetics getRateConstant() {
//#[ operation getRateConstant()
if (isForward()) {
return rateConstant;
}
else if (isBackward()) {
Reaction rr = getReverseReaction();
if (rr == null) throw new NullPointerException("Reverse reaction is null.\n" + structure.toString());
if (!rr.isForward()) throw new InvalidReactionDirectionException(structure.toString());
return rr.getRateConstant();
}
else throw new InvalidReactionDirectionException(structure.toString());
//#]
}*/
//## operation getReactantList()
public LinkedList getReactantList() {
//#[ operation getReactantList()
return structure.getReactantList();
//#]
}
//## operation getReactantNumber()
public int getReactantNumber() {
//#[ operation getReactantNumber()
return getStructure().getReactantNumber();
//#]
}
//## operation getReactants()
public ListIterator getReactants() {
//#[ operation getReactants()
return structure.getReactants();
//#]
}
//## operation getRedundancy()
public int getRedundancy() {
//#[ operation getRedundancy()
return getStructure().getRedundancy();
//#]
}
public boolean hasResonanceIsomer() {
//#[ operation hasResonanceIsomer()
return (hasResonanceIsomerAsReactant() || hasResonanceIsomerAsProduct());
//#]
}
//## operation hasResonanceIsomerAsProduct()
public boolean hasResonanceIsomerAsProduct() {
//#[ operation hasResonanceIsomerAsProduct()
for (Iterator iter = getProducts(); iter.hasNext();) {
Species spe = ((Species)iter.next());
if (spe.hasResonanceIsomers()) return true;
}
return false;
//#]
}
//## operation hasResonanceIsomerAsReactant()
public boolean hasResonanceIsomerAsReactant() {
//#[ operation hasResonanceIsomerAsReactant()
for (Iterator iter = getReactants(); iter.hasNext();) {
Species spe = ((Species)iter.next());
if (spe.hasResonanceIsomers()) return true;
}
return false;
//#]
}
//## operation hasReverseReaction()
public boolean hasReverseReaction() {
//#[ operation hasReverseReaction()
return reverseReaction != null;
//#]
}
//## operation hashCode()
public int hashCode() {
//#[ operation hashCode()
// just use the structure's hashcode
return structure.hashCode();
//#]
}
//## operation isDuplicated(Reaction)
/*public boolean isDuplicated(Reaction p_reaction) {
//#[ operation isDuplicated(Reaction)
// the same structure, return true
Structure str1 = getStructure();
Structure str2 = p_reaction.getStructure();
//if (str1.isDuplicate(str2)) return true;
// if not the same structure, check the resonance isomers
if (!hasResonanceIsomer()) return false;
if (str1.equals(str2)) return true;
else return false;
//#]
}*/
//## operation isBackward()
public boolean isBackward() {
//#[ operation isBackward()
return structure.isBackward();
//#]
}
//## operation isForward()
public boolean isForward() {
//#[ operation isForward()
return structure.isForward();
//#]
}
//## operation isIncluded(HashSet)
public boolean isIncluded(HashSet p_speciesSet) {
//#[ operation isIncluded(HashSet)
return (allReactantsIncluded(p_speciesSet) && allProductsIncluded(p_speciesSet));
//#]
}
//## operation makeReaction(Structure,Kinetics,boolean)
public static Reaction makeReaction(Structure p_structure, Kinetics[] p_kinetics, boolean p_generateReverse) {
//#[ operation makeReaction(Structure,Kinetics,boolean)
if (!p_structure.repOk()) throw new InvalidStructureException(p_structure.toChemkinString(false).toString());
for (int numKinetics=0; numKinetics<p_kinetics.length; numKinetics++) {
if (!p_kinetics[numKinetics].repOk()) throw new InvalidKineticsException(p_kinetics[numKinetics].toString());
}
Reaction r = new Reaction(p_structure, p_kinetics);
if (p_generateReverse) {
r.generateReverseReaction();
}
else {
r.setReverseReaction(null);
}
return r;
//#]
}
//## operation reactantEqualsProduct()
public boolean reactantEqualsProduct() {
//#[ operation reactantEqualsProduct()
return getStructure().reactantEqualsProduct();
//#]
}
//## operation repOk()
public boolean repOk() {
//#[ operation repOk()
if (!structure.repOk()) {
System.out.println("Invalid Reaction Structure:" + structure.toString());
return false;
}
if (!isForward() && !isBackward()) {
System.out.println("Invalid Reaction Direction: " + String.valueOf(getDirection()));
return false;
}
if (isBackward() && reverseReaction == null) {
System.out.println("Backward Reaction without a reversed reaction defined!");
return false;
}
/*if (!getRateConstant().repOk()) {
System.out.println("Invalid Rate Constant: " + getRateConstant().toString());
return false;
}*/
Kinetics[] allKinetics = getKinetics();
for (int numKinetics=0; numKinetics<allKinetics.length; ++numKinetics) {
if (!allKinetics[numKinetics].repOk()) {
System.out.println("Invalid Kinetics: " + allKinetics[numKinetics].toString());
return false;
}
}
if (!checkRateRange()) {
System.out.println("reaction rate is higher than the upper rate limit!");
System.out.println(getStructure().toString());
Temperature tup = new Temperature(1500,"K");
if (isForward()) {
System.out.println("k(T=1500) = " + String.valueOf(calculateTotalRate(tup)));
}
else {
System.out.println("k(T=1500) = " + String.valueOf(calculateTotalRate(tup)));
System.out.println("Keq(T=1500) = " + String.valueOf(calculateKeq(tup)));
System.out.println("krev(T=1500) = " + String.valueOf(getReverseReaction().calculateTotalRate(tup)));
}
System.out.println(getKinetics());
return false;
}
return true;
//#]
}
//## operation setReverseReaction(Reaction)
public void setReverseReaction(Reaction p_reverseReaction) {
//#[ operation setReverseReaction(Reaction)
reverseReaction = p_reverseReaction;
if (p_reverseReaction != null) reverseReaction.reverseReaction = this;
//#]
}
//## operation toChemkinString()
public String toChemkinString(Temperature p_temperature) {
//#[ operation toChemkinString()
if (ChemkinString != null)
return ChemkinString;
StringBuilder result = new StringBuilder();
StringBuilder strucString = getStructure().toChemkinString(hasReverseReaction());
Temperature stdtemp = new Temperature(298,"K");
double Hrxn = calculateHrxn(stdtemp);
Kinetics[] allKinetics = getKinetics();
for (int numKinetics=0; numKinetics<allKinetics.length; ++numKinetics) {
String k = allKinetics[numKinetics].toChemkinString(Hrxn,p_temperature,true);
if (allKinetics.length == 1)
result.append(strucString + " " + k);
else
result.append(strucString + " " + k + "\nDUP\n");
}
ChemkinString = result.toString();
return result.toString();
}
public String toChemkinString(Temperature p_temperature, Pressure p_pressure) {
if (ChemkinString != null)
return ChemkinString;
StringBuilder result = new StringBuilder();
StringBuilder strucString = getStructure().toChemkinString(hasReverseReaction());
Temperature stdtemp = new Temperature(298,"K");
double Hrxn = calculateHrxn(stdtemp);
Kinetics[] allKinetics = getKinetics();
for (int numKinetics=0; numKinetics<allKinetics.length; ++numKinetics) {
String k = allKinetics[numKinetics].toChemkinString(Hrxn,p_temperature,true);
if (allKinetics.length == 1)
result.append(strucString + " " + k);
else
result.append(strucString + " " + k + "\nDUP\n");
}
ChemkinString = result.toString();
return result.toString();
}
public String toRestartString(Temperature p_temperature, boolean pathReaction) {
/*
* Edited by MRH on 18Jan2010
*
* Writing restart files was causing a bug in the RMG-generated chem.inp file
* For example, H+CH4=CH3+H2 in input file w/HXD13, CH4, and H2
* RMG would correctly multiply the A factor by the structure's redundancy
* when calculating the rate to place in the ODEsolver input file. However,
* the A reported in the chem.inp file would be the "per event" A. This was
* due to the reaction.toChemkinString() method being called when writing the
* Restart coreReactions.txt and edgeReactions.txt files. At the first point of
* writing the chemkinString for this reaction (when it is still an edge reaction),
* RMG had not yet computed the redundancy of the structure (as H was not a core
* species at the time, but CH3 and H2 were). When RMG tried to write the chemkinString
* for the above reaction, using the correct redundancy, the chemkinString already existed
* and thus the toChemkinString() method was exited immediately.
* MRH is replacing the reaction.toChemkinString() call with reaction.toRestartString()
* when writing the Restart files, to account for this bug.
*/
String result = getStructure().toRestartString(hasReverseReaction()); //+ " "+getStructure().direction + " "+getStructure().redundancy;
// MRH 18Jan2010: Restart files do not look for direction/redundancy
/*
* MRH 14Feb2010: Handle reactions with multiple kinetics
*/
String totalResult = "";
Kinetics[] allKinetics = getKinetics();
for (int numKinetics=0; numKinetics<allKinetics.length; ++numKinetics) {
totalResult += result + " " + allKinetics[numKinetics].toChemkinString(calculateHrxn(p_temperature),p_temperature,true);
if (allKinetics.length != 1) {
if (pathReaction) {
totalResult += "\n";
if (numKinetics != allKinetics.length-1) totalResult += getStructure().direction + "\t";
}
else totalResult += "\n\tDUP\n";
}
}
return totalResult;
}
/*
* MRH 23MAR2010:
* Method not used in RMG
*/
// //## operation toFullString()
// public String toFullString() {
// //#[ operation toFullString()
// return getStructure().toString() + getKinetics().toString() + getComments().toString();
//
//
//
// //#]
// }
//## operation toString()
public String toString(Temperature p_temperature) {
//#[ operation toString()
String string2return = "";
Kinetics[] k = getKinetics();
for (int numKinetics=0; numKinetics<k.length; ++numKinetics) {
string2return += getStructure().toString() + "\t";
string2return += k[numKinetics].toChemkinString(calculateHrxn(p_temperature),p_temperature,false);
if (k.length > 1) string2return += "\n";
}
return string2return;
}
/*
* MRH 23MAR2010:
* This method is redundant to toString()
*/
//10/26/07 gmagoon: changed to take temperature as parameter (required changing function name from toString to reactionToString
// public String reactionToString(Temperature p_temperature) {
// // public String toString() {
// //#[ operation toString()
// // Temperature p_temperature = Global.temperature;
// Kinetics k = getKinetics();
// String kString = k.toChemkinString(calculateHrxn(p_temperature),p_temperature,false);
//
// return getStructure().toString() + '\t' + kString;
// //#]
// }
public static double getBIMOLECULAR_RATE_UPPER() {
return BIMOLECULAR_RATE_UPPER;
}
public static double getUNIMOLECULAR_RATE_UPPER() {
return UNIMOLECULAR_RATE_UPPER;
}
public void setComments(String p_comments) {
comments = p_comments;
}
/**
* Returns the reverse reaction of this reaction. If there is no reverse reaction present
* then a null object is returned.
* @return
*/
public Reaction getReverseReaction() {
return reverseReaction;
}
public void setKinetics(Kinetics p_kinetics, int k_index) {
if (p_kinetics == null) {
kinetics = null;
}
else {
kinetics[k_index] = p_kinetics;
}
}
public void addAdditionalKinetics(Kinetics p_kinetics, int red) {
if (finalized)
return;
if (p_kinetics == null)
return;
if (kinetics == null){
+ kinetics = new Kinetics[1];
kinetics[0] = p_kinetics;
structure.redundancy = 1;
}
else {
boolean kineticsAlreadyPresent = false;
for (int numKinetics=0; numKinetics<kinetics.length; ++numKinetics) {
if (kinetics[numKinetics].equals(p_kinetics)) {
structure.increaseRedundancy(red);
kineticsAlreadyPresent = true;
}
}
if (!kineticsAlreadyPresent) {
Kinetics[] tempKinetics = kinetics;
kinetics = new Kinetics[tempKinetics.length+1];
for (int i=0; i<tempKinetics.length; i++) {
kinetics[i] = tempKinetics[i];
}
kinetics[kinetics.length-1] = p_kinetics;
structure.redundancy = 1;
}
}
/*
* MRH 24MAR2010:
* Commented out. As RMG will be able to handle more than 2 Kinetics
* per reaction, the code below is no longer necessary
*/
//10/29/07 gmagoon: changed to use Global.highTemperature, Global.lowTemperature (versus Global.temperature); apparently this function chooses the top two rates when there are multiple reactions with same reactants and products; the reactions with the top two rates are used; use of high and low temperatures would be less than ideal in cases where temperature of system changes over the course of reaction
//10/31/07 gmagoon: it is assumed that two rate constants vs. temperature cross each other at most one time over the temperature range of interest
//if there at least three different reactions/rates and rate crossings/intersections occur, the two rates used are based on the lowest simulation temperature and a warning is displayed
// else if (additionalKinetics == null){
// if (p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)){
// if (p_kinetics.calculateRate(Global.highTemperature) < kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = true;
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// structure.redundancy = 1;
// }
// else{
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = true;
// additionalKinetics = p_kinetics;
// }
// }
// else if (additionalKinetics.equals(p_kinetics))
// return;
// else {
// if(ratesForKineticsAndAdditionalKineticsCross){
// if(p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)){
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = false;
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// }
// else if (p_kinetics.calculateRate(Global.lowTemperature) < additionalKinetics.calculateRate(Global.lowTemperature)){
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else{//else p_kinetics @ low temperature is between kinetics and additional kinetics at low temperature
// if(p_kinetics.calculateRate(Global.highTemperature) < kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = false;
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// }
// else{
// if ((p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)) && (p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() ); //10/29/07 gmagoon: note that I have moved this before reassignment of variables; I think this was a minor bug in original code
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// }
// else if ((p_kinetics.calculateRate(Global.lowTemperature) < additionalKinetics.calculateRate(Global.lowTemperature))&&(p_kinetics.calculateRate(Global.highTemperature) < additionalKinetics.calculateRate(Global.highTemperature))){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else if ((p_kinetics.calculateRate(Global.lowTemperature) > additionalKinetics.calculateRate(Global.lowTemperature))&&(p_kinetics.calculateRate(Global.highTemperature) > additionalKinetics.calculateRate(Global.highTemperature))&&(p_kinetics.calculateRate(Global.lowTemperature) < kinetics.calculateRate(Global.lowTemperature))&&(p_kinetics.calculateRate(Global.highTemperature) < kinetics.calculateRate(Global.highTemperature))){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// else //else there is at least one crossing in the temperature range of interest between p_kinetics and either kinetics or additionalKinetics; base which reaction is kept on the lowest temperature
// {
// if(p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)){
// if(p_kinetics.calculateRate(Global.highTemperature) < additionalKinetics.calculateRate(Global.highTemperature))
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// ratesForKineticsAndAdditionalKineticsCross = true;
// }
// else if(p_kinetics.calculateRate(Global.lowTemperature) < additionalKinetics.calculateRate(Global.lowTemperature)){
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else //else p_kinetics at low temperature is between kinetics and additional kinetics at low temperature
// {
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = true;
// else//else p_kinetics crosses additional kinetics
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// }
// }
// }
// else if (additionalKinetics == null){
// if (p_kinetics.calculateRate(Global.temperature) > kinetics.calculateRate(Global.temperature)){
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// structure.redundancy = 1;
// }
// else additionalKinetics = p_kinetics;
// }
// else if (additionalKinetics.equals(p_kinetics))
// return;
// else {
// if (p_kinetics.calculateRate(Global.temperature) > kinetics.calculateRate(Global.temperature)){
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
//
// }
// else if (p_kinetics.calculateRate(Global.temperature) < additionalKinetics.calculateRate(Global.temperature)){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else {
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// }
}
/*
* MRH 18MAR2010:
* A reaction's kinetics is now an array. The additionalKinetics is now
* obsolete and this method will be removed (to ensure nothing calls it)
*/
// public boolean hasAdditionalKinetics(){
// return (additionalKinetics != null);
// }
//public int totalNumberOfKinetics(){ //7/26/09 gmagoon: this is not used, and appears to incorrectly assume that there are a maximum of two kinetics...I think this was old and I have changed it since
// if (hasAdditionalKinetics())
// return 2;
// else
// return 1;
//}
/*
* MRH 18MAR2010:
* Restructuring a reaction's kinetics
* With a reaction's kinetics now being defined as an array of Kinetics,
* instead of "kinetics" and "additionalKinetics", the getAllKinetics()
* method is now obsolete.
*/
// public HashSet getAllKinetics(){
// HashSet allKinetics = new HashSet();
// allKinetics.add(kinetics.multiply(structure.redundancy));
// if ( hasAdditionalKinetics()){
// allKinetics.add(additionalKinetics.multiply(structure.redundancy));
//
// }
//
// return allKinetics;
// }
public void setFinalized(boolean p_finalized) {
finalized = p_finalized;
return;
}
public Structure getStructure() {
return structure;
}
public void setStructure(Structure p_Structure) {
structure = p_Structure;
}
/**
* Returns the reaction as an ASCII string.
* @return A string representing the reaction equation in ASCII test.
*/
@Override
public String toString() {
if (getReactantNumber() == 0 || getProductNumber() == 0)
return "";
String rxn = "";
Species species = (Species) structure.getReactantList().get(0);
rxn = rxn + species.getName() + "(" + Integer.toString(species.getID()) + ")";
for (int i = 1; i < getReactantNumber(); i++) {
species = (Species) structure.getReactantList().get(i);
rxn += " + " + species.getName() + "(" + Integer.toString(species.getID()) + ")";
}
rxn += " --> ";
species = (Species) structure.getProductList().get(0);
rxn = rxn + species.getName() + "(" + Integer.toString(species.getID()) + ")";
for (int i = 1; i < getProductNumber(); i++) {
species = (Species) structure.getProductList().get(i);
rxn += " + " + species.getName() + "(" + Integer.toString(species.getID()) + ")";
}
return rxn;
}
public String toInChIString() {
if (getReactantNumber() == 0 || getProductNumber() == 0)
return "";
String rxn = "";
Species species = (Species) structure.getReactantList().get(0);
rxn = rxn + species.getInChI();
for (int i = 1; i < getReactantNumber(); i++) {
species = (Species) structure.getReactantList().get(i);
rxn += " + " + species.getInChI();
}
rxn += " --> ";
species = (Species) structure.getProductList().get(0);
rxn = rxn + species.getInChI();
for (int i = 1; i < getProductNumber(); i++) {
species = (Species) structure.getProductList().get(i);
rxn += " + " + species.getInChI();
}
return rxn;
}
/**
* Calculates the flux of this reaction given the provided system snapshot.
* The system snapshot contains the temperature, pressure, and
* concentrations of each core species.
* @param ss The system snapshot at which to determine the reaction flux
* @return The determined reaction flux
*/
public double calculateFlux(SystemSnapshot ss) {
return calculateForwardFlux(ss) - calculateReverseFlux(ss);
}
/**
* Calculates the forward flux of this reaction given the provided system snapshot.
* The system snapshot contains the temperature, pressure, and
* concentrations of each core species.
* @param ss The system snapshot at which to determine the reaction flux
* @return The determined reaction flux
*/
public double calculateForwardFlux(SystemSnapshot ss) {
Temperature T = ss.getTemperature();
double forwardFlux = getRateConstant(T);
for (ListIterator<Species> iter = getReactants(); iter.hasNext(); ) {
Species spe = iter.next();
double conc = 0.0;
if (ss.getSpeciesStatus(spe) != null)
conc = ss.getSpeciesStatus(spe).getConcentration();
if (conc < 0) {
double aTol = ReactionModelGenerator.getAtol();
//if (Math.abs(conc) < aTol) conc = 0;
//else throw new NegativeConcentrationException(spe.getName() + ": " + String.valueOf(conc));
if (conc < -100.0 * aTol)
throw new NegativeConcentrationException("Species " + spe.getName() + " has negative concentration: " + String.valueOf(conc));
}
forwardFlux *= conc;
}
return forwardFlux;
}
/**
* Calculates the flux of this reaction given the provided system snapshot.
* The system snapshot contains the temperature, pressure, and
* concentrations of each core species.
* @param ss The system snapshot at which to determine the reaction flux
* @return The determined reaction flux
*/
public double calculateReverseFlux(SystemSnapshot ss) {
if (hasReverseReaction())
return reverseReaction.calculateForwardFlux(ss);
else
return 0.0;
}
public boolean isFromPrimaryReactionLibrary() {
return kineticsFromPrimaryReactionLibrary;
}
public void setIsFromPrimaryReactionLibrary(boolean p_boolean) {
kineticsFromPrimaryReactionLibrary = p_boolean;
}
public ReactionTemplate getReactionTemplate() {
return rxnTemplate;
}
public boolean hasMultipleKinetics() {
if (getKinetics().length > 1) return true;
else return false;
}
}
/*********************************************************************
File Path : RMG\RMG\jing\rxn\Reaction.java
*********************************************************************/
| true | true | public void addAdditionalKinetics(Kinetics p_kinetics, int red) {
if (finalized)
return;
if (p_kinetics == null)
return;
if (kinetics == null){
kinetics[0] = p_kinetics;
structure.redundancy = 1;
}
else {
boolean kineticsAlreadyPresent = false;
for (int numKinetics=0; numKinetics<kinetics.length; ++numKinetics) {
if (kinetics[numKinetics].equals(p_kinetics)) {
structure.increaseRedundancy(red);
kineticsAlreadyPresent = true;
}
}
if (!kineticsAlreadyPresent) {
Kinetics[] tempKinetics = kinetics;
kinetics = new Kinetics[tempKinetics.length+1];
for (int i=0; i<tempKinetics.length; i++) {
kinetics[i] = tempKinetics[i];
}
kinetics[kinetics.length-1] = p_kinetics;
structure.redundancy = 1;
}
}
/*
* MRH 24MAR2010:
* Commented out. As RMG will be able to handle more than 2 Kinetics
* per reaction, the code below is no longer necessary
*/
//10/29/07 gmagoon: changed to use Global.highTemperature, Global.lowTemperature (versus Global.temperature); apparently this function chooses the top two rates when there are multiple reactions with same reactants and products; the reactions with the top two rates are used; use of high and low temperatures would be less than ideal in cases where temperature of system changes over the course of reaction
//10/31/07 gmagoon: it is assumed that two rate constants vs. temperature cross each other at most one time over the temperature range of interest
//if there at least three different reactions/rates and rate crossings/intersections occur, the two rates used are based on the lowest simulation temperature and a warning is displayed
// else if (additionalKinetics == null){
// if (p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)){
// if (p_kinetics.calculateRate(Global.highTemperature) < kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = true;
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// structure.redundancy = 1;
// }
// else{
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = true;
// additionalKinetics = p_kinetics;
// }
// }
// else if (additionalKinetics.equals(p_kinetics))
// return;
// else {
// if(ratesForKineticsAndAdditionalKineticsCross){
// if(p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)){
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = false;
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// }
// else if (p_kinetics.calculateRate(Global.lowTemperature) < additionalKinetics.calculateRate(Global.lowTemperature)){
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else{//else p_kinetics @ low temperature is between kinetics and additional kinetics at low temperature
// if(p_kinetics.calculateRate(Global.highTemperature) < kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = false;
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// }
// else{
// if ((p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)) && (p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() ); //10/29/07 gmagoon: note that I have moved this before reassignment of variables; I think this was a minor bug in original code
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// }
// else if ((p_kinetics.calculateRate(Global.lowTemperature) < additionalKinetics.calculateRate(Global.lowTemperature))&&(p_kinetics.calculateRate(Global.highTemperature) < additionalKinetics.calculateRate(Global.highTemperature))){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else if ((p_kinetics.calculateRate(Global.lowTemperature) > additionalKinetics.calculateRate(Global.lowTemperature))&&(p_kinetics.calculateRate(Global.highTemperature) > additionalKinetics.calculateRate(Global.highTemperature))&&(p_kinetics.calculateRate(Global.lowTemperature) < kinetics.calculateRate(Global.lowTemperature))&&(p_kinetics.calculateRate(Global.highTemperature) < kinetics.calculateRate(Global.highTemperature))){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// else //else there is at least one crossing in the temperature range of interest between p_kinetics and either kinetics or additionalKinetics; base which reaction is kept on the lowest temperature
// {
// if(p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)){
// if(p_kinetics.calculateRate(Global.highTemperature) < additionalKinetics.calculateRate(Global.highTemperature))
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// ratesForKineticsAndAdditionalKineticsCross = true;
// }
// else if(p_kinetics.calculateRate(Global.lowTemperature) < additionalKinetics.calculateRate(Global.lowTemperature)){
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else //else p_kinetics at low temperature is between kinetics and additional kinetics at low temperature
// {
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = true;
// else//else p_kinetics crosses additional kinetics
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// }
// }
// }
// else if (additionalKinetics == null){
// if (p_kinetics.calculateRate(Global.temperature) > kinetics.calculateRate(Global.temperature)){
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// structure.redundancy = 1;
// }
// else additionalKinetics = p_kinetics;
// }
// else if (additionalKinetics.equals(p_kinetics))
// return;
// else {
// if (p_kinetics.calculateRate(Global.temperature) > kinetics.calculateRate(Global.temperature)){
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
//
// }
// else if (p_kinetics.calculateRate(Global.temperature) < additionalKinetics.calculateRate(Global.temperature)){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else {
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// }
}
| public void addAdditionalKinetics(Kinetics p_kinetics, int red) {
if (finalized)
return;
if (p_kinetics == null)
return;
if (kinetics == null){
kinetics = new Kinetics[1];
kinetics[0] = p_kinetics;
structure.redundancy = 1;
}
else {
boolean kineticsAlreadyPresent = false;
for (int numKinetics=0; numKinetics<kinetics.length; ++numKinetics) {
if (kinetics[numKinetics].equals(p_kinetics)) {
structure.increaseRedundancy(red);
kineticsAlreadyPresent = true;
}
}
if (!kineticsAlreadyPresent) {
Kinetics[] tempKinetics = kinetics;
kinetics = new Kinetics[tempKinetics.length+1];
for (int i=0; i<tempKinetics.length; i++) {
kinetics[i] = tempKinetics[i];
}
kinetics[kinetics.length-1] = p_kinetics;
structure.redundancy = 1;
}
}
/*
* MRH 24MAR2010:
* Commented out. As RMG will be able to handle more than 2 Kinetics
* per reaction, the code below is no longer necessary
*/
//10/29/07 gmagoon: changed to use Global.highTemperature, Global.lowTemperature (versus Global.temperature); apparently this function chooses the top two rates when there are multiple reactions with same reactants and products; the reactions with the top two rates are used; use of high and low temperatures would be less than ideal in cases where temperature of system changes over the course of reaction
//10/31/07 gmagoon: it is assumed that two rate constants vs. temperature cross each other at most one time over the temperature range of interest
//if there at least three different reactions/rates and rate crossings/intersections occur, the two rates used are based on the lowest simulation temperature and a warning is displayed
// else if (additionalKinetics == null){
// if (p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)){
// if (p_kinetics.calculateRate(Global.highTemperature) < kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = true;
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// structure.redundancy = 1;
// }
// else{
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = true;
// additionalKinetics = p_kinetics;
// }
// }
// else if (additionalKinetics.equals(p_kinetics))
// return;
// else {
// if(ratesForKineticsAndAdditionalKineticsCross){
// if(p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)){
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = false;
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// }
// else if (p_kinetics.calculateRate(Global.lowTemperature) < additionalKinetics.calculateRate(Global.lowTemperature)){
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else{//else p_kinetics @ low temperature is between kinetics and additional kinetics at low temperature
// if(p_kinetics.calculateRate(Global.highTemperature) < kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = false;
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// }
// else{
// if ((p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)) && (p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() ); //10/29/07 gmagoon: note that I have moved this before reassignment of variables; I think this was a minor bug in original code
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// }
// else if ((p_kinetics.calculateRate(Global.lowTemperature) < additionalKinetics.calculateRate(Global.lowTemperature))&&(p_kinetics.calculateRate(Global.highTemperature) < additionalKinetics.calculateRate(Global.highTemperature))){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else if ((p_kinetics.calculateRate(Global.lowTemperature) > additionalKinetics.calculateRate(Global.lowTemperature))&&(p_kinetics.calculateRate(Global.highTemperature) > additionalKinetics.calculateRate(Global.highTemperature))&&(p_kinetics.calculateRate(Global.lowTemperature) < kinetics.calculateRate(Global.lowTemperature))&&(p_kinetics.calculateRate(Global.highTemperature) < kinetics.calculateRate(Global.highTemperature))){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// else //else there is at least one crossing in the temperature range of interest between p_kinetics and either kinetics or additionalKinetics; base which reaction is kept on the lowest temperature
// {
// if(p_kinetics.calculateRate(Global.lowTemperature) > kinetics.calculateRate(Global.lowTemperature)){
// if(p_kinetics.calculateRate(Global.highTemperature) < additionalKinetics.calculateRate(Global.highTemperature))
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// ratesForKineticsAndAdditionalKineticsCross = true;
// }
// else if(p_kinetics.calculateRate(Global.lowTemperature) < additionalKinetics.calculateRate(Global.lowTemperature)){
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else //else p_kinetics at low temperature is between kinetics and additional kinetics at low temperature
// {
// if(p_kinetics.calculateRate(Global.highTemperature) > kinetics.calculateRate(Global.highTemperature))
// ratesForKineticsAndAdditionalKineticsCross = true;
// else//else p_kinetics crosses additional kinetics
// System.out.println("WARNING: reaction that may be significant at higher temperatures within the provided range is being neglected; see following for details:");
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// }
// }
// }
// else if (additionalKinetics == null){
// if (p_kinetics.calculateRate(Global.temperature) > kinetics.calculateRate(Global.temperature)){
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// structure.redundancy = 1;
// }
// else additionalKinetics = p_kinetics;
// }
// else if (additionalKinetics.equals(p_kinetics))
// return;
// else {
// if (p_kinetics.calculateRate(Global.temperature) > kinetics.calculateRate(Global.temperature)){
// additionalKinetics = kinetics;
// kinetics = p_kinetics;
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
//
// }
// else if (p_kinetics.calculateRate(Global.temperature) < additionalKinetics.calculateRate(Global.temperature)){
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + p_kinetics.toString() );
// }
// else {
// System.out.println("More than 2 kinetics provided for reaction " + structure.toChemkinString(true));
// System.out.println("Ignoring the rate constant " + additionalKinetics.toString() );
// additionalKinetics = p_kinetics;
// }
// }
}
|
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
index a1de56675..0bf77a9d4 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
@@ -1,525 +1,527 @@
/* -*- compile-command: "cd ../../../../../../; ant install"; -*- */
/*
* Copyright 2009-2010 by Eric House ([email protected]). All
* rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package org.eehouse.android.xw4.jni;
import org.eehouse.android.xw4.Utils;
import android.content.Context;
import java.lang.InterruptedException;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.Iterator;
import android.os.Handler;
import android.os.Message;
import android.graphics.Paint;
import android.graphics.Rect;
import org.eehouse.android.xw4.R;
import org.eehouse.android.xw4.BoardDims;
import org.eehouse.android.xw4.GameUtils;
import org.eehouse.android.xw4.DBUtils;
import org.eehouse.android.xw4.Toolbar;
import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole;
public class JNIThread extends Thread {
public enum JNICmd { CMD_NONE,
CMD_DRAW,
CMD_LAYOUT,
CMD_START,
CMD_SWITCHCLIENT,
CMD_RESET,
CMD_SAVE,
CMD_DO,
CMD_RECEIVE,
CMD_TRANSFAIL,
CMD_PREFS_CHANGE,
CMD_PEN_DOWN,
CMD_PEN_MOVE,
CMD_PEN_UP,
CMD_KEYDOWN,
CMD_KEYUP,
CMD_TIMER_FIRED,
CMD_COMMIT,
CMD_JUGGLE,
CMD_FLIP,
CMD_TOGGLE_TRAY,
CMD_TOGGLE_TRADE,
CMD_UNDO_CUR,
CMD_UNDO_LAST,
CMD_HINT,
CMD_ZOOM,
CMD_TOGGLEZOOM,
CMD_PREV_HINT,
CMD_NEXT_HINT,
CMD_VALUES,
CMD_COUNTS_VALUES,
CMD_REMAINING,
CMD_RESEND,
CMD_HISTORY,
CMD_FINAL,
CMD_ENDGAME,
CMD_POST_OVER,
CMD_SENDCHAT,
CMD_DRAW_CONNS_STATUS,
};
public static final int RUNNING = 1;
public static final int DRAW = 2;
public static final int DIALOG = 3;
public static final int QUERY_ENDGAME = 4;
public static final int TOOLBAR_STATES = 5;
private boolean m_stopped = false;
private int m_jniGamePtr;
private String m_path;
private Context m_context;
private CurGameInfo m_gi;
private Handler m_handler;
private SyncedDraw m_drawer;
private static final int kMinDivWidth = 10;
private Rect m_connsIconRect;
private int m_connsIconID = 0;
private boolean m_inBack = false;
LinkedBlockingQueue<QueueElem> m_queue;
private class QueueElem {
protected QueueElem( JNICmd cmd, boolean isUI, Object[] args )
{
m_cmd = cmd; m_isUIEvent = isUI; m_args = args;
}
boolean m_isUIEvent;
JNICmd m_cmd;
Object[] m_args;
}
public JNIThread( int gamePtr, CurGameInfo gi, SyncedDraw drawer,
String path, Context context, Handler handler )
{
m_jniGamePtr = gamePtr;
m_gi = gi;
m_drawer = drawer;
m_path = path;
m_context = context;
m_handler = handler;
m_queue = new LinkedBlockingQueue<QueueElem>();
}
public void waitToStop() {
m_stopped = true;
handle( JNICmd.CMD_NONE ); // tickle it
try {
join(200); // wait up to 2/10 second
} catch ( java.lang.InterruptedException ie ) {
Utils.logf( "got InterruptedException: " + ie.toString() );
}
}
public boolean busy()
{ // synchronize this!!!
boolean result = false;
Iterator<QueueElem> iter = m_queue.iterator();
while ( iter.hasNext() ) {
if ( iter.next().m_isUIEvent ) {
result = true;
break;
}
}
return result;
}
public void setInBackground( boolean inBack )
{
m_inBack = inBack;
if ( inBack ) {
handle( JNICmd.CMD_SAVE );
}
}
private boolean toggleTray() {
boolean draw;
int state = XwJNI.board_getTrayVisState( m_jniGamePtr );
if ( state == XwJNI.TRAY_REVEALED ) {
draw = XwJNI.board_hideTray( m_jniGamePtr );
} else {
draw = XwJNI.board_showTray( m_jniGamePtr );
}
return draw;
}
private void sendForDialog( int titleArg, String text )
{
Message.obtain( m_handler, DIALOG, titleArg, 0, text ).sendToTarget();
}
private void doLayout( BoardDims dims )
{
int scoreWidth = dims.width;
if ( DeviceRole.SERVER_STANDALONE != m_gi.serverRole ) {
scoreWidth -= dims.cellSize;
m_connsIconRect =
new Rect( scoreWidth, 0, scoreWidth + dims.cellSize,
dims.cellSize );
}
if ( m_gi.timerEnabled ) {
scoreWidth -= dims.timerWidth;
XwJNI.board_setTimerLoc( m_jniGamePtr, scoreWidth, 0,
dims.timerWidth, dims.scoreHt );
}
XwJNI.board_setScoreboardLoc( m_jniGamePtr, 0, 0, scoreWidth,
dims.scoreHt, true );
XwJNI.board_setPos( m_jniGamePtr, 0, dims.scoreHt,
dims.width-1, dims.boardHt, dims.maxCellSize,
false );
XwJNI.board_setTrayLoc( m_jniGamePtr, 0, dims.trayTop,
dims.width-1, dims.trayHt, kMinDivWidth );
XwJNI.board_invalAll( m_jniGamePtr );
}
private boolean nextSame( JNICmd cmd )
{
QueueElem nextElem = m_queue.peek();
return null != nextElem && nextElem.m_cmd == cmd;
}
private boolean processKeyEvent( JNICmd cmd, XwJNI.XP_Key xpKey,
boolean[] barr )
{
boolean draw = false;
return draw;
} // processKeyEvent
private void checkButtons()
{
int visTileCount = XwJNI.board_visTileCount( m_jniGamePtr );
int canFlip = visTileCount > 1 ? 1 : 0;
Message.obtain( m_handler, TOOLBAR_STATES, Toolbar.BUTTON_FLIP,
canFlip ).sendToTarget();
int canValues = visTileCount > 0 ? 1 : 0;
Message.obtain( m_handler, TOOLBAR_STATES, Toolbar.BUTTON_VALUES,
canValues ).sendToTarget();
int canShuffle = XwJNI.board_canShuffle( m_jniGamePtr ) ? 1 : 0;
Message.obtain( m_handler, TOOLBAR_STATES, Toolbar.BUTTON_JUGGLE,
canShuffle ).sendToTarget();
int canRedo = XwJNI.board_canTogglePending( m_jniGamePtr ) ? 1 : 0;
Message.obtain( m_handler, TOOLBAR_STATES, Toolbar.BUTTON_UNDO,
canRedo ).sendToTarget();
int canHint = XwJNI.board_canHint( m_jniGamePtr ) ? 1 : 0;
Message.obtain( m_handler, TOOLBAR_STATES, Toolbar.BUTTON_HINT_PREV,
canHint ).sendToTarget();
Message.obtain( m_handler, TOOLBAR_STATES, Toolbar.BUTTON_HINT_NEXT,
canHint ).sendToTarget();
}
public void run()
{
boolean[] barr = new boolean[2]; // scratch boolean
while ( !m_stopped ) {
QueueElem elem;
Object[] args;
try {
elem = m_queue.take();
} catch ( InterruptedException ie ) {
Utils.logf( "interrupted; killing thread" );
break;
}
boolean draw = false;
args = elem.m_args;
switch( elem.m_cmd ) {
case CMD_SAVE:
if ( nextSame( JNICmd.CMD_SAVE ) ) {
continue;
}
GameSummary summary = new GameSummary();
XwJNI.game_summarize( m_jniGamePtr, m_gi.nPlayers, summary );
byte[] state = XwJNI.game_saveToStream( m_jniGamePtr, null );
GameUtils.saveGame( m_context, state, m_path );
DBUtils.saveSummary( m_path, summary );
break;
case CMD_DRAW:
if ( nextSame( JNICmd.CMD_DRAW ) ) {
continue;
}
draw = true;
break;
case CMD_LAYOUT:
doLayout( (BoardDims)args[0] );
draw = true;
// check and disable zoom button at limit
handle( JNICmd.CMD_ZOOM, 0 );
break;
case CMD_RESET:
XwJNI.comms_resetSame( m_jniGamePtr );
// FALLTHRU
case CMD_START:
XwJNI.comms_start( m_jniGamePtr );
if ( m_gi.serverRole == DeviceRole.SERVER_ISCLIENT ) {
XwJNI.server_initClientConnection( m_jniGamePtr );
}
draw = XwJNI.server_do( m_jniGamePtr );
break;
case CMD_SWITCHCLIENT:
XwJNI.server_reset( m_jniGamePtr );
XwJNI.server_initClientConnection( m_jniGamePtr );
draw = XwJNI.server_do( m_jniGamePtr );
break;
case CMD_DO:
if ( nextSame( JNICmd.CMD_DO ) ) {
continue;
}
draw = XwJNI.server_do( m_jniGamePtr );
break;
case CMD_RECEIVE:
draw = XwJNI.game_receiveMessage( m_jniGamePtr,
(byte[])args[0] );
handle( JNICmd.CMD_DO );
if ( m_inBack ) {
handle( JNICmd.CMD_SAVE );
}
break;
case CMD_TRANSFAIL:
XwJNI.comms_transportFailed( m_jniGamePtr );
break;
case CMD_PREFS_CHANGE:
// need to inval all because some of prefs,
// e.g. colors, aren't known by common code so
// board_prefsChanged's return value isn't enough.
XwJNI.board_invalAll( m_jniGamePtr );
XwJNI.board_server_prefsChanged( m_jniGamePtr,
CommonPrefs.get( m_context ) );
draw = true;
break;
case CMD_PEN_DOWN:
draw = XwJNI.board_handlePenDown( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue(),
barr );
break;
case CMD_PEN_MOVE:
if ( nextSame( JNICmd.CMD_PEN_MOVE ) ) {
continue;
}
draw = XwJNI.board_handlePenMove( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue() );
break;
case CMD_PEN_UP:
draw = XwJNI.board_handlePenUp( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue() );
break;
case CMD_KEYDOWN:
case CMD_KEYUP:
draw = processKeyEvent( elem.m_cmd, (XwJNI.XP_Key)args[0], barr );
break;
case CMD_COMMIT:
draw = XwJNI.board_commitTurn( m_jniGamePtr );
break;
case CMD_JUGGLE:
draw = XwJNI.board_juggleTray( m_jniGamePtr );
break;
case CMD_FLIP:
draw = XwJNI.board_flip( m_jniGamePtr );
break;
case CMD_TOGGLE_TRAY:
draw = toggleTray();
break;
case CMD_TOGGLE_TRADE:
draw = XwJNI.board_beginTrade( m_jniGamePtr );
break;
case CMD_UNDO_CUR:
draw = XwJNI.board_replaceTiles( m_jniGamePtr )
|| XwJNI.board_redoReplacedTiles( m_jniGamePtr );
break;
case CMD_UNDO_LAST:
XwJNI.server_handleUndo( m_jniGamePtr );
draw = true;
break;
case CMD_HINT:
XwJNI.board_resetEngine( m_jniGamePtr );
handle( JNICmd.CMD_NEXT_HINT );
break;
case CMD_NEXT_HINT:
case CMD_PREV_HINT:
if ( nextSame( elem.m_cmd ) ) {
continue;
}
draw = XwJNI.board_requestHint( m_jniGamePtr, false,
JNICmd.CMD_PREV_HINT==elem.m_cmd,
barr );
if ( barr[0] ) {
handle( elem.m_cmd );
draw = false;
}
break;
case CMD_TOGGLEZOOM:
XwJNI.board_zoom( m_jniGamePtr, 0 , barr );
int zoomBy = 0;
if ( barr[1] ) { // always go out if possible
zoomBy = -4;
} else if ( barr[0] ) {
zoomBy = 4;
}
draw = XwJNI.board_zoom( m_jniGamePtr, zoomBy, barr );
break;
case CMD_ZOOM:
draw = XwJNI.board_zoom( m_jniGamePtr,
((Integer)args[0]).intValue(),
barr );
break;
case CMD_VALUES:
draw = XwJNI.board_toggle_showValues( m_jniGamePtr );
break;
case CMD_COUNTS_VALUES:
sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.server_formatDictCounts( m_jniGamePtr, 3 )
);
break;
case CMD_REMAINING:
sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.board_formatRemainingTiles( m_jniGamePtr )
);
break;
case CMD_RESEND:
XwJNI.comms_resendAll( m_jniGamePtr );
break;
case CMD_HISTORY:
boolean gameOver = XwJNI.server_getGameIsOver( m_jniGamePtr );
sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.model_writeGameHistory( m_jniGamePtr,
gameOver ) );
break;
case CMD_FINAL:
if ( XwJNI.server_getGameIsOver( m_jniGamePtr ) ) {
handle( JNICmd.CMD_POST_OVER );
} else {
Message.obtain( m_handler, QUERY_ENDGAME ).sendToTarget();
}
break;
case CMD_ENDGAME:
XwJNI.server_endGame( m_jniGamePtr );
draw = true;
break;
case CMD_POST_OVER:
- sendForDialog( R.string.finalscores_title,
- XwJNI.server_writeFinalScores( m_jniGamePtr ) );
+ if ( XwJNI.server_getGameIsOver( m_jniGamePtr ) ) {
+ sendForDialog( R.string.finalscores_title,
+ XwJNI.server_writeFinalScores( m_jniGamePtr ) );
+ }
break;
case CMD_SENDCHAT:
XwJNI.server_sendChat( m_jniGamePtr, (String)args[0] );
break;
case CMD_DRAW_CONNS_STATUS:
int newID = 0;
switch( (TransportProcs.CommsRelayState)(args[0]) ) {
case COMMS_RELAYSTATE_UNCONNECTED:
case COMMS_RELAYSTATE_DENIED:
case COMMS_RELAYSTATE_CONNECT_PENDING:
newID = R.drawable.netarrow_unconn;
break;
case COMMS_RELAYSTATE_CONNECTED:
case COMMS_RELAYSTATE_RECONNECTED:
newID = R.drawable.netarrow_someconn;
break;
case COMMS_RELAYSTATE_ALLCONNECTED:
newID = R.drawable.netarrow_allconn;
break;
default:
newID = 0;
}
if ( m_connsIconID != newID ) {
draw = true;
m_connsIconID = newID;
}
break;
case CMD_TIMER_FIRED:
draw = XwJNI.timerFired( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue(),
((Integer)args[2]).intValue() );
break;
}
if ( draw ) {
// do the drawing in this thread but in BoardView
// where it can be synchronized with that class's use
// of the same bitmap for blitting.
m_drawer.doJNIDraw();
if ( null != m_connsIconRect ) {
m_drawer.doIconDraw( m_connsIconID, m_connsIconRect );
}
// main UI thread has to invalidate view as it created
// it.
Message.obtain( m_handler, DRAW ).sendToTarget();
checkButtons();
}
}
Utils.logf( "run exiting" );
} // run
public void handle( JNICmd cmd, boolean isUI, Object... args )
{
QueueElem elem = new QueueElem( cmd, isUI, args );
// Utils.logf( "adding: " + cmd.toString() );
m_queue.add( elem );
}
public void handle( JNICmd cmd, Object... args )
{
handle( cmd, true, args );
}
}
| true | true | public void run()
{
boolean[] barr = new boolean[2]; // scratch boolean
while ( !m_stopped ) {
QueueElem elem;
Object[] args;
try {
elem = m_queue.take();
} catch ( InterruptedException ie ) {
Utils.logf( "interrupted; killing thread" );
break;
}
boolean draw = false;
args = elem.m_args;
switch( elem.m_cmd ) {
case CMD_SAVE:
if ( nextSame( JNICmd.CMD_SAVE ) ) {
continue;
}
GameSummary summary = new GameSummary();
XwJNI.game_summarize( m_jniGamePtr, m_gi.nPlayers, summary );
byte[] state = XwJNI.game_saveToStream( m_jniGamePtr, null );
GameUtils.saveGame( m_context, state, m_path );
DBUtils.saveSummary( m_path, summary );
break;
case CMD_DRAW:
if ( nextSame( JNICmd.CMD_DRAW ) ) {
continue;
}
draw = true;
break;
case CMD_LAYOUT:
doLayout( (BoardDims)args[0] );
draw = true;
// check and disable zoom button at limit
handle( JNICmd.CMD_ZOOM, 0 );
break;
case CMD_RESET:
XwJNI.comms_resetSame( m_jniGamePtr );
// FALLTHRU
case CMD_START:
XwJNI.comms_start( m_jniGamePtr );
if ( m_gi.serverRole == DeviceRole.SERVER_ISCLIENT ) {
XwJNI.server_initClientConnection( m_jniGamePtr );
}
draw = XwJNI.server_do( m_jniGamePtr );
break;
case CMD_SWITCHCLIENT:
XwJNI.server_reset( m_jniGamePtr );
XwJNI.server_initClientConnection( m_jniGamePtr );
draw = XwJNI.server_do( m_jniGamePtr );
break;
case CMD_DO:
if ( nextSame( JNICmd.CMD_DO ) ) {
continue;
}
draw = XwJNI.server_do( m_jniGamePtr );
break;
case CMD_RECEIVE:
draw = XwJNI.game_receiveMessage( m_jniGamePtr,
(byte[])args[0] );
handle( JNICmd.CMD_DO );
if ( m_inBack ) {
handle( JNICmd.CMD_SAVE );
}
break;
case CMD_TRANSFAIL:
XwJNI.comms_transportFailed( m_jniGamePtr );
break;
case CMD_PREFS_CHANGE:
// need to inval all because some of prefs,
// e.g. colors, aren't known by common code so
// board_prefsChanged's return value isn't enough.
XwJNI.board_invalAll( m_jniGamePtr );
XwJNI.board_server_prefsChanged( m_jniGamePtr,
CommonPrefs.get( m_context ) );
draw = true;
break;
case CMD_PEN_DOWN:
draw = XwJNI.board_handlePenDown( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue(),
barr );
break;
case CMD_PEN_MOVE:
if ( nextSame( JNICmd.CMD_PEN_MOVE ) ) {
continue;
}
draw = XwJNI.board_handlePenMove( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue() );
break;
case CMD_PEN_UP:
draw = XwJNI.board_handlePenUp( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue() );
break;
case CMD_KEYDOWN:
case CMD_KEYUP:
draw = processKeyEvent( elem.m_cmd, (XwJNI.XP_Key)args[0], barr );
break;
case CMD_COMMIT:
draw = XwJNI.board_commitTurn( m_jniGamePtr );
break;
case CMD_JUGGLE:
draw = XwJNI.board_juggleTray( m_jniGamePtr );
break;
case CMD_FLIP:
draw = XwJNI.board_flip( m_jniGamePtr );
break;
case CMD_TOGGLE_TRAY:
draw = toggleTray();
break;
case CMD_TOGGLE_TRADE:
draw = XwJNI.board_beginTrade( m_jniGamePtr );
break;
case CMD_UNDO_CUR:
draw = XwJNI.board_replaceTiles( m_jniGamePtr )
|| XwJNI.board_redoReplacedTiles( m_jniGamePtr );
break;
case CMD_UNDO_LAST:
XwJNI.server_handleUndo( m_jniGamePtr );
draw = true;
break;
case CMD_HINT:
XwJNI.board_resetEngine( m_jniGamePtr );
handle( JNICmd.CMD_NEXT_HINT );
break;
case CMD_NEXT_HINT:
case CMD_PREV_HINT:
if ( nextSame( elem.m_cmd ) ) {
continue;
}
draw = XwJNI.board_requestHint( m_jniGamePtr, false,
JNICmd.CMD_PREV_HINT==elem.m_cmd,
barr );
if ( barr[0] ) {
handle( elem.m_cmd );
draw = false;
}
break;
case CMD_TOGGLEZOOM:
XwJNI.board_zoom( m_jniGamePtr, 0 , barr );
int zoomBy = 0;
if ( barr[1] ) { // always go out if possible
zoomBy = -4;
} else if ( barr[0] ) {
zoomBy = 4;
}
draw = XwJNI.board_zoom( m_jniGamePtr, zoomBy, barr );
break;
case CMD_ZOOM:
draw = XwJNI.board_zoom( m_jniGamePtr,
((Integer)args[0]).intValue(),
barr );
break;
case CMD_VALUES:
draw = XwJNI.board_toggle_showValues( m_jniGamePtr );
break;
case CMD_COUNTS_VALUES:
sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.server_formatDictCounts( m_jniGamePtr, 3 )
);
break;
case CMD_REMAINING:
sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.board_formatRemainingTiles( m_jniGamePtr )
);
break;
case CMD_RESEND:
XwJNI.comms_resendAll( m_jniGamePtr );
break;
case CMD_HISTORY:
boolean gameOver = XwJNI.server_getGameIsOver( m_jniGamePtr );
sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.model_writeGameHistory( m_jniGamePtr,
gameOver ) );
break;
case CMD_FINAL:
if ( XwJNI.server_getGameIsOver( m_jniGamePtr ) ) {
handle( JNICmd.CMD_POST_OVER );
} else {
Message.obtain( m_handler, QUERY_ENDGAME ).sendToTarget();
}
break;
case CMD_ENDGAME:
XwJNI.server_endGame( m_jniGamePtr );
draw = true;
break;
case CMD_POST_OVER:
sendForDialog( R.string.finalscores_title,
XwJNI.server_writeFinalScores( m_jniGamePtr ) );
break;
case CMD_SENDCHAT:
XwJNI.server_sendChat( m_jniGamePtr, (String)args[0] );
break;
case CMD_DRAW_CONNS_STATUS:
int newID = 0;
switch( (TransportProcs.CommsRelayState)(args[0]) ) {
case COMMS_RELAYSTATE_UNCONNECTED:
case COMMS_RELAYSTATE_DENIED:
case COMMS_RELAYSTATE_CONNECT_PENDING:
newID = R.drawable.netarrow_unconn;
break;
case COMMS_RELAYSTATE_CONNECTED:
case COMMS_RELAYSTATE_RECONNECTED:
newID = R.drawable.netarrow_someconn;
break;
case COMMS_RELAYSTATE_ALLCONNECTED:
newID = R.drawable.netarrow_allconn;
break;
default:
newID = 0;
}
if ( m_connsIconID != newID ) {
draw = true;
m_connsIconID = newID;
}
break;
case CMD_TIMER_FIRED:
draw = XwJNI.timerFired( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue(),
((Integer)args[2]).intValue() );
break;
}
if ( draw ) {
// do the drawing in this thread but in BoardView
// where it can be synchronized with that class's use
// of the same bitmap for blitting.
m_drawer.doJNIDraw();
if ( null != m_connsIconRect ) {
m_drawer.doIconDraw( m_connsIconID, m_connsIconRect );
}
// main UI thread has to invalidate view as it created
// it.
Message.obtain( m_handler, DRAW ).sendToTarget();
checkButtons();
}
}
Utils.logf( "run exiting" );
} // run
| public void run()
{
boolean[] barr = new boolean[2]; // scratch boolean
while ( !m_stopped ) {
QueueElem elem;
Object[] args;
try {
elem = m_queue.take();
} catch ( InterruptedException ie ) {
Utils.logf( "interrupted; killing thread" );
break;
}
boolean draw = false;
args = elem.m_args;
switch( elem.m_cmd ) {
case CMD_SAVE:
if ( nextSame( JNICmd.CMD_SAVE ) ) {
continue;
}
GameSummary summary = new GameSummary();
XwJNI.game_summarize( m_jniGamePtr, m_gi.nPlayers, summary );
byte[] state = XwJNI.game_saveToStream( m_jniGamePtr, null );
GameUtils.saveGame( m_context, state, m_path );
DBUtils.saveSummary( m_path, summary );
break;
case CMD_DRAW:
if ( nextSame( JNICmd.CMD_DRAW ) ) {
continue;
}
draw = true;
break;
case CMD_LAYOUT:
doLayout( (BoardDims)args[0] );
draw = true;
// check and disable zoom button at limit
handle( JNICmd.CMD_ZOOM, 0 );
break;
case CMD_RESET:
XwJNI.comms_resetSame( m_jniGamePtr );
// FALLTHRU
case CMD_START:
XwJNI.comms_start( m_jniGamePtr );
if ( m_gi.serverRole == DeviceRole.SERVER_ISCLIENT ) {
XwJNI.server_initClientConnection( m_jniGamePtr );
}
draw = XwJNI.server_do( m_jniGamePtr );
break;
case CMD_SWITCHCLIENT:
XwJNI.server_reset( m_jniGamePtr );
XwJNI.server_initClientConnection( m_jniGamePtr );
draw = XwJNI.server_do( m_jniGamePtr );
break;
case CMD_DO:
if ( nextSame( JNICmd.CMD_DO ) ) {
continue;
}
draw = XwJNI.server_do( m_jniGamePtr );
break;
case CMD_RECEIVE:
draw = XwJNI.game_receiveMessage( m_jniGamePtr,
(byte[])args[0] );
handle( JNICmd.CMD_DO );
if ( m_inBack ) {
handle( JNICmd.CMD_SAVE );
}
break;
case CMD_TRANSFAIL:
XwJNI.comms_transportFailed( m_jniGamePtr );
break;
case CMD_PREFS_CHANGE:
// need to inval all because some of prefs,
// e.g. colors, aren't known by common code so
// board_prefsChanged's return value isn't enough.
XwJNI.board_invalAll( m_jniGamePtr );
XwJNI.board_server_prefsChanged( m_jniGamePtr,
CommonPrefs.get( m_context ) );
draw = true;
break;
case CMD_PEN_DOWN:
draw = XwJNI.board_handlePenDown( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue(),
barr );
break;
case CMD_PEN_MOVE:
if ( nextSame( JNICmd.CMD_PEN_MOVE ) ) {
continue;
}
draw = XwJNI.board_handlePenMove( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue() );
break;
case CMD_PEN_UP:
draw = XwJNI.board_handlePenUp( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue() );
break;
case CMD_KEYDOWN:
case CMD_KEYUP:
draw = processKeyEvent( elem.m_cmd, (XwJNI.XP_Key)args[0], barr );
break;
case CMD_COMMIT:
draw = XwJNI.board_commitTurn( m_jniGamePtr );
break;
case CMD_JUGGLE:
draw = XwJNI.board_juggleTray( m_jniGamePtr );
break;
case CMD_FLIP:
draw = XwJNI.board_flip( m_jniGamePtr );
break;
case CMD_TOGGLE_TRAY:
draw = toggleTray();
break;
case CMD_TOGGLE_TRADE:
draw = XwJNI.board_beginTrade( m_jniGamePtr );
break;
case CMD_UNDO_CUR:
draw = XwJNI.board_replaceTiles( m_jniGamePtr )
|| XwJNI.board_redoReplacedTiles( m_jniGamePtr );
break;
case CMD_UNDO_LAST:
XwJNI.server_handleUndo( m_jniGamePtr );
draw = true;
break;
case CMD_HINT:
XwJNI.board_resetEngine( m_jniGamePtr );
handle( JNICmd.CMD_NEXT_HINT );
break;
case CMD_NEXT_HINT:
case CMD_PREV_HINT:
if ( nextSame( elem.m_cmd ) ) {
continue;
}
draw = XwJNI.board_requestHint( m_jniGamePtr, false,
JNICmd.CMD_PREV_HINT==elem.m_cmd,
barr );
if ( barr[0] ) {
handle( elem.m_cmd );
draw = false;
}
break;
case CMD_TOGGLEZOOM:
XwJNI.board_zoom( m_jniGamePtr, 0 , barr );
int zoomBy = 0;
if ( barr[1] ) { // always go out if possible
zoomBy = -4;
} else if ( barr[0] ) {
zoomBy = 4;
}
draw = XwJNI.board_zoom( m_jniGamePtr, zoomBy, barr );
break;
case CMD_ZOOM:
draw = XwJNI.board_zoom( m_jniGamePtr,
((Integer)args[0]).intValue(),
barr );
break;
case CMD_VALUES:
draw = XwJNI.board_toggle_showValues( m_jniGamePtr );
break;
case CMD_COUNTS_VALUES:
sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.server_formatDictCounts( m_jniGamePtr, 3 )
);
break;
case CMD_REMAINING:
sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.board_formatRemainingTiles( m_jniGamePtr )
);
break;
case CMD_RESEND:
XwJNI.comms_resendAll( m_jniGamePtr );
break;
case CMD_HISTORY:
boolean gameOver = XwJNI.server_getGameIsOver( m_jniGamePtr );
sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.model_writeGameHistory( m_jniGamePtr,
gameOver ) );
break;
case CMD_FINAL:
if ( XwJNI.server_getGameIsOver( m_jniGamePtr ) ) {
handle( JNICmd.CMD_POST_OVER );
} else {
Message.obtain( m_handler, QUERY_ENDGAME ).sendToTarget();
}
break;
case CMD_ENDGAME:
XwJNI.server_endGame( m_jniGamePtr );
draw = true;
break;
case CMD_POST_OVER:
if ( XwJNI.server_getGameIsOver( m_jniGamePtr ) ) {
sendForDialog( R.string.finalscores_title,
XwJNI.server_writeFinalScores( m_jniGamePtr ) );
}
break;
case CMD_SENDCHAT:
XwJNI.server_sendChat( m_jniGamePtr, (String)args[0] );
break;
case CMD_DRAW_CONNS_STATUS:
int newID = 0;
switch( (TransportProcs.CommsRelayState)(args[0]) ) {
case COMMS_RELAYSTATE_UNCONNECTED:
case COMMS_RELAYSTATE_DENIED:
case COMMS_RELAYSTATE_CONNECT_PENDING:
newID = R.drawable.netarrow_unconn;
break;
case COMMS_RELAYSTATE_CONNECTED:
case COMMS_RELAYSTATE_RECONNECTED:
newID = R.drawable.netarrow_someconn;
break;
case COMMS_RELAYSTATE_ALLCONNECTED:
newID = R.drawable.netarrow_allconn;
break;
default:
newID = 0;
}
if ( m_connsIconID != newID ) {
draw = true;
m_connsIconID = newID;
}
break;
case CMD_TIMER_FIRED:
draw = XwJNI.timerFired( m_jniGamePtr,
((Integer)args[0]).intValue(),
((Integer)args[1]).intValue(),
((Integer)args[2]).intValue() );
break;
}
if ( draw ) {
// do the drawing in this thread but in BoardView
// where it can be synchronized with that class's use
// of the same bitmap for blitting.
m_drawer.doJNIDraw();
if ( null != m_connsIconRect ) {
m_drawer.doIconDraw( m_connsIconID, m_connsIconRect );
}
// main UI thread has to invalidate view as it created
// it.
Message.obtain( m_handler, DRAW ).sendToTarget();
checkButtons();
}
}
Utils.logf( "run exiting" );
} // run
|
diff --git a/components/bio-formats/src/loci/formats/in/PDSReader.java b/components/bio-formats/src/loci/formats/in/PDSReader.java
index d9d3d1b20..4ad9e8ce6 100644
--- a/components/bio-formats/src/loci/formats/in/PDSReader.java
+++ b/components/bio-formats/src/loci/formats/in/PDSReader.java
@@ -1,284 +1,287 @@
//
// PDSReader.java
//
/*
OME Bio-Formats package for reading and converting biological file formats.
Copyright (C) 2005-@year@ UW-Madison LOCI and Glencoe Software, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package loci.formats.in;
import java.io.IOException;
import loci.common.DataTools;
import loci.common.DateTools;
import loci.common.Location;
import loci.common.RandomAccessInputStream;
import loci.formats.FormatException;
import loci.formats.FormatReader;
import loci.formats.FormatTools;
import loci.formats.MetadataTools;
import loci.formats.meta.MetadataStore;
/**
* PDSReader is the file format reader for Perkin Elmer densitometer files.
*
* <dl><dt><b>Source code:</b></dt>
* <dd><a href="http://trac.openmicroscopy.org.uk/ome/browser/bioformats.git/components/bio-formats/src/loci/formats/in/PDSReader.java">Trac</a>,
* <a href="http://git.openmicroscopy.org/?p=bioformats.git;a=blob;f=components/bio-formats/src/loci/formats/in/PDSReader.java;hb=HEAD">Gitweb</a></dd></dl>
*/
public class PDSReader extends FormatReader {
// -- Constants --
private static final String PDS_MAGIC_STRING = " IDENTIFICATION";
private static final String DATE_FORMAT = "HH:mm:ss d-MMM-** yyyy";
// -- Fields --
private String pixelsFile;
private int recordWidth;
private int lutIndex = -1;
private boolean reverseX = false, reverseY = false;
// -- Constructor --
/** Constructs a new PDS reader. */
public PDSReader() {
super("Perkin Elmer Densitometer", new String[] {"hdr", "img"});
domains = new String[] {FormatTools.EM_DOMAIN};
suffixSufficient = false;
}
// -- IFormatReader API methods --
/* @see loci.formats.IFormatReader#isThisType(String, boolean) */
public boolean isThisType(String name, boolean open) {
if (!open) return false;
if (checkSuffix(name, "hdr")) return super.isThisType(name, open);
else if (checkSuffix(name, "img")) {
String headerFile = name.substring(0, name.lastIndexOf(".")) + ".hdr";
return new Location(headerFile).exists() && isThisType(headerFile, open);
}
return false;
}
/* @see loci.formats.IFormatReader#isThisType(RandomAccessInputStream) */
public boolean isThisType(RandomAccessInputStream stream) throws IOException {
final int blockLen = 15;
if (!FormatTools.validStream(stream, blockLen, false)) return false;
return stream.readString(blockLen).equals(PDS_MAGIC_STRING);
}
/* @see loci.formats.IFormatReader#get16BitLookupTable() */
public short[][] get16BitLookupTable() throws FormatException, IOException {
FormatTools.assertId(currentId, true, 1);
if (lutIndex < 0 || lutIndex >= 3) return null;
short[][] lut = new short[3][65536];
for (int i=0; i<lut[lutIndex].length; i++) {
lut[lutIndex][i] = (short) i;
}
return lut;
}
/* @see loci.formats.IFormatReader#getSeriesUsedFiles(boolean) */
public String[] getSeriesUsedFiles(boolean noPixels) {
FormatTools.assertId(currentId, true, 1);
if (noPixels) {
return new String[] {currentId};
}
return new String[] {currentId, pixelsFile};
}
/**
* @see loci.formats.IFormatReader#openBytes(int, byte[], int, int, int, int)
*/
public byte[] openBytes(int no, byte[] buf, int x, int y, int w, int h)
throws FormatException, IOException
{
FormatTools.checkPlaneParameters(this, no, buf.length, x, y, w, h);
int pad = recordWidth - (getSizeX() % recordWidth);
RandomAccessInputStream pixels = new RandomAccessInputStream(pixelsFile);
readPlane(pixels, x, y, w, h, pad, buf);
pixels.close();
if (reverseX) {
for (int row=0; row<h; row++) {
for (int col=0; col<w/2; col++) {
int begin = 2 * (row * w + col);
int end = 2 * (row * w + (w - col - 1));
byte b0 = buf[begin];
byte b1 = buf[begin + 1];
buf[begin] = buf[end];
buf[begin + 1] = buf[end + 1];
buf[end] = b0;
buf[end + 1] = b1;
}
}
}
if (reverseY) {
for (int row=0; row<h/2; row++) {
byte[] b = new byte[w * 2];
int start = row * w * 2;
int end = (h - row - 1) * w * 2;
System.arraycopy(buf, start, b, 0, b.length);
System.arraycopy(buf, end, buf, start, b.length);
System.arraycopy(b, 0, buf, end, b.length);
}
}
return buf;
}
/* @see loci.formats.IFormatReader#close(boolean) */
public void close(boolean fileOnly) throws IOException {
super.close(fileOnly);
if (!fileOnly) {
recordWidth = 0;
pixelsFile = null;
lutIndex = -1;
reverseX = reverseY = false;
}
}
// -- Internal FormatReader API methods --
/* @see loci.formats.FormatReader#initFile(String) */
protected void initFile(String id) throws FormatException, IOException {
if (!checkSuffix(id, "hdr")) {
String headerFile = id.substring(0, id.lastIndexOf(".")) + ".hdr";
if (!new Location(headerFile).exists()) {
headerFile = id.substring(0, id.lastIndexOf(".")) + ".HDR";
if (!new Location(headerFile).exists()) {
throw new FormatException("Could not find matching .hdr file.");
}
}
initFile(headerFile);
return;
}
super.initFile(id);
String[] headerData = DataTools.readFile(id).split("\r\n");
+ if (headerData.length == 1) {
+ headerData = headerData[0].split("\r");
+ }
Double xPos = null, yPos = null;
Double deltaX = null, deltaY = null;
String date = null;
for (String line : headerData) {
int eq = line.indexOf("=");
if (eq < 0) continue;
int end = line.indexOf("/");
if (end < 0) end = line.length();
String key = line.substring(0, eq).trim();
String value = line.substring(eq + 1, end).trim();
if (key.equals("NXP")) {
core[0].sizeX = Integer.parseInt(value);
}
else if (key.equals("NYP")) {
core[0].sizeY = Integer.parseInt(value);
}
else if (key.equals("XPOS")) {
xPos = new Double(value);
addGlobalMeta("X position for position #1", xPos);
}
else if (key.equals("YPOS")) {
yPos = new Double(value);
addGlobalMeta("Y position for position #1", yPos);
}
else if (key.equals("SIGNX")) {
reverseX = value.replaceAll("'", "").trim().equals("-");
}
else if (key.equals("SIGNY")) {
reverseY = value.replaceAll("'", "").trim().equals("-");
}
else if (key.equals("DELTAX")) {
deltaX = new Double(value);
}
else if (key.equals("DELTAY")) {
deltaY = new Double(value);
}
else if (key.equals("COLOR")) {
int color = Integer.parseInt(value);
if (color == 4) {
core[0].sizeC = 3;
core[0].rgb = true;
}
else {
core[0].sizeC = 1;
core[0].rgb = false;
lutIndex = color - 1;
core[0].indexed = lutIndex >= 0;
}
}
else if (key.equals("SCAN TIME")) {
long modTime = new Location(currentId).getAbsoluteFile().lastModified();
String year = DateTools.convertDate(modTime, DateTools.UNIX, "yyyy");
date = value.replaceAll("'", "") + " " + year;
date = DateTools.formatDate(date, DATE_FORMAT);
}
else if (key.equals("FILE REC LEN")) {
recordWidth = Integer.parseInt(value) / 2;
}
addGlobalMeta(key, value);
}
core[0].sizeZ = 1;
core[0].sizeT = 1;
core[0].imageCount = 1;
core[0].dimensionOrder = "XYCZT";
core[0].pixelType = FormatTools.UINT16;
core[0].littleEndian = true;
String base = currentId.substring(0, currentId.lastIndexOf("."));
pixelsFile = base + ".IMG";
if (!new Location(pixelsFile).exists()) {
pixelsFile = base + ".img";
}
boolean minimumMetadata =
getMetadataOptions().getMetadataLevel() == MetadataLevel.MINIMUM;
MetadataStore store = makeFilterMetadata();
MetadataTools.populatePixels(store, this, !minimumMetadata);
if (date == null) {
MetadataTools.setDefaultCreationDate(store, currentId, 0);
}
else store.setImageAcquiredDate(date, 0);
if (!minimumMetadata) {
store.setPlanePositionX(xPos, 0, 0);
store.setPlanePositionY(yPos, 0, 0);
if (deltaX != null) {
store.setPixelsPhysicalSizeX(deltaX, 0);
}
if (deltaY != null) {
store.setPixelsPhysicalSizeY(deltaY, 0);
}
}
}
}
| true | true | protected void initFile(String id) throws FormatException, IOException {
if (!checkSuffix(id, "hdr")) {
String headerFile = id.substring(0, id.lastIndexOf(".")) + ".hdr";
if (!new Location(headerFile).exists()) {
headerFile = id.substring(0, id.lastIndexOf(".")) + ".HDR";
if (!new Location(headerFile).exists()) {
throw new FormatException("Could not find matching .hdr file.");
}
}
initFile(headerFile);
return;
}
super.initFile(id);
String[] headerData = DataTools.readFile(id).split("\r\n");
Double xPos = null, yPos = null;
Double deltaX = null, deltaY = null;
String date = null;
for (String line : headerData) {
int eq = line.indexOf("=");
if (eq < 0) continue;
int end = line.indexOf("/");
if (end < 0) end = line.length();
String key = line.substring(0, eq).trim();
String value = line.substring(eq + 1, end).trim();
if (key.equals("NXP")) {
core[0].sizeX = Integer.parseInt(value);
}
else if (key.equals("NYP")) {
core[0].sizeY = Integer.parseInt(value);
}
else if (key.equals("XPOS")) {
xPos = new Double(value);
addGlobalMeta("X position for position #1", xPos);
}
else if (key.equals("YPOS")) {
yPos = new Double(value);
addGlobalMeta("Y position for position #1", yPos);
}
else if (key.equals("SIGNX")) {
reverseX = value.replaceAll("'", "").trim().equals("-");
}
else if (key.equals("SIGNY")) {
reverseY = value.replaceAll("'", "").trim().equals("-");
}
else if (key.equals("DELTAX")) {
deltaX = new Double(value);
}
else if (key.equals("DELTAY")) {
deltaY = new Double(value);
}
else if (key.equals("COLOR")) {
int color = Integer.parseInt(value);
if (color == 4) {
core[0].sizeC = 3;
core[0].rgb = true;
}
else {
core[0].sizeC = 1;
core[0].rgb = false;
lutIndex = color - 1;
core[0].indexed = lutIndex >= 0;
}
}
else if (key.equals("SCAN TIME")) {
long modTime = new Location(currentId).getAbsoluteFile().lastModified();
String year = DateTools.convertDate(modTime, DateTools.UNIX, "yyyy");
date = value.replaceAll("'", "") + " " + year;
date = DateTools.formatDate(date, DATE_FORMAT);
}
else if (key.equals("FILE REC LEN")) {
recordWidth = Integer.parseInt(value) / 2;
}
addGlobalMeta(key, value);
}
core[0].sizeZ = 1;
core[0].sizeT = 1;
core[0].imageCount = 1;
core[0].dimensionOrder = "XYCZT";
core[0].pixelType = FormatTools.UINT16;
core[0].littleEndian = true;
String base = currentId.substring(0, currentId.lastIndexOf("."));
pixelsFile = base + ".IMG";
if (!new Location(pixelsFile).exists()) {
pixelsFile = base + ".img";
}
boolean minimumMetadata =
getMetadataOptions().getMetadataLevel() == MetadataLevel.MINIMUM;
MetadataStore store = makeFilterMetadata();
MetadataTools.populatePixels(store, this, !minimumMetadata);
if (date == null) {
MetadataTools.setDefaultCreationDate(store, currentId, 0);
}
else store.setImageAcquiredDate(date, 0);
if (!minimumMetadata) {
store.setPlanePositionX(xPos, 0, 0);
store.setPlanePositionY(yPos, 0, 0);
if (deltaX != null) {
store.setPixelsPhysicalSizeX(deltaX, 0);
}
if (deltaY != null) {
store.setPixelsPhysicalSizeY(deltaY, 0);
}
}
}
| protected void initFile(String id) throws FormatException, IOException {
if (!checkSuffix(id, "hdr")) {
String headerFile = id.substring(0, id.lastIndexOf(".")) + ".hdr";
if (!new Location(headerFile).exists()) {
headerFile = id.substring(0, id.lastIndexOf(".")) + ".HDR";
if (!new Location(headerFile).exists()) {
throw new FormatException("Could not find matching .hdr file.");
}
}
initFile(headerFile);
return;
}
super.initFile(id);
String[] headerData = DataTools.readFile(id).split("\r\n");
if (headerData.length == 1) {
headerData = headerData[0].split("\r");
}
Double xPos = null, yPos = null;
Double deltaX = null, deltaY = null;
String date = null;
for (String line : headerData) {
int eq = line.indexOf("=");
if (eq < 0) continue;
int end = line.indexOf("/");
if (end < 0) end = line.length();
String key = line.substring(0, eq).trim();
String value = line.substring(eq + 1, end).trim();
if (key.equals("NXP")) {
core[0].sizeX = Integer.parseInt(value);
}
else if (key.equals("NYP")) {
core[0].sizeY = Integer.parseInt(value);
}
else if (key.equals("XPOS")) {
xPos = new Double(value);
addGlobalMeta("X position for position #1", xPos);
}
else if (key.equals("YPOS")) {
yPos = new Double(value);
addGlobalMeta("Y position for position #1", yPos);
}
else if (key.equals("SIGNX")) {
reverseX = value.replaceAll("'", "").trim().equals("-");
}
else if (key.equals("SIGNY")) {
reverseY = value.replaceAll("'", "").trim().equals("-");
}
else if (key.equals("DELTAX")) {
deltaX = new Double(value);
}
else if (key.equals("DELTAY")) {
deltaY = new Double(value);
}
else if (key.equals("COLOR")) {
int color = Integer.parseInt(value);
if (color == 4) {
core[0].sizeC = 3;
core[0].rgb = true;
}
else {
core[0].sizeC = 1;
core[0].rgb = false;
lutIndex = color - 1;
core[0].indexed = lutIndex >= 0;
}
}
else if (key.equals("SCAN TIME")) {
long modTime = new Location(currentId).getAbsoluteFile().lastModified();
String year = DateTools.convertDate(modTime, DateTools.UNIX, "yyyy");
date = value.replaceAll("'", "") + " " + year;
date = DateTools.formatDate(date, DATE_FORMAT);
}
else if (key.equals("FILE REC LEN")) {
recordWidth = Integer.parseInt(value) / 2;
}
addGlobalMeta(key, value);
}
core[0].sizeZ = 1;
core[0].sizeT = 1;
core[0].imageCount = 1;
core[0].dimensionOrder = "XYCZT";
core[0].pixelType = FormatTools.UINT16;
core[0].littleEndian = true;
String base = currentId.substring(0, currentId.lastIndexOf("."));
pixelsFile = base + ".IMG";
if (!new Location(pixelsFile).exists()) {
pixelsFile = base + ".img";
}
boolean minimumMetadata =
getMetadataOptions().getMetadataLevel() == MetadataLevel.MINIMUM;
MetadataStore store = makeFilterMetadata();
MetadataTools.populatePixels(store, this, !minimumMetadata);
if (date == null) {
MetadataTools.setDefaultCreationDate(store, currentId, 0);
}
else store.setImageAcquiredDate(date, 0);
if (!minimumMetadata) {
store.setPlanePositionX(xPos, 0, 0);
store.setPlanePositionY(yPos, 0, 0);
if (deltaX != null) {
store.setPixelsPhysicalSizeX(deltaX, 0);
}
if (deltaY != null) {
store.setPixelsPhysicalSizeY(deltaY, 0);
}
}
}
|
diff --git a/maven-gae-plugin/src/main/java/net/kindleit/gae/CronInfoGoal.java b/maven-gae-plugin/src/main/java/net/kindleit/gae/CronInfoGoal.java
index 33d1279..6dfa2a6 100644
--- a/maven-gae-plugin/src/main/java/net/kindleit/gae/CronInfoGoal.java
+++ b/maven-gae-plugin/src/main/java/net/kindleit/gae/CronInfoGoal.java
@@ -1,38 +1,38 @@
/* Copyright 2011 Kindleit.net Software Development
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.kindleit.gae;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
/**
* Displays times for the next several runs of each cron job
* from Google's servers.
*
* @author [email protected]
*
* @goal cron-info
* @requiresOnline
* @since 0.7.1
*
*/
public class CronInfoGoal extends EngineGoalBase {
public void execute() throws MojoExecutionException, MojoFailureException {
getLog().info("Getting cron info...");
- runAppCfg("cron_info");
+ runAppCfg("cron_info", appDir);
}
}
| true | true | public void execute() throws MojoExecutionException, MojoFailureException {
getLog().info("Getting cron info...");
runAppCfg("cron_info");
}
| public void execute() throws MojoExecutionException, MojoFailureException {
getLog().info("Getting cron info...");
runAppCfg("cron_info", appDir);
}
|
diff --git a/src/husacct/define/domain/module/modules/Component.java b/src/husacct/define/domain/module/modules/Component.java
index 300adbd8..d6b139da 100644
--- a/src/husacct/define/domain/module/modules/Component.java
+++ b/src/husacct/define/domain/module/modules/Component.java
@@ -1,38 +1,39 @@
package husacct.define.domain.module.modules;
import husacct.define.domain.SoftwareUnitRegExDefinition;
import husacct.define.domain.module.ModuleFactory;
import husacct.define.domain.module.ModuleStrategy;
import husacct.define.domain.softwareunit.SoftwareUnitDefinition;
import java.util.ArrayList;
public class Component extends ModuleStrategy {
public void set(String name, String description){
this.id = STATIC_ID;
STATIC_ID++;
this.name = name;
this.description = description;
this.type = "Component";
this.mappedSUunits = new ArrayList<SoftwareUnitDefinition>();
this.mappedRegExSUunits = new ArrayList<SoftwareUnitRegExDefinition>();
this.subModules = new ArrayList<ModuleStrategy>();
ModuleStrategy facade = new ModuleFactory().createModule("Facade");
facade.set("Facade<"+name+">","this is the Facade of your Component");
+ facade.setParent(this);
this.subModules.add(facade);
}
public void copyValuestoNewCompont(ModuleStrategy newModule){
newModule.setId(this.getId());
newModule.setName(this.getName());
newModule.setDescription(this.getDescription());
newModule.setParent(this.getparent());
this.subModules.remove(0);
newModule.setSubModules(this.getSubModules());
newModule.setRegExUnits(this.getRegExUnits());
newModule.setUnits(this.getUnits());
}
}
| true | true | public void set(String name, String description){
this.id = STATIC_ID;
STATIC_ID++;
this.name = name;
this.description = description;
this.type = "Component";
this.mappedSUunits = new ArrayList<SoftwareUnitDefinition>();
this.mappedRegExSUunits = new ArrayList<SoftwareUnitRegExDefinition>();
this.subModules = new ArrayList<ModuleStrategy>();
ModuleStrategy facade = new ModuleFactory().createModule("Facade");
facade.set("Facade<"+name+">","this is the Facade of your Component");
this.subModules.add(facade);
}
| public void set(String name, String description){
this.id = STATIC_ID;
STATIC_ID++;
this.name = name;
this.description = description;
this.type = "Component";
this.mappedSUunits = new ArrayList<SoftwareUnitDefinition>();
this.mappedRegExSUunits = new ArrayList<SoftwareUnitRegExDefinition>();
this.subModules = new ArrayList<ModuleStrategy>();
ModuleStrategy facade = new ModuleFactory().createModule("Facade");
facade.set("Facade<"+name+">","this is the Facade of your Component");
facade.setParent(this);
this.subModules.add(facade);
}
|
diff --git a/utils/js/RunScript.java b/utils/js/RunScript.java
index afe602a..82d1f3e 100644
--- a/utils/js/RunScript.java
+++ b/utils/js/RunScript.java
@@ -1,70 +1,73 @@
/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Rhino code, released
* May 6, 1998.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1999
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Modified by Michael Neumann.
*
* Alternatively, the contents of this file may be used under the terms of
* the GNU General Public License Version 2 or later (the "GPL"), in which
* case the provisions of the GPL are applicable instead of those above. If
* you wish to allow use of your version of this file only under the terms of
* the GPL and not to allow others to use your version of this file under the
* MPL, indicate your decision by deleting the provisions above and replacing
* them with the notice and other provisions required by the GPL. If you do
* not delete the provisions above, a recipient may use your version of this
* file under either the MPL or the GPL.
*
* ***** END LICENSE BLOCK ***** */
import org.mozilla.javascript.*;
import java.io.*;
public class RunScript {
public static void main(String args[]) throws IOException
{
Context cx = Context.enter();
try {
Scriptable scope = cx.initStandardObjects();
// Add a global variable "out" that is a JavaScript reflection
// of System.out
Object jsOut = Context.javaToJS(System.out, scope);
ScriptableObject.putProperty(scope, "out", jsOut);
// Read script from stdio into s
String s = "";
String line;
s += "function println(o) { out.println(o); };\n";
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
- while ( (line = in.readLine()) != null ) s += line;
+ while ( (line = in.readLine()) != null ) {
+ s += line;
+ s += "\n";
+ }
Object result = cx.evaluateString(scope, s, "<cmd>", 1, null);
//System.err.println(cx.toString(result));
} finally {
Context.exit();
}
}
}
| true | true | public static void main(String args[]) throws IOException
{
Context cx = Context.enter();
try {
Scriptable scope = cx.initStandardObjects();
// Add a global variable "out" that is a JavaScript reflection
// of System.out
Object jsOut = Context.javaToJS(System.out, scope);
ScriptableObject.putProperty(scope, "out", jsOut);
// Read script from stdio into s
String s = "";
String line;
s += "function println(o) { out.println(o); };\n";
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
while ( (line = in.readLine()) != null ) s += line;
Object result = cx.evaluateString(scope, s, "<cmd>", 1, null);
//System.err.println(cx.toString(result));
} finally {
Context.exit();
}
}
| public static void main(String args[]) throws IOException
{
Context cx = Context.enter();
try {
Scriptable scope = cx.initStandardObjects();
// Add a global variable "out" that is a JavaScript reflection
// of System.out
Object jsOut = Context.javaToJS(System.out, scope);
ScriptableObject.putProperty(scope, "out", jsOut);
// Read script from stdio into s
String s = "";
String line;
s += "function println(o) { out.println(o); };\n";
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
while ( (line = in.readLine()) != null ) {
s += line;
s += "\n";
}
Object result = cx.evaluateString(scope, s, "<cmd>", 1, null);
//System.err.println(cx.toString(result));
} finally {
Context.exit();
}
}
|
diff --git a/AppServer/src/org/prot/appserver/runtime/java/JavaRuntime.java b/AppServer/src/org/prot/appserver/runtime/java/JavaRuntime.java
index 9509816f..38b49281 100644
--- a/AppServer/src/org/prot/appserver/runtime/java/JavaRuntime.java
+++ b/AppServer/src/org/prot/appserver/runtime/java/JavaRuntime.java
@@ -1,97 +1,96 @@
package org.prot.appserver.runtime.java;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.log.Slf4jLog;
import org.prot.appserver.app.AppInfo;
import org.prot.appserver.config.Configuration;
import org.prot.appserver.runtime.AppRuntime;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.ClassPathResource;
public class JavaRuntime implements AppRuntime
{
private static final Logger logger = Logger.getLogger(JavaRuntime.class);
private static final String IDENTIFIER = "JAVA";
@Override
public String getIdentifier()
{
return IDENTIFIER;
}
@Override
public void launch(AppInfo appInfo) throws Exception
{
logger.debug("Launching java runtime");
XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("/etc/spring_java.xml", getClass()));
// Configure server port
int port = Configuration.getInstance().getAppServerPort();
logger.debug("Configuring server port: " + port);
Connector connector = (Connector) factory.getBean("Connector");
connector.setPort(port);
// Load and init AppDeployer
logger.debug("Initialize the AppDeployer");
AppDeployer deployer = (AppDeployer) factory.getBean("AppDeployer");
deployer.setAppInfo(appInfo);
// Start the server
Server server = (Server) factory.getBean("Server");
// Activate the slf4j logging facade (which is bound to log4j)
- Slf4jLog log = new Slf4jLog();
org.eclipse.jetty.util.log.Log.setLog(new Slf4jLog());
server.addBean(deployer);
try
{
logger.debug("Starting jetty");
server.start();
} catch (Exception e)
{
logger.error("Could not start the jetty server", e);
throw e;
}
}
@Override
public void loadConfiguration(AppInfo appInfo, Map<?, ?> yaml)
{
// Create a specific java configuration
JavaConfiguration configuration = new JavaConfiguration();
appInfo.setRuntimeConfiguration(configuration);
// Default - do not use distributed sessions
configuration.setUseDistributedSessions(false);
// Check if the distributed sessions are configured
Object distSession = yaml.get("distSession");
if (distSession != null)
{
// Check if the setting is a boolean value
if (distSession instanceof Boolean)
{
try
{
configuration.setUseDistributedSessions((Boolean) distSession);
} catch (NumberFormatException e)
{
logger.error("Could not parse configuration");
System.exit(1);
}
} else
{
logger.warn("app.yaml setting distSession must be boolean");
}
}
logger.debug("Using distributed sessions: " + configuration.isUseDistributedSessions());
}
}
| true | true | public void launch(AppInfo appInfo) throws Exception
{
logger.debug("Launching java runtime");
XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("/etc/spring_java.xml", getClass()));
// Configure server port
int port = Configuration.getInstance().getAppServerPort();
logger.debug("Configuring server port: " + port);
Connector connector = (Connector) factory.getBean("Connector");
connector.setPort(port);
// Load and init AppDeployer
logger.debug("Initialize the AppDeployer");
AppDeployer deployer = (AppDeployer) factory.getBean("AppDeployer");
deployer.setAppInfo(appInfo);
// Start the server
Server server = (Server) factory.getBean("Server");
// Activate the slf4j logging facade (which is bound to log4j)
Slf4jLog log = new Slf4jLog();
org.eclipse.jetty.util.log.Log.setLog(new Slf4jLog());
server.addBean(deployer);
try
{
logger.debug("Starting jetty");
server.start();
} catch (Exception e)
{
logger.error("Could not start the jetty server", e);
throw e;
}
}
| public void launch(AppInfo appInfo) throws Exception
{
logger.debug("Launching java runtime");
XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("/etc/spring_java.xml", getClass()));
// Configure server port
int port = Configuration.getInstance().getAppServerPort();
logger.debug("Configuring server port: " + port);
Connector connector = (Connector) factory.getBean("Connector");
connector.setPort(port);
// Load and init AppDeployer
logger.debug("Initialize the AppDeployer");
AppDeployer deployer = (AppDeployer) factory.getBean("AppDeployer");
deployer.setAppInfo(appInfo);
// Start the server
Server server = (Server) factory.getBean("Server");
// Activate the slf4j logging facade (which is bound to log4j)
org.eclipse.jetty.util.log.Log.setLog(new Slf4jLog());
server.addBean(deployer);
try
{
logger.debug("Starting jetty");
server.start();
} catch (Exception e)
{
logger.error("Could not start the jetty server", e);
throw e;
}
}
|
diff --git a/src/java/com/eviware/soapui/impl/wsdl/teststeps/WsdlMessageAssertion.java b/src/java/com/eviware/soapui/impl/wsdl/teststeps/WsdlMessageAssertion.java
index 5868e5fc0..31acb98b7 100644
--- a/src/java/com/eviware/soapui/impl/wsdl/teststeps/WsdlMessageAssertion.java
+++ b/src/java/com/eviware/soapui/impl/wsdl/teststeps/WsdlMessageAssertion.java
@@ -1,476 +1,476 @@
/*
* soapUI, copyright (C) 2004-2011 eviware.com
*
* soapUI is free software; you can redistribute it and/or modify it under the
* terms of version 2.1 of the GNU Lesser General Public License as published by
* the Free Software Foundation.
*
* soapUI is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU Lesser General Public License for more details at gnu.org.
*/
package com.eviware.soapui.impl.wsdl.teststeps;
import java.util.List;
import javax.swing.ImageIcon;
import org.apache.xmlbeans.XmlObject;
import com.eviware.soapui.config.AssertionEntryConfig;
import com.eviware.soapui.config.GroupAssertionListConfig;
import com.eviware.soapui.config.TestAssertionConfig;
import com.eviware.soapui.impl.wsdl.teststeps.assertions.TestAssertionRegistry;
import com.eviware.soapui.model.ModelItem;
import com.eviware.soapui.model.TestPropertyHolder;
import com.eviware.soapui.model.iface.MessageExchange;
import com.eviware.soapui.model.iface.SubmitContext;
import com.eviware.soapui.model.propertyexpansion.PropertyExpansion;
import com.eviware.soapui.model.propertyexpansion.PropertyExpansionContainer;
import com.eviware.soapui.model.settings.Settings;
import com.eviware.soapui.model.support.AbstractModelItem;
import com.eviware.soapui.model.support.ModelSupport;
import com.eviware.soapui.model.testsuite.Assertable;
import com.eviware.soapui.model.testsuite.Assertable.AssertionStatus;
import com.eviware.soapui.model.testsuite.AssertionError;
import com.eviware.soapui.model.testsuite.AssertionException;
import com.eviware.soapui.model.testsuite.TestAssertion;
import com.eviware.soapui.model.testsuite.TestCaseRunContext;
import com.eviware.soapui.model.testsuite.TestCaseRunner;
import com.eviware.soapui.support.UISupport;
import com.eviware.soapui.support.resolver.ResolveContext;
/**
* Base class for WsdlAssertions
*
* @author Ole.Matzura
*/
public abstract class WsdlMessageAssertion extends AbstractModelItem implements PropertyExpansionContainer,
TestAssertion
{
private TestAssertionConfig assertionConfig;
private final Assertable assertable;
protected AssertionStatus assertionStatus = AssertionStatus.UNKNOWN;
protected com.eviware.soapui.model.testsuite.AssertionError[] assertionErrors;
private ImageIcon validIcon;
private ImageIcon failedIcon;
private ImageIcon unknownIcon;
private final boolean cloneable;
private final boolean configurable;
private final boolean allowMultiple;
private final boolean requiresResponseContent;
protected WsdlMessageAssertion( TestAssertionConfig assertionConfig, Assertable modelItem, boolean cloneable,
boolean configurable, boolean multiple, boolean requiresResponseContent )
{
this.assertionConfig = assertionConfig;
this.assertable = modelItem;
this.cloneable = cloneable;
this.configurable = configurable;
this.allowMultiple = multiple;
this.requiresResponseContent = requiresResponseContent;
validIcon = UISupport.createImageIcon( "/valid_assertion.gif" );
failedIcon = UISupport.createImageIcon( "/failed_assertion.gif" );
unknownIcon = UISupport.createImageIcon( "/unknown_assertion.gif" );
}
public XmlObject getConfiguration()
{
if( null == assertionConfig.getConfiguration() )
{
assertionConfig.addNewConfiguration();
}
return assertionConfig.getConfiguration();
}
public void setConfiguration( XmlObject configuration )
{
XmlObject oldConfig = assertionConfig.getConfiguration();
assertionConfig.setConfiguration( configuration );
notifyPropertyChanged( TestAssertion.CONFIGURATION_PROPERTY, oldConfig, configuration );
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#getName()
*/
public String getName()
{
return assertionConfig.isSetName() ? assertionConfig.getName() : TestAssertionRegistry.getInstance()
.getAssertionNameForType( assertionConfig.getType() );
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#getStatus()
*/
public AssertionStatus getStatus()
{
return isDisabled() ? AssertionStatus.UNKNOWN : assertionStatus;
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#getErrors()
*/
public AssertionError[] getErrors()
{
return isDisabled() ? null : assertionErrors;
}
/*
* (non-Javadoc)
*
* @see
* com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#isAllowMultiple()
*/
public boolean isAllowMultiple()
{
return allowMultiple;
}
public AssertionStatus assertResponse( MessageExchange messageExchange, SubmitContext context )
{
AssertionStatus oldStatus = assertionStatus;
AssertionError[] oldErrors = getErrors();
ImageIcon oldIcon = getIcon();
if( isDisabled() )
{
assertionStatus = AssertionStatus.UNKNOWN;
assertionErrors = null;
}
- else if( !messageExchange.hasResponse() && requiresResponseContent )
+ else if( messageExchange != null && !messageExchange.hasResponse() && requiresResponseContent )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
"null/empty response" ) };
}
else
{
try
{
internalAssertResponse( messageExchange, context );
assertionStatus = AssertionStatus.VALID;
assertionErrors = null;
}
catch( AssertionException e )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = e.getErrors();
}
catch( Throwable e )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
e.getMessage() ) };
}
}
notifyPropertyChanged( STATUS_PROPERTY, oldStatus, assertionStatus );
notifyPropertyChanged( ERRORS_PROPERTY, oldErrors, assertionErrors );
notifyPropertyChanged( ICON_PROPERTY, oldIcon, getIcon() );
return assertionStatus;
}
protected abstract String internalAssertResponse( MessageExchange messageExchange, SubmitContext context )
throws AssertionException;
public AssertionStatus assertRequest( MessageExchange messageExchange, SubmitContext context )
{
AssertionStatus oldStatus = assertionStatus;
ImageIcon oldIcon = getIcon();
if( !messageExchange.hasRequest( true ) )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
"null/empty request" ) };
}
else
{
try
{
internalAssertRequest( messageExchange, context );
assertionStatus = AssertionStatus.VALID;
assertionErrors = null;
}
catch( AssertionException e )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = e.getErrors();
}
catch( Throwable e )
{
e.printStackTrace();
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
e.getMessage() ) };
}
}
notifyPropertyChanged( STATUS_PROPERTY, oldStatus, assertionStatus );
notifyPropertyChanged( ICON_PROPERTY, oldIcon, getIcon() );
return assertionStatus;
}
public AssertionStatus assertProperty( TestPropertyHolder source, String propertyName,
MessageExchange messageExchange, SubmitContext context )
{
AssertionStatus oldStatus = assertionStatus;
ImageIcon oldIcon = getIcon();
if( !propertyName.equals( "Group" ) && !source.hasProperty( propertyName ) )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
"property: '" + propertyName + "' does not exist" ) };
}
else
{
try
{
internalAssertProperty( source, propertyName, messageExchange, context );
assertionStatus = AssertionStatus.VALID;
assertionErrors = null;
}
catch( AssertionException e )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = e.getErrors();
}
catch( Throwable e )
{
e.printStackTrace();
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
e.getMessage() ) };
}
}
notifyPropertyChanged( STATUS_PROPERTY, oldStatus, assertionStatus );
notifyPropertyChanged( ICON_PROPERTY, oldIcon, getIcon() );
return assertionStatus;
}
protected abstract String internalAssertRequest( MessageExchange messageExchange, SubmitContext context )
throws AssertionException;
protected abstract String internalAssertProperty( TestPropertyHolder source, String propertyName,
MessageExchange messageExchange, SubmitContext context ) throws AssertionException;
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#isConfigurable()
*/
public boolean isConfigurable()
{
return configurable;
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#isClonable()
*/
public boolean isClonable()
{
return cloneable;
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#configure()
*/
public boolean configure()
{
return true;
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#getDescription()
*/
public String getDescription()
{
return getConfig().getDescription();
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#getIcon()
*/
public ImageIcon getIcon()
{
switch( getStatus() )
{
case FAILED :
return failedIcon;
case UNKNOWN :
return unknownIcon;
case VALID :
return validIcon;
}
return null;
}
public void updateConfig( TestAssertionConfig config )
{
this.assertionConfig = config;
}
public TestAssertionConfig getConfig()
{
return assertionConfig;
}
public Settings getSettings()
{
return assertable.getModelItem().getSettings();
}
public void release()
{
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#getAssertable()
*/
public Assertable getAssertable()
{
return assertable;
}
public String getId()
{
if( !assertionConfig.isSetId() )
assertionConfig.setId( ModelSupport.generateModelItemID() );
return assertionConfig.getId();
}
public PropertyExpansion[] getPropertyExpansions()
{
return null;
}
public void setName( String name )
{
String oldLabel = getLabel();
String old = getName();
assertionConfig.setName( name );
notifyPropertyChanged( NAME_PROPERTY, old, name );
String label = getLabel();
if( !oldLabel.equals( label ) )
{
notifyPropertyChanged( LABEL_PROPERTY, oldLabel, label );
}
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#getLabel()
*/
public String getLabel()
{
String name = getName();
if( isDisabled() )
return name + " (disabled)";
else
return name;
}
/*
* (non-Javadoc)
*
* @see com.eviware.soapui.impl.wsdl.teststeps.TestAssertion#isDisabled()
*/
public boolean isDisabled()
{
return getConfig().getDisabled();
}
public void setDisabled( boolean disabled )
{
String oldLabel = getLabel();
boolean oldDisabled = isDisabled();
if( oldDisabled == disabled )
return;
if( disabled )
{
getConfig().setDisabled( disabled );
}
else if( getConfig().isSetDisabled() )
{
getConfig().unsetDisabled();
}
String label = getLabel();
if( !oldLabel.equals( label ) )
{
notifyPropertyChanged( LABEL_PROPERTY, oldLabel, label );
}
notifyPropertyChanged( DISABLED_PROPERTY, oldDisabled, disabled );
}
public ModelItem getParent()
{
return assertable.getModelItem();
}
public boolean isValid()
{
return getStatus() == AssertionStatus.VALID;
}
public boolean isFailed()
{
return getStatus() == AssertionStatus.FAILED;
}
public void prepare( TestCaseRunner testRunner, TestCaseRunContext testRunContext ) throws Exception
{
assertionStatus = AssertionStatus.UNKNOWN;
}
@Override
public int getIndexOfAssertion( TestAssertion assertion )
{
if( getConfig() instanceof GroupAssertionListConfig )
{
List<AssertionEntryConfig> assertionEntryConfigList = ( ( GroupAssertionListConfig )getConfig() )
.getAssertionsList();
return assertionEntryConfigList.indexOf( ( ( WsdlMessageAssertion )assertion ).getConfig() );
}
else
return -1;
}
public void resolve( ResolveContext<?> context )
{
}
}
| true | true | public AssertionStatus assertResponse( MessageExchange messageExchange, SubmitContext context )
{
AssertionStatus oldStatus = assertionStatus;
AssertionError[] oldErrors = getErrors();
ImageIcon oldIcon = getIcon();
if( isDisabled() )
{
assertionStatus = AssertionStatus.UNKNOWN;
assertionErrors = null;
}
else if( !messageExchange.hasResponse() && requiresResponseContent )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
"null/empty response" ) };
}
else
{
try
{
internalAssertResponse( messageExchange, context );
assertionStatus = AssertionStatus.VALID;
assertionErrors = null;
}
catch( AssertionException e )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = e.getErrors();
}
catch( Throwable e )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
e.getMessage() ) };
}
}
notifyPropertyChanged( STATUS_PROPERTY, oldStatus, assertionStatus );
notifyPropertyChanged( ERRORS_PROPERTY, oldErrors, assertionErrors );
notifyPropertyChanged( ICON_PROPERTY, oldIcon, getIcon() );
return assertionStatus;
}
| public AssertionStatus assertResponse( MessageExchange messageExchange, SubmitContext context )
{
AssertionStatus oldStatus = assertionStatus;
AssertionError[] oldErrors = getErrors();
ImageIcon oldIcon = getIcon();
if( isDisabled() )
{
assertionStatus = AssertionStatus.UNKNOWN;
assertionErrors = null;
}
else if( messageExchange != null && !messageExchange.hasResponse() && requiresResponseContent )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
"null/empty response" ) };
}
else
{
try
{
internalAssertResponse( messageExchange, context );
assertionStatus = AssertionStatus.VALID;
assertionErrors = null;
}
catch( AssertionException e )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = e.getErrors();
}
catch( Throwable e )
{
assertionStatus = AssertionStatus.FAILED;
assertionErrors = new com.eviware.soapui.model.testsuite.AssertionError[] { new com.eviware.soapui.model.testsuite.AssertionError(
e.getMessage() ) };
}
}
notifyPropertyChanged( STATUS_PROPERTY, oldStatus, assertionStatus );
notifyPropertyChanged( ERRORS_PROPERTY, oldErrors, assertionErrors );
notifyPropertyChanged( ICON_PROPERTY, oldIcon, getIcon() );
return assertionStatus;
}
|
diff --git a/src/mozeq/irc/bot/plugins/BugzillaPlugin.java b/src/mozeq/irc/bot/plugins/BugzillaPlugin.java
index de4f67d..4fd262b 100644
--- a/src/mozeq/irc/bot/plugins/BugzillaPlugin.java
+++ b/src/mozeq/irc/bot/plugins/BugzillaPlugin.java
@@ -1,66 +1,66 @@
package mozeq.irc.bot.plugins;
import java.net.MalformedURLException;
import java.util.ArrayList;
import mozeq.irc.bot.ConfigLoader;
import mozeq.irc.bot.Configuration;
import mozeq.irc.bot.IrcBotPlugin;
import mozeq.irc.bot.IrcMessage;
import org.apache.xmlrpc.XmlRpcException;
import org.mozeq.bugzilla.BugzillaProxy;
import org.mozeq.bugzilla.BugzillaTicket;
public class BugzillaPlugin extends IrcBotPlugin {
private String USERNAME = null;
private String PASSWORD = null;
private String BZ_URL = null;
@Override
public void init() {
this.commands = new ArrayList<String>();
commands.add(".rhbz#");
Configuration conf = ConfigLoader.getConfiguration("bzplugin.conf");
if (conf != null) {
USERNAME = conf.get("username");
PASSWORD = conf.get("password");
BZ_URL = conf.get("bz_url");
}
}
@Override
public ArrayList<String> run(IrcMessage message, String command) {
clearResponses();
String[] params = message.body.split("#");
if (params.length < 2) {
System.err.println("Can't parse the ticket id from the message");
return responses;
}
BugzillaProxy bz = new BugzillaProxy(BZ_URL);
try {
bz.connect(USERNAME, PASSWORD);
} catch (MalformedURLException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
BugzillaTicket bzTicket = null;
try {
bzTicket = bz.getTicket(Integer.parseInt(params[1]));
} catch (XmlRpcException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
if (bzTicket != null) {
String ticketURL = bz.getURL() + "/show_bug.cgi?id=" + bzTicket.getID();
- addResponse("["+ bzTicket.getComponent() +"] " + bzTicket.getSummary() + " <"+ ticketURL +">");
+ addResponse("bz#" + bzTicket.getID() + ": ["+ bzTicket.getComponent() +"] " + bzTicket.getSummary() + " <"+ ticketURL +">");
}
return responses;
}
}
| true | true | public ArrayList<String> run(IrcMessage message, String command) {
clearResponses();
String[] params = message.body.split("#");
if (params.length < 2) {
System.err.println("Can't parse the ticket id from the message");
return responses;
}
BugzillaProxy bz = new BugzillaProxy(BZ_URL);
try {
bz.connect(USERNAME, PASSWORD);
} catch (MalformedURLException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
BugzillaTicket bzTicket = null;
try {
bzTicket = bz.getTicket(Integer.parseInt(params[1]));
} catch (XmlRpcException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
if (bzTicket != null) {
String ticketURL = bz.getURL() + "/show_bug.cgi?id=" + bzTicket.getID();
addResponse("["+ bzTicket.getComponent() +"] " + bzTicket.getSummary() + " <"+ ticketURL +">");
}
return responses;
}
| public ArrayList<String> run(IrcMessage message, String command) {
clearResponses();
String[] params = message.body.split("#");
if (params.length < 2) {
System.err.println("Can't parse the ticket id from the message");
return responses;
}
BugzillaProxy bz = new BugzillaProxy(BZ_URL);
try {
bz.connect(USERNAME, PASSWORD);
} catch (MalformedURLException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
BugzillaTicket bzTicket = null;
try {
bzTicket = bz.getTicket(Integer.parseInt(params[1]));
} catch (XmlRpcException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
if (bzTicket != null) {
String ticketURL = bz.getURL() + "/show_bug.cgi?id=" + bzTicket.getID();
addResponse("bz#" + bzTicket.getID() + ": ["+ bzTicket.getComponent() +"] " + bzTicket.getSummary() + " <"+ ticketURL +">");
}
return responses;
}
|
Subsets and Splits