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/src/org/ohmage/request/image/ImageReadRequest.java b/src/org/ohmage/request/image/ImageReadRequest.java
index 4fdb79e8..cedc0078 100644
--- a/src/org/ohmage/request/image/ImageReadRequest.java
+++ b/src/org/ohmage/request/image/ImageReadRequest.java
@@ -1,327 +1,328 @@
/*******************************************************************************
* Copyright 2012 The Regents of the University of California
*
* 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.ohmage.request.image;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.ClientAbortException;
import org.apache.log4j.Logger;
import org.ohmage.annotator.Annotator.ErrorCode;
import org.ohmage.cache.UserBin;
import org.ohmage.domain.Image;
import org.ohmage.exception.DomainException;
import org.ohmage.exception.InvalidRequestException;
import org.ohmage.exception.ServiceException;
import org.ohmage.exception.ValidationException;
import org.ohmage.request.InputKeys;
import org.ohmage.request.UserRequest;
import org.ohmage.service.ImageServices;
import org.ohmage.service.UserImageServices;
import org.ohmage.service.UserServices;
import org.ohmage.util.CookieUtils;
import org.ohmage.validator.ImageValidators;
/**
* <p>Returns an image based on the given ID. The requester must be requesting
* an image they created, a shared image in a campaign in which they are an
* author, or a shared image in a shared campaign in which they are an analyst.
* </p>
* <table border="1">
* <tr>
* <td>Parameter Name</td>
* <td>Description</td>
* <td>Required</td>
* </tr>
* <tr>
* <td>{@value org.ohmage.request.InputKeys#CLIENT}</td>
* <td>A string describing the client that is making this request.</td>
* <td>true</td>
* </tr>
* <tr>
* <td>{@value org.ohmage.request.InputKeys#IMAGE_ID}</td>
* <td>The image's unique identifier.</td>
* <td>true</td>
* </tr>
* <tr>
* <td>{@value org.ohmage.request.InputKeys#IMAGE_SIZE}</td>
* <td>If omitted, the originally uploaded image will be returned. If
* given, it will alter the image in some way based on the value given.
* It must be one of
* {@link org.ohmage.validator.ImageValidators.ImageSize}.</td>
* <td>false</td>
* </tr>
* </table>
*
* @author John Jenkins
*/
public class ImageReadRequest extends UserRequest {
private static final Logger LOGGER = Logger.getLogger(ImageReadRequest.class);
private static final int CHUNK_SIZE = 4096;
private static final long MILLIS_IN_A_SECOND = 1000;
private final UUID imageId;
private final Image.Size size;
private Image image;
/**
* Creates a new image read request.
*
* @param httpRequest The HttpServletRequest with all of the parameters to
* build this request.
*
* @throws InvalidRequestException Thrown if the parameters cannot be
* parsed.
*
* @throws IOException There was an error reading from the request.
*/
public ImageReadRequest(HttpServletRequest httpRequest) throws IOException, InvalidRequestException {
super(httpRequest, false, TokenLocation.EITHER, null);
UUID tImageId = null;
Image.Size tSize = Image.Size.ORIGINAL;
if(! isFailed()) {
LOGGER.info("Creating an image read request.");
String[] t;
try {
t = getParameterValues(InputKeys.IMAGE_ID);
if(t.length > 1) {
throw new ValidationException(
ErrorCode.IMAGE_INVALID_ID,
"Multiple image IDs were given: " +
InputKeys.IMAGE_ID);
}
else if(t.length == 0) {
throw new ValidationException(
ErrorCode.IMAGE_INVALID_ID,
"The image ID is missing: " +
InputKeys.IMAGE_ID);
}
else {
tImageId = ImageValidators.validateId(t[0]);
if(tImageId == null) {
throw new ValidationException(
ErrorCode.IMAGE_INVALID_ID,
"The image ID is missing: " +
InputKeys.IMAGE_ID);
}
}
t = getParameterValues(InputKeys.IMAGE_SIZE);
if(t.length > 1) {
throw new ValidationException(
ErrorCode.IMAGE_INVALID_SIZE,
"Multiple image sizes were given: " +
InputKeys.IMAGE_SIZE);
}
else if(t.length == 1) {
tSize = ImageValidators.validateImageSize(t[0]);
}
}
catch(ValidationException e) {
e.failRequest(this);
LOGGER.info(e.toString());
}
}
imageId = tImageId;
size = tSize;
image = null;
}
/**
* Services the request.
*/
@Override
public void service() {
LOGGER.info("Servicing image read request.");
if(! authenticate(AllowNewAccount.NEW_ACCOUNT_DISALLOWED)) {
return;
}
try {
LOGGER.info("Verifying that the image exists.");
ImageServices.instance().verifyImageExistance(imageId, true);
try {
LOGGER.info("Checking if the user is an admin.");
UserServices.instance().verifyUserIsAdmin(getUser().getUsername());
}
catch(ServiceException e) {
LOGGER.info("Verifying that the user can read the image.");
UserImageServices.instance().verifyUserCanReadImage(getUser().getUsername(), imageId);
}
LOGGER.info("Retrieving the image.");
image = ImageServices.instance().getImage(imageId, size);
}
catch(ServiceException e) {
e.failRequest(this);
e.logException(LOGGER);
}
}
/**
* Responds to the request with an image if it was successful or JSON if it
* was not.
*/
@Override
public void respond(HttpServletRequest httpRequest, HttpServletResponse httpResponse) {
LOGGER.info("Writing the image read response.");
// Sets the HTTP headers to disable caching
expireResponse(httpResponse);
// Set the CORS headers.
handleCORS(httpRequest, httpResponse);
// Open the connection to the image if it is not null.
InputStream imageStream = null;
try {
if(image != null) {
imageStream = image.openStream(size);
}
}
catch(DomainException e) {
LOGGER.error("Could not connect to the image.", e);
this.setFailed(ErrorCode.SYSTEM_GENERAL_ERROR, "Image not found.");
httpResponse.setStatus(HttpServletResponse.SC_NOT_FOUND);
super.respond(httpRequest, httpResponse, null);
return;
}
// If the request hasn't failed, attempt to write the file to the
// output stream.
try {
if(isFailed()) {
+ httpResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
super.respond(httpRequest, httpResponse, null);
}
else {
// Set the type of the value.
// FIXME: This isn't necessarily the case. We might want to do
// some sort of image inspection to figure out what this should
// be.
httpResponse.setContentType("image/png");
httpResponse.setHeader(
"Content-Length",
new Long(image.getSizeBytes(size)).toString());
// If available, set the token.
if(getUser() != null) {
final String token = getUser().getToken();
if(token != null) {
CookieUtils.setCookieValue(
httpResponse,
InputKeys.AUTH_TOKEN,
token,
(int) (UserBin.getTokenRemainingLifetimeInMillis(token) / MILLIS_IN_A_SECOND));
}
}
// Creates the writer that will write the response, success or
// fail.
OutputStream os;
try {
os = httpResponse.getOutputStream();
}
catch(IOException e) {
LOGGER.error(
"Unable to create writer object. Aborting.",
e);
return;
}
// Set the output stream to the response.
DataOutputStream dos = new DataOutputStream(os);
byte[] bytes = new byte[CHUNK_SIZE];
int currRead;
try {
while((currRead = imageStream.read(bytes)) != -1) {
dos.write(bytes, 0, currRead);
}
}
finally {
// Close the data output stream to which we were writing.
try {
dos.close();
}
catch(ClientAbortException e) {
LOGGER.info("The client hung up unexpectedly.", e);
}
catch(IOException e) {
LOGGER.warn("Error closing the data output stream.", e);
}
}
}
}
// If there was an error getting the image's information, abort
// the whole operation and return an error.
catch(DomainException e) {
LOGGER.error(
"There was a problem reading or writing the image.",
e);
setFailed();
httpResponse.setStatus(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
// If the client hangs up, just print a warning.
catch(ClientAbortException e) {
LOGGER.info("The client hung up unexpectedly.", e);
}
// If the error occurred while reading from the input stream or
// writing to the output stream, abort the whole operation and
// return an error.
catch(IOException e) {
LOGGER.error(
"The contents of the file could not be read or written to the response.",
e);
setFailed();
httpResponse.setStatus(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
// No matter what, try to close the input stream if it exists.
finally {
try {
if(imageStream != null) {
imageStream.close();
}
}
// If the client hangs up, just print a warning.
catch(ClientAbortException e) {
LOGGER.info("The client hung up unexpectedly.", e);
}
catch(IOException e) {
LOGGER.warn("Could not close the image stream.", e);
// We don't care about failing the request, because, either, it
// has already been failed or we wrote everything already.
}
}
}
}
| true | true | public void respond(HttpServletRequest httpRequest, HttpServletResponse httpResponse) {
LOGGER.info("Writing the image read response.");
// Sets the HTTP headers to disable caching
expireResponse(httpResponse);
// Set the CORS headers.
handleCORS(httpRequest, httpResponse);
// Open the connection to the image if it is not null.
InputStream imageStream = null;
try {
if(image != null) {
imageStream = image.openStream(size);
}
}
catch(DomainException e) {
LOGGER.error("Could not connect to the image.", e);
this.setFailed(ErrorCode.SYSTEM_GENERAL_ERROR, "Image not found.");
httpResponse.setStatus(HttpServletResponse.SC_NOT_FOUND);
super.respond(httpRequest, httpResponse, null);
return;
}
// If the request hasn't failed, attempt to write the file to the
// output stream.
try {
if(isFailed()) {
super.respond(httpRequest, httpResponse, null);
}
else {
// Set the type of the value.
// FIXME: This isn't necessarily the case. We might want to do
// some sort of image inspection to figure out what this should
// be.
httpResponse.setContentType("image/png");
httpResponse.setHeader(
"Content-Length",
new Long(image.getSizeBytes(size)).toString());
// If available, set the token.
if(getUser() != null) {
final String token = getUser().getToken();
if(token != null) {
CookieUtils.setCookieValue(
httpResponse,
InputKeys.AUTH_TOKEN,
token,
(int) (UserBin.getTokenRemainingLifetimeInMillis(token) / MILLIS_IN_A_SECOND));
}
}
// Creates the writer that will write the response, success or
// fail.
OutputStream os;
try {
os = httpResponse.getOutputStream();
}
catch(IOException e) {
LOGGER.error(
"Unable to create writer object. Aborting.",
e);
return;
}
// Set the output stream to the response.
DataOutputStream dos = new DataOutputStream(os);
byte[] bytes = new byte[CHUNK_SIZE];
int currRead;
try {
while((currRead = imageStream.read(bytes)) != -1) {
dos.write(bytes, 0, currRead);
}
}
finally {
// Close the data output stream to which we were writing.
try {
dos.close();
}
catch(ClientAbortException e) {
LOGGER.info("The client hung up unexpectedly.", e);
}
catch(IOException e) {
LOGGER.warn("Error closing the data output stream.", e);
}
}
}
}
// If there was an error getting the image's information, abort
// the whole operation and return an error.
catch(DomainException e) {
LOGGER.error(
"There was a problem reading or writing the image.",
e);
setFailed();
httpResponse.setStatus(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
// If the client hangs up, just print a warning.
catch(ClientAbortException e) {
LOGGER.info("The client hung up unexpectedly.", e);
}
// If the error occurred while reading from the input stream or
// writing to the output stream, abort the whole operation and
// return an error.
catch(IOException e) {
LOGGER.error(
"The contents of the file could not be read or written to the response.",
e);
setFailed();
httpResponse.setStatus(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
// No matter what, try to close the input stream if it exists.
finally {
try {
if(imageStream != null) {
imageStream.close();
}
}
// If the client hangs up, just print a warning.
catch(ClientAbortException e) {
LOGGER.info("The client hung up unexpectedly.", e);
}
catch(IOException e) {
LOGGER.warn("Could not close the image stream.", e);
// We don't care about failing the request, because, either, it
// has already been failed or we wrote everything already.
}
}
}
| public void respond(HttpServletRequest httpRequest, HttpServletResponse httpResponse) {
LOGGER.info("Writing the image read response.");
// Sets the HTTP headers to disable caching
expireResponse(httpResponse);
// Set the CORS headers.
handleCORS(httpRequest, httpResponse);
// Open the connection to the image if it is not null.
InputStream imageStream = null;
try {
if(image != null) {
imageStream = image.openStream(size);
}
}
catch(DomainException e) {
LOGGER.error("Could not connect to the image.", e);
this.setFailed(ErrorCode.SYSTEM_GENERAL_ERROR, "Image not found.");
httpResponse.setStatus(HttpServletResponse.SC_NOT_FOUND);
super.respond(httpRequest, httpResponse, null);
return;
}
// If the request hasn't failed, attempt to write the file to the
// output stream.
try {
if(isFailed()) {
httpResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
super.respond(httpRequest, httpResponse, null);
}
else {
// Set the type of the value.
// FIXME: This isn't necessarily the case. We might want to do
// some sort of image inspection to figure out what this should
// be.
httpResponse.setContentType("image/png");
httpResponse.setHeader(
"Content-Length",
new Long(image.getSizeBytes(size)).toString());
// If available, set the token.
if(getUser() != null) {
final String token = getUser().getToken();
if(token != null) {
CookieUtils.setCookieValue(
httpResponse,
InputKeys.AUTH_TOKEN,
token,
(int) (UserBin.getTokenRemainingLifetimeInMillis(token) / MILLIS_IN_A_SECOND));
}
}
// Creates the writer that will write the response, success or
// fail.
OutputStream os;
try {
os = httpResponse.getOutputStream();
}
catch(IOException e) {
LOGGER.error(
"Unable to create writer object. Aborting.",
e);
return;
}
// Set the output stream to the response.
DataOutputStream dos = new DataOutputStream(os);
byte[] bytes = new byte[CHUNK_SIZE];
int currRead;
try {
while((currRead = imageStream.read(bytes)) != -1) {
dos.write(bytes, 0, currRead);
}
}
finally {
// Close the data output stream to which we were writing.
try {
dos.close();
}
catch(ClientAbortException e) {
LOGGER.info("The client hung up unexpectedly.", e);
}
catch(IOException e) {
LOGGER.warn("Error closing the data output stream.", e);
}
}
}
}
// If there was an error getting the image's information, abort
// the whole operation and return an error.
catch(DomainException e) {
LOGGER.error(
"There was a problem reading or writing the image.",
e);
setFailed();
httpResponse.setStatus(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
// If the client hangs up, just print a warning.
catch(ClientAbortException e) {
LOGGER.info("The client hung up unexpectedly.", e);
}
// If the error occurred while reading from the input stream or
// writing to the output stream, abort the whole operation and
// return an error.
catch(IOException e) {
LOGGER.error(
"The contents of the file could not be read or written to the response.",
e);
setFailed();
httpResponse.setStatus(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
// No matter what, try to close the input stream if it exists.
finally {
try {
if(imageStream != null) {
imageStream.close();
}
}
// If the client hangs up, just print a warning.
catch(ClientAbortException e) {
LOGGER.info("The client hung up unexpectedly.", e);
}
catch(IOException e) {
LOGGER.warn("Could not close the image stream.", e);
// We don't care about failing the request, because, either, it
// has already been failed or we wrote everything already.
}
}
}
|
diff --git a/troia-server/src/main/java/com/datascience/mv/IncrementalMV.java b/troia-server/src/main/java/com/datascience/mv/IncrementalMV.java
index 87401616..1ed1208a 100644
--- a/troia-server/src/main/java/com/datascience/mv/IncrementalMV.java
+++ b/troia-server/src/main/java/com/datascience/mv/IncrementalMV.java
@@ -1,75 +1,77 @@
package com.datascience.mv;
import com.datascience.core.algorithms.INewDataObserver;
import com.datascience.core.base.AssignedLabel;
import com.datascience.core.base.LObject;
import com.datascience.core.base.Worker;
import com.datascience.core.nominal.IncrementalNominalModel;
import com.datascience.core.stats.CategoryPriorCalculators;
import com.datascience.core.stats.ErrorRateCalculators;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
/**
* @Author: konrad
*/
public class IncrementalMV extends MajorityVote implements INewDataObserver {
private IncrementalNominalModel model;
public IncrementalMV(){
super(
new ErrorRateCalculators.BatchErrorRateCalculator(),
new CategoryPriorCalculators.IncrementalCategoryPriorCalculator());
model = new IncrementalNominalModel();
}
@Override
public IncrementalNominalModel getModel() {
return model;
}
@Override
public Type getModelType() {
return new TypeToken<IncrementalNominalModel>() {} .getType();
}
@Override
public void setModel(Object o){
model = (IncrementalNominalModel) o;
}
@Override
public void compute() {
//There is nothing that we would make sense to do here
}
public void computeForNewAssign(AssignedLabel<String> assign){
computeResultsForObject(assign.getLobject());
for (AssignedLabel<String> al: getData().getAssignsForObject(assign.getLobject())){
computeWorkersConfusionMatrix(al.getWorker());
}
- model.priorDenominator++;
- model.categoryPriors.put(assign.getLabel(), model.categoryPriors.get(assign.getLabel()) + 1);
+ if (!data.arePriorsFixed()){
+ model.priorDenominator++;
+ model.categoryPriors.put(assign.getLabel(), model.categoryPriors.get(assign.getLabel()) + 1);
+ }
}
@Override
public void newAssign(AssignedLabel assign) {
computeForNewAssign(assign);
}
@Override
public void newGoldObject(LObject object) {
computeResultsForObject(object);
}
@Override
public void newObject(LObject object) {
computeResultsForObject(object);
}
@Override
public void newWorker(Worker worker) {
}
}
| true | true | public void computeForNewAssign(AssignedLabel<String> assign){
computeResultsForObject(assign.getLobject());
for (AssignedLabel<String> al: getData().getAssignsForObject(assign.getLobject())){
computeWorkersConfusionMatrix(al.getWorker());
}
model.priorDenominator++;
model.categoryPriors.put(assign.getLabel(), model.categoryPriors.get(assign.getLabel()) + 1);
}
| public void computeForNewAssign(AssignedLabel<String> assign){
computeResultsForObject(assign.getLobject());
for (AssignedLabel<String> al: getData().getAssignsForObject(assign.getLobject())){
computeWorkersConfusionMatrix(al.getWorker());
}
if (!data.arePriorsFixed()){
model.priorDenominator++;
model.categoryPriors.put(assign.getLabel(), model.categoryPriors.get(assign.getLabel()) + 1);
}
}
|
diff --git a/src/main/java/com/ardublock/translator/block/SerialPrintlnBlock.java b/src/main/java/com/ardublock/translator/block/SerialPrintlnBlock.java
index 6f1fb5d..f74f26a 100644
--- a/src/main/java/com/ardublock/translator/block/SerialPrintlnBlock.java
+++ b/src/main/java/com/ardublock/translator/block/SerialPrintlnBlock.java
@@ -1,43 +1,43 @@
package com.ardublock.translator.block;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
import com.ardublock.translator.block.exception.SocketNullException;
import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
public class SerialPrintlnBlock extends TranslatorBlock
{
public SerialPrintlnBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
translator.addSetupCommand("Serial.begin(9600);");
TranslatorBlock t1 = getRequiredTranslatorBlockAtSocket(0);
String b1 = t1.toCode();
String text = "";
if (b1.equals("Return")) {
text = "Serial.println( ";
} else {
text = "Serial.print( ";
}
- TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(1, text , " );\n");
+ TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0, text , " );\n");
String ret = translatorBlock.toCode();
ret = ret + "Serial.println(\"\");\n";
return ret;
}
}
| true | true | public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
translator.addSetupCommand("Serial.begin(9600);");
TranslatorBlock t1 = getRequiredTranslatorBlockAtSocket(0);
String b1 = t1.toCode();
String text = "";
if (b1.equals("Return")) {
text = "Serial.println( ";
} else {
text = "Serial.print( ";
}
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(1, text , " );\n");
String ret = translatorBlock.toCode();
ret = ret + "Serial.println(\"\");\n";
return ret;
}
| public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
translator.addSetupCommand("Serial.begin(9600);");
TranslatorBlock t1 = getRequiredTranslatorBlockAtSocket(0);
String b1 = t1.toCode();
String text = "";
if (b1.equals("Return")) {
text = "Serial.println( ";
} else {
text = "Serial.print( ";
}
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0, text , " );\n");
String ret = translatorBlock.toCode();
ret = ret + "Serial.println(\"\");\n";
return ret;
}
|
diff --git a/apps/animaldb/plugins/breedingplugin/ManageLitters.java b/apps/animaldb/plugins/breedingplugin/ManageLitters.java
index ebc7afdc0..cf91683af 100644
--- a/apps/animaldb/plugins/breedingplugin/ManageLitters.java
+++ b/apps/animaldb/plugins/breedingplugin/ManageLitters.java
@@ -1,1758 +1,1758 @@
/* Date: November 15, 2010
* Template: PluginScreenJavaTemplateGen.java.ftl
* generator: org.molgenis.generators.ui.PluginScreenJavaTemplateGen 3.3.3
*
* THIS FILE IS A TEMPLATE. PLEASE EDIT :-)
*/
package plugins.breedingplugin;
import java.io.File;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import org.molgenis.framework.db.Database;
import org.molgenis.framework.db.DatabaseException;
import org.molgenis.framework.db.Query;
import org.molgenis.framework.db.QueryRule;
import org.molgenis.framework.db.QueryRule.Operator;
import org.molgenis.framework.ui.PluginModel;
import org.molgenis.framework.ui.ScreenController;
import org.molgenis.framework.ui.ScreenMessage;
import org.molgenis.framework.ui.html.DateInput;
import org.molgenis.framework.ui.html.HtmlInput;
import org.molgenis.framework.ui.html.SelectInput;
import org.molgenis.framework.ui.html.Table;
import org.molgenis.matrix.component.MatrixViewer;
import org.molgenis.matrix.component.SliceablePhenoMatrix;
import org.molgenis.matrix.component.general.MatrixQueryRule;
import org.molgenis.pheno.Category;
import org.molgenis.pheno.Individual;
import org.molgenis.pheno.Measurement;
import org.molgenis.pheno.ObservationElement;
import org.molgenis.pheno.ObservationTarget;
import org.molgenis.pheno.ObservedValue;
import org.molgenis.pheno.Panel;
import org.molgenis.protocol.ProtocolApplication;
import org.molgenis.util.Entity;
import org.molgenis.util.Tuple;
import plugins.output.LabelGenerator;
import plugins.output.LabelGeneratorException;
import commonservice.CommonService;
public class ManageLitters extends PluginModel<Entity>
{
private static final long serialVersionUID = 7608670026855241487L;
private List<ObservationTarget> parentgroupList;
private List<Litter> litterList = new ArrayList<Litter>();
private List<Litter> genoLitterList = new ArrayList<Litter>();
private List<Litter> doneLitterList = new ArrayList<Litter>();
private int selectedParentgroup = -1;
private int litter;
// private String litterName = "";
private String birthdate = null;
private String weandate = null;
private int litterSize;
private int weanSizeFemale;
private int weanSizeMale;
private int weanSizeUnknown;
private boolean litterSizeApproximate;
private CommonService ct = CommonService.getInstance();
private SimpleDateFormat oldDateOnlyFormat = new SimpleDateFormat("MMMM d, yyyy", Locale.US);
private SimpleDateFormat newDateOnlyFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
private String action = "ShowLitters";
private String nameBase = null;
private int startNumber = -1;
private String labelDownloadLink = null;
private List<ObservationTarget> backgroundList;
private List<ObservationTarget> sexList;
private List<String> geneNameList;
private List<String> geneStateList;
private List<String> colorList;
private List<Category> earmarkList;
private int genoLitterId;
private List<String> bases = null;
private String remarks = null;
private String status = null;
private Table genotypeTable = null;
private int nrOfGenotypes = 1;
MatrixViewer matrixViewer = null;
private static String MATRIX = "matrix";
private int userId = -1;
private String respres = null;
//hack to pass database to toHtml() via toHtml(db)
private Database toHtmlDb;
public void setToHtmlDb(Database toHtmlDb)
{
this.toHtmlDb = toHtmlDb;
}
public ManageLitters(String name, ScreenController<?> parent)
{
super(name, parent);
}
public String getCustomHtmlHeaders() {
return "<script type=\"text/javascript\" src=\"res/jquery-plugins/datatables/js/jquery.dataTables.js\"></script>\n" +
"<script src=\"res/jquery-plugins/ctnotify/lib/jquery.ctNotify.js\" language=\"javascript\"></script>\n" +
"<script src=\"res/scripts/custom/addingajax.js\" language=\"javascript\"></script>\n" +
"<script src=\"res/scripts/custom/litters.js\" language=\"javascript\"></script>\n" +
"<link rel=\"stylesheet\" style=\"text/css\" href=\"res/jquery-plugins/ctnotify/lib/jquery.ctNotify.css\">" +
"<link rel=\"stylesheet\" style=\"text/css\" href=\"res/jquery-plugins/datatables/css/demo_table_jui.css\">\n" +
"<link rel=\"stylesheet\" style=\"text/css\" href=\"res/css/animaldb.css\">";
}
@Override
public String getViewName()
{
return "plugins_breedingplugin_ManageLitters";
}
@Override
public String getViewTemplate()
{
return "plugins/breedingplugin/ManageLitters.ftl";
}
// Parent group list related methods:
public List<ObservationTarget> getParentgroupList() {
return parentgroupList;
}
public void setParentgroupList(List<ObservationTarget> parentgroupList) {
this.parentgroupList = parentgroupList;
}
public void setLitterList(List<Litter> litterList) {
this.litterList = litterList;
}
public List<Litter> getLitterList() {
return litterList;
}
public void setGenoLitterList(List<Litter> genoLitterList) {
this.genoLitterList = genoLitterList;
}
public List<Litter> getGenoLitterList() {
return genoLitterList;
}
public List<Litter> getDoneLitterList() {
return doneLitterList;
}
public void setDoneLitterList(List<Litter> doneLitterList) {
this.doneLitterList = doneLitterList;
}
public String getBirthdate() {
if (birthdate != null) {
return birthdate;
}
return newDateOnlyFormat.format(new Date());
}
public void setBirthdate(String birthdate) {
this.birthdate = birthdate;
}
public void setWeandate(String weandate) {
this.weandate = weandate;
}
public String getWeandate() {
if (weandate != null) {
return weandate;
}
return newDateOnlyFormat.format(new Date());
}
public int getLitterSize() {
return litterSize;
}
public void setLitterSize(int litterSize) {
this.litterSize = litterSize;
}
public void setWeanSizeFemale(int weanSizeFemale) {
this.weanSizeFemale = weanSizeFemale;
}
public int getWeanSizeFemale() {
return weanSizeFemale;
}
public void setWeanSizeMale(int weanSizeMale) {
this.weanSizeMale = weanSizeMale;
}
public int getWeanSizeMale() {
return weanSizeMale;
}
public void setWeanSizeUnknown(int weanSizeUnknown) {
this.weanSizeUnknown = weanSizeUnknown;
}
public int getWeanSizeUnknown() {
return weanSizeUnknown;
}
public int getSelectedParentgroup() {
return selectedParentgroup;
}
public String getSelectedParentgroupName() {
try {
return ct.getObservationTargetLabel(selectedParentgroup);
} catch (Exception e) {
return "None";
}
}
public void setSelectedParentgroup(int selectedParentgroup) {
this.selectedParentgroup = selectedParentgroup;
}
public void setLitter(int litter) {
this.litter = litter;
}
public int getLitter() {
return litter;
}
public boolean getLitterSizeApproximate() {
return litterSizeApproximate;
}
public void setLitterSizeApproximate(boolean litterSizeApproximate) {
this.litterSizeApproximate = litterSizeApproximate;
}
public void setAction(String action)
{
this.action = action;
}
public String getAction()
{
return action;
}
public void setLabelDownloadLink(String labelDownloadLink) {
this.labelDownloadLink = labelDownloadLink;
}
public String getLabelDownloadLink() {
return labelDownloadLink;
}
public List<ObservationTarget> getBackgroundList() {
return backgroundList;
}
public void setBackgroundList(List<ObservationTarget> backgroundList) {
this.backgroundList = backgroundList;
}
public List<String> getGeneNameList() {
return geneNameList;
}
public void setGeneNameList(List<String> geneNameList) {
this.geneNameList = geneNameList;
}
public List<String> getGeneStateList() {
return geneStateList;
}
public void setGeneStateList(List<String> geneStateList) {
this.geneStateList = geneStateList;
}
public int getGenoLitterId() {
return genoLitterId;
}
public void setGenoLitterId(int genoLitterId) {
this.genoLitterId = genoLitterId;
}
public List<ObservationTarget> getSexList() {
return sexList;
}
public void setSexList(List<ObservationTarget> sexList) {
this.sexList = sexList;
}
public List<String> getColorList() {
return colorList;
}
public void setColorList(List<String> colorList) {
this.colorList = colorList;
}
public List<Category> getEarmarkList() {
return earmarkList;
}
public void setEarmarkList(List<Category> earmarkList) {
this.earmarkList = earmarkList;
}
public String renderMatrixViewer() {
if (matrixViewer != null) {
matrixViewer.setDatabase(toHtmlDb);
return matrixViewer.render();
} else {
return "No viewer available, matrix for selecting a parent group cannot be rendered.";
}
}
private void setUserFields(Tuple request, boolean wean) throws Exception {
if (wean == true) {
respres = request.getString("respres");
if (request.getString("weandate") == null || request.getString("weandate").equals("")) {
throw new Exception("Wean date cannot be empty");
}
weandate = request.getString("weandate"); // in old date format!
setWeanSizeFemale(request.getInt("weansizefemale"));
setWeanSizeMale(request.getInt("weansizemale"));
setWeanSizeUnknown(request.getInt("weansizeunknown"));
this.setRemarks(request.getString("remarks"));
if (request.getString("namebase") != null) {
nameBase = request.getString("namebase");
if (nameBase.equals("New")) {
if (request.getString("newnamebase") != null) {
nameBase = request.getString("newnamebase");
} else {
nameBase = "";
}
}
} else {
nameBase = "";
}
if (request.getInt("startnumber") != null) {
startNumber = request.getInt("startnumber");
} else {
startNumber = 1; // standard start at 1
}
} else {
if (request.getString("birthdate") == null || request.getString("birthdate").equals("")) {
throw new Exception("Birth date cannot be empty");
}
birthdate = request.getString("birthdate"); // in old date format!
setLitterSize(request.getInt("littersize"));
if (request.getBool("sizeapp_toggle") != null) {
setLitterSizeApproximate(true);
} else {
setLitterSizeApproximate(false);
}
this.setRemarks(request.getString("remarks"));
}
}
public String getParentInfo() {
try {
String returnString = "";
int parentgroupId = ct.getMostRecentValueAsXref(this.getGenoLitterId(), ct.getMeasurementId("Parentgroup"));
String parentgroupName = ct.getObservationTargetById(parentgroupId).getName();
returnString += ("Parentgroup: " + parentgroupName + "<br />");
returnString += ("Line: " + getLineInfo(parentgroupId) + "<br />");
int motherId = findParentForParentgroup(parentgroupId, "Mother", toHtmlDb);
returnString += ("Mother: " + getGenoInfo(motherId, toHtmlDb) + "<br />");
int fatherId = findParentForParentgroup(parentgroupId, "Father", toHtmlDb);
returnString += ("Father: " + getGenoInfo(fatherId, toHtmlDb) + "<br />");
return returnString;
} catch (Exception e) {
return "No (complete) parent info available";
}
}
public List<Individual> getAnimalsInLitter(Database db) {
try {
return getAnimalsInLitter(this.getGenoLitterId(), db);
} catch (Exception e) {
// On fail, return empty list to UI
return new ArrayList<Individual>();
}
}
public List<Individual> getAnimalsInLitter(int litterId, Database db) {
List<Individual> returnList = new ArrayList<Individual>();
try {
Query<ObservedValue> q = db.query(ObservedValue.class);
q.addRules(new QueryRule(ObservedValue.DELETED, Operator.EQUALS, false));
q.addRules(new QueryRule(ObservedValue.RELATION, Operator.EQUALS, litterId));
q.addRules(new QueryRule(ObservedValue.FEATURE, Operator.EQUALS, ct.getMeasurementId("Litter")));
List<ObservedValue> valueList = q.find();
for (ObservedValue value : valueList) {
int animalId = value.getTarget_Id();
returnList.add(ct.getIndividualById(animalId));
}
return returnList;
} catch (Exception e) {
// On fail, return empty list to UI
return new ArrayList<Individual>();
}
}
public int getAnimalSex(int animalId) {
try {
return ct.getMostRecentValueAsXref(animalId, ct.getMeasurementId("Sex"));
} catch (Exception e) {
return -1;
}
}
public String getAnimalColor(int animalId) {
try {
return ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("Color"));
} catch (Exception e) {
return "unknown";
}
}
public Date getAnimalBirthDate(int animalId) {
try {
String birthDateString = ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("DateOfBirth"));
return newDateOnlyFormat.parse(birthDateString);
} catch (Exception e) {
return null;
}
}
public String getAnimalBirthDateAsString(int animalId) {
try {
String birthDateString = ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("DateOfBirth"));
Date tmpBirthDate = newDateOnlyFormat.parse(birthDateString);
return oldDateOnlyFormat.format(tmpBirthDate);
} catch (Exception e) {
return "";
}
}
public String getAnimalEarmark(int animalId) {
try {
return ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("Earmark"));
} catch (Exception e) {
return "";
}
}
public int getAnimalBackground(int animalId) {
try {
return ct.getMostRecentValueAsXref(animalId, ct.getMeasurementId("Background"));
} catch (Exception e) {
return -1;
}
}
public String getAnimalGeneInfo(String measurementName, int animalId, int genoNr, Database db) {
Query<ObservedValue> q = db.query(ObservedValue.class);
q.addRules(new QueryRule(ObservedValue.DELETED, Operator.EQUALS, false));
q.addRules(new QueryRule(ObservedValue.TARGET, Operator.EQUALS, animalId));
q.addRules(new QueryRule(ObservedValue.FEATURE_NAME, Operator.EQUALS, measurementName));
List<ObservedValue> valueList;
try {
valueList = q.find();
} catch (DatabaseException e) {
return "";
}
if (valueList.size() > genoNr) {
return valueList.get(genoNr).getValue();
} else {
return "";
}
}
private int findParentForParentgroup(int parentgroupId, String parentSex, Database db) throws DatabaseException, ParseException {
ct.setDatabase(db);
int measurementId = ct.getMeasurementId(parentSex);
Query<ObservedValue> parentQuery = db.query(ObservedValue.class);
parentQuery.addRules(new QueryRule(ObservedValue.DELETED, Operator.EQUALS, false));
parentQuery.addRules(new QueryRule(ObservedValue.RELATION, Operator.EQUALS, parentgroupId));
parentQuery.addRules(new QueryRule(ObservedValue.FEATURE, Operator.EQUALS, measurementId));
List<ObservedValue> parentValueList = parentQuery.find();
if (parentValueList.size() > 0) {
return parentValueList.get(0).getTarget_Id();
} else {
throw new DatabaseException("No " + parentSex + " found for parentgroup with ID " + parentgroupId);
}
}
private String getGenoInfo(int animalId, Database db) throws DatabaseException, ParseException {
String returnString = "";
int measurementId = ct.getMeasurementId("Background");
int animalBackgroundId = ct.getMostRecentValueAsXref(animalId, measurementId);
String animalBackgroundName = "unknown";
if (animalBackgroundId != -1) {
animalBackgroundName = ct.getObservationTargetById(animalBackgroundId).getName();
}
returnString += ("background: " + animalBackgroundName + "; ");
Query<ObservedValue> q = db.query(ObservedValue.class);
q.addRules(new QueryRule(ObservedValue.DELETED, Operator.EQUALS, false));
q.addRules(new QueryRule(ObservedValue.TARGET, Operator.EQUALS, animalId));
q.addRules(new QueryRule(ObservedValue.FEATURE, Operator.EQUALS, ct.getMeasurementId("GeneModification")));
List<ObservedValue> valueList = q.find();
if (valueList != null) {
int protocolApplicationId;
for (ObservedValue value : valueList) {
String geneName = value.getValue();
String geneState = "";
protocolApplicationId = value.getProtocolApplication_Id();
q = db.query(ObservedValue.class);
q.addRules(new QueryRule(ObservedValue.DELETED, Operator.EQUALS, false));
q.addRules(new QueryRule(ObservedValue.TARGET, Operator.EQUALS, animalId));
q.addRules(new QueryRule(ObservedValue.FEATURE, Operator.EQUALS, ct.getMeasurementId("GeneState")));
q.addRules(new QueryRule(ObservedValue.PROTOCOLAPPLICATION, Operator.EQUALS, protocolApplicationId));
List<ObservedValue> geneStateValueList = q.find();
if (geneStateValueList != null) {
if (geneStateValueList.size() > 0) {
geneState = geneStateValueList.get(0).getValue();
}
}
returnString += ("gene: " + geneName + ": " + geneState + "; ");
}
}
if (returnString.length() > 0) {
returnString = returnString.substring(0, returnString.length() - 2);
}
return returnString;
}
private String getLineInfo(int parentgroupId) throws DatabaseException, ParseException {
int lineId = ct.getMostRecentValueAsXref(parentgroupId, ct.getMeasurementId("Line"));
String lineName = ct.getObservationTargetById(lineId).getName();
return lineName;
}
public List<String> getBases() {
return bases;
}
public void setBases(List<String> bases) {
this.bases = bases;
}
public String getStartNumberHelperContent() {
try {
String helperContents = "";
helperContents += (ct.getHighestNumberForPrefix("") + 1);
helperContents += ";1";
for (String base : this.bases) {
if (!base.equals("")) {
helperContents += (";" + (ct.getHighestNumberForPrefix(base) + 1));
}
}
return helperContents;
} catch (Exception e) {
return "";
}
}
public int getStartNumberForEmptyBase() {
try {
return ct.getHighestNumberForPrefix("") + 1;
} catch (DatabaseException e) {
return 1;
}
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
public String getStatus(int litterId) throws DatabaseException {
try {
return ct.getMostRecentValueAsString(litterId, ct.getMeasurementId("Active"));
} catch (Exception e) {
e.printStackTrace();
return "Error while retrieving status";
}
}
public void setStatus(String status) {
this.status = status;
}
@Override
public void handleRequest(Database db, Tuple request)
{
ct.setDatabase(db);
try {
this.action = request.getString("__action");
if (action.startsWith(matrixViewer.getName())) {
matrixViewer.handleRequest(db, request);
this.action = "AddLitter";
}
if (action.equals("MakeTmpLabels")) {
setLitter(request.getInt("id"));
makeTempCageLabels(db);
}
if (action.equals("MakeDefLabels")) {
setLitter(request.getInt("id"));
makeDefCageLabels(db);
}
if (action.equals("AddLitter")) {
//
}
if (action.equals("ShowLitters")) {
//
}
if (action.equals("ApplyAddLitter")) {
String litterName = ApplyAddLitter(db, request);
this.litterSize = 0;
this.remarks = null;
this.birthdate = null;
this.selectedParentgroup = -1;
this.action = "ShowLitters";
reload(db);
reloadLitterLists(db, false);
this.getMessages().clear();
this.getMessages().add(new ScreenMessage("Litter " + litterName + " successfully added", true));
}
if (action.equals("ShowWean")) {
setLitter(request.getInt("id"));
}
if (action.equals("Wean")) {
int weanSize = Wean(db, request);
// Update custom label map now new animals have been added
ct.makeObservationTargetNameMap(this.getLogin().getUserId(), true);
this.weandate = null;
this.selectedParentgroup = -1;
this.action = "ShowLitters";
reload(db);
reloadLitterLists(db, false);
this.getMessages().add(new ScreenMessage("All " + weanSize + " animals successfully weaned", true));
}
if (action.equals("ShowGenotype")) {
ShowGenotype(db, request);
}
if (action.equals("AddGenoCol")) {
storeGenotypeTable(db, request);
AddGenoCol(db, request);
this.getMessages().add(new ScreenMessage("Gene modification + state pair successfully added", true));
}
if (action.equals("RemGenoCol")) {
if (nrOfGenotypes > 1) {
int currCol = 5 + ((nrOfGenotypes - 1) * 2);
genotypeTable.removeColumn(currCol); // NB: nr. of cols is now 1 lower!
genotypeTable.removeColumn(currCol);
nrOfGenotypes--;
this.getMessages().add(new ScreenMessage("Gene modification + state pair successfully removed", true));
} else {
this.getMessages().add(new ScreenMessage("Cannot remove - at least one Gene modification + state pair has to remain", false));
}
storeGenotypeTable(db, request);
}
if (action.equals("Genotype")) {
int animalCount = Genotype(db, request);
this.action = "ShowLitters";
this.selectedParentgroup = -1;
reload(db);
reloadLitterLists(db, false);
this.getMessages().add(new ScreenMessage("All " + animalCount + " animals successfully genotyped", true));
}
if (action.equals("ShowDoneLitters")) {
reloadLitterLists(db, true);
}
} catch (Exception e) {
if (e.getMessage() != null) {
this.getMessages().add(new ScreenMessage(e.getMessage(), false));
}
e.printStackTrace();
this.action = "ShowLitters";
}
}
private int Genotype(Database db, Tuple request) throws Exception
{
Date now = new Date();
int invid = ct.getObservationTargetById(this.genoLitterId).getInvestigation_Id();
List<Integer> investigationIds = ct.getAllUserInvestigationIds(this.getLogin().getUserId());
// Set genotype date on litter -> this is how we mark a litter as genotyped
// TODO: use proper date from field instead of 'weandate' which is undefined here!!
int protocolId = ct.getProtocolId("SetGenotypeDate");
int measurementId = ct.getMeasurementId("GenotypeDate");
db.add(ct.createObservedValueWithProtocolApplication(invid, now,
null, protocolId, measurementId, this.genoLitterId, weandate, 0));
// Set genotyping remarks on litter
if (request.getString("remarks") != null) {
protocolId = ct.getProtocolId("SetRemark");
measurementId = ct.getMeasurementId("Remark");
db.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, this.genoLitterId, request.getString("remarks"), 0));
}
int animalCount = 0;
for (Individual animal : this.getAnimalsInLitter(db)) {
// Here we (re)set the values from the genotyping
// Set sex
int sexId = request.getInt("1_" + animalCount);
ObservedValue value = ct.getObservedValuesByTargetAndFeature(animal.getId(),
ct.getMeasurementByName("Sex"), investigationIds, invid).get(0);
value.setRelation_Id(sexId);
value.setValue(null);
if (value.getProtocolApplication_Id() == null) {
int paId = ct.makeProtocolApplication(invid, ct.getProtocolId("SetSex"));
value.setProtocolApplication_Id(paId);
db.add(value);
} else {
db.update(value);
}
// Set birth date
String dob = request.getString("0_" + animalCount); // already in new format
value = ct.getObservedValuesByTargetAndFeature(animal.getId(),
ct.getMeasurementByName("DateOfBirth"), investigationIds, invid).get(0);
value.setValue(dob);
if (value.getProtocolApplication_Id() == null) {
int paId = ct.makeProtocolApplication(invid, ct.getProtocolId("SetDateOfBirth"));
value.setProtocolApplication_Id(paId);
db.add(value);
} else {
db.update(value);
}
// Set color
String color = request.getString("2_" + animalCount);
value = ct.getObservedValuesByTargetAndFeature(animal.getId(),
ct.getMeasurementByName("Color"), investigationIds, invid).get(0);
value.setValue(color);
if (value.getProtocolApplication_Id() == null) {
int paId = ct.makeProtocolApplication(invid, ct.getProtocolId("SetColor"));
value.setProtocolApplication_Id(paId);
db.add(value);
} else {
db.update(value);
}
// Set earmark
String earmark = request.getString("3_" + animalCount);
value = ct.getObservedValuesByTargetAndFeature(animal.getId(),
ct.getMeasurementByName("Earmark"), investigationIds, invid).get(0);
value.setValue(earmark);
if (value.getProtocolApplication_Id() == null) {
int paId = ct.makeProtocolApplication(invid, ct.getProtocolId("SetEarmark"));
value.setProtocolApplication_Id(paId);
db.add(value);
} else {
db.update(value);
}
// Set background
int backgroundId = request.getInt("4_" + animalCount);
value = ct.getObservedValuesByTargetAndFeature(animal.getId(),
ct.getMeasurementByName("Background"), investigationIds, invid).get(0);
value.setRelation_Id(backgroundId);
value.setValue(null);
if (value.getProtocolApplication_Id() == null) {
int paId = ct.makeProtocolApplication(invid, ct.getProtocolId("SetBackground"));
value.setProtocolApplication_Id(paId);
db.add(value);
} else {
db.update(value);
}
// Set genotype(s)
for (int genoNr = 0; genoNr < nrOfGenotypes; genoNr++) {
int currCol = 5 + (genoNr * 2);
int paId = ct.makeProtocolApplication(invid, ct.getProtocolId("SetGenotype"));
String geneName = request.getString(currCol + "_" + animalCount);
List<ObservedValue> valueList = ct.getObservedValuesByTargetAndFeature(animal.getId(),
ct.getMeasurementByName("GeneModification"), investigationIds, invid);
if (genoNr < valueList.size()) {
value = valueList.get(genoNr);
} else {
value = new ObservedValue();
value.setFeature_Id(ct.getMeasurementId("GeneModification"));
value.setTarget_Id(animal.getId());
value.setInvestigation_Id(invid);
}
value.setValue(geneName);
if (value.getProtocolApplication_Id() == null) {
value.setProtocolApplication_Id(paId);
db.add(value);
} else {
db.update(value);
}
String geneState = request.getString((currCol + 1) + "_" + animalCount);
valueList = ct.getObservedValuesByTargetAndFeature(animal.getId(),
ct.getMeasurementByName("GeneState"), investigationIds, invid);
if (genoNr < valueList.size()) {
value = valueList.get(genoNr);
} else {
value = new ObservedValue();
value.setFeature_Id(ct.getMeasurementId("GeneState"));
value.setTarget_Id(animal.getId());
value.setInvestigation_Id(invid);
}
value.setValue(geneState);
if (value.getProtocolApplication_Id() == null) {
value.setProtocolApplication_Id(paId);
db.add(value);
} else {
db.update(value);
}
}
animalCount++;
}
return animalCount;
}
private void AddGenoCol(Database db, Tuple request)
{
nrOfGenotypes++;
genotypeTable.addColumn("Gene modification");
genotypeTable.addColumn("Gene state");
int row = 0;
for (Individual animal : getAnimalsInLitter(db)) {
int animalId = animal.getId();
// Check for already selected genes for this animal
List<String> selectedGenes = new ArrayList<String>();
for (int genoNr = 0; genoNr < nrOfGenotypes - 1; genoNr++) {
int currCol = 5 + (genoNr * 2);
if (request.getString(currCol + "_" + row) != null) {
selectedGenes.add(request.getString(currCol + "_" + row));
}
}
// Make new gene mod name box
int newCol = 5 + ((nrOfGenotypes - 1) * 2);
SelectInput geneNameInput = new SelectInput(newCol + "_" + row);
for (String geneName : this.geneNameList) {
if (!selectedGenes.contains(geneName)) {
geneNameInput.addOption(geneName, geneName);
}
}
geneNameInput.setValue(getAnimalGeneInfo("GeneModification", animalId, nrOfGenotypes, db));
geneNameInput.setWidth(-1);
genotypeTable.setCell(newCol, row, geneNameInput);
// Make new gene state box
SelectInput geneStateInput = new SelectInput((newCol + 1) + "_" + row);
for (String geneState : this.geneStateList) {
geneStateInput.addOption(geneState, geneState);
}
geneStateInput.setValue(getAnimalGeneInfo("GeneState", animalId, nrOfGenotypes, db));
geneStateInput.setWidth(-1);
genotypeTable.setCell(newCol + 1, row, geneStateInput);
row++;
}
}
private void ShowGenotype(Database db, Tuple request)
{
nrOfGenotypes = 1;
this.setGenoLitterId(request.getInt("id"));
// Prepare table
genotypeTable = new Table("GenoTable", "");
genotypeTable.addColumn("Birth date");
genotypeTable.addColumn("Sex");
genotypeTable.addColumn("Color");
genotypeTable.addColumn("Earmark");
genotypeTable.addColumn("Background");
genotypeTable.addColumn("Gene modification");
genotypeTable.addColumn("Gene state");
int row = 0;
for (Individual animal : getAnimalsInLitter(db)) {
int animalId = animal.getId();
genotypeTable.addRow(animal.getName());
// Birth date
DateInput dateInput = new DateInput("0_" + row);
dateInput.setValue(getAnimalBirthDate(animalId));
genotypeTable.setCell(0, row, dateInput);
// Sex
SelectInput sexInput = new SelectInput("1_" + row);
for (ObservationTarget sex : this.sexList) {
sexInput.addOption(sex.getId(), sex.getName());
}
sexInput.setValue(getAnimalSex(animalId));
sexInput.setWidth(-1);
genotypeTable.setCell(1, row, sexInput);
// Color
SelectInput colorInput = new SelectInput("2_" + row);
for (String color : this.colorList) {
colorInput.addOption(color, color);
}
colorInput.setValue(getAnimalColor(animalId));
colorInput.setWidth(-1);
genotypeTable.setCell(2, row, colorInput);
// Earmark
SelectInput earmarkInput = new SelectInput("3_" + row);
for (Category earmark : this.earmarkList) {
earmarkInput.addOption(earmark.getCode_String(), earmark.getCode_String());
}
earmarkInput.setValue(getAnimalEarmark(animalId));
earmarkInput.setWidth(-1);
genotypeTable.setCell(3, row, earmarkInput);
// Background
SelectInput backgroundInput = new SelectInput("4_" + row);
for (ObservationTarget background : this.backgroundList) {
backgroundInput.addOption(background.getId(), background.getName());
}
backgroundInput.setValue(getAnimalBackground(animalId));
backgroundInput.setWidth(-1);
genotypeTable.setCell(4, row, backgroundInput);
// TODO: show columns and selectboxes for ALL set geno mods
// Gene mod name (1)
SelectInput geneNameInput = new SelectInput("5_" + row);
for (String geneName : this.geneNameList) {
geneNameInput.addOption(geneName, geneName);
}
geneNameInput.setValue(getAnimalGeneInfo("GeneModification", animalId, 0, db));
geneNameInput.setWidth(-1);
genotypeTable.setCell(5, row, geneNameInput);
// Gene state (1)
SelectInput geneStateInput = new SelectInput("6_" + row);
for (String geneState : this.geneStateList) {
geneStateInput.addOption(geneState, geneState);
}
geneStateInput.setValue(getAnimalGeneInfo("GeneState", animalId, 0, db));
geneStateInput.setWidth(-1);
genotypeTable.setCell(6, row, geneStateInput);
row++;
}
}
private int Wean(Database db, Tuple request) throws Exception
{
Date now = new Date();
int invid = ct.getObservationTargetById(litter).getInvestigation_Id();
setUserFields(request, true);
Date weanDate = newDateOnlyFormat.parse(weandate);
int userId = this.getLogin().getUserId();
// Init lists that we can later add to the DB at once
List<ObservedValue> valuesToAddList = new ArrayList<ObservedValue>();
List<ObservationTarget> animalsToAddList = new ArrayList<ObservationTarget>();
// Source (take from litter)
int sourceId;
try {
sourceId = ct.getMostRecentValueAsXref(litter, ct.getMeasurementId("Source"));
} catch (Exception e) {
throw(new Exception("No source found - litter not weaned"));
}
// Get litter birth date
String litterBirthDateString;
Date litterBirthDate;
try {
litterBirthDateString = ct.getMostRecentValueAsString(litter, ct.getMeasurementId("DateOfBirth"));
litterBirthDate = newDateOnlyFormat.parse(litterBirthDateString);
} catch (Exception e) {
throw(new Exception("No litter birth date found - litter not weaned"));
}
// Find Parentgroup for this litter
int parentgroupId;
try {
parentgroupId = ct.getMostRecentValueAsXref(litter, ct.getMeasurementId("Parentgroup"));
} catch (Exception e) {
throw(new Exception("No parentgroup found - litter not weaned"));
}
// Find Line for this Parentgroup
int lineId = ct.getMostRecentValueAsXref(parentgroupId, ct.getMeasurementId("Line"));
// Find first mother, plus her animal type, species, color, background, gene name and gene state
int speciesId;
String animalType;
String color;
int motherBackgroundId;
String geneName;
String geneState;
int motherId;
try {
motherId = findParentForParentgroup(parentgroupId, "Mother", db);
speciesId = ct.getMostRecentValueAsXref(motherId, ct.getMeasurementId("Species"));
animalType = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("AnimalType"));
color = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("Color"));
motherBackgroundId = ct.getMostRecentValueAsXref(motherId, ct.getMeasurementId("Background"));
geneName = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("GeneModification"));
geneState = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("GeneState"));
} catch (Exception e) {
throw(new Exception("No mother (properties) found - litter not weaned"));
}
int fatherBackgroundId;
int fatherId;
try {
fatherId = findParentForParentgroup(parentgroupId, "Father", db);
fatherBackgroundId = ct.getMostRecentValueAsXref(fatherId, ct.getMeasurementId("Background"));
} catch (Exception e) {
throw(new Exception("No father (properties) found - litter not weaned"));
}
// Keep normal and transgene types, but set type of child from wild parents to normal
// TODO: animalType should be based on BOTH mother and father
if (animalType.equals("C. Wildvang") || animalType.equals("D. Biotoop")) {
animalType = "A. Gewoon dier";
}
// Set wean sizes
int weanSize = weanSizeFemale + weanSizeMale + weanSizeUnknown;
int protocolId = ct.getProtocolId("SetWeanSize");
int measurementId = ct.getMeasurementId("WeanSize");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSize), 0));
protocolId = ct.getProtocolId("SetWeanSizeFemale");
measurementId = ct.getMeasurementId("WeanSizeFemale");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSizeFemale), 0));
protocolId = ct.getProtocolId("SetWeanSizeMale");
measurementId = ct.getMeasurementId("WeanSizeMale");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSizeMale), 0));
protocolId = ct.getProtocolId("SetWeanSizeUnknown");
measurementId = ct.getMeasurementId("WeanSizeUnknown");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSizeUnknown), 0));
// Set wean date on litter -> this is how we mark a litter as weaned (but not genotyped)
protocolId = ct.getProtocolId("SetWeanDate");
measurementId = ct.getMeasurementId("WeanDate");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, litter, newDateOnlyFormat.format(weanDate), 0));
// Set weaning remarks on litter
if (remarks != null) {
protocolId = ct.getProtocolId("SetRemark");
measurementId = ct.getMeasurementId("Remark");
db.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, remarks, 0));
}
// change litter status from active to inactive
protocolId = ct.getProtocolId("SetActive");
measurementId = ct.getMeasurementId("Active");
- valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate, null, measurementId, protocolId, litter,
- "Inactive", 0));
+ valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate, null,
+ protocolId, measurementId, litter, "Inactive", 0));
// Make animal, link to litter, parents and set wean dates etc.
for (int animalNumber = 0; animalNumber < weanSize; animalNumber++) {
String nrPart = "" + (startNumber + animalNumber);
nrPart = ct.prependZeros(nrPart, 6);
ObservationTarget animalToAdd = ct.createIndividual(invid, nameBase + nrPart,
userId);
animalsToAddList.add(animalToAdd);
}
db.add(animalsToAddList);
// Make or update name prefix entry
ct.updatePrefix("animal", nameBase, startNumber + weanSize - 1);
int animalNumber = 0;
for (ObservationTarget animal : animalsToAddList) {
int animalId = animal.getId();
// TODO: link every value to a single Wean protocol application instead of to its own one
// Link to litter
protocolId = ct.getProtocolId("SetLitter");
measurementId = ct.getMeasurementId("Litter");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, litter));
// Link to parents
protocolId = ct.getProtocolId("SetMother");
measurementId = ct.getMeasurementId("Mother");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, motherId));
protocolId = ct.getProtocolId("SetFather");
measurementId = ct.getMeasurementId("Father");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, fatherId));
// Set line also on animal itself
protocolId = ct.getProtocolId("SetLine");
measurementId = ct.getMeasurementId("Line");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, lineId));
// Set responsible researcher
protocolId = ct.getProtocolId("SetResponsibleResearcher");
measurementId = ct.getMeasurementId("ResponsibleResearcher");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now,
null, protocolId, measurementId, animalId, respres, 0));
// Set sex
int sexId = ct.getObservationTargetId("Female");
if (animalNumber >= weanSizeFemale) {
if (animalNumber < weanSizeFemale + weanSizeMale) {
sexId = ct.getObservationTargetId("Male");
} else {
sexId = ct.getObservationTargetId("UnknownSex");
}
}
protocolId = ct.getProtocolId("SetSex");
measurementId = ct.getMeasurementId("Sex");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, sexId));
// Set wean date on animal
protocolId = ct.getProtocolId("SetWeanDate");
measurementId = ct.getMeasurementId("WeanDate");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, newDateOnlyFormat.format(weanDate), 0));
// Set 'Active'
protocolId = ct.getProtocolId("SetActive");
measurementId = ct.getMeasurementId("Active");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid,
litterBirthDate, null, protocolId, measurementId, animalId, "Alive", 0));
// Set 'Date of Birth'
protocolId = ct.getProtocolId("SetDateOfBirth");
measurementId = ct.getMeasurementId("DateOfBirth");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, litterBirthDateString, 0));
// Set species
protocolId = ct.getProtocolId("SetSpecies");
measurementId = ct.getMeasurementId("Species");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, speciesId));
// Set animal type
protocolId = ct.getProtocolId("SetAnimalType");
measurementId = ct.getMeasurementId("AnimalType");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, animalType, 0));
// Set source
protocolId = ct.getProtocolId("SetSource");
measurementId = ct.getMeasurementId("Source");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, sourceId));
// Set color based on mother's (can be changed during genotyping)
if (!color.equals("")) {
protocolId = ct.getProtocolId("SetColor");
measurementId = ct.getMeasurementId("Color");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, color, 0));
}
// Set background based on mother's and father's (can be changed during genotyping)
int backgroundId = -1;
if (motherBackgroundId != -1 && fatherBackgroundId == -1) {
backgroundId = motherBackgroundId;
} else if (motherBackgroundId == -1 && fatherBackgroundId != -1) {
backgroundId = fatherBackgroundId;
} else if (motherBackgroundId != -1 && fatherBackgroundId != -1) {
// Make new or use existing cross background
String motherBackgroundName = ct.getObservationTargetLabel(motherBackgroundId);
String fatherBackgroundName = ct.getObservationTargetLabel(fatherBackgroundId);
if (motherBackgroundId == fatherBackgroundId) {
backgroundId = ct.getObservationTargetId(fatherBackgroundName);
} else {
backgroundId = ct.getObservationTargetId(fatherBackgroundName + " X " + motherBackgroundName);
}
if (backgroundId == -1) {
backgroundId = ct.makePanel(invid, fatherBackgroundName + " X " + motherBackgroundName, userId);
protocolId = ct.getProtocolId("SetTypeOfGroup");
measurementId = ct.getMeasurementId("TypeOfGroup");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate, null,
protocolId, measurementId, backgroundId, "Background", 0));
}
}
if (backgroundId != -1) {
protocolId = ct.getProtocolId("SetBackground");
measurementId = ct.getMeasurementId("Background");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, backgroundId));
}
// Set genotype
// TODO: Set based on mother's X father's and ONLY if you can know the outcome
if (!geneName.equals("") && !geneState.equals("")) {
protocolId = ct.getProtocolId("SetGenotype");
int paId = ct.makeProtocolApplication(invid, protocolId);
// Set gene mod name based on mother's (can be changed during genotyping)
measurementId = ct.getMeasurementId("GeneModification");
valuesToAddList.add(ct.createObservedValue(invid, paId, weanDate,
null, measurementId, animalId, geneName, 0));
// Set gene state based on mother's (can be changed during genotyping)
measurementId = ct.getMeasurementId("GeneState");
valuesToAddList.add(ct.createObservedValue(invid, paId, weanDate,
null, measurementId, animalId, geneState, 0));
}
animalNumber++;
}
db.add(valuesToAddList);
return weanSize;
}
private String ApplyAddLitter(Database db, Tuple request) throws Exception
{
Date now = new Date();
//setUserFields(request, false);
List<?> rows = matrixViewer.getSelection(db);
try {
int row = request.getInt(MATRIX + "_selected");
this.selectedParentgroup = ((ObservationElement) rows.get(row)).getId();
} catch (Exception e) {
this.setAction("AddLitter");
throw new Exception("No parent group selected - litter not added");
}
int invid = ct.getOwnUserInvestigationIds(this.getLogin().getUserId()).get(0);
setUserFields(request, false);
Date eventDate = newDateOnlyFormat.parse(birthdate);
int userId = this.getLogin().getUserId();
int lineId = ct.getMostRecentValueAsXref(selectedParentgroup, ct.getMeasurementId("Line"));
// Init lists that we can later add to the DB at once
List<ObservedValue> valuesToAddList = new ArrayList<ObservedValue>();
// Make group
String litterPrefix = "LT_" + ct.getObservationTargetLabel(lineId) + "_";
int litterNr = ct.getHighestNumberForPrefix(litterPrefix) + 1;
String litterNrPart = "" + litterNr;
litterNrPart = ct.prependZeros(litterNrPart, 6);
int litterid = ct.makePanel(invid, litterPrefix + litterNrPart, userId);
// Make or update name prefix entry
ct.updatePrefix("litter", litterPrefix, litterNr);
// Mark group as a litter
int protocolId = ct.getProtocolId("SetTypeOfGroup");
int measurementId = ct.getMeasurementId("TypeOfGroup");
db.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litterid, "Litter", 0));
// Apply other fields using event
protocolId = ct.getProtocolId("SetLitterSpecs");
ProtocolApplication app = ct.createProtocolApplication(invid, protocolId);
db.add(app);
int eventid = app.getId();
// Parentgroup
measurementId = ct.getMeasurementId("Parentgroup");
valuesToAddList.add(ct.createObservedValue(invid, eventid, eventDate, null, measurementId,
litterid, null, selectedParentgroup));
// Date of Birth
measurementId = ct.getMeasurementId("DateOfBirth");
valuesToAddList.add(ct.createObservedValue(invid, eventid, eventDate, null, measurementId,
litterid, newDateOnlyFormat.format(eventDate), 0));
// Size
measurementId = ct.getMeasurementId("Size");
valuesToAddList.add(ct.createObservedValue(invid, eventid, eventDate, null, measurementId, litterid,
Integer.toString(litterSize), 0));
// Size approximate (certain)?
String valueString = "0";
if (litterSizeApproximate == true) {
valueString = "1";
}
measurementId = ct.getMeasurementId("Certain");
valuesToAddList.add(ct.createObservedValue(invid, eventid, eventDate, null, measurementId, litterid,
valueString, 0));
// Remarks
if (remarks != null) {
protocolId = ct.getProtocolId("SetRemark");
measurementId = ct.getMeasurementId("Remark");
db.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litterid, remarks, 0));
}
// Get Source via Line
measurementId = ct.getMeasurementId("Source");
try {
int sourceId = ct.getMostRecentValueAsXref(lineId, measurementId);
protocolId = ct.getProtocolId("SetSource");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid,
eventDate, null, protocolId, measurementId, litterid, null, sourceId));
} catch(Exception e) {
//
}
// Active
measurementId = ct.getMeasurementId("Active");
valuesToAddList.add(ct.createObservedValue(invid, eventid, eventDate, null, measurementId, litterid,
"Active", 0));
// Add everything to DB
db.add(valuesToAddList);
return litterPrefix + litterNrPart;
}
private void makeDefCageLabels(Database db) throws LabelGeneratorException, DatabaseException, ParseException {
// PDF file stuff
File tmpDir = new File(System.getProperty("java.io.tmpdir"));
File pdfFile = new File(tmpDir.getAbsolutePath() + File.separatorChar + "deflabels.pdf");
String filename = pdfFile.getName();
LabelGenerator labelgenerator = new LabelGenerator(2);
labelgenerator.startDocument(pdfFile);
// Litter stuff
int parentgroupId = ct.getMostRecentValueAsXref(litter, ct.getMeasurementId("Parentgroup"));
String line = this.getLineInfo(parentgroupId);
int motherId = findParentForParentgroup(parentgroupId, "Mother", db);
String motherInfo = this.getGenoInfo(motherId, db);
int fatherId = findParentForParentgroup(parentgroupId, "Father", db);
String fatherInfo = this.getGenoInfo(fatherId, db);
List<String> elementLabelList;
List<String> elementList;
for (Individual animal : this.getAnimalsInLitter(litter, db)) {
int animalId = animal.getId();
elementList = new ArrayList<String>();
elementLabelList = new ArrayList<String>();
//ID
elementLabelList.add("Animal ID:");
elementList.add(Integer.toString(animalId));
// Earmark
elementLabelList.add("Earmark:");
elementList.add(ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("Earmark")));
// Name / custom label
elementLabelList.add("Name:");
elementList.add(ct.getObservationTargetLabel(animalId));
// Line
elementLabelList.add("Line:");
elementList.add(line);
// Background + GeneModification + GeneState
elementLabelList.add("Genotype:");
elementList.add(this.getGenoInfo(animalId, db));
// Color + Sex
elementLabelList.add("Color and Sex:");
String colorSex = ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("Color"));
colorSex += "\t\t";
int sexId = ct.getMostRecentValueAsXref(animalId, ct.getMeasurementId("Sex"));
colorSex += ct.getObservationTargetById(sexId).getName();
elementList.add(colorSex);
//Birthdate
elementLabelList.add("Birthdate:");
elementList.add(ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("DateOfBirth")));
// Geno mother
elementLabelList.add("Genotype mother:");
elementList.add(motherInfo);
// Geno father
elementLabelList.add("Genotype father:");
elementList.add(fatherInfo);
// Add DEC nr, if present, or empty if not
elementLabelList.add("DEC:");
String DecNr = ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("DecNr")) + " " + ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("ExperimentNr"));
elementList.add(DecNr);
// Not needed at this time, maybe later:
// Birthdate
//elementList.add("Birthdate: " + ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("DateOfBirth")));
// OldUliDbExperimentator -> TODO: add responsible researcher
//elementList.add("Experimenter: " + ct.getMostRecentValueAsString(animalId, ct.getMeasurementId("OldUliDbExperimentator")));
labelgenerator.addLabelToDocument(elementLabelList, elementList);
}
// In case of an odd number of animals, add extra label to make row full
if (this.getAnimalsInLitter(litter, db).size() %2 != 0) {
elementLabelList = new ArrayList<String>();
elementList = new ArrayList<String>();
labelgenerator.addLabelToDocument(elementLabelList, elementList);
}
labelgenerator.finishDocument();
this.setLabelDownloadLink("<a href=\"tmpfile/" + filename + "\">Download definitive cage labels as pdf</a>");
}
private void makeTempCageLabels(Database db) throws Exception {
// PDF file stuff
File tmpDir = new File(System.getProperty("java.io.tmpdir"));
File pdfFile = new File(tmpDir.getAbsolutePath() + File.separatorChar + "weanlabels.pdf");
String filename = pdfFile.getName();
LabelGenerator labelgenerator = new LabelGenerator(2);
labelgenerator.startDocument(pdfFile);
List<String> elementList;
// Selected litter stuff
int parentgroupId = ct.getMostRecentValueAsXref(litter, ct.getMeasurementId("Parentgroup"));
int lineId = ct.getMostRecentValueAsXref(parentgroupId, ct.getMeasurementId("Line"));
String lineName = ct.getObservationTargetById(lineId).getName();
int motherId = findParentForParentgroup(parentgroupId, "Mother", db);
String motherName = ct.getObservationTargetById(motherId).getName();
int fatherId = findParentForParentgroup(parentgroupId, "Father", db);
String fatherName = ct.getObservationTargetById(fatherId).getName();
String litterBirthDateString = ct.getMostRecentValueAsString(litter, ct.getMeasurementId("DateOfBirth"));
int nrOfFemales = Integer.parseInt(ct.getMostRecentValueAsString(litter, ct.getMeasurementId("WeanSizeFemale")));
int nrOfMales = Integer.parseInt(ct.getMostRecentValueAsString(litter, ct.getMeasurementId("WeanSizeMale")));
int nrOfUnknowns = Integer.parseInt(ct.getMostRecentValueAsString(litter, ct.getMeasurementId("WeanSizeUnknown")));
// Labels for females
int nrOfCages = 0;
while (nrOfFemales > 0) {
elementList = new ArrayList<String>();
// Line name + Nr. of females in cage
String firstLine = lineName + "\t\t";
// Females can be 2 or 3 in a cage, if possible not 1
int cageSize;
if (nrOfFemales > 4) {
cageSize = 3;
} else {
if (nrOfFemales == 4) {
cageSize = 2;
} else {
cageSize = nrOfFemales;
}
}
firstLine += (cageSize + " female");
if (cageSize > 1) firstLine += "s";
elementList.add(firstLine);
// Parents
elementList.add(motherName + " x " + fatherName);
// Litter birth date
elementList.add(litterBirthDateString);
// Nrs. for writing extra information behind
for (int i = 1; i <= cageSize; i++) {
elementList.add(i + ".");
}
labelgenerator.addLabelToDocument(elementList);
nrOfFemales -= cageSize;
nrOfCages++;
}
// Labels for males
while (nrOfMales > 0) {
elementList = new ArrayList<String>();
// Line name + Nr. of males in cage
String firstLine = lineName;
if (nrOfMales >= 2) {
firstLine += "\t\t2 males";
} else {
firstLine += "\t\t1 male";
}
elementList.add(firstLine);
// Parents
elementList.add(motherName + " x " + fatherName);
// Litter birth date
elementList.add(litterBirthDateString);
// Nrs. for writing extra information behind
for (int i = 1; i <= Math.min(nrOfMales, 2); i++) {
elementList.add(i + ".");
}
labelgenerator.addLabelToDocument(elementList);
nrOfMales -= 2;
nrOfCages++;
}
// Labels for unknowns
// TODO: keep or group together with (fe)males?
while (nrOfUnknowns > 0) {
elementList = new ArrayList<String>();
// Line name + Nr. of unknowns in cage
String firstLine = lineName;
if (nrOfUnknowns >= 2) {
firstLine += "\t\t2 unknowns";
} else {
firstLine += "\t\t1 unknown";
}
elementList.add(firstLine);
// Parents
elementList.add(motherName + " x " + fatherName);
// Litter birth date
elementList.add(litterBirthDateString);
// Nrs. for writing extra information behind
for (int i = 1; i <= Math.min(nrOfUnknowns, 2); i++) {
elementList.add(i + ".");
}
labelgenerator.addLabelToDocument(elementList);
nrOfUnknowns -= 2;
nrOfCages++;
}
// In case of an odd number of cages, add extra label to make row full
if (nrOfCages %2 != 0) {
elementList = new ArrayList<String>();
labelgenerator.addLabelToDocument(elementList);
}
labelgenerator.finishDocument();
this.setLabelDownloadLink("<a href=\"tmpfile/" + filename + "\">Download temporary wean labels as pdf</a>");
}
@Override
public void reload(Database db)
{
ct.setDatabase(db);
this.toHtmlDb = db;
if (this.getLogin().getUserId().intValue() != userId) {
userId = this.getLogin().getUserId().intValue();
reloadLitterLists(db, false);
reloadMatrixViewer();
}
try {
int userId = this.getLogin().getUserId();
List<Integer> investigationIds = ct.getAllUserInvestigationIds(userId);
// Populate parent group list
this.setParentgroupList(ct.getAllMarkedPanels("Parentgroup", investigationIds));
// Populate backgrounds list
this.setBackgroundList(ct.getAllMarkedPanels("Background", investigationIds));
// Populate sexes list
this.setSexList(ct.getAllMarkedPanels("Sex", investigationIds));
// Populate gene name list
this.setGeneNameList(ct.getAllCodesForFeatureAsStrings("GeneModification"));
// Populate gene state list
this.setGeneStateList(ct.getAllCodesForFeatureAsStrings("GeneState"));
// Populate color list
this.setColorList(ct.getAllCodesForFeatureAsStrings("Color"));
// Populate earmark list
this.setEarmarkList(ct.getAllCodesForFeature("Earmark"));
// Populate name prefixes list for the animals
this.bases = new ArrayList<String>();
List<String> tmpPrefixes = ct.getPrefixes("animal");
for (String tmpPrefix : tmpPrefixes) {
if (!tmpPrefix.equals("")) {
this.bases.add(tmpPrefix);
}
}
} catch (Exception e) {
if (e.getMessage() != null) {
this.getMessages().clear();
this.getMessages().add(new ScreenMessage(e.getMessage(), false));
}
e.printStackTrace();
}
}
private void reloadLitterLists(Database db, boolean includeDone) {
//this.db = db;
ct.setDatabase(db);
ct.makeObservationTargetNameMap(this.getLogin().getUserId(), false);
try {
List<Integer> investigationIds = ct.getAllUserInvestigationIds(this.getLogin().getUserId());
// Populate litter lists
litterList.clear();
genoLitterList.clear();
if (includeDone) doneLitterList.clear();
// Make list of ID's of weaned litters
List<Integer> weanedLitterIdList = new ArrayList<Integer>();
Query<ObservedValue> q = db.query(ObservedValue.class);
q.addRules(new QueryRule(ObservedValue.DELETED, Operator.EQUALS, false));
q.addRules(new QueryRule(ObservedValue.FEATURE, Operator.EQUALS, ct.getMeasurementId("WeanDate")));
List<ObservedValue> valueList = q.find();
for (ObservedValue value : valueList) {
int litterId = value.getTarget_Id();
if (!weanedLitterIdList.contains(litterId)) {
weanedLitterIdList.add(litterId);
}
}
// Make list of ID's of genotyped litters
List<Integer> genotypedLitterIdList = new ArrayList<Integer>();
q = db.query(ObservedValue.class);
q.addRules(new QueryRule(ObservedValue.DELETED, Operator.EQUALS, false));
q.addRules(new QueryRule(ObservedValue.FEATURE, Operator.EQUALS, ct.getMeasurementId("GenotypeDate")));
valueList = q.find();
for (ObservedValue value : valueList) {
int litterId = value.getTarget_Id();
if (!genotypedLitterIdList.contains(litterId)) {
genotypedLitterIdList.add(litterId);
}
}
// Get all litters that the current user has rights on
List<ObservationTarget> allLitterList = ct.getAllMarkedPanels("Litter", investigationIds);
for (ObservationTarget litter : allLitterList) {
int litterId = litter.getId();
if (!includeDone && genotypedLitterIdList.contains(litterId)) {
continue;
}
// Make a temporary litter and set all relevant values
Litter litterToAdd = new Litter();
// ID
litterToAdd.setId(litterId);
// Name
litterToAdd.setName(litter.getName());
// Parentgroup
int parentgroupId = ct.getMostRecentValueAsXref(litterId, ct.getMeasurementId("Parentgroup"));
String parentgroup = ct.getObservationTargetById(parentgroupId).getName();
litterToAdd.setParentgroup(parentgroup);
// Birth date
String birthDate = ct.getMostRecentValueAsString(litterId, ct.getMeasurementId("DateOfBirth"));
if (birthDate != null && !birthDate.equals("")) {
litterToAdd.setBirthDate(birthDate);
}
// Wean date
String weanDate = ct.getMostRecentValueAsString(litterId, ct.getMeasurementId("WeanDate"));
if (weanDate != null && !weanDate.equals("")) {
litterToAdd.setWeanDate(weanDate);
}
// Size
String size = ct.getMostRecentValueAsString(litterId, ct.getMeasurementId("Size"));
if (size.equals("")) {
litterToAdd.setSize(-1);
} else {
litterToAdd.setSize(Integer.parseInt(size));
}
// Wean size
String weanSize = ct.getMostRecentValueAsString(litterId, ct.getMeasurementId("WeanSize"));
if (weanSize.equals("")) {
litterToAdd.setWeanSize(-1);
} else {
litterToAdd.setWeanSize(Integer.parseInt(weanSize));
}
// Size approximate
String isApproximate = "";
String tmpValue = ct.getMostRecentValueAsString(litterId, ct.getMeasurementId("Certain"));
if (tmpValue.equals("0")) {
isApproximate = "No";
}
if (tmpValue.equals("1")) {
isApproximate = "Yes";
}
litterToAdd.setSizeApproximate(isApproximate);
// Remarks
List<String> remarksList = ct.getRemarks(litterId);
String remarks = "";
for (String remark : remarksList) {
remarks += (remark + "<br>");
}
if (remarks.length() > 0) {
remarks = remarks.substring(0, remarks.length() - 4);
}
litterToAdd.setRemarks(remarks);
// Status
String status = ct.getMostRecentValueAsString(litterId, ct.getMeasurementId("Active"));
litterToAdd.setStatus(status);
// Add to the right list
if (!weanedLitterIdList.contains(litterId) && !genotypedLitterIdList.contains(litterId)) {
litterList.add(litterToAdd);
} else {
if (!genotypedLitterIdList.contains(litterId)) {
genoLitterList.add(litterToAdd);
} else {
doneLitterList.add(litterToAdd);
}
}
}
} catch (Exception e) {
if (e.getMessage() != null) {
this.getMessages().clear();
this.getMessages().add(new ScreenMessage(e.getMessage(), false));
}
e.printStackTrace();
}
}
public String getGenotypeTable() {
return genotypeTable.render();
}
private void storeGenotypeTable(Database db, Tuple request) {
HtmlInput input;
int animalCount = 0;
for (Individual animal : this.getAnimalsInLitter(db)) {
if (request.getString("0_" + animalCount) != null) {
String dob = request.getString("0_" + animalCount); // already in new format
input = (HtmlInput) genotypeTable.getCell(0, animalCount);
input.setValue(dob);
genotypeTable.setCell(0, animalCount, input);
}
if (request.getString("1_" + animalCount) != null) {
int sexId = request.getInt("1_" + animalCount);
input = (HtmlInput) genotypeTable.getCell(1, animalCount);
input.setValue(sexId);
genotypeTable.setCell(1, animalCount, input);
}
if (request.getString("2_" + animalCount) != null) {
String color = request.getString("2_" + animalCount);
input = (HtmlInput) genotypeTable.getCell(2, animalCount);
input.setValue(color);
genotypeTable.setCell(2, animalCount, input);
}
if (request.getString("3_" + animalCount) != null) {
String earmark = request.getString("3_" + animalCount);
input = (HtmlInput) genotypeTable.getCell(3, animalCount);
input.setValue(earmark);
genotypeTable.setCell(3, animalCount, input);
}
if (request.getString("4_" + animalCount) != null) {
int backgroundId = request.getInt("4_" + animalCount);
input = (HtmlInput) genotypeTable.getCell(4, animalCount);
input.setValue(backgroundId);
genotypeTable.setCell(4, animalCount, input);
}
for (int genoNr = 0; genoNr < nrOfGenotypes; genoNr++) {
int currCol = 5 + (genoNr * 2);
if (request.getString(currCol + "_" + animalCount) != null) {
String geneName = request.getString(currCol + "_" + animalCount);
input = (HtmlInput) genotypeTable.getCell(currCol, animalCount);
input.setValue(geneName);
genotypeTable.setCell(currCol, animalCount, input);
}
if (request.getString((currCol + 1) + "_" + animalCount) != null) {
String geneState = request.getString((currCol + 1) + "_" + animalCount);
input = (HtmlInput) genotypeTable.getCell(currCol + 1, animalCount);
input.setValue(geneState);
genotypeTable.setCell(currCol + 1, animalCount, input);
}
}
animalCount++;
}
}
private void reloadMatrixViewer() {
try {
List<String> investigationNames = ct.getAllUserInvestigationNames(userId);
List<String> measurementsToShow = new ArrayList<String>();
measurementsToShow.add("TypeOfGroup");
measurementsToShow.add("Line");
measurementsToShow.add("Active");
List<MatrixQueryRule> filterRules = new ArrayList<MatrixQueryRule>();
filterRules.add(new MatrixQueryRule(MatrixQueryRule.Type.rowHeader, Individual.INVESTIGATION_NAME,
Operator.IN, investigationNames));
filterRules.add(new MatrixQueryRule(MatrixQueryRule.Type.colValueProperty, ct.getMeasurementId("TypeOfGroup"),
ObservedValue.VALUE, Operator.EQUALS, "Parentgroup"));
filterRules.add(new MatrixQueryRule(MatrixQueryRule.Type.colValueProperty, ct.getMeasurementId("Active"),
ObservedValue.VALUE, Operator.EQUALS, "Active"));
matrixViewer = new MatrixViewer(this, MATRIX,
new SliceablePhenoMatrix(Panel.class, Measurement.class),
true, false, false, filterRules,
new MatrixQueryRule(MatrixQueryRule.Type.colHeader, Measurement.NAME, Operator.IN, measurementsToShow));
} catch (Exception e) {
String message = "Something went wrong while loading matrix viewer";
if (e.getMessage() != null) {
message += (": " + e.getMessage());
}
this.getMessages().add(new ScreenMessage(message, false));
e.printStackTrace();
}
}
}
| true | true | private int Wean(Database db, Tuple request) throws Exception
{
Date now = new Date();
int invid = ct.getObservationTargetById(litter).getInvestigation_Id();
setUserFields(request, true);
Date weanDate = newDateOnlyFormat.parse(weandate);
int userId = this.getLogin().getUserId();
// Init lists that we can later add to the DB at once
List<ObservedValue> valuesToAddList = new ArrayList<ObservedValue>();
List<ObservationTarget> animalsToAddList = new ArrayList<ObservationTarget>();
// Source (take from litter)
int sourceId;
try {
sourceId = ct.getMostRecentValueAsXref(litter, ct.getMeasurementId("Source"));
} catch (Exception e) {
throw(new Exception("No source found - litter not weaned"));
}
// Get litter birth date
String litterBirthDateString;
Date litterBirthDate;
try {
litterBirthDateString = ct.getMostRecentValueAsString(litter, ct.getMeasurementId("DateOfBirth"));
litterBirthDate = newDateOnlyFormat.parse(litterBirthDateString);
} catch (Exception e) {
throw(new Exception("No litter birth date found - litter not weaned"));
}
// Find Parentgroup for this litter
int parentgroupId;
try {
parentgroupId = ct.getMostRecentValueAsXref(litter, ct.getMeasurementId("Parentgroup"));
} catch (Exception e) {
throw(new Exception("No parentgroup found - litter not weaned"));
}
// Find Line for this Parentgroup
int lineId = ct.getMostRecentValueAsXref(parentgroupId, ct.getMeasurementId("Line"));
// Find first mother, plus her animal type, species, color, background, gene name and gene state
int speciesId;
String animalType;
String color;
int motherBackgroundId;
String geneName;
String geneState;
int motherId;
try {
motherId = findParentForParentgroup(parentgroupId, "Mother", db);
speciesId = ct.getMostRecentValueAsXref(motherId, ct.getMeasurementId("Species"));
animalType = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("AnimalType"));
color = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("Color"));
motherBackgroundId = ct.getMostRecentValueAsXref(motherId, ct.getMeasurementId("Background"));
geneName = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("GeneModification"));
geneState = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("GeneState"));
} catch (Exception e) {
throw(new Exception("No mother (properties) found - litter not weaned"));
}
int fatherBackgroundId;
int fatherId;
try {
fatherId = findParentForParentgroup(parentgroupId, "Father", db);
fatherBackgroundId = ct.getMostRecentValueAsXref(fatherId, ct.getMeasurementId("Background"));
} catch (Exception e) {
throw(new Exception("No father (properties) found - litter not weaned"));
}
// Keep normal and transgene types, but set type of child from wild parents to normal
// TODO: animalType should be based on BOTH mother and father
if (animalType.equals("C. Wildvang") || animalType.equals("D. Biotoop")) {
animalType = "A. Gewoon dier";
}
// Set wean sizes
int weanSize = weanSizeFemale + weanSizeMale + weanSizeUnknown;
int protocolId = ct.getProtocolId("SetWeanSize");
int measurementId = ct.getMeasurementId("WeanSize");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSize), 0));
protocolId = ct.getProtocolId("SetWeanSizeFemale");
measurementId = ct.getMeasurementId("WeanSizeFemale");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSizeFemale), 0));
protocolId = ct.getProtocolId("SetWeanSizeMale");
measurementId = ct.getMeasurementId("WeanSizeMale");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSizeMale), 0));
protocolId = ct.getProtocolId("SetWeanSizeUnknown");
measurementId = ct.getMeasurementId("WeanSizeUnknown");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSizeUnknown), 0));
// Set wean date on litter -> this is how we mark a litter as weaned (but not genotyped)
protocolId = ct.getProtocolId("SetWeanDate");
measurementId = ct.getMeasurementId("WeanDate");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, litter, newDateOnlyFormat.format(weanDate), 0));
// Set weaning remarks on litter
if (remarks != null) {
protocolId = ct.getProtocolId("SetRemark");
measurementId = ct.getMeasurementId("Remark");
db.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, remarks, 0));
}
// change litter status from active to inactive
protocolId = ct.getProtocolId("SetActive");
measurementId = ct.getMeasurementId("Active");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate, null, measurementId, protocolId, litter,
"Inactive", 0));
// Make animal, link to litter, parents and set wean dates etc.
for (int animalNumber = 0; animalNumber < weanSize; animalNumber++) {
String nrPart = "" + (startNumber + animalNumber);
nrPart = ct.prependZeros(nrPart, 6);
ObservationTarget animalToAdd = ct.createIndividual(invid, nameBase + nrPart,
userId);
animalsToAddList.add(animalToAdd);
}
db.add(animalsToAddList);
// Make or update name prefix entry
ct.updatePrefix("animal", nameBase, startNumber + weanSize - 1);
int animalNumber = 0;
for (ObservationTarget animal : animalsToAddList) {
int animalId = animal.getId();
// TODO: link every value to a single Wean protocol application instead of to its own one
// Link to litter
protocolId = ct.getProtocolId("SetLitter");
measurementId = ct.getMeasurementId("Litter");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, litter));
// Link to parents
protocolId = ct.getProtocolId("SetMother");
measurementId = ct.getMeasurementId("Mother");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, motherId));
protocolId = ct.getProtocolId("SetFather");
measurementId = ct.getMeasurementId("Father");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, fatherId));
// Set line also on animal itself
protocolId = ct.getProtocolId("SetLine");
measurementId = ct.getMeasurementId("Line");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, lineId));
// Set responsible researcher
protocolId = ct.getProtocolId("SetResponsibleResearcher");
measurementId = ct.getMeasurementId("ResponsibleResearcher");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now,
null, protocolId, measurementId, animalId, respres, 0));
// Set sex
int sexId = ct.getObservationTargetId("Female");
if (animalNumber >= weanSizeFemale) {
if (animalNumber < weanSizeFemale + weanSizeMale) {
sexId = ct.getObservationTargetId("Male");
} else {
sexId = ct.getObservationTargetId("UnknownSex");
}
}
protocolId = ct.getProtocolId("SetSex");
measurementId = ct.getMeasurementId("Sex");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, sexId));
// Set wean date on animal
protocolId = ct.getProtocolId("SetWeanDate");
measurementId = ct.getMeasurementId("WeanDate");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, newDateOnlyFormat.format(weanDate), 0));
// Set 'Active'
protocolId = ct.getProtocolId("SetActive");
measurementId = ct.getMeasurementId("Active");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid,
litterBirthDate, null, protocolId, measurementId, animalId, "Alive", 0));
// Set 'Date of Birth'
protocolId = ct.getProtocolId("SetDateOfBirth");
measurementId = ct.getMeasurementId("DateOfBirth");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, litterBirthDateString, 0));
// Set species
protocolId = ct.getProtocolId("SetSpecies");
measurementId = ct.getMeasurementId("Species");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, speciesId));
// Set animal type
protocolId = ct.getProtocolId("SetAnimalType");
measurementId = ct.getMeasurementId("AnimalType");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, animalType, 0));
// Set source
protocolId = ct.getProtocolId("SetSource");
measurementId = ct.getMeasurementId("Source");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, sourceId));
// Set color based on mother's (can be changed during genotyping)
if (!color.equals("")) {
protocolId = ct.getProtocolId("SetColor");
measurementId = ct.getMeasurementId("Color");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, color, 0));
}
// Set background based on mother's and father's (can be changed during genotyping)
int backgroundId = -1;
if (motherBackgroundId != -1 && fatherBackgroundId == -1) {
backgroundId = motherBackgroundId;
} else if (motherBackgroundId == -1 && fatherBackgroundId != -1) {
backgroundId = fatherBackgroundId;
} else if (motherBackgroundId != -1 && fatherBackgroundId != -1) {
// Make new or use existing cross background
String motherBackgroundName = ct.getObservationTargetLabel(motherBackgroundId);
String fatherBackgroundName = ct.getObservationTargetLabel(fatherBackgroundId);
if (motherBackgroundId == fatherBackgroundId) {
backgroundId = ct.getObservationTargetId(fatherBackgroundName);
} else {
backgroundId = ct.getObservationTargetId(fatherBackgroundName + " X " + motherBackgroundName);
}
if (backgroundId == -1) {
backgroundId = ct.makePanel(invid, fatherBackgroundName + " X " + motherBackgroundName, userId);
protocolId = ct.getProtocolId("SetTypeOfGroup");
measurementId = ct.getMeasurementId("TypeOfGroup");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate, null,
protocolId, measurementId, backgroundId, "Background", 0));
}
}
if (backgroundId != -1) {
protocolId = ct.getProtocolId("SetBackground");
measurementId = ct.getMeasurementId("Background");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, backgroundId));
}
// Set genotype
// TODO: Set based on mother's X father's and ONLY if you can know the outcome
if (!geneName.equals("") && !geneState.equals("")) {
protocolId = ct.getProtocolId("SetGenotype");
int paId = ct.makeProtocolApplication(invid, protocolId);
// Set gene mod name based on mother's (can be changed during genotyping)
measurementId = ct.getMeasurementId("GeneModification");
valuesToAddList.add(ct.createObservedValue(invid, paId, weanDate,
null, measurementId, animalId, geneName, 0));
// Set gene state based on mother's (can be changed during genotyping)
measurementId = ct.getMeasurementId("GeneState");
valuesToAddList.add(ct.createObservedValue(invid, paId, weanDate,
null, measurementId, animalId, geneState, 0));
}
animalNumber++;
}
db.add(valuesToAddList);
return weanSize;
}
| private int Wean(Database db, Tuple request) throws Exception
{
Date now = new Date();
int invid = ct.getObservationTargetById(litter).getInvestigation_Id();
setUserFields(request, true);
Date weanDate = newDateOnlyFormat.parse(weandate);
int userId = this.getLogin().getUserId();
// Init lists that we can later add to the DB at once
List<ObservedValue> valuesToAddList = new ArrayList<ObservedValue>();
List<ObservationTarget> animalsToAddList = new ArrayList<ObservationTarget>();
// Source (take from litter)
int sourceId;
try {
sourceId = ct.getMostRecentValueAsXref(litter, ct.getMeasurementId("Source"));
} catch (Exception e) {
throw(new Exception("No source found - litter not weaned"));
}
// Get litter birth date
String litterBirthDateString;
Date litterBirthDate;
try {
litterBirthDateString = ct.getMostRecentValueAsString(litter, ct.getMeasurementId("DateOfBirth"));
litterBirthDate = newDateOnlyFormat.parse(litterBirthDateString);
} catch (Exception e) {
throw(new Exception("No litter birth date found - litter not weaned"));
}
// Find Parentgroup for this litter
int parentgroupId;
try {
parentgroupId = ct.getMostRecentValueAsXref(litter, ct.getMeasurementId("Parentgroup"));
} catch (Exception e) {
throw(new Exception("No parentgroup found - litter not weaned"));
}
// Find Line for this Parentgroup
int lineId = ct.getMostRecentValueAsXref(parentgroupId, ct.getMeasurementId("Line"));
// Find first mother, plus her animal type, species, color, background, gene name and gene state
int speciesId;
String animalType;
String color;
int motherBackgroundId;
String geneName;
String geneState;
int motherId;
try {
motherId = findParentForParentgroup(parentgroupId, "Mother", db);
speciesId = ct.getMostRecentValueAsXref(motherId, ct.getMeasurementId("Species"));
animalType = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("AnimalType"));
color = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("Color"));
motherBackgroundId = ct.getMostRecentValueAsXref(motherId, ct.getMeasurementId("Background"));
geneName = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("GeneModification"));
geneState = ct.getMostRecentValueAsString(motherId, ct.getMeasurementId("GeneState"));
} catch (Exception e) {
throw(new Exception("No mother (properties) found - litter not weaned"));
}
int fatherBackgroundId;
int fatherId;
try {
fatherId = findParentForParentgroup(parentgroupId, "Father", db);
fatherBackgroundId = ct.getMostRecentValueAsXref(fatherId, ct.getMeasurementId("Background"));
} catch (Exception e) {
throw(new Exception("No father (properties) found - litter not weaned"));
}
// Keep normal and transgene types, but set type of child from wild parents to normal
// TODO: animalType should be based on BOTH mother and father
if (animalType.equals("C. Wildvang") || animalType.equals("D. Biotoop")) {
animalType = "A. Gewoon dier";
}
// Set wean sizes
int weanSize = weanSizeFemale + weanSizeMale + weanSizeUnknown;
int protocolId = ct.getProtocolId("SetWeanSize");
int measurementId = ct.getMeasurementId("WeanSize");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSize), 0));
protocolId = ct.getProtocolId("SetWeanSizeFemale");
measurementId = ct.getMeasurementId("WeanSizeFemale");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSizeFemale), 0));
protocolId = ct.getProtocolId("SetWeanSizeMale");
measurementId = ct.getMeasurementId("WeanSizeMale");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSizeMale), 0));
protocolId = ct.getProtocolId("SetWeanSizeUnknown");
measurementId = ct.getMeasurementId("WeanSizeUnknown");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, Integer.toString(weanSizeUnknown), 0));
// Set wean date on litter -> this is how we mark a litter as weaned (but not genotyped)
protocolId = ct.getProtocolId("SetWeanDate");
measurementId = ct.getMeasurementId("WeanDate");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, litter, newDateOnlyFormat.format(weanDate), 0));
// Set weaning remarks on litter
if (remarks != null) {
protocolId = ct.getProtocolId("SetRemark");
measurementId = ct.getMeasurementId("Remark");
db.add(ct.createObservedValueWithProtocolApplication(invid, now, null,
protocolId, measurementId, litter, remarks, 0));
}
// change litter status from active to inactive
protocolId = ct.getProtocolId("SetActive");
measurementId = ct.getMeasurementId("Active");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate, null,
protocolId, measurementId, litter, "Inactive", 0));
// Make animal, link to litter, parents and set wean dates etc.
for (int animalNumber = 0; animalNumber < weanSize; animalNumber++) {
String nrPart = "" + (startNumber + animalNumber);
nrPart = ct.prependZeros(nrPart, 6);
ObservationTarget animalToAdd = ct.createIndividual(invid, nameBase + nrPart,
userId);
animalsToAddList.add(animalToAdd);
}
db.add(animalsToAddList);
// Make or update name prefix entry
ct.updatePrefix("animal", nameBase, startNumber + weanSize - 1);
int animalNumber = 0;
for (ObservationTarget animal : animalsToAddList) {
int animalId = animal.getId();
// TODO: link every value to a single Wean protocol application instead of to its own one
// Link to litter
protocolId = ct.getProtocolId("SetLitter");
measurementId = ct.getMeasurementId("Litter");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, litter));
// Link to parents
protocolId = ct.getProtocolId("SetMother");
measurementId = ct.getMeasurementId("Mother");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, motherId));
protocolId = ct.getProtocolId("SetFather");
measurementId = ct.getMeasurementId("Father");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, fatherId));
// Set line also on animal itself
protocolId = ct.getProtocolId("SetLine");
measurementId = ct.getMeasurementId("Line");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, lineId));
// Set responsible researcher
protocolId = ct.getProtocolId("SetResponsibleResearcher");
measurementId = ct.getMeasurementId("ResponsibleResearcher");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, now,
null, protocolId, measurementId, animalId, respres, 0));
// Set sex
int sexId = ct.getObservationTargetId("Female");
if (animalNumber >= weanSizeFemale) {
if (animalNumber < weanSizeFemale + weanSizeMale) {
sexId = ct.getObservationTargetId("Male");
} else {
sexId = ct.getObservationTargetId("UnknownSex");
}
}
protocolId = ct.getProtocolId("SetSex");
measurementId = ct.getMeasurementId("Sex");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, sexId));
// Set wean date on animal
protocolId = ct.getProtocolId("SetWeanDate");
measurementId = ct.getMeasurementId("WeanDate");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, newDateOnlyFormat.format(weanDate), 0));
// Set 'Active'
protocolId = ct.getProtocolId("SetActive");
measurementId = ct.getMeasurementId("Active");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid,
litterBirthDate, null, protocolId, measurementId, animalId, "Alive", 0));
// Set 'Date of Birth'
protocolId = ct.getProtocolId("SetDateOfBirth");
measurementId = ct.getMeasurementId("DateOfBirth");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, litterBirthDateString, 0));
// Set species
protocolId = ct.getProtocolId("SetSpecies");
measurementId = ct.getMeasurementId("Species");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, speciesId));
// Set animal type
protocolId = ct.getProtocolId("SetAnimalType");
measurementId = ct.getMeasurementId("AnimalType");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, animalType, 0));
// Set source
protocolId = ct.getProtocolId("SetSource");
measurementId = ct.getMeasurementId("Source");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, sourceId));
// Set color based on mother's (can be changed during genotyping)
if (!color.equals("")) {
protocolId = ct.getProtocolId("SetColor");
measurementId = ct.getMeasurementId("Color");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, color, 0));
}
// Set background based on mother's and father's (can be changed during genotyping)
int backgroundId = -1;
if (motherBackgroundId != -1 && fatherBackgroundId == -1) {
backgroundId = motherBackgroundId;
} else if (motherBackgroundId == -1 && fatherBackgroundId != -1) {
backgroundId = fatherBackgroundId;
} else if (motherBackgroundId != -1 && fatherBackgroundId != -1) {
// Make new or use existing cross background
String motherBackgroundName = ct.getObservationTargetLabel(motherBackgroundId);
String fatherBackgroundName = ct.getObservationTargetLabel(fatherBackgroundId);
if (motherBackgroundId == fatherBackgroundId) {
backgroundId = ct.getObservationTargetId(fatherBackgroundName);
} else {
backgroundId = ct.getObservationTargetId(fatherBackgroundName + " X " + motherBackgroundName);
}
if (backgroundId == -1) {
backgroundId = ct.makePanel(invid, fatherBackgroundName + " X " + motherBackgroundName, userId);
protocolId = ct.getProtocolId("SetTypeOfGroup");
measurementId = ct.getMeasurementId("TypeOfGroup");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate, null,
protocolId, measurementId, backgroundId, "Background", 0));
}
}
if (backgroundId != -1) {
protocolId = ct.getProtocolId("SetBackground");
measurementId = ct.getMeasurementId("Background");
valuesToAddList.add(ct.createObservedValueWithProtocolApplication(invid, weanDate,
null, protocolId, measurementId, animalId, null, backgroundId));
}
// Set genotype
// TODO: Set based on mother's X father's and ONLY if you can know the outcome
if (!geneName.equals("") && !geneState.equals("")) {
protocolId = ct.getProtocolId("SetGenotype");
int paId = ct.makeProtocolApplication(invid, protocolId);
// Set gene mod name based on mother's (can be changed during genotyping)
measurementId = ct.getMeasurementId("GeneModification");
valuesToAddList.add(ct.createObservedValue(invid, paId, weanDate,
null, measurementId, animalId, geneName, 0));
// Set gene state based on mother's (can be changed during genotyping)
measurementId = ct.getMeasurementId("GeneState");
valuesToAddList.add(ct.createObservedValue(invid, paId, weanDate,
null, measurementId, animalId, geneState, 0));
}
animalNumber++;
}
db.add(valuesToAddList);
return weanSize;
}
|
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
index d5fdea8a6..3f4d0de95 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
@@ -1,1198 +1,1198 @@
/*
* 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.builders;
import com.android.ide.eclipse.adt.AdtPlugin;
import com.android.ide.eclipse.adt.AndroidConstants;
import com.android.ide.eclipse.adt.internal.build.AaptParser;
import com.android.ide.eclipse.adt.internal.build.Messages;
import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs;
import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs.BuildVerbosity;
import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper;
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.ProjectHelper;
import com.android.ide.eclipse.adt.internal.project.XmlErrorHandler.BasicXmlErrorListener;
import com.android.ide.eclipse.adt.internal.sdk.ProjectState;
import com.android.ide.eclipse.adt.internal.sdk.Sdk;
import com.android.ide.eclipse.adt.io.IFileWrapper;
import com.android.ide.eclipse.adt.io.IFolderWrapper;
import com.android.sdklib.AndroidVersion;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.SdkConstants;
import com.android.sdklib.xml.AndroidManifest;
import com.android.sdklib.xml.ManifestData;
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.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 {
/** This ID is used in plugin.xml and in each project's .project file.
* It cannot be changed even if the class is renamed/moved */
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 {
// get a project object
IProject project = getProject();
// list of referenced projects.
IProject[] libProjects = null;
try {
mDerivedProgressMonitor.reset();
// get the project info
ProjectState projectState = Sdk.getProjectState(project);
// this can happen if the project has no default.properties.
if (projectState == null) {
return null;
}
IAndroidTarget projectTarget = projectState.getTarget();
// get the libraries
libProjects = projectState.getFullLibraryProjects();
IJavaProject javaProject = JavaCore.create(project);
// Top level check to make sure the build can move forward.
abortOnBadSetup(javaProject);
// 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(BuildVerbosity.VERBOSE, project,
Messages.Start_Full_Pre_Compiler);
// do some clean up.
doClean(project, monitor);
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
} else {
AdtPlugin.printBuildToConsole(BuildVerbosity.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();
// if the main resources didn't change, then we check for the library
// ones (will trigger resource recompilation too)
if (mMustCompileResources == false && libProjects.length > 0) {
for (IProject libProject : libProjects) {
delta = getDelta(libProject);
if (delta != null) {
LibraryDeltaVisitor visitor = new LibraryDeltaVisitor();
delta.accept(visitor);
mMustCompileResources = visitor.getResChange();
if (mMustCompileResources) {
break;
}
}
}
}
}
}
// 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 manifestFile = ProjectHelper.getManifest(project);
if (manifestFile == null) {
String msg = String.format(Messages.s_File_Missing,
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printErrorToConsole(project, msg);
markProject(AndroidConstants.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();
ManifestData parser = AndroidManifestHelper.parse(new IFileWrapper(manifestFile),
true /*gather data*/,
errorListener);
if (errorListener.mHasXmlError == true) {
// There was an error in the manifest, its file has been marked
// by the XmlErrorHandler. The stopBuild() call below will abort
// this with an exception.
String msg = String.format(Messages.s_Contains_Xml_Error,
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project, msg);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
}
// Get the java package from the parser.
// This can be null if the parsing failed because the resource is out of sync,
// in which case the error will already have been logged anyway.
if (parser != null) {
javaPackage = parser.getPackage();
minSdkVersion = parser.getMinSdkVersionString();
}
}
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();
// remove earlier marker from the manifest
removeMarkersFromFile(manifestFile, AndroidConstants.MARKER_ADT);
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 manifest to set %2$s to '%1$s'",
+ "Platform %1$s is a preview and requires application manifest to set %2$s to '%1$s'",
codename, AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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(
"Attribute %1$s (%2$d) is lower than the project target API level (%3$d)",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION,
minSdkValue, projectVersion.getApiLevel());
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.MARKER_ADT,
msg, IMarker.SEVERITY_WARNING);
} else if (minSdkValue > projectVersion.getApiLevel()) {
// integer minSdk is too high for the target => warning
String msg = String.format(
"Attribute %1$s (%2$d) is higher than the project target API level (%3$d)",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION,
minSdkValue, projectVersion.getApiLevel());
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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.",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION, minSdkVersion);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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'",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION, codename);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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'",
+ "Platform %1$s is a preview and requires application manifests to set %2$s to '%1$s'",
codename, AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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,
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.MARKER_ADT,
msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
// This also throws an exception and nothing beyond this line will run.
stopBuild(msg);
} else if (javaPackage.indexOf('.') == -1) {
// The application package name does not contain 2+ segments!
String msg = String.format(
"Application package '%1$s' must have a minimum of 2 segments.",
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.MARKER_ADT,
msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
// This also throws an exception and nothing beyond this line will run.
stopBuild(msg);
}
// 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.equals(mManifestPackage) == false) {
// The manifest package has changed, the user may want to update
// the launch configuration
if (mManifestPackage != null) {
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project,
Messages.Checking_Package_Change);
FixLaunchConfig flc = new FixLaunchConfig(project, mManifestPackage,
javaPackage);
flc.start();
}
// record the new manifest package, and save it.
mManifestPackage = javaPackage;
saveProjectStringProperty(PROPERTY_PACKAGE, mManifestPackage);
// force a clean
doClean(project, monitor);
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
saveProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES , mMustCompileResources);
}
if (mMustCompileResources) {
handleResources(project, javaPackage, projectTarget, manifestFile, libProjects);
}
// now handle the aidl stuff.
boolean aidlStatus = handleAidl(projectTarget, sourceFolderPathList, monitor);
if (aidlStatus == false && mMustCompileResources == false) {
AdtPlugin.printBuildToConsole(BuildVerbosity.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 libProjects;
}
@Override
protected void clean(IProgressMonitor monitor) throws CoreException {
super.clean(monitor);
doClean(getProject(), monitor);
if (mGenFolder != null) {
mGenFolder.refreshLocal(IResource.DEPTH_INFINITE, monitor);
}
}
private void doClean(IProject project, IProgressMonitor monitor) throws CoreException {
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project,
Messages.Removing_Generated_Classes);
// remove all the derived resources from the 'gen' source folder.
if (mGenFolder != null) {
removeDerivedResources(mGenFolder, monitor);
}
// Clear the project of the generic markers
removeMarkersFromProject(project, AndroidConstants.MARKER_AAPT_COMPILE);
removeMarkersFromProject(project, AndroidConstants.MARKER_XML);
removeMarkersFromProject(project, AndroidConstants.MARKER_AIDL);
removeMarkersFromProject(project, AndroidConstants.MARKER_ANDROID);
}
@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);
}
}
/**
* Handles resource changes and regenerate whatever files need regenerating.
* @param project the main project
* @param javaPackage the app package for the main project
* @param projectTarget the target of the main project
* @param manifest the {@link IFile} representing the project manifest
* @param libProjects the library dependencies
* @throws CoreException
*/
private void handleResources(IProject project, String javaPackage, IAndroidTarget projectTarget,
IFile manifest, IProject[] libProjects) throws CoreException {
// 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(BuildVerbosity.VERBOSE, project,
Messages.Preparing_Generated_Files);
// we need to figure out where to store the R class.
// get the parent folder for R.java and update mManifestPackageSourceFolder
IFolder mainPackageFolder = getGenManifestPackageFolder();
// handle libraries
ArrayList<IFolder> libResFolders = new ArrayList<IFolder>();
ArrayList<IFolder> libOutputFolders = new ArrayList<IFolder>();
ArrayList<String> libJavaPackages = new ArrayList<String>();
if (libProjects != null) {
for (IProject lib : libProjects) {
IFolder libResFolder = lib.getFolder(SdkConstants.FD_RES);
if (libResFolder.exists()) {
libResFolders.add(libResFolder);
}
try {
String libJavaPackage = AndroidManifest.getPackage(new IFolderWrapper(lib));
if (libJavaPackage.equals(javaPackage) == false) {
libJavaPackages.add(libJavaPackage);
libOutputFolders.add(getGenManifestPackageFolder(libJavaPackage));
}
} catch (Exception e) {
}
}
}
execAapt(project, projectTarget, osOutputPath, osResPath, osManifestPath,
mainPackageFolder, libResFolders, null /* custom java package */);
final int count = libOutputFolders.size();
if (count > 0) {
for (int i = 0 ; i < count ; i++) {
IFolder libFolder = libOutputFolders.get(i);
String libJavaPackage = libJavaPackages.get(i);
execAapt(project, projectTarget, osOutputPath, osResPath, osManifestPath,
libFolder, libResFolders, libJavaPackage);
}
}
}
}
/**
* Executes AAPT to generate R.java/Manifest.java
* @param project the main project
* @param projectTarget the main project target
* @param osOutputPath the OS output path for the generated file. This is the source folder, not
* the package folder.
* @param osResPath the OS path to the res folder for the main project
* @param osManifestPath the OS path to the manifest of the main project
* @param packageFolder the IFolder that will contain the generated file. Unlike
* <var>osOutputPath</var> this is the direct parent of the geenerated files.
* If <var>customJavaPackage</var> is not null, this must match the new destination triggered
* by its value.
* @param libResFolders the list of res folders for the library.
* @param customJavaPackage an optional javapackage to replace the main project java package.
* can be null.
* @throws CoreException
*/
private void execAapt(IProject project, IAndroidTarget projectTarget, String osOutputPath,
String osResPath, String osManifestPath, IFolder packageFolder,
ArrayList<IFolder> libResFolders, String customJavaPackage) throws CoreException {
// 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.getLocation().toFile().delete();
// 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 (AdtPrefs.getPrefs().getBuildVerbosity() == BuildVerbosity.VERBOSE) {
array.add("-v"); //$NON-NLS-1$
}
if (libResFolders.size() > 0) {
array.add("--auto-add-overlay"); //$NON-NLS-1$
}
if (customJavaPackage != null) {
array.add("--custom-package"); //$NON-NLS-1$
array.add(customJavaPackage);
}
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);
for (IFolder libResFolder : libResFolders) {
array.add("-S"); //$NON-NLS-1$
array.add(libResFolder.getLocation().toOSString());
}
array.add("-I"); //$NON-NLS-1$
array.add(projectTarget.getPath(IAndroidTarget.ANDROID_JAR));
if (AdtPrefs.getPrefs().getBuildVerbosity() == BuildVerbosity.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 = AaptParser.parseOutput(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(BuildVerbosity.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(AndroidConstants.MARKER_ADT,
Messages.Unparsed_AAPT_Errors, IMarker.SEVERITY_ERROR);
}
AdtPlugin.printBuildToConsole(BuildVerbosity.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(AndroidConstants.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(AndroidConstants.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);
}
}
/**
* 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).
* @return the {@link IFolder} that will contain the R class or null if
* the folder was not found.
* @throws CoreException
*/
private IFolder getGenManifestPackageFolder() 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);
}
/**
* Returns an {@link IFolder} (located inside the 'gen' source folder), that matches the
* given package. This {@link IFolder} may not actually exist
* (aapt will create it anyway).
* @param javaPackage the java package that must match the folder.
* @return the {@link IFolder} that will contain the R class or null if
* the folder was not found.
* @throws CoreException
*/
private IFolder getGenManifestPackageFolder(String javaPackage) throws CoreException {
// get the path for the package
IPath packagePath = getJavaPackagePath(javaPackage);
// 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.getLocation().toFile().delete();
}
}
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(AndroidConstants.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(AndroidConstants.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(AndroidConstants.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.markResource(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);
}
}
}
}
| false | true | protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
throws CoreException {
// get a project object
IProject project = getProject();
// list of referenced projects.
IProject[] libProjects = null;
try {
mDerivedProgressMonitor.reset();
// get the project info
ProjectState projectState = Sdk.getProjectState(project);
// this can happen if the project has no default.properties.
if (projectState == null) {
return null;
}
IAndroidTarget projectTarget = projectState.getTarget();
// get the libraries
libProjects = projectState.getFullLibraryProjects();
IJavaProject javaProject = JavaCore.create(project);
// Top level check to make sure the build can move forward.
abortOnBadSetup(javaProject);
// 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(BuildVerbosity.VERBOSE, project,
Messages.Start_Full_Pre_Compiler);
// do some clean up.
doClean(project, monitor);
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
} else {
AdtPlugin.printBuildToConsole(BuildVerbosity.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();
// if the main resources didn't change, then we check for the library
// ones (will trigger resource recompilation too)
if (mMustCompileResources == false && libProjects.length > 0) {
for (IProject libProject : libProjects) {
delta = getDelta(libProject);
if (delta != null) {
LibraryDeltaVisitor visitor = new LibraryDeltaVisitor();
delta.accept(visitor);
mMustCompileResources = visitor.getResChange();
if (mMustCompileResources) {
break;
}
}
}
}
}
}
// 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 manifestFile = ProjectHelper.getManifest(project);
if (manifestFile == null) {
String msg = String.format(Messages.s_File_Missing,
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printErrorToConsole(project, msg);
markProject(AndroidConstants.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();
ManifestData parser = AndroidManifestHelper.parse(new IFileWrapper(manifestFile),
true /*gather data*/,
errorListener);
if (errorListener.mHasXmlError == true) {
// There was an error in the manifest, its file has been marked
// by the XmlErrorHandler. The stopBuild() call below will abort
// this with an exception.
String msg = String.format(Messages.s_Contains_Xml_Error,
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project, msg);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
}
// Get the java package from the parser.
// This can be null if the parsing failed because the resource is out of sync,
// in which case the error will already have been logged anyway.
if (parser != null) {
javaPackage = parser.getPackage();
minSdkVersion = parser.getMinSdkVersionString();
}
}
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();
// remove earlier marker from the manifest
removeMarkersFromFile(manifestFile, AndroidConstants.MARKER_ADT);
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 manifest to set %2$s to '%1$s'",
codename, AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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(
"Attribute %1$s (%2$d) is lower than the project target API level (%3$d)",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION,
minSdkValue, projectVersion.getApiLevel());
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.MARKER_ADT,
msg, IMarker.SEVERITY_WARNING);
} else if (minSdkValue > projectVersion.getApiLevel()) {
// integer minSdk is too high for the target => warning
String msg = String.format(
"Attribute %1$s (%2$d) is higher than the project target API level (%3$d)",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION,
minSdkValue, projectVersion.getApiLevel());
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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.",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION, minSdkVersion);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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'",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION, codename);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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, AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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,
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.MARKER_ADT,
msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
// This also throws an exception and nothing beyond this line will run.
stopBuild(msg);
} else if (javaPackage.indexOf('.') == -1) {
// The application package name does not contain 2+ segments!
String msg = String.format(
"Application package '%1$s' must have a minimum of 2 segments.",
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.MARKER_ADT,
msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
// This also throws an exception and nothing beyond this line will run.
stopBuild(msg);
}
// 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.equals(mManifestPackage) == false) {
// The manifest package has changed, the user may want to update
// the launch configuration
if (mManifestPackage != null) {
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project,
Messages.Checking_Package_Change);
FixLaunchConfig flc = new FixLaunchConfig(project, mManifestPackage,
javaPackage);
flc.start();
}
// record the new manifest package, and save it.
mManifestPackage = javaPackage;
saveProjectStringProperty(PROPERTY_PACKAGE, mManifestPackage);
// force a clean
doClean(project, monitor);
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
saveProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES , mMustCompileResources);
}
if (mMustCompileResources) {
handleResources(project, javaPackage, projectTarget, manifestFile, libProjects);
}
// now handle the aidl stuff.
boolean aidlStatus = handleAidl(projectTarget, sourceFolderPathList, monitor);
if (aidlStatus == false && mMustCompileResources == false) {
AdtPlugin.printBuildToConsole(BuildVerbosity.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 libProjects;
}
| protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
throws CoreException {
// get a project object
IProject project = getProject();
// list of referenced projects.
IProject[] libProjects = null;
try {
mDerivedProgressMonitor.reset();
// get the project info
ProjectState projectState = Sdk.getProjectState(project);
// this can happen if the project has no default.properties.
if (projectState == null) {
return null;
}
IAndroidTarget projectTarget = projectState.getTarget();
// get the libraries
libProjects = projectState.getFullLibraryProjects();
IJavaProject javaProject = JavaCore.create(project);
// Top level check to make sure the build can move forward.
abortOnBadSetup(javaProject);
// 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(BuildVerbosity.VERBOSE, project,
Messages.Start_Full_Pre_Compiler);
// do some clean up.
doClean(project, monitor);
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
} else {
AdtPlugin.printBuildToConsole(BuildVerbosity.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();
// if the main resources didn't change, then we check for the library
// ones (will trigger resource recompilation too)
if (mMustCompileResources == false && libProjects.length > 0) {
for (IProject libProject : libProjects) {
delta = getDelta(libProject);
if (delta != null) {
LibraryDeltaVisitor visitor = new LibraryDeltaVisitor();
delta.accept(visitor);
mMustCompileResources = visitor.getResChange();
if (mMustCompileResources) {
break;
}
}
}
}
}
}
// 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 manifestFile = ProjectHelper.getManifest(project);
if (manifestFile == null) {
String msg = String.format(Messages.s_File_Missing,
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printErrorToConsole(project, msg);
markProject(AndroidConstants.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();
ManifestData parser = AndroidManifestHelper.parse(new IFileWrapper(manifestFile),
true /*gather data*/,
errorListener);
if (errorListener.mHasXmlError == true) {
// There was an error in the manifest, its file has been marked
// by the XmlErrorHandler. The stopBuild() call below will abort
// this with an exception.
String msg = String.format(Messages.s_Contains_Xml_Error,
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project, msg);
// This interrupts the build. The next builders will not run.
stopBuild(msg);
}
// Get the java package from the parser.
// This can be null if the parsing failed because the resource is out of sync,
// in which case the error will already have been logged anyway.
if (parser != null) {
javaPackage = parser.getPackage();
minSdkVersion = parser.getMinSdkVersionString();
}
}
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();
// remove earlier marker from the manifest
removeMarkersFromFile(manifestFile, AndroidConstants.MARKER_ADT);
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 application manifest to set %2$s to '%1$s'",
codename, AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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(
"Attribute %1$s (%2$d) is lower than the project target API level (%3$d)",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION,
minSdkValue, projectVersion.getApiLevel());
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.MARKER_ADT,
msg, IMarker.SEVERITY_WARNING);
} else if (minSdkValue > projectVersion.getApiLevel()) {
// integer minSdk is too high for the target => warning
String msg = String.format(
"Attribute %1$s (%2$d) is higher than the project target API level (%3$d)",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION,
minSdkValue, projectVersion.getApiLevel());
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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.",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION, minSdkVersion);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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'",
AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION, codename);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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 application manifests to set %2$s to '%1$s'",
codename, AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.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,
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.MARKER_ADT,
msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
// This also throws an exception and nothing beyond this line will run.
stopBuild(msg);
} else if (javaPackage.indexOf('.') == -1) {
// The application package name does not contain 2+ segments!
String msg = String.format(
"Application package '%1$s' must have a minimum of 2 segments.",
SdkConstants.FN_ANDROID_MANIFEST_XML);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.markResource(manifestFile, AndroidConstants.MARKER_ADT,
msg, IMarker.SEVERITY_ERROR);
// This interrupts the build. The next builders will not run.
// This also throws an exception and nothing beyond this line will run.
stopBuild(msg);
}
// 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.equals(mManifestPackage) == false) {
// The manifest package has changed, the user may want to update
// the launch configuration
if (mManifestPackage != null) {
AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project,
Messages.Checking_Package_Change);
FixLaunchConfig flc = new FixLaunchConfig(project, mManifestPackage,
javaPackage);
flc.start();
}
// record the new manifest package, and save it.
mManifestPackage = javaPackage;
saveProjectStringProperty(PROPERTY_PACKAGE, mManifestPackage);
// force a clean
doClean(project, monitor);
mMustCompileResources = true;
buildAidlCompilationList(project, sourceFolderPathList);
saveProjectBooleanProperty(PROPERTY_COMPILE_RESOURCES , mMustCompileResources);
}
if (mMustCompileResources) {
handleResources(project, javaPackage, projectTarget, manifestFile, libProjects);
}
// now handle the aidl stuff.
boolean aidlStatus = handleAidl(projectTarget, sourceFolderPathList, monitor);
if (aidlStatus == false && mMustCompileResources == false) {
AdtPlugin.printBuildToConsole(BuildVerbosity.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 libProjects;
}
|
diff --git a/BankProject/src/bankproject/BankProject.java b/BankProject/src/bankproject/BankProject.java
index bc1d31e..fca263b 100644
--- a/BankProject/src/bankproject/BankProject.java
+++ b/BankProject/src/bankproject/BankProject.java
@@ -1,44 +1,44 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package bankproject;
/**
*
* @author s504
*/
public class BankProject {
public AccountManager accountManager = new AccountManager();
public OperationManager operationManager = new OperationManager();
public Vault bankVault;
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
BankProject bankProject = new BankProject();
// TODO code application logic here
//populate bank
for (int i=0; i < 10; i++) {
// Object options = [];
AccountHolder object = new AccountHolder();
object.name = "Ivan" + i;
object.ballance = i * 10.00;
bankProject.accountManager.newAccount(object);
}
//get element at 3 position
AccountHolder element3 = bankProject.accountManager.getAccount(3);
System.out.println(element3.name + " " + element3.ballance);
- //deposit money for 5
+ //deposit money for 3
bankProject.operationManager.deposit(element3, 65.44);
//get element at 3 position
element3 = bankProject.accountManager.getAccount(3);
System.out.println(element3.name + " " + element3.ballance);
System.out.println(Vault.showVault());
}
}
| true | true | public static void main(String[] args) {
BankProject bankProject = new BankProject();
// TODO code application logic here
//populate bank
for (int i=0; i < 10; i++) {
// Object options = [];
AccountHolder object = new AccountHolder();
object.name = "Ivan" + i;
object.ballance = i * 10.00;
bankProject.accountManager.newAccount(object);
}
//get element at 3 position
AccountHolder element3 = bankProject.accountManager.getAccount(3);
System.out.println(element3.name + " " + element3.ballance);
//deposit money for 5
bankProject.operationManager.deposit(element3, 65.44);
//get element at 3 position
element3 = bankProject.accountManager.getAccount(3);
System.out.println(element3.name + " " + element3.ballance);
System.out.println(Vault.showVault());
}
| public static void main(String[] args) {
BankProject bankProject = new BankProject();
// TODO code application logic here
//populate bank
for (int i=0; i < 10; i++) {
// Object options = [];
AccountHolder object = new AccountHolder();
object.name = "Ivan" + i;
object.ballance = i * 10.00;
bankProject.accountManager.newAccount(object);
}
//get element at 3 position
AccountHolder element3 = bankProject.accountManager.getAccount(3);
System.out.println(element3.name + " " + element3.ballance);
//deposit money for 3
bankProject.operationManager.deposit(element3, 65.44);
//get element at 3 position
element3 = bankProject.accountManager.getAccount(3);
System.out.println(element3.name + " " + element3.ballance);
System.out.println(Vault.showVault());
}
|
diff --git a/src/minecraft/net/minecraft/src/EntityLiving.java b/src/minecraft/net/minecraft/src/EntityLiving.java
index 1c568761..f2a51fb4 100644
--- a/src/minecraft/net/minecraft/src/EntityLiving.java
+++ b/src/minecraft/net/minecraft/src/EntityLiving.java
@@ -1,1121 +1,1120 @@
package net.minecraft.src;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.Block;
import net.minecraft.src.DamageSource;
import net.minecraft.src.Entity;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EntityWolf;
import net.minecraft.src.EntityXPOrb;
import net.minecraft.src.ItemStack;
import net.minecraft.src.Material;
import net.minecraft.src.MathHelper;
import net.minecraft.src.MovingObjectPosition;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.NBTTagList;
import net.minecraft.src.Potion;
import net.minecraft.src.PotionEffect;
import net.minecraft.src.StepSound;
import net.minecraft.src.Vec3D;
import net.minecraft.src.World;
//Spout Start
import org.getspout.spout.io.CustomTextureManager;
//Spout End
public abstract class EntityLiving extends Entity {
public int heartsHalvesLife = 20;
public float field_9365_p;
public float field_9363_r;
public float renderYawOffset = 0.0F;
public float prevRenderYawOffset = 0.0F;
protected float field_9362_u;
protected float field_9361_v;
protected float field_9360_w;
protected float field_9359_x;
protected boolean field_9358_y = true;
protected String texture = "/mob/char.png";
protected boolean field_9355_A = true;
protected float field_9353_B = 0.0F;
protected String entityType = null;
protected float field_9349_D = 1.0F;
protected int scoreValue = 0;
protected float field_9345_F = 0.0F;
public boolean isMultiplayerEntity = false;
public float field_35169_bv = 0.1F;
public float field_35168_bw = 0.02F;
public float prevSwingProgress;
public float swingProgress;
public int health = 10;
public int prevHealth;
private int livingSoundTime;
public int hurtTime;
public int maxHurtTime;
public float attackedAtYaw = 0.0F;
public int deathTime = 0;
public int attackTime = 0;
public float prevCameraPitch;
public float cameraPitch;
protected boolean unused_flag = false;
protected int field_35171_bJ;
public int field_9326_T = -1;
public float field_9325_U = (float)(Math.random() * 0.8999999761581421D + 0.10000000149011612D);
public float field_705_Q;
public float field_704_R;
public float field_703_S;
private EntityPlayer field_34904_b = null;
private int field_34905_c = 0;
public int field_35172_bP = 0;
public int field_35173_bQ = 0;
protected HashMap field_35170_bR = new HashMap();
protected int newPosRotationIncrements;
protected double newPosX;
protected double newPosY;
protected double newPosZ;
protected double newRotationYaw;
protected double newRotationPitch;
float field_9348_ae = 0.0F;
protected int field_9346_af = 0;
protected int entityAge = 0;
protected float moveStrafing;
protected float moveForward;
protected float randomYawVelocity;
protected boolean isJumping = false;
protected float defaultPitch = 0.0F;
protected float moveSpeed = 0.7F;
private Entity currentTarget;
protected int numTicksToChaseTarget = 0;
//Spout Start
private HashMap<Byte, String> customTextures = new HashMap<Byte, String>();
private byte textureToRender = 0;
public double gravityMod = 1D;
public double walkingMod = 1D;
public double swimmingMod = 1D;
public double jumpingMod = 1D;
public double airspeedMod = 1D;
//Spout End
public EntityLiving(World var1) {
super(var1);
this.preventEntitySpawning = true;
this.field_9363_r = (float)(Math.random() + 1.0D) * 0.01F;
this.setPosition(this.posX, this.posY, this.posZ);
this.field_9365_p = (float)Math.random() * 12398.0F;
this.rotationYaw = (float)(Math.random() * 3.1415927410125732D * 2.0D);
this.stepHeight = 0.5F;
}
protected void entityInit() {}
public boolean canEntityBeSeen(Entity var1) {
return this.worldObj.rayTraceBlocks(Vec3D.createVector(this.posX, this.posY + (double)this.getEyeHeight(), this.posZ), Vec3D.createVector(var1.posX, var1.posY + (double)var1.getEyeHeight(), var1.posZ)) == null;
}
public String getEntityTexture() {
//Spout Start
String custom = getCustomTextureUrl(getTextureToRender());
if(custom == null || CustomTextureManager.getTexturePathFromUrl(custom) == null){
return texture;
} else {
return CustomTextureManager.getTexturePathFromUrl(custom);
}
//Spout End
}
//Spout Start
public String getCustomTextureUrl(byte id){
return customTextures.get(id);
}
public String getCustomTexture(byte id){
if(getCustomTextureUrl(id) != null)
{
return CustomTextureManager.getTexturePathFromUrl(getCustomTextureUrl(id));
}
return null;
}
public void setCustomTexture(String url, byte id){
if (url != null) {
CustomTextureManager.downloadTexture(url);
}
customTextures.put(id, url);
}
public void setTextureToRender(byte textureToRender) {
this.textureToRender = textureToRender;
}
public byte getTextureToRender() {
return textureToRender;
}
//Spout End
public boolean canBeCollidedWith() {
return !this.isDead;
}
public boolean canBePushed() {
return !this.isDead;
}
public float getEyeHeight() {
return this.height * 0.85F;
}
public int getTalkInterval() {
return 80;
}
public void playLivingSound() {
String var1 = this.getLivingSound();
if(var1 != null) {
this.worldObj.playSoundAtEntity(this, var1, this.getSoundVolume(), (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F);
}
}
public void onEntityUpdate() {
this.prevSwingProgress = this.swingProgress;
super.onEntityUpdate();
if(this.rand.nextInt(1000) < this.livingSoundTime++) {
this.livingSoundTime = -this.getTalkInterval();
this.playLivingSound();
}
if(this.isEntityAlive() && this.isEntityInsideOpaqueBlock()) {
this.attackEntityFrom(DamageSource.inWall, 1);
}
if(this.isImmuneToFire || this.worldObj.multiplayerWorld) {
this.fire = 0;
}
int var1;
if(this.isEntityAlive() && this.isInsideOfMaterial(Material.water) && !this.canBreatheUnderwater() && !this.field_35170_bR.containsKey(Integer.valueOf(Potion.potionWaterBreathing.id))) {
--this.air;
if(this.air == -20) {
this.air = 0;
for(var1 = 0; var1 < 8; ++var1) {
float var2 = this.rand.nextFloat() - this.rand.nextFloat();
float var3 = this.rand.nextFloat() - this.rand.nextFloat();
float var4 = this.rand.nextFloat() - this.rand.nextFloat();
this.worldObj.spawnParticle("bubble", this.posX + (double)var2, this.posY + (double)var3, this.posZ + (double)var4, this.motionX, this.motionY, this.motionZ);
}
this.attackEntityFrom(DamageSource.drown, 2);
}
this.fire = 0;
} else {
this.air = this.maxAir;
}
this.prevCameraPitch = this.cameraPitch;
if(this.attackTime > 0) {
--this.attackTime;
}
if(this.hurtTime > 0) {
--this.hurtTime;
}
if(this.heartsLife > 0) {
--this.heartsLife;
}
if(this.health <= 0) {
++this.deathTime;
if(this.deathTime > 20) {
//Spout start - disabled XP orbs
/*if(this.field_34905_c > 0 || this.func_35163_av()) {
var1 = this.a(this.field_34904_b);
while(var1 > 0) {
int var8 = EntityXPOrb.func_35121_b(var1);
var1 -= var8;
this.worldObj.entityJoinedWorld(new EntityXPOrb(this.worldObj, this.posX, this.posY, this.posZ, var8));
}
}*/
//Spout end
this.onEntityDeath();
this.setEntityDead();
for(var1 = 0; var1 < 20; ++var1) {
double var9 = this.rand.nextGaussian() * 0.02D;
double var10 = this.rand.nextGaussian() * 0.02D;
double var6 = this.rand.nextGaussian() * 0.02D;
this.worldObj.spawnParticle("explode", this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, var9, var10, var6);
}
}
}
if(this.field_34905_c > 0) {
--this.field_34905_c;
} else {
this.field_34904_b = null;
}
this.func_36000_g();
this.field_9359_x = this.field_9360_w;
this.prevRenderYawOffset = this.renderYawOffset;
this.prevRotationYaw = this.rotationYaw;
this.prevRotationPitch = this.rotationPitch;
}
protected int func_36001_a(EntityPlayer var1) {
return this.field_35171_bJ;
}
protected boolean func_35163_av() {
return false;
}
public void spawnExplosionParticle() {
for(int var1 = 0; var1 < 20; ++var1) {
double var2 = this.rand.nextGaussian() * 0.02D;
double var4 = this.rand.nextGaussian() * 0.02D;
double var6 = this.rand.nextGaussian() * 0.02D;
double var8 = 10.0D;
this.worldObj.spawnParticle("explode", this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width - var2 * var8, this.posY + (double)(this.rand.nextFloat() * this.height) - var4 * var8, this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width - var6 * var8, var2, var4, var6);
}
}
public void updateRidden() {
super.updateRidden();
this.field_9362_u = this.field_9361_v;
this.field_9361_v = 0.0F;
}
public void setPositionAndRotation2(double var1, double var3, double var5, float var7, float var8, int var9) {
this.yOffset = 0.0F;
this.newPosX = var1;
this.newPosY = var3;
this.newPosZ = var5;
this.newRotationYaw = (double)var7;
this.newRotationPitch = (double)var8;
this.newPosRotationIncrements = var9;
}
public void onUpdate() {
super.onUpdate();
if(this.field_35172_bP > 0) {
if(this.field_35173_bQ <= 0) {
this.field_35173_bQ = 60;
}
--this.field_35173_bQ;
if(this.field_35173_bQ <= 0) {
--this.field_35172_bP;
}
}
this.onLivingUpdate();
double var1 = this.posX - this.prevPosX;
double var3 = this.posZ - this.prevPosZ;
float var5 = MathHelper.sqrt_double(var1 * var1 + var3 * var3);
float var6 = this.renderYawOffset;
float var7 = 0.0F;
this.field_9362_u = this.field_9361_v;
float var8 = 0.0F;
if(var5 > 0.05F) {
var8 = 1.0F;
var7 = var5 * 3.0F;
var6 = (float)Math.atan2(var3, var1) * 180.0F / 3.1415927F - 90.0F;
}
if(this.swingProgress > 0.0F) {
var6 = this.rotationYaw;
}
if(!this.onGround) {
var8 = 0.0F;
}
this.field_9361_v += (var8 - this.field_9361_v) * 0.3F;
float var9;
for(var9 = var6 - this.renderYawOffset; var9 < -180.0F; var9 += 360.0F) {
;
}
while(var9 >= 180.0F) {
var9 -= 360.0F;
}
this.renderYawOffset += var9 * 0.3F;
float var10;
for(var10 = this.rotationYaw - this.renderYawOffset; var10 < -180.0F; var10 += 360.0F) {
;
}
while(var10 >= 180.0F) {
var10 -= 360.0F;
}
boolean var11 = var10 < -90.0F || var10 >= 90.0F;
if(var10 < -75.0F) {
var10 = -75.0F;
}
if(var10 >= 75.0F) {
var10 = 75.0F;
}
this.renderYawOffset = this.rotationYaw - var10;
if(var10 * var10 > 2500.0F) {
this.renderYawOffset += var10 * 0.2F;
}
if(var11) {
var7 *= -1.0F;
}
while(this.rotationYaw - this.prevRotationYaw < -180.0F) {
this.prevRotationYaw -= 360.0F;
}
while(this.rotationYaw - this.prevRotationYaw >= 180.0F) {
this.prevRotationYaw += 360.0F;
}
while(this.renderYawOffset - this.prevRenderYawOffset < -180.0F) {
this.prevRenderYawOffset -= 360.0F;
}
while(this.renderYawOffset - this.prevRenderYawOffset >= 180.0F) {
this.prevRenderYawOffset += 360.0F;
}
while(this.rotationPitch - this.prevRotationPitch < -180.0F) {
this.prevRotationPitch -= 360.0F;
}
while(this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F;
}
this.field_9360_w += var7;
}
protected void setSize(float var1, float var2) {
super.setSize(var1, var2);
}
public void heal(int var1) {
if(this.health > 0) {
this.health += var1;
if(this.health > 20) {
this.health = 20;
}
this.heartsLife = this.heartsHalvesLife / 2;
}
}
public boolean attackEntityFrom(DamageSource var1, int var2) {
if(this.worldObj.multiplayerWorld) {
return false;
} else {
this.entityAge = 0;
if(this.health <= 0) {
return false;
} else {
this.field_704_R = 1.5F;
boolean var3 = true;
if((float)this.heartsLife > (float)this.heartsHalvesLife / 2.0F) {
if(var2 <= this.field_9346_af) {
return false;
}
this.damageEntity(var1, var2 - this.field_9346_af);
this.field_9346_af = var2;
var3 = false;
} else {
this.field_9346_af = var2;
this.prevHealth = this.health;
this.heartsLife = this.heartsHalvesLife;
this.damageEntity(var1, var2);
this.hurtTime = this.maxHurtTime = 10;
}
this.attackedAtYaw = 0.0F;
Entity var4 = var1.getEntity();
if(var4 != null) {
if(var4 instanceof EntityPlayer) {
this.field_34905_c = 60;
this.field_34904_b = (EntityPlayer)var4;
} else if(var4 instanceof EntityWolf) {
EntityWolf var5 = (EntityWolf)var4;
if(var5.isWolfTamed()) {
this.field_34905_c = 60;
this.field_34904_b = null;
}
}
}
if(var3) {
this.worldObj.setEntityState(this, (byte)2);
this.setBeenAttacked();
if(var4 != null) {
double var9 = var4.posX - this.posX;
double var7;
for(var7 = var4.posZ - this.posZ; var9 * var9 + var7 * var7 < 1.0E-4D; var7 = (Math.random() - Math.random()) * 0.01D) {
var9 = (Math.random() - Math.random()) * 0.01D;
}
this.attackedAtYaw = (float)(Math.atan2(var7, var9) * 180.0D / 3.1415927410125732D) - this.rotationYaw;
this.knockBack(var4, var2, var9, var7);
} else {
this.attackedAtYaw = (float)((int)(Math.random() * 2.0D) * 180);
}
}
if(this.health <= 0) {
if(var3) {
this.worldObj.playSoundAtEntity(this, this.getDeathSound(), this.getSoundVolume(), (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F);
}
this.onDeath(var1);
} else if(var3) {
this.worldObj.playSoundAtEntity(this, this.getHurtSound(), this.getSoundVolume(), (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F);
}
return true;
}
}
}
public void performHurtAnimation() {
this.hurtTime = this.maxHurtTime = 10;
this.attackedAtYaw = 0.0F;
}
protected void damageEntity(DamageSource var1, int var2) {
this.health -= var2;
}
protected float getSoundVolume() {
return 1.0F;
}
protected String getLivingSound() {
return null;
}
protected String getHurtSound() {
return "random.hurt";
}
protected String getDeathSound() {
return "random.hurt";
}
public void knockBack(Entity var1, int var2, double var3, double var5) {
this.field_35118_ao = true;
float var7 = MathHelper.sqrt_double(var3 * var3 + var5 * var5);
float var8 = 0.4F;
this.motionX /= 2.0D;
this.motionY /= 2.0D;
this.motionZ /= 2.0D;
this.motionX -= var3 / (double)var7 * (double)var8;
this.motionY += 0.4000000059604645D;
this.motionZ -= var5 / (double)var7 * (double)var8;
if(this.motionY > 0.4000000059604645D) {
this.motionY = 0.4000000059604645D;
}
}
public void onDeath(DamageSource var1) {
Entity var2 = var1.getEntity();
if(this.scoreValue >= 0 && var2 != null) {
var2.addToPlayerScore(this, this.scoreValue);
}
if(var2 != null) {
var2.onKillEntity(this);
}
this.unused_flag = true;
if(!this.worldObj.multiplayerWorld) {
this.dropFewItems(this.field_34905_c > 0);
}
this.worldObj.setEntityState(this, (byte)3);
}
protected void dropFewItems(boolean var1) {
int var2 = this.getDropItemId();
if(var2 > 0) {
int var3 = this.rand.nextInt(3);
for(int var4 = 0; var4 < var3; ++var4) {
this.dropItem(var2, 1);
}
}
}
protected int getDropItemId() {
return 0;
}
protected void fall(float var1) {
super.fall(var1);
int var2 = (int)Math.ceil((double)(var1 - 3.0F));
if(var2 > 0) {
this.attackEntityFrom(DamageSource.fall, var2);
int var3 = this.worldObj.getBlockId(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY - 0.20000000298023224D - (double)this.yOffset), MathHelper.floor_double(this.posZ));
if(var3 > 0) {
StepSound var4 = Block.blocksList[var3].stepSound;
this.worldObj.playSoundAtEntity(this, var4.stepSoundDir2(), var4.getVolume() * 0.5F, var4.getPitch() * 0.75F);
}
}
}
public void moveEntityWithHeading(float var1, float var2) {
double var3;
if(this.isInWater()) {
var3 = this.posY;
moveFlying(var1, var2, (float) (0.02F * swimmingMod)); //Spout
this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.motionX *= 0.800000011920929D;
this.motionY *= 0.800000011920929D;
this.motionZ *= 0.800000011920929D;
//Spout start
motionY -= 0.02D * gravityMod;
//Spout end
if(this.isCollidedHorizontally && this.isOffsetPositionInLiquid(this.motionX, this.motionY + 0.6000000238418579D - this.posY + var3, this.motionZ)) {
this.motionY = 0.30000001192092896D;
}
} else if(this.handleLavaMovement()) {
var3 = this.posY;
this.moveFlying(var1, var2, 0.02F);
this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.motionX *= 0.5D;
this.motionY *= 0.5D;
this.motionZ *= 0.5D;
this.motionY -= 0.02D;
if(this.isCollidedHorizontally && this.isOffsetPositionInLiquid(this.motionX, this.motionY + 0.6000000238418579D - this.posY + var3, this.motionZ)) {
this.motionY = 0.30000001192092896D;
}
} else {
float var8 = 0.91F;
if(this.onGround) {
var8 = 0.54600006F;
int var4 = this.worldObj.getBlockId(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ));
if(var4 > 0) {
var8 = Block.blocksList[var4].slipperiness * 0.91F;
}
}
float var9 = 0.16277136F / (var8 * var8 * var8);
- float var5 = this.onGround?this.field_35169_bv * var9:this.field_35168_bw;
//Spout start
- float movement = 0.02F;
+ float movement = this.field_35168_bw;
if (onGround) {
- movement = (float) (0.1F * var9 * walkingMod);
+ movement = (float) (this.field_35169_bv * var9 * walkingMod);
}
else if (!isInWater()) {
movement *= airspeedMod;
}
moveFlying(var1, var2, movement);
//Spout end
var8 = 0.91F;
if(this.onGround) {
var8 = 0.54600006F;
int var6 = this.worldObj.getBlockId(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ));
if(var6 > 0) {
var8 = Block.blocksList[var6].slipperiness * 0.91F;
}
}
if(this.isOnLadder()) {
float var11 = 0.15F;
if(this.motionX < (double)(-var11)) {
this.motionX = (double)(-var11);
}
if(this.motionX > (double)var11) {
this.motionX = (double)var11;
}
if(this.motionZ < (double)(-var11)) {
this.motionZ = (double)(-var11);
}
if(this.motionZ > (double)var11) {
this.motionZ = (double)var11;
}
this.fallDistance = 0.0F;
if(this.motionY < -0.15D) {
this.motionY = -0.15D;
}
if(this.isSneaking() && this.motionY < 0.0D) {
this.motionY = 0.0D;
}
}
this.moveEntity(this.motionX, this.motionY, this.motionZ);
if(this.isCollidedHorizontally && this.isOnLadder()) {
this.motionY = 0.2D;
}
this.motionY -= 0.08D * gravityMod; //Spout
this.motionY *= 0.9800000190734863D;
this.motionX *= (double)var8;
this.motionZ *= (double)var8;
}
this.field_705_Q = this.field_704_R;
var3 = this.posX - this.prevPosX;
double var10 = this.posZ - this.prevPosZ;
float var7 = MathHelper.sqrt_double(var3 * var3 + var10 * var10) * 4.0F;
if(var7 > 1.0F) {
var7 = 1.0F;
}
this.field_704_R += (var7 - this.field_704_R) * 0.4F;
this.field_703_S += this.field_704_R;
}
public boolean isOnLadder() {
int var1 = MathHelper.floor_double(this.posX);
int var2 = MathHelper.floor_double(this.boundingBox.minY);
int var3 = MathHelper.floor_double(this.posZ);
return this.worldObj.getBlockId(var1, var2, var3) == Block.ladder.blockID;
}
public void writeEntityToNBT(NBTTagCompound var1) {
var1.setShort("Health", (short)this.health);
var1.setShort("HurtTime", (short)this.hurtTime);
var1.setShort("DeathTime", (short)this.deathTime);
var1.setShort("AttackTime", (short)this.attackTime);
if(!this.field_35170_bR.isEmpty()) {
NBTTagList var2 = new NBTTagList();
Iterator var3 = this.field_35170_bR.values().iterator();
while(var3.hasNext()) {
PotionEffect var4 = (PotionEffect)var3.next();
NBTTagCompound var5 = new NBTTagCompound();
var5.setByte("Id", (byte)var4.func_35799_a());
var5.setByte("Amplifier", (byte)var4.func_35801_c());
var5.setInteger("Duration", var4.func_35802_b());
var2.setTag(var5);
}
var1.setTag("ActiveEffects", var2);
}
}
public void readEntityFromNBT(NBTTagCompound var1) {
this.health = var1.getShort("Health");
if(!var1.hasKey("Health")) {
this.health = 10;
}
this.hurtTime = var1.getShort("HurtTime");
this.deathTime = var1.getShort("DeathTime");
this.attackTime = var1.getShort("AttackTime");
if(var1.hasKey("ActiveEffects")) {
NBTTagList var2 = var1.getTagList("ActiveEffects");
for(int var3 = 0; var3 < var2.tagCount(); ++var3) {
NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
byte var5 = var4.getByte("Id");
byte var6 = var4.getByte("Amplifier");
int var7 = var4.getInteger("Duration");
this.field_35170_bR.put(Integer.valueOf(var5), new PotionEffect(var5, var7, var6));
}
}
}
public boolean isEntityAlive() {
return !this.isDead && this.health > 0;
}
public boolean canBreatheUnderwater() {
return false;
}
public void onLivingUpdate() {
if(this.newPosRotationIncrements > 0) {
double var1 = this.posX + (this.newPosX - this.posX) / (double)this.newPosRotationIncrements;
double var3 = this.posY + (this.newPosY - this.posY) / (double)this.newPosRotationIncrements;
double var5 = this.posZ + (this.newPosZ - this.posZ) / (double)this.newPosRotationIncrements;
double var7;
for(var7 = this.newRotationYaw - (double)this.rotationYaw; var7 < -180.0D; var7 += 360.0D) {
;
}
while(var7 >= 180.0D) {
var7 -= 360.0D;
}
this.rotationYaw = (float)((double)this.rotationYaw + var7 / (double)this.newPosRotationIncrements);
this.rotationPitch = (float)((double)this.rotationPitch + (this.newRotationPitch - (double)this.rotationPitch) / (double)this.newPosRotationIncrements);
--this.newPosRotationIncrements;
this.setPosition(var1, var3, var5);
this.setRotation(this.rotationYaw, this.rotationPitch);
List var9 = this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox.contract(0.03125D, 0.0D, 0.03125D));
if(var9.size() > 0) {
double var10 = 0.0D;
for(int var12 = 0; var12 < var9.size(); ++var12) {
AxisAlignedBB var13 = (AxisAlignedBB)var9.get(var12);
if(var13.maxY > var10) {
var10 = var13.maxY;
}
}
var3 += var10 - this.boundingBox.minY;
this.setPosition(var1, var3, var5);
}
}
if(this.isMovementBlocked()) {
this.isJumping = false;
this.moveStrafing = 0.0F;
this.moveForward = 0.0F;
this.randomYawVelocity = 0.0F;
} else if(!this.isMultiplayerEntity) {
this.updateEntityActionState();
}
boolean var14 = this.isInWater();
boolean var2 = this.handleLavaMovement();
if(this.isJumping) {
if(var14) {
this.motionY += 0.03999999910593033D * jumpingMod; //Spout
} else if(var2) {
this.motionY += 0.03999999910593033D * jumpingMod; //Spout
} else if(this.onGround) {
this.jump();
}
}
this.moveStrafing *= 0.98F;
this.moveForward *= 0.98F;
this.randomYawVelocity *= 0.9F;
float var15 = this.field_35169_bv;
this.field_35169_bv *= this.func_35166_t_();
this.moveEntityWithHeading(this.moveStrafing, this.moveForward);
this.field_35169_bv = var15;
List var4 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand(0.20000000298023224D, 0.0D, 0.20000000298023224D));
if(var4 != null && var4.size() > 0) {
for(int var16 = 0; var16 < var4.size(); ++var16) {
Entity var6 = (Entity)var4.get(var16);
if(var6.canBePushed()) {
var6.applyEntityCollision(this);
}
}
}
}
protected boolean isMovementBlocked() {
return this.health <= 0;
}
public boolean func_35162_ad() {
return false;
}
protected void jump() {
this.motionY = 0.41999998688697815D * jumpingMod; //Spout
if(this.func_35117_Q()) {
float var1 = this.rotationYaw * 0.017453292F;
this.motionX -= (double)(MathHelper.sin(var1) * 0.2F);
this.motionZ += (double)(MathHelper.cos(var1) * 0.2F);
}
this.field_35118_ao = true;
}
protected boolean canDespawn() {
return true;
}
protected void despawnEntity() {
EntityPlayer var1 = this.worldObj.getClosestPlayerToEntity(this, -1.0D);
if(this.canDespawn() && var1 != null) {
double var2 = var1.posX - this.posX;
double var4 = var1.posY - this.posY;
double var6 = var1.posZ - this.posZ;
double var8 = var2 * var2 + var4 * var4 + var6 * var6;
if(var8 > 16384.0D) {
this.setEntityDead();
}
if(this.entityAge > 600 && this.rand.nextInt(800) == 0) {
if(var8 < 1024.0D) {
this.entityAge = 0;
} else {
this.setEntityDead();
}
}
}
}
protected void updateEntityActionState() {
++this.entityAge;
EntityPlayer var1 = this.worldObj.getClosestPlayerToEntity(this, -1.0D);
this.despawnEntity();
this.moveStrafing = 0.0F;
this.moveForward = 0.0F;
float var2 = 8.0F;
if(this.rand.nextFloat() < 0.02F) {
var1 = this.worldObj.getClosestPlayerToEntity(this, (double)var2);
if(var1 != null) {
this.currentTarget = var1;
this.numTicksToChaseTarget = 10 + this.rand.nextInt(20);
} else {
this.randomYawVelocity = (this.rand.nextFloat() - 0.5F) * 20.0F;
}
}
if(this.currentTarget != null) {
this.faceEntity(this.currentTarget, 10.0F, (float)this.getVerticalFaceSpeed());
if(this.numTicksToChaseTarget-- <= 0 || this.currentTarget.isDead || this.currentTarget.getDistanceSqToEntity(this) > (double)(var2 * var2)) {
this.currentTarget = null;
}
} else {
if(this.rand.nextFloat() < 0.05F) {
this.randomYawVelocity = (this.rand.nextFloat() - 0.5F) * 20.0F;
}
this.rotationYaw += this.randomYawVelocity;
this.rotationPitch = this.defaultPitch;
}
boolean var3 = this.isInWater();
boolean var4 = this.handleLavaMovement();
if(var3 || var4) {
this.isJumping = this.rand.nextFloat() < 0.8F;
}
}
protected int getVerticalFaceSpeed() {
return 40;
}
public void faceEntity(Entity var1, float var2, float var3) {
double var4 = var1.posX - this.posX;
double var8 = var1.posZ - this.posZ;
double var6;
if(var1 instanceof EntityLiving) {
EntityLiving var10 = (EntityLiving)var1;
var6 = this.posY + (double)this.getEyeHeight() - (var10.posY + (double)var10.getEyeHeight());
} else {
var6 = (var1.boundingBox.minY + var1.boundingBox.maxY) / 2.0D - (this.posY + (double)this.getEyeHeight());
}
double var14 = (double)MathHelper.sqrt_double(var4 * var4 + var8 * var8);
float var12 = (float)(Math.atan2(var8, var4) * 180.0D / 3.1415927410125732D) - 90.0F;
float var13 = (float)(-(Math.atan2(var6, var14) * 180.0D / 3.1415927410125732D));
this.rotationPitch = -this.updateRotation(this.rotationPitch, var13, var3);
this.rotationYaw = this.updateRotation(this.rotationYaw, var12, var2);
}
public boolean hasCurrentTarget() {
return this.currentTarget != null;
}
public Entity getCurrentTarget() {
return this.currentTarget;
}
private float updateRotation(float var1, float var2, float var3) {
float var4;
for(var4 = var2 - var1; var4 < -180.0F; var4 += 360.0F) {
;
}
while(var4 >= 180.0F) {
var4 -= 360.0F;
}
if(var4 > var3) {
var4 = var3;
}
if(var4 < -var3) {
var4 = -var3;
}
return var1 + var4;
}
public void onEntityDeath() {}
public boolean getCanSpawnHere() {
return this.worldObj.checkIfAABBIsClear(this.boundingBox) && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).size() == 0 && !this.worldObj.getIsAnyLiquid(this.boundingBox);
}
protected void kill() {
this.attackEntityFrom(DamageSource.outOfWorld, 4);
}
public float getSwingProgress(float var1) {
float var2 = this.swingProgress - this.prevSwingProgress;
if(var2 < 0.0F) {
++var2;
}
return this.prevSwingProgress + var2 * var1;
}
public Vec3D getPosition(float var1) {
if(var1 == 1.0F) {
return Vec3D.createVector(this.posX, this.posY, this.posZ);
} else {
double var2 = this.prevPosX + (this.posX - this.prevPosX) * (double)var1;
double var4 = this.prevPosY + (this.posY - this.prevPosY) * (double)var1;
double var6 = this.prevPosZ + (this.posZ - this.prevPosZ) * (double)var1;
return Vec3D.createVector(var2, var4, var6);
}
}
public Vec3D getLookVec() {
return this.getLook(1.0F);
}
public Vec3D getLook(float var1) {
float var2;
float var3;
float var4;
float var5;
if(var1 == 1.0F) {
var2 = MathHelper.cos(-this.rotationYaw * 0.017453292F - 3.1415927F);
var3 = MathHelper.sin(-this.rotationYaw * 0.017453292F - 3.1415927F);
var4 = -MathHelper.cos(-this.rotationPitch * 0.017453292F);
var5 = MathHelper.sin(-this.rotationPitch * 0.017453292F);
return Vec3D.createVector((double)(var3 * var4), (double)var5, (double)(var2 * var4));
} else {
var2 = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * var1;
var3 = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * var1;
var4 = MathHelper.cos(-var3 * 0.017453292F - 3.1415927F);
var5 = MathHelper.sin(-var3 * 0.017453292F - 3.1415927F);
float var6 = -MathHelper.cos(-var2 * 0.017453292F);
float var7 = MathHelper.sin(-var2 * 0.017453292F);
return Vec3D.createVector((double)(var5 * var6), (double)var7, (double)(var4 * var6));
}
}
public float func_35159_aC() {
return 1.0F;
}
public MovingObjectPosition rayTrace(double var1, float var3) {
Vec3D var4 = this.getPosition(var3);
Vec3D var5 = this.getLook(var3);
Vec3D var6 = var4.addVector(var5.xCoord * var1, var5.yCoord * var1, var5.zCoord * var1);
return this.worldObj.rayTraceBlocks(var4, var6);
}
public int getMaxSpawnedInChunk() {
return 4;
}
public ItemStack getHeldItem() {
return null;
}
public void handleHealthUpdate(byte var1) {
if(var1 == 2) {
this.field_704_R = 1.5F;
this.heartsLife = this.heartsHalvesLife;
this.hurtTime = this.maxHurtTime = 10;
this.attackedAtYaw = 0.0F;
this.worldObj.playSoundAtEntity(this, this.getHurtSound(), this.getSoundVolume(), (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F);
this.attackEntityFrom(DamageSource.generic, 0);
} else if(var1 == 3) {
this.worldObj.playSoundAtEntity(this, this.getDeathSound(), this.getSoundVolume(), (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F);
this.health = 0;
this.onDeath(DamageSource.generic);
} else {
super.handleHealthUpdate(var1);
}
}
public boolean isPlayerSleeping() {
return false;
}
public int getItemIcon(ItemStack var1) {
return var1.getIconIndex();
}
protected void func_36000_g() {
Iterator var1 = this.field_35170_bR.keySet().iterator();
while(var1.hasNext()) {
Integer var2 = (Integer)var1.next();
PotionEffect var3 = (PotionEffect)this.field_35170_bR.get(var2);
if(!var3.func_35798_a(this) && !this.worldObj.multiplayerWorld) {
var1.remove();
this.func_35158_d(var3);
}
}
}
public boolean func_35160_a(Potion var1) {
return this.field_35170_bR.containsKey(Integer.valueOf(var1.id));
}
public PotionEffect func_35167_b(Potion var1) {
return (PotionEffect)this.field_35170_bR.get(Integer.valueOf(var1.id));
}
public void func_35165_a(PotionEffect var1) {
if(this.field_35170_bR.containsKey(Integer.valueOf(var1.func_35799_a()))) {
((PotionEffect)this.field_35170_bR.get(Integer.valueOf(var1.func_35799_a()))).func_35796_a(var1);
this.func_35161_c((PotionEffect)this.field_35170_bR.get(Integer.valueOf(var1.func_35799_a())));
} else {
this.field_35170_bR.put(Integer.valueOf(var1.func_35799_a()), var1);
this.func_35164_b(var1);
}
}
public void func_36002_f(int var1) {
this.field_35170_bR.remove(Integer.valueOf(var1));
}
protected void func_35164_b(PotionEffect var1) {}
protected void func_35161_c(PotionEffect var1) {}
protected void func_35158_d(PotionEffect var1) {}
protected float func_35166_t_() {
float var1 = 1.0F;
if(this.func_35160_a(Potion.potionSpeed)) {
var1 *= 1.0F + 0.2F * (float)(this.func_35167_b(Potion.potionSpeed).func_35801_c() + 1);
}
if(this.func_35160_a(Potion.potionSlowdown)) {
var1 *= 1.0F - 0.15F * (float)(this.func_35167_b(Potion.potionSlowdown).func_35801_c() + 1);
}
return var1;
}
}
| false | true | public void moveEntityWithHeading(float var1, float var2) {
double var3;
if(this.isInWater()) {
var3 = this.posY;
moveFlying(var1, var2, (float) (0.02F * swimmingMod)); //Spout
this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.motionX *= 0.800000011920929D;
this.motionY *= 0.800000011920929D;
this.motionZ *= 0.800000011920929D;
//Spout start
motionY -= 0.02D * gravityMod;
//Spout end
if(this.isCollidedHorizontally && this.isOffsetPositionInLiquid(this.motionX, this.motionY + 0.6000000238418579D - this.posY + var3, this.motionZ)) {
this.motionY = 0.30000001192092896D;
}
} else if(this.handleLavaMovement()) {
var3 = this.posY;
this.moveFlying(var1, var2, 0.02F);
this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.motionX *= 0.5D;
this.motionY *= 0.5D;
this.motionZ *= 0.5D;
this.motionY -= 0.02D;
if(this.isCollidedHorizontally && this.isOffsetPositionInLiquid(this.motionX, this.motionY + 0.6000000238418579D - this.posY + var3, this.motionZ)) {
this.motionY = 0.30000001192092896D;
}
} else {
float var8 = 0.91F;
if(this.onGround) {
var8 = 0.54600006F;
int var4 = this.worldObj.getBlockId(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ));
if(var4 > 0) {
var8 = Block.blocksList[var4].slipperiness * 0.91F;
}
}
float var9 = 0.16277136F / (var8 * var8 * var8);
float var5 = this.onGround?this.field_35169_bv * var9:this.field_35168_bw;
//Spout start
float movement = 0.02F;
if (onGround) {
movement = (float) (0.1F * var9 * walkingMod);
}
else if (!isInWater()) {
movement *= airspeedMod;
}
moveFlying(var1, var2, movement);
//Spout end
var8 = 0.91F;
if(this.onGround) {
var8 = 0.54600006F;
int var6 = this.worldObj.getBlockId(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ));
if(var6 > 0) {
var8 = Block.blocksList[var6].slipperiness * 0.91F;
}
}
if(this.isOnLadder()) {
float var11 = 0.15F;
if(this.motionX < (double)(-var11)) {
this.motionX = (double)(-var11);
}
if(this.motionX > (double)var11) {
this.motionX = (double)var11;
}
if(this.motionZ < (double)(-var11)) {
this.motionZ = (double)(-var11);
}
if(this.motionZ > (double)var11) {
this.motionZ = (double)var11;
}
this.fallDistance = 0.0F;
if(this.motionY < -0.15D) {
this.motionY = -0.15D;
}
if(this.isSneaking() && this.motionY < 0.0D) {
this.motionY = 0.0D;
}
}
this.moveEntity(this.motionX, this.motionY, this.motionZ);
if(this.isCollidedHorizontally && this.isOnLadder()) {
this.motionY = 0.2D;
}
this.motionY -= 0.08D * gravityMod; //Spout
this.motionY *= 0.9800000190734863D;
this.motionX *= (double)var8;
this.motionZ *= (double)var8;
}
this.field_705_Q = this.field_704_R;
var3 = this.posX - this.prevPosX;
double var10 = this.posZ - this.prevPosZ;
float var7 = MathHelper.sqrt_double(var3 * var3 + var10 * var10) * 4.0F;
if(var7 > 1.0F) {
var7 = 1.0F;
}
this.field_704_R += (var7 - this.field_704_R) * 0.4F;
this.field_703_S += this.field_704_R;
}
| public void moveEntityWithHeading(float var1, float var2) {
double var3;
if(this.isInWater()) {
var3 = this.posY;
moveFlying(var1, var2, (float) (0.02F * swimmingMod)); //Spout
this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.motionX *= 0.800000011920929D;
this.motionY *= 0.800000011920929D;
this.motionZ *= 0.800000011920929D;
//Spout start
motionY -= 0.02D * gravityMod;
//Spout end
if(this.isCollidedHorizontally && this.isOffsetPositionInLiquid(this.motionX, this.motionY + 0.6000000238418579D - this.posY + var3, this.motionZ)) {
this.motionY = 0.30000001192092896D;
}
} else if(this.handleLavaMovement()) {
var3 = this.posY;
this.moveFlying(var1, var2, 0.02F);
this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.motionX *= 0.5D;
this.motionY *= 0.5D;
this.motionZ *= 0.5D;
this.motionY -= 0.02D;
if(this.isCollidedHorizontally && this.isOffsetPositionInLiquid(this.motionX, this.motionY + 0.6000000238418579D - this.posY + var3, this.motionZ)) {
this.motionY = 0.30000001192092896D;
}
} else {
float var8 = 0.91F;
if(this.onGround) {
var8 = 0.54600006F;
int var4 = this.worldObj.getBlockId(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ));
if(var4 > 0) {
var8 = Block.blocksList[var4].slipperiness * 0.91F;
}
}
float var9 = 0.16277136F / (var8 * var8 * var8);
//Spout start
float movement = this.field_35168_bw;
if (onGround) {
movement = (float) (this.field_35169_bv * var9 * walkingMod);
}
else if (!isInWater()) {
movement *= airspeedMod;
}
moveFlying(var1, var2, movement);
//Spout end
var8 = 0.91F;
if(this.onGround) {
var8 = 0.54600006F;
int var6 = this.worldObj.getBlockId(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ));
if(var6 > 0) {
var8 = Block.blocksList[var6].slipperiness * 0.91F;
}
}
if(this.isOnLadder()) {
float var11 = 0.15F;
if(this.motionX < (double)(-var11)) {
this.motionX = (double)(-var11);
}
if(this.motionX > (double)var11) {
this.motionX = (double)var11;
}
if(this.motionZ < (double)(-var11)) {
this.motionZ = (double)(-var11);
}
if(this.motionZ > (double)var11) {
this.motionZ = (double)var11;
}
this.fallDistance = 0.0F;
if(this.motionY < -0.15D) {
this.motionY = -0.15D;
}
if(this.isSneaking() && this.motionY < 0.0D) {
this.motionY = 0.0D;
}
}
this.moveEntity(this.motionX, this.motionY, this.motionZ);
if(this.isCollidedHorizontally && this.isOnLadder()) {
this.motionY = 0.2D;
}
this.motionY -= 0.08D * gravityMod; //Spout
this.motionY *= 0.9800000190734863D;
this.motionX *= (double)var8;
this.motionZ *= (double)var8;
}
this.field_705_Q = this.field_704_R;
var3 = this.posX - this.prevPosX;
double var10 = this.posZ - this.prevPosZ;
float var7 = MathHelper.sqrt_double(var3 * var3 + var10 * var10) * 4.0F;
if(var7 > 1.0F) {
var7 = 1.0F;
}
this.field_704_R += (var7 - this.field_704_R) * 0.4F;
this.field_703_S += this.field_704_R;
}
|
diff --git a/tools/host/src/com/android/cts/CtsTestResult.java b/tools/host/src/com/android/cts/CtsTestResult.java
index 0aea74b3..851b07d3 100644
--- a/tools/host/src/com/android/cts/CtsTestResult.java
+++ b/tools/host/src/com/android/cts/CtsTestResult.java
@@ -1,203 +1,209 @@
/*
* 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.android.cts;
import junit.framework.TestFailure;
import junit.framework.TestResult;
import java.util.Enumeration;
import java.util.HashMap;
/**
* Store the result of a specific test.
*/
public class CtsTestResult {
private int mResultCode;
private String mFailedMessage;
private String mStackTrace;
public static final int CODE_INIT = -1;
public static final int CODE_NOT_EXECUTED = 0;
public static final int CODE_PASS = 1;
public static final int CODE_FAIL = 2;
public static final int CODE_ERROR = 3;
public static final int CODE_TIMEOUT = 4;
public static final int CODE_OMITTED = 5;
public static final int CODE_FIRST = CODE_INIT;
public static final int CODE_LAST = CODE_OMITTED;
public static final String STR_ERROR = "error";
public static final String STR_TIMEOUT = "timeout";
public static final String STR_NOT_EXECUTED = "notExecuted";
public static final String STR_OMITTED = "omitted";
public static final String STR_FAIL = "fail";
public static final String STR_PASS = "pass";
private static HashMap<Integer, String> sCodeToResultMap;
private static HashMap<String, Integer> sResultToCodeMap;
static {
sCodeToResultMap = new HashMap<Integer, String>();
sCodeToResultMap.put(CODE_NOT_EXECUTED, STR_NOT_EXECUTED);
sCodeToResultMap.put(CODE_PASS, STR_PASS);
sCodeToResultMap.put(CODE_FAIL, STR_FAIL);
sCodeToResultMap.put(CODE_ERROR, STR_ERROR);
sCodeToResultMap.put(CODE_TIMEOUT, STR_TIMEOUT);
sCodeToResultMap.put(CODE_OMITTED, STR_OMITTED);
sResultToCodeMap = new HashMap<String, Integer>();
for (int code : sCodeToResultMap.keySet()) {
sResultToCodeMap.put(sCodeToResultMap.get(code), code);
}
}
public CtsTestResult(int resCode) {
mResultCode = resCode;
}
public CtsTestResult(int resCode, final String failedMessage, final String stackTrace) {
mResultCode = resCode;
mFailedMessage = failedMessage;
mStackTrace = stackTrace;
}
public CtsTestResult(final String result, final String failedMessage,
final String stackTrace) throws InvalidTestResultStringException {
if (!sResultToCodeMap.containsKey(result)) {
throw new InvalidTestResultStringException(result);
}
mResultCode = sResultToCodeMap.get(result);
mFailedMessage = failedMessage;
mStackTrace = stackTrace;
}
/**
* Check if the result indicates failure.
*
* @return If failed, return true; else, return false.
*/
public boolean isFail() {
return mResultCode == CODE_FAIL;
}
/**
* Check if the result indicates pass.
*
* @return If pass, return true; else, return false.
*/
public boolean isPass() {
return mResultCode == CODE_PASS;
}
/**
* Check if the result indicates not executed.
*
* @return If not executed, return true; else, return false.
*/
public boolean isNotExecuted() {
return mResultCode == CODE_NOT_EXECUTED;
}
/**
* Get result code of the test.
*
* @return The result code of the test.
* The following is the possible result codes:
* <ul>
* <li> notExecuted
* <li> pass
* <li> fail
* <li> error
* <li> timeout
* </ul>
*/
public int getResultCode() {
return mResultCode;
}
/**
* Get the failed message.
*
* @return The failed message.
*/
public String getFailedMessage() {
return mFailedMessage;
}
/**
* Get the stack trace.
*
* @return The stack trace.
*/
public String getStackTrace() {
return mStackTrace;
}
/**
* Set the result.
*
* @param testResult The result in the form of JUnit test result.
*/
@SuppressWarnings("unchecked")
public void setResult(TestResult testResult) {
int resCode = CODE_PASS;
String failedMessage = null;
String stackTrace = null;
- if ((testResult != null) && (testResult.failureCount() > 0)) {
+ if ((testResult != null) && (testResult.failureCount() > 0 || testResult.errorCount() > 0)) {
resCode = CODE_FAIL;
Enumeration<TestFailure> failures = testResult.failures();
while (failures.hasMoreElements()) {
TestFailure failure = failures.nextElement();
failedMessage += failure.exceptionMessage();
stackTrace += failure.trace();
}
+ Enumeration<TestFailure> errors = testResult.errors();
+ while (errors.hasMoreElements()) {
+ TestFailure failure = errors.nextElement();
+ failedMessage += failure.exceptionMessage();
+ stackTrace += failure.trace();
+ }
}
mResultCode = resCode;
mFailedMessage = failedMessage;
mStackTrace = stackTrace;
}
/**
* Reverse the result code.
*/
public void reverse() {
if (isPass()) {
mResultCode = CtsTestResult.CODE_FAIL;
} else if (isFail()){
mResultCode = CtsTestResult.CODE_PASS;
}
}
/**
* Get the test result as string.
*
* @return The readable result string.
*/
public String getResultString() {
return sCodeToResultMap.get(mResultCode);
}
/**
* Check if the given resultType is a valid result type defined..
*
* @param resultType The result type to be checked.
* @return If valid, return true; else, return false.
*/
static public boolean isValidResultType(final String resultType) {
return sResultToCodeMap.containsKey(resultType);
}
}
| false | true | public void setResult(TestResult testResult) {
int resCode = CODE_PASS;
String failedMessage = null;
String stackTrace = null;
if ((testResult != null) && (testResult.failureCount() > 0)) {
resCode = CODE_FAIL;
Enumeration<TestFailure> failures = testResult.failures();
while (failures.hasMoreElements()) {
TestFailure failure = failures.nextElement();
failedMessage += failure.exceptionMessage();
stackTrace += failure.trace();
}
}
mResultCode = resCode;
mFailedMessage = failedMessage;
mStackTrace = stackTrace;
}
| public void setResult(TestResult testResult) {
int resCode = CODE_PASS;
String failedMessage = null;
String stackTrace = null;
if ((testResult != null) && (testResult.failureCount() > 0 || testResult.errorCount() > 0)) {
resCode = CODE_FAIL;
Enumeration<TestFailure> failures = testResult.failures();
while (failures.hasMoreElements()) {
TestFailure failure = failures.nextElement();
failedMessage += failure.exceptionMessage();
stackTrace += failure.trace();
}
Enumeration<TestFailure> errors = testResult.errors();
while (errors.hasMoreElements()) {
TestFailure failure = errors.nextElement();
failedMessage += failure.exceptionMessage();
stackTrace += failure.trace();
}
}
mResultCode = resCode;
mFailedMessage = failedMessage;
mStackTrace = stackTrace;
}
|
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 92c2d621b..abbb15094 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -1,617 +1,617 @@
package hudson.model;
import hudson.FilePath;
import hudson.Launcher;
import hudson.FeedAdapter;
import hudson.maven.MavenModule;
import hudson.model.Descriptor.FormException;
import hudson.model.Fingerprint.RangeSet;
import hudson.model.RunMap.Constructor;
import hudson.scm.ChangeLogSet;
import hudson.scm.NullSCM;
import hudson.scm.SCM;
import hudson.scm.SCMS;
import hudson.scm.ChangeLogSet.Entry;
import hudson.triggers.Trigger;
import hudson.triggers.TriggerDescriptor;
import hudson.triggers.Triggers;
import hudson.util.EditDistance;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import javax.servlet.ServletException;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.Vector;
import java.util.Calendar;
/**
* Base implementation of {@link Job}s that build software.
*
* For now this is primarily the common part of {@link Project} and {@link MavenModule}.
*
* @author Kohsuke Kawaguchi
* @see AbstractBuild
*/
public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends AbstractBuild<P,R>> extends Job<P,R> implements BuildableItem {
private SCM scm = new NullSCM();
/**
* All the builds keyed by their build number.
*/
protected transient /*almost final*/ RunMap<R> builds = new RunMap<R>();
/**
* The quiet period. Null to delegate to the system default.
*/
private Integer quietPeriod = null;
/**
* If this project is configured to be only built on a certain node,
* this value will be set to that node. Null to indicate the affinity
* with the master node.
*
* see #canRoam
*/
private String assignedNode;
/**
* True if this project can be built on any node.
*
* <p>
* This somewhat ugly flag combination is so that we can migrate
* existing Hudson installations nicely.
*/
private boolean canRoam;
/**
* True to suspend new builds.
*/
protected boolean disabled;
/**
* Identifies {@link JDK} to be used.
* Null if no explicit configuration is required.
*
* <p>
* Can't store {@link JDK} directly because {@link Hudson} and {@link Project}
* are saved independently.
*
* @see Hudson#getJDK(String)
*/
private String jdk;
/**
* @deprecated
*/
private transient boolean enableRemoteTrigger;
private BuildAuthorizationToken authToken = null;
/**
* List of all {@link Trigger}s for this project.
*/
protected List<Trigger<?>> triggers = new Vector<Trigger<?>>();
/**
* {@link Action}s contributed from subsidiary objects associated with
* {@link AbstractProject}, such as from triggers, builders, publishers, etc.
*
* We don't want to persist them separately, and these actions
* come and go as configuration change, so it's kept separate.
*/
protected transient /*final*/ List<Action> transientActions = new Vector<Action>();
protected AbstractProject(ItemGroup parent, String name) {
super(parent,name);
if(!Hudson.getInstance().getSlaves().isEmpty()) {
// if a new job is configured with Hudson that already has slave nodes
// make it roamable by default
canRoam = true;
}
}
@Override
public void onLoad(ItemGroup<? extends Item> parent, String name) throws IOException {
super.onLoad(parent, name);
this.builds = new RunMap<R>();
this.builds.load(this,new Constructor<R>() {
public R create(File dir) throws IOException {
return loadBuild(dir);
}
});
if(triggers==null)
// it didn't exist in < 1.28
triggers = new Vector<Trigger<?>>();
for (Trigger t : triggers)
t.start(this,false);
}
/**
* If this project is configured to be always built on this node,
* return that {@link Node}. Otherwise null.
*/
public Node getAssignedNode() {
if(canRoam)
return null;
if(assignedNode ==null)
return Hudson.getInstance();
return Hudson.getInstance().getSlave(assignedNode);
}
/**
* Gets the directory where the module is checked out.
*/
public abstract FilePath getWorkspace();
/**
* Returns the root directory of the checked-out module.
* <p>
* This is usually where <tt>pom.xml</tt>, <tt>build.xml</tt>
* and so on exists.
*/
public FilePath getModuleRoot() {
return getScm().getModuleRoot(getWorkspace());
}
public int getQuietPeriod() {
return quietPeriod!=null ? quietPeriod : Hudson.getInstance().getQuietPeriod();
}
// ugly name because of EL
public boolean getHasCustomQuietPeriod() {
return quietPeriod!=null;
}
public final boolean isBuildable() {
return !isDisabled();
}
public boolean isDisabled() {
return disabled;
}
@Override
public BallColor getIconColor() {
if(isDisabled())
// use grey to indicate that the build is disabled
return BallColor.GREY;
else
return super.getIconColor();
}
/**
* Schedules a build of this project.
*
* @return
* true if the project is actually added to the queue.
* false if the queue contained it and therefore the add()
* was noop
*/
public boolean scheduleBuild() {
if(isDisabled()) return false;
return Hudson.getInstance().getQueue().add(this);
}
/**
* Returns true if the build is in the queue.
*/
@Override
public boolean isInQueue() {
return Hudson.getInstance().getQueue().contains(this);
}
@Override
public Queue.Item getQueueItem() {
return Hudson.getInstance().getQueue().getItem(this);
}
/**
* Returns true if a build of this project is in progress.
*/
public boolean isBuilding() {
R b = getLastBuild();
return b!=null && b.isBuilding();
}
public JDK getJDK() {
return Hudson.getInstance().getJDK(jdk);
}
/**
* Overwrites the JDK setting.
*/
public synchronized void setJDK(JDK jdk) throws IOException {
this.jdk = jdk.getName();
save();
}
public BuildAuthorizationToken getAuthToken() {
return authToken;
}
public SortedMap<Integer, ? extends R> _getRuns() {
return builds.getView();
}
public void removeRun(R run) {
this.builds.remove(run);
}
/**
* Creates a new build of this project for immediate execution.
*/
protected abstract R newBuild() throws IOException;
/**
* Loads an existing build record from disk.
*/
protected abstract R loadBuild(File dir) throws IOException;
public synchronized List<Action> getActions() {
// add all the transient actions, too
List<Action> actions = new Vector<Action>(super.getActions());
actions.addAll(transientActions);
return actions;
}
/**
* Gets the {@link Node} where this project was last built on.
*
* @return
* null if no information is available (for example,
* if no build was done yet.)
*/
public Node getLastBuiltOn() {
// where was it built on?
AbstractBuild b = getLastBuild();
if(b==null)
return null;
else
return b.getBuiltOn();
}
/**
* Returns true if this project's build execution should be blocked
* for temporary reasons. This method is used by {@link Queue}.
*
* <p>
* A project must be blocked if its own previous build is in progress,
* but derived classes can also check other conditions.
*/
protected boolean isBuildBlocked() {
return isBuilding();
}
public boolean checkout(AbstractBuild build, Launcher launcher, BuildListener listener, File changelogFile) throws IOException {
if(scm==null)
return true; // no SCM
try {
FilePath workspace = getWorkspace();
workspace.mkdirs();
return scm.checkout(build, launcher, workspace, listener, changelogFile);
} catch (InterruptedException e) {
e.printStackTrace(listener.fatalError("SCM check out aborted"));
return false;
}
}
/**
* Checks if there's any update in SCM, and returns true if any is found.
*
* <p>
* The caller is responsible for coordinating the mutual exclusion between
* a build and polling, as both touches the workspace.
*/
public boolean pollSCMChanges( TaskListener listener ) {
if(scm==null) {
listener.getLogger().println("No SCM");
return false;
}
if(isDisabled()) {
listener.getLogger().println("Build disabled");
return false;
}
try {
FilePath workspace = getWorkspace();
if(!workspace.exists()) {
// no workspace. build now, or nothing will ever be built
listener.getLogger().println("No workspace is available, so can't check for updates.");
listener.getLogger().println("Scheduling a new build to get a workspace.");
return true;
}
return scm.pollChanges(this, workspace.createLauncher(listener), workspace, listener );
} catch (IOException e) {
e.printStackTrace(listener.fatalError(e.getMessage()));
return false;
} catch (InterruptedException e) {
e.printStackTrace(listener.fatalError("SCM polling aborted"));
return false;
}
}
public SCM getScm() {
return scm;
}
public void setScm(SCM scm) {
this.scm = scm;
}
/**
* Adds a new {@link Trigger} to this {@link Project} if not active yet.
*/
public void addTrigger(Trigger<?> trigger) throws IOException {
addToList(trigger,triggers);
}
public void removeTrigger(TriggerDescriptor trigger) throws IOException {
removeFromList(trigger,triggers);
}
protected final synchronized <T extends Describable<T>>
void addToList( T item, List<T> collection ) throws IOException {
for( int i=0; i<collection.size(); i++ ) {
if(collection.get(i).getDescriptor()==item.getDescriptor()) {
// replace
collection.set(i,item);
save();
return;
}
}
// add
collection.add(item);
save();
}
protected final synchronized <T extends Describable<T>>
void removeFromList(Descriptor<T> item, List<T> collection) throws IOException {
for( int i=0; i< collection.size(); i++ ) {
if(collection.get(i).getDescriptor()==item) {
// found it
collection.remove(i);
save();
return;
}
}
}
public synchronized Map<TriggerDescriptor,Trigger> getTriggers() {
return (Map)Descriptor.toMap(triggers);
}
//
//
// fingerprint related
//
//
/**
* True if the builds of this project produces {@link Fingerprint} records.
*/
public abstract boolean isFingerprintConfigured();
/**
* Gets the other {@link AbstractProject}s that should be built
* when a build of this project is completed.
*/
public final List<AbstractProject> getDownstreamProjects() {
return Hudson.getInstance().getDependencyGraph().getDownstream(this);
}
public final List<AbstractProject> getUpstreamProjects() {
return Hudson.getInstance().getDependencyGraph().getUpstream(this);
}
/**
* Gets the dependency relationship map between this project (as the source)
* and that project (as the sink.)
*
* @return
* can be empty but not null. build number of this project to the build
* numbers of that project.
*/
public SortedMap<Integer, RangeSet> getRelationship(AbstractProject that) {
TreeMap<Integer,RangeSet> r = new TreeMap<Integer,RangeSet>(REVERSE_INTEGER_COMPARATOR);
checkAndRecord(that, r, this.getBuilds());
// checkAndRecord(that, r, that.getBuilds());
return r;
}
/**
* Helper method for getDownstreamRelationship.
*
* For each given build, find the build number range of the given project and put that into the map.
*/
private void checkAndRecord(AbstractProject that, TreeMap<Integer, RangeSet> r, Collection<R> builds) {
for (R build : builds) {
RangeSet rs = build.getDownstreamRelationship(that);
if(rs==null || rs.isEmpty())
continue;
int n = build.getNumber();
RangeSet value = r.get(n);
if(value==null)
r.put(n,rs);
else
value.add(rs);
}
}
/**
* Builds the dependency graph.
* @see DependencyGraph
*/
protected abstract void buildDependencyGraph(DependencyGraph graph);
//
//
// actions
//
//
/**
* Schedules a new build command.
*/
public void doBuild( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
BuildAuthorizationToken.startBuildIfAuthorized(authToken,this,req,rsp);
}
/**
* Cancels a scheduled build.
*/
public void doCancelQueue( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
if(!Hudson.adminCheck(req,rsp))
return;
Hudson.getInstance().getQueue().cancel(this);
rsp.forwardToPreviousPage(req);
}
@Override
protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
super.submit(req,rsp);
disabled = req.getParameter("disable")!=null;
jdk = req.getParameter("jdk");
if(req.getParameter("hasCustomQuietPeriod")!=null) {
quietPeriod = Integer.parseInt(req.getParameter("quiet_period"));
} else {
quietPeriod = null;
}
if(req.getParameter("hasSlaveAffinity")!=null) {
canRoam = false;
assignedNode = req.getParameter("slave");
if(assignedNode !=null) {
if(Hudson.getInstance().getSlave(assignedNode)==null) {
assignedNode = null; // no such slave
}
}
} else {
canRoam = true;
assignedNode = null;
}
authToken = BuildAuthorizationToken.create(req);
setScm(SCMS.parseSCM(req));
for (Trigger t : triggers)
t.stop();
buildDescribable(req, Triggers.getApplicableTriggers(this), triggers, "trigger");
for (Trigger t : triggers)
t.start(this,true);
}
protected final <T extends Describable<T>> void buildDescribable(StaplerRequest req, List<? extends Descriptor<T>> descriptors, List<T> result, String prefix)
throws FormException {
result.clear();
for( int i=0; i< descriptors.size(); i++ ) {
if(req.getParameter(prefix +i)!=null) {
T instance = descriptors.get(i).newInstance(req);
result.add(instance);
}
}
}
/**
* Serves the workspace files.
*/
public void doWs( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException, InterruptedException {
FilePath ws = getWorkspace();
if(!ws.exists()) {
// if there's no workspace, report a nice error message
rsp.forward(this,"noWorkspace",req);
} else {
new DirectoryBrowserSupport(this).serveFile(req, rsp, ws, "folder.gif", true);
}
}
/**
* RSS feed for changes in this project.
*/
public void doRssChangelog( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
class FeedItem {
ChangeLogSet.Entry e;
int idx;
public FeedItem(Entry e, int idx) {
this.e = e;
this.idx = idx;
}
AbstractBuild<?,?> getBuild() {
return e.getParent().build;
}
}
List<FeedItem> entries = new ArrayList<FeedItem>();
for(R r=getLastBuild(); r!=null; r=r.getPreviousBuild()) {
int idx=0;
for( ChangeLogSet.Entry e : r.getChangeSet())
entries.add(new FeedItem(e,idx++));
}
RSS.forwardToRss(
getDisplayName()+' '+scm.getDescriptor().getDisplayName()+" changes",
getUrl()+"changes",
entries, new FeedAdapter<FeedItem>() {
public String getEntryTitle(FeedItem item) {
- return '#'+item.getBuild().number+' '+item.e.getMsg()+" ("+item.e.getAuthor()+")";
+ return "#"+item.getBuild().number+' '+item.e.getMsg()+" ("+item.e.getAuthor()+")";
}
public String getEntryUrl(FeedItem item) {
return item.getBuild().getUrl()+"changes#detail"+item.idx;
}
public String getEntryID(FeedItem item) {
return getEntryUrl(item);
}
public Calendar getEntryTimestamp(FeedItem item) {
return item.getBuild().getTimestamp();
}
},
req, rsp );
}
/**
* Finds a {@link AbstractProject} that has the name closest to the given name.
*/
public static AbstractProject findNearest(String name) {
List<AbstractProject> projects = Hudson.getInstance().getAllItems(AbstractProject.class);
String[] names = new String[projects.size()];
for( int i=0; i<projects.size(); i++ )
names[i] = projects.get(i).getName();
String nearest = EditDistance.findNearest(name, names);
return (AbstractProject)Hudson.getInstance().getItem(nearest);
}
private static final Comparator<Integer> REVERSE_INTEGER_COMPARATOR = new Comparator<Integer>() {
public int compare(Integer o1, Integer o2) {
return o2-o1;
}
};
}
| true | true | public void doRssChangelog( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
class FeedItem {
ChangeLogSet.Entry e;
int idx;
public FeedItem(Entry e, int idx) {
this.e = e;
this.idx = idx;
}
AbstractBuild<?,?> getBuild() {
return e.getParent().build;
}
}
List<FeedItem> entries = new ArrayList<FeedItem>();
for(R r=getLastBuild(); r!=null; r=r.getPreviousBuild()) {
int idx=0;
for( ChangeLogSet.Entry e : r.getChangeSet())
entries.add(new FeedItem(e,idx++));
}
RSS.forwardToRss(
getDisplayName()+' '+scm.getDescriptor().getDisplayName()+" changes",
getUrl()+"changes",
entries, new FeedAdapter<FeedItem>() {
public String getEntryTitle(FeedItem item) {
return '#'+item.getBuild().number+' '+item.e.getMsg()+" ("+item.e.getAuthor()+")";
}
public String getEntryUrl(FeedItem item) {
return item.getBuild().getUrl()+"changes#detail"+item.idx;
}
public String getEntryID(FeedItem item) {
return getEntryUrl(item);
}
public Calendar getEntryTimestamp(FeedItem item) {
return item.getBuild().getTimestamp();
}
},
req, rsp );
}
| public void doRssChangelog( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
class FeedItem {
ChangeLogSet.Entry e;
int idx;
public FeedItem(Entry e, int idx) {
this.e = e;
this.idx = idx;
}
AbstractBuild<?,?> getBuild() {
return e.getParent().build;
}
}
List<FeedItem> entries = new ArrayList<FeedItem>();
for(R r=getLastBuild(); r!=null; r=r.getPreviousBuild()) {
int idx=0;
for( ChangeLogSet.Entry e : r.getChangeSet())
entries.add(new FeedItem(e,idx++));
}
RSS.forwardToRss(
getDisplayName()+' '+scm.getDescriptor().getDisplayName()+" changes",
getUrl()+"changes",
entries, new FeedAdapter<FeedItem>() {
public String getEntryTitle(FeedItem item) {
return "#"+item.getBuild().number+' '+item.e.getMsg()+" ("+item.e.getAuthor()+")";
}
public String getEntryUrl(FeedItem item) {
return item.getBuild().getUrl()+"changes#detail"+item.idx;
}
public String getEntryID(FeedItem item) {
return getEntryUrl(item);
}
public Calendar getEntryTimestamp(FeedItem item) {
return item.getBuild().getTimestamp();
}
},
req, rsp );
}
|
diff --git a/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java b/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java
index 4dfbc065..3968f68a 100644
--- a/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java
+++ b/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java
@@ -1,253 +1,253 @@
package org.jboss.tools.ws.creation.ui.widgets;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
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.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
import org.jboss.tools.ws.ui.utils.JBossWSUIUtils;
@SuppressWarnings("restriction")
public class WSDL2JavaCodeGenConfigWidget extends SimpleWidgetDataContributor {
private ServiceModel model;
private IStatus status = null;
public ServiceModel getModel() {
return model;
}
public void setModel(ServiceModel model) {
this.model = model;
}
private Button btnRemove;
private Button btnUpdateWebxml;
private Button btnGenDefaultImpl;
private Button btnExtension;
public WSDL2JavaCodeGenConfigWidget(ServiceModel model) {
this.model = model;
}
public WidgetDataEvents addControls(Composite parent,
final Listener statusListener) {
Composite configCom = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(3, false);
configCom.setLayout(layout);
configCom.setLayoutData(new GridData(GridData.FILL_BOTH));
// custom package name
Label lblCustomPakage = new Label(configCom, SWT.NONE);
lblCustomPakage
.setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name);
final Text txtCustomPkgName = new Text(configCom, SWT.BORDER);
- txtCustomPkgName.setText(model.getCustomPackage());
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
txtCustomPkgName.setLayoutData(gd);
txtCustomPkgName.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
if (validatePackage(txtCustomPkgName.getText())) {
model.setCustomPackage(txtCustomPkgName.getText());
}
statusListener.handleEvent(null);
}
});
+ txtCustomPkgName.setText(model.getCustomPackage());
// target
new Label(configCom, SWT.NONE)
.setText(JBossWSCreationCoreMessages.Label_JaxWS_Target);
final Combo cbSpec = new Combo(configCom, SWT.BORDER | SWT.READ_ONLY);
cbSpec.add(JBossWSCreationCoreMessages.Value_Target_0, 0);
cbSpec.add(JBossWSCreationCoreMessages.Value_Target_1, 1);
if (JBossWSCreationCoreMessages.Value_Target_0
.equals(model.getTarget())) {
cbSpec.select(0);
} else {
cbSpec.select(1);
}
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
cbSpec.setLayoutData(gd);
cbSpec.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
model.setTarget(cbSpec.getText());
}
});
// catalog file
new Label(configCom, SWT.NONE)
.setText(JBossWSCreationCoreMessages.Label_Catalog_File);
final Text txtCatlog = new Text(configCom, SWT.BORDER);
txtCatlog.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Button btnCatlog = new Button(configCom, SWT.NONE);
btnCatlog
.setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
btnCatlog.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
String fileLocation = new FileDialog(Display.getCurrent()
.getActiveShell(), SWT.NONE).open();
txtCatlog.setText(fileLocation);
model.setCatalog(fileLocation);
}
});
// binding files
new Label(configCom, SWT.NONE)
.setText(JBossWSCreationCoreMessages.Label_Binding_File);
final List bindingList = new List(configCom, SWT.BORDER
| SWT.SCROLL_LINE | SWT.V_SCROLL | SWT.H_SCROLL);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = Display.getCurrent().getActiveShell().getBounds().height / 4;
gd.verticalSpan = 3;
bindingList.setLayoutData(gd);
loadBindingFiles(bindingList);
bindingList.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
if (bindingList.getSelectionIndex() >= 0) {
btnRemove.setEnabled(true);
} else {
btnRemove.setEnabled(false);
}
}
});
Button btnSelect = new Button(configCom, SWT.NONE);
btnSelect
.setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
btnSelect.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
String fileLocation = new FileDialog(Display.getCurrent()
.getActiveShell(), SWT.NONE).open();
if (fileLocation != null
&& !model.getBindingFiles().contains(fileLocation)) {
bindingList.add(fileLocation);
model.addBindingFile(fileLocation);
}
}
});
new Label(configCom, SWT.NONE);
btnRemove = new Button(configCom, SWT.NONE);
btnRemove.setEnabled(false);
btnRemove.setText(JBossWSCreationCoreMessages.Label_Button_Text_Remove);
btnRemove.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.getBindingFiles().remove(bindingList.getSelectionIndex());
bindingList.remove(bindingList.getSelectionIndex());
if (bindingList.getSelectionIndex() == -1) {
btnRemove.setEnabled(false);
}
}
});
btnExtension = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnExtension.setLayoutData(gd);
btnExtension
.setText(JBossWSCreationCoreMessages.Label_EnableSOAP12_Binding_Extension);
btnExtension.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setEnableSOAP12(btnExtension.getSelection());
}
});
if (model.getWsScenario() != WebServiceScenario.CLIENT) {
btnGenDefaultImpl = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnGenDefaultImpl.setLayoutData(gd);
btnGenDefaultImpl
.setText(JBossWSCreationCoreMessages.Label_Generate_Impelemtation);
btnGenDefaultImpl.setSelection(true);
btnGenDefaultImpl.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setGenerateImplementatoin(btnGenDefaultImpl
.getSelection());
btnUpdateWebxml
.setEnabled(btnGenDefaultImpl.getSelection());
if (!btnGenDefaultImpl.getSelection()) {
model.setUpdateWebxml(false);
} else {
model.setUpdateWebxml(btnUpdateWebxml.getSelection());
}
}
});
btnUpdateWebxml = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnUpdateWebxml.setLayoutData(gd);
btnUpdateWebxml
.setText(JBossWSCreationCoreMessages.Label_Update_Webxml);
btnUpdateWebxml.setSelection(true);
btnUpdateWebxml.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setUpdateWebxml(btnUpdateWebxml.getSelection());
}
});
}
// enable enable soap12 checkbox if the target jbossws runtime is less
// than 3.0
updateExtensionButtonStatus();
return this;
}
private void updateExtensionButtonStatus() {
btnExtension.setEnabled(JBossWSCreationUtils.supportSOAP12(model
.getWebProjectName()));
}
private void loadBindingFiles(List bindingList) {
for (String fileLocation : model.getBindingFiles()) {
bindingList.add(fileLocation);
}
}
private boolean validatePackage(String name) {
try {
status = JBossWSUIUtils.validatePackageName(name,
JBossWSCreationUtils.getJavaProjectByName(model
.getWebProjectName()));
} catch (JavaModelException e1) {
e1.printStackTrace();
}
if (status != null && status.getSeverity() == IStatus.ERROR) {
return false;
}
return true;
}
public IStatus getStatus() {
return status;
}
}
| false | true | public WidgetDataEvents addControls(Composite parent,
final Listener statusListener) {
Composite configCom = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(3, false);
configCom.setLayout(layout);
configCom.setLayoutData(new GridData(GridData.FILL_BOTH));
// custom package name
Label lblCustomPakage = new Label(configCom, SWT.NONE);
lblCustomPakage
.setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name);
final Text txtCustomPkgName = new Text(configCom, SWT.BORDER);
txtCustomPkgName.setText(model.getCustomPackage());
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
txtCustomPkgName.setLayoutData(gd);
txtCustomPkgName.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
if (validatePackage(txtCustomPkgName.getText())) {
model.setCustomPackage(txtCustomPkgName.getText());
}
statusListener.handleEvent(null);
}
});
// target
new Label(configCom, SWT.NONE)
.setText(JBossWSCreationCoreMessages.Label_JaxWS_Target);
final Combo cbSpec = new Combo(configCom, SWT.BORDER | SWT.READ_ONLY);
cbSpec.add(JBossWSCreationCoreMessages.Value_Target_0, 0);
cbSpec.add(JBossWSCreationCoreMessages.Value_Target_1, 1);
if (JBossWSCreationCoreMessages.Value_Target_0
.equals(model.getTarget())) {
cbSpec.select(0);
} else {
cbSpec.select(1);
}
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
cbSpec.setLayoutData(gd);
cbSpec.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
model.setTarget(cbSpec.getText());
}
});
// catalog file
new Label(configCom, SWT.NONE)
.setText(JBossWSCreationCoreMessages.Label_Catalog_File);
final Text txtCatlog = new Text(configCom, SWT.BORDER);
txtCatlog.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Button btnCatlog = new Button(configCom, SWT.NONE);
btnCatlog
.setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
btnCatlog.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
String fileLocation = new FileDialog(Display.getCurrent()
.getActiveShell(), SWT.NONE).open();
txtCatlog.setText(fileLocation);
model.setCatalog(fileLocation);
}
});
// binding files
new Label(configCom, SWT.NONE)
.setText(JBossWSCreationCoreMessages.Label_Binding_File);
final List bindingList = new List(configCom, SWT.BORDER
| SWT.SCROLL_LINE | SWT.V_SCROLL | SWT.H_SCROLL);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = Display.getCurrent().getActiveShell().getBounds().height / 4;
gd.verticalSpan = 3;
bindingList.setLayoutData(gd);
loadBindingFiles(bindingList);
bindingList.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
if (bindingList.getSelectionIndex() >= 0) {
btnRemove.setEnabled(true);
} else {
btnRemove.setEnabled(false);
}
}
});
Button btnSelect = new Button(configCom, SWT.NONE);
btnSelect
.setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
btnSelect.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
String fileLocation = new FileDialog(Display.getCurrent()
.getActiveShell(), SWT.NONE).open();
if (fileLocation != null
&& !model.getBindingFiles().contains(fileLocation)) {
bindingList.add(fileLocation);
model.addBindingFile(fileLocation);
}
}
});
new Label(configCom, SWT.NONE);
btnRemove = new Button(configCom, SWT.NONE);
btnRemove.setEnabled(false);
btnRemove.setText(JBossWSCreationCoreMessages.Label_Button_Text_Remove);
btnRemove.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.getBindingFiles().remove(bindingList.getSelectionIndex());
bindingList.remove(bindingList.getSelectionIndex());
if (bindingList.getSelectionIndex() == -1) {
btnRemove.setEnabled(false);
}
}
});
btnExtension = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnExtension.setLayoutData(gd);
btnExtension
.setText(JBossWSCreationCoreMessages.Label_EnableSOAP12_Binding_Extension);
btnExtension.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setEnableSOAP12(btnExtension.getSelection());
}
});
if (model.getWsScenario() != WebServiceScenario.CLIENT) {
btnGenDefaultImpl = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnGenDefaultImpl.setLayoutData(gd);
btnGenDefaultImpl
.setText(JBossWSCreationCoreMessages.Label_Generate_Impelemtation);
btnGenDefaultImpl.setSelection(true);
btnGenDefaultImpl.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setGenerateImplementatoin(btnGenDefaultImpl
.getSelection());
btnUpdateWebxml
.setEnabled(btnGenDefaultImpl.getSelection());
if (!btnGenDefaultImpl.getSelection()) {
model.setUpdateWebxml(false);
} else {
model.setUpdateWebxml(btnUpdateWebxml.getSelection());
}
}
});
btnUpdateWebxml = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnUpdateWebxml.setLayoutData(gd);
btnUpdateWebxml
.setText(JBossWSCreationCoreMessages.Label_Update_Webxml);
btnUpdateWebxml.setSelection(true);
btnUpdateWebxml.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setUpdateWebxml(btnUpdateWebxml.getSelection());
}
});
}
// enable enable soap12 checkbox if the target jbossws runtime is less
// than 3.0
updateExtensionButtonStatus();
return this;
}
| public WidgetDataEvents addControls(Composite parent,
final Listener statusListener) {
Composite configCom = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(3, false);
configCom.setLayout(layout);
configCom.setLayoutData(new GridData(GridData.FILL_BOTH));
// custom package name
Label lblCustomPakage = new Label(configCom, SWT.NONE);
lblCustomPakage
.setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name);
final Text txtCustomPkgName = new Text(configCom, SWT.BORDER);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
txtCustomPkgName.setLayoutData(gd);
txtCustomPkgName.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
if (validatePackage(txtCustomPkgName.getText())) {
model.setCustomPackage(txtCustomPkgName.getText());
}
statusListener.handleEvent(null);
}
});
txtCustomPkgName.setText(model.getCustomPackage());
// target
new Label(configCom, SWT.NONE)
.setText(JBossWSCreationCoreMessages.Label_JaxWS_Target);
final Combo cbSpec = new Combo(configCom, SWT.BORDER | SWT.READ_ONLY);
cbSpec.add(JBossWSCreationCoreMessages.Value_Target_0, 0);
cbSpec.add(JBossWSCreationCoreMessages.Value_Target_1, 1);
if (JBossWSCreationCoreMessages.Value_Target_0
.equals(model.getTarget())) {
cbSpec.select(0);
} else {
cbSpec.select(1);
}
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
cbSpec.setLayoutData(gd);
cbSpec.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
model.setTarget(cbSpec.getText());
}
});
// catalog file
new Label(configCom, SWT.NONE)
.setText(JBossWSCreationCoreMessages.Label_Catalog_File);
final Text txtCatlog = new Text(configCom, SWT.BORDER);
txtCatlog.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Button btnCatlog = new Button(configCom, SWT.NONE);
btnCatlog
.setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
btnCatlog.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
String fileLocation = new FileDialog(Display.getCurrent()
.getActiveShell(), SWT.NONE).open();
txtCatlog.setText(fileLocation);
model.setCatalog(fileLocation);
}
});
// binding files
new Label(configCom, SWT.NONE)
.setText(JBossWSCreationCoreMessages.Label_Binding_File);
final List bindingList = new List(configCom, SWT.BORDER
| SWT.SCROLL_LINE | SWT.V_SCROLL | SWT.H_SCROLL);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = Display.getCurrent().getActiveShell().getBounds().height / 4;
gd.verticalSpan = 3;
bindingList.setLayoutData(gd);
loadBindingFiles(bindingList);
bindingList.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
if (bindingList.getSelectionIndex() >= 0) {
btnRemove.setEnabled(true);
} else {
btnRemove.setEnabled(false);
}
}
});
Button btnSelect = new Button(configCom, SWT.NONE);
btnSelect
.setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
btnSelect.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
String fileLocation = new FileDialog(Display.getCurrent()
.getActiveShell(), SWT.NONE).open();
if (fileLocation != null
&& !model.getBindingFiles().contains(fileLocation)) {
bindingList.add(fileLocation);
model.addBindingFile(fileLocation);
}
}
});
new Label(configCom, SWT.NONE);
btnRemove = new Button(configCom, SWT.NONE);
btnRemove.setEnabled(false);
btnRemove.setText(JBossWSCreationCoreMessages.Label_Button_Text_Remove);
btnRemove.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.getBindingFiles().remove(bindingList.getSelectionIndex());
bindingList.remove(bindingList.getSelectionIndex());
if (bindingList.getSelectionIndex() == -1) {
btnRemove.setEnabled(false);
}
}
});
btnExtension = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnExtension.setLayoutData(gd);
btnExtension
.setText(JBossWSCreationCoreMessages.Label_EnableSOAP12_Binding_Extension);
btnExtension.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setEnableSOAP12(btnExtension.getSelection());
}
});
if (model.getWsScenario() != WebServiceScenario.CLIENT) {
btnGenDefaultImpl = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnGenDefaultImpl.setLayoutData(gd);
btnGenDefaultImpl
.setText(JBossWSCreationCoreMessages.Label_Generate_Impelemtation);
btnGenDefaultImpl.setSelection(true);
btnGenDefaultImpl.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setGenerateImplementatoin(btnGenDefaultImpl
.getSelection());
btnUpdateWebxml
.setEnabled(btnGenDefaultImpl.getSelection());
if (!btnGenDefaultImpl.getSelection()) {
model.setUpdateWebxml(false);
} else {
model.setUpdateWebxml(btnUpdateWebxml.getSelection());
}
}
});
btnUpdateWebxml = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnUpdateWebxml.setLayoutData(gd);
btnUpdateWebxml
.setText(JBossWSCreationCoreMessages.Label_Update_Webxml);
btnUpdateWebxml.setSelection(true);
btnUpdateWebxml.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setUpdateWebxml(btnUpdateWebxml.getSelection());
}
});
}
// enable enable soap12 checkbox if the target jbossws runtime is less
// than 3.0
updateExtensionButtonStatus();
return this;
}
|
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/serializer/CSV.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/serializer/CSV.java
index 6005161..4c4e4a9 100644
--- a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/serializer/CSV.java
+++ b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/serializer/CSV.java
@@ -1,790 +1,790 @@
/*
* Copyright (c) 2013 LDBC
* Linked Data Benchmark Council (http://ldbc.eu)
*
* This file is part of ldbc_socialnet_dbgen.
*
* ldbc_socialnet_dbgen 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.
*
* ldbc_socialnet_dbgen 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 ldbc_socialnet_dbgen. If not, see <http://www.gnu.org/licenses/>.
*
* Copyright (C) 2011 OpenLink Software <[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; only Version 2 of the License dated
* June 1991.
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package ldbc.socialnet.dbgen.serializer;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Vector;
import ldbc.socialnet.dbgen.dictionary.IPAddressDictionary;
import ldbc.socialnet.dbgen.dictionary.LanguageDictionary;
import ldbc.socialnet.dbgen.dictionary.LocationDictionary;
import ldbc.socialnet.dbgen.dictionary.TagDictionary;
import ldbc.socialnet.dbgen.generator.DateGenerator;
import ldbc.socialnet.dbgen.generator.ScalableGenerator;
import ldbc.socialnet.dbgen.objects.Comment;
import ldbc.socialnet.dbgen.objects.Friend;
import ldbc.socialnet.dbgen.objects.Group;
import ldbc.socialnet.dbgen.objects.GroupMemberShip;
import ldbc.socialnet.dbgen.objects.Location;
import ldbc.socialnet.dbgen.objects.Photo;
import ldbc.socialnet.dbgen.objects.Post;
import ldbc.socialnet.dbgen.objects.ReducedUserProfile;
import ldbc.socialnet.dbgen.objects.UserExtraInfo;
import ldbc.socialnet.dbgen.vocabulary.DBP;
import ldbc.socialnet.dbgen.vocabulary.DBPOWL;
import ldbc.socialnet.dbgen.vocabulary.SN;
public class CSV implements Serializer {
final String NEWLINE = "\n";
final String SEPARATOR = "|";
final String[] fileNames = {
"tag",
"post",
"forum",
"person",
"comment",
"place",
"tagclass",
"organisation",
"person_likes_post",
"person_hasInterest_tag",
"person_knows_person",
"person_speaks_language",
"person_workAt_organisation",
"person_studyAt_organisation",
"person_isLocatedIn_place",
"person_email_emailaddress",
"post_isLocatedIn_place",
"post_hasTag_tag",
"post_hasCreator_person",
"comment_isLocatedIn_place",
"comment_replyOf_post",
"comment_replyOf_comment",
"comment_hasCreator_person",
"tag_hasType_tagclass",
"tagclass_isSubclassOf_tagclass",
"place_isPartOf_place",
"organisation_isLocatedIn_place",
"forum_hasModerator_person",
"forum_containerOf_post",
"forum_hasTag_tag",
"forum_hasMember_person"
};
enum Files {
TAG,
POST,
FORUM,
PERSON,
COMMENT,
PLACE,
TAGCLASS,
ORGANISATION,
PERSON_LIKE_POST,
PERSON_INTEREST_TAG,
PERSON_KNOWS_PERSON,
PERSON_SPEAKS_LANGUAGE,
PERSON_WORK_AT_ORGANISATION,
PERSON_STUDY_AT_ORGANISATION,
PERSON_LOCATED_IN_PLACE,
PERSON_HAS_EMAIL_EMAIL,
POST_LOCATED_PLACE,
POST_HAS_TAG_TAG,
POST_HAS_CREATOR_PERSON,
COMMENT_LOCATED_PLACE,
COMMENT_REPLY_OF_POST,
COMMENT_REPLY_OF_COMMENT,
COMMENT_HAS_CREATOR_PERSON,
TAG_HAS_TYPE_TAGCLASS,
TAGCLASS_IS_SUBCLASS_OF_TAGCLASS,
PLACE_PART_OF_PLACE,
ORGANISATION_BASED_NEAR_PLACE,
FORUM_HAS_MODERATOR_PERSON,
FORUM_CONTAINER_OF_POST,
FORUM_HASTAG_TAG,
FORUM_HASMEMBER_PERSON,
NUM_FILES
}
final String[][] fieldNames = {
{"id", "name", "url"},
{"id", "imageFile", "creationDate", "locationIP", "browserUsed", "language", "content"},
{"id", "title", "creationDate"},
{"id", "firstName", "lastName", "gender", "birthday", "creationDate", "locationIP", "browserUsed"},
{"id", "creationDate", "locationIP", "browserUsed", "content"},
{"id", "name", "url", "type"},
{"id", "name", "url"},
{"id", "type", "name", "url"},
{"Person.id", "Post.id", "creationDate"},
{"Person.id", "Tag.id"},
{"Person.id", "Person.id"},
{"Person.id", "language"},
{"Person.id", "Organisation.id", "workFrom"},
{"Person.id", "Organisation.id", "classYear"},
{"Person.id", "Place.id"},
{"Person.id", "email"},
{"Post.id", "Place.id"},
{"Post.id", "Tag.id"},
{"Post.id", "Person.id"},
{"Comment.id", "Place.id"},
{"Comment.id", "Post.id"},
{"Comment.id", "Comment.id"},
{"Comment.id", "Person.id"},
{"Tag.id", "TagClass.id"},
{"TagClass.id", "TagClass.id"},
{"Place.id", "Place.id"},
{"Organisation.id", "Place.id"},
{"Forum.id", "Person.id"},
{"Forum.id", "Post.id"},
{"Forum.id", "Tag.id"},
{"Forum.id", "Person.id", "joinDate"}
};
private long nrTriples;
private FileWriter[][] dataFileWriter;
int[] currentWriter;
long[] idList;
static long membershipId = 0;
static long friendshipId = 0;
static long gpsId = 0;
static long emailId = 0;
static long ipId = 0;
HashMap<Integer, Integer> printedTagClasses;
HashMap<String, Integer> companyToCountry;
HashMap<String, Integer> universityToCountry;
Vector<String> vBrowserNames;
Vector<Integer> locations;
Vector<Integer> serializedLanguages;
Vector<String> organisations;
Vector<String> interests;
Vector<String> tagList;
Vector<String> ipList;
GregorianCalendar date;
LocationDictionary locationDic;
LanguageDictionary languageDic;
TagDictionary tagDic;
IPAddressDictionary ipDic;
public CSV(String file, boolean forwardChaining) {
this(file, forwardChaining, 1);
}
public CSV(String file, boolean forwardChaining, int nrOfOutputFiles) {
vBrowserNames = new Vector<String>();
locations = new Vector<Integer>();
organisations = new Vector<String>();
interests = new Vector<String>();
tagList = new Vector<String>();
ipList = new Vector<String>();
serializedLanguages = new Vector<Integer>();
printedTagClasses = new HashMap<Integer, Integer>();
idList = new long[Files.NUM_FILES.ordinal()];
currentWriter = new int[Files.NUM_FILES.ordinal()];
for (int i = 0; i < Files.NUM_FILES.ordinal(); i++) {
idList[i] = 0;
currentWriter[i] = 0;
}
date = new GregorianCalendar();
int nrOfDigits = ((int)Math.log10(nrOfOutputFiles)) + 1;
String formatString = "%0" + nrOfDigits + "d";
try{
dataFileWriter = new FileWriter[nrOfOutputFiles][Files.NUM_FILES.ordinal()];
if(nrOfOutputFiles==1) {
for (int i = 0; i < Files.NUM_FILES.ordinal(); i++) {
this.dataFileWriter[0][i] = new FileWriter(file + fileNames[i] + ".csv");
}
} else {
for(int i=0;i<nrOfOutputFiles;i++) {
for (int j = 0; j < Files.NUM_FILES.ordinal(); j++) {
dataFileWriter[i][j] = new FileWriter(file + fileNames[j] + String.format(formatString, i+1) + ".csv");
}
}
}
for(int i=0;i<nrOfOutputFiles;i++) {
for (int j = 0; j < Files.NUM_FILES.ordinal(); j++) {
Vector<String> arguments = new Vector<String>();
for (int k = 0; k < fieldNames[j].length; k++) {
arguments.add(fieldNames[j][k]);
}
ToCSV(arguments, j);
}
}
} catch(IOException e){
System.err.println("Could not open File for writing.");
System.err.println(e.getMessage());
System.exit(-1);
}
nrTriples = 0l;
}
public CSV(String file, boolean forwardChaining, int nrOfOutputFiles,
TagDictionary tagDic, Vector<String> _vBrowsers,
HashMap<String, Integer> companyToCountry, HashMap<String, Integer> univesityToCountry,
IPAddressDictionary ipDic, LocationDictionary locationDic, LanguageDictionary languageDic) {
this(file, forwardChaining, nrOfOutputFiles);
this.tagDic = tagDic;
this.vBrowserNames = _vBrowsers;
this.locationDic = locationDic;
this.languageDic = languageDic;
this.companyToCountry = companyToCountry;
this.universityToCountry = univesityToCountry;
this.ipDic = ipDic;
}
public Long triplesGenerated() {
return nrTriples;
}
public void printTagHierarchy(Integer tagId) {
Vector<String> arguments = new Vector<String>();
Integer tagClass = tagDic.getTagClass(tagId);
arguments.add(tagId.toString());
arguments.add(tagClass.toString());
ToCSV(arguments, Files.TAG_HAS_TYPE_TAGCLASS.ordinal());
while (tagClass != -1 && !printedTagClasses.containsKey(tagClass)) {
printedTagClasses.put(tagClass, tagClass);
arguments.add(tagClass.toString());
arguments.add(tagDic.getClassName(tagClass));
if (tagDic.getClassName(tagClass).equals("Thing")) {
arguments.add("http://www.w3.org/2002/07/owl#Thing");
} else {
arguments.add(DBPOWL.getUrl(tagDic.getClassName(tagClass)));
}
ToCSV(arguments, Files.TAGCLASS.ordinal());
Integer parent = tagDic.getClassParent(tagClass);
if (parent != -1) {
arguments.add(tagClass.toString());
arguments.add(parent.toString());
ToCSV(arguments, Files.TAGCLASS_IS_SUBCLASS_OF_TAGCLASS.ordinal());
}
tagClass = parent;
}
}
public void ToCSV(Vector<String> arguments, int index) {
StringBuffer result = new StringBuffer();
result.append(arguments.get(0));
for (int i = 1; i < arguments.size(); i++) {
result.append(SEPARATOR);
result.append(arguments.get(i));
}
result.append(NEWLINE);
WriteTo(result.toString(), index);
arguments.clear();
idList[index]++;
}
public void WriteTo(String data, int index) {
try {
dataFileWriter[currentWriter[index]][index].append(data);
currentWriter[index] = (currentWriter[index] + 1) % dataFileWriter.length;
} catch (IOException e) {
System.out.println("Cannot write to output file ");
e.printStackTrace();
}
}
public void printLocationHierarchy(int baseId) {
Vector<String> arguments = new Vector<String>();
ArrayList<Integer> areas = new ArrayList<Integer>();
do {
areas.add(baseId);
baseId = locationDic.belongsTo(baseId);
} while (baseId != -1);
for (int i = areas.size() - 1; i >= 0; i--) {
if (locations.indexOf(areas.get(i)) == -1) {
locations.add(areas.get(i));
//print location
arguments.add(Integer.toString(areas.get(i)));
arguments.add(locationDic.getLocationName(areas.get(i)));
arguments.add(DBP.getUrl(locationDic.getLocationName(areas.get(i))));
arguments.add(locationDic.getType(areas.get(i)));
ToCSV(arguments, Files.PLACE.ordinal());
if (locationDic.getType(areas.get(i)) == Location.CITY ||
locationDic.getType(areas.get(i)) == Location.COUNTRY) {
arguments.add(Integer.toString(areas.get(i)));
arguments.add(Integer.toString(areas.get(i+1)));
ToCSV(arguments, Files.PLACE_PART_OF_PLACE.ordinal());
}
}
}
}
public void gatherData(ReducedUserProfile profile, UserExtraInfo extraInfo){
Vector<String> arguments = new Vector<String>();
if (extraInfo == null) {
System.err.println("LDBC socialnet must serialize the extraInfo");
System.exit(-1);
}
printLocationHierarchy(extraInfo.getLocationId());
Iterator<String> itString = extraInfo.getCompanies().iterator();
while (itString.hasNext()) {
String company = itString.next();
int parentId = companyToCountry.get(company);
printLocationHierarchy(parentId);
}
printLocationHierarchy(universityToCountry.get(extraInfo.getOrganization()));
printLocationHierarchy(ipDic.getLocation(profile.getIpAddress()));
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(extraInfo.getFirstName());
arguments.add(extraInfo.getLastName());
arguments.add(extraInfo.getGender());
if (profile.getBirthDay() != -1 ) {
date.setTimeInMillis(profile.getBirthDay());
String dateString = DateGenerator.formatDate(date);
arguments.add(dateString);
} else {
String empty = "";
arguments.add(empty);
}
date.setTimeInMillis(profile.getCreatedDate());
String dateString = DateGenerator.formatDateDetail(date);
arguments.add(dateString);
if (profile.getIpAddress() != null) {
arguments.add(profile.getIpAddress().toString());
} else {
String empty = "";
arguments.add(empty);
}
if (profile.getBrowserIdx() >= 0) {
arguments.add(vBrowserNames.get(profile.getBrowserIdx()));
} else {
String empty = "";
arguments.add(empty);
}
ToCSV(arguments, Files.PERSON.ordinal());
Vector<Integer> languages = extraInfo.getLanguages();
for (int i = 0; i < languages.size(); i++) {
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(languageDic.getLanguagesName(languages.get(i)));
ToCSV(arguments, Files.PERSON_SPEAKS_LANGUAGE.ordinal());
}
itString = extraInfo.getEmail().iterator();
while (itString.hasNext()){
String email = itString.next();
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(email);
ToCSV(arguments, Files.PERSON_HAS_EMAIL_EMAIL.ordinal());
}
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(extraInfo.getLocationId()));
ToCSV(arguments, Files.PERSON_LOCATED_IN_PLACE.ordinal());
int organisationId = -1;
if (!extraInfo.getOrganization().equals("")){
organisationId = organisations.indexOf(extraInfo.getOrganization());
if(organisationId == -1) {
organisationId = organisations.size();
organisations.add(extraInfo.getOrganization());
arguments.add(SN.formId(organisationId));
arguments.add(ScalableGenerator.OrganisationType.university.toString());
arguments.add(extraInfo.getOrganization());
arguments.add(DBP.getUrl(extraInfo.getOrganization()));
ToCSV(arguments, Files.ORGANISATION.ordinal());
arguments.add(SN.formId(organisationId));
arguments.add(Integer.toString(universityToCountry.get(extraInfo.getOrganization())));
ToCSV(arguments, Files.ORGANISATION_BASED_NEAR_PLACE.ordinal());
}
}
if (extraInfo.getClassYear() != -1 ) {
date.setTimeInMillis(extraInfo.getClassYear());
dateString = DateGenerator.formatYear(date);
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(SN.formId(organisationId));
arguments.add(dateString);
ToCSV(arguments, Files.PERSON_STUDY_AT_ORGANISATION.ordinal());
}
itString = extraInfo.getCompanies().iterator();
while (itString.hasNext()) {
String company = itString.next();
organisationId = organisations.indexOf(company);
if(organisationId == -1) {
organisationId = organisations.size();
organisations.add(company);
arguments.add(SN.formId(organisationId));
arguments.add(ScalableGenerator.OrganisationType.company.toString());
arguments.add(company);
arguments.add(DBP.getUrl(company));
ToCSV(arguments, Files.ORGANISATION.ordinal());
arguments.add(SN.formId(organisationId));
arguments.add(Integer.toString(companyToCountry.get(company)));
ToCSV(arguments, Files.ORGANISATION_BASED_NEAR_PLACE.ordinal());
}
date.setTimeInMillis(extraInfo.getWorkFrom(company));
dateString = DateGenerator.formatYear(date);
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(SN.formId(organisationId));
arguments.add(dateString);
ToCSV(arguments, Files.PERSON_WORK_AT_ORGANISATION.ordinal());
}
Iterator<Integer> itInteger = profile.getSetOfTags().iterator();
while (itInteger.hasNext()){
Integer interestIdx = itInteger.next();
String interest = tagDic.getName(interestIdx);
if (interests.indexOf(interest) == -1) {
interests.add(interest);
arguments.add(Integer.toString(interestIdx));
arguments.add(interest.replace("\"", "\\\""));
arguments.add(DBP.getUrl(interest));
ToCSV(arguments, Files.TAG.ordinal());
printTagHierarchy(interestIdx);
}
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(interestIdx));
ToCSV(arguments, Files.PERSON_INTEREST_TAG.ordinal());
}
Friend friends[] = profile.getFriendList();
for (int i = 0; i < friends.length; i ++) {
if (friends[i] != null && friends[i].getCreatedTime() != -1){
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(friends[i].getFriendAcc()));
ToCSV(arguments,Files.PERSON_KNOWS_PERSON.ordinal());
}
}
//The forums of the user
date.setTimeInMillis(profile.getCreatedDate());
dateString = DateGenerator.formatDateDetail(date);
String title = "Wall of " + extraInfo.getFirstName() + " " + extraInfo.getLastName();
arguments.add(SN.formId(profile.getForumWallId()));
arguments.add(title);
arguments.add(dateString);
ToCSV(arguments,Files.FORUM.ordinal());
arguments.add(SN.formId(profile.getForumWallId()));
arguments.add(Integer.toString(profile.getAccountId()));
ToCSV(arguments,Files.FORUM_HAS_MODERATOR_PERSON.ordinal());
itInteger = profile.getSetOfTags().iterator();
while (itInteger.hasNext()){
Integer interestIdx = itInteger.next();
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(interestIdx));
ToCSV(arguments, Files.FORUM_HASTAG_TAG.ordinal());
}
for (int i = 0; i < friends.length; i ++){
if (friends[i] != null && friends[i].getCreatedTime() != -1){
date.setTimeInMillis(friends[i].getCreatedTime());
dateString = DateGenerator.formatDateDetail(date);
- arguments.add(Integer.toString(profile.getForumWallId()));
+ arguments.add(SN.formId(profile.getForumWallId()));
arguments.add(Integer.toString(friends[i].getFriendAcc()));
arguments.add(dateString);
ToCSV(arguments,Files.FORUM_HASMEMBER_PERSON.ordinal());
}
}
}
public void gatherData(Post post){
Vector<String> arguments = new Vector<String>();
String empty = "";
arguments.add(SN.formId(post.getPostId()));
arguments.add(empty);
date.setTimeInMillis(post.getCreatedDate());
String dateString = DateGenerator.formatDateDetail(date);
arguments.add(dateString);
if (post.getIpAddress() != null) {
arguments.add(post.getIpAddress().toString());
} else {
arguments.add(empty);
}
if (post.getBrowserIdx() != -1){
arguments.add(vBrowserNames.get(post.getBrowserIdx()));
} else {
arguments.add(empty);
}
if (post.getLanguage() != -1) {
arguments.add(languageDic.getLanguagesName(post.getLanguage()));
} else {
arguments.add(empty);
}
arguments.add(post.getContent());
ToCSV(arguments, Files.POST.ordinal());
if (post.getIpAddress() != null) {
arguments.add(SN.formId(post.getPostId()));
arguments.add(Integer.toString(ipDic.getLocation(post.getIpAddress())));
ToCSV(arguments, Files.POST_LOCATED_PLACE.ordinal());
}
arguments.add(SN.formId(post.getForumId()));
arguments.add(SN.formId(post.getPostId()));
ToCSV(arguments, Files.FORUM_CONTAINER_OF_POST.ordinal());
arguments.add(SN.formId(post.getPostId()));
arguments.add(Integer.toString(post.getAuthorId()));
ToCSV(arguments, Files.POST_HAS_CREATOR_PERSON.ordinal());
Iterator<Integer> it = post.getTags().iterator();
while (it.hasNext()) {
Integer tagId = it.next();
String tag = tagDic.getName(tagId);
if (interests.indexOf(tag) == -1) {
interests.add(tag);
arguments.add(Integer.toString(tagId));
arguments.add(tag.replace("\"", "\\\""));
arguments.add(DBP.getUrl(tag));
ToCSV(arguments, Files.TAG.ordinal());
printTagHierarchy(tagId);
}
arguments.add(SN.formId(post.getPostId()));
arguments.add(Integer.toString(tagId));
ToCSV(arguments, Files.POST_HAS_TAG_TAG.ordinal());
}
int userLikes[] = post.getInterestedUserAccs();
long likeTimestamps[] = post.getInterestedUserAccsTimestamp();
for (int i = 0; i < userLikes.length; i ++) {
date.setTimeInMillis(likeTimestamps[i]);
dateString = DateGenerator.formatDateDetail(date);
arguments.add(Integer.toString(userLikes[i]));
arguments.add(SN.formId(post.getPostId()));
arguments.add(dateString);
ToCSV(arguments, Files.PERSON_LIKE_POST.ordinal());
}
}
public void gatherData(Comment comment){
Vector<String> arguments = new Vector<String>();
date.setTimeInMillis(comment.getCreateDate());
String dateString = DateGenerator.formatDateDetail(date);
arguments.add(SN.formId(comment.getCommentId()));
arguments.add(dateString);
if (comment.getIpAddress() != null) {
arguments.add(comment.getIpAddress().toString());
} else {
String empty = "";
arguments.add(empty);
}
if (comment.getBrowserIdx() != -1){
arguments.add(vBrowserNames.get(comment.getBrowserIdx()));
} else {
String empty = "";
arguments.add(empty);
}
arguments.add(comment.getContent());
ToCSV(arguments, Files.COMMENT.ordinal());
if (comment.getReply_of() == -1) {
arguments.add(SN.formId(comment.getCommentId()));
arguments.add(SN.formId(comment.getPostId()));
ToCSV(arguments, Files.COMMENT_REPLY_OF_POST.ordinal());
} else {
arguments.add(SN.formId(comment.getCommentId()));
arguments.add(SN.formId(comment.getReply_of()));
ToCSV(arguments, Files.COMMENT_REPLY_OF_COMMENT.ordinal());
}
if (comment.getIpAddress() != null) {
arguments.add(SN.formId(comment.getPostId()));
arguments.add(Integer.toString(ipDic.getLocation(comment.getIpAddress())));
ToCSV(arguments, Files.COMMENT_LOCATED_PLACE.ordinal());
}
arguments.add(SN.formId(comment.getCommentId()));
arguments.add(Integer.toString(comment.getAuthorId()));
ToCSV(arguments, Files.COMMENT_HAS_CREATOR_PERSON.ordinal());
}
public void gatherData(Photo photo){
Vector<String> arguments = new Vector<String>();
String empty = "";
arguments.add(SN.formId(photo.getPhotoId()));
arguments.add(photo.getImage());
date.setTimeInMillis(photo.getTakenTime());
String dateString = DateGenerator.formatDateDetail(date);
arguments.add(dateString);
if (photo.getIpAddress() != null) {
arguments.add(photo.getIpAddress().toString());
} else {
arguments.add(empty);
}
if (photo.getBrowserIdx() != -1){
arguments.add(vBrowserNames.get(photo.getBrowserIdx()));
} else {
arguments.add(empty);
}
arguments.add(empty);
arguments.add(empty);
ToCSV(arguments, Files.POST.ordinal());
if (photo.getIpAddress() != null) {
arguments.add(SN.formId(photo.getPhotoId()));
arguments.add(Integer.toString(ipDic.getLocation(photo.getIpAddress())));
ToCSV(arguments, Files.POST_LOCATED_PLACE.ordinal());
}
arguments.add(SN.formId(photo.getPhotoId()));
arguments.add(Integer.toString(photo.getCreatorId()));
ToCSV(arguments, Files.POST_HAS_CREATOR_PERSON.ordinal());
arguments.add(SN.formId(photo.getAlbumId()));
arguments.add(SN.formId(photo.getPhotoId()));
ToCSV(arguments, Files.FORUM_CONTAINER_OF_POST.ordinal());
Iterator<Integer> it = photo.getTags().iterator();
while (it.hasNext()) {
Integer tagId = it.next();
String tag = tagDic.getName(tagId);
if (interests.indexOf(tag) == -1) {
interests.add(tag);
arguments.add(Integer.toString(tagId));
arguments.add(tag.replace("\"", "\\\""));
arguments.add(DBP.getUrl(tag));
ToCSV(arguments, Files.TAG.ordinal());
printTagHierarchy(tagId);
}
arguments.add(SN.formId(photo.getPhotoId()));
arguments.add(Integer.toString(tagId));
ToCSV(arguments, Files.POST_HAS_TAG_TAG.ordinal());
}
int userLikes[] = photo.getInterestedUserAccs();
long likeTimestamps[] = photo.getInterestedUserAccsTimestamp();
for (int i = 0; i < userLikes.length; i ++) {
date.setTimeInMillis(likeTimestamps[i]);
dateString = DateGenerator.formatDateDetail(date);
arguments.add(Integer.toString(userLikes[i]));
arguments.add(SN.formId(photo.getPhotoId()));
arguments.add(dateString);
ToCSV(arguments, Files.PERSON_LIKE_POST.ordinal());
}
}
public void gatherData(Group group) {
Vector<String> arguments = new Vector<String>();
date.setTimeInMillis(group.getCreatedDate());
String dateString = DateGenerator.formatDateDetail(date);
arguments.add(SN.formId(group.getForumWallId()));
arguments.add(group.getGroupName());
arguments.add(dateString);
ToCSV(arguments,Files.FORUM.ordinal());
arguments.add(SN.formId(group.getForumWallId()));
arguments.add(Integer.toString(group.getModeratorId()));
ToCSV(arguments,Files.FORUM_HAS_MODERATOR_PERSON.ordinal());
Integer groupTags[] = group.getTags();
for (int i = 0; i < groupTags.length; i ++) {
String interest = tagDic.getName(groupTags[i]);
if (interests.indexOf(interest) == -1) {
interests.add(interest);
arguments.add(Integer.toString(groupTags[i]));
arguments.add(interest.replace("\"", "\\\""));
arguments.add(DBP.getUrl(interest));
ToCSV(arguments, Files.TAG.ordinal());
printTagHierarchy(groupTags[i]);
}
arguments.add(SN.formId(group.getForumWallId()));
arguments.add(Integer.toString(groupTags[i]));
ToCSV(arguments,Files.FORUM_HASTAG_TAG.ordinal());
}
GroupMemberShip memberShips[] = group.getMemberShips();
int numMemberAdded = group.getNumMemberAdded();
for (int i = 0; i < numMemberAdded; i ++) {
date.setTimeInMillis(memberShips[i].getJoinDate());
dateString = DateGenerator.formatDateDetail(date);
arguments.add(SN.formId(group.getForumWallId()));
arguments.add(Integer.toString(memberShips[i].getUserId()));
arguments.add(dateString);
ToCSV(arguments,Files.FORUM_HASMEMBER_PERSON.ordinal());
}
}
public void serialize() {
try {
for (int i = 0; i < dataFileWriter.length; i++) {
for (int j = 0; j < Files.NUM_FILES.ordinal(); j++) {
dataFileWriter[i][j].flush();
dataFileWriter[i][j].close();
}
}
} catch(IOException e) {
System.err.println(e.getMessage());
System.exit(-1);
}
}
}
| true | true | public void gatherData(ReducedUserProfile profile, UserExtraInfo extraInfo){
Vector<String> arguments = new Vector<String>();
if (extraInfo == null) {
System.err.println("LDBC socialnet must serialize the extraInfo");
System.exit(-1);
}
printLocationHierarchy(extraInfo.getLocationId());
Iterator<String> itString = extraInfo.getCompanies().iterator();
while (itString.hasNext()) {
String company = itString.next();
int parentId = companyToCountry.get(company);
printLocationHierarchy(parentId);
}
printLocationHierarchy(universityToCountry.get(extraInfo.getOrganization()));
printLocationHierarchy(ipDic.getLocation(profile.getIpAddress()));
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(extraInfo.getFirstName());
arguments.add(extraInfo.getLastName());
arguments.add(extraInfo.getGender());
if (profile.getBirthDay() != -1 ) {
date.setTimeInMillis(profile.getBirthDay());
String dateString = DateGenerator.formatDate(date);
arguments.add(dateString);
} else {
String empty = "";
arguments.add(empty);
}
date.setTimeInMillis(profile.getCreatedDate());
String dateString = DateGenerator.formatDateDetail(date);
arguments.add(dateString);
if (profile.getIpAddress() != null) {
arguments.add(profile.getIpAddress().toString());
} else {
String empty = "";
arguments.add(empty);
}
if (profile.getBrowserIdx() >= 0) {
arguments.add(vBrowserNames.get(profile.getBrowserIdx()));
} else {
String empty = "";
arguments.add(empty);
}
ToCSV(arguments, Files.PERSON.ordinal());
Vector<Integer> languages = extraInfo.getLanguages();
for (int i = 0; i < languages.size(); i++) {
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(languageDic.getLanguagesName(languages.get(i)));
ToCSV(arguments, Files.PERSON_SPEAKS_LANGUAGE.ordinal());
}
itString = extraInfo.getEmail().iterator();
while (itString.hasNext()){
String email = itString.next();
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(email);
ToCSV(arguments, Files.PERSON_HAS_EMAIL_EMAIL.ordinal());
}
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(extraInfo.getLocationId()));
ToCSV(arguments, Files.PERSON_LOCATED_IN_PLACE.ordinal());
int organisationId = -1;
if (!extraInfo.getOrganization().equals("")){
organisationId = organisations.indexOf(extraInfo.getOrganization());
if(organisationId == -1) {
organisationId = organisations.size();
organisations.add(extraInfo.getOrganization());
arguments.add(SN.formId(organisationId));
arguments.add(ScalableGenerator.OrganisationType.university.toString());
arguments.add(extraInfo.getOrganization());
arguments.add(DBP.getUrl(extraInfo.getOrganization()));
ToCSV(arguments, Files.ORGANISATION.ordinal());
arguments.add(SN.formId(organisationId));
arguments.add(Integer.toString(universityToCountry.get(extraInfo.getOrganization())));
ToCSV(arguments, Files.ORGANISATION_BASED_NEAR_PLACE.ordinal());
}
}
if (extraInfo.getClassYear() != -1 ) {
date.setTimeInMillis(extraInfo.getClassYear());
dateString = DateGenerator.formatYear(date);
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(SN.formId(organisationId));
arguments.add(dateString);
ToCSV(arguments, Files.PERSON_STUDY_AT_ORGANISATION.ordinal());
}
itString = extraInfo.getCompanies().iterator();
while (itString.hasNext()) {
String company = itString.next();
organisationId = organisations.indexOf(company);
if(organisationId == -1) {
organisationId = organisations.size();
organisations.add(company);
arguments.add(SN.formId(organisationId));
arguments.add(ScalableGenerator.OrganisationType.company.toString());
arguments.add(company);
arguments.add(DBP.getUrl(company));
ToCSV(arguments, Files.ORGANISATION.ordinal());
arguments.add(SN.formId(organisationId));
arguments.add(Integer.toString(companyToCountry.get(company)));
ToCSV(arguments, Files.ORGANISATION_BASED_NEAR_PLACE.ordinal());
}
date.setTimeInMillis(extraInfo.getWorkFrom(company));
dateString = DateGenerator.formatYear(date);
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(SN.formId(organisationId));
arguments.add(dateString);
ToCSV(arguments, Files.PERSON_WORK_AT_ORGANISATION.ordinal());
}
Iterator<Integer> itInteger = profile.getSetOfTags().iterator();
while (itInteger.hasNext()){
Integer interestIdx = itInteger.next();
String interest = tagDic.getName(interestIdx);
if (interests.indexOf(interest) == -1) {
interests.add(interest);
arguments.add(Integer.toString(interestIdx));
arguments.add(interest.replace("\"", "\\\""));
arguments.add(DBP.getUrl(interest));
ToCSV(arguments, Files.TAG.ordinal());
printTagHierarchy(interestIdx);
}
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(interestIdx));
ToCSV(arguments, Files.PERSON_INTEREST_TAG.ordinal());
}
Friend friends[] = profile.getFriendList();
for (int i = 0; i < friends.length; i ++) {
if (friends[i] != null && friends[i].getCreatedTime() != -1){
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(friends[i].getFriendAcc()));
ToCSV(arguments,Files.PERSON_KNOWS_PERSON.ordinal());
}
}
//The forums of the user
date.setTimeInMillis(profile.getCreatedDate());
dateString = DateGenerator.formatDateDetail(date);
String title = "Wall of " + extraInfo.getFirstName() + " " + extraInfo.getLastName();
arguments.add(SN.formId(profile.getForumWallId()));
arguments.add(title);
arguments.add(dateString);
ToCSV(arguments,Files.FORUM.ordinal());
arguments.add(SN.formId(profile.getForumWallId()));
arguments.add(Integer.toString(profile.getAccountId()));
ToCSV(arguments,Files.FORUM_HAS_MODERATOR_PERSON.ordinal());
itInteger = profile.getSetOfTags().iterator();
while (itInteger.hasNext()){
Integer interestIdx = itInteger.next();
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(interestIdx));
ToCSV(arguments, Files.FORUM_HASTAG_TAG.ordinal());
}
for (int i = 0; i < friends.length; i ++){
if (friends[i] != null && friends[i].getCreatedTime() != -1){
date.setTimeInMillis(friends[i].getCreatedTime());
dateString = DateGenerator.formatDateDetail(date);
arguments.add(Integer.toString(profile.getForumWallId()));
arguments.add(Integer.toString(friends[i].getFriendAcc()));
arguments.add(dateString);
ToCSV(arguments,Files.FORUM_HASMEMBER_PERSON.ordinal());
}
}
}
| public void gatherData(ReducedUserProfile profile, UserExtraInfo extraInfo){
Vector<String> arguments = new Vector<String>();
if (extraInfo == null) {
System.err.println("LDBC socialnet must serialize the extraInfo");
System.exit(-1);
}
printLocationHierarchy(extraInfo.getLocationId());
Iterator<String> itString = extraInfo.getCompanies().iterator();
while (itString.hasNext()) {
String company = itString.next();
int parentId = companyToCountry.get(company);
printLocationHierarchy(parentId);
}
printLocationHierarchy(universityToCountry.get(extraInfo.getOrganization()));
printLocationHierarchy(ipDic.getLocation(profile.getIpAddress()));
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(extraInfo.getFirstName());
arguments.add(extraInfo.getLastName());
arguments.add(extraInfo.getGender());
if (profile.getBirthDay() != -1 ) {
date.setTimeInMillis(profile.getBirthDay());
String dateString = DateGenerator.formatDate(date);
arguments.add(dateString);
} else {
String empty = "";
arguments.add(empty);
}
date.setTimeInMillis(profile.getCreatedDate());
String dateString = DateGenerator.formatDateDetail(date);
arguments.add(dateString);
if (profile.getIpAddress() != null) {
arguments.add(profile.getIpAddress().toString());
} else {
String empty = "";
arguments.add(empty);
}
if (profile.getBrowserIdx() >= 0) {
arguments.add(vBrowserNames.get(profile.getBrowserIdx()));
} else {
String empty = "";
arguments.add(empty);
}
ToCSV(arguments, Files.PERSON.ordinal());
Vector<Integer> languages = extraInfo.getLanguages();
for (int i = 0; i < languages.size(); i++) {
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(languageDic.getLanguagesName(languages.get(i)));
ToCSV(arguments, Files.PERSON_SPEAKS_LANGUAGE.ordinal());
}
itString = extraInfo.getEmail().iterator();
while (itString.hasNext()){
String email = itString.next();
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(email);
ToCSV(arguments, Files.PERSON_HAS_EMAIL_EMAIL.ordinal());
}
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(extraInfo.getLocationId()));
ToCSV(arguments, Files.PERSON_LOCATED_IN_PLACE.ordinal());
int organisationId = -1;
if (!extraInfo.getOrganization().equals("")){
organisationId = organisations.indexOf(extraInfo.getOrganization());
if(organisationId == -1) {
organisationId = organisations.size();
organisations.add(extraInfo.getOrganization());
arguments.add(SN.formId(organisationId));
arguments.add(ScalableGenerator.OrganisationType.university.toString());
arguments.add(extraInfo.getOrganization());
arguments.add(DBP.getUrl(extraInfo.getOrganization()));
ToCSV(arguments, Files.ORGANISATION.ordinal());
arguments.add(SN.formId(organisationId));
arguments.add(Integer.toString(universityToCountry.get(extraInfo.getOrganization())));
ToCSV(arguments, Files.ORGANISATION_BASED_NEAR_PLACE.ordinal());
}
}
if (extraInfo.getClassYear() != -1 ) {
date.setTimeInMillis(extraInfo.getClassYear());
dateString = DateGenerator.formatYear(date);
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(SN.formId(organisationId));
arguments.add(dateString);
ToCSV(arguments, Files.PERSON_STUDY_AT_ORGANISATION.ordinal());
}
itString = extraInfo.getCompanies().iterator();
while (itString.hasNext()) {
String company = itString.next();
organisationId = organisations.indexOf(company);
if(organisationId == -1) {
organisationId = organisations.size();
organisations.add(company);
arguments.add(SN.formId(organisationId));
arguments.add(ScalableGenerator.OrganisationType.company.toString());
arguments.add(company);
arguments.add(DBP.getUrl(company));
ToCSV(arguments, Files.ORGANISATION.ordinal());
arguments.add(SN.formId(organisationId));
arguments.add(Integer.toString(companyToCountry.get(company)));
ToCSV(arguments, Files.ORGANISATION_BASED_NEAR_PLACE.ordinal());
}
date.setTimeInMillis(extraInfo.getWorkFrom(company));
dateString = DateGenerator.formatYear(date);
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(SN.formId(organisationId));
arguments.add(dateString);
ToCSV(arguments, Files.PERSON_WORK_AT_ORGANISATION.ordinal());
}
Iterator<Integer> itInteger = profile.getSetOfTags().iterator();
while (itInteger.hasNext()){
Integer interestIdx = itInteger.next();
String interest = tagDic.getName(interestIdx);
if (interests.indexOf(interest) == -1) {
interests.add(interest);
arguments.add(Integer.toString(interestIdx));
arguments.add(interest.replace("\"", "\\\""));
arguments.add(DBP.getUrl(interest));
ToCSV(arguments, Files.TAG.ordinal());
printTagHierarchy(interestIdx);
}
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(interestIdx));
ToCSV(arguments, Files.PERSON_INTEREST_TAG.ordinal());
}
Friend friends[] = profile.getFriendList();
for (int i = 0; i < friends.length; i ++) {
if (friends[i] != null && friends[i].getCreatedTime() != -1){
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(friends[i].getFriendAcc()));
ToCSV(arguments,Files.PERSON_KNOWS_PERSON.ordinal());
}
}
//The forums of the user
date.setTimeInMillis(profile.getCreatedDate());
dateString = DateGenerator.formatDateDetail(date);
String title = "Wall of " + extraInfo.getFirstName() + " " + extraInfo.getLastName();
arguments.add(SN.formId(profile.getForumWallId()));
arguments.add(title);
arguments.add(dateString);
ToCSV(arguments,Files.FORUM.ordinal());
arguments.add(SN.formId(profile.getForumWallId()));
arguments.add(Integer.toString(profile.getAccountId()));
ToCSV(arguments,Files.FORUM_HAS_MODERATOR_PERSON.ordinal());
itInteger = profile.getSetOfTags().iterator();
while (itInteger.hasNext()){
Integer interestIdx = itInteger.next();
arguments.add(Integer.toString(profile.getAccountId()));
arguments.add(Integer.toString(interestIdx));
ToCSV(arguments, Files.FORUM_HASTAG_TAG.ordinal());
}
for (int i = 0; i < friends.length; i ++){
if (friends[i] != null && friends[i].getCreatedTime() != -1){
date.setTimeInMillis(friends[i].getCreatedTime());
dateString = DateGenerator.formatDateDetail(date);
arguments.add(SN.formId(profile.getForumWallId()));
arguments.add(Integer.toString(friends[i].getFriendAcc()));
arguments.add(dateString);
ToCSV(arguments,Files.FORUM_HASMEMBER_PERSON.ordinal());
}
}
}
|
diff --git a/src/main/java/org/testng/SuiteRunnerWorker.java b/src/main/java/org/testng/SuiteRunnerWorker.java
index a271020e..1c7932f9 100644
--- a/src/main/java/org/testng/SuiteRunnerWorker.java
+++ b/src/main/java/org/testng/SuiteRunnerWorker.java
@@ -1,118 +1,118 @@
package org.testng;
import org.testng.internal.PoolService;
import org.testng.internal.Utils;
import org.testng.xml.XmlSuite;
public class SuiteRunnerWorker implements Runnable {
private SuiteRunner m_suiteRunner;
private Integer m_verbose;
private String m_defaultSuiteName;
private StringBuilder m_verboseOutput;
public SuiteRunnerWorker(SuiteRunner sr, Integer verbose, String defaultSuiteName) {
m_suiteRunner = sr;
m_verbose = verbose;
m_defaultSuiteName = defaultSuiteName;
}
/**
* Runs a suite and its children suites
* @param result populates this list with execution results
* @param suiteRunnerMap map of suiteRunners that are updated with test results
* @param xmlSuite XML suites to run
*/
private void runSuite(XmlSuite xmlSuite)
{
// System.out.println("Running suite:" + xmlSuite);
if (m_verbose > 0) {
StringBuffer allFiles = new StringBuffer();
allFiles.append(" ").append(xmlSuite.getFileName() != null
? xmlSuite.getFileName() : m_defaultSuiteName).append('\n');
Utils.log("TestNG", 0, "Running:\n" + allFiles.toString());
}
PoolService.initialize(xmlSuite.getDataProviderThreadCount());
// for (XmlSuite s : suiteRunnerMap.keySet()) {
// System.out.println(s.equals(xmlSuite) + " " + s.hashCode() + " " + xmlSuite.hashCode());
// }
m_suiteRunner.run();
// PoolService.getInstance().shutdown();
//
// Display the final statistics
//
int passed = 0;
int failed = 0;
int skipped = 0;
int confFailures = 0;
int confSkips = 0;
int total = 0;
if (xmlSuite.getVerbose() > 0) {
// SuiteResultCounts counts = new SuiteResultCounts();
// counts.calculateResultCounts(xmlSuite, suiteRunnerMap);
+ m_verboseOutput =
+ new StringBuilder("\n===============================================\n")
+ .append(xmlSuite.getName());
for (ISuiteResult isr : m_suiteRunner.getResults().values()) {
- m_verboseOutput =
- new StringBuilder("\n===============================================\n")
- .append(xmlSuite.getName());
passed += isr.getTestContext().getPassedTests().size();
failed += isr.getTestContext().getFailedTests().size();
skipped += isr.getTestContext().getSkippedTests().size();
confFailures += isr.getTestContext().getFailedConfigurations().size();
confSkips += isr.getTestContext().getSkippedConfigurations().size();
}
total += passed + failed + skipped;
m_verboseOutput.append("\nTotal tests run: ")
.append(total)
.append(", Failures: ").append(failed)
.append(", Skips: ").append(skipped);;
if(confFailures > 0 || confSkips > 0) {
m_verboseOutput.append("\nConfiguration Failures: ").append(confFailures)
.append(", Skips: ").append(confSkips);
}
m_verboseOutput.append("\n===============================================\n");
System.out.println(m_verboseOutput);
}
}
@Override
public void run() {
runSuite(m_suiteRunner.getXmlSuite());
}
public String getVerboseOutput() {
return m_verboseOutput.toString();
}
}
//class SuiteResultCounts {
//
// int total = 0;
// int skipped = 0;
// int failed = 0;
// int confFailures = 0;
// int confSkips = 0;
//
// public void calculateResultCounts(XmlSuite xmlSuite, Map<XmlSuite, ISuite> xmlToISuiteMap)
// {
// Collection<ISuiteResult> tempSuiteResult = xmlToISuiteMap.get(xmlSuite).getResults().values();
// for (ISuiteResult isr : tempSuiteResult) {
// ITestContext ctx = isr.getTestContext();
// int _skipped = ctx.getSkippedTests().size();
// int _failed = ctx.getFailedTests().size() + ctx.getFailedButWithinSuccessPercentageTests().size();
// skipped += _skipped;
// failed += _failed;
// confFailures += ctx.getFailedConfigurations().size();
// confSkips += ctx.getSkippedConfigurations().size();
// total += ctx.getPassedTests().size() + _failed + _skipped;
// }
//
// for (XmlSuite childSuite : xmlSuite.getChildSuites()) {
// calculateResultCounts(childSuite, xmlToISuiteMap);
// }
// }
//}
| false | true | private void runSuite(XmlSuite xmlSuite)
{
// System.out.println("Running suite:" + xmlSuite);
if (m_verbose > 0) {
StringBuffer allFiles = new StringBuffer();
allFiles.append(" ").append(xmlSuite.getFileName() != null
? xmlSuite.getFileName() : m_defaultSuiteName).append('\n');
Utils.log("TestNG", 0, "Running:\n" + allFiles.toString());
}
PoolService.initialize(xmlSuite.getDataProviderThreadCount());
// for (XmlSuite s : suiteRunnerMap.keySet()) {
// System.out.println(s.equals(xmlSuite) + " " + s.hashCode() + " " + xmlSuite.hashCode());
// }
m_suiteRunner.run();
// PoolService.getInstance().shutdown();
//
// Display the final statistics
//
int passed = 0;
int failed = 0;
int skipped = 0;
int confFailures = 0;
int confSkips = 0;
int total = 0;
if (xmlSuite.getVerbose() > 0) {
// SuiteResultCounts counts = new SuiteResultCounts();
// counts.calculateResultCounts(xmlSuite, suiteRunnerMap);
for (ISuiteResult isr : m_suiteRunner.getResults().values()) {
m_verboseOutput =
new StringBuilder("\n===============================================\n")
.append(xmlSuite.getName());
passed += isr.getTestContext().getPassedTests().size();
failed += isr.getTestContext().getFailedTests().size();
skipped += isr.getTestContext().getSkippedTests().size();
confFailures += isr.getTestContext().getFailedConfigurations().size();
confSkips += isr.getTestContext().getSkippedConfigurations().size();
}
total += passed + failed + skipped;
m_verboseOutput.append("\nTotal tests run: ")
.append(total)
.append(", Failures: ").append(failed)
.append(", Skips: ").append(skipped);;
if(confFailures > 0 || confSkips > 0) {
m_verboseOutput.append("\nConfiguration Failures: ").append(confFailures)
.append(", Skips: ").append(confSkips);
}
m_verboseOutput.append("\n===============================================\n");
System.out.println(m_verboseOutput);
}
}
| private void runSuite(XmlSuite xmlSuite)
{
// System.out.println("Running suite:" + xmlSuite);
if (m_verbose > 0) {
StringBuffer allFiles = new StringBuffer();
allFiles.append(" ").append(xmlSuite.getFileName() != null
? xmlSuite.getFileName() : m_defaultSuiteName).append('\n');
Utils.log("TestNG", 0, "Running:\n" + allFiles.toString());
}
PoolService.initialize(xmlSuite.getDataProviderThreadCount());
// for (XmlSuite s : suiteRunnerMap.keySet()) {
// System.out.println(s.equals(xmlSuite) + " " + s.hashCode() + " " + xmlSuite.hashCode());
// }
m_suiteRunner.run();
// PoolService.getInstance().shutdown();
//
// Display the final statistics
//
int passed = 0;
int failed = 0;
int skipped = 0;
int confFailures = 0;
int confSkips = 0;
int total = 0;
if (xmlSuite.getVerbose() > 0) {
// SuiteResultCounts counts = new SuiteResultCounts();
// counts.calculateResultCounts(xmlSuite, suiteRunnerMap);
m_verboseOutput =
new StringBuilder("\n===============================================\n")
.append(xmlSuite.getName());
for (ISuiteResult isr : m_suiteRunner.getResults().values()) {
passed += isr.getTestContext().getPassedTests().size();
failed += isr.getTestContext().getFailedTests().size();
skipped += isr.getTestContext().getSkippedTests().size();
confFailures += isr.getTestContext().getFailedConfigurations().size();
confSkips += isr.getTestContext().getSkippedConfigurations().size();
}
total += passed + failed + skipped;
m_verboseOutput.append("\nTotal tests run: ")
.append(total)
.append(", Failures: ").append(failed)
.append(", Skips: ").append(skipped);;
if(confFailures > 0 || confSkips > 0) {
m_verboseOutput.append("\nConfiguration Failures: ").append(confFailures)
.append(", Skips: ").append(confSkips);
}
m_verboseOutput.append("\n===============================================\n");
System.out.println(m_verboseOutput);
}
}
|
diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/WorkspaceRepository.java b/biz.aQute.bndlib/src/aQute/bnd/build/WorkspaceRepository.java
index 2e2a8970c..48111e096 100644
--- a/biz.aQute.bndlib/src/aQute/bnd/build/WorkspaceRepository.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/build/WorkspaceRepository.java
@@ -1,190 +1,197 @@
package aQute.bnd.build;
import java.io.*;
import java.util.*;
import java.util.regex.*;
import aQute.bnd.osgi.*;
import aQute.bnd.service.*;
import aQute.bnd.version.*;
import aQute.lib.collections.*;
import aQute.libg.glob.*;
public class WorkspaceRepository implements RepositoryPlugin, Actionable {
private final Workspace workspace;
public WorkspaceRepository(Workspace workspace) {
this.workspace = workspace;
}
private File[] get(String bsn, String range) throws Exception {
Collection<Project> projects = workspace.getAllProjects();
SortedMap<Version,File> foundVersion = new TreeMap<Version,File>();
for (Project project : projects) {
- File[] build = project.build(false);
- if (build != null) {
- for (File file : build) {
- Jar jar = new Jar(file);
- if (bsn.equals(jar.getBsn())) {
- Version version = new Version(jar.getVersion());
- boolean exact = range.matches("[0-9]+\\.[0-9]+\\.[0-9]+\\..*");
- if ("latest".equals(range) || matchVersion(range, version, exact)) {
- foundVersion.put(version, file);
+ for (Builder builder : project.getSubBuilders()) {
+ if (!bsn.equals(builder.getBsn())) {
+ continue;
+ }
+ Version version = new Version(builder.getVersion());
+ boolean exact = range.matches("[0-9]+\\.[0-9]+\\.[0-9]+\\..*");
+ if ("latest".equals(range) || matchVersion(range, version, exact)) {
+ File file = project.getOutputFile(bsn);
+ if (!file.exists()) {
+ Jar jar = builder.build();
+ if (jar == null) {
+ project.getInfo(builder);
+ continue;
}
+ file = project.saveBuild(jar);
+ jar.close();
}
+ foundVersion.put(version, file);
}
}
}
File[] result = new File[foundVersion.size()];
result = foundVersion.values().toArray(result);
if (!"latest".equals(range)) {
return result;
}
if (result.length > 0) {
return new File[] {
result[0]
};
}
return new File[0];
}
public File get(String bsn, String range, Strategy strategy, Map<String,String> properties) throws Exception {
File[] files = get(bsn, range);
if (files.length == 0) {
return null;
}
if (strategy == Strategy.EXACT) {
return files[0];
} else if (strategy == Strategy.HIGHEST) {
return files[files.length - 1];
} else if (strategy == Strategy.LOWEST) {
return files[0];
}
return null;
}
private boolean matchVersion(String range, Version version, boolean exact) {
if (range == null || range.trim().length() == 0)
return true;
VersionRange vr = new VersionRange(range);
boolean result;
if (exact) {
if (vr.isRange())
result = false;
else
result = vr.getHigh().equals(version);
} else {
result = vr.includes(version);
}
return result;
}
public boolean canWrite() {
return false;
}
public PutResult put(InputStream stream, PutOptions options) throws Exception {
throw new UnsupportedOperationException("Read only repository");
}
public List<String> list(String pattern) throws Exception {
List<String> names = new ArrayList<String>();
Collection<Project> projects = workspace.getAllProjects();
for (Project project : projects) {
for (Builder builder : project.getSubBuilders()) {
String bsn = builder.getBsn();
if (pattern != null) {
Glob glob = new Glob(pattern);
Matcher matcher = glob.matcher(bsn);
if (matcher.matches()) {
if (!names.contains(bsn)) {
names.add(bsn);
}
}
} else {
if (!names.contains(bsn)) {
names.add(bsn);
}
}
}
}
return names;
}
public SortedSet<Version> versions(String bsn) throws Exception {
List<Version> versions = new ArrayList<Version>();
Collection<Project> projects = workspace.getAllProjects();
for (Project project : projects) {
File[] build = project.build(false);
if (build != null) {
for (File file : build) {
Jar jar = new Jar(file);
try {
if (bsn.equals(jar.getBsn())) {
String v = jar.getVersion();
if ( v == null)
v = "0";
else if (!Verifier.isVersion(v))
continue; // skip
versions.add(new Version(v));
}
}
finally {
jar.close();
}
}
}
}
if ( versions.isEmpty())
return SortedList.empty();
return new SortedList<Version>(versions);
}
public String getName() {
return "Workspace " + workspace.getBase().getName();
}
public String getLocation() {
return workspace.getBase().getAbsolutePath();
}
public File get(String bsn, Version version, Map<String,String> properties, DownloadListener ... listeners) throws Exception {
File file = get(bsn, version.toString(), Strategy.EXACT, properties);
if ( file == null)
return null;
for (DownloadListener l : listeners) {
try {
l.success(file);
}
catch (Exception e) {
workspace.exception(e, "Workspace repo listener callback for %s" ,file);
}
}
return file;
}
public Map<String,Runnable> actions(Object... target) throws Exception {
// TODO Auto-generated method stub
return null;
}
public String tooltip(Object... target) throws Exception {
// TODO Auto-generated method stub
return null;
}
public String title(Object... target) throws Exception {
// TODO Auto-generated method stub
return null;
}
}
| false | true | private File[] get(String bsn, String range) throws Exception {
Collection<Project> projects = workspace.getAllProjects();
SortedMap<Version,File> foundVersion = new TreeMap<Version,File>();
for (Project project : projects) {
File[] build = project.build(false);
if (build != null) {
for (File file : build) {
Jar jar = new Jar(file);
if (bsn.equals(jar.getBsn())) {
Version version = new Version(jar.getVersion());
boolean exact = range.matches("[0-9]+\\.[0-9]+\\.[0-9]+\\..*");
if ("latest".equals(range) || matchVersion(range, version, exact)) {
foundVersion.put(version, file);
}
}
}
}
}
File[] result = new File[foundVersion.size()];
result = foundVersion.values().toArray(result);
if (!"latest".equals(range)) {
return result;
}
if (result.length > 0) {
return new File[] {
result[0]
};
}
return new File[0];
}
| private File[] get(String bsn, String range) throws Exception {
Collection<Project> projects = workspace.getAllProjects();
SortedMap<Version,File> foundVersion = new TreeMap<Version,File>();
for (Project project : projects) {
for (Builder builder : project.getSubBuilders()) {
if (!bsn.equals(builder.getBsn())) {
continue;
}
Version version = new Version(builder.getVersion());
boolean exact = range.matches("[0-9]+\\.[0-9]+\\.[0-9]+\\..*");
if ("latest".equals(range) || matchVersion(range, version, exact)) {
File file = project.getOutputFile(bsn);
if (!file.exists()) {
Jar jar = builder.build();
if (jar == null) {
project.getInfo(builder);
continue;
}
file = project.saveBuild(jar);
jar.close();
}
foundVersion.put(version, file);
}
}
}
File[] result = new File[foundVersion.size()];
result = foundVersion.values().toArray(result);
if (!"latest".equals(range)) {
return result;
}
if (result.length > 0) {
return new File[] {
result[0]
};
}
return new File[0];
}
|
diff --git a/cocos2d-android/src/org/cocos2d/actions/CCActionManager.java b/cocos2d-android/src/org/cocos2d/actions/CCActionManager.java
index 845234b..63b98bb 100644
--- a/cocos2d-android/src/org/cocos2d/actions/CCActionManager.java
+++ b/cocos2d-android/src/org/cocos2d/actions/CCActionManager.java
@@ -1,349 +1,349 @@
package org.cocos2d.actions;
import java.util.ArrayList;
import org.cocos2d.actions.base.CCAction;
import org.cocos2d.nodes.CCNode;
import org.cocos2d.utils.collections.ConcurrentArrayHashMap;
import org.cocos2d.utils.pool.ConcOneClassPool;
import android.util.Log;
/** CCActionManager is a singleton that manages all the actions.
Normally you won't need to use this singleton directly. 99% of the cases you will use the CCNode interface,
which uses this singleton.
But there are some cases where you might need to use this singleton.
Examples:
- When you want to run an action where the target is different from a CCNode.
- When you want to pause / resume the actions
@since v0.8
*/
public class CCActionManager implements UpdateCallback {
private static final String LOG_TAG = CCActionManager.class.getSimpleName();
private static class HashElement {
final ArrayList<CCAction> actions;
CCNode target;
int actionIndex;
// CCAction currentAction;
// boolean currentActionSalvaged;
boolean paused;
public HashElement() {
actions = new ArrayList<CCAction>(4);
}
}
private ConcOneClassPool<HashElement> pool = new ConcOneClassPool<CCActionManager.HashElement>() {
@Override
protected HashElement allocate() {
return new HashElement();
}
};
/**
* ActionManager is a singleton that manages all the actions.
* Normally you won't need to use this singleton directly. 99% of the cases you will use the CocosNode interface,
* which uses this singleton.
* But there are some cases where you might need to use this singleton.
* Examples:
* - When you want to run an action where the target is different from a CocosNode.
* - When you want to pause / resume the actions
*
* @since v0.8
*/
private final ConcurrentArrayHashMap<CCNode, HashElement> targets;
// private HashElement currentTarget;
// private boolean currentTargetSalvaged;
/**
* returns a shared instance of the ActionManager
*/
private static CCActionManager _sharedManager = new CCActionManager();
/** returns a shared instance of the CCActionManager */
public static CCActionManager sharedManager() {
return _sharedManager;
}
private CCActionManager() {
CCScheduler.sharedScheduler().scheduleUpdate(this, 0, false);
targets = new ConcurrentArrayHashMap<CCNode, HashElement>();
}
// @Override
// public void finalize () throws Throwable {
// ccMacros.CCLOGINFO(LOG_TAG, "cocos2d: deallocing " + this.toString());
//
// this.removeAllActions();
// _sharedManager = null;
//
// super.finalize();
// }
private void deleteHashElement(HashElement element) {
synchronized (element.actions) {
element.actions.clear();
}
HashElement removedEl = targets.remove(element.target);//put(element.target, null);
if(removedEl != null) {
pool.free( removedEl );
}
}
private void removeAction(int index, HashElement element) {
synchronized (element.actions) {
element.actions.remove(index);
if (element.actionIndex >= index)
element.actionIndex--;
if (element.actions.isEmpty()) {
deleteHashElement(element);
}
}
}
// actions
// TODO figure out why the target not found
/**
* Pauses all actions for a certain target.
* When the actions are paused, they won't be "ticked".
*/
@Deprecated
public void pauseAllActions(CCNode target) {
this.pause(target);
}
/**
* Resumes all actions for a certain target.
* Once the actions are resumed, they will be "ticked" in every frame.
*/
@Deprecated
public void resumeAllActions(CCNode target) {
this.resume(target);
}
/** Adds an action with a target.
If the target is already present, then the action will be added to the existing target.
If the target is not present, a new instance of this target will be created either paused or paused, and the action will be added to the newly created target.
When the target is paused, the queued actions won't be 'ticked'.
*/
public void addAction(CCAction action, CCNode target, boolean paused) {
assert action != null : "Argument action must be non-null";
assert target != null : "Argument target must be non-null";
HashElement element = targets.get(target);
if (element == null) {
element = pool.get();
element.target = target;
element.paused = paused;
targets.put(target, element);
}
synchronized (element.actions) {
assert !element.actions.contains(action) : "runAction: Action already running";
element.actions.add(action);
}
action.start(target);
}
/**
* Removes all actions from all the targers.
*/
public void removeAllActions() {
for(ConcurrentArrayHashMap<CCNode, HashElement>.Entry e = targets.firstValue();
e != null; e = targets.nextValue(e)) {
HashElement element = e.getValue();
if(element != null)
removeAllActions(element.target);
}
}
/**
* Removes all actions from a certain target.
* All the actions that belongs to the target will be removed.
*/
public void removeAllActions(CCNode target) {
// explicit null handling
if (target == null)
return;
HashElement element = targets.get(target);
if (element != null) {
// if( element.actions.contains(element.currentAction) && !element.currentActionSalvaged ) {
// element.currentActionSalvaged = true;
// }
// element.actions.clear();
// if( currentTarget == element )
// currentTargetSalvaged = true;
// else
deleteHashElement(element);
} else {
// Log.w(LOG_TAG, "removeAllActions: target not found");
}
}
/**
* Removes an action given an action reference.
*/
public void removeAction(CCAction action) {
if (action == null)
return;
HashElement element = targets.get(action.getOriginalTarget());
if (element != null) {
int i;
synchronized (element.actions) {
i = element.actions.indexOf(action);
if (i != -1) {
removeAction(i, element);
}
}
} else {
Log.w(LOG_TAG, "removeAction: target not found");
}
}
/**
* Removes an action given its tag and the target
*/
public void removeAction(int tag, CCNode target) {
assert tag != CCAction.kCCActionTagInvalid : "Invalid tag";
HashElement element = targets.get(target);
if (element != null) {
synchronized (element.actions) {
int limit = element.actions.size();
for (int i = 0; i < limit; i++) {
CCAction a = element.actions.get(i);
if (a.getTag() == tag && a.getOriginalTarget() == target)
removeAction(i, element);
}
}
} else {
// Log.w(LOG_TAG, "removeAction: target not found");
}
}
/**
* Gets an action given its tag and a target
*
* @return the Action with the given tag
*/
public CCAction getAction(int tag, CCNode target) {
assert tag != CCAction.kCCActionTagInvalid : "Invalid tag";
HashElement element = targets.get(target);
if (element != null) {
synchronized (element.actions) {
int limit = element.actions.size();
for (int i = 0; i < limit; i++) {
CCAction a = element.actions.get(i);
if (a.getTag() == tag)
return a;
}
}
} else {
// Log.w(LOG_TAG, "getAction: target not found");
}
return null;
}
/**
* Returns the numbers of actions that are running in a certain target
* Composable actions are counted as 1 action. Example:
* If you are running 1 Sequence of 7 actions, it will return 1.
* If you are running 7 Sequences of 2 actions, it will return 7.
*/
public int numberOfRunningActions(CCNode target) {
HashElement element = targets.get(target);
if (element != null) {
synchronized (element.actions) {
return element.actions.size();
}
}
return 0;
}
public void update(float dt) {
for(ConcurrentArrayHashMap<CCNode, HashElement>.Entry e = targets.firstValue();
e != null; e = targets.nextValue(e)) {
HashElement currentTarget = e.getValue();
if(currentTarget == null)
continue;
if (!currentTarget.paused) {
synchronized (currentTarget.actions) {
// The 'actions' may change while inside this loop.
for (currentTarget.actionIndex = 0;
currentTarget.actionIndex < currentTarget.actions.size();
currentTarget.actionIndex++) {
CCAction currentAction = currentTarget.actions.get(currentTarget.actionIndex);
currentAction.step(dt);
if (currentAction.isDone()) {
currentAction.stop();
// removeAction(currentAction);
HashElement element = targets.get(currentTarget.target);
- if (element != null) {
+ if (element != null && currentTarget.actionIndex >= 0) {
removeAction(currentTarget.actionIndex, currentTarget);
}
}
// currentTarget.currentAction = null;
}
}
}
if (currentTarget.actions.isEmpty())
deleteHashElement(currentTarget);
}
}
public void resume(CCNode target) {
HashElement element = targets.get(target);
if (element != null)
element.paused = false;
}
public void pause(CCNode target) {
HashElement element = targets.get(target);
if( element != null )
element.paused = true;
}
/** purges the shared action manager. It releases the retained instance.
@since v0.99.0
*/
public static void purgeSharedManager() {
if (_sharedManager != null) {
CCScheduler.sharedScheduler().unscheduleUpdate(_sharedManager);
_sharedManager = null;
}
}
}
| true | true | public void update(float dt) {
for(ConcurrentArrayHashMap<CCNode, HashElement>.Entry e = targets.firstValue();
e != null; e = targets.nextValue(e)) {
HashElement currentTarget = e.getValue();
if(currentTarget == null)
continue;
if (!currentTarget.paused) {
synchronized (currentTarget.actions) {
// The 'actions' may change while inside this loop.
for (currentTarget.actionIndex = 0;
currentTarget.actionIndex < currentTarget.actions.size();
currentTarget.actionIndex++) {
CCAction currentAction = currentTarget.actions.get(currentTarget.actionIndex);
currentAction.step(dt);
if (currentAction.isDone()) {
currentAction.stop();
// removeAction(currentAction);
HashElement element = targets.get(currentTarget.target);
if (element != null) {
removeAction(currentTarget.actionIndex, currentTarget);
}
}
// currentTarget.currentAction = null;
}
}
}
if (currentTarget.actions.isEmpty())
deleteHashElement(currentTarget);
}
}
| public void update(float dt) {
for(ConcurrentArrayHashMap<CCNode, HashElement>.Entry e = targets.firstValue();
e != null; e = targets.nextValue(e)) {
HashElement currentTarget = e.getValue();
if(currentTarget == null)
continue;
if (!currentTarget.paused) {
synchronized (currentTarget.actions) {
// The 'actions' may change while inside this loop.
for (currentTarget.actionIndex = 0;
currentTarget.actionIndex < currentTarget.actions.size();
currentTarget.actionIndex++) {
CCAction currentAction = currentTarget.actions.get(currentTarget.actionIndex);
currentAction.step(dt);
if (currentAction.isDone()) {
currentAction.stop();
// removeAction(currentAction);
HashElement element = targets.get(currentTarget.target);
if (element != null && currentTarget.actionIndex >= 0) {
removeAction(currentTarget.actionIndex, currentTarget);
}
}
// currentTarget.currentAction = null;
}
}
}
if (currentTarget.actions.isEmpty())
deleteHashElement(currentTarget);
}
}
|
diff --git a/src/main/java/de/cismet/cids/custom/objecteditors/wunda_blau/VermessungFlurstueckSelectionDialog.java b/src/main/java/de/cismet/cids/custom/objecteditors/wunda_blau/VermessungFlurstueckSelectionDialog.java
index a76728c0..d48e115a 100644
--- a/src/main/java/de/cismet/cids/custom/objecteditors/wunda_blau/VermessungFlurstueckSelectionDialog.java
+++ b/src/main/java/de/cismet/cids/custom/objecteditors/wunda_blau/VermessungFlurstueckSelectionDialog.java
@@ -1,870 +1,870 @@
/***************************************************
*
* cismet GmbH, Saarbruecken, Germany
*
* ... and it just works.
*
****************************************************/
/*
* FlurstueckSelectionDialoge.java
*
* Created on 13.12.2010, 11:02:41
*/
package de.cismet.cids.custom.objecteditors.wunda_blau;
import Sirius.server.middleware.types.LightweightMetaObject;
import Sirius.server.middleware.types.MetaObject;
import org.openide.util.NbBundle;
import java.awt.Color;
import java.awt.Component;
import java.awt.HeadlessException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JTextField;
import javax.swing.ListCellRenderer;
import javax.swing.SwingWorker;
import de.cismet.cids.custom.objectrenderer.utils.AlphanumComparator;
import de.cismet.cids.custom.objectrenderer.utils.CidsBeanSupport;
import de.cismet.cids.custom.objectrenderer.utils.ObjectRendererUtils;
import de.cismet.cids.custom.objectrenderer.utils.VermessungFlurstueckFinder;
import de.cismet.cids.dynamics.CidsBean;
import de.cismet.tools.CismetThreadPool;
import de.cismet.tools.gui.StaticSwingTools;
/**
* DOCUMENT ME!
*
* @author stefan
* @version $Revision$, $Date$
*/
public class VermessungFlurstueckSelectionDialog extends javax.swing.JDialog {
//~ Static fields/initializers ---------------------------------------------
private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(
VermessungFlurstueckSelectionDialog.class);
private static final ComboBoxModel WAIT_MODEL = new DefaultComboBoxModel(new String[] { "Wird geladen..." });
private static final DefaultComboBoxModel NO_SELECTION_MODEL = new DefaultComboBoxModel(new Object[] {});
private static final String CB_EDITED_ACTION_COMMAND = "comboBoxEdited";
//~ Instance fields --------------------------------------------------------
private List<CidsBean> currentListToAdd;
private final boolean usedInEditor;
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnApply;
private javax.swing.JButton btnCancel;
private javax.swing.JButton btnOK;
private javax.swing.JComboBox cboFlur;
private javax.swing.JComboBox cboFlurstueck;
private javax.swing.JComboBox cboGemarkung;
private javax.swing.JComboBox cmbVeraenderungsart;
private javax.swing.JLabel lblFlur;
private javax.swing.JLabel lblFlurstueck;
private javax.swing.JLabel lblGemarkung;
private javax.swing.JLabel lblGemarkungsname;
private javax.swing.JLabel lblVeraenderungsart;
private javax.swing.JPanel pnlContainer;
private javax.swing.JPanel pnlControls;
private javax.swing.JSeparator sepControls;
// End of variables declaration//GEN-END:variables
//~ Constructors -----------------------------------------------------------
/**
* Creates a new FlurstueckSelectionDialoge object.
*/
public VermessungFlurstueckSelectionDialog() {
this(true);
}
/**
* Creates new form FlurstueckSelectionDialoge.
*
* @param usedInEditor DOCUMENT ME!
*/
public VermessungFlurstueckSelectionDialog(final boolean usedInEditor) {
this.usedInEditor = usedInEditor;
setTitle("Bitte Flurstück auswählen");
initComponents();
setSize(419, 144);
final ListCellRenderer lcr = new ListCellRenderer() {
DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
@Override
public Component getListCellRendererComponent(final JList list,
final Object value,
final int index,
final boolean isSelected,
final boolean cellHasFocus) {
final JLabel result = (JLabel)defaultListCellRenderer.getListCellRendererComponent(
list,
value,
index,
isSelected,
cellHasFocus);
if (value instanceof LightweightMetaObject) {
final LightweightMetaObject metaObject = (LightweightMetaObject)value;
result.setText(
String.valueOf(metaObject.getLWAttribute(VermessungFlurstueckFinder.FLURSTUECK_GEMARKUNG))
+ " - "
+ String.valueOf(
metaObject.getLWAttribute(VermessungFlurstueckFinder.GEMARKUNG_NAME)));
}
return result;
}
};
cboGemarkung.setRenderer(lcr);
CismetThreadPool.execute(new AbstractFlurstueckComboModelWorker(cboGemarkung, true) {
@Override
protected ComboBoxModel doInBackground() throws Exception {
return new DefaultComboBoxModel(VermessungFlurstueckFinder.getLWGemarkungen());
}
@Override
protected void done() {
super.done();
cboGemarkung.setSelectedIndex(0);
cboGemarkung.requestFocusInWindow();
ObjectRendererUtils.selectAllTextInEditableCombobox(cboGemarkung);
}
});
CismetThreadPool.execute(new AbstractFlurstueckComboModelWorker(cmbVeraenderungsart, false) {
@Override
protected ComboBoxModel doInBackground() throws Exception {
final DefaultComboBoxModel result = new DefaultComboBoxModel(
VermessungFlurstueckFinder.getVeraenderungsarten());
if (!usedInEditor) {
result.insertElementAt("Alle", 0);
}
return result;
}
@Override
protected void done() {
super.done();
cmbVeraenderungsart.setSelectedIndex(0);
}
});
}
//~ Methods ----------------------------------------------------------------
@Override
public void setVisible(final boolean b) {
checkOkEnableState();
super.setVisible(b);
}
/**
* DOCUMENT ME!
*
* @param currentListToAdd DOCUMENT ME!
*/
public void setCurrentListToAdd(final List<CidsBean> currentListToAdd) {
this.currentListToAdd = currentListToAdd;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public List<CidsBean> getCurrentListToAdd() {
return currentListToAdd;
}
/**
* This method is called from within the constructor to initialize the form. WARNING: Do NOT modify this code. The
* content of this method is always regenerated by the Form Editor.
*/
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
pnlContainer = new javax.swing.JPanel();
cboGemarkung = new javax.swing.JComboBox();
pnlControls = new javax.swing.JPanel();
btnCancel = new javax.swing.JButton();
btnOK = new javax.swing.JButton();
btnApply = new javax.swing.JButton();
cboFlur = new javax.swing.JComboBox(NO_SELECTION_MODEL);
cboFlurstueck = new javax.swing.JComboBox(NO_SELECTION_MODEL);
lblGemarkung = new javax.swing.JLabel();
lblFlur = new javax.swing.JLabel();
lblFlurstueck = new javax.swing.JLabel();
lblGemarkungsname = new javax.swing.JLabel();
sepControls = new javax.swing.JSeparator();
lblVeraenderungsart = new javax.swing.JLabel();
cmbVeraenderungsart = new javax.swing.JComboBox();
setMinimumSize(new java.awt.Dimension(419, 154));
pnlContainer.setMaximumSize(new java.awt.Dimension(250, 180));
pnlContainer.setMinimumSize(new java.awt.Dimension(250, 180));
pnlContainer.setPreferredSize(new java.awt.Dimension(250, 180));
pnlContainer.setLayout(new java.awt.GridBagLayout());
cboGemarkung.setEditable(true);
cboGemarkung.setMaximumSize(new java.awt.Dimension(100, 18));
cboGemarkung.setMinimumSize(new java.awt.Dimension(100, 18));
cboGemarkung.setPreferredSize(new java.awt.Dimension(100, 18));
cboGemarkung.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
cboGemarkungActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 2.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(cboGemarkung, gridBagConstraints);
pnlControls.setLayout(new java.awt.GridBagLayout());
btnCancel.setText("Abbrechen");
- btnCancel.setToolTipText("Eingaben nicht übernehmen und Dialog schliessen");
+ btnCancel.setToolTipText("Eingaben nicht übernehmen und Dialog schließen");
btnCancel.setFocusPainted(false);
btnCancel.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
btnCancelActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlControls.add(btnCancel, gridBagConstraints);
btnOK.setText("OK");
- btnOK.setToolTipText("Eingaben übernehmen und Dialog schliessen");
+ btnOK.setToolTipText("Eingaben übernehmen und Dialog schließen");
btnOK.setFocusPainted(false);
btnOK.setMaximumSize(new java.awt.Dimension(85, 23));
btnOK.setMinimumSize(new java.awt.Dimension(85, 23));
btnOK.setPreferredSize(new java.awt.Dimension(85, 23));
btnOK.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
btnOKActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlControls.add(btnOK, gridBagConstraints);
btnApply.setText("Übernehmen");
btnApply.setToolTipText("Eingaben übernehmen und Dialog geöffnet lassen");
btnApply.setFocusPainted(false);
btnApply.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
btnApplyActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlControls.add(btnApply, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 6;
gridBagConstraints.gridwidth = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
gridBagConstraints.weightx = 2.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(pnlControls, gridBagConstraints);
cboFlur.setEditable(true);
cboFlur.setEnabled(false);
cboFlur.setMaximumSize(new java.awt.Dimension(100, 18));
cboFlur.setMinimumSize(new java.awt.Dimension(100, 18));
cboFlur.setPreferredSize(new java.awt.Dimension(100, 18));
cboFlur.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
cboFlurActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(5, 0, 5, 0);
pnlContainer.add(cboFlur, gridBagConstraints);
cboFlurstueck.setEditable(true);
cboFlurstueck.setEnabled(false);
cboFlurstueck.setMaximumSize(new java.awt.Dimension(100, 18));
cboFlurstueck.setMinimumSize(new java.awt.Dimension(100, 18));
cboFlurstueck.setPreferredSize(new java.awt.Dimension(100, 18));
cboFlurstueck.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
cboFlurstueckActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(cboFlurstueck, gridBagConstraints);
lblGemarkung.setText("Gemarkung");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 2.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblGemarkung, gridBagConstraints);
lblFlur.setText("Flur");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblFlur, gridBagConstraints);
lblFlurstueck.setText("Flurstück");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 1;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblFlurstueck, gridBagConstraints);
lblGemarkungsname.setText(" ");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblGemarkungsname, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 5;
gridBagConstraints.gridwidth = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6);
pnlContainer.add(sepControls, gridBagConstraints);
lblVeraenderungsart.setText("Veränderungsart");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 3;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblVeraenderungsart, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(cmbVeraenderungsart, gridBagConstraints);
getContentPane().add(pnlContainer, java.awt.BorderLayout.CENTER);
} // </editor-fold>//GEN-END:initComponents
/**
* DOCUMENT ME!
*
* @param evt DOCUMENT ME!
*/
private void cboGemarkungActionPerformed(final java.awt.event.ActionEvent evt) { //GEN-FIRST:event_cboGemarkungActionPerformed
final Object selection = cboGemarkung.getSelectedItem();
cboFlurstueck.setEnabled(false);
btnOK.setEnabled(false);
if (selection instanceof LightweightMetaObject) {
final LightweightMetaObject metaObject = (LightweightMetaObject)selection;
final String gemarkung = String.valueOf(selection);
CismetThreadPool.execute(new AbstractFlurstueckComboModelWorker(
cboFlur,
CB_EDITED_ACTION_COMMAND.equals(evt.getActionCommand())) {
@Override
protected ComboBoxModel doInBackground() throws Exception {
return new DefaultComboBoxModel(VermessungFlurstueckFinder.getLWFlure(gemarkung));
}
});
final String gemarkungsname = String.valueOf(metaObject.getLWAttribute(
VermessungFlurstueckFinder.GEMARKUNG_NAME));
lblGemarkungsname.setText("(" + gemarkungsname + ")");
cboGemarkung.getEditor().getEditorComponent().setBackground(Color.WHITE);
} else {
final int foundBeanIndex = ObjectRendererUtils.findComboBoxItemForString(
cboGemarkung,
String.valueOf(selection));
if (foundBeanIndex < 0) {
if (usedInEditor) {
cboFlur.setModel(new DefaultComboBoxModel());
try {
Integer.parseInt(String.valueOf(selection));
cboGemarkung.getEditor().getEditorComponent().setBackground(Color.YELLOW);
cboFlur.setEnabled(true);
if (CB_EDITED_ACTION_COMMAND.equals(evt.getActionCommand())) {
cboFlur.requestFocusInWindow();
}
} catch (NumberFormatException notANumberEx) {
if (LOG.isDebugEnabled()) {
LOG.debug(selection + " is not a number!", notANumberEx);
}
cboFlur.setEnabled(false);
cboGemarkung.getEditor().getEditorComponent().setBackground(Color.RED);
lblGemarkungsname.setText("(Ist keine Zahl)");
}
lblGemarkungsname.setText(" ");
} else {
cboGemarkung.getEditor().getEditorComponent().setBackground(Color.RED);
cboFlur.setEnabled(false);
}
} else {
cboGemarkung.setSelectedIndex(foundBeanIndex);
cboFlur.getEditor().getEditorComponent().setBackground(Color.WHITE);
cboFlurstueck.getEditor().getEditorComponent().setBackground(Color.WHITE);
}
}
checkOkEnableState();
} //GEN-LAST:event_cboGemarkungActionPerformed
/**
* DOCUMENT ME!
*
* @param evt DOCUMENT ME!
*/
private void btnCancelActionPerformed(final java.awt.event.ActionEvent evt) { //GEN-FIRST:event_btnCancelActionPerformed
setVisible(false);
cancelHook();
} //GEN-LAST:event_btnCancelActionPerformed
/**
* DOCUMENT ME!
*
* @param evt DOCUMENT ME!
*/
private void btnOKActionPerformed(final java.awt.event.ActionEvent evt) { //GEN-FIRST:event_btnOKActionPerformed
apply(false);
} //GEN-LAST:event_btnOKActionPerformed
/**
* DOCUMENT ME!
*/
public void okHook() {
}
/**
* DOCUMENT ME!
*/
public void cancelHook() {
}
/**
* DOCUMENT ME!
*/
private void checkOkEnableState() {
btnOK.setEnabled(cboFlurstueck.getSelectedItem() instanceof MetaObject);
}
/**
* DOCUMENT ME!
*
* @param evt DOCUMENT ME!
*/
private void cboFlurActionPerformed(final java.awt.event.ActionEvent evt) { //GEN-FIRST:event_cboFlurActionPerformed
final Object selection = cboFlur.getSelectedItem();
if (selection instanceof MetaObject) {
final String gemarkung = String.valueOf(cboGemarkung.getSelectedItem());
final StringBuffer flur = new StringBuffer(String.valueOf(cboFlur.getSelectedItem()));
while (flur.length() < 3) {
flur.insert(0, 0);
}
btnOK.setEnabled(false);
cboFlur.getEditor().getEditorComponent().setBackground(Color.WHITE);
CismetThreadPool.execute(new AbstractFlurstueckComboModelWorker(
cboFlurstueck,
CB_EDITED_ACTION_COMMAND.equals(evt.getActionCommand())) {
@Override
protected ComboBoxModel doInBackground() throws Exception {
return new DefaultComboBoxModel(
VermessungFlurstueckFinder.getLWFurstuecksZaehlerNenner(gemarkung, flur.toString()));
}
});
} else {
String userInput = String.valueOf(selection);
while (userInput.length() < 3) {
userInput = "0" + userInput;
}
final int foundBeanIndex = ObjectRendererUtils.findComboBoxItemForString(cboFlur, userInput);
if (foundBeanIndex < 0) {
if (usedInEditor) {
cboFlur.getEditor().getEditorComponent().setBackground(Color.YELLOW);
cboFlurstueck.setModel(new DefaultComboBoxModel());
cboFlurstueck.setEnabled(true);
if (CB_EDITED_ACTION_COMMAND.equals(evt.getActionCommand())) {
cboFlurstueck.requestFocusInWindow();
cboFlurstueck.setSelectedIndex(0);
}
} else {
cboFlur.getEditor().getEditorComponent().setBackground(Color.RED);
cboFlurstueck.setModel(new DefaultComboBoxModel());
cboFlurstueck.setEnabled(false);
}
} else {
cboFlur.setSelectedIndex(foundBeanIndex);
cboFlurstueck.getEditor().getEditorComponent().setBackground(Color.WHITE);
}
}
checkOkEnableState();
} //GEN-LAST:event_cboFlurActionPerformed
/**
* DOCUMENT ME!
*
* @param evt DOCUMENT ME!
*/
private void cboFlurstueckActionPerformed(final java.awt.event.ActionEvent evt) { //GEN-FIRST:event_cboFlurstueckActionPerformed
btnOK.setEnabled(checkFlurstueckSelectionComplete());
if (CB_EDITED_ACTION_COMMAND.equals(evt.getActionCommand())) {
btnOK.requestFocusInWindow();
}
final Component editor = cboFlurstueck.getEditor().getEditorComponent();
if (cboFlurstueck.getSelectedItem() instanceof MetaObject) {
editor.setBackground(Color.WHITE);
} else {
String flurstueck = String.valueOf(cboFlurstueck.getSelectedItem());
if (!flurstueck.contains("/")) {
flurstueck += "/0";
if (editor instanceof JTextField) {
((JTextField)editor).setText(flurstueck);
}
}
final int foundBeanIndex = ObjectRendererUtils.findComboBoxItemForString(cboFlurstueck, flurstueck);
if (foundBeanIndex < 0) {
if (usedInEditor) {
cboFlurstueck.getEditor().getEditorComponent().setBackground(Color.YELLOW);
} else {
cboFlurstueck.getEditor().getEditorComponent().setBackground(Color.RED);
}
} else {
cboFlurstueck.setSelectedIndex(foundBeanIndex);
}
}
} //GEN-LAST:event_cboFlurstueckActionPerformed
/**
* DOCUMENT ME!
*
* @param evt DOCUMENT ME!
*/
private void btnApplyActionPerformed(final java.awt.event.ActionEvent evt) { //GEN-FIRST:event_btnApplyActionPerformed
apply(true);
} //GEN-LAST:event_btnApplyActionPerformed
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private boolean checkFlurstueckSelectionComplete() {
if (cboFlur.isEnabled() && cboFlurstueck.isEnabled()) {
final Object flur = cboFlur.getSelectedItem();
final Object flurstueck = cboFlurstueck.getSelectedItem();
if ((flur != null) && (flurstueck != null)) {
if (usedInEditor || (flurstueck instanceof MetaObject)) {
if ((flur.toString().length() > 0) && (flurstueck.toString().length() > 0)) {
return true;
}
}
}
}
return false;
}
/**
* DOCUMENT ME!
*
* @param zaehlerNenner DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private CidsBean landParcelBeanFromComboBoxes(final String zaehlerNenner) {
int result = JOptionPane.YES_OPTION;
try {
final Map<String, Object> newLandParcelProperties = new HashMap<String, Object>();
final String gemarkung = String.valueOf(cboGemarkung.getSelectedItem());
final String flur = String.valueOf(cboFlur.getSelectedItem());
if (flur.length() != 3) {
result = JOptionPane.showConfirmDialog(
StaticSwingTools.getParentFrame(this),
"Das neue Flurstück entspricht nicht der Namenskonvention: Flur sollte dreistellig sein (mit führenden Nullen, z.B. 007). Datensatz trotzdem abspeichern?",
"Warnung: Format",
JOptionPane.YES_NO_OPTION,
JOptionPane.WARNING_MESSAGE);
}
if (result == JOptionPane.YES_OPTION) {
final String[] zaehlerNennerParts = zaehlerNenner.split("/");
final String zaehler = zaehlerNennerParts[0];
String nenner = "0";
if (zaehlerNennerParts.length == 2) {
nenner = zaehlerNennerParts[1];
}
final MetaObject gemarkungMetaObject = VermessungFlurstueckFinder.getLWGemarkung(Integer.valueOf(
gemarkung));
if ((gemarkungMetaObject != null) && (gemarkungMetaObject.getBean() != null)) {
newLandParcelProperties.put(
VermessungFlurstueckFinder.FLURSTUECK_GEMARKUNG,
gemarkungMetaObject.getBean());
} else {
LOG.error("Gemarkung '" + gemarkung
+ "' could not be found in teh cids system. Can't add this flurstueck.");
return null;
}
newLandParcelProperties.put(VermessungFlurstueckFinder.FLURSTUECK_FLUR, flur);
newLandParcelProperties.put(VermessungFlurstueckFinder.FLURSTUECK_ZAEHLER, zaehler);
newLandParcelProperties.put(VermessungFlurstueckFinder.FLURSTUECK_NENNER, nenner);
// the following code tries to avoid the creation of multiple entries for the same landparcel. however,
// there *might* be a chance that a historic landparcel is created multiple times when more then one
// client creates the same parcel at the "same time".
final MetaObject[] searchResult = VermessungFlurstueckFinder.getLWLandparcel(
gemarkung,
flur,
zaehler,
nenner);
if ((searchResult != null) && (searchResult.length > 0)) {
return searchResult[0].getBean();
} else {
return CidsBeanSupport.createNewCidsBeanFromTableName(
VermessungFlurstueckFinder.FLURSTUECK_KICKER_TABLE_NAME,
newLandParcelProperties);
}
}
} catch (Exception ex) {
LOG.error("Could not find or create the landparcel corresponding to user's input.", ex);
}
return null;
}
/**
* DOCUMENT ME!
*
* @param visible DOCUMENT ME!
*
* @throws HeadlessException DOCUMENT ME!
*/
private void apply(final boolean visible) throws HeadlessException {
final Object flurstueck = cboFlurstueck.getSelectedItem();
final Object veraenderungsart = cmbVeraenderungsart.getSelectedItem();
CidsBean flurstueckBean = null;
if (flurstueck instanceof LightweightMetaObject) {
flurstueckBean = ((LightweightMetaObject)flurstueck).getBean();
} else if ((flurstueck instanceof String) && usedInEditor) {
final int result = JOptionPane.showConfirmDialog(
this,
"Das Flurstück befindet sich nicht im Datenbestand der aktuellen Flurstücke. Soll es als historisch angelegt werden?",
"Historisches Flurstück anlegen",
JOptionPane.YES_NO_OPTION);
if (result == JOptionPane.YES_OPTION) {
flurstueckBean = landParcelBeanFromComboBoxes(flurstueck.toString());
if (MetaObject.NEW == flurstueckBean.getMetaObject().getStatus()) {
try {
flurstueckBean = flurstueckBean.persist();
} catch (Exception ex) {
LOG.error("Could not persist new flurstueck.", ex);
flurstueckBean = null;
}
}
}
}
CidsBean veraenderungsartBean = null;
if (veraenderungsart instanceof LightweightMetaObject) {
veraenderungsartBean = ((LightweightMetaObject)veraenderungsart).getBean();
}
CidsBean flurstuecksvermessung = null;
// If the dialog is not used in the editor - thus is used in the window search - it's OK to have a
// veraenderungsartBean which is null
if ((flurstueckBean != null) && (!usedInEditor || (veraenderungsartBean != null))) {
final Map<String, Object> properties = new HashMap<String, Object>();
properties.put(VermessungFlurstueckFinder.VERMESSUNG_FLURSTUECKSVERMESSUNG_FLURSTUECK, flurstueckBean);
if (veraenderungsartBean != null) {
properties.put(
VermessungFlurstueckFinder.VERMESSUNG_FLURSTUECKSVERMESSUNG_VERMESSUNGSART,
veraenderungsartBean);
}
try {
flurstuecksvermessung = CidsBeanSupport.createNewCidsBeanFromTableName(
VermessungFlurstueckFinder.VERMESSUNG_FLURSTUECKSVERMESSUNG_TABLE_NAME,
properties);
} catch (Exception ex) {
LOG.error("Could not add new flurstueck or flurstuecksvermessung.", ex);
}
}
if ((flurstuecksvermessung != null) && (currentListToAdd != null)) {
final int position = Collections.binarySearch(
currentListToAdd,
flurstuecksvermessung,
AlphanumComparator.getInstance());
if (position < 0) {
currentListToAdd.add(-position - 1, flurstuecksvermessung);
} else {
JOptionPane.showMessageDialog(
this,
NbBundle.getMessage(
VermessungFlurstueckSelectionDialog.class,
"VermessungFlurstueckSelectionDialog.apply(boolean).itemAlreadyExists.message"),
NbBundle.getMessage(
VermessungFlurstueckSelectionDialog.class,
"VermessungFlurstueckSelectionDialog.apply(boolean).itemAlreadyExists.title"),
JOptionPane.WARNING_MESSAGE);
return;
}
}
okHook();
setVisible(visible);
}
//~ Inner Classes ----------------------------------------------------------
/**
* DOCUMENT ME!
*
* @version $Revision$, $Date$
*/
abstract class AbstractFlurstueckComboModelWorker extends SwingWorker<ComboBoxModel, Void> {
//~ Instance fields ----------------------------------------------------
private final JComboBox box;
private final boolean switchToBox;
//~ Constructors -------------------------------------------------------
/**
* Creates a new AbstractFlurstueckComboModelWorker object.
*
* @param box DOCUMENT ME!
* @param switchToBox DOCUMENT ME!
*/
public AbstractFlurstueckComboModelWorker(final JComboBox box, final boolean switchToBox) {
this.box = box;
this.switchToBox = switchToBox;
box.setVisible(true);
box.setEnabled(false);
box.setModel(WAIT_MODEL);
}
//~ Methods ------------------------------------------------------------
@Override
protected void done() {
try {
box.setModel(get());
if (switchToBox) {
box.requestFocus();
}
} catch (InterruptedException ex) {
if (LOG.isDebugEnabled()) {
LOG.debug("There was an interruption while loading the values.", ex);
}
} catch (ExecutionException ex) {
LOG.error("An error occurred while loading the values.", ex);
} finally {
box.setEnabled(true);
box.setSelectedIndex(0);
ObjectRendererUtils.selectAllTextInEditableCombobox(box);
checkOkEnableState();
}
}
}
}
| false | true | private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
pnlContainer = new javax.swing.JPanel();
cboGemarkung = new javax.swing.JComboBox();
pnlControls = new javax.swing.JPanel();
btnCancel = new javax.swing.JButton();
btnOK = new javax.swing.JButton();
btnApply = new javax.swing.JButton();
cboFlur = new javax.swing.JComboBox(NO_SELECTION_MODEL);
cboFlurstueck = new javax.swing.JComboBox(NO_SELECTION_MODEL);
lblGemarkung = new javax.swing.JLabel();
lblFlur = new javax.swing.JLabel();
lblFlurstueck = new javax.swing.JLabel();
lblGemarkungsname = new javax.swing.JLabel();
sepControls = new javax.swing.JSeparator();
lblVeraenderungsart = new javax.swing.JLabel();
cmbVeraenderungsart = new javax.swing.JComboBox();
setMinimumSize(new java.awt.Dimension(419, 154));
pnlContainer.setMaximumSize(new java.awt.Dimension(250, 180));
pnlContainer.setMinimumSize(new java.awt.Dimension(250, 180));
pnlContainer.setPreferredSize(new java.awt.Dimension(250, 180));
pnlContainer.setLayout(new java.awt.GridBagLayout());
cboGemarkung.setEditable(true);
cboGemarkung.setMaximumSize(new java.awt.Dimension(100, 18));
cboGemarkung.setMinimumSize(new java.awt.Dimension(100, 18));
cboGemarkung.setPreferredSize(new java.awt.Dimension(100, 18));
cboGemarkung.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
cboGemarkungActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 2.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(cboGemarkung, gridBagConstraints);
pnlControls.setLayout(new java.awt.GridBagLayout());
btnCancel.setText("Abbrechen");
btnCancel.setToolTipText("Eingaben nicht übernehmen und Dialog schliessen");
btnCancel.setFocusPainted(false);
btnCancel.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
btnCancelActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlControls.add(btnCancel, gridBagConstraints);
btnOK.setText("OK");
btnOK.setToolTipText("Eingaben übernehmen und Dialog schliessen");
btnOK.setFocusPainted(false);
btnOK.setMaximumSize(new java.awt.Dimension(85, 23));
btnOK.setMinimumSize(new java.awt.Dimension(85, 23));
btnOK.setPreferredSize(new java.awt.Dimension(85, 23));
btnOK.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
btnOKActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlControls.add(btnOK, gridBagConstraints);
btnApply.setText("Übernehmen");
btnApply.setToolTipText("Eingaben übernehmen und Dialog geöffnet lassen");
btnApply.setFocusPainted(false);
btnApply.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
btnApplyActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlControls.add(btnApply, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 6;
gridBagConstraints.gridwidth = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
gridBagConstraints.weightx = 2.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(pnlControls, gridBagConstraints);
cboFlur.setEditable(true);
cboFlur.setEnabled(false);
cboFlur.setMaximumSize(new java.awt.Dimension(100, 18));
cboFlur.setMinimumSize(new java.awt.Dimension(100, 18));
cboFlur.setPreferredSize(new java.awt.Dimension(100, 18));
cboFlur.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
cboFlurActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(5, 0, 5, 0);
pnlContainer.add(cboFlur, gridBagConstraints);
cboFlurstueck.setEditable(true);
cboFlurstueck.setEnabled(false);
cboFlurstueck.setMaximumSize(new java.awt.Dimension(100, 18));
cboFlurstueck.setMinimumSize(new java.awt.Dimension(100, 18));
cboFlurstueck.setPreferredSize(new java.awt.Dimension(100, 18));
cboFlurstueck.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
cboFlurstueckActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(cboFlurstueck, gridBagConstraints);
lblGemarkung.setText("Gemarkung");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 2.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblGemarkung, gridBagConstraints);
lblFlur.setText("Flur");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblFlur, gridBagConstraints);
lblFlurstueck.setText("Flurstück");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 1;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblFlurstueck, gridBagConstraints);
lblGemarkungsname.setText(" ");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblGemarkungsname, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 5;
gridBagConstraints.gridwidth = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6);
pnlContainer.add(sepControls, gridBagConstraints);
lblVeraenderungsart.setText("Veränderungsart");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 3;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblVeraenderungsart, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(cmbVeraenderungsart, gridBagConstraints);
getContentPane().add(pnlContainer, java.awt.BorderLayout.CENTER);
} // </editor-fold>//GEN-END:initComponents
| private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
pnlContainer = new javax.swing.JPanel();
cboGemarkung = new javax.swing.JComboBox();
pnlControls = new javax.swing.JPanel();
btnCancel = new javax.swing.JButton();
btnOK = new javax.swing.JButton();
btnApply = new javax.swing.JButton();
cboFlur = new javax.swing.JComboBox(NO_SELECTION_MODEL);
cboFlurstueck = new javax.swing.JComboBox(NO_SELECTION_MODEL);
lblGemarkung = new javax.swing.JLabel();
lblFlur = new javax.swing.JLabel();
lblFlurstueck = new javax.swing.JLabel();
lblGemarkungsname = new javax.swing.JLabel();
sepControls = new javax.swing.JSeparator();
lblVeraenderungsart = new javax.swing.JLabel();
cmbVeraenderungsart = new javax.swing.JComboBox();
setMinimumSize(new java.awt.Dimension(419, 154));
pnlContainer.setMaximumSize(new java.awt.Dimension(250, 180));
pnlContainer.setMinimumSize(new java.awt.Dimension(250, 180));
pnlContainer.setPreferredSize(new java.awt.Dimension(250, 180));
pnlContainer.setLayout(new java.awt.GridBagLayout());
cboGemarkung.setEditable(true);
cboGemarkung.setMaximumSize(new java.awt.Dimension(100, 18));
cboGemarkung.setMinimumSize(new java.awt.Dimension(100, 18));
cboGemarkung.setPreferredSize(new java.awt.Dimension(100, 18));
cboGemarkung.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
cboGemarkungActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 2.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(cboGemarkung, gridBagConstraints);
pnlControls.setLayout(new java.awt.GridBagLayout());
btnCancel.setText("Abbrechen");
btnCancel.setToolTipText("Eingaben nicht übernehmen und Dialog schließen");
btnCancel.setFocusPainted(false);
btnCancel.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
btnCancelActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlControls.add(btnCancel, gridBagConstraints);
btnOK.setText("OK");
btnOK.setToolTipText("Eingaben übernehmen und Dialog schließen");
btnOK.setFocusPainted(false);
btnOK.setMaximumSize(new java.awt.Dimension(85, 23));
btnOK.setMinimumSize(new java.awt.Dimension(85, 23));
btnOK.setPreferredSize(new java.awt.Dimension(85, 23));
btnOK.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
btnOKActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlControls.add(btnOK, gridBagConstraints);
btnApply.setText("Übernehmen");
btnApply.setToolTipText("Eingaben übernehmen und Dialog geöffnet lassen");
btnApply.setFocusPainted(false);
btnApply.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
btnApplyActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlControls.add(btnApply, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 6;
gridBagConstraints.gridwidth = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
gridBagConstraints.weightx = 2.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(pnlControls, gridBagConstraints);
cboFlur.setEditable(true);
cboFlur.setEnabled(false);
cboFlur.setMaximumSize(new java.awt.Dimension(100, 18));
cboFlur.setMinimumSize(new java.awt.Dimension(100, 18));
cboFlur.setPreferredSize(new java.awt.Dimension(100, 18));
cboFlur.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
cboFlurActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(5, 0, 5, 0);
pnlContainer.add(cboFlur, gridBagConstraints);
cboFlurstueck.setEditable(true);
cboFlurstueck.setEnabled(false);
cboFlurstueck.setMaximumSize(new java.awt.Dimension(100, 18));
cboFlurstueck.setMinimumSize(new java.awt.Dimension(100, 18));
cboFlurstueck.setPreferredSize(new java.awt.Dimension(100, 18));
cboFlurstueck.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final java.awt.event.ActionEvent evt) {
cboFlurstueckActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(cboFlurstueck, gridBagConstraints);
lblGemarkung.setText("Gemarkung");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 2.0;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblGemarkung, gridBagConstraints);
lblFlur.setText("Flur");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblFlur, gridBagConstraints);
lblFlurstueck.setText("Flurstück");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 1;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblFlurstueck, gridBagConstraints);
lblGemarkungsname.setText(" ");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblGemarkungsname, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 5;
gridBagConstraints.gridwidth = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6);
pnlContainer.add(sepControls, gridBagConstraints);
lblVeraenderungsart.setText("Veränderungsart");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 3;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(lblVeraenderungsart, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
pnlContainer.add(cmbVeraenderungsart, gridBagConstraints);
getContentPane().add(pnlContainer, java.awt.BorderLayout.CENTER);
} // </editor-fold>//GEN-END:initComponents
|
diff --git a/src/org/waynak/hackathon/EventsActivity.java b/src/org/waynak/hackathon/EventsActivity.java
index e07424a..b8563ed 100755
--- a/src/org/waynak/hackathon/EventsActivity.java
+++ b/src/org/waynak/hackathon/EventsActivity.java
@@ -1,115 +1,115 @@
package org.waynak.hackathon;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.widget.AdapterView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.AdapterView.OnItemClickListener;
import android.view.*;
import android.view.View.OnClickListener;
import android.widget.ImageView;
public class EventsActivity extends Activity
{
private ListView eventsListView;
private Event[] eventList;
int clickedEventPosition = 0;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.events);
ImageView iv = (ImageView) this.findViewById(R.id.descImg);
TextView tv = (TextView) this.findViewById(R.id.descTv);
/*
public static final String NYUAD = "NYU Abu Dhabi";
public static final String QASRALHOSN = "Qasr Al Hosn";
public static final String DALMAISLAND = "Dalma Island";
*/
String whichPlace = getIntent().getStringExtra("place");
if (whichPlace.equals(WaynakMapActivity.NYUAD)) {
iv.setImageResource(R.drawable.abudhabi);
tv.setText("Abu Dhabi");
eventList = new Event[7];
eventList[0] = new Event("Fish Souk",R.drawable.fish_souk,"");
eventList[1] = new Event("Old Abu Dhabi Souk (1962)",R.drawable.souk1,"");
eventList[2] = new Event("Old Abu Dhabi Souk",R.drawable.souk2,"");
eventList[3] = new Event("Old Abu Dhabi Souk",R.drawable.souk3,"");
eventList[4] = new Event("Old Abu Dhabi Souk",R.drawable.souk4,"");
eventList[5] = new Event("Old Abu Dhabi Souk (1962)",R.drawable.souk5,"");
eventList[6] = new Event("Old Abu Dhabi Souk",R.drawable.souk6,"");
} else if (whichPlace.equals(WaynakMapActivity.QASRALHOSN)) {
iv.setImageResource(R.drawable.qasralhosn);
tv.setText(WaynakMapActivity.QASRALHOSN);
eventList = new Event[12];
eventList[0] = new Event("Qasr Al Hosn in the past.",R.drawable.hosn1,"");
eventList[1] = new Event("Qasr Al Hosn Fort (1962).",R.drawable.hosn2,"");
eventList[2] = new Event("Qasr Al Hosn (1961).",R.drawable.hosn3,"");
eventList[3] = new Event("Qasr Al Hosn Fort (1957).",R.drawable.hosn4,"");
eventList[4] = new Event("Qasr al-Hosn",R.drawable.hosn5,"Sheikh Zayed bin Khalifa the first , in his place in the open air with the Senate and the citizens, which taken by the German photographer Berrtkart during his visit to the Arabian Gulf and Abu Dhabi in February (1904).");
eventList[5] = new Event("Qasr al-Hosn",R.drawable.hosn6,"");
eventList[6] = new Event("Qasr al-Hosn",R.drawable.hosn7,"");
eventList[7] = new Event("Qasr al-Hosn",R.drawable.hosn8,"");
eventList[8] = new Event("Qasr al-Hosn Fort",R.drawable.hosn9,"");
eventList[9] = new Event("Qasr al-Hosn Fort",R.drawable.hosn10,"");
eventList[10] = new Event("Qasr al-Hosn in the past",R.drawable.hosn11,"");
eventList[11] = new Event("Qasr al-Hosn in the past (1963).",R.drawable.hosn12,"");
} else if (whichPlace.equals(WaynakMapActivity.DALMAISLAND)) {
iv.setImageResource(R.drawable.dalmaisland);
tv.setText(WaynakMapActivity.DALMAISLAND);
eventList = new Event[9];
eventList[0] = new Event("Pearl Diving and Fishing",R.drawable.pearl1,"A group of Citizens preparing their nets for their fishing trip in Dalma Island.");
eventList[1] = new Event("Pearl Diving and Fishing",R.drawable.pearl2,"A set of nets used by fishermen to catch fish near the beach.");
eventList[2] = new Event("Pearl Diving and Fishing",R.drawable.pearl3,"A citizen preparing the nets for fishing.");
eventList[3] = new Event("Pearl Diving and Fishing",R.drawable.pearl4,"A fisherman drying fish.");
eventList[4] = new Event("Pearl Diving and Fishing",R.drawable.pearl5,"A citizen build dhows.");
eventList[5] = new Event("Pearl Diving and Fishing",R.drawable.pearl6,"A citizen build dhows.");
eventList[6] = new Event("Pearl Diving and Fishing",R.drawable.pearl7,"Pearling is the main occupation.");
eventList[7] = new Event("Pearl Diving and Fishing",R.drawable.pearl8,"A group of men receiving a signal from the diver by hand connecting rope between him and the diver.");
eventList[8] = new Event("Pearl Diving and Fishing",R.drawable.pearl9,"A group of divers preparing for a diving trip.");
} else {
}
eventsListView = (ListView) findViewById(R.id.eventsList);
eventsListView.setAdapter(new EventsAdapater(this, R.layout.events_row, eventList));
eventsListView.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
clickedEventPosition = position;
//Toast.makeText(getApplicationContext(), eventList[position].eventName, Toast.LENGTH_SHORT).show();
Intent i = new Intent(EventsActivity.this,ImageAvctivity.class);
i.putExtra("resource",eventList[clickedEventPosition].imageId);
i.putExtra("title", eventList[clickedEventPosition].eventName);
i.putExtra("description", eventList[clickedEventPosition].description);
startActivity(i);
- TextView mainText = (TextView) findViewById(R.id.mainText);
- mainText.setText(eventList[position].description);
+ //TextView mainText = (TextView) findViewById(R.id.mainText);
+ //mainText.setText(eventList[position].description);
}
});
}
}
| true | true | protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.events);
ImageView iv = (ImageView) this.findViewById(R.id.descImg);
TextView tv = (TextView) this.findViewById(R.id.descTv);
/*
public static final String NYUAD = "NYU Abu Dhabi";
public static final String QASRALHOSN = "Qasr Al Hosn";
public static final String DALMAISLAND = "Dalma Island";
*/
String whichPlace = getIntent().getStringExtra("place");
if (whichPlace.equals(WaynakMapActivity.NYUAD)) {
iv.setImageResource(R.drawable.abudhabi);
tv.setText("Abu Dhabi");
eventList = new Event[7];
eventList[0] = new Event("Fish Souk",R.drawable.fish_souk,"");
eventList[1] = new Event("Old Abu Dhabi Souk (1962)",R.drawable.souk1,"");
eventList[2] = new Event("Old Abu Dhabi Souk",R.drawable.souk2,"");
eventList[3] = new Event("Old Abu Dhabi Souk",R.drawable.souk3,"");
eventList[4] = new Event("Old Abu Dhabi Souk",R.drawable.souk4,"");
eventList[5] = new Event("Old Abu Dhabi Souk (1962)",R.drawable.souk5,"");
eventList[6] = new Event("Old Abu Dhabi Souk",R.drawable.souk6,"");
} else if (whichPlace.equals(WaynakMapActivity.QASRALHOSN)) {
iv.setImageResource(R.drawable.qasralhosn);
tv.setText(WaynakMapActivity.QASRALHOSN);
eventList = new Event[12];
eventList[0] = new Event("Qasr Al Hosn in the past.",R.drawable.hosn1,"");
eventList[1] = new Event("Qasr Al Hosn Fort (1962).",R.drawable.hosn2,"");
eventList[2] = new Event("Qasr Al Hosn (1961).",R.drawable.hosn3,"");
eventList[3] = new Event("Qasr Al Hosn Fort (1957).",R.drawable.hosn4,"");
eventList[4] = new Event("Qasr al-Hosn",R.drawable.hosn5,"Sheikh Zayed bin Khalifa the first , in his place in the open air with the Senate and the citizens, which taken by the German photographer Berrtkart during his visit to the Arabian Gulf and Abu Dhabi in February (1904).");
eventList[5] = new Event("Qasr al-Hosn",R.drawable.hosn6,"");
eventList[6] = new Event("Qasr al-Hosn",R.drawable.hosn7,"");
eventList[7] = new Event("Qasr al-Hosn",R.drawable.hosn8,"");
eventList[8] = new Event("Qasr al-Hosn Fort",R.drawable.hosn9,"");
eventList[9] = new Event("Qasr al-Hosn Fort",R.drawable.hosn10,"");
eventList[10] = new Event("Qasr al-Hosn in the past",R.drawable.hosn11,"");
eventList[11] = new Event("Qasr al-Hosn in the past (1963).",R.drawable.hosn12,"");
} else if (whichPlace.equals(WaynakMapActivity.DALMAISLAND)) {
iv.setImageResource(R.drawable.dalmaisland);
tv.setText(WaynakMapActivity.DALMAISLAND);
eventList = new Event[9];
eventList[0] = new Event("Pearl Diving and Fishing",R.drawable.pearl1,"A group of Citizens preparing their nets for their fishing trip in Dalma Island.");
eventList[1] = new Event("Pearl Diving and Fishing",R.drawable.pearl2,"A set of nets used by fishermen to catch fish near the beach.");
eventList[2] = new Event("Pearl Diving and Fishing",R.drawable.pearl3,"A citizen preparing the nets for fishing.");
eventList[3] = new Event("Pearl Diving and Fishing",R.drawable.pearl4,"A fisherman drying fish.");
eventList[4] = new Event("Pearl Diving and Fishing",R.drawable.pearl5,"A citizen build dhows.");
eventList[5] = new Event("Pearl Diving and Fishing",R.drawable.pearl6,"A citizen build dhows.");
eventList[6] = new Event("Pearl Diving and Fishing",R.drawable.pearl7,"Pearling is the main occupation.");
eventList[7] = new Event("Pearl Diving and Fishing",R.drawable.pearl8,"A group of men receiving a signal from the diver by hand connecting rope between him and the diver.");
eventList[8] = new Event("Pearl Diving and Fishing",R.drawable.pearl9,"A group of divers preparing for a diving trip.");
} else {
}
eventsListView = (ListView) findViewById(R.id.eventsList);
eventsListView.setAdapter(new EventsAdapater(this, R.layout.events_row, eventList));
eventsListView.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
clickedEventPosition = position;
//Toast.makeText(getApplicationContext(), eventList[position].eventName, Toast.LENGTH_SHORT).show();
Intent i = new Intent(EventsActivity.this,ImageAvctivity.class);
i.putExtra("resource",eventList[clickedEventPosition].imageId);
i.putExtra("title", eventList[clickedEventPosition].eventName);
i.putExtra("description", eventList[clickedEventPosition].description);
startActivity(i);
TextView mainText = (TextView) findViewById(R.id.mainText);
mainText.setText(eventList[position].description);
}
});
}
| protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.events);
ImageView iv = (ImageView) this.findViewById(R.id.descImg);
TextView tv = (TextView) this.findViewById(R.id.descTv);
/*
public static final String NYUAD = "NYU Abu Dhabi";
public static final String QASRALHOSN = "Qasr Al Hosn";
public static final String DALMAISLAND = "Dalma Island";
*/
String whichPlace = getIntent().getStringExtra("place");
if (whichPlace.equals(WaynakMapActivity.NYUAD)) {
iv.setImageResource(R.drawable.abudhabi);
tv.setText("Abu Dhabi");
eventList = new Event[7];
eventList[0] = new Event("Fish Souk",R.drawable.fish_souk,"");
eventList[1] = new Event("Old Abu Dhabi Souk (1962)",R.drawable.souk1,"");
eventList[2] = new Event("Old Abu Dhabi Souk",R.drawable.souk2,"");
eventList[3] = new Event("Old Abu Dhabi Souk",R.drawable.souk3,"");
eventList[4] = new Event("Old Abu Dhabi Souk",R.drawable.souk4,"");
eventList[5] = new Event("Old Abu Dhabi Souk (1962)",R.drawable.souk5,"");
eventList[6] = new Event("Old Abu Dhabi Souk",R.drawable.souk6,"");
} else if (whichPlace.equals(WaynakMapActivity.QASRALHOSN)) {
iv.setImageResource(R.drawable.qasralhosn);
tv.setText(WaynakMapActivity.QASRALHOSN);
eventList = new Event[12];
eventList[0] = new Event("Qasr Al Hosn in the past.",R.drawable.hosn1,"");
eventList[1] = new Event("Qasr Al Hosn Fort (1962).",R.drawable.hosn2,"");
eventList[2] = new Event("Qasr Al Hosn (1961).",R.drawable.hosn3,"");
eventList[3] = new Event("Qasr Al Hosn Fort (1957).",R.drawable.hosn4,"");
eventList[4] = new Event("Qasr al-Hosn",R.drawable.hosn5,"Sheikh Zayed bin Khalifa the first , in his place in the open air with the Senate and the citizens, which taken by the German photographer Berrtkart during his visit to the Arabian Gulf and Abu Dhabi in February (1904).");
eventList[5] = new Event("Qasr al-Hosn",R.drawable.hosn6,"");
eventList[6] = new Event("Qasr al-Hosn",R.drawable.hosn7,"");
eventList[7] = new Event("Qasr al-Hosn",R.drawable.hosn8,"");
eventList[8] = new Event("Qasr al-Hosn Fort",R.drawable.hosn9,"");
eventList[9] = new Event("Qasr al-Hosn Fort",R.drawable.hosn10,"");
eventList[10] = new Event("Qasr al-Hosn in the past",R.drawable.hosn11,"");
eventList[11] = new Event("Qasr al-Hosn in the past (1963).",R.drawable.hosn12,"");
} else if (whichPlace.equals(WaynakMapActivity.DALMAISLAND)) {
iv.setImageResource(R.drawable.dalmaisland);
tv.setText(WaynakMapActivity.DALMAISLAND);
eventList = new Event[9];
eventList[0] = new Event("Pearl Diving and Fishing",R.drawable.pearl1,"A group of Citizens preparing their nets for their fishing trip in Dalma Island.");
eventList[1] = new Event("Pearl Diving and Fishing",R.drawable.pearl2,"A set of nets used by fishermen to catch fish near the beach.");
eventList[2] = new Event("Pearl Diving and Fishing",R.drawable.pearl3,"A citizen preparing the nets for fishing.");
eventList[3] = new Event("Pearl Diving and Fishing",R.drawable.pearl4,"A fisherman drying fish.");
eventList[4] = new Event("Pearl Diving and Fishing",R.drawable.pearl5,"A citizen build dhows.");
eventList[5] = new Event("Pearl Diving and Fishing",R.drawable.pearl6,"A citizen build dhows.");
eventList[6] = new Event("Pearl Diving and Fishing",R.drawable.pearl7,"Pearling is the main occupation.");
eventList[7] = new Event("Pearl Diving and Fishing",R.drawable.pearl8,"A group of men receiving a signal from the diver by hand connecting rope between him and the diver.");
eventList[8] = new Event("Pearl Diving and Fishing",R.drawable.pearl9,"A group of divers preparing for a diving trip.");
} else {
}
eventsListView = (ListView) findViewById(R.id.eventsList);
eventsListView.setAdapter(new EventsAdapater(this, R.layout.events_row, eventList));
eventsListView.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
clickedEventPosition = position;
//Toast.makeText(getApplicationContext(), eventList[position].eventName, Toast.LENGTH_SHORT).show();
Intent i = new Intent(EventsActivity.this,ImageAvctivity.class);
i.putExtra("resource",eventList[clickedEventPosition].imageId);
i.putExtra("title", eventList[clickedEventPosition].eventName);
i.putExtra("description", eventList[clickedEventPosition].description);
startActivity(i);
//TextView mainText = (TextView) findViewById(R.id.mainText);
//mainText.setText(eventList[position].description);
}
});
}
|
diff --git a/cobertura/src/net/sourceforge/cobertura/instrument/CoberturaInstrumenter.java b/cobertura/src/net/sourceforge/cobertura/instrument/CoberturaInstrumenter.java
index bee0ae5..efe6067 100644
--- a/cobertura/src/net/sourceforge/cobertura/instrument/CoberturaInstrumenter.java
+++ b/cobertura/src/net/sourceforge/cobertura/instrument/CoberturaInstrumenter.java
@@ -1,315 +1,315 @@
/*
* Cobertura - http://cobertura.sourceforge.net/
*
* Cobertura 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.
*
* Cobertura 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 Cobertura; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*/
package net.sourceforge.cobertura.instrument;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.Vector;
import java.util.regex.Pattern;
import net.sourceforge.cobertura.coveragedata.ProjectData;
import net.sourceforge.cobertura.instrument.pass1.DetectDuplicatedCodeClassVisitor;
import net.sourceforge.cobertura.instrument.pass1.DetectIgnoredCodeClassVisitor;
import net.sourceforge.cobertura.instrument.pass2.BuildClassMapClassVisitor;
import net.sourceforge.cobertura.instrument.pass3.InjectCodeClassInstrumenter;
import net.sourceforge.cobertura.util.IOUtil;
import org.apache.log4j.Logger;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
/**
* Class that is responsible for the whole process of instrumentation of a single class.
*
* The class is instrumented in tree passes:
* <ol>
* <li>Read only: {@link DetectDuplicatedCodeClassVisitor} - we look for the same ASM code snippets
* rendered in different places of destination code</li>
* <li>Read only: {@link BuildClassMapClassVisitor} - finds all touch-points and other interesting
* information that are in the class and store it in {@link ClassMap}.
* <li>Real instrumentation: {@link InjectCodeClassInstrumenter}. Uses {#link ClassMap} to inject
* code into the class</li>
* </ol>
*
* @author [email protected]
*/
public class CoberturaInstrumenter {
private static final Logger logger = Logger.getLogger(CoberturaInstrumenter.class);
/**
* During the instrumentation process we are feeling {@link ProjectData}, to generate from
* it the *.ser file.
*
* We now (1.10+) don't need to generate the file (it is not necessery for reporting), but we still
* do it for backward compatibility (for example maven-cobertura-plugin expects it). We should avoid
* this some day.
*/
private ProjectData projectData;
/**
* The root directory for instrumented classes. If it is null, the instrumented classes are overwritten.
*/
private File destinationDirectory;
/**
* List of patterns to know that we don't want trace lines that are calls to some methods
*/
private Collection<Pattern> ignoreRegexes = new Vector<Pattern>();
/**
* Methods annotated by this annotations will be ignored during coverage measurement
*/
private Set<String> ignoreMethodAnnotations = new HashSet<String>();
/**
* If true: Getters, Setters and simple initialization will be ignored by coverage measurement
*/
private boolean ignoreTrivial;
/**
* If true: The process is interrupted when first error occured.
*/
private boolean failOnError;
/**
* Setting to true causes cobertura to use more strict threadsafe model that is significantly
* slower, but guarantees that number of hits counted for each line will be precise in multithread-environment.
*
* The option does not change measured coverage.
*
* In implementation it means that AtomicIntegerArray will be used instead of int[].
*/
private boolean threadsafeRigorous;
/**
* Analyzes and instruments class given by path.
*
* <p>Also the {@link #projectData} structure is filled with information about the found touch-points</p>
*
* @param file - path to class that should be instrumented
*
* @return instrumentation result structure or null in case of problems
*/
public InstrumentationResult instrumentClass(File file){
InputStream inputStream = null;
try{
logger.debug("Working on file:" + file.getAbsolutePath());
inputStream = new FileInputStream(file);
return instrumentClass(inputStream);
}catch (Throwable t){
logger.warn("Unable to instrument file " + file.getAbsolutePath(),t);
if (failOnError) {
throw new RuntimeException("Warning detected and failOnError is true", t);
} else {
return null;
}
}finally{
IOUtil.closeInputStream(inputStream);
}
}
/**
* Analyzes and instruments class given by inputStream
*
* <p>Also the {@link #projectData} structure is filled with information about the found touch-points</p>
*
* @param inputStream - source of class to instrument *
* @return instrumentation result structure or null in case of problems
*/
public InstrumentationResult instrumentClass(InputStream inputStream) throws IOException{
ClassReader cr0 = new ClassReader(inputStream);
ClassWriter cw0 = new ClassWriter(0);
DetectIgnoredCodeClassVisitor detectIgnoredCv =
new DetectIgnoredCodeClassVisitor(cw0, ignoreTrivial, ignoreMethodAnnotations);
DetectDuplicatedCodeClassVisitor cv0=new DetectDuplicatedCodeClassVisitor(detectIgnoredCv);
cr0.accept(cv0,0);
ClassReader cr = new ClassReader(cw0.toByteArray());
ClassWriter cw = new ClassWriter(0);
BuildClassMapClassVisitor cv = new BuildClassMapClassVisitor(cw, ignoreRegexes,cv0.getDuplicatesLinesCollector(),
detectIgnoredCv.getIgnoredMethodNamesAndSignatures());
cr.accept(cv, 0);
if(logger.isDebugEnabled()){
logger.debug("=============== Detected duplicated code =============");
Map<Integer, Map<Integer, Integer>> l=cv0.getDuplicatesLinesCollector();
for(Map.Entry<Integer, Map<Integer,Integer>> m:l.entrySet()){
if (m.getValue()!=null){
for(Map.Entry<Integer, Integer> pair:m.getValue().entrySet()){
logger.debug(cv.getClassMap().getClassName()+":"+m.getKey()+" "+pair.getKey()+"->"+pair.getValue());
}
}
}
logger.debug("=============== End of detected duplicated code ======");
}
//TODO(ptab): Don't like the idea, but we have to be compatible (hope to remove the line in future release)
logger.debug("Migrating classmap in projectData to store in *.ser file: " + cv.getClassMap().getClassName());
// if (cv.shouldBeInstrumented()) { //Not instrumented classes should be not included into the report
cv.getClassMap().applyOnProjectData(projectData, cv.shouldBeInstrumented());
// }
if (cv.shouldBeInstrumented()){
/*
* BuildClassMapClassInstrumenter and DetectDuplicatedCodeClassVisitor has not modificated bytecode,
* so we can use any bytecode representation of that class.
*/
ClassReader cr2= new ClassReader(cw0.toByteArray());
- ClassWriter cw2= new ClassWriter(/*ClassWriter.COMPUTE_MAXS |*/ ClassWriter.COMPUTE_FRAMES);
+ ClassWriter cw2= new ClassWriter(ClassWriter.COMPUTE_MAXS);
cv.getClassMap().assignCounterIds();
logger.debug("Assigned "+ cv.getClassMap().getMaxCounterId()+" counters for class:"+cv.getClassMap().getClassName());
InjectCodeClassInstrumenter cv2 = new InjectCodeClassInstrumenter(cw2, ignoreRegexes,
threadsafeRigorous, cv.getClassMap(), cv0.getDuplicatesLinesCollector(), detectIgnoredCv.getIgnoredMethodNamesAndSignatures());
cr2.accept(cv2, 0);
return new InstrumentationResult(cv.getClassMap().getClassName(), cw2.toByteArray());
}else{
logger.debug("Class shouldn't be instrumented: "+cv.getClassMap().getClassName());
return null;
}
}
/**
* Analyzes and instruments class given by file.
*
* <p>If the {@link #destinationDirectory} is null, then the file is overwritten,
* otherwise the class is stored into the {@link #destinationDirectory}</p>
*
* <p>Also the {@link #projectData} structure is filled with information about the found touch-points</p>
*
* @param file - source of class to instrument
*/
public void addInstrumentationToSingleClass(File file)
{
logger.debug("Instrumenting class " + file.getAbsolutePath());
InstrumentationResult instrumentationResult=instrumentClass(file);
if (instrumentationResult!=null){
OutputStream outputStream = null;
try{
// If destinationDirectory is null, then overwrite
// the original, uninstrumented file.
File outputFile=(destinationDirectory == null)?file
:new File(destinationDirectory, instrumentationResult.className.replace('.', File.separatorChar)+ ".class");
logger.debug("Writing instrumented class into:"+outputFile.getAbsolutePath());
File parentFile = outputFile.getParentFile();
if (parentFile != null){
parentFile.mkdirs();
}
outputStream = new FileOutputStream(outputFile);
outputStream.write(instrumentationResult.content);
}catch (Throwable t){
logger.warn("Unable to write instrumented file " + file.getAbsolutePath(),t);
return;
}finally{
outputStream = IOUtil.closeOutputStream(outputStream);
}
}
}
// ----------------- Getters and setters -------------------------------------
/**
* Gets the root directory for instrumented classes. If it is null, the instrumented classes are overwritten.
*/
public File getDestinationDirectory() {
return destinationDirectory;
}
/**
*Sets the root directory for instrumented classes. If it is null, the instrumented classes are overwritten.
*/
public void setDestinationDirectory(File destinationDirectory) {
this.destinationDirectory = destinationDirectory;
}
/**
* Gets list of patterns to know that we don't want trace lines that are calls to some methods
*/
public Collection<Pattern> getIgnoreRegexes() {
return ignoreRegexes;
}
/**
* Sets list of patterns to know that we don't want trace lines that are calls to some methods
*/
public void setIgnoreRegexes(Collection<Pattern> ignoreRegexes) {
this.ignoreRegexes = ignoreRegexes;
}
public void setIgnoreTrivial(boolean ignoreTrivial) {
this.ignoreTrivial = ignoreTrivial;
}
public void setIgnoreMethodAnnotations(Set<String> ignoreMethodAnnotations) {
this.ignoreMethodAnnotations = ignoreMethodAnnotations;
}
public void setThreadsafeRigorous(boolean threadsafeRigorous) {
this.threadsafeRigorous = threadsafeRigorous;
}
public void setFailOnError(boolean failOnError) {
this.failOnError = failOnError;
}
/**
* Sets {@link ProjectData} that will be filled with information about touch points inside instrumented classes
* @param projectData
*/
public void setProjectData(ProjectData projectData) {
this.projectData=projectData;
}
/**
* Result of instrumentation is a pair of two fields:
* <ul>
* <li> {@link #content} - bytecode of the instrumented class
* <li> {@link #className} - className of class being instrumented
* </ul>
*/
public static class InstrumentationResult{
private String className;
private byte[] content;
public InstrumentationResult(String className,byte[] content) {
this.className=className;
this.content=content;
}
public String getClassName() {
return className;
}
public byte[] getContent() {
return content;
}
}
}
| true | true | public InstrumentationResult instrumentClass(InputStream inputStream) throws IOException{
ClassReader cr0 = new ClassReader(inputStream);
ClassWriter cw0 = new ClassWriter(0);
DetectIgnoredCodeClassVisitor detectIgnoredCv =
new DetectIgnoredCodeClassVisitor(cw0, ignoreTrivial, ignoreMethodAnnotations);
DetectDuplicatedCodeClassVisitor cv0=new DetectDuplicatedCodeClassVisitor(detectIgnoredCv);
cr0.accept(cv0,0);
ClassReader cr = new ClassReader(cw0.toByteArray());
ClassWriter cw = new ClassWriter(0);
BuildClassMapClassVisitor cv = new BuildClassMapClassVisitor(cw, ignoreRegexes,cv0.getDuplicatesLinesCollector(),
detectIgnoredCv.getIgnoredMethodNamesAndSignatures());
cr.accept(cv, 0);
if(logger.isDebugEnabled()){
logger.debug("=============== Detected duplicated code =============");
Map<Integer, Map<Integer, Integer>> l=cv0.getDuplicatesLinesCollector();
for(Map.Entry<Integer, Map<Integer,Integer>> m:l.entrySet()){
if (m.getValue()!=null){
for(Map.Entry<Integer, Integer> pair:m.getValue().entrySet()){
logger.debug(cv.getClassMap().getClassName()+":"+m.getKey()+" "+pair.getKey()+"->"+pair.getValue());
}
}
}
logger.debug("=============== End of detected duplicated code ======");
}
//TODO(ptab): Don't like the idea, but we have to be compatible (hope to remove the line in future release)
logger.debug("Migrating classmap in projectData to store in *.ser file: " + cv.getClassMap().getClassName());
// if (cv.shouldBeInstrumented()) { //Not instrumented classes should be not included into the report
cv.getClassMap().applyOnProjectData(projectData, cv.shouldBeInstrumented());
// }
if (cv.shouldBeInstrumented()){
/*
* BuildClassMapClassInstrumenter and DetectDuplicatedCodeClassVisitor has not modificated bytecode,
* so we can use any bytecode representation of that class.
*/
ClassReader cr2= new ClassReader(cw0.toByteArray());
ClassWriter cw2= new ClassWriter(/*ClassWriter.COMPUTE_MAXS |*/ ClassWriter.COMPUTE_FRAMES);
cv.getClassMap().assignCounterIds();
logger.debug("Assigned "+ cv.getClassMap().getMaxCounterId()+" counters for class:"+cv.getClassMap().getClassName());
InjectCodeClassInstrumenter cv2 = new InjectCodeClassInstrumenter(cw2, ignoreRegexes,
threadsafeRigorous, cv.getClassMap(), cv0.getDuplicatesLinesCollector(), detectIgnoredCv.getIgnoredMethodNamesAndSignatures());
cr2.accept(cv2, 0);
return new InstrumentationResult(cv.getClassMap().getClassName(), cw2.toByteArray());
}else{
logger.debug("Class shouldn't be instrumented: "+cv.getClassMap().getClassName());
return null;
}
}
| public InstrumentationResult instrumentClass(InputStream inputStream) throws IOException{
ClassReader cr0 = new ClassReader(inputStream);
ClassWriter cw0 = new ClassWriter(0);
DetectIgnoredCodeClassVisitor detectIgnoredCv =
new DetectIgnoredCodeClassVisitor(cw0, ignoreTrivial, ignoreMethodAnnotations);
DetectDuplicatedCodeClassVisitor cv0=new DetectDuplicatedCodeClassVisitor(detectIgnoredCv);
cr0.accept(cv0,0);
ClassReader cr = new ClassReader(cw0.toByteArray());
ClassWriter cw = new ClassWriter(0);
BuildClassMapClassVisitor cv = new BuildClassMapClassVisitor(cw, ignoreRegexes,cv0.getDuplicatesLinesCollector(),
detectIgnoredCv.getIgnoredMethodNamesAndSignatures());
cr.accept(cv, 0);
if(logger.isDebugEnabled()){
logger.debug("=============== Detected duplicated code =============");
Map<Integer, Map<Integer, Integer>> l=cv0.getDuplicatesLinesCollector();
for(Map.Entry<Integer, Map<Integer,Integer>> m:l.entrySet()){
if (m.getValue()!=null){
for(Map.Entry<Integer, Integer> pair:m.getValue().entrySet()){
logger.debug(cv.getClassMap().getClassName()+":"+m.getKey()+" "+pair.getKey()+"->"+pair.getValue());
}
}
}
logger.debug("=============== End of detected duplicated code ======");
}
//TODO(ptab): Don't like the idea, but we have to be compatible (hope to remove the line in future release)
logger.debug("Migrating classmap in projectData to store in *.ser file: " + cv.getClassMap().getClassName());
// if (cv.shouldBeInstrumented()) { //Not instrumented classes should be not included into the report
cv.getClassMap().applyOnProjectData(projectData, cv.shouldBeInstrumented());
// }
if (cv.shouldBeInstrumented()){
/*
* BuildClassMapClassInstrumenter and DetectDuplicatedCodeClassVisitor has not modificated bytecode,
* so we can use any bytecode representation of that class.
*/
ClassReader cr2= new ClassReader(cw0.toByteArray());
ClassWriter cw2= new ClassWriter(ClassWriter.COMPUTE_MAXS);
cv.getClassMap().assignCounterIds();
logger.debug("Assigned "+ cv.getClassMap().getMaxCounterId()+" counters for class:"+cv.getClassMap().getClassName());
InjectCodeClassInstrumenter cv2 = new InjectCodeClassInstrumenter(cw2, ignoreRegexes,
threadsafeRigorous, cv.getClassMap(), cv0.getDuplicatesLinesCollector(), detectIgnoredCv.getIgnoredMethodNamesAndSignatures());
cr2.accept(cv2, 0);
return new InstrumentationResult(cv.getClassMap().getClassName(), cw2.toByteArray());
}else{
logger.debug("Class shouldn't be instrumented: "+cv.getClassMap().getClassName());
return null;
}
}
|
diff --git a/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java b/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java
index e5b830b25..0450aedeb 100644
--- a/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java
@@ -1,296 +1,306 @@
/* *******************************************************************
* Copyright (c) 2005 Contributors.
* 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://eclipse.org/legal/epl-v10.html
*
* Contributors:
* Adrian Colyer Initial implementation
* ******************************************************************/
package org.aspectj.weaver.reflect;
import java.util.HashSet;
import java.util.Set;
import junit.framework.TestCase;
import org.aspectj.bridge.IMessageHandler;
import org.aspectj.weaver.ReferenceType;
import org.aspectj.weaver.ResolvedMember;
import org.aspectj.weaver.ResolvedType;
import org.aspectj.weaver.UnresolvedType;
import org.aspectj.weaver.bcel.BcelWorld;
public class ReflectionBasedReferenceTypeDelegateTest extends TestCase {
protected ReflectionWorld world;
private ResolvedType objectType;
private ResolvedType classType;
public void testIsAspect() {
assertFalse(objectType.isAspect());
}
public void testIsAnnotationStyleAspect() {
assertFalse(objectType.isAnnotationStyleAspect());
}
public void testIsInterface() {
assertFalse(objectType.isInterface());
assertTrue(world.resolve("java.io.Serializable").isInterface());
}
public void testIsEnum() {
assertFalse(objectType.isEnum());
}
public void testIsAnnotation() {
assertFalse(objectType.isAnnotation());
}
public void testIsAnnotationWithRuntimeRetention() {
assertFalse(objectType.isAnnotationWithRuntimeRetention());
}
public void testIsClass() {
assertTrue(objectType.isClass());
assertFalse(world.resolve("java.io.Serializable").isClass());
}
public void testIsGeneric() {
assertFalse(objectType.isGenericType());
}
public void testIsExposedToWeaver() {
assertFalse(objectType.isExposedToWeaver());
}
public void testHasAnnotation() {
assertFalse(objectType.hasAnnotation(UnresolvedType.forName("Foo")));
}
public void testGetAnnotations() {
assertEquals("no entries",0,objectType.getAnnotations().length);
}
public void testGetAnnotationTypes() {
assertEquals("no entries",0,objectType.getAnnotationTypes().length);
}
public void testGetTypeVariables() {
assertEquals("no entries",0,objectType.getTypeVariables().length);
}
public void testGetPerClause() {
assertNull(objectType.getPerClause());
}
public void testGetModifiers() {
assertEquals(Object.class.getModifiers(),objectType.getModifiers());
}
public void testGetSuperclass() {
assertTrue("Superclass of object should be null, but it is: "+objectType.getSuperclass(),objectType.getSuperclass()==null);
assertEquals(objectType,world.resolve("java.lang.Class").getSuperclass());
ResolvedType d = world.resolve("reflect.tests.D");
assertEquals(world.resolve("reflect.tests.C"),d.getSuperclass());
}
protected int findMethod(String name, ResolvedMember[] methods) {
for (int i=0; i<methods.length; i++) {
if (name.equals(methods[i].getName())) {
return i;
}
}
return -1;
}
protected int findMethod(String name, int numArgs, ResolvedMember[] methods) {
for (int i=0; i<methods.length; i++) {
if (name.equals(methods[i].getName()) && (methods[i].getParameterTypes().length == numArgs)) {
return i;
}
}
return -1;
}
public void testGetDeclaredMethods() {
ResolvedMember[] methods = objectType.getDeclaredMethods();
assertEquals(Object.class.getDeclaredMethods().length + Object.class.getDeclaredConstructors().length, methods.length);
ResolvedType c = world.resolve("reflect.tests.C");
methods = c.getDeclaredMethods();
assertEquals(3,methods.length);
int idx = findMethod("foo", methods);
assertTrue(idx > -1);
assertEquals(world.resolve("java.lang.String"),methods[idx].getReturnType());
assertEquals(1, methods[idx].getParameterTypes().length);
assertEquals(objectType,methods[idx].getParameterTypes()[0]);
assertEquals(1,methods[idx].getExceptions().length);
assertEquals(world.resolve("java.lang.Exception"),methods[idx].getExceptions()[0]);
int baridx = findMethod("bar", methods);
int initidx = findMethod("<init>", methods);
assertTrue(baridx > -1);
assertTrue(initidx > -1);
assertTrue(baridx != initidx && baridx != idx && idx <= 2 && initidx <= 2 && baridx <= 2);
ResolvedType d = world.resolve("reflect.tests.D");
methods = d.getDeclaredMethods();
assertEquals(2,methods.length);
classType = world.resolve("java.lang.Class");
methods = classType.getDeclaredMethods();
assertEquals(Class.class.getDeclaredMethods().length + Class.class.getDeclaredConstructors().length, methods.length);
}
public void testGetDeclaredFields() {
ResolvedMember[] fields = objectType.getDeclaredFields();
assertEquals(0,fields.length);
ResolvedType c = world.resolve("reflect.tests.C");
fields = c.getDeclaredFields();
assertEquals(2,fields.length);
assertEquals("f",fields[0].getName());
assertEquals("s",fields[1].getName());
assertEquals(ResolvedType.INT,fields[0].getReturnType());
assertEquals(world.resolve("java.lang.String"),fields[1].getReturnType());
}
public void testGetDeclaredInterfaces() {
ResolvedType[] interfaces = objectType.getDeclaredInterfaces();
assertEquals(0,interfaces.length);
ResolvedType d = world.resolve("reflect.tests.D");
interfaces = d.getDeclaredInterfaces();
assertEquals(1,interfaces.length);
assertEquals(world.resolve("java.io.Serializable"),interfaces[0]);
}
public void testGetDeclaredPointcuts() {
ResolvedMember[] pointcuts = objectType.getDeclaredPointcuts();
assertEquals(0,pointcuts.length);
}
public void testSerializableSuperclass() {
ResolvedType serializableType = world.resolve("java.io.Serializable");
ResolvedType superType = serializableType.getSuperclass();
assertTrue("Superclass of serializable should be Object but was "+superType,superType.equals(UnresolvedType.OBJECT));
BcelWorld bcelworld = new BcelWorld();
bcelworld.setBehaveInJava5Way(true);
ResolvedType bcelSupertype = bcelworld.resolve(UnresolvedType.SERIALIZABLE).getSuperclass();
assertTrue("Should be null but is "+bcelSupertype,bcelSupertype.equals(UnresolvedType.OBJECT));
}
public void testSubinterfaceSuperclass() {
ResolvedType ifaceType = world.resolve("java.security.Key");
ResolvedType superType = ifaceType.getSuperclass();
assertTrue("Superclass should be Object but was "+superType,superType.equals(UnresolvedType.OBJECT));
BcelWorld bcelworld = new BcelWorld();
bcelworld.setBehaveInJava5Way(true);
ResolvedType bcelSupertype = bcelworld.resolve("java.security.Key").getSuperclass();
assertTrue("Should be null but is "+bcelSupertype,bcelSupertype.equals(UnresolvedType.OBJECT));
}
public void testVoidSuperclass() {
ResolvedType voidType = world.resolve(Void.TYPE);
ResolvedType superType = voidType.getSuperclass();
assertNull(superType);
BcelWorld bcelworld = new BcelWorld();
bcelworld.setBehaveInJava5Way(true);
ResolvedType bcelSupertype = bcelworld.resolve("void").getSuperclass();
assertTrue("Should be null but is "+bcelSupertype,bcelSupertype==null);
}
public void testIntSuperclass() {
ResolvedType voidType = world.resolve(Integer.TYPE);
ResolvedType superType = voidType.getSuperclass();
assertNull(superType);
BcelWorld bcelworld = new BcelWorld();
bcelworld.setBehaveInJava5Way(true);
ResolvedType bcelSupertype = bcelworld.resolve("int").getSuperclass();
assertTrue("Should be null but is "+bcelSupertype,bcelSupertype==null);
}
public void testGenericInterfaceSuperclass_BcelWorldResolution() {
BcelWorld bcelworld = new BcelWorld();
bcelworld.setBehaveInJava5Way(true);
UnresolvedType javaUtilMap = UnresolvedType.forName("java.util.Map");
ReferenceType rawType = (ReferenceType) bcelworld.resolve(javaUtilMap);
assertTrue("Should be the raw type ?!? "+rawType.getTypekind(),rawType.isRawType());
ReferenceType genericType = (ReferenceType)rawType.getGenericType();
assertTrue("Should be the generic type ?!? "+genericType.getTypekind(),genericType.isGenericType());
ResolvedType rt = rawType.getSuperclass();
assertTrue("Superclass for Map raw type should be Object but was "+rt,rt.equals(UnresolvedType.OBJECT));
ResolvedType rt2 = genericType.getSuperclass();
assertTrue("Superclass for Map generic type should be Object but was "+rt2,rt2.equals(UnresolvedType.OBJECT));
}
// FIXME asc maybe. The reflection list of methods returned doesn't include <clinit> (the static initializer) ... is that really a problem.
public void testCompareSubclassDelegates() {
boolean barfIfClinitMissing = false;
world.setBehaveInJava5Way(true);
BcelWorld bcelWorld = new BcelWorld(getClass().getClassLoader(),IMessageHandler.THROW,null);
bcelWorld.setBehaveInJava5Way(true);
UnresolvedType javaUtilHashMap = UnresolvedType.forName("java.util.HashMap");
ReferenceType rawType =(ReferenceType)bcelWorld.resolve(javaUtilHashMap );
ReferenceType rawReflectType =(ReferenceType)world.resolve(javaUtilHashMap );
ResolvedMember[] rms1 = rawType.getDelegate().getDeclaredMethods();
ResolvedMember[] rms2 = rawReflectType.getDelegate().getDeclaredMethods();
StringBuffer errors = new StringBuffer();
Set one = new HashSet();
for (int i = 0; i < rms1.length; i++) {
one.add(rms1[i].toString());
}
Set two = new HashSet();
for (int i = 0; i < rms2.length; i++) {
two.add(rms2[i].toString());
}
for (int i = 0;i<rms2.length;i++) {
if (!one.contains(rms2[i].toString())) {
errors.append("Couldn't find "+rms2[i].toString()+" in the bcel set\n");
}
}
for (int i = 0;i<rms1.length;i++) {
if (!two.contains(rms1[i].toString())) {
if (!barfIfClinitMissing && rms1[i].getName().equals("<clinit>")) continue;
errors.append("Couldn't find "+rms1[i].toString()+" in the reflection set\n");
}
}
assertTrue("Errors:"+errors.toString(),errors.length()==0);
+ // the good old ibm vm seems to offer clinit through its reflection support (see pr145322)
+ if (rms1.length==rms2.length) return;
if (barfIfClinitMissing) {
// the numbers must be exact
assertEquals(rms1.length,rms2.length);
} else {
// the numbers can be out by one in favour of bcel
+ if (rms1.length!=(rms2.length+1)) {
+ for (int i = 0; i < rms1.length; i++) {
+ System.err.println("bcel"+i+" is "+rms1[i]);
+ }
+ for (int i = 0; i < rms2.length; i++) {
+ System.err.println("refl"+i+" is "+rms2[i]);
+ }
+ }
assertTrue("Should be one extra (clinit) in BCEL case, but bcel="+rms1.length+" reflect="+rms2.length,rms1.length==rms2.length+1);
}
}
// todo: array of int
protected void setUp() throws Exception {
world = new ReflectionWorld(getClass().getClassLoader());
objectType = world.resolve("java.lang.Object");
}
}
| false | true | public void testCompareSubclassDelegates() {
boolean barfIfClinitMissing = false;
world.setBehaveInJava5Way(true);
BcelWorld bcelWorld = new BcelWorld(getClass().getClassLoader(),IMessageHandler.THROW,null);
bcelWorld.setBehaveInJava5Way(true);
UnresolvedType javaUtilHashMap = UnresolvedType.forName("java.util.HashMap");
ReferenceType rawType =(ReferenceType)bcelWorld.resolve(javaUtilHashMap );
ReferenceType rawReflectType =(ReferenceType)world.resolve(javaUtilHashMap );
ResolvedMember[] rms1 = rawType.getDelegate().getDeclaredMethods();
ResolvedMember[] rms2 = rawReflectType.getDelegate().getDeclaredMethods();
StringBuffer errors = new StringBuffer();
Set one = new HashSet();
for (int i = 0; i < rms1.length; i++) {
one.add(rms1[i].toString());
}
Set two = new HashSet();
for (int i = 0; i < rms2.length; i++) {
two.add(rms2[i].toString());
}
for (int i = 0;i<rms2.length;i++) {
if (!one.contains(rms2[i].toString())) {
errors.append("Couldn't find "+rms2[i].toString()+" in the bcel set\n");
}
}
for (int i = 0;i<rms1.length;i++) {
if (!two.contains(rms1[i].toString())) {
if (!barfIfClinitMissing && rms1[i].getName().equals("<clinit>")) continue;
errors.append("Couldn't find "+rms1[i].toString()+" in the reflection set\n");
}
}
assertTrue("Errors:"+errors.toString(),errors.length()==0);
if (barfIfClinitMissing) {
// the numbers must be exact
assertEquals(rms1.length,rms2.length);
} else {
// the numbers can be out by one in favour of bcel
assertTrue("Should be one extra (clinit) in BCEL case, but bcel="+rms1.length+" reflect="+rms2.length,rms1.length==rms2.length+1);
}
}
| public void testCompareSubclassDelegates() {
boolean barfIfClinitMissing = false;
world.setBehaveInJava5Way(true);
BcelWorld bcelWorld = new BcelWorld(getClass().getClassLoader(),IMessageHandler.THROW,null);
bcelWorld.setBehaveInJava5Way(true);
UnresolvedType javaUtilHashMap = UnresolvedType.forName("java.util.HashMap");
ReferenceType rawType =(ReferenceType)bcelWorld.resolve(javaUtilHashMap );
ReferenceType rawReflectType =(ReferenceType)world.resolve(javaUtilHashMap );
ResolvedMember[] rms1 = rawType.getDelegate().getDeclaredMethods();
ResolvedMember[] rms2 = rawReflectType.getDelegate().getDeclaredMethods();
StringBuffer errors = new StringBuffer();
Set one = new HashSet();
for (int i = 0; i < rms1.length; i++) {
one.add(rms1[i].toString());
}
Set two = new HashSet();
for (int i = 0; i < rms2.length; i++) {
two.add(rms2[i].toString());
}
for (int i = 0;i<rms2.length;i++) {
if (!one.contains(rms2[i].toString())) {
errors.append("Couldn't find "+rms2[i].toString()+" in the bcel set\n");
}
}
for (int i = 0;i<rms1.length;i++) {
if (!two.contains(rms1[i].toString())) {
if (!barfIfClinitMissing && rms1[i].getName().equals("<clinit>")) continue;
errors.append("Couldn't find "+rms1[i].toString()+" in the reflection set\n");
}
}
assertTrue("Errors:"+errors.toString(),errors.length()==0);
// the good old ibm vm seems to offer clinit through its reflection support (see pr145322)
if (rms1.length==rms2.length) return;
if (barfIfClinitMissing) {
// the numbers must be exact
assertEquals(rms1.length,rms2.length);
} else {
// the numbers can be out by one in favour of bcel
if (rms1.length!=(rms2.length+1)) {
for (int i = 0; i < rms1.length; i++) {
System.err.println("bcel"+i+" is "+rms1[i]);
}
for (int i = 0; i < rms2.length; i++) {
System.err.println("refl"+i+" is "+rms2[i]);
}
}
assertTrue("Should be one extra (clinit) in BCEL case, but bcel="+rms1.length+" reflect="+rms2.length,rms1.length==rms2.length+1);
}
}
|
diff --git a/src/com/UBC417/A1/Tests/TestSeatReservation.java b/src/com/UBC417/A1/Tests/TestSeatReservation.java
index d9b32d7..6e763de 100644
--- a/src/com/UBC417/A1/Tests/TestSeatReservation.java
+++ b/src/com/UBC417/A1/Tests/TestSeatReservation.java
@@ -1,52 +1,53 @@
package com.UBC417.A1.Tests;
import java.io.IOException;
import java.util.Random;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.UBC417.A1.Data.Seat;
import com.google.appengine.api.datastore.EntityNotFoundException;
import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory;
@SuppressWarnings("serial")
public class TestSeatReservation extends HttpServlet {
static Random r = new Random();
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws IOException, ServletException {
// Get parameters
- //Key FlightKey = KeyFactory.stringToKey(req.getParameter("FlightName"));
- String FlightID = req.getParameter("FlightName");
+ Key FlightKey = KeyFactory.stringToKey(req.getParameter("FlightName"));
+ String FlightID = FlightKey.getName();
+ //String FlightID = req.getParameter("FlightName");
String FirstName = req.getParameter("FirstName");
String LastName = req.getParameter("LastName");
// use random seat
int i = r.nextInt(200);
// get seat leter
char c = 'A';
c += i % 4;
// get seat row
int j = i / 4 + 1;
// create seatID
String SeatID = String.format("%d%c", j, c);
try {
- if (!Seat.ReserveSeat(SeatID, FirstName, LastName)) {
+ if (!Seat.ReserveSeat(FlightID+SeatID, FirstName, LastName)) {
// Didn't reserve seat, o well, don't show errors for test
}
} catch (EntityNotFoundException e) {
// Assume this wont happen, as long as tester provides proper data.
}
}
}
| false | true | public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws IOException, ServletException {
// Get parameters
//Key FlightKey = KeyFactory.stringToKey(req.getParameter("FlightName"));
String FlightID = req.getParameter("FlightName");
String FirstName = req.getParameter("FirstName");
String LastName = req.getParameter("LastName");
// use random seat
int i = r.nextInt(200);
// get seat leter
char c = 'A';
c += i % 4;
// get seat row
int j = i / 4 + 1;
// create seatID
String SeatID = String.format("%d%c", j, c);
try {
if (!Seat.ReserveSeat(SeatID, FirstName, LastName)) {
// Didn't reserve seat, o well, don't show errors for test
}
} catch (EntityNotFoundException e) {
// Assume this wont happen, as long as tester provides proper data.
}
}
| public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws IOException, ServletException {
// Get parameters
Key FlightKey = KeyFactory.stringToKey(req.getParameter("FlightName"));
String FlightID = FlightKey.getName();
//String FlightID = req.getParameter("FlightName");
String FirstName = req.getParameter("FirstName");
String LastName = req.getParameter("LastName");
// use random seat
int i = r.nextInt(200);
// get seat leter
char c = 'A';
c += i % 4;
// get seat row
int j = i / 4 + 1;
// create seatID
String SeatID = String.format("%d%c", j, c);
try {
if (!Seat.ReserveSeat(FlightID+SeatID, FirstName, LastName)) {
// Didn't reserve seat, o well, don't show errors for test
}
} catch (EntityNotFoundException e) {
// Assume this wont happen, as long as tester provides proper data.
}
}
|
diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
index f8c1cc307..cb98fe329 100644
--- a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
+++ b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
@@ -1,108 +1,108 @@
package tests.net.sf.jabref.export.layout;
import java.io.IOException;
import java.io.StringReader;
import java.util.Collection;
import junit.framework.TestCase;
import net.sf.jabref.BibtexEntry;
import net.sf.jabref.Globals;
import net.sf.jabref.JabRefPreferences;
import net.sf.jabref.export.layout.Layout;
import net.sf.jabref.export.layout.LayoutHelper;
import net.sf.jabref.imports.BibtexParser;
import net.sf.jabref.imports.ParserResult;
public class LayoutTest extends TestCase {
/**
* Initialize Preferences.
*/
protected void setUp() throws Exception {
super.setUp();
if (Globals.prefs == null) {
Globals.prefs = JabRefPreferences.getInstance();
}
}
/**
* Return Test data.
*/
public String t1BibtexString() {
return "@article{canh05,\n"
+ " author = {This\nis\na\ntext},\n"
+ " title = {Effective work practices for floss development: A model and propositions},\n"
+ " booktitle = {Hawaii International Conference On System Sciences (HICSS)},\n"
+ " year = {2005},\n" + " owner = {oezbek},\n" + " timestamp = {2006.05.29},\n"
+ " url = {http://james.howison.name/publications.html},\n" + " abstract = {\\~{n}\n"
+ "\\~n\n" + "\\'i\n" + "\\i\n" + "\\i}\n" + "}\n";
}
public BibtexEntry t1BibtexEntry() throws IOException {
return bibtexString2BibtexEntry(t1BibtexString());
}
public static BibtexEntry bibtexString2BibtexEntry(String s) throws IOException {
ParserResult result = BibtexParser.parse(new StringReader(s));
Collection<BibtexEntry> c = result.getDatabase().getEntries();
assertEquals(1, c.size());
return c.iterator().next();
}
public String layout(String layoutFile, String entry) throws Exception {
BibtexEntry be = bibtexString2BibtexEntry(entry);
StringReader sr = new StringReader(layoutFile.replaceAll("__NEWLINE__", "\n"));
Layout layout = new LayoutHelper(sr).getLayoutFromText(Globals.FORMATTER_PACKAGE);
StringBuffer sb = new StringBuffer();
sb.append(layout.doLayout(be, null));
return sb.toString();
}
public void testLayoutBibtextype() throws Exception {
assertEquals("Other", layout("\\bibtextype", "@other{bla, author={This\nis\na\ntext}}"));
assertEquals("Article", layout("\\bibtextype", "@article{bla, author={This\nis\na\ntext}}"));
assertEquals("Misc", layout("\\bibtextype", "@misc{bla, author={This\nis\na\ntext}}"));
}
public void testHTMLChar() throws Exception {
String layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
"@other{bla, author={This\nis\na\ntext}}");
assertEquals("This is a text ", layoutText);
layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author}",
"@other{bla, author={This\nis\na\ntext}}");
assertEquals("This is a text", layoutText);
layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
"@other{bla, author={This\nis\na\n\ntext}}");
- assertEquals("This is a<p>text ", layoutText);
+ assertEquals("This is a<br>text ", layoutText);
}
public void testPluginLoading() throws Exception {
String layoutText = layout("\\begin{author}\\format[NameFormatter]{\\author}\\end{author}",
"@other{bla, author={Joe Doe and Jane, Moon}}");
assertEquals("Joe Doe, Moon Jane", layoutText);
}
/**
* [ 1495181 ] Dotless i and tilde not handled in preview
*
* @throws Exception
*/
public void testLayout() throws Exception {
String layoutText = layout(
"<font face=\"arial\">\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract}\\end{abstract}</font>",
t1BibtexString());
assertEquals(
"<font face=\"arial\"><BR><BR><b>Abstract: </b> ñ ñ í ı ı</font>",
layoutText);
}
}
| true | true | public void testHTMLChar() throws Exception {
String layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
"@other{bla, author={This\nis\na\ntext}}");
assertEquals("This is a text ", layoutText);
layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author}",
"@other{bla, author={This\nis\na\ntext}}");
assertEquals("This is a text", layoutText);
layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
"@other{bla, author={This\nis\na\n\ntext}}");
assertEquals("This is a<p>text ", layoutText);
}
| public void testHTMLChar() throws Exception {
String layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
"@other{bla, author={This\nis\na\ntext}}");
assertEquals("This is a text ", layoutText);
layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author}",
"@other{bla, author={This\nis\na\ntext}}");
assertEquals("This is a text", layoutText);
layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
"@other{bla, author={This\nis\na\n\ntext}}");
assertEquals("This is a<br>text ", layoutText);
}
|
diff --git a/src/main/java/com/geNAZt/RegionShop/Data/Tasks/DisplayItemOverChest.java b/src/main/java/com/geNAZt/RegionShop/Data/Tasks/DisplayItemOverChest.java
index 4747500..f9abafb 100644
--- a/src/main/java/com/geNAZt/RegionShop/Data/Tasks/DisplayItemOverChest.java
+++ b/src/main/java/com/geNAZt/RegionShop/Data/Tasks/DisplayItemOverChest.java
@@ -1,82 +1,82 @@
package com.geNAZt.RegionShop.Data.Tasks;
import com.geNAZt.RegionShop.Config.ConfigManager;
import com.geNAZt.RegionShop.Database.Database;
import com.geNAZt.RegionShop.Database.Model.Item;
import com.geNAZt.RegionShop.Database.Table.Chest;
import com.geNAZt.RegionShop.Database.Table.Items;
import com.geNAZt.RegionShop.RegionShopPlugin;
import com.geNAZt.RegionShop.Util.ItemName;
import com.geNAZt.RegionShop.Util.NMS;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Sign;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector;
import java.util.Iterator;
import java.util.List;
/**
* Created for ME :D
* User: geNAZt ([email protected])
* Date: 04.10.13
*/
public class DisplayItemOverChest extends BukkitRunnable {
@Override
public void run() {
List<Chest> chestList = Database.getServer().find(Chest.class).findList();
for(final Chest chest : chestList) {
boolean found = false;
for (Entity ent : Bukkit.getWorld(chest.getWorld()).getEntities()) {
if(ent.getLocation().getBlockY() == chest.getChestY()+1 && ent.getLocation().getBlockX() == chest.getChestX() && ent.getLocation().getBlockZ() == chest.getChestZ()) {
found = true;
}
}
if(!found) {
Iterator itemsIterator = chest.getItemStorage().getItems().iterator();
if(!itemsIterator.hasNext()) {
RegionShopPlugin.getInstance().getLogger().warning("Found Chest without item. Maybe wrong deletion: " + chest.getId());
continue;
}
final Items items = chest.getItemStorage().getItems().iterator().next();
final ItemStack itemStack = Item.fromDBItem(items);
itemStack.setAmount(1);
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(RegionShopPlugin.getInstance(), new BukkitRunnable() {
@Override
public void run() {
org.bukkit.entity.Item droppedItem = Bukkit.getWorld(chest.getWorld()).dropItem(new Location(Bukkit.getWorld(chest.getWorld()), (double) chest.getChestX() + 0.5, (double)chest.getChestY() + 1.2, (double)chest.getChestZ() + 0.5), itemStack);
droppedItem.setVelocity(new Vector(0, 0.1, 0));
NMS.safeGuard(droppedItem);
- Sign sign = (Sign) Bukkit.getWorld(chest.getWorld()).getBlockAt(chest.getSignX(), chest.getSignY(), chest.getSignZ());
+ Sign sign = (Sign) Bukkit.getWorld(chest.getWorld()).getBlockAt(chest.getSignX(), chest.getSignY(), chest.getSignZ()).getState();
//Get the nice name
String itemName = ItemName.getDataName(itemStack) + itemStack.getType().toString();
if (itemStack.getItemMeta().hasDisplayName()) {
itemName += "(" + itemStack.getItemMeta().getDisplayName() + ")";
}
for(Integer line = 0; line < 4; line++) {
sign.setLine(line, ConfigManager.language.Sign_Shop_SignText.get(line).
replace("%player", chest.getOwners().iterator().next().getName()).
replace("%itemname", ItemName.nicer(itemName)).
replace("%amount", items.getUnitAmount().toString()).
replace("%sell", items.getSell().toString()).
replace("%buy", items.getBuy().toString()));
}
sign.update();
}
});
}
}
}
}
| true | true | public void run() {
List<Chest> chestList = Database.getServer().find(Chest.class).findList();
for(final Chest chest : chestList) {
boolean found = false;
for (Entity ent : Bukkit.getWorld(chest.getWorld()).getEntities()) {
if(ent.getLocation().getBlockY() == chest.getChestY()+1 && ent.getLocation().getBlockX() == chest.getChestX() && ent.getLocation().getBlockZ() == chest.getChestZ()) {
found = true;
}
}
if(!found) {
Iterator itemsIterator = chest.getItemStorage().getItems().iterator();
if(!itemsIterator.hasNext()) {
RegionShopPlugin.getInstance().getLogger().warning("Found Chest without item. Maybe wrong deletion: " + chest.getId());
continue;
}
final Items items = chest.getItemStorage().getItems().iterator().next();
final ItemStack itemStack = Item.fromDBItem(items);
itemStack.setAmount(1);
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(RegionShopPlugin.getInstance(), new BukkitRunnable() {
@Override
public void run() {
org.bukkit.entity.Item droppedItem = Bukkit.getWorld(chest.getWorld()).dropItem(new Location(Bukkit.getWorld(chest.getWorld()), (double) chest.getChestX() + 0.5, (double)chest.getChestY() + 1.2, (double)chest.getChestZ() + 0.5), itemStack);
droppedItem.setVelocity(new Vector(0, 0.1, 0));
NMS.safeGuard(droppedItem);
Sign sign = (Sign) Bukkit.getWorld(chest.getWorld()).getBlockAt(chest.getSignX(), chest.getSignY(), chest.getSignZ());
//Get the nice name
String itemName = ItemName.getDataName(itemStack) + itemStack.getType().toString();
if (itemStack.getItemMeta().hasDisplayName()) {
itemName += "(" + itemStack.getItemMeta().getDisplayName() + ")";
}
for(Integer line = 0; line < 4; line++) {
sign.setLine(line, ConfigManager.language.Sign_Shop_SignText.get(line).
replace("%player", chest.getOwners().iterator().next().getName()).
replace("%itemname", ItemName.nicer(itemName)).
replace("%amount", items.getUnitAmount().toString()).
replace("%sell", items.getSell().toString()).
replace("%buy", items.getBuy().toString()));
}
sign.update();
}
});
}
}
}
| public void run() {
List<Chest> chestList = Database.getServer().find(Chest.class).findList();
for(final Chest chest : chestList) {
boolean found = false;
for (Entity ent : Bukkit.getWorld(chest.getWorld()).getEntities()) {
if(ent.getLocation().getBlockY() == chest.getChestY()+1 && ent.getLocation().getBlockX() == chest.getChestX() && ent.getLocation().getBlockZ() == chest.getChestZ()) {
found = true;
}
}
if(!found) {
Iterator itemsIterator = chest.getItemStorage().getItems().iterator();
if(!itemsIterator.hasNext()) {
RegionShopPlugin.getInstance().getLogger().warning("Found Chest without item. Maybe wrong deletion: " + chest.getId());
continue;
}
final Items items = chest.getItemStorage().getItems().iterator().next();
final ItemStack itemStack = Item.fromDBItem(items);
itemStack.setAmount(1);
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(RegionShopPlugin.getInstance(), new BukkitRunnable() {
@Override
public void run() {
org.bukkit.entity.Item droppedItem = Bukkit.getWorld(chest.getWorld()).dropItem(new Location(Bukkit.getWorld(chest.getWorld()), (double) chest.getChestX() + 0.5, (double)chest.getChestY() + 1.2, (double)chest.getChestZ() + 0.5), itemStack);
droppedItem.setVelocity(new Vector(0, 0.1, 0));
NMS.safeGuard(droppedItem);
Sign sign = (Sign) Bukkit.getWorld(chest.getWorld()).getBlockAt(chest.getSignX(), chest.getSignY(), chest.getSignZ()).getState();
//Get the nice name
String itemName = ItemName.getDataName(itemStack) + itemStack.getType().toString();
if (itemStack.getItemMeta().hasDisplayName()) {
itemName += "(" + itemStack.getItemMeta().getDisplayName() + ")";
}
for(Integer line = 0; line < 4; line++) {
sign.setLine(line, ConfigManager.language.Sign_Shop_SignText.get(line).
replace("%player", chest.getOwners().iterator().next().getName()).
replace("%itemname", ItemName.nicer(itemName)).
replace("%amount", items.getUnitAmount().toString()).
replace("%sell", items.getSell().toString()).
replace("%buy", items.getBuy().toString()));
}
sign.update();
}
});
}
}
}
|
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java
index 0418e6728..a5942ca70 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java
@@ -1,537 +1,542 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
// Copyright (C) 2001-2002 Oliver Burn
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 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
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
////////////////////////////////////////////////////////////////////////////////
package com.puppycrawl.tools.checkstyle;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Reader;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import antlr.RecognitionException;
import antlr.TokenStreamException;
import com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck;
import com.puppycrawl.tools.checkstyle.api.Check;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.api.Context;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.api.FileContents;
import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
import com.puppycrawl.tools.checkstyle.api.LocalizedMessages;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
import com.puppycrawl.tools.checkstyle.api.Utils;
/**
* Responsible for walking an abstract syntax tree and notifying interested
* checks at each each node.
*
* @author <a href="mailto:[email protected]">Oliver Burn</a>
* @version 1.0
*/
public final class TreeWalker
extends AbstractFileSetCheck
{
/**
* Overrides ANTLR error reporting so we completely control
* checkstyle's output during parsing. This is important because
* we try parsing with several grammers (with/without support for
* <code>assert</code>). We must not write any error messages when
* parsing fails because with the next grammar it might succeed
* and the user will be confused.
*/
private static class SilentJava14Recognizer
extends GeneratedJava14Recognizer
{
/**
* Creates a new <code>SilentJava14Recognizer</code> instance.
*
* @param aLexer the tokenstream the recognizer operates on.
*/
private SilentJava14Recognizer(GeneratedJava14Lexer aLexer)
{
super(aLexer);
}
/**
* Parser error-reporting function, does nothing.
* @param aRex the exception to be reported
*/
public void reportError(RecognitionException aRex)
{
}
/**
* Parser error-reporting function, does nothing.
* @param aMsg the error message
*/
public void reportError(String aMsg)
{
}
/**
* Parser warning-reporting function, does nothing.
* @param aMsg the error message
*/
public void reportWarning(String aMsg)
{
}
}
/** maps from token name to checks */
private final Map mTokenToChecks = new HashMap();
/** all the registered checks */
private final Set mAllChecks = new HashSet();
/** collects the error messages */
private final LocalizedMessages mMessages;
/** the distance between tab stops */
private int mTabWidth = 8;
/** cache file **/
private PropertyCacheFile mCache = new PropertyCacheFile(null, null);
/** class loader to resolve classes with. **/
private ClassLoader mClassLoader;
/** context of child components */
private Context mChildContext;
/**
* HACK - a reference to a private "mParent" field in DetailAST.
* Don't do this at home!
*/
private Field mDetailASTmParent;
/** a factory for creating submodules (i.e. the Checks) */
private ModuleFactory mModuleFactory;
/**
* Creates a new <code>TreeWalker</code> instance.
*/
public TreeWalker()
{
setFileExtensions(new String[]{"java"});
mMessages = new LocalizedMessages();
// TODO: I (lkuehne) can't believe I wrote this! HACK HACK HACK!
// the parent relationship should really be managed by the DetailAST
// itself but ANTLR calls setFirstChild and friends in an
// unpredictable way. Introducing this hack for now to make
// DetailsAST.setParent() private...
try {
mDetailASTmParent = DetailAST.class.getDeclaredField("mParent");
// this will fail in environments with security managers
mDetailASTmParent.setAccessible(true);
}
catch (NoSuchFieldException e) {
mDetailASTmParent = null;
}
}
/** @param aTabWidth the distance between tab stops */
public void setTabWidth(int aTabWidth)
{
mTabWidth = aTabWidth;
}
/** @param aFileName the cache file */
public void setCacheFile(String aFileName)
{
final Configuration configuration = getConfiguration();
mCache = new PropertyCacheFile(configuration, aFileName);
}
/** @param aClassLoader class loader to resolve classes with. */
public void setClassLoader(ClassLoader aClassLoader)
{
mClassLoader = aClassLoader;
}
/**
* Sets the module factory for creating child modules (Checks).
* @param aModuleFactory the factory
*/
public void setModuleFactory(ModuleFactory aModuleFactory)
{
mModuleFactory = aModuleFactory;
}
/** @see com.puppycrawl.tools.checkstyle.api.Configurable */
public void finishLocalSetup()
{
DefaultContext checkContext = new DefaultContext();
checkContext.add("classLoader", mClassLoader);
checkContext.add("messages", mMessages);
// TODO: hmmm.. this looks less than elegant
// we have just parsed the string,
// now we're recreating it only to parse it again a few moments later
checkContext.add("tabWidth", String.valueOf(mTabWidth));
mChildContext = checkContext;
}
/**
* Instantiates, configures and registers a Check that is specified
* in the provided configuration.
* @see com.puppycrawl.tools.checkstyle.api.AutomaticBean
*/
public void setupChild(Configuration aChildConf)
throws CheckstyleException
{
// TODO: improve the error handing
final String name = aChildConf.getName();
final Object module = mModuleFactory.createModule(name);
if (!(module instanceof Check)) {
throw new CheckstyleException(
"TreeWalker is not allowed as a parent of " + name);
}
final Check c = (Check) module;
c.contextualize(mChildContext);
c.configure(aChildConf);
c.init();
registerCheck(c);
}
/**
* Processes a specified file and reports all errors found.
* @param aFile the file to process
**/
private void process(File aFile)
{
// check if already checked and passed the file
final String fileName = aFile.getPath();
final long timestamp = aFile.lastModified();
if (mCache.alreadyChecked(fileName, timestamp)) {
return;
}
mMessages.reset();
try {
getMessageDispatcher().fireFileStarted(fileName);
final String[] lines = Utils.getLines(fileName);
final FileContents contents = new FileContents(fileName, lines);
final DetailAST rootAST = TreeWalker.parse(contents);
walk(rootAST, contents);
}
catch (FileNotFoundException fnfe) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.fileNotFound", null));
}
catch (IOException ioe) {
mMessages.add(new LocalizedMessage(
0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {ioe.getMessage()}));
}
catch (RecognitionException re) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {re.getMessage()}));
}
catch (TokenStreamException te) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {te.getMessage()}));
}
+ catch (Throwable err) {
+ mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
+ "general.exception",
+ new String[] {"" + err}));
+ }
if (mMessages.size() == 0) {
mCache.checkedOk(fileName, timestamp);
}
else {
getMessageDispatcher().fireErrors(
fileName, mMessages.getMessages());
}
getMessageDispatcher().fireFileFinished(fileName);
}
/**
* Register a check for a given configuration.
* @param aCheck the check to register
* @throws CheckstyleException if an error occurs
*/
private void registerCheck(Check aCheck)
throws CheckstyleException
{
int[] tokens = new int[] {}; //safety initialization
final Set checkTokens = aCheck.getTokenNames();
if (!checkTokens.isEmpty()) {
tokens = aCheck.getRequiredTokens();
//register configured tokens
final int acceptableTokens[] = aCheck.getAcceptableTokens();
Arrays.sort(acceptableTokens);
final Iterator it = checkTokens.iterator();
while (it.hasNext()) {
final String token = (String) it.next();
try {
final int tokenId = TokenTypes.getTokenId(token);
if (Arrays.binarySearch(acceptableTokens, tokenId) >= 0) {
registerCheck(token, aCheck);
}
// TODO: else log warning
}
catch (IllegalArgumentException ex) {
throw new CheckstyleException("illegal token \""
+ token + "\" in check " + aCheck, ex);
}
}
}
else {
tokens = aCheck.getDefaultTokens();
}
for (int i = 0; i < tokens.length; i++) {
registerCheck(tokens[i], aCheck);
}
mAllChecks.add(aCheck);
}
/**
* Register a check for a specified token id.
* @param aTokenID the id of the token
* @param aCheck the check to register
*/
private void registerCheck(int aTokenID, Check aCheck)
{
registerCheck(TokenTypes.getTokenName(aTokenID), aCheck);
}
/**
* Register a check for a specified token name
* @param aToken the name of the token
* @param aCheck the check to register
*/
private void registerCheck(String aToken, Check aCheck)
{
ArrayList visitors = (ArrayList) mTokenToChecks.get(aToken);
if (visitors == null) {
visitors = new ArrayList();
mTokenToChecks.put(aToken, visitors);
}
visitors.add(aCheck);
}
/**
* Initiates the walk of an AST.
* @param aAST the root AST
* @param aContents the contents of the file the AST was generated from
*/
private void walk(DetailAST aAST, FileContents aContents)
{
mMessages.reset();
notifyBegin(aAST, aContents);
// empty files are not flagged by javac, will yield aAST == null
if (aAST != null) {
setParent(aAST, null); // TODO: Manage parent in DetailAST
process(aAST);
}
notifyEnd(aAST);
}
/**
* Sets the parent of an AST.
* @param aChildAST the child that gets a new parent
* @param aParentAST the new parent
*/
// TODO: remove this method and manage parent in DetailAST
private void setParent(DetailAST aChildAST, DetailAST aParentAST)
{
// HACK
try {
mDetailASTmParent.set(aChildAST, aParentAST);
}
catch (IllegalAccessException iae) {
// can't happen because method has been made accesible
throw new RuntimeException();
}
// End of HACK
}
/**
* Notify interested checks that about to begin walking a tree.
* @param aRootAST the root of the tree
* @param aContents the contents of the file the AST was generated from
*/
private void notifyBegin(DetailAST aRootAST, FileContents aContents)
{
final Iterator it = mAllChecks.iterator();
while (it.hasNext()) {
final Check check = (Check) it.next();
check.setFileContents(aContents);
check.beginTree(aRootAST);
}
}
/**
* Notify checks that finished walking a tree.
* @param aRootAST the root of the tree
*/
private void notifyEnd(DetailAST aRootAST)
{
final Iterator it = mAllChecks.iterator();
while (it.hasNext()) {
final Check check = (Check) it.next();
check.finishTree(aRootAST);
}
}
/**
* Recursively processes a node calling interested checks at each node.
* @param aAST the node to start from
*/
private void process(DetailAST aAST)
{
if (aAST == null) {
return;
}
notifyVisit(aAST);
final DetailAST child = (DetailAST) aAST.getFirstChild();
if (child != null) {
setParent(child, aAST); // TODO: Manage parent in DetailAST
process(child);
}
notifyLeave(aAST);
final DetailAST sibling = (DetailAST) aAST.getNextSibling();
if (sibling != null) {
setParent(sibling, aAST.getParent()); // TODO: Manage parent ...
process(sibling);
}
}
/**
* Notify interested checks that visiting a node.
* @param aAST the node to notify for
*/
private void notifyVisit(DetailAST aAST)
{
final ArrayList visitors =
(ArrayList) mTokenToChecks.get(
TokenTypes.getTokenName(aAST.getType()));
if (visitors != null) {
for (int i = 0; i < visitors.size(); i++) {
final Check check = (Check) visitors.get(i);
check.visitToken(aAST);
}
}
}
/**
* Notify interested checks that leaving a node.
* @param aAST the node to notify for
*/
private void notifyLeave(DetailAST aAST)
{
final ArrayList visitors =
(ArrayList) mTokenToChecks.get(
TokenTypes.getTokenName(aAST.getType()));
if (visitors != null) {
for (int i = 0; i < visitors.size(); i++) {
final Check check = (Check) visitors.get(i);
check.leaveToken(aAST);
}
}
}
/**
* Static helper method to parses a Java source file.
* @param aContents contains the contents of the file
* @return the root of the AST
* @throws TokenStreamException if lexing failed
* @throws RecognitionException if parsing failed
*/
public static DetailAST parse(FileContents aContents)
throws TokenStreamException, RecognitionException
{
DetailAST rootAST;
try {
// try the 1.4 grammar first, this will succeed for
// all code that compiles without any warnings in JDK 1.4,
// that should cover most cases
final Reader sar = new StringArrayReader(aContents.getLines());
final GeneratedJava14Lexer jl = new GeneratedJava14Lexer(sar);
jl.setFilename(aContents.getFilename());
jl.setFileContents(aContents);
final GeneratedJava14Recognizer jr =
new SilentJava14Recognizer(jl);
jr.setFilename(aContents.getFilename());
jr.setASTNodeClass(DetailAST.class.getName());
jr.compilationUnit();
rootAST = (DetailAST) jr.getAST();
}
catch (RecognitionException re) {
// Parsing might have failed because the checked
// file contains "assert" as an identifier. Retry with a
// grammar that treats "assert" as an identifier
// and not as a keyword
// Arghh - the pain - duplicate code!
final Reader sar = new StringArrayReader(aContents.getLines());
final GeneratedJavaLexer jl = new GeneratedJavaLexer(sar);
jl.setFilename(aContents.getFilename());
jl.setFileContents(aContents);
final GeneratedJavaRecognizer jr = new GeneratedJavaRecognizer(jl);
jr.setFilename(aContents.getFilename());
jr.setASTNodeClass(DetailAST.class.getName());
jr.compilationUnit();
rootAST = (DetailAST) jr.getAST();
}
return rootAST;
}
/** @see com.puppycrawl.tools.checkstyle.api.FileSetCheck */
public void process(File[] aFiles)
{
File[] javaFiles = filter(aFiles);
for (int i = 0; i < javaFiles.length; i++) {
process(javaFiles[i]);
}
}
/**
* @see com.puppycrawl.tools.checkstyle.api.FileSetCheck
*/
public void destroy()
{
for (Iterator it = mAllChecks.iterator(); it.hasNext();) {
final Check c = (Check) it.next();
c.destroy();
}
mCache.destroy();
super.destroy();
}
}
| true | true | private void process(File aFile)
{
// check if already checked and passed the file
final String fileName = aFile.getPath();
final long timestamp = aFile.lastModified();
if (mCache.alreadyChecked(fileName, timestamp)) {
return;
}
mMessages.reset();
try {
getMessageDispatcher().fireFileStarted(fileName);
final String[] lines = Utils.getLines(fileName);
final FileContents contents = new FileContents(fileName, lines);
final DetailAST rootAST = TreeWalker.parse(contents);
walk(rootAST, contents);
}
catch (FileNotFoundException fnfe) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.fileNotFound", null));
}
catch (IOException ioe) {
mMessages.add(new LocalizedMessage(
0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {ioe.getMessage()}));
}
catch (RecognitionException re) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {re.getMessage()}));
}
catch (TokenStreamException te) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {te.getMessage()}));
}
if (mMessages.size() == 0) {
mCache.checkedOk(fileName, timestamp);
}
else {
getMessageDispatcher().fireErrors(
fileName, mMessages.getMessages());
}
getMessageDispatcher().fireFileFinished(fileName);
}
| private void process(File aFile)
{
// check if already checked and passed the file
final String fileName = aFile.getPath();
final long timestamp = aFile.lastModified();
if (mCache.alreadyChecked(fileName, timestamp)) {
return;
}
mMessages.reset();
try {
getMessageDispatcher().fireFileStarted(fileName);
final String[] lines = Utils.getLines(fileName);
final FileContents contents = new FileContents(fileName, lines);
final DetailAST rootAST = TreeWalker.parse(contents);
walk(rootAST, contents);
}
catch (FileNotFoundException fnfe) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.fileNotFound", null));
}
catch (IOException ioe) {
mMessages.add(new LocalizedMessage(
0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {ioe.getMessage()}));
}
catch (RecognitionException re) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {re.getMessage()}));
}
catch (TokenStreamException te) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {te.getMessage()}));
}
catch (Throwable err) {
mMessages.add(new LocalizedMessage(0, Defn.CHECKSTYLE_BUNDLE,
"general.exception",
new String[] {"" + err}));
}
if (mMessages.size() == 0) {
mCache.checkedOk(fileName, timestamp);
}
else {
getMessageDispatcher().fireErrors(
fileName, mMessages.getMessages());
}
getMessageDispatcher().fireFileFinished(fileName);
}
|
diff --git a/src/main/java/no/mesan/ejafjallajokull/servlets/NyBrukerServlet.java b/src/main/java/no/mesan/ejafjallajokull/servlets/NyBrukerServlet.java
index fc8011b..fe3dd1d 100644
--- a/src/main/java/no/mesan/ejafjallajokull/servlets/NyBrukerServlet.java
+++ b/src/main/java/no/mesan/ejafjallajokull/servlets/NyBrukerServlet.java
@@ -1,62 +1,62 @@
package no.mesan.ejafjallajokull.servlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import no.mesan.ejafjallajokull.utils.ServletUtil;
@SuppressWarnings("serial")
public class NyBrukerServlet extends HttpServlet {
private Connection connection;
private Statement stm;
private ResultSet rs;
public NyBrukerServlet() {
connection = ServletUtil.initializeDBCon();
}
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String nextJSP = "/ny.jsp";
RequestDispatcher dispatcher = request.getRequestDispatcher(nextJSP);
dispatcher.forward(request, response);
}
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String navn = request.getParameter("navn");
String brukerid = request.getParameter("brukerid");
String passord = request.getParameter("passord");
- String sql = "INSERT INTO bruker VALUES('" + navn + "', '" + brukerid + "', '" + passord + "', '" + 0 + "')";
+ String sql = "INSERT INTO bruker VALUES('" + brukerid + "', '" + passord + "', '" + navn + "', '" + 0 + "')";
System.out.println(sql);
try {
stm = connection.createStatement();
stm.executeUpdate(sql);
connection.close();
} catch (Exception e) {
request.setAttribute("feilmelding", "Kunne ikke registrere bruker: " + e.getMessage());
e.printStackTrace();
ServletUtil.gotoFeilSide(request, response);
}
String nextJSP = "/index.jsp";
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(nextJSP);
dispatcher.forward(request, response);
ServletUtil.cleanupDBConn(rs, connection);
}
}
| true | true | protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String navn = request.getParameter("navn");
String brukerid = request.getParameter("brukerid");
String passord = request.getParameter("passord");
String sql = "INSERT INTO bruker VALUES('" + navn + "', '" + brukerid + "', '" + passord + "', '" + 0 + "')";
System.out.println(sql);
try {
stm = connection.createStatement();
stm.executeUpdate(sql);
connection.close();
} catch (Exception e) {
request.setAttribute("feilmelding", "Kunne ikke registrere bruker: " + e.getMessage());
e.printStackTrace();
ServletUtil.gotoFeilSide(request, response);
}
String nextJSP = "/index.jsp";
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(nextJSP);
dispatcher.forward(request, response);
ServletUtil.cleanupDBConn(rs, connection);
}
| protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String navn = request.getParameter("navn");
String brukerid = request.getParameter("brukerid");
String passord = request.getParameter("passord");
String sql = "INSERT INTO bruker VALUES('" + brukerid + "', '" + passord + "', '" + navn + "', '" + 0 + "')";
System.out.println(sql);
try {
stm = connection.createStatement();
stm.executeUpdate(sql);
connection.close();
} catch (Exception e) {
request.setAttribute("feilmelding", "Kunne ikke registrere bruker: " + e.getMessage());
e.printStackTrace();
ServletUtil.gotoFeilSide(request, response);
}
String nextJSP = "/index.jsp";
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(nextJSP);
dispatcher.forward(request, response);
ServletUtil.cleanupDBConn(rs, connection);
}
|
diff --git a/android/src/com/google/zxing/client/android/ResultHandler.java b/android/src/com/google/zxing/client/android/ResultHandler.java
index 190cb73e..fc05b37b 100755
--- a/android/src/com/google/zxing/client/android/ResultHandler.java
+++ b/android/src/com/google/zxing/client/android/ResultHandler.java
@@ -1,130 +1,130 @@
/*
* Copyright (C) 2008 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.google.zxing.client.android;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.provider.Contacts;
import com.google.zxing.client.result.AddressBookAUParsedResult;
import com.google.zxing.client.result.AddressBookDoCoMoParsedResult;
import com.google.zxing.client.result.BookmarkDoCoMoParsedResult;
import com.google.zxing.client.result.EmailAddressParsedResult;
import com.google.zxing.client.result.EmailDoCoMoParsedResult;
import com.google.zxing.client.result.GeoParsedResult;
import com.google.zxing.client.result.ParsedReaderResult;
import com.google.zxing.client.result.ParsedReaderResultType;
import com.google.zxing.client.result.TelParsedResult;
import com.google.zxing.client.result.UPCParsedResult;
import com.google.zxing.client.result.URIParsedResult;
import com.google.zxing.client.result.URLTOParsedResult;
/**
* Handles the result of barcode decoding in the context of the Android platform,
* by dispatching the proper intents and so on.
*
* @author [email protected] (Sean Owen)
* @author [email protected] (Daniel Switkin)
*/
final class ResultHandler implements DialogInterface.OnClickListener {
private final Intent intent;
private final BarcodeReaderCaptureActivity captureActivity;
ResultHandler(BarcodeReaderCaptureActivity captureActivity, ParsedReaderResult result) {
this.captureActivity = captureActivity;
this.intent = resultToIntent(result);
}
private static Intent resultToIntent(ParsedReaderResult result) {
Intent intent = null;
ParsedReaderResultType type = result.getType();
if (type.equals(ParsedReaderResultType.ADDRESSBOOK)) {
AddressBookDoCoMoParsedResult addressResult = (AddressBookDoCoMoParsedResult) result;
intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI);
putExtra(intent, Contacts.Intents.Insert.NAME, addressResult.getName());
putExtra(intent, Contacts.Intents.Insert.PHONE, addressResult.getPhoneNumbers());
putExtra(intent, Contacts.Intents.Insert.EMAIL, addressResult.getEmail());
putExtra(intent, Contacts.Intents.Insert.NOTES, addressResult.getNote());
putExtra(intent, Contacts.Intents.Insert.POSTAL, addressResult.getAddress());
} else if (type.equals(ParsedReaderResultType.ADDRESSBOOK_AU)) {
AddressBookAUParsedResult addressResult = (AddressBookAUParsedResult) result;
intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI);
putExtra(intent, Contacts.Intents.Insert.NAME, addressResult.getNames());
putExtra(intent, Contacts.Intents.Insert.PHONE, addressResult.getPhoneNumbers());
putExtra(intent, Contacts.Intents.Insert.EMAIL, addressResult.getEmails());
putExtra(intent, Contacts.Intents.Insert.NOTES, addressResult.getNote());
putExtra(intent, Contacts.Intents.Insert.POSTAL, addressResult.getAddress());
} else if (type.equals(ParsedReaderResultType.BOOKMARK)) {
// For now, we can only open the browser, and not actually add a bookmark
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(((BookmarkDoCoMoParsedResult) result).getURI()));
} else if (type.equals(ParsedReaderResultType.URLTO)) {
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(((URLTOParsedResult) result).getURI()));
} else if (type.equals(ParsedReaderResultType.EMAIL)) {
EmailDoCoMoParsedResult emailResult = (EmailDoCoMoParsedResult) result;
intent = new Intent(Intent.SENDTO_ACTION, Uri.parse(emailResult.getTo()));
putExtra(intent, "subject", emailResult.getSubject());
putExtra(intent, "body", emailResult.getBody());
} else if (type.equals(ParsedReaderResultType.EMAIL_ADDRESS)) {
EmailAddressParsedResult emailResult = (EmailAddressParsedResult) result;
- intent = new Intent(Intent.SENDTO_ACTION, Uri.parse(emailResult.getEmailAddress()));
+ intent = new Intent(Intent.SENDTO_ACTION, Uri.parse("mailto:" + emailResult.getEmailAddress()));
} else if (type.equals(ParsedReaderResultType.TEL)) {
TelParsedResult telResult = (TelParsedResult) result;
intent = new Intent(Intent.DIAL_ACTION, Uri.parse("tel:" + telResult.getNumber()));
} else if (type.equals(ParsedReaderResultType.GEO)) {
GeoParsedResult geoResult = (GeoParsedResult) result;
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(geoResult.getGeoURI()));
} else if (type.equals(ParsedReaderResultType.UPC)) {
UPCParsedResult upcResult = (UPCParsedResult) result;
Uri uri = Uri.parse("http://www.upcdatabase.com/item.asp?upc=" + upcResult.getUPC());
intent = new Intent(Intent.VIEW_ACTION, uri);
} else if (type.equals(ParsedReaderResultType.URI)) {
URIParsedResult uriResult = (URIParsedResult) result;
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(uriResult.getURI()));
} else if (type.equals(ParsedReaderResultType.ANDROID_INTENT)) {
intent = ((AndroidIntentParsedResult) result).getIntent();
}
return intent;
}
public void onClick(DialogInterface dialogInterface, int i) {
if (i == DialogInterface.BUTTON1) {
if (intent != null) {
captureActivity.startActivity(intent);
}
} else {
captureActivity.restartPreview();
}
}
Intent getIntent() {
return intent;
}
private static void putExtra(Intent intent, String key, String value) {
if (value != null && value.length() > 0) {
intent.putExtra(key, value);
}
}
private static void putExtra(Intent intent, String key, String[] value) {
if (value != null && value.length > 0) {
putExtra(intent, key, value[0]);
}
}
}
| true | true | private static Intent resultToIntent(ParsedReaderResult result) {
Intent intent = null;
ParsedReaderResultType type = result.getType();
if (type.equals(ParsedReaderResultType.ADDRESSBOOK)) {
AddressBookDoCoMoParsedResult addressResult = (AddressBookDoCoMoParsedResult) result;
intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI);
putExtra(intent, Contacts.Intents.Insert.NAME, addressResult.getName());
putExtra(intent, Contacts.Intents.Insert.PHONE, addressResult.getPhoneNumbers());
putExtra(intent, Contacts.Intents.Insert.EMAIL, addressResult.getEmail());
putExtra(intent, Contacts.Intents.Insert.NOTES, addressResult.getNote());
putExtra(intent, Contacts.Intents.Insert.POSTAL, addressResult.getAddress());
} else if (type.equals(ParsedReaderResultType.ADDRESSBOOK_AU)) {
AddressBookAUParsedResult addressResult = (AddressBookAUParsedResult) result;
intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI);
putExtra(intent, Contacts.Intents.Insert.NAME, addressResult.getNames());
putExtra(intent, Contacts.Intents.Insert.PHONE, addressResult.getPhoneNumbers());
putExtra(intent, Contacts.Intents.Insert.EMAIL, addressResult.getEmails());
putExtra(intent, Contacts.Intents.Insert.NOTES, addressResult.getNote());
putExtra(intent, Contacts.Intents.Insert.POSTAL, addressResult.getAddress());
} else if (type.equals(ParsedReaderResultType.BOOKMARK)) {
// For now, we can only open the browser, and not actually add a bookmark
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(((BookmarkDoCoMoParsedResult) result).getURI()));
} else if (type.equals(ParsedReaderResultType.URLTO)) {
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(((URLTOParsedResult) result).getURI()));
} else if (type.equals(ParsedReaderResultType.EMAIL)) {
EmailDoCoMoParsedResult emailResult = (EmailDoCoMoParsedResult) result;
intent = new Intent(Intent.SENDTO_ACTION, Uri.parse(emailResult.getTo()));
putExtra(intent, "subject", emailResult.getSubject());
putExtra(intent, "body", emailResult.getBody());
} else if (type.equals(ParsedReaderResultType.EMAIL_ADDRESS)) {
EmailAddressParsedResult emailResult = (EmailAddressParsedResult) result;
intent = new Intent(Intent.SENDTO_ACTION, Uri.parse(emailResult.getEmailAddress()));
} else if (type.equals(ParsedReaderResultType.TEL)) {
TelParsedResult telResult = (TelParsedResult) result;
intent = new Intent(Intent.DIAL_ACTION, Uri.parse("tel:" + telResult.getNumber()));
} else if (type.equals(ParsedReaderResultType.GEO)) {
GeoParsedResult geoResult = (GeoParsedResult) result;
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(geoResult.getGeoURI()));
} else if (type.equals(ParsedReaderResultType.UPC)) {
UPCParsedResult upcResult = (UPCParsedResult) result;
Uri uri = Uri.parse("http://www.upcdatabase.com/item.asp?upc=" + upcResult.getUPC());
intent = new Intent(Intent.VIEW_ACTION, uri);
} else if (type.equals(ParsedReaderResultType.URI)) {
URIParsedResult uriResult = (URIParsedResult) result;
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(uriResult.getURI()));
} else if (type.equals(ParsedReaderResultType.ANDROID_INTENT)) {
intent = ((AndroidIntentParsedResult) result).getIntent();
}
return intent;
}
| private static Intent resultToIntent(ParsedReaderResult result) {
Intent intent = null;
ParsedReaderResultType type = result.getType();
if (type.equals(ParsedReaderResultType.ADDRESSBOOK)) {
AddressBookDoCoMoParsedResult addressResult = (AddressBookDoCoMoParsedResult) result;
intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI);
putExtra(intent, Contacts.Intents.Insert.NAME, addressResult.getName());
putExtra(intent, Contacts.Intents.Insert.PHONE, addressResult.getPhoneNumbers());
putExtra(intent, Contacts.Intents.Insert.EMAIL, addressResult.getEmail());
putExtra(intent, Contacts.Intents.Insert.NOTES, addressResult.getNote());
putExtra(intent, Contacts.Intents.Insert.POSTAL, addressResult.getAddress());
} else if (type.equals(ParsedReaderResultType.ADDRESSBOOK_AU)) {
AddressBookAUParsedResult addressResult = (AddressBookAUParsedResult) result;
intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI);
putExtra(intent, Contacts.Intents.Insert.NAME, addressResult.getNames());
putExtra(intent, Contacts.Intents.Insert.PHONE, addressResult.getPhoneNumbers());
putExtra(intent, Contacts.Intents.Insert.EMAIL, addressResult.getEmails());
putExtra(intent, Contacts.Intents.Insert.NOTES, addressResult.getNote());
putExtra(intent, Contacts.Intents.Insert.POSTAL, addressResult.getAddress());
} else if (type.equals(ParsedReaderResultType.BOOKMARK)) {
// For now, we can only open the browser, and not actually add a bookmark
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(((BookmarkDoCoMoParsedResult) result).getURI()));
} else if (type.equals(ParsedReaderResultType.URLTO)) {
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(((URLTOParsedResult) result).getURI()));
} else if (type.equals(ParsedReaderResultType.EMAIL)) {
EmailDoCoMoParsedResult emailResult = (EmailDoCoMoParsedResult) result;
intent = new Intent(Intent.SENDTO_ACTION, Uri.parse(emailResult.getTo()));
putExtra(intent, "subject", emailResult.getSubject());
putExtra(intent, "body", emailResult.getBody());
} else if (type.equals(ParsedReaderResultType.EMAIL_ADDRESS)) {
EmailAddressParsedResult emailResult = (EmailAddressParsedResult) result;
intent = new Intent(Intent.SENDTO_ACTION, Uri.parse("mailto:" + emailResult.getEmailAddress()));
} else if (type.equals(ParsedReaderResultType.TEL)) {
TelParsedResult telResult = (TelParsedResult) result;
intent = new Intent(Intent.DIAL_ACTION, Uri.parse("tel:" + telResult.getNumber()));
} else if (type.equals(ParsedReaderResultType.GEO)) {
GeoParsedResult geoResult = (GeoParsedResult) result;
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(geoResult.getGeoURI()));
} else if (type.equals(ParsedReaderResultType.UPC)) {
UPCParsedResult upcResult = (UPCParsedResult) result;
Uri uri = Uri.parse("http://www.upcdatabase.com/item.asp?upc=" + upcResult.getUPC());
intent = new Intent(Intent.VIEW_ACTION, uri);
} else if (type.equals(ParsedReaderResultType.URI)) {
URIParsedResult uriResult = (URIParsedResult) result;
intent = new Intent(Intent.VIEW_ACTION, Uri.parse(uriResult.getURI()));
} else if (type.equals(ParsedReaderResultType.ANDROID_INTENT)) {
intent = ((AndroidIntentParsedResult) result).getIntent();
}
return intent;
}
|
diff --git a/src/java/org/astrogrid/samp/Message.java b/src/java/org/astrogrid/samp/Message.java
index 6b7f2e0..8b159a8 100644
--- a/src/java/org/astrogrid/samp/Message.java
+++ b/src/java/org/astrogrid/samp/Message.java
@@ -1,155 +1,156 @@
package org.astrogrid.samp;
import java.util.HashMap;
import java.util.Map;
/**
* Represents an encoded SAMP Message.
*
* @author Mark Taylor
* @since 14 Jul 2008
*/
public class Message extends SampMap {
/** Key for message MType. */
public static final String MTYPE_KEY = "samp.mtype";
/** Key for map of parameters used by this message. */
public static final String PARAMS_KEY = "samp.params";
private static final String[] KNOWN_KEYS = new String[] {
MTYPE_KEY,
PARAMS_KEY,
};
/**
* Constructs an empty message.
*/
public Message() {
super( KNOWN_KEYS );
}
/**
* Constructs a message based on an existing map.
*
* @param map map containing initial data for this object
*/
public Message( Map map ) {
this();
putAll( map );
}
/**
* Constructs a message with a given MType and params map.
*
* @param mtype value for {@link #MTYPE_KEY} key
* @param params value for {@link #PARAMS_KEY} key
*/
public Message( String mtype, Map params ) {
this();
put( MTYPE_KEY, mtype );
put( PARAMS_KEY, params == null ? new HashMap() : params );
}
/**
* Constructs a message with a given MType.
* The parameters map will be mutable.
*
* @param mtype value for {@link #MTYPE_KEY} key
*/
public Message( String mtype ) {
this( mtype, null );
}
/**
* Returns this message's MType.
*
* @return value for {@link #MTYPE_KEY}
*/
public String getMType() {
return getString( MTYPE_KEY );
}
/**
* Sets this message's params map.
*
* @param params value for {@link #PARAMS_KEY}
*/
public void setParams( Map params ) {
put( PARAMS_KEY, params );
}
/**
* Returns this message's params map.
*
* @return value for {@link #PARAMS_KEY}
*/
public Map getParams() {
return getMap( PARAMS_KEY );
}
/**
* Sets the value for a single entry in this message's
* <code>samp.params</code> map.
*
* @param name param name
* @param value param value
*/
public Message addParam( String name, Object value ) {
if ( ! containsKey( PARAMS_KEY ) ) {
put( PARAMS_KEY, new HashMap() );
}
getParams().put( name, value );
return this;
}
/**
* Returns the value of a single entry in this message's
* <code>samp.params</code> map. Null is returned if the parameter
* does not appear.
*
* @param name param name
* @return param value, or null
*/
public Object getParam( String name ) {
Map params = getParams();
return params == null ? null
: params.get( name );
}
/**
* Returns the value of a single entry in this message's
* <code>samp.params</code> map, throwing an exception
* if it is not present.
*
* @param name param name
* @return param value
* @throws DataException if no parameter <code>name</code> is present
*/
public Object getRequiredParam( String name ) {
Object param = getParam( name );
if ( param != null ) {
return param;
}
else {
- throw new DataException( "Missing parameter " + name );
+ throw new DataException( "Required parameter \"" + name
+ + "\" is missing" );
}
}
public void check() {
super.check();
checkHasKeys( new String[] { MTYPE_KEY } );
}
/**
* Returns a given map as a Message object.
*
* @param map map
* @return message
*/
public static Message asMessage( Map map ) {
return ( map instanceof Message || map == null )
? (Message) map
: new Message( map );
}
}
| true | true | public Object getRequiredParam( String name ) {
Object param = getParam( name );
if ( param != null ) {
return param;
}
else {
throw new DataException( "Missing parameter " + name );
}
}
| public Object getRequiredParam( String name ) {
Object param = getParam( name );
if ( param != null ) {
return param;
}
else {
throw new DataException( "Required parameter \"" + name
+ "\" is missing" );
}
}
|
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java
index 392485740..3f28509ac 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java
@@ -1,92 +1,92 @@
// Copyright (C) 2013 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.group;
import static com.google.common.base.Strings.nullToEmpty;
import com.google.common.collect.Lists;
import com.google.gerrit.common.data.GroupDescription;
import com.google.gerrit.common.errors.NoSuchGroupException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountGroupIncludeByUuid;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.account.GroupControl;
import com.google.gerrit.server.group.GetGroup.GroupInfo;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.slf4j.Logger;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
public class ListIncludedGroups implements RestReadView<GroupResource> {
private static final Logger log = org.slf4j.LoggerFactory.getLogger(ListIncludedGroups.class);
private final GroupControl.Factory controlFactory;
private final Provider<ReviewDb> dbProvider;
@Inject
ListIncludedGroups(GroupControl.Factory controlFactory,
Provider<ReviewDb> dbProvider) {
this.controlFactory = controlFactory;
this.dbProvider = dbProvider;
}
@Override
public List<GroupInfo> apply(GroupResource rsrc)
throws ResourceNotFoundException, OrmException {
if (!rsrc.isInternal()) {
throw new ResourceNotFoundException(rsrc.getGroupUUID().get());
}
boolean ownerOfParent = rsrc.getControl().isOwner();
List<GroupInfo> included = Lists.newArrayList();
for (AccountGroupIncludeByUuid u : dbProvider.get()
.accountGroupIncludesByUuid()
.byGroup(groupId(rsrc))) {
try {
GroupControl i = controlFactory.controlFor(u.getIncludeUUID());
if (ownerOfParent || i.isVisible()) {
included.add(new GetGroup.GroupInfo(i.getGroup()));
}
} catch (NoSuchGroupException notFound) {
log.warn(String.format("Group %s no longer available, included into ",
u.getIncludeUUID(),
rsrc.getGroup().getName()));
continue;
}
}
Collections.sort(included, new Comparator<GroupInfo>() {
@Override
public int compare(GroupInfo a, GroupInfo b) {
int cmp = nullToEmpty(a.name).compareTo(nullToEmpty(b.name));
if (cmp != 0) {
return cmp;
}
- return nullToEmpty(a.id).compareTo(nullToEmpty(b.name));
+ return nullToEmpty(a.id).compareTo(nullToEmpty(b.id));
}
});
return included;
}
private static AccountGroup.Id groupId(GroupResource rsrc) {
GroupDescription.Basic d = rsrc.getGroup();
return ((GroupDescription.Internal) d).getAccountGroup().getId();
}
}
| true | true | public List<GroupInfo> apply(GroupResource rsrc)
throws ResourceNotFoundException, OrmException {
if (!rsrc.isInternal()) {
throw new ResourceNotFoundException(rsrc.getGroupUUID().get());
}
boolean ownerOfParent = rsrc.getControl().isOwner();
List<GroupInfo> included = Lists.newArrayList();
for (AccountGroupIncludeByUuid u : dbProvider.get()
.accountGroupIncludesByUuid()
.byGroup(groupId(rsrc))) {
try {
GroupControl i = controlFactory.controlFor(u.getIncludeUUID());
if (ownerOfParent || i.isVisible()) {
included.add(new GetGroup.GroupInfo(i.getGroup()));
}
} catch (NoSuchGroupException notFound) {
log.warn(String.format("Group %s no longer available, included into ",
u.getIncludeUUID(),
rsrc.getGroup().getName()));
continue;
}
}
Collections.sort(included, new Comparator<GroupInfo>() {
@Override
public int compare(GroupInfo a, GroupInfo b) {
int cmp = nullToEmpty(a.name).compareTo(nullToEmpty(b.name));
if (cmp != 0) {
return cmp;
}
return nullToEmpty(a.id).compareTo(nullToEmpty(b.name));
}
});
return included;
}
| public List<GroupInfo> apply(GroupResource rsrc)
throws ResourceNotFoundException, OrmException {
if (!rsrc.isInternal()) {
throw new ResourceNotFoundException(rsrc.getGroupUUID().get());
}
boolean ownerOfParent = rsrc.getControl().isOwner();
List<GroupInfo> included = Lists.newArrayList();
for (AccountGroupIncludeByUuid u : dbProvider.get()
.accountGroupIncludesByUuid()
.byGroup(groupId(rsrc))) {
try {
GroupControl i = controlFactory.controlFor(u.getIncludeUUID());
if (ownerOfParent || i.isVisible()) {
included.add(new GetGroup.GroupInfo(i.getGroup()));
}
} catch (NoSuchGroupException notFound) {
log.warn(String.format("Group %s no longer available, included into ",
u.getIncludeUUID(),
rsrc.getGroup().getName()));
continue;
}
}
Collections.sort(included, new Comparator<GroupInfo>() {
@Override
public int compare(GroupInfo a, GroupInfo b) {
int cmp = nullToEmpty(a.name).compareTo(nullToEmpty(b.name));
if (cmp != 0) {
return cmp;
}
return nullToEmpty(a.id).compareTo(nullToEmpty(b.id));
}
});
return included;
}
|
diff --git a/lab_1/MatrixTransposer.java b/lab_1/MatrixTransposer.java
index d11fbd1..be1a1bb 100644
--- a/lab_1/MatrixTransposer.java
+++ b/lab_1/MatrixTransposer.java
@@ -1,37 +1,37 @@
package javalabs.lab_1;
import java.io.*;
import java.util.*;
// Класс MatrixTransposer.
// Выполнения последовательность действий,
// указанных в задании.
class MatrixTransposer
{
public static void main(String[] args)
{
try
{
int rows = 1, columns = 1;
Scanner s = new Scanner(System.in);
System.out.print("Input matrix rows amount: ");
rows = s.nextInt();
System.out.print("Input matrix columns amount: ");
columns = s.nextInt();
Matrix matrix = new Matrix(rows, columns);
matrix.input();
System.out.println("Transposed matrix:");
matrix.transpose();
matrix.print();
}
- catch(IOException e)
+ catch(Exception e)
{
- System.out.println("IO Exception catched: " + e);
+ System.out.println("Exception catched: " + e + "\nAborting programm...");
}
}
}
| false | true | public static void main(String[] args)
{
try
{
int rows = 1, columns = 1;
Scanner s = new Scanner(System.in);
System.out.print("Input matrix rows amount: ");
rows = s.nextInt();
System.out.print("Input matrix columns amount: ");
columns = s.nextInt();
Matrix matrix = new Matrix(rows, columns);
matrix.input();
System.out.println("Transposed matrix:");
matrix.transpose();
matrix.print();
}
catch(IOException e)
{
System.out.println("IO Exception catched: " + e);
}
}
| public static void main(String[] args)
{
try
{
int rows = 1, columns = 1;
Scanner s = new Scanner(System.in);
System.out.print("Input matrix rows amount: ");
rows = s.nextInt();
System.out.print("Input matrix columns amount: ");
columns = s.nextInt();
Matrix matrix = new Matrix(rows, columns);
matrix.input();
System.out.println("Transposed matrix:");
matrix.transpose();
matrix.print();
}
catch(Exception e)
{
System.out.println("Exception catched: " + e + "\nAborting programm...");
}
}
|
diff --git a/android/src/com/google/zxing/client/android/ViewfinderView.java b/android/src/com/google/zxing/client/android/ViewfinderView.java
index 8a52ba9c..fe70351e 100755
--- a/android/src/com/google/zxing/client/android/ViewfinderView.java
+++ b/android/src/com/google/zxing/client/android/ViewfinderView.java
@@ -1,188 +1,192 @@
/*
* Copyright (C) 2008 ZXing 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.google.zxing.client.android;
import com.google.zxing.ResultPoint;
import com.google.zxing.client.android.camera.CameraManager;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.View;
import java.util.ArrayList;
import java.util.List;
/**
* This view is overlaid on top of the camera preview. It adds the viewfinder rectangle and partial
* transparency outside it, as well as the laser scanner animation and result points.
*
* @author [email protected] (Daniel Switkin)
*/
public final class ViewfinderView extends View {
private static final int[] SCANNER_ALPHA = {0, 64, 128, 192, 255, 192, 128, 64};
private static final long ANIMATION_DELAY = 80L;
private static final int CURRENT_POINT_OPACITY = 0xA0;
private static final int MAX_RESULT_POINTS = 20;
private static final int POINT_SIZE = 6;
private final Paint paint;
private Bitmap resultBitmap;
private final int maskColor;
private final int resultColor;
private final int frameColor;
private final int laserColor;
private final int resultPointColor;
private int scannerAlpha;
private List<ResultPoint> possibleResultPoints;
private List<ResultPoint> lastPossibleResultPoints;
// This constructor is used when the class is built from an XML resource.
public ViewfinderView(Context context, AttributeSet attrs) {
super(context, attrs);
// Initialize these once for performance rather than calling them every time in onDraw().
paint = new Paint(Paint.ANTI_ALIAS_FLAG);
Resources resources = getResources();
maskColor = resources.getColor(R.color.viewfinder_mask);
resultColor = resources.getColor(R.color.result_view);
frameColor = resources.getColor(R.color.viewfinder_frame);
laserColor = resources.getColor(R.color.viewfinder_laser);
resultPointColor = resources.getColor(R.color.possible_result_points);
scannerAlpha = 0;
possibleResultPoints = new ArrayList<ResultPoint>(5);
lastPossibleResultPoints = null;
}
@Override
public void onDraw(Canvas canvas) {
- Rect frame = CameraManager.get().getFramingRect();
+ CameraManager cameraManager = CameraManager.get();
+ if (cameraManager == null) {
+ return;
+ }
+ Rect frame = cameraManager.getFramingRect();
if (frame == null) {
return;
}
int width = canvas.getWidth();
int height = canvas.getHeight();
// Draw the exterior (i.e. outside the framing rect) darkened
paint.setColor(resultBitmap != null ? resultColor : maskColor);
canvas.drawRect(0, 0, width, frame.top, paint);
canvas.drawRect(0, frame.top, frame.left, frame.bottom + 1, paint);
canvas.drawRect(frame.right + 1, frame.top, width, frame.bottom + 1, paint);
canvas.drawRect(0, frame.bottom + 1, width, height, paint);
if (resultBitmap != null) {
// Draw the opaque result bitmap over the scanning rectangle
paint.setAlpha(CURRENT_POINT_OPACITY);
canvas.drawBitmap(resultBitmap, null, frame, paint);
} else {
// Draw a two pixel solid black border inside the framing rect
paint.setColor(frameColor);
canvas.drawRect(frame.left, frame.top, frame.right + 1, frame.top + 2, paint);
canvas.drawRect(frame.left, frame.top + 2, frame.left + 2, frame.bottom - 1, paint);
canvas.drawRect(frame.right - 1, frame.top, frame.right + 1, frame.bottom - 1, paint);
canvas.drawRect(frame.left, frame.bottom - 1, frame.right + 1, frame.bottom + 1, paint);
// Draw a red "laser scanner" line through the middle to show decoding is active
paint.setColor(laserColor);
paint.setAlpha(SCANNER_ALPHA[scannerAlpha]);
scannerAlpha = (scannerAlpha + 1) % SCANNER_ALPHA.length;
int middle = frame.height() / 2 + frame.top;
canvas.drawRect(frame.left + 2, middle - 1, frame.right - 1, middle + 2, paint);
- Rect previewFrame = CameraManager.get().getFramingRectInPreview();
+ Rect previewFrame = cameraManager.getFramingRectInPreview();
float scaleX = frame.width() / (float) previewFrame.width();
float scaleY = frame.height() / (float) previewFrame.height();
List<ResultPoint> currentPossible = possibleResultPoints;
List<ResultPoint> currentLast = lastPossibleResultPoints;
int frameLeft = frame.left;
int frameTop = frame.top;
if (currentPossible.isEmpty()) {
lastPossibleResultPoints = null;
} else {
possibleResultPoints = new ArrayList<ResultPoint>(5);
lastPossibleResultPoints = currentPossible;
paint.setAlpha(CURRENT_POINT_OPACITY);
paint.setColor(resultPointColor);
synchronized (currentPossible) {
for (ResultPoint point : currentPossible) {
canvas.drawCircle(frameLeft + (int) (point.getX() * scaleX),
frameTop + (int) (point.getY() * scaleY),
POINT_SIZE, paint);
}
}
}
if (currentLast != null) {
paint.setAlpha(CURRENT_POINT_OPACITY / 2);
paint.setColor(resultPointColor);
synchronized (currentLast) {
for (ResultPoint point : currentLast) {
canvas.drawCircle(frameLeft + (int) (point.getX() * scaleX),
frameTop + (int) (point.getY() * scaleY),
POINT_SIZE / 2, paint);
}
}
}
// Request another update at the animation interval, but only repaint the laser line,
// not the entire viewfinder mask.
postInvalidateDelayed(ANIMATION_DELAY,
frame.left - POINT_SIZE,
frame.top - POINT_SIZE,
frame.right + POINT_SIZE,
frame.bottom + POINT_SIZE);
}
}
public void drawViewfinder() {
Bitmap resultBitmap = this.resultBitmap;
this.resultBitmap = null;
if (resultBitmap != null) {
resultBitmap.recycle();
}
invalidate();
}
/**
* Draw a bitmap with the result points highlighted instead of the live scanning display.
*
* @param barcode An image of the decoded barcode.
*/
public void drawResultBitmap(Bitmap barcode) {
resultBitmap = barcode;
invalidate();
}
public void addPossibleResultPoint(ResultPoint point) {
List<ResultPoint> points = possibleResultPoints;
synchronized (point) {
points.add(point);
int size = points.size();
if (size > MAX_RESULT_POINTS) {
// trim it
points.subList(0, size - MAX_RESULT_POINTS / 2).clear();
}
}
}
}
| false | true | public void onDraw(Canvas canvas) {
Rect frame = CameraManager.get().getFramingRect();
if (frame == null) {
return;
}
int width = canvas.getWidth();
int height = canvas.getHeight();
// Draw the exterior (i.e. outside the framing rect) darkened
paint.setColor(resultBitmap != null ? resultColor : maskColor);
canvas.drawRect(0, 0, width, frame.top, paint);
canvas.drawRect(0, frame.top, frame.left, frame.bottom + 1, paint);
canvas.drawRect(frame.right + 1, frame.top, width, frame.bottom + 1, paint);
canvas.drawRect(0, frame.bottom + 1, width, height, paint);
if (resultBitmap != null) {
// Draw the opaque result bitmap over the scanning rectangle
paint.setAlpha(CURRENT_POINT_OPACITY);
canvas.drawBitmap(resultBitmap, null, frame, paint);
} else {
// Draw a two pixel solid black border inside the framing rect
paint.setColor(frameColor);
canvas.drawRect(frame.left, frame.top, frame.right + 1, frame.top + 2, paint);
canvas.drawRect(frame.left, frame.top + 2, frame.left + 2, frame.bottom - 1, paint);
canvas.drawRect(frame.right - 1, frame.top, frame.right + 1, frame.bottom - 1, paint);
canvas.drawRect(frame.left, frame.bottom - 1, frame.right + 1, frame.bottom + 1, paint);
// Draw a red "laser scanner" line through the middle to show decoding is active
paint.setColor(laserColor);
paint.setAlpha(SCANNER_ALPHA[scannerAlpha]);
scannerAlpha = (scannerAlpha + 1) % SCANNER_ALPHA.length;
int middle = frame.height() / 2 + frame.top;
canvas.drawRect(frame.left + 2, middle - 1, frame.right - 1, middle + 2, paint);
Rect previewFrame = CameraManager.get().getFramingRectInPreview();
float scaleX = frame.width() / (float) previewFrame.width();
float scaleY = frame.height() / (float) previewFrame.height();
List<ResultPoint> currentPossible = possibleResultPoints;
List<ResultPoint> currentLast = lastPossibleResultPoints;
int frameLeft = frame.left;
int frameTop = frame.top;
if (currentPossible.isEmpty()) {
lastPossibleResultPoints = null;
} else {
possibleResultPoints = new ArrayList<ResultPoint>(5);
lastPossibleResultPoints = currentPossible;
paint.setAlpha(CURRENT_POINT_OPACITY);
paint.setColor(resultPointColor);
synchronized (currentPossible) {
for (ResultPoint point : currentPossible) {
canvas.drawCircle(frameLeft + (int) (point.getX() * scaleX),
frameTop + (int) (point.getY() * scaleY),
POINT_SIZE, paint);
}
}
}
if (currentLast != null) {
paint.setAlpha(CURRENT_POINT_OPACITY / 2);
paint.setColor(resultPointColor);
synchronized (currentLast) {
for (ResultPoint point : currentLast) {
canvas.drawCircle(frameLeft + (int) (point.getX() * scaleX),
frameTop + (int) (point.getY() * scaleY),
POINT_SIZE / 2, paint);
}
}
}
// Request another update at the animation interval, but only repaint the laser line,
// not the entire viewfinder mask.
postInvalidateDelayed(ANIMATION_DELAY,
frame.left - POINT_SIZE,
frame.top - POINT_SIZE,
frame.right + POINT_SIZE,
frame.bottom + POINT_SIZE);
}
}
| public void onDraw(Canvas canvas) {
CameraManager cameraManager = CameraManager.get();
if (cameraManager == null) {
return;
}
Rect frame = cameraManager.getFramingRect();
if (frame == null) {
return;
}
int width = canvas.getWidth();
int height = canvas.getHeight();
// Draw the exterior (i.e. outside the framing rect) darkened
paint.setColor(resultBitmap != null ? resultColor : maskColor);
canvas.drawRect(0, 0, width, frame.top, paint);
canvas.drawRect(0, frame.top, frame.left, frame.bottom + 1, paint);
canvas.drawRect(frame.right + 1, frame.top, width, frame.bottom + 1, paint);
canvas.drawRect(0, frame.bottom + 1, width, height, paint);
if (resultBitmap != null) {
// Draw the opaque result bitmap over the scanning rectangle
paint.setAlpha(CURRENT_POINT_OPACITY);
canvas.drawBitmap(resultBitmap, null, frame, paint);
} else {
// Draw a two pixel solid black border inside the framing rect
paint.setColor(frameColor);
canvas.drawRect(frame.left, frame.top, frame.right + 1, frame.top + 2, paint);
canvas.drawRect(frame.left, frame.top + 2, frame.left + 2, frame.bottom - 1, paint);
canvas.drawRect(frame.right - 1, frame.top, frame.right + 1, frame.bottom - 1, paint);
canvas.drawRect(frame.left, frame.bottom - 1, frame.right + 1, frame.bottom + 1, paint);
// Draw a red "laser scanner" line through the middle to show decoding is active
paint.setColor(laserColor);
paint.setAlpha(SCANNER_ALPHA[scannerAlpha]);
scannerAlpha = (scannerAlpha + 1) % SCANNER_ALPHA.length;
int middle = frame.height() / 2 + frame.top;
canvas.drawRect(frame.left + 2, middle - 1, frame.right - 1, middle + 2, paint);
Rect previewFrame = cameraManager.getFramingRectInPreview();
float scaleX = frame.width() / (float) previewFrame.width();
float scaleY = frame.height() / (float) previewFrame.height();
List<ResultPoint> currentPossible = possibleResultPoints;
List<ResultPoint> currentLast = lastPossibleResultPoints;
int frameLeft = frame.left;
int frameTop = frame.top;
if (currentPossible.isEmpty()) {
lastPossibleResultPoints = null;
} else {
possibleResultPoints = new ArrayList<ResultPoint>(5);
lastPossibleResultPoints = currentPossible;
paint.setAlpha(CURRENT_POINT_OPACITY);
paint.setColor(resultPointColor);
synchronized (currentPossible) {
for (ResultPoint point : currentPossible) {
canvas.drawCircle(frameLeft + (int) (point.getX() * scaleX),
frameTop + (int) (point.getY() * scaleY),
POINT_SIZE, paint);
}
}
}
if (currentLast != null) {
paint.setAlpha(CURRENT_POINT_OPACITY / 2);
paint.setColor(resultPointColor);
synchronized (currentLast) {
for (ResultPoint point : currentLast) {
canvas.drawCircle(frameLeft + (int) (point.getX() * scaleX),
frameTop + (int) (point.getY() * scaleY),
POINT_SIZE / 2, paint);
}
}
}
// Request another update at the animation interval, but only repaint the laser line,
// not the entire viewfinder mask.
postInvalidateDelayed(ANIMATION_DELAY,
frame.left - POINT_SIZE,
frame.top - POINT_SIZE,
frame.right + POINT_SIZE,
frame.bottom + POINT_SIZE);
}
}
|
diff --git a/src/ibis/impl/messagePassing/SerializeSendPort.java b/src/ibis/impl/messagePassing/SerializeSendPort.java
index fd87c577..928acc89 100644
--- a/src/ibis/impl/messagePassing/SerializeSendPort.java
+++ b/src/ibis/impl/messagePassing/SerializeSendPort.java
@@ -1,112 +1,112 @@
package ibis.ipl.impl.messagePassing;
import java.io.BufferedOutputStream;
import java.io.ObjectOutputStream;
import java.io.IOException;
import ibis.ipl.IbisException;
import ibis.ipl.ConnectionTimedOutException;
import ibis.ipl.ConnectionRefusedException;
import ibis.ipl.Replacer;
final public class SerializeSendPort extends SendPort {
ibis.io.SunSerializationOutputStream obj_out;
SerializeSendPort() {
}
public SerializeSendPort(PortType type, String name, OutputConnection conn, Replacer r)
throws IOException {
super(type, name, conn, r,
true, /* syncMode */
true /* makeCopy */);
if (Ibis.DEBUG) {
System.err.println("/////////// Created a new SerializeSendPort " + this);
}
}
public void connect(ibis.ipl.ReceivePortIdentifier receiver,
- int timeout)
+ long timeout)
throws IOException {
// Reset all our previous connections so the
// ObjectStream(BufferedStream()) may go through a stop/restart.
if (obj_out != null) {
obj_out.reset();
}
Ibis.myIbis.lock();
try {
// Add the new receiver to our tables.
int my_split = addConnection((ReceivePortIdentifier)receiver);
byte[] sf = ident.getSerialForm();
for (int i = 0; i < my_split; i++) {
ReceivePortIdentifier r = splitter[i];
outConn.ibmp_disconnect(r.cpu,
r.getSerialForm(),
sf,
messageCount);
}
messageCount = 0;
for (int i = 0; i < splitter.length; i++) {
ReceivePortIdentifier r = splitter[i];
if (Ibis.DEBUG) {
System.err.println(Thread.currentThread() + "Now do native connect call to " + r + "; me = " + ident);
System.err.println("Ibis.myIbis " + Ibis.myIbis);
System.err.println("Ibis.myIbis.identifier() " + Ibis.myIbis.identifier());
System.err.println("Ibis.myIbis.identifier().name() " + Ibis.myIbis.identifier().name());
}
outConn.ibmp_connect(r.cpu,
r.getSerialForm(),
ident.getSerialForm(),
i == my_split ? syncer[i] : null);
if (Ibis.DEBUG) {
System.err.println(Thread.currentThread() + "Done native connect call to " + r + "; me = " + ident);
}
}
if (! syncer[my_split].s_wait(timeout)) {
throw new ConnectionTimedOutException("No connection to " + receiver);
}
if (! syncer[my_split].accepted) {
throw new ConnectionRefusedException("No connection to " + receiver);
}
} finally {
Ibis.myIbis.unlock();
}
obj_out = new ibis.io.SunSerializationOutputStream(new BufferedOutputStream((java.io.OutputStream)out));
if (replacer != null) {
obj_out.setReplacer(replacer);
}
if (message != null) {
((SerializeWriteMessage)message).obj_out = obj_out;
}
obj_out.flush();
Ibis.myIbis.lock();
try {
out.send(true);
out.reset(true);
} finally {
Ibis.myIbis.unlock();
}
if (Ibis.DEBUG) {
System.err.println(Thread.currentThread() + ">>>>>>>>>>>> Created ObjectOutputStream " + obj_out + " on top of " + out);
}
}
ibis.ipl.WriteMessage cachedMessage() throws IOException {
if (message == null) {
message = new SerializeWriteMessage(this);
}
return message;
}
}
| true | true | public void connect(ibis.ipl.ReceivePortIdentifier receiver,
int timeout)
throws IOException {
// Reset all our previous connections so the
// ObjectStream(BufferedStream()) may go through a stop/restart.
if (obj_out != null) {
obj_out.reset();
}
Ibis.myIbis.lock();
try {
// Add the new receiver to our tables.
int my_split = addConnection((ReceivePortIdentifier)receiver);
byte[] sf = ident.getSerialForm();
for (int i = 0; i < my_split; i++) {
ReceivePortIdentifier r = splitter[i];
outConn.ibmp_disconnect(r.cpu,
r.getSerialForm(),
sf,
messageCount);
}
messageCount = 0;
for (int i = 0; i < splitter.length; i++) {
ReceivePortIdentifier r = splitter[i];
if (Ibis.DEBUG) {
System.err.println(Thread.currentThread() + "Now do native connect call to " + r + "; me = " + ident);
System.err.println("Ibis.myIbis " + Ibis.myIbis);
System.err.println("Ibis.myIbis.identifier() " + Ibis.myIbis.identifier());
System.err.println("Ibis.myIbis.identifier().name() " + Ibis.myIbis.identifier().name());
}
outConn.ibmp_connect(r.cpu,
r.getSerialForm(),
ident.getSerialForm(),
i == my_split ? syncer[i] : null);
if (Ibis.DEBUG) {
System.err.println(Thread.currentThread() + "Done native connect call to " + r + "; me = " + ident);
}
}
if (! syncer[my_split].s_wait(timeout)) {
throw new ConnectionTimedOutException("No connection to " + receiver);
}
if (! syncer[my_split].accepted) {
throw new ConnectionRefusedException("No connection to " + receiver);
}
} finally {
Ibis.myIbis.unlock();
}
obj_out = new ibis.io.SunSerializationOutputStream(new BufferedOutputStream((java.io.OutputStream)out));
if (replacer != null) {
obj_out.setReplacer(replacer);
}
if (message != null) {
((SerializeWriteMessage)message).obj_out = obj_out;
}
obj_out.flush();
Ibis.myIbis.lock();
try {
out.send(true);
out.reset(true);
} finally {
Ibis.myIbis.unlock();
}
if (Ibis.DEBUG) {
System.err.println(Thread.currentThread() + ">>>>>>>>>>>> Created ObjectOutputStream " + obj_out + " on top of " + out);
}
}
| public void connect(ibis.ipl.ReceivePortIdentifier receiver,
long timeout)
throws IOException {
// Reset all our previous connections so the
// ObjectStream(BufferedStream()) may go through a stop/restart.
if (obj_out != null) {
obj_out.reset();
}
Ibis.myIbis.lock();
try {
// Add the new receiver to our tables.
int my_split = addConnection((ReceivePortIdentifier)receiver);
byte[] sf = ident.getSerialForm();
for (int i = 0; i < my_split; i++) {
ReceivePortIdentifier r = splitter[i];
outConn.ibmp_disconnect(r.cpu,
r.getSerialForm(),
sf,
messageCount);
}
messageCount = 0;
for (int i = 0; i < splitter.length; i++) {
ReceivePortIdentifier r = splitter[i];
if (Ibis.DEBUG) {
System.err.println(Thread.currentThread() + "Now do native connect call to " + r + "; me = " + ident);
System.err.println("Ibis.myIbis " + Ibis.myIbis);
System.err.println("Ibis.myIbis.identifier() " + Ibis.myIbis.identifier());
System.err.println("Ibis.myIbis.identifier().name() " + Ibis.myIbis.identifier().name());
}
outConn.ibmp_connect(r.cpu,
r.getSerialForm(),
ident.getSerialForm(),
i == my_split ? syncer[i] : null);
if (Ibis.DEBUG) {
System.err.println(Thread.currentThread() + "Done native connect call to " + r + "; me = " + ident);
}
}
if (! syncer[my_split].s_wait(timeout)) {
throw new ConnectionTimedOutException("No connection to " + receiver);
}
if (! syncer[my_split].accepted) {
throw new ConnectionRefusedException("No connection to " + receiver);
}
} finally {
Ibis.myIbis.unlock();
}
obj_out = new ibis.io.SunSerializationOutputStream(new BufferedOutputStream((java.io.OutputStream)out));
if (replacer != null) {
obj_out.setReplacer(replacer);
}
if (message != null) {
((SerializeWriteMessage)message).obj_out = obj_out;
}
obj_out.flush();
Ibis.myIbis.lock();
try {
out.send(true);
out.reset(true);
} finally {
Ibis.myIbis.unlock();
}
if (Ibis.DEBUG) {
System.err.println(Thread.currentThread() + ">>>>>>>>>>>> Created ObjectOutputStream " + obj_out + " on top of " + out);
}
}
|
diff --git a/extras/appgen/src/org/example/antbook/xdoclet/FormTagsHandler.java b/extras/appgen/src/org/example/antbook/xdoclet/FormTagsHandler.java
index 41b50b14..60c79987 100644
--- a/extras/appgen/src/org/example/antbook/xdoclet/FormTagsHandler.java
+++ b/extras/appgen/src/org/example/antbook/xdoclet/FormTagsHandler.java
@@ -1,359 +1,365 @@
package org.example.antbook.xdoclet;
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.Properties;
import java.util.LinkedHashMap;
import xdoclet.XDocletException;
import xdoclet.tagshandler.AbstractProgramElementTagsHandler;
import xdoclet.tagshandler.MethodTagsHandler;
import xjavadoc.XClass;
import xjavadoc.XMethod;
import xjavadoc.XParameter;
public class FormTagsHandler extends AbstractProgramElementTagsHandler {
private final static List supportedTypes = new ArrayList();
private String curFieldName;
private String curType;
private boolean curFieldIsIdorVersion = false;
private boolean curFieldIsBoolean = false;
static {
supportedTypes.add("java.lang.String");
supportedTypes.add("java.lang.Integer");
supportedTypes.add("int");
supportedTypes.add("java.lang.Float");
supportedTypes.add("float");
supportedTypes.add("java.lang.Long");
supportedTypes.add("long");
supportedTypes.add("java.lang.Double");
supportedTypes.add("double");
supportedTypes.add("java.lang.Boolean");
supportedTypes.add("boolean");
supportedTypes.add("java.util.Date");
supportedTypes.add("java.sql.Timestamp");
}
/**
* Gets the package name for the parent of this Package.
* @author Lance Lavandowska
*/
public String parentPackageName() {
String packageName = getCurrentPackage().getName();
return packageName.substring(0, packageName.lastIndexOf("."));
}
/**
* Gets the package name for the parent of this Package in directory format.
* @return Parent package path.
*/
public String parentPackageDir() {
return parentPackageName().replace('.', '/');
}
/**
* Iterates the body for each field of the current form requiring validation.
*
* @param template
* @param attributes
* @throws XDocletException
*/
public void forAllFields(String template, Properties attributes) throws XDocletException {
XClass clazz = getCurrentClass();
Map setters = new LinkedHashMap(getFields(clazz));
for (Iterator iterator = setters.keySet().iterator(); iterator.hasNext();) {
curFieldName = (String) iterator.next();
XMethod field = (XMethod) setters.get(curFieldName);
XMethod getter = field.getAccessor();
setCurrentMethod(getter);
curFieldIsIdorVersion = false;
- Properties pro = new Properties();
- pro.setProperty("tagName", "hibernate.id");
+ Properties prop = new Properties();
+ prop.setProperty("tagName", "hibernate.id");
- if (hasTag(pro, FOR_METHOD)) {
- curFieldIsIdorVersion = true;
+ if (hasTag(prop, FOR_METHOD)) {
+ prop.setProperty("paramName", "generator-class");
+ String generatorClass = methodTagValue(prop);
+ if (generatorClass == null || generatorClass.equals("assigned")) {
+ curFieldIsIdorVersion = false;
+ } else {
+ curFieldIsIdorVersion = true;
+ }
} else {
curFieldIsIdorVersion = false;
}
- pro.setProperty("tagName", "hibernate.version");
+ prop.setProperty("tagName", "hibernate.version");
- if (hasTag(pro, FOR_METHOD)) {
+ if (hasTag(prop, FOR_METHOD)) {
curFieldIsIdorVersion = true;
}
String typename = field.getPropertyType().getType().getQualifiedName();
curFieldIsBoolean = typename.equals("boolean") || typename.equals("java.lang.Boolean");
curType = typename;
setCurrentMethod(field);
generate(template);
}
}
/**
* This method is added so that I can pick up a boolean field. When
* generating a form page, checkbox is used for boolean fields.
*
* @author hzhang([email protected])
* @param template
* @param attributes
* @throws XDocletException
*/
public void ifIsBooleanField(String template, Properties attributes) throws XDocletException {
if (curFieldIsBoolean)
generate(template);
}
/**
* Method ifIsNotBooleanField
*
* @param template
* @param attributes
*
* @throws XDocletException
*
*/
public void ifIsNotBooleanField(String template, Properties attributes) throws XDocletException {
if (!curFieldIsBoolean)
generate(template);
}
/**
* This method is used to determine id fields - this is used in the view
* pages to set the ids as hidden fields.
*
* @param template
* @param attributes
* @throws XDocletException
*/
public void ifIsIdOrVersionField(String template, Properties attributes) throws XDocletException {
if (curFieldIsIdorVersion) {
generate(template);
}
}
/**
* Method ifIsNotIdField
*
* @param template
* @param attributes
*
* @throws XDocletException
*/
public void ifIsNotIdOrVersionField(String template, Properties attributes) throws XDocletException {
if (!curFieldIsIdorVersion) {
generate(template);
}
}
/**
* Method ifFieldNameEquals
*
* @param template
* @param attributes
*
* @throws XDocletException
*/
public void ifFieldNameEquals(String template, Properties attributes) throws XDocletException{
String name = attributes.getProperty("name");
if ((name != null) && name.equals(curFieldName)) {
generate(template);
}
}
/**
* Method ifFieldNameNotEquals
*
* @param template
* @param attributes
*
* @throws XDocletException
*/
public void ifFieldNameNotEquals(String template, Properties attributes) throws XDocletException {
String name = attributes.getProperty("name");
if ((name != null) && !name.equals(curFieldName)) {
generate(template);
}
}
/**
* Method methodTagValue
* @param attributes
* @return
* @throws XDocletException
*/
public String methodTagValue(Properties attributes) throws XDocletException {
XMethod method = getCurrentMethod();
setCurrentMethod(method.getAccessor());
String value = getTagValue(attributes, FOR_METHOD);
setCurrentMethod(method);
return value;
}
/**
* Method columnName
* @param attributes
* @return
* @throws XDocletException
*/
public String columnName(Properties attributes) throws XDocletException {
Properties prop = new Properties();
prop.setProperty("tagName", "hibernate.property");
prop.setProperty("paramName", "column");
String column = methodTagValue(prop);
if ((column == null) || (column.trim().length() < 1)) {
prop.setProperty("tagName", "hibernate.id");
column = methodTagValue(prop);
}
return column;
}
/**
* Returns the current fields name.
*
* @param props
* @return
*/
public String fieldName(Properties props) {
return curFieldName;
}
/**
* Returns the current field's java type.
* @param props
* @return
*/
public String javaType(Properties props) {
return curType;
}
/**
* Returns the current field's jdbc type
* @param props
* @return
*/
public String jdbcType(Properties props) {
String jdbcType = "VARCHAR";
if (curType != null) {
String javaType = curType.toLowerCase();
if (javaType.indexOf("date") > 0) {
jdbcType = "TIMESTAMP";
} else if (javaType.indexOf("timestamp") > 0) {
jdbcType = "TIMESTAMP";
} else if ((javaType.indexOf("int") > 0) || (javaType.indexOf("long") > 0) || (javaType.indexOf("short") > 0)) {
jdbcType = "INTEGER";
} else if (javaType.indexOf("double") > 0) {
jdbcType = "DOUBLE";
} else if (javaType.indexOf("float") > 0) {
jdbcType = "FLOAT";
}
}
return jdbcType;
}
/**
* @return Classname of the POJO with first letter in lowercase
*/
public String classNameLower() {
String name = getCurrentClass().getName();
return Character.toLowerCase(name.charAt(0)) + name.substring(1);
}
public String className() {
return getCurrentClass().getName();
}
/**
* Name of the POJO in UPPERCASE, for usage in Constants.java.
* @return
*/
public String classNameUpper() {
String name = getCurrentClass().getName();
return name.toUpperCase();
}
public String fieldDescription(Properties props) {
StringBuffer buffer = new StringBuffer();
boolean nextUpper = false;
for (int i = 0; i < curFieldName.length(); i++) {
char c = curFieldName.charAt(i);
if (i == 0) {
buffer.append(Character.toUpperCase(c));
continue;
}
if (Character.isUpperCase(c)) {
buffer.append(' ');
buffer.append(c);
continue;
}
if (c == '.') {
buffer.delete(0, buffer.length());
nextUpper = true;
continue;
}
char x = nextUpper ? Character.toUpperCase(c) : c;
buffer.append(x);
nextUpper = false;
}
return buffer.toString();
}
private Map getFields(XClass clazz) throws XDocletException {
return getFields(clazz, "");
}
private Map getFields(XClass clazz, String prefix) throws XDocletException {
Map fields = new LinkedHashMap();
Collection curFields = clazz.getMethods(true);
for (Iterator iterator = curFields.iterator(); iterator.hasNext();) {
XMethod setter = (XMethod) iterator.next();
if (MethodTagsHandler.isSetterMethod(setter)) {
String name = MethodTagsHandler.getPropertyNameFor(setter);
XParameter param = (XParameter) setter.getParameters().iterator().next();
String type = param.getType().getQualifiedName();
XMethod getter = setter.getAccessor();
setCurrentClass(setter.getContainingClass());
super.setCurrentMethod(getter);
Properties pro = new Properties();
pro.setProperty("tagName", "hibernate.component");
if (super.hasTag(pro, FOR_METHOD)) {
name += "Form";
fields.putAll(getFields(param.getType(), prefix + name + "."));
} else {
fields.put(prefix + name, setter);
}
}
}
return fields;
}
}
| false | true | public void forAllFields(String template, Properties attributes) throws XDocletException {
XClass clazz = getCurrentClass();
Map setters = new LinkedHashMap(getFields(clazz));
for (Iterator iterator = setters.keySet().iterator(); iterator.hasNext();) {
curFieldName = (String) iterator.next();
XMethod field = (XMethod) setters.get(curFieldName);
XMethod getter = field.getAccessor();
setCurrentMethod(getter);
curFieldIsIdorVersion = false;
Properties pro = new Properties();
pro.setProperty("tagName", "hibernate.id");
if (hasTag(pro, FOR_METHOD)) {
curFieldIsIdorVersion = true;
} else {
curFieldIsIdorVersion = false;
}
pro.setProperty("tagName", "hibernate.version");
if (hasTag(pro, FOR_METHOD)) {
curFieldIsIdorVersion = true;
}
String typename = field.getPropertyType().getType().getQualifiedName();
curFieldIsBoolean = typename.equals("boolean") || typename.equals("java.lang.Boolean");
curType = typename;
setCurrentMethod(field);
generate(template);
}
}
| public void forAllFields(String template, Properties attributes) throws XDocletException {
XClass clazz = getCurrentClass();
Map setters = new LinkedHashMap(getFields(clazz));
for (Iterator iterator = setters.keySet().iterator(); iterator.hasNext();) {
curFieldName = (String) iterator.next();
XMethod field = (XMethod) setters.get(curFieldName);
XMethod getter = field.getAccessor();
setCurrentMethod(getter);
curFieldIsIdorVersion = false;
Properties prop = new Properties();
prop.setProperty("tagName", "hibernate.id");
if (hasTag(prop, FOR_METHOD)) {
prop.setProperty("paramName", "generator-class");
String generatorClass = methodTagValue(prop);
if (generatorClass == null || generatorClass.equals("assigned")) {
curFieldIsIdorVersion = false;
} else {
curFieldIsIdorVersion = true;
}
} else {
curFieldIsIdorVersion = false;
}
prop.setProperty("tagName", "hibernate.version");
if (hasTag(prop, FOR_METHOD)) {
curFieldIsIdorVersion = true;
}
String typename = field.getPropertyType().getType().getQualifiedName();
curFieldIsBoolean = typename.equals("boolean") || typename.equals("java.lang.Boolean");
curType = typename;
setCurrentMethod(field);
generate(template);
}
}
|
diff --git a/plugins/org.eclipse.birt.data.aggregation/src/org/eclipse/birt/data/aggregation/impl/ParameterDefn.java b/plugins/org.eclipse.birt.data.aggregation/src/org/eclipse/birt/data/aggregation/impl/ParameterDefn.java
index cfc453f05..d6addfec1 100644
--- a/plugins/org.eclipse.birt.data.aggregation/src/org/eclipse/birt/data/aggregation/impl/ParameterDefn.java
+++ b/plugins/org.eclipse.birt.data.aggregation/src/org/eclipse/birt/data/aggregation/impl/ParameterDefn.java
@@ -1,172 +1,172 @@
/*******************************************************************************
* Copyright (c) 2004, 2008 Actuate Corporation.
* 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:
* Actuate Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.birt.data.aggregation.impl;
import org.eclipse.birt.core.data.DataType;
import org.eclipse.birt.data.engine.api.aggregation.IParameterDefn;
/**
*
*/
public class ParameterDefn implements IParameterDefn
{
private String name;
private boolean isOptional = false;
private boolean isDataField = false;
private String displayName;
private String description;
private int[] supportedDataTypes;
/**
*
* @param name
* @param displayName
* @param isOptional
* @param isDataField
* @param supportedDataTypes
* @param description
*/
public ParameterDefn( String name, String displayName, boolean isOptional,
boolean isDataField, int[] supportedDataTypes, String description )
{
assert name != null;
assert supportedDataTypes!= null;
this.name = name;
this.isOptional = isOptional;
this.isDataField = isDataField;
this.displayName = displayName;
this.supportedDataTypes = supportedDataTypes;
this.description = description;
}
/**
* @param isOptional
* the isOptional to set
*/
public void setOptional( boolean isOptional )
{
this.isOptional = isOptional;
}
/**
* @param isDataField
* the isDataField to set
*/
public void setDataField( boolean isDataField )
{
this.isDataField = isDataField;
}
/**
* @param displayName
* the displayName to set
*/
public void setDisplayName( String displayName )
{
this.displayName = displayName;
}
/**
* @param description
* the description to set
*/
public void setDescription( String description )
{
this.description = description;
}
/*
* (non-Javadoc)
* @see org.eclipse.birt.data.engine.api.aggregation.IParameterDefn#getName()
*/
public String getName( )
{
return name;
}
/**
* @param name the name to set
*/
public void setName( String name )
{
this.name = name;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.birt.data.engine.api.aggregation.IParameterDefn#getDescription()
*/
public String getDescription( )
{
return description;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.birt.data.engine.api.aggregation.IParameterDefn#getDisplayName()
*/
public String getDisplayName( )
{
return displayName;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.birt.data.engine.api.aggregation.IParameterDefn#isDataField()
*/
public boolean isDataField( )
{
return isDataField;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.birt.data.engine.api.aggregation.IParameterDefn#isOptional()
*/
public boolean isOptional( )
{
return isOptional;
}
/*
* (non-Javadoc)
* @see org.eclipse.birt.data.engine.api.aggregation.IParameterDefn#supportDataType(int)
*/
public boolean supportDataType( int dataType )
{
- if( dataType == DataType.ANY_TYPE || dataType == DataType.UNKNOWN_TYPE )
+ if( dataType == DataType.UNKNOWN_TYPE )
return true;
for ( int i = 0; i < supportedDataTypes.length; i++ )
{
- if ( supportedDataTypes[i] == dataType )
+ if ( supportedDataTypes[i] == DataType.ANY_TYPE || supportedDataTypes[i] == dataType )
{
return true;
}
}
return false;
}
}
| false | true | public boolean supportDataType( int dataType )
{
if( dataType == DataType.ANY_TYPE || dataType == DataType.UNKNOWN_TYPE )
return true;
for ( int i = 0; i < supportedDataTypes.length; i++ )
{
if ( supportedDataTypes[i] == dataType )
{
return true;
}
}
return false;
}
| public boolean supportDataType( int dataType )
{
if( dataType == DataType.UNKNOWN_TYPE )
return true;
for ( int i = 0; i < supportedDataTypes.length; i++ )
{
if ( supportedDataTypes[i] == DataType.ANY_TYPE || supportedDataTypes[i] == dataType )
{
return true;
}
}
return false;
}
|
diff --git a/main/src/cgeo/geocaching/connector/ec/ECApi.java b/main/src/cgeo/geocaching/connector/ec/ECApi.java
index 94936e461..d059813e8 100644
--- a/main/src/cgeo/geocaching/connector/ec/ECApi.java
+++ b/main/src/cgeo/geocaching/connector/ec/ECApi.java
@@ -1,226 +1,230 @@
package cgeo.geocaching.connector.ec;
import cgeo.geocaching.DataStore;
import cgeo.geocaching.Geocache;
import cgeo.geocaching.connector.LogResult;
import cgeo.geocaching.enumerations.CacheSize;
import cgeo.geocaching.enumerations.CacheType;
import cgeo.geocaching.enumerations.LoadFlags.SaveFlag;
import cgeo.geocaching.enumerations.LogType;
import cgeo.geocaching.enumerations.StatusCode;
import cgeo.geocaching.files.GPX10Parser;
import cgeo.geocaching.geopoint.Geopoint;
import cgeo.geocaching.geopoint.Viewport;
import cgeo.geocaching.list.StoredList;
import cgeo.geocaching.network.Network;
import cgeo.geocaching.network.Parameters;
import cgeo.geocaching.utils.Log;
import ch.boye.httpclientandroidlib.HttpResponse;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.FastDateFormat;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
public class ECApi {
private static final String API_HOST = "https://extremcaching.com/exports/";
private static final FastDateFormat LOG_DATE_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss.SSSZ", TimeZone.getTimeZone("UTC"), Locale.US);
public static String getIdFromGeocode(final String geocode) {
return StringUtils.removeStartIgnoreCase(geocode, "EC");
}
public static Geocache searchByGeoCode(final String geocode) {
final Parameters params = new Parameters("id", getIdFromGeocode(geocode));
final HttpResponse response = apiRequest("gpx.php", params);
final Collection<Geocache> caches = importCachesFromGPXResponse(response);
if (CollectionUtils.isNotEmpty(caches)) {
return caches.iterator().next();
}
return null;
}
public static Collection<Geocache> searchByBBox(final Viewport viewport) {
if (viewport.getLatitudeSpan() == 0 || viewport.getLongitudeSpan() == 0) {
return Collections.emptyList();
}
final Parameters params = new Parameters("fnc", "bbox");
params.add("lat1", String.valueOf(viewport.getLatitudeMin()));
params.add("lat2", String.valueOf(viewport.getLatitudeMax()));
params.add("lon1", String.valueOf(viewport.getLongitudeMin()));
params.add("lon2", String.valueOf(viewport.getLongitudeMax()));
final HttpResponse response = apiRequest(params);
return importCachesFromJSON(response);
}
public static Collection<Geocache> searchByCenter(final Geopoint center) {
final Parameters params = new Parameters("fnc", "center");
params.add("distance", "20");
params.add("lat", String.valueOf(center.getLatitude()));
params.add("lon", String.valueOf(center.getLongitude()));
final HttpResponse response = apiRequest(params);
return importCachesFromJSON(response);
}
public static LogResult postLog(final Geocache cache, final LogType logType, final Calendar date, final String log) {
return postLog(cache, logType, date, log, false);
}
public static LogResult postLog(final Geocache cache, final LogType logType, final Calendar date, final String log, boolean isRetry) {
final Parameters params = new Parameters("cache_id", cache.getGeocode());
params.add("type", logType.type);
params.add("log", log);
params.add("date", LOG_DATE_FORMAT.format(date.getTime()));
+ params.add("sid", ECLogin.getInstance().getSessionId());
final String uri = API_HOST + "log.php";
final HttpResponse response = Network.postRequest(uri, params);
if (response == null) {
return new LogResult(StatusCode.LOG_POST_ERROR_EC, "");
}
if (!isRetry && response.getStatusLine().getStatusCode() == 403) {
if (ECLogin.getInstance().login() == StatusCode.NO_ERROR) {
apiRequest(uri, params, true);
}
}
if (response.getStatusLine().getStatusCode() != 200) {
return new LogResult(StatusCode.LOG_POST_ERROR_EC, "");
}
final String data = Network.getResponseDataAlways(response);
if (!StringUtils.isBlank(data) && StringUtils.contains(data, "success")) {
+ if (logType == LogType.FOUND_IT || logType == LogType.ATTENDED) {
+ ECLogin.getInstance().setActualCachesFound(ECLogin.getInstance().getActualCachesFound() + 1);
+ }
final String uid = StringUtils.remove(data, "success:");
return new LogResult(StatusCode.NO_ERROR, uid);
}
return new LogResult(StatusCode.LOG_POST_ERROR_EC, "");
}
private static HttpResponse apiRequest(final Parameters params) {
return apiRequest("api.php", params);
}
private static HttpResponse apiRequest(final String uri, final Parameters params) {
return apiRequest(uri, params, false);
}
private static HttpResponse apiRequest(final String uri, final Parameters params, final boolean isRetry) {
// add session and cgeo marker on every request
if (!isRetry) {
params.add("cgeo", "1");
params.add("sid", ECLogin.getInstance().getSessionId());
}
final HttpResponse response = Network.getRequest(API_HOST + uri, params);
if (response == null) {
return null;
}
// retry at most one time
if (!isRetry && response.getStatusLine().getStatusCode() == 403) {
if (ECLogin.getInstance().login() == StatusCode.NO_ERROR) {
return apiRequest(uri, params, true);
}
}
if (response.getStatusLine().getStatusCode() != 200) {
return null;
}
return response;
}
private static Collection<Geocache> importCachesFromGPXResponse(final HttpResponse response) {
if (response == null) {
return Collections.emptyList();
}
try {
return new GPX10Parser(StoredList.TEMPORARY_LIST_ID).parse(response.getEntity().getContent(), null);
} catch (Exception e) {
Log.e("Error importing gpx from extremcaching.com", e);
return Collections.emptyList();
}
}
private static List<Geocache> importCachesFromJSON(final HttpResponse response) {
if (response != null) {
try {
final String data = Network.getResponseDataAlways(response);
if (StringUtils.isBlank(data) || StringUtils.equals(data, "[]")) {
return Collections.emptyList();
}
final JSONArray json = new JSONArray(data);
final int len = json.length();
final List<Geocache> caches = new ArrayList<Geocache>(len);
for (int i = 0; i < len; i++) {
final Geocache cache = parseCache(json.getJSONObject(i));
if (cache != null) {
caches.add(cache);
}
}
return caches;
} catch (final JSONException e) {
Log.w("JSONResult", e);
}
}
return Collections.emptyList();
}
private static Geocache parseCache(final JSONObject response) {
final Geocache cache = new Geocache();
cache.setReliableLatLon(true);
try {
cache.setGeocode("EC" + response.getString("cache_id"));
cache.setName(response.getString("title"));
cache.setCoords(new Geopoint(response.getString("lat"), response.getString("lon")));
cache.setType(getCacheType(response.getString("type")));
cache.setDifficulty((float) response.getDouble("difficulty"));
cache.setTerrain((float) response.getDouble("terrain"));
cache.setSize(CacheSize.getById(response.getString("size")));
cache.setFound(response.getInt("found") == 1);
DataStore.saveCache(cache, EnumSet.of(SaveFlag.SAVE_CACHE));
} catch (final JSONException e) {
Log.e("ECApi.parseCache", e);
return null;
}
return cache;
}
private static CacheType getCacheType(final String cacheType) {
if (cacheType.equalsIgnoreCase("Tradi")) {
return CacheType.TRADITIONAL;
}
if (cacheType.equalsIgnoreCase("Multi")) {
return CacheType.MULTI;
}
if (cacheType.equalsIgnoreCase("Event")) {
return CacheType.EVENT;
}
if (cacheType.equalsIgnoreCase("Mystery")) {
return CacheType.MYSTERY;
}
return CacheType.UNKNOWN;
}
}
| false | true | public static LogResult postLog(final Geocache cache, final LogType logType, final Calendar date, final String log, boolean isRetry) {
final Parameters params = new Parameters("cache_id", cache.getGeocode());
params.add("type", logType.type);
params.add("log", log);
params.add("date", LOG_DATE_FORMAT.format(date.getTime()));
final String uri = API_HOST + "log.php";
final HttpResponse response = Network.postRequest(uri, params);
if (response == null) {
return new LogResult(StatusCode.LOG_POST_ERROR_EC, "");
}
if (!isRetry && response.getStatusLine().getStatusCode() == 403) {
if (ECLogin.getInstance().login() == StatusCode.NO_ERROR) {
apiRequest(uri, params, true);
}
}
if (response.getStatusLine().getStatusCode() != 200) {
return new LogResult(StatusCode.LOG_POST_ERROR_EC, "");
}
final String data = Network.getResponseDataAlways(response);
if (!StringUtils.isBlank(data) && StringUtils.contains(data, "success")) {
final String uid = StringUtils.remove(data, "success:");
return new LogResult(StatusCode.NO_ERROR, uid);
}
return new LogResult(StatusCode.LOG_POST_ERROR_EC, "");
}
| public static LogResult postLog(final Geocache cache, final LogType logType, final Calendar date, final String log, boolean isRetry) {
final Parameters params = new Parameters("cache_id", cache.getGeocode());
params.add("type", logType.type);
params.add("log", log);
params.add("date", LOG_DATE_FORMAT.format(date.getTime()));
params.add("sid", ECLogin.getInstance().getSessionId());
final String uri = API_HOST + "log.php";
final HttpResponse response = Network.postRequest(uri, params);
if (response == null) {
return new LogResult(StatusCode.LOG_POST_ERROR_EC, "");
}
if (!isRetry && response.getStatusLine().getStatusCode() == 403) {
if (ECLogin.getInstance().login() == StatusCode.NO_ERROR) {
apiRequest(uri, params, true);
}
}
if (response.getStatusLine().getStatusCode() != 200) {
return new LogResult(StatusCode.LOG_POST_ERROR_EC, "");
}
final String data = Network.getResponseDataAlways(response);
if (!StringUtils.isBlank(data) && StringUtils.contains(data, "success")) {
if (logType == LogType.FOUND_IT || logType == LogType.ATTENDED) {
ECLogin.getInstance().setActualCachesFound(ECLogin.getInstance().getActualCachesFound() + 1);
}
final String uid = StringUtils.remove(data, "success:");
return new LogResult(StatusCode.NO_ERROR, uid);
}
return new LogResult(StatusCode.LOG_POST_ERROR_EC, "");
}
|
diff --git a/src/com/nullprogram/wheel/ChaosWheel.java b/src/com/nullprogram/wheel/ChaosWheel.java
index 79b731c..d84b64a 100644
--- a/src/com/nullprogram/wheel/ChaosWheel.java
+++ b/src/com/nullprogram/wheel/ChaosWheel.java
@@ -1,434 +1,434 @@
/* Copyright (c) 2010 Christopher Wellons <[email protected]>
*
* Permission to use, copy, modify, and distribute this software for
* any purpose with or without fee is hereby granted, provided that
* the above copyright notice and this permission notice appear in all
* copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
* WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
package com.nullprogram.wheel;
import java.util.Vector;
import java.util.ArrayDeque;
import java.util.Iterator;
import java.util.Random;
import java.awt.Color;
import java.awt.Graphics;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseListener;
import java.awt.event.MouseEvent;
import javax.swing.Timer;
import javax.swing.JFrame;
import javax.swing.JComponent;
/**
* Simulates and displays a chaotic water wheel.
*
* Left-clicking adds a bucket and right-clicking removes a
* bucket. The simulation discrete steps are uniform, making this a
* bit rudimentary.
*
* This code is based on a Matlab program written by my friend Michael
* Abraham.
*/
public class ChaosWheel extends JComponent implements MouseListener {
private static final long serialVersionUID = 4764158473501226728L;
/* Simulation constants. */
private static final int SIZE = 300; // display size in pixels
private static final int DELAY = 30; // milliseconds
private static final int DEFAULT_BUCKETS = 9;
private static final int MIN_BUCKETS = 5;
/* Simulation parameters. */
private double radius = 1; // feet
private double wheelIntertia = .1; // slug * ft ^ 2
private double damping = 2.5; // ft * lbs / radians / sec
private double gravity = 10.7; // ft / sec ^ 2
private double bucketFull = 1.0; // slug
private double drainRate = 0.3; // slug / sec / slug
private double fillRate = 0.33; // slug / sec
/* Current state of the wheel. */
private double theta; // radians
private double thetadot; // radians / sec
private Vector<Double> buckets; // slug
private Timer timer;
private boolean graphMode;
/* Histotic state information. */
private static final int MAX_HISTORY = 1000;
private ArrayDeque<Double> rlRatio; // left/right water ratio
private ArrayDeque<Double> tbRatio; // top/bottom water ratio
private double rlRatioMax = 0;
private double rlRatioMin = 0;
private double tbRatioMax = 0;
private double tbRatioMin = 0;
/**
* Create a water wheel with the default number of buckets.
*/
public ChaosWheel() {
this(DEFAULT_BUCKETS);
}
/**
* Create a water wheel with a specific number of buckets.
*
* @param numBuckets number of buckets.
*/
public ChaosWheel(final int numBuckets) {
Random rng = new Random();
theta = rng.nextDouble() * 2d * Math.PI;
thetadot = (rng.nextDouble() - 0.5);
buckets = new Vector<Double>();
for (int i = 0; i < numBuckets; i++) {
buckets.add(0d);
}
rlRatio = new ArrayDeque<Double>();
tbRatio = new ArrayDeque<Double>();
setPreferredSize(new Dimension(SIZE, SIZE));
addMouseListener(this);
ActionListener listener = new ActionListener() {
public void actionPerformed(final ActionEvent evt) {
updateState(DELAY / 1000.0);
repaint();
}
};
graphMode = false;
timer = new Timer(DELAY, listener);
}
/**
* The main function when running standalone.
*
* @param args command line arguments
*/
public static void main(final String[] args) {
JFrame frame = new JFrame("Lorenz Water Wheel");
ChaosWheel wheel = null;
if (args.length == 0) {
wheel = new ChaosWheel();
} else {
int num = 0;
try {
num = Integer.parseInt(args[0]);
} catch (NumberFormatException e) {
System.out.println("Argument must be an integer.");
System.exit(1);
}
if (num < MIN_BUCKETS) {
System.out.println("Minimum # of buckets: " + MIN_BUCKETS);
System.exit(1);
}
wheel = new ChaosWheel(num);
}
frame.add(wheel);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.pack();
frame.setVisible(true);
wheel.start();
}
/**
* Draw the water wheel to the display.
*
* @param g the graphics to draw on
*/
public final void paintComponent(final Graphics g) {
super.paintComponent(g);
if (graphMode) {
paintGraph(g);
return;
}
/* Draw the buckets. */
double diff = Math.PI * 2d / buckets.size();
int size = Math.min(getWidth(), getHeight());
int bucketSize = size / (int) (buckets.size() / 1.25);
int drawRadius = size / 2 - bucketSize;
int centerx = size / 2;
int centery = size / 2;
for (int i = 0; i < buckets.size(); i++) {
double angle = i * diff + theta - Math.PI / 2;
int x = centerx + (int) (Math.cos(angle) * drawRadius);
int y = centery + (int) (Math.sin(angle) * drawRadius);
g.setColor(Color.black);
g.drawRect(x - bucketSize / 2, y - bucketSize / 2,
bucketSize, bucketSize);
g.setColor(Color.blue);
int height = (int) (bucketSize * buckets.get(i) / bucketFull);
g.fillRect(x - bucketSize / 2,
y - bucketSize / 2 + (bucketSize - height),
bucketSize, height);
}
}
/**
* Paint a graph of historical data.
*
* @param g graphics to be painted
*/
private void paintGraph(final Graphics g) {
if (rlRatio.size() < 2) {
return;
}
g.setColor(Color.black);
Iterator<Double> rlit = rlRatio.iterator();
Iterator<Double> tbit = tbRatio.iterator();
Double rlLast = rlit.next();
Double tbLast = tbit.next();
while (rlit.hasNext()) {
Double rl = rlit.next();
Double tb = tbit.next();
int x0 = (int) (rlLast / (rlRatioMax - rlRatioMin) * getWidth());
int y0 = (int) (tbLast / (tbRatioMax - tbRatioMin) * getHeight());
int x1 = (int) (rl / (rlRatioMax - rlRatioMin) * getWidth());
int y1 = (int) (tb / (tbRatioMax - tbRatioMin) * getHeight());
g.drawLine(x0, y0, x1, y1);
rlLast = rl;
tbLast = tb;
}
}
/**
* Start running the wheel simulation.
*/
public final void start() {
timer.start();
}
/**
* Tell the wheel to stop running.
*/
public final void stop() {
timer.stop();
}
/**
* Update the state by the given amount of seconds.
*
* @param tdot number of seconds to update by.
*/
public final void updateState(final double tdot) {
/* Store the original system state */
double thetaOrig = theta;
double thetadotOrig = thetadot;
- Vector<Double> bucketsOrig = (Vector<Double>) buckets.clone();
+ Vector<Double> bucketsOrig = new Vector<Double>(buckets);
/* These are variables needed for intermediate steps in RK4 */
double dt = 0.0;
double rateWeight = 1.0;
/* Time derivatives of states */
double ddtTheta = 0.0;
double ddtThetadot = 0.0;
Vector<Double> ddtBuckets = new Vector<Double>();
for (int i = 0; i < buckets.size(); i++) {
ddtBuckets.add(0d);
}
/* Total derivative approximations */
double ddtThetaTotal = 0.0;
double ddtThetadotTotal = 0.0;
Vector<Double> ddtBucketsTotal = new Vector<Double>();
for (int i = 0; i < buckets.size(); i++) {
ddtBucketsTotal.add(0.0);
}
/* RK4 Integration */
for (int rk4idx = 1; rk4idx <= 4; rk4idx++) {
if (rk4idx > 1) {
rateWeight = 2.0;
dt = tdot / 2.0;
} else if (rk4idx == 4) {
rateWeight = 1.0;
dt = tdot;
}
/* System states to be used in this RK4 step */
theta = thetaOrig + dt * ddtTheta;
while (theta < 0) {
theta += Math.PI * 2;
}
while (theta > Math.PI * 2) {
theta -= Math.PI * 2;
}
thetadot = thetadotOrig + dt * ddtThetadot;
for (int i = 0; i < buckets.size(); i++) {
double val = bucketsOrig.get(i) + dt * ddtBuckets.get(i);
buckets.set(i, Math.min(bucketFull, Math.max(0, val)));
}
/* Differential Equation for ddt_theta (Kinematics) */
ddtTheta = thetadot;
/* Calculate inertia */
double inertia = wheelIntertia;
for (int i = 0; i < buckets.size(); i++) {
inertia += buckets.get(i) * radius * radius;
}
/* Calculate torque */
double torque = -1 * (damping * thetadot);
double diff = Math.PI * 2d / buckets.size();
for (int i = 0; i < buckets.size(); i++) {
torque += buckets.get(i) * radius * gravity
* Math.sin(theta + diff * i);
}
/* Differential Equation for ddt_thetadot (Physics) */
ddtThetadot = torque / inertia;
/* Differential Equation for ddt_buckets (drain rate equation) */
for (int i = 0; i < buckets.size(); i++) {
ddtBuckets.set(i, buckets.get(i) * -drainRate
+ inflow(theta + diff * i));
}
/* Log the derivative approximations */
ddtThetaTotal += ddtTheta * rateWeight;
ddtThetadotTotal += ddtThetadot * rateWeight;
for (int i = 0; i < ddtBucketsTotal.size(); i++) {
ddtBucketsTotal.set(i, ddtBucketsTotal.get(i)
+ ddtBuckets.get(i) * rateWeight);
}
} /* End of RK4 for loop */
/* Update the system state. THIS is where time actually moves forward */
theta = thetaOrig + 1.0 / 6.0 * ddtThetaTotal * tdot;
thetadot = thetadotOrig + 1.0 / 6.0 * ddtThetadotTotal * tdot;
for (int i = 0; i < ddtBucketsTotal.size(); i++) {
buckets.set(i, bucketsOrig.get(i)
+ 1.0 / 6.0 * ddtBucketsTotal.get(i) * tdot);
}
logState();
}
/**
* Append some info about the current wheel state to the log.
*/
private void logState() {
double left = 0;
double right = 0;
double top = 0;
double bottom = 0;
double diff = Math.PI * 2d / buckets.size();
for (int i = 0; i < buckets.size(); i++) {
double angle = theta + diff * i;
if (Math.cos(angle) > 0) {
right += buckets.get(i);
}
left += buckets.get(i);
if (Math.sin(angle) > 0) {
top += buckets.get(i);
}
bottom += buckets.get(i);
}
double rl = left / right;
double tb = top / bottom;
rlRatioMax = Math.max(rl, rlRatioMax);
tbRatioMax = Math.max(tb, tbRatioMax);
rlRatioMin = Math.min(rl, rlRatioMin);
tbRatioMin = Math.min(tb, tbRatioMin);
rlRatio.add(rl);
tbRatio.add(tb);
if (rlRatio.size() > MAX_HISTORY) {
rl = rlRatio.remove();
tb = tbRatio.remove();
}
}
/**
* The fill rate for a bucket at the given position.
*
* @param angle position of the bucket
* @return fill rate of the bucket (slugs / sec)
*/
private double inflow(final double angle) {
double lim = Math.abs(Math.cos(Math.PI * 2d / buckets.size()));
if (Math.cos(angle) > lim) {
return fillRate / 2d
* (Math.cos(buckets.size()
* Math.atan2(Math.tan(angle), 1) / 2d) + 1);
} else {
return 0;
}
}
/**
* Add one bucket to the display.
*/
private void addBucket() {
buckets.add(0d);
}
/**
* Remove one bucket from the display.
*/
private void removeBucket() {
if (buckets.size() > MIN_BUCKETS) {
buckets.remove(0);
}
}
/** {@inheritDoc} */
public final void mouseReleased(final MouseEvent e) {
switch (e.getButton()) {
case MouseEvent.BUTTON1:
addBucket();
break;
case MouseEvent.BUTTON2:
graphMode ^= true;
break;
case MouseEvent.BUTTON3:
removeBucket();
break;
default:
/* do nothing */
break;
}
}
/** {@inheritDoc} */
public void mouseExited(final MouseEvent e) {
/* Do nothing */
}
/** {@inheritDoc} */
public void mouseEntered(final MouseEvent e) {
/* Do nothing */
}
/** {@inheritDoc} */
public void mouseClicked(final MouseEvent e) {
/* Do nothing */
}
/** {@inheritDoc} */
public void mousePressed(final MouseEvent e) {
/* Do nothing */
}
}
| true | true | public final void updateState(final double tdot) {
/* Store the original system state */
double thetaOrig = theta;
double thetadotOrig = thetadot;
Vector<Double> bucketsOrig = (Vector<Double>) buckets.clone();
/* These are variables needed for intermediate steps in RK4 */
double dt = 0.0;
double rateWeight = 1.0;
/* Time derivatives of states */
double ddtTheta = 0.0;
double ddtThetadot = 0.0;
Vector<Double> ddtBuckets = new Vector<Double>();
for (int i = 0; i < buckets.size(); i++) {
ddtBuckets.add(0d);
}
/* Total derivative approximations */
double ddtThetaTotal = 0.0;
double ddtThetadotTotal = 0.0;
Vector<Double> ddtBucketsTotal = new Vector<Double>();
for (int i = 0; i < buckets.size(); i++) {
ddtBucketsTotal.add(0.0);
}
/* RK4 Integration */
for (int rk4idx = 1; rk4idx <= 4; rk4idx++) {
if (rk4idx > 1) {
rateWeight = 2.0;
dt = tdot / 2.0;
} else if (rk4idx == 4) {
rateWeight = 1.0;
dt = tdot;
}
/* System states to be used in this RK4 step */
theta = thetaOrig + dt * ddtTheta;
while (theta < 0) {
theta += Math.PI * 2;
}
while (theta > Math.PI * 2) {
theta -= Math.PI * 2;
}
thetadot = thetadotOrig + dt * ddtThetadot;
for (int i = 0; i < buckets.size(); i++) {
double val = bucketsOrig.get(i) + dt * ddtBuckets.get(i);
buckets.set(i, Math.min(bucketFull, Math.max(0, val)));
}
/* Differential Equation for ddt_theta (Kinematics) */
ddtTheta = thetadot;
/* Calculate inertia */
double inertia = wheelIntertia;
for (int i = 0; i < buckets.size(); i++) {
inertia += buckets.get(i) * radius * radius;
}
/* Calculate torque */
double torque = -1 * (damping * thetadot);
double diff = Math.PI * 2d / buckets.size();
for (int i = 0; i < buckets.size(); i++) {
torque += buckets.get(i) * radius * gravity
* Math.sin(theta + diff * i);
}
/* Differential Equation for ddt_thetadot (Physics) */
ddtThetadot = torque / inertia;
/* Differential Equation for ddt_buckets (drain rate equation) */
for (int i = 0; i < buckets.size(); i++) {
ddtBuckets.set(i, buckets.get(i) * -drainRate
+ inflow(theta + diff * i));
}
/* Log the derivative approximations */
ddtThetaTotal += ddtTheta * rateWeight;
ddtThetadotTotal += ddtThetadot * rateWeight;
for (int i = 0; i < ddtBucketsTotal.size(); i++) {
ddtBucketsTotal.set(i, ddtBucketsTotal.get(i)
+ ddtBuckets.get(i) * rateWeight);
}
} /* End of RK4 for loop */
/* Update the system state. THIS is where time actually moves forward */
theta = thetaOrig + 1.0 / 6.0 * ddtThetaTotal * tdot;
thetadot = thetadotOrig + 1.0 / 6.0 * ddtThetadotTotal * tdot;
for (int i = 0; i < ddtBucketsTotal.size(); i++) {
buckets.set(i, bucketsOrig.get(i)
+ 1.0 / 6.0 * ddtBucketsTotal.get(i) * tdot);
}
logState();
}
| public final void updateState(final double tdot) {
/* Store the original system state */
double thetaOrig = theta;
double thetadotOrig = thetadot;
Vector<Double> bucketsOrig = new Vector<Double>(buckets);
/* These are variables needed for intermediate steps in RK4 */
double dt = 0.0;
double rateWeight = 1.0;
/* Time derivatives of states */
double ddtTheta = 0.0;
double ddtThetadot = 0.0;
Vector<Double> ddtBuckets = new Vector<Double>();
for (int i = 0; i < buckets.size(); i++) {
ddtBuckets.add(0d);
}
/* Total derivative approximations */
double ddtThetaTotal = 0.0;
double ddtThetadotTotal = 0.0;
Vector<Double> ddtBucketsTotal = new Vector<Double>();
for (int i = 0; i < buckets.size(); i++) {
ddtBucketsTotal.add(0.0);
}
/* RK4 Integration */
for (int rk4idx = 1; rk4idx <= 4; rk4idx++) {
if (rk4idx > 1) {
rateWeight = 2.0;
dt = tdot / 2.0;
} else if (rk4idx == 4) {
rateWeight = 1.0;
dt = tdot;
}
/* System states to be used in this RK4 step */
theta = thetaOrig + dt * ddtTheta;
while (theta < 0) {
theta += Math.PI * 2;
}
while (theta > Math.PI * 2) {
theta -= Math.PI * 2;
}
thetadot = thetadotOrig + dt * ddtThetadot;
for (int i = 0; i < buckets.size(); i++) {
double val = bucketsOrig.get(i) + dt * ddtBuckets.get(i);
buckets.set(i, Math.min(bucketFull, Math.max(0, val)));
}
/* Differential Equation for ddt_theta (Kinematics) */
ddtTheta = thetadot;
/* Calculate inertia */
double inertia = wheelIntertia;
for (int i = 0; i < buckets.size(); i++) {
inertia += buckets.get(i) * radius * radius;
}
/* Calculate torque */
double torque = -1 * (damping * thetadot);
double diff = Math.PI * 2d / buckets.size();
for (int i = 0; i < buckets.size(); i++) {
torque += buckets.get(i) * radius * gravity
* Math.sin(theta + diff * i);
}
/* Differential Equation for ddt_thetadot (Physics) */
ddtThetadot = torque / inertia;
/* Differential Equation for ddt_buckets (drain rate equation) */
for (int i = 0; i < buckets.size(); i++) {
ddtBuckets.set(i, buckets.get(i) * -drainRate
+ inflow(theta + diff * i));
}
/* Log the derivative approximations */
ddtThetaTotal += ddtTheta * rateWeight;
ddtThetadotTotal += ddtThetadot * rateWeight;
for (int i = 0; i < ddtBucketsTotal.size(); i++) {
ddtBucketsTotal.set(i, ddtBucketsTotal.get(i)
+ ddtBuckets.get(i) * rateWeight);
}
} /* End of RK4 for loop */
/* Update the system state. THIS is where time actually moves forward */
theta = thetaOrig + 1.0 / 6.0 * ddtThetaTotal * tdot;
thetadot = thetadotOrig + 1.0 / 6.0 * ddtThetadotTotal * tdot;
for (int i = 0; i < ddtBucketsTotal.size(); i++) {
buckets.set(i, bucketsOrig.get(i)
+ 1.0 / 6.0 * ddtBucketsTotal.get(i) * tdot);
}
logState();
}
|
diff --git a/java/pdfclown.lib/src/org/pdfclown/tokens/PdfDocEncoding.java b/java/pdfclown.lib/src/org/pdfclown/tokens/PdfDocEncoding.java
index 1d0b109..541523d 100644
--- a/java/pdfclown.lib/src/org/pdfclown/tokens/PdfDocEncoding.java
+++ b/java/pdfclown.lib/src/org/pdfclown/tokens/PdfDocEncoding.java
@@ -1,127 +1,128 @@
/*
Copyright 2012 Stefano Chizzolini. http://www.pdfclown.org
Contributors:
* Stefano Chizzolini (original code developer, http://www.stefanochizzolini.it)
This file should be part of the source code distribution of "PDF Clown library"
(the Program): see the accompanying README files for more info.
This Program is free software; you can redistribute it and/or modify it under the terms
of the GNU Lesser 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,
either expressed or implied; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the License for more details.
You should have received a copy of the GNU Lesser General Public License along with this
Program (see README files); if not, go to the GNU website (http://www.gnu.org/licenses/).
Redistribution and use, with or without modification, are permitted provided that such
redistributions retain the above copyright notice, license and disclaimer, along with
this list of conditions.
*/
package org.pdfclown.tokens;
import org.pdfclown.util.BiMap;
/**
Encoding for text strings in a PDF document outside the document's content streams [PDF:1.7:D].
@author Stefano Chizzolini (http://www.stefanochizzolini.it)
@since 0.1.2
@version 0.1.2, 02/20/12
*/
public final class PdfDocEncoding
extends LatinEncoding
{
// <static>
// <fields>
private static final PdfDocEncoding instance = new PdfDocEncoding();
// </fields>
// <interface>
public static PdfDocEncoding get(
)
{return instance;}
// <interface>
// </static>
// <dynamic>
// <constructors>
private PdfDocEncoding(
)
{
chars = new BiMap<Integer,Character>()
{
private static final long serialVersionUID = 1L;
private boolean isIdentity(
int code
)
{return code < 128 || (code > 160 && code < 256);}
@Override
public synchronized Character get(
Object key
)
{
Integer code = (Integer)key;
return isIdentity(code)
? (char)code.intValue()
: super.get(key);
}
@Override
public Integer getKey(
Character value
)
{
- return isIdentity(value)
- ? (int)value
- : super.getKey(value);
+ if(isIdentity(value))
+ return (int)value;
+ else
+ return super.getKey(value);
}
@Override
public synchronized int size(
)
{return 256;}
};
chars.put(0x80, '\u2022');
chars.put(0x81, '\u2020');
chars.put(0x82, '\u2021');
chars.put(0x84, '\u2014');
chars.put(0x85, '\u2013');
chars.put(0x86, '\u0192');
chars.put(0x87, '\u2044');
chars.put(0x88, '\u2039');
chars.put(0x89, '\u203A');
chars.put(0x8A, '\u2212');
chars.put(0x8B, '\u2030');
chars.put(0x8C, '\u201E');
chars.put(0x8D, '\u201C');
chars.put(0x8E, '\u201D');
chars.put(0x8F, '\u2018');
chars.put(0x90, '\u2019');
chars.put(0x91, '\u201A');
chars.put(0x92, '\u2122');
chars.put(0x93, '\uFB01');
chars.put(0x94, '\uFB02');
chars.put(0x95, '\u0141');
chars.put(0x96, '\u0152');
chars.put(0x97, '\u0160');
chars.put(0x98, '\u0178');
chars.put(0x99, '\u017D');
chars.put(0x9A, '\u0131');
chars.put(0x9B, '\u0142');
chars.put(0x9C, '\u0153');
chars.put(0x9D, '\u0161');
chars.put(0x9E, '\u017E');
chars.put(0x9F, '\u009F');
chars.put(0xA0, '\u20AC');
}
// </constructors>
// </dynamic>
}
| true | true | private PdfDocEncoding(
)
{
chars = new BiMap<Integer,Character>()
{
private static final long serialVersionUID = 1L;
private boolean isIdentity(
int code
)
{return code < 128 || (code > 160 && code < 256);}
@Override
public synchronized Character get(
Object key
)
{
Integer code = (Integer)key;
return isIdentity(code)
? (char)code.intValue()
: super.get(key);
}
@Override
public Integer getKey(
Character value
)
{
return isIdentity(value)
? (int)value
: super.getKey(value);
}
@Override
public synchronized int size(
)
{return 256;}
};
chars.put(0x80, '\u2022');
chars.put(0x81, '\u2020');
chars.put(0x82, '\u2021');
chars.put(0x84, '\u2014');
chars.put(0x85, '\u2013');
chars.put(0x86, '\u0192');
chars.put(0x87, '\u2044');
chars.put(0x88, '\u2039');
chars.put(0x89, '\u203A');
chars.put(0x8A, '\u2212');
chars.put(0x8B, '\u2030');
chars.put(0x8C, '\u201E');
chars.put(0x8D, '\u201C');
chars.put(0x8E, '\u201D');
chars.put(0x8F, '\u2018');
chars.put(0x90, '\u2019');
chars.put(0x91, '\u201A');
chars.put(0x92, '\u2122');
chars.put(0x93, '\uFB01');
chars.put(0x94, '\uFB02');
chars.put(0x95, '\u0141');
chars.put(0x96, '\u0152');
chars.put(0x97, '\u0160');
chars.put(0x98, '\u0178');
chars.put(0x99, '\u017D');
chars.put(0x9A, '\u0131');
chars.put(0x9B, '\u0142');
chars.put(0x9C, '\u0153');
chars.put(0x9D, '\u0161');
chars.put(0x9E, '\u017E');
chars.put(0x9F, '\u009F');
chars.put(0xA0, '\u20AC');
}
| private PdfDocEncoding(
)
{
chars = new BiMap<Integer,Character>()
{
private static final long serialVersionUID = 1L;
private boolean isIdentity(
int code
)
{return code < 128 || (code > 160 && code < 256);}
@Override
public synchronized Character get(
Object key
)
{
Integer code = (Integer)key;
return isIdentity(code)
? (char)code.intValue()
: super.get(key);
}
@Override
public Integer getKey(
Character value
)
{
if(isIdentity(value))
return (int)value;
else
return super.getKey(value);
}
@Override
public synchronized int size(
)
{return 256;}
};
chars.put(0x80, '\u2022');
chars.put(0x81, '\u2020');
chars.put(0x82, '\u2021');
chars.put(0x84, '\u2014');
chars.put(0x85, '\u2013');
chars.put(0x86, '\u0192');
chars.put(0x87, '\u2044');
chars.put(0x88, '\u2039');
chars.put(0x89, '\u203A');
chars.put(0x8A, '\u2212');
chars.put(0x8B, '\u2030');
chars.put(0x8C, '\u201E');
chars.put(0x8D, '\u201C');
chars.put(0x8E, '\u201D');
chars.put(0x8F, '\u2018');
chars.put(0x90, '\u2019');
chars.put(0x91, '\u201A');
chars.put(0x92, '\u2122');
chars.put(0x93, '\uFB01');
chars.put(0x94, '\uFB02');
chars.put(0x95, '\u0141');
chars.put(0x96, '\u0152');
chars.put(0x97, '\u0160');
chars.put(0x98, '\u0178');
chars.put(0x99, '\u017D');
chars.put(0x9A, '\u0131');
chars.put(0x9B, '\u0142');
chars.put(0x9C, '\u0153');
chars.put(0x9D, '\u0161');
chars.put(0x9E, '\u017E');
chars.put(0x9F, '\u009F');
chars.put(0xA0, '\u20AC');
}
|
diff --git a/iteration/ui/src/test/integration/org/richfaces/component/extendedDataTable/TestTableState.java b/iteration/ui/src/test/integration/org/richfaces/component/extendedDataTable/TestTableState.java
index 408a862bc..69dce72aa 100644
--- a/iteration/ui/src/test/integration/org/richfaces/component/extendedDataTable/TestTableState.java
+++ b/iteration/ui/src/test/integration/org/richfaces/component/extendedDataTable/TestTableState.java
@@ -1,311 +1,311 @@
package org.richfaces.component.extendedDataTable;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.arquillian.warp.Activity;
import org.jboss.arquillian.warp.Inspection;
import org.jboss.arquillian.warp.Warp;
import org.jboss.arquillian.warp.WarpTest;
import org.jboss.arquillian.warp.jsf.AfterPhase;
import org.jboss.arquillian.warp.jsf.Phase;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.openqa.selenium.By;
import org.openqa.selenium.Keys;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Action;
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.support.FindBy;
import org.richfaces.component.AbstractExtendedDataTable;
import org.richfaces.component.ExtendedDataTableState;
import org.richfaces.component.UIColumn;
import org.richfaces.integration.IterationDeployment;
import org.richfaces.shrinkwrap.descriptor.FaceletAsset;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
import java.net.URL;
import java.util.List;
import static org.jboss.arquillian.graphene.Graphene.*;
import static org.junit.Assert.assertTrue;
@RunAsClient
@WarpTest
@RunWith(Arquillian.class)
public class TestTableState {
@Drone
private WebDriver browser;
@ArquillianResource
private URL contextPath;
@FindBy(id = "myForm:edt")
private WebElement edt;
@FindBy(id = "myForm:edt:0:n")
private WebElement firstRow;
@FindBy(id = "myForm:ajax")
private WebElement button;
@FindBy(id = "myForm:edt:header")
private WebElement header;
@FindBy(id = "myForm:edt:sort")
private WebElement sortLink;
@Deployment
public static WebArchive createDeployment() {
IterationDeployment deployment = new IterationDeployment(TestTableState.class);
deployment.archive().addClass(IterationBean.class);
addIndexPage(deployment);
addWidthPage(deployment);
addOrderPage(deployment);
addSortPage(deployment);
addFilterPage(deployment);
return deployment.getFinalArchive();
}
@Test
public void table_width() {
browser.get(contextPath.toExternalForm() + "width.jsf");
// assert the columns widths (selectors are independent of the column order)
Assert.assertEquals("210px", firstRow.findElement(By.cssSelector("td .rf-edt-c-column1")).getCssValue("width"));
Assert.assertEquals("75px", firstRow.findElement(By.cssSelector("td .rf-edt-c-column2")).getCssValue("width"));
}
@Test
public void table_order() {
browser.get(contextPath.toExternalForm() + "order.jsf");
Assert.assertEquals("Column 2", header.findElement(By.cssSelector("td")).getText());
}
@Test
public void table_order_server_side() throws InterruptedException {
// given
browser.get(contextPath.toExternalForm());
WebElement column1 = header.findElement(By.cssSelector(".rf-edt-hdr-c.rf-edt-c-column1"));
WebElement column3 = header.findElement(By.cssSelector(".rf-edt-c-column3 .rf-edt-hdr-c-cnt"));
Actions builder = new Actions(browser);
Action dragAndDrop = builder.clickAndHold(column3)
.moveToElement(column1)
.release(column1)
.build();
guardXhr(dragAndDrop).perform();
// when / then
Warp.initiate(new Activity() {
@Override
public void perform() {
guardXhr(button).click();
}
}).inspect(new Inspection() {
private static final long serialVersionUID = 1L;
@Inject
IterationBean bean;
@AfterPhase(Phase.INVOKE_APPLICATION)
public void verify_bean_executed() {
FacesContext facesContext = FacesContext.getCurrentInstance();
AbstractExtendedDataTable edtComponent = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("myForm").findComponent("edt");
ExtendedDataTableState tableState = new ExtendedDataTableState(edtComponent);
String[] expectedOrder = {"column3", "column1", "column2"};
Assert.assertArrayEquals(expectedOrder, tableState.getColumnsOrder());
}
});
}
@Test
public void table_sort() throws InterruptedException {
// given
browser.get(contextPath.toExternalForm() + "sort.jsf");
Thread.sleep(500);
WebElement cell = browser.findElements(By.cssSelector(".rf-edt-c-column2 .rf-edt-c-cnt")).get(0);
Assert.assertEquals("9", cell.getText());
guardXhr(sortLink).click();
Thread.sleep(500);
cell = browser.findElements(By.cssSelector(".rf-edt-c-column2 .rf-edt-c-cnt")).get(0);
Assert.assertEquals("0", cell.getText());
// when / then
Warp.initiate(new Activity() {
@Override
public void perform() {
guardXhr(button).click();
}
}).inspect(new Inspection() {
private static final long serialVersionUID = 1L;
@Inject
IterationBean bean;
@AfterPhase(Phase.INVOKE_APPLICATION)
public void verify_bean_executed() {
FacesContext facesContext = FacesContext.getCurrentInstance();
AbstractExtendedDataTable edtComponent = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("myForm").findComponent("edt");
ExtendedDataTableState tableState = new ExtendedDataTableState(edtComponent.getTableState());
UIColumn column = new UIColumn();
column.setId("column2");
Assert.assertEquals("ascending", tableState.getColumnSort(column));
}
});
}
@Test
public void table_observe() throws InterruptedException {
// given
browser.get(contextPath.toExternalForm() + "filter.jsf");
List<WebElement> cells = browser.findElements(By.cssSelector(".rf-edt-c-column2 .rf-edt-c-cnt"));
WebElement cell = cells.get(cells.size() - 1);
Assert.assertEquals("6", cell.getText());
WebElement filterInput = browser.findElement(By.id("myForm:edt:filterInput"));
filterInput.clear();
filterInput.sendKeys("3");
filterInput.sendKeys(Keys.TAB);
Thread.sleep(500);
cells = browser.findElements(By.cssSelector(".rf-edt-c-column2 .rf-edt-c-cnt"));
cell = cells.get(cells.size() - 1);
Assert.assertEquals("3", cell.getText());
// when / then
Warp.initiate(new Activity() {
@Override
public void perform() {
guardXhr(button).click();
}
}).inspect(new Inspection() {
private static final long serialVersionUID = 1L;
@Inject
IterationBean bean;
@AfterPhase(Phase.INVOKE_APPLICATION)
public void verify_bean_executed() {
FacesContext facesContext = FacesContext.getCurrentInstance();
AbstractExtendedDataTable edtComponent = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("myForm").findComponent("edt");
ExtendedDataTableState tableState = new ExtendedDataTableState(edtComponent.getTableState());
UIColumn column = new UIColumn();
column.setId("column2");
Assert.assertEquals("3", tableState.getColumnFilter(column));
}
});
}
private static FaceletAsset getPage(String edtAttributes) {
FaceletAsset p = new FaceletAsset();
p.xmlns("rich", "http://richfaces.org/iteration");
p.xmlns("a4j", "http://richfaces.org/a4j");
p.body("<script type='text/javascript'>");
p.body("function sortEdt(currentSortOrder) { ");
p.body(" var edt = RichFaces.$('myForm:edt'); ");
p.body(" var sortOrder = currentSortOrder == 'ascending' ? 'descending' : 'ascending'; ");
p.body(" edt.sort('column2', sortOrder, true); ");
p.body("} ");
p.body("function filterEdt(filterValue) { ");
p.body(" var edt = RichFaces.$('myForm:edt'); ");
- p.body(" edt.observe('column2', filterValue, true); ");
+ p.body(" edt.filter('column2', filterValue, true); ");
p.body("} ");
p.body("</script>");
p.body("<h:form id='myForm'> ");
p.body(" <rich:extendedDataTable " + edtAttributes + " filterVar='fv' > ");
p.body(" <rich:column id='column1' width='150px' > ");
p.body(" <f:facet name='header'>Column 1</f:facet> ");
p.body(" <h:outputText value='Bean:' /> ");
p.body(" </rich:column> ");
p.body(" <rich:column id='column2' width='150px' ");
p.body(" sortBy='#{bean}' ");
p.body(" sortOrder='#{iterationBean.sortOrder}' ");
p.body(" filterValue='#{iterationBean.filterValue}' ");
p.body(" filterExpression='#{bean le fv}' > ");
p.body(" <f:facet name='header'> ");
p.body(" <h:panelGrid columns='1'> ");
p.body(" <h:link id='sort' onclick=\"sortEdt('#{iterationBean.sortOrder}'); return false;\">Column 2</h:link> ");
p.body(" <h:inputText id='filterInput' value='#{iterationBean.filterValue}' label='Filter' ");
p.body(" onblur='filterEdt(this.value); return false; ' > ");
p.body(" <f:convertNumber /> ");
p.body(" <f:validateLongRange minimum='0' maximum='10' /> ");
p.body(" </h:inputText> ");
p.body(" </h:panelGrid> ");
p.body(" </f:facet> ");
p.body(" <h:outputText value='#{bean}' /> ");
p.body(" </rich:column> ");
p.body(" <rich:column id='column3' width='150px' > ");
p.body(" <f:facet name='header'>Column 3</f:facet> ");
p.body(" <h:outputText value='R#{bean}C3' /> ");
p.body(" </rich:column> ");
p.body(" </rich:extendedDataTable> ");
p.body(" <a4j:commandButton id='ajax' execute='edt' render='edt' value='Ajax' /> ");
p.body("</h:form> ");
return p;
}
private static void addIndexPage(IterationDeployment deployment) {
String edtAttributes =
" id='edt' value='#{iterationBean.values}' var='bean' ";
FaceletAsset p = getPage(edtAttributes);
deployment.archive().addAsWebResource(p, "index.xhtml");
}
private static void addWidthPage(IterationDeployment deployment) {
String edtAttributes =
" id='edt' value='#{iterationBean.values}' var='bean' " +
" tableState='#{iterationBean.widthState}'";
FaceletAsset p = getPage(edtAttributes);
deployment.archive().addAsWebResource(p, "width.xhtml");
}
private static void addSortPage(IterationDeployment deployment) {
String edtAttributes =
" id='edt' value='#{iterationBean.values}' var='bean' " +
" tableState='#{iterationBean.sortState}'";
FaceletAsset p = getPage(edtAttributes);
deployment.archive().addAsWebResource(p, "sort.xhtml");
}
private static void addFilterPage(IterationDeployment deployment) {
String edtAttributes =
" id='edt' value='#{iterationBean.values}' var='bean' " +
" tableState='#{iterationBean.filterState}'";
FaceletAsset p = getPage(edtAttributes);
deployment.archive().addAsWebResource(p, "filter.xhtml");
}
private static void addOrderPage(IterationDeployment deployment) {
String edtAttributes =
" id='edt' value='#{iterationBean.values}' var='bean' " +
" columnsOrder='#{iterationBean.columnsOrder}'" +
" tableState='#{iterationBean.orderState}'";
FaceletAsset p = getPage(edtAttributes);
deployment.archive().addAsWebResource(p, "order.xhtml");
}
}
| true | true | private static FaceletAsset getPage(String edtAttributes) {
FaceletAsset p = new FaceletAsset();
p.xmlns("rich", "http://richfaces.org/iteration");
p.xmlns("a4j", "http://richfaces.org/a4j");
p.body("<script type='text/javascript'>");
p.body("function sortEdt(currentSortOrder) { ");
p.body(" var edt = RichFaces.$('myForm:edt'); ");
p.body(" var sortOrder = currentSortOrder == 'ascending' ? 'descending' : 'ascending'; ");
p.body(" edt.sort('column2', sortOrder, true); ");
p.body("} ");
p.body("function filterEdt(filterValue) { ");
p.body(" var edt = RichFaces.$('myForm:edt'); ");
p.body(" edt.observe('column2', filterValue, true); ");
p.body("} ");
p.body("</script>");
p.body("<h:form id='myForm'> ");
p.body(" <rich:extendedDataTable " + edtAttributes + " filterVar='fv' > ");
p.body(" <rich:column id='column1' width='150px' > ");
p.body(" <f:facet name='header'>Column 1</f:facet> ");
p.body(" <h:outputText value='Bean:' /> ");
p.body(" </rich:column> ");
p.body(" <rich:column id='column2' width='150px' ");
p.body(" sortBy='#{bean}' ");
p.body(" sortOrder='#{iterationBean.sortOrder}' ");
p.body(" filterValue='#{iterationBean.filterValue}' ");
p.body(" filterExpression='#{bean le fv}' > ");
p.body(" <f:facet name='header'> ");
p.body(" <h:panelGrid columns='1'> ");
p.body(" <h:link id='sort' onclick=\"sortEdt('#{iterationBean.sortOrder}'); return false;\">Column 2</h:link> ");
p.body(" <h:inputText id='filterInput' value='#{iterationBean.filterValue}' label='Filter' ");
p.body(" onblur='filterEdt(this.value); return false; ' > ");
p.body(" <f:convertNumber /> ");
p.body(" <f:validateLongRange minimum='0' maximum='10' /> ");
p.body(" </h:inputText> ");
p.body(" </h:panelGrid> ");
p.body(" </f:facet> ");
p.body(" <h:outputText value='#{bean}' /> ");
p.body(" </rich:column> ");
p.body(" <rich:column id='column3' width='150px' > ");
p.body(" <f:facet name='header'>Column 3</f:facet> ");
p.body(" <h:outputText value='R#{bean}C3' /> ");
p.body(" </rich:column> ");
p.body(" </rich:extendedDataTable> ");
p.body(" <a4j:commandButton id='ajax' execute='edt' render='edt' value='Ajax' /> ");
p.body("</h:form> ");
return p;
}
| private static FaceletAsset getPage(String edtAttributes) {
FaceletAsset p = new FaceletAsset();
p.xmlns("rich", "http://richfaces.org/iteration");
p.xmlns("a4j", "http://richfaces.org/a4j");
p.body("<script type='text/javascript'>");
p.body("function sortEdt(currentSortOrder) { ");
p.body(" var edt = RichFaces.$('myForm:edt'); ");
p.body(" var sortOrder = currentSortOrder == 'ascending' ? 'descending' : 'ascending'; ");
p.body(" edt.sort('column2', sortOrder, true); ");
p.body("} ");
p.body("function filterEdt(filterValue) { ");
p.body(" var edt = RichFaces.$('myForm:edt'); ");
p.body(" edt.filter('column2', filterValue, true); ");
p.body("} ");
p.body("</script>");
p.body("<h:form id='myForm'> ");
p.body(" <rich:extendedDataTable " + edtAttributes + " filterVar='fv' > ");
p.body(" <rich:column id='column1' width='150px' > ");
p.body(" <f:facet name='header'>Column 1</f:facet> ");
p.body(" <h:outputText value='Bean:' /> ");
p.body(" </rich:column> ");
p.body(" <rich:column id='column2' width='150px' ");
p.body(" sortBy='#{bean}' ");
p.body(" sortOrder='#{iterationBean.sortOrder}' ");
p.body(" filterValue='#{iterationBean.filterValue}' ");
p.body(" filterExpression='#{bean le fv}' > ");
p.body(" <f:facet name='header'> ");
p.body(" <h:panelGrid columns='1'> ");
p.body(" <h:link id='sort' onclick=\"sortEdt('#{iterationBean.sortOrder}'); return false;\">Column 2</h:link> ");
p.body(" <h:inputText id='filterInput' value='#{iterationBean.filterValue}' label='Filter' ");
p.body(" onblur='filterEdt(this.value); return false; ' > ");
p.body(" <f:convertNumber /> ");
p.body(" <f:validateLongRange minimum='0' maximum='10' /> ");
p.body(" </h:inputText> ");
p.body(" </h:panelGrid> ");
p.body(" </f:facet> ");
p.body(" <h:outputText value='#{bean}' /> ");
p.body(" </rich:column> ");
p.body(" <rich:column id='column3' width='150px' > ");
p.body(" <f:facet name='header'>Column 3</f:facet> ");
p.body(" <h:outputText value='R#{bean}C3' /> ");
p.body(" </rich:column> ");
p.body(" </rich:extendedDataTable> ");
p.body(" <a4j:commandButton id='ajax' execute='edt' render='edt' value='Ajax' /> ");
p.body("</h:form> ");
return p;
}
|
diff --git a/source/ch/cyberduck/core/AbstractProxy.java b/source/ch/cyberduck/core/AbstractProxy.java
index cfe78fce9..cd07be4da 100644
--- a/source/ch/cyberduck/core/AbstractProxy.java
+++ b/source/ch/cyberduck/core/AbstractProxy.java
@@ -1,69 +1,69 @@
package ch.cyberduck.core;
/*
* Copyright (c) 2002-2009 David Kocher. All rights reserved.
*
* http://cyberduck.ch/
*
* 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.
*
* Bug fixes, suggestions and comments should be sent to:
* [email protected]
*/
import org.apache.log4j.Logger;
import java.util.Properties;
/**
* @version $Id$
*/
public abstract class AbstractProxy implements Proxy {
private static Logger log = Logger.getLogger(AbstractProxy.class);
/**
* SOCKS port property name
*/
private static final String SOCKS_PORT = "socksProxyPort";
/**
* SOCKS host property name
*/
private static final String SOCKS_HOST = "socksProxyHost";
/**
* Set up SOCKS v4/v5 proxy settings. This can be used if there
* is a SOCKS proxy server in place that must be connected through.
* Note that setting these properties directs <b>all</b> TCP
* sockets in this JVM to the SOCKS proxy
*/
public void configure(final Host host) {
Properties properties = System.getProperties();
if(this.isSOCKSProxyEnabled() && !this.isHostExcluded(host.getHostname())) {
// Indicates the name of the SOCKS proxy server and the port number
// that will be used by the SOCKS protocol layer. If socksProxyHost
// is specified then all TCP sockets will use the SOCKS proxy server
// to establish a connection or accept one. The SOCKS proxy server
// can either be a SOCKS v4 or v5 server and it has to allow for
// unauthenticated connections.
final int port = this.getSOCKSProxyPort();
- properties.put(SOCKS_PORT, port);
+ properties.put(SOCKS_PORT, Integer.toString(port));
final String proxy = this.getSOCKSProxyHost();
properties.put(SOCKS_HOST, proxy);
log.info("Using SOCKS Proxy " + proxy + ":" + port);
}
else {
properties.remove(SOCKS_HOST);
properties.remove(SOCKS_PORT);
}
System.setProperties(properties);
}
}
| true | true | public void configure(final Host host) {
Properties properties = System.getProperties();
if(this.isSOCKSProxyEnabled() && !this.isHostExcluded(host.getHostname())) {
// Indicates the name of the SOCKS proxy server and the port number
// that will be used by the SOCKS protocol layer. If socksProxyHost
// is specified then all TCP sockets will use the SOCKS proxy server
// to establish a connection or accept one. The SOCKS proxy server
// can either be a SOCKS v4 or v5 server and it has to allow for
// unauthenticated connections.
final int port = this.getSOCKSProxyPort();
properties.put(SOCKS_PORT, port);
final String proxy = this.getSOCKSProxyHost();
properties.put(SOCKS_HOST, proxy);
log.info("Using SOCKS Proxy " + proxy + ":" + port);
}
else {
properties.remove(SOCKS_HOST);
properties.remove(SOCKS_PORT);
}
System.setProperties(properties);
}
| public void configure(final Host host) {
Properties properties = System.getProperties();
if(this.isSOCKSProxyEnabled() && !this.isHostExcluded(host.getHostname())) {
// Indicates the name of the SOCKS proxy server and the port number
// that will be used by the SOCKS protocol layer. If socksProxyHost
// is specified then all TCP sockets will use the SOCKS proxy server
// to establish a connection or accept one. The SOCKS proxy server
// can either be a SOCKS v4 or v5 server and it has to allow for
// unauthenticated connections.
final int port = this.getSOCKSProxyPort();
properties.put(SOCKS_PORT, Integer.toString(port));
final String proxy = this.getSOCKSProxyHost();
properties.put(SOCKS_HOST, proxy);
log.info("Using SOCKS Proxy " + proxy + ":" + port);
}
else {
properties.remove(SOCKS_HOST);
properties.remove(SOCKS_PORT);
}
System.setProperties(properties);
}
|
diff --git a/plugins/org.bonitasoft.studio.actors/src/org/bonitasoft/studio/actors/ui/section/ProcessActorsPropertySection.java b/plugins/org.bonitasoft.studio.actors/src/org/bonitasoft/studio/actors/ui/section/ProcessActorsPropertySection.java
index 40984efac5..ba7f84d737 100644
--- a/plugins/org.bonitasoft.studio.actors/src/org/bonitasoft/studio/actors/ui/section/ProcessActorsPropertySection.java
+++ b/plugins/org.bonitasoft.studio.actors/src/org/bonitasoft/studio/actors/ui/section/ProcessActorsPropertySection.java
@@ -1,336 +1,336 @@
/**
* Copyright (C) 2012 BonitaSoft S.A.
* BonitaSoft, 31 rue Gustave Eiffel - 38000 Grenoble
* 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.0 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.bonitasoft.studio.actors.ui.section;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.bonitasoft.studio.actors.ActorsPlugin;
import org.bonitasoft.studio.actors.i18n.Messages;
import org.bonitasoft.studio.actors.ui.section.editingsupport.ActorDescripitonEditingSupport;
import org.bonitasoft.studio.actors.ui.section.editingsupport.ActorNameEditingSupport;
import org.bonitasoft.studio.common.NamingUtils;
import org.bonitasoft.studio.common.jface.CellEditorValidationStatusListener;
import org.bonitasoft.studio.common.jface.TableColumnSorter;
import org.bonitasoft.studio.common.properties.AbstractBonitaDescriptionSection;
import org.bonitasoft.studio.model.process.AbstractProcess;
import org.bonitasoft.studio.model.process.Actor;
import org.bonitasoft.studio.model.process.ProcessFactory;
import org.bonitasoft.studio.model.process.ProcessPackage;
import org.bonitasoft.studio.pics.Pics;
import org.eclipse.emf.common.command.CompoundCommand;
import org.eclipse.emf.databinding.edit.EMFEditObservables;
import org.eclipse.emf.edit.command.AddCommand;
import org.eclipse.emf.edit.command.DeleteCommand;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
/**
* @author Romain Bioteau
*
*/
public class ProcessActorsPropertySection extends AbstractBonitaDescriptionSection implements ISelectionChangedListener, IDoubleClickListener{
private TableViewer actorsViewer;
private Button removeButton;
private ActorNameEditingSupport nameEditingSupport;
private ActorDescripitonEditingSupport descripitonEditingSupport;
private Button setAsInitiatorButton;
@Override
public void createControls(Composite parent,TabbedPropertySheetPage aTabbedPropertySheetPage) {
TabbedPropertySheetWidgetFactory widgetFactory = aTabbedPropertySheetPage.getWidgetFactory() ;
super.createControls(parent, aTabbedPropertySheetPage) ;
// parent.setLayoutData(GridDataFactory.fillDefaults().grab(true,true).hint(SWT.DEFAULT, 180).create()) ;
Composite mainComposite = widgetFactory.createComposite(parent, SWT.NONE) ;
mainComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(2).margins(10, 10).extendedMargins(0, 20, 5, 15).spacing(5, 2).create()) ;
mainComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).hint(SWT.DEFAULT, 180).create());
// Label actorsLabel = widgetFactory.createLabel(mainComposite, Messages.addRemoveActors,SWT.WRAP) ;
// actorsLabel.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).span(2, 1).create()) ;
widgetFactory.createCLabel(mainComposite,"", SWT.NONE);
final CLabel statusControl = widgetFactory.createCLabel(mainComposite,"", SWT.NONE);
statusControl.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).create());
Composite buttonsComposite = widgetFactory.createComposite(mainComposite, SWT.NONE) ;
buttonsComposite.setLayoutData(GridDataFactory.fillDefaults().grab(false, false).create()) ;
buttonsComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(1).equalWidth(false).margins(0, 0).spacing(0, 3).create()) ;
createAddButton(buttonsComposite,widgetFactory) ;
setAsInitiatorButton = createInitiatorButton(buttonsComposite,widgetFactory) ;
removeButton = createRemoveButton(buttonsComposite,widgetFactory) ;
actorsViewer = new TableViewer(mainComposite, SWT.FULL_SELECTION | SWT.BORDER | SWT.MULTI | SWT.V_SCROLL) ;
widgetFactory.adapt(actorsViewer.getTable(),false,false) ;
actorsViewer.getTable().setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
actorsViewer.setContentProvider(new ObservableListContentProvider());
TableLayout tableLayout = new TableLayout() ;
tableLayout.addColumnData(new ColumnWeightData(3)) ;
tableLayout.addColumnData(new ColumnWeightData(30)) ;
tableLayout.addColumnData(new ColumnWeightData(67)) ;
actorsViewer.getTable().setLayout(tableLayout) ;
actorsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
public void selectionChanged(SelectionChangedEvent event) {
updateButtons() ;
}
}) ;
TableViewerColumn initiatorIconViewer = new TableViewerColumn(actorsViewer,SWT.NONE) ;
initiatorIconViewer.setLabelProvider(new ColumnLabelProvider(){
@Override
public String getText(Object element) {
- return "";
+ return null;
}
@Override
public String getToolTipText(Object element) {
if(((Actor)element).isInitiator()){
return Messages.processInitiator ;
}
return null ;
}
@Override
public int getToolTipTimeDisplayed(Object object) {
return 4000 ;
}
@Override
public int getToolTipDisplayDelayTime(Object object) {
return 300;
}
@Override
public Point getToolTipShift(Object object) {
return new Point(5,5);
}
@Override
public Image getImage(Object element) {
if(((Actor)element).isInitiator()){
return Pics.getImage("initiator.png", ActorsPlugin.getDefault()) ;
}
return null;
}
}) ;
TableViewerColumn columnNameViewer = new TableViewerColumn(actorsViewer,SWT.NONE) ;
columnNameViewer.setLabelProvider(new ColumnLabelProvider(){
@Override
public String getText(Object element) {
return ((Actor)element).getName() ;
}
}) ;
final CellEditorValidationStatusListener listener = new CellEditorValidationStatusListener(statusControl);
nameEditingSupport = new ActorNameEditingSupport(columnNameViewer.getViewer(),getEditingDomain(),listener) ;
columnNameViewer.setEditingSupport(nameEditingSupport) ;
TableColumn column = columnNameViewer.getColumn() ;
column.setText(Messages.name) ;
TableViewerColumn columnDescriptionViewer = new TableViewerColumn(actorsViewer,SWT.NONE) ;
columnDescriptionViewer.setLabelProvider(new ColumnLabelProvider(){
@Override
public String getText(Object element) {
return ((Actor)element).getDocumentation();
}
}) ;
descripitonEditingSupport = new ActorDescripitonEditingSupport(columnDescriptionViewer.getViewer(),getEditingDomain()) ;
columnDescriptionViewer.setEditingSupport(descripitonEditingSupport) ;
TableColumn column3 = columnDescriptionViewer.getColumn() ;
column3.setText(Messages.description) ;
actorsViewer.getTable().setHeaderVisible(true);
actorsViewer.getTable().setLinesVisible(true) ;
ColumnViewerToolTipSupport.enableFor(actorsViewer);
TableColumnSorter sorter = new TableColumnSorter(actorsViewer) ;
sorter.setColumn(column) ;
updateButtons() ;
}
private Button createRemoveButton(Composite buttonsComposite, TabbedPropertySheetWidgetFactory widgetFactory) {
Button removeButton = widgetFactory.createButton(buttonsComposite, Messages.remove, SWT.PUSH) ;
removeButton.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create()) ;
removeButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
removeSelected();
}
}) ;
return removeButton;
}
protected void removeSelected() {
if(!actorsViewer.getSelection().isEmpty()){
if(MessageDialog.openConfirm(Display.getDefault().getActiveShell(), Messages.deleteActorsTitle,Messages.deleteActorsTitleMessage)){
List<?> actors = ((IStructuredSelection) actorsViewer.getSelection()).toList() ;
getEditingDomain().getCommandStack().execute(DeleteCommand.create(getEditingDomain(), actors));
refresh() ;
}
}
}
protected Button createAddButton(Composite buttonsComposite, TabbedPropertySheetWidgetFactory widgetFactory) {
Button addButton = widgetFactory.createButton(buttonsComposite, Messages.add, SWT.PUSH) ;
addButton.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create()) ;
addButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
addSelected();
}
}) ;
return addButton;
}
protected Button createInitiatorButton(Composite buttonsComposite, TabbedPropertySheetWidgetFactory widgetFactory) {
Button addButton = widgetFactory.createButton(buttonsComposite, Messages.setAsProcessInitiator, SWT.PUSH) ;
addButton.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create()) ;
addButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
Actor selectedActor = (Actor) ((IStructuredSelection) actorsViewer.getSelection()).getFirstElement() ;
CompoundCommand cc = new CompoundCommand() ;
AbstractProcess process = (AbstractProcess) getEObject() ;
for(Actor a : process.getActors()){
cc.append(SetCommand.create(getEditingDomain(), a, ProcessPackage.Literals.ACTOR__INITIATOR, false)) ;
}
cc.append(SetCommand.create(getEditingDomain(), selectedActor, ProcessPackage.Literals.ACTOR__INITIATOR, true)) ;
getEditingDomain().getCommandStack().execute(cc) ;
actorsViewer.refresh() ;
updateButtons();
}
}) ;
return addButton;
}
protected void addSelected() {
AbstractProcess process = (AbstractProcess) getEObject() ;
Actor actor = ProcessFactory.eINSTANCE.createActor() ;
actor.setName(generateActorName(process)) ;
getEditingDomain().getCommandStack().execute(AddCommand.create(getEditingDomain(), process, ProcessPackage.Literals.ABSTRACT_PROCESS__ACTORS,actor)) ;
refresh() ;
actorsViewer.editElement(actor, 0) ;
}
private String generateActorName(AbstractProcess process) {
Set<String> actorsName = new HashSet<String>() ;
for(Actor a : process.getActors()){
actorsName.add(a.getName()) ;
}
return NamingUtils.generateNewName(actorsName,Messages.defaultActorName) ;
}
@Override
public void refresh() {
super.refresh();
if(getEObject() != null){
AbstractProcess process = (AbstractProcess) getEObject() ;
actorsViewer.setInput(EMFEditObservables.observeList(getEditingDomain(), process, ProcessPackage.Literals.ABSTRACT_PROCESS__ACTORS)) ;
updateButtons() ;
}
}
@Override
public void selectionChanged(SelectionChangedEvent arg0) {
updateButtons() ;
}
private void updateButtons() {
if(removeButton != null && !removeButton.isDisposed()){
removeButton.setEnabled(!actorsViewer.getSelection().isEmpty()) ;
}
if(setAsInitiatorButton != null && !setAsInitiatorButton.isDisposed()){
if(!actorsViewer.getSelection().isEmpty()){
Actor selectedActor = (Actor) ((IStructuredSelection) actorsViewer.getSelection()).getFirstElement() ;
setAsInitiatorButton.setEnabled(!selectedActor.isInitiator()) ;
}else{
setAsInitiatorButton.setEnabled(false) ;
}
}
}
@Override
protected void setEditingDomain(TransactionalEditingDomain editingDomain) {
super.setEditingDomain(editingDomain);
if(nameEditingSupport != null){
nameEditingSupport.setTransactionalEditingDomain(editingDomain) ;
descripitonEditingSupport.setTransactionalEditingDomain(editingDomain) ;
}
}
@Override
public void doubleClick(DoubleClickEvent arg0) {
}
@Override
public String getSectionDescription() {
return Messages.addRemoveActors;
}
}
| true | true | public void createControls(Composite parent,TabbedPropertySheetPage aTabbedPropertySheetPage) {
TabbedPropertySheetWidgetFactory widgetFactory = aTabbedPropertySheetPage.getWidgetFactory() ;
super.createControls(parent, aTabbedPropertySheetPage) ;
// parent.setLayoutData(GridDataFactory.fillDefaults().grab(true,true).hint(SWT.DEFAULT, 180).create()) ;
Composite mainComposite = widgetFactory.createComposite(parent, SWT.NONE) ;
mainComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(2).margins(10, 10).extendedMargins(0, 20, 5, 15).spacing(5, 2).create()) ;
mainComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).hint(SWT.DEFAULT, 180).create());
// Label actorsLabel = widgetFactory.createLabel(mainComposite, Messages.addRemoveActors,SWT.WRAP) ;
// actorsLabel.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).span(2, 1).create()) ;
widgetFactory.createCLabel(mainComposite,"", SWT.NONE);
final CLabel statusControl = widgetFactory.createCLabel(mainComposite,"", SWT.NONE);
statusControl.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).create());
Composite buttonsComposite = widgetFactory.createComposite(mainComposite, SWT.NONE) ;
buttonsComposite.setLayoutData(GridDataFactory.fillDefaults().grab(false, false).create()) ;
buttonsComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(1).equalWidth(false).margins(0, 0).spacing(0, 3).create()) ;
createAddButton(buttonsComposite,widgetFactory) ;
setAsInitiatorButton = createInitiatorButton(buttonsComposite,widgetFactory) ;
removeButton = createRemoveButton(buttonsComposite,widgetFactory) ;
actorsViewer = new TableViewer(mainComposite, SWT.FULL_SELECTION | SWT.BORDER | SWT.MULTI | SWT.V_SCROLL) ;
widgetFactory.adapt(actorsViewer.getTable(),false,false) ;
actorsViewer.getTable().setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
actorsViewer.setContentProvider(new ObservableListContentProvider());
TableLayout tableLayout = new TableLayout() ;
tableLayout.addColumnData(new ColumnWeightData(3)) ;
tableLayout.addColumnData(new ColumnWeightData(30)) ;
tableLayout.addColumnData(new ColumnWeightData(67)) ;
actorsViewer.getTable().setLayout(tableLayout) ;
actorsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
public void selectionChanged(SelectionChangedEvent event) {
updateButtons() ;
}
}) ;
TableViewerColumn initiatorIconViewer = new TableViewerColumn(actorsViewer,SWT.NONE) ;
initiatorIconViewer.setLabelProvider(new ColumnLabelProvider(){
@Override
public String getText(Object element) {
return "";
}
@Override
public String getToolTipText(Object element) {
if(((Actor)element).isInitiator()){
return Messages.processInitiator ;
}
return null ;
}
@Override
public int getToolTipTimeDisplayed(Object object) {
return 4000 ;
}
@Override
public int getToolTipDisplayDelayTime(Object object) {
return 300;
}
@Override
public Point getToolTipShift(Object object) {
return new Point(5,5);
}
@Override
public Image getImage(Object element) {
if(((Actor)element).isInitiator()){
return Pics.getImage("initiator.png", ActorsPlugin.getDefault()) ;
}
return null;
}
}) ;
TableViewerColumn columnNameViewer = new TableViewerColumn(actorsViewer,SWT.NONE) ;
columnNameViewer.setLabelProvider(new ColumnLabelProvider(){
@Override
public String getText(Object element) {
return ((Actor)element).getName() ;
}
}) ;
final CellEditorValidationStatusListener listener = new CellEditorValidationStatusListener(statusControl);
nameEditingSupport = new ActorNameEditingSupport(columnNameViewer.getViewer(),getEditingDomain(),listener) ;
columnNameViewer.setEditingSupport(nameEditingSupport) ;
TableColumn column = columnNameViewer.getColumn() ;
column.setText(Messages.name) ;
TableViewerColumn columnDescriptionViewer = new TableViewerColumn(actorsViewer,SWT.NONE) ;
columnDescriptionViewer.setLabelProvider(new ColumnLabelProvider(){
@Override
public String getText(Object element) {
return ((Actor)element).getDocumentation();
}
}) ;
descripitonEditingSupport = new ActorDescripitonEditingSupport(columnDescriptionViewer.getViewer(),getEditingDomain()) ;
columnDescriptionViewer.setEditingSupport(descripitonEditingSupport) ;
TableColumn column3 = columnDescriptionViewer.getColumn() ;
column3.setText(Messages.description) ;
actorsViewer.getTable().setHeaderVisible(true);
actorsViewer.getTable().setLinesVisible(true) ;
ColumnViewerToolTipSupport.enableFor(actorsViewer);
TableColumnSorter sorter = new TableColumnSorter(actorsViewer) ;
sorter.setColumn(column) ;
updateButtons() ;
}
| public void createControls(Composite parent,TabbedPropertySheetPage aTabbedPropertySheetPage) {
TabbedPropertySheetWidgetFactory widgetFactory = aTabbedPropertySheetPage.getWidgetFactory() ;
super.createControls(parent, aTabbedPropertySheetPage) ;
// parent.setLayoutData(GridDataFactory.fillDefaults().grab(true,true).hint(SWT.DEFAULT, 180).create()) ;
Composite mainComposite = widgetFactory.createComposite(parent, SWT.NONE) ;
mainComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(2).margins(10, 10).extendedMargins(0, 20, 5, 15).spacing(5, 2).create()) ;
mainComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).hint(SWT.DEFAULT, 180).create());
// Label actorsLabel = widgetFactory.createLabel(mainComposite, Messages.addRemoveActors,SWT.WRAP) ;
// actorsLabel.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).span(2, 1).create()) ;
widgetFactory.createCLabel(mainComposite,"", SWT.NONE);
final CLabel statusControl = widgetFactory.createCLabel(mainComposite,"", SWT.NONE);
statusControl.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).create());
Composite buttonsComposite = widgetFactory.createComposite(mainComposite, SWT.NONE) ;
buttonsComposite.setLayoutData(GridDataFactory.fillDefaults().grab(false, false).create()) ;
buttonsComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(1).equalWidth(false).margins(0, 0).spacing(0, 3).create()) ;
createAddButton(buttonsComposite,widgetFactory) ;
setAsInitiatorButton = createInitiatorButton(buttonsComposite,widgetFactory) ;
removeButton = createRemoveButton(buttonsComposite,widgetFactory) ;
actorsViewer = new TableViewer(mainComposite, SWT.FULL_SELECTION | SWT.BORDER | SWT.MULTI | SWT.V_SCROLL) ;
widgetFactory.adapt(actorsViewer.getTable(),false,false) ;
actorsViewer.getTable().setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
actorsViewer.setContentProvider(new ObservableListContentProvider());
TableLayout tableLayout = new TableLayout() ;
tableLayout.addColumnData(new ColumnWeightData(3)) ;
tableLayout.addColumnData(new ColumnWeightData(30)) ;
tableLayout.addColumnData(new ColumnWeightData(67)) ;
actorsViewer.getTable().setLayout(tableLayout) ;
actorsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
public void selectionChanged(SelectionChangedEvent event) {
updateButtons() ;
}
}) ;
TableViewerColumn initiatorIconViewer = new TableViewerColumn(actorsViewer,SWT.NONE) ;
initiatorIconViewer.setLabelProvider(new ColumnLabelProvider(){
@Override
public String getText(Object element) {
return null;
}
@Override
public String getToolTipText(Object element) {
if(((Actor)element).isInitiator()){
return Messages.processInitiator ;
}
return null ;
}
@Override
public int getToolTipTimeDisplayed(Object object) {
return 4000 ;
}
@Override
public int getToolTipDisplayDelayTime(Object object) {
return 300;
}
@Override
public Point getToolTipShift(Object object) {
return new Point(5,5);
}
@Override
public Image getImage(Object element) {
if(((Actor)element).isInitiator()){
return Pics.getImage("initiator.png", ActorsPlugin.getDefault()) ;
}
return null;
}
}) ;
TableViewerColumn columnNameViewer = new TableViewerColumn(actorsViewer,SWT.NONE) ;
columnNameViewer.setLabelProvider(new ColumnLabelProvider(){
@Override
public String getText(Object element) {
return ((Actor)element).getName() ;
}
}) ;
final CellEditorValidationStatusListener listener = new CellEditorValidationStatusListener(statusControl);
nameEditingSupport = new ActorNameEditingSupport(columnNameViewer.getViewer(),getEditingDomain(),listener) ;
columnNameViewer.setEditingSupport(nameEditingSupport) ;
TableColumn column = columnNameViewer.getColumn() ;
column.setText(Messages.name) ;
TableViewerColumn columnDescriptionViewer = new TableViewerColumn(actorsViewer,SWT.NONE) ;
columnDescriptionViewer.setLabelProvider(new ColumnLabelProvider(){
@Override
public String getText(Object element) {
return ((Actor)element).getDocumentation();
}
}) ;
descripitonEditingSupport = new ActorDescripitonEditingSupport(columnDescriptionViewer.getViewer(),getEditingDomain()) ;
columnDescriptionViewer.setEditingSupport(descripitonEditingSupport) ;
TableColumn column3 = columnDescriptionViewer.getColumn() ;
column3.setText(Messages.description) ;
actorsViewer.getTable().setHeaderVisible(true);
actorsViewer.getTable().setLinesVisible(true) ;
ColumnViewerToolTipSupport.enableFor(actorsViewer);
TableColumnSorter sorter = new TableColumnSorter(actorsViewer) ;
sorter.setColumn(column) ;
updateButtons() ;
}
|
diff --git a/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java b/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
index 675bdc6c4..b35261f78 100644
--- a/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
+++ b/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
@@ -1,919 +1,919 @@
/*
Derby - Class org.apache.derby.impl.store.raw.data.CachedPage
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.derby.impl.store.raw.data;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.impl.store.raw.data.BasePage;
import org.apache.derby.iapi.store.raw.log.LogInstant;
import org.apache.derby.iapi.store.raw.ContainerHandle;
import org.apache.derby.iapi.store.raw.PageKey;
import org.apache.derby.iapi.services.cache.Cacheable;
import org.apache.derby.iapi.services.cache.CacheManager;
import org.apache.derby.iapi.services.context.ContextService;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.sanity.SanityManager;
import org.apache.derby.iapi.services.io.FormatIdUtil;
import org.apache.derby.iapi.services.io.StoredFormatIds;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.error.ExceptionSeverity;
import java.io.IOException;
/**
A base page that is cached.
Since there are multiple page formats, use this abstract class to implement
cacheable interface.
*/
public abstract class CachedPage extends BasePage implements Cacheable
{
protected boolean alreadyReadPage; // true when page read by another
// class
protected byte[] pageData; // the actual page data - this is
// the 'buffer' in the buffer cache
// The isDirty flag indicates if the pageData or pageHeader has been
// modified. The preDirty flag indicates that the pageData or the
// pageHeader is about to be modified. The reason for these 2 flags
// instead of just one is to accomodate checkpoint. After a clean
// (latched) page sends a log record to the log stream but before that page
// is dirtied by the log operation, a checkpoint could be taken. If so,
// then the redoLWM will be after the log record but, without preDirty, the
// cache cleaning will not have waited for the change. So the preDirty bit
// is to stop the cache cleaning from skipping over this (latched) page
// even though it has not really been modified yet.
protected boolean isDirty; // must be set to true whenever the
// pageData array is touched
// directly or indirectly.
protected boolean preDirty; // set to true if the page is clean
// and the pageData array is about
// to be touched directly or
// indirectly.
protected int initialRowCount; // keep a running count of rows for
// estimated row count.
private long containerRowCount; // the number of rows in the
// container when this page is read
// from disk
/*
** These fields are immutable and can be used by the subclasses directly.
*/
/**
The page cache I live in.
<BR> MT - Immutable
*/
protected CacheManager pageCache;
/**
The container cache my container lives in.
<BR> MT - Immutable
*/
protected CacheManager containerCache;
/**
My factory class.
<BR> MT - Immutable -
*/
protected BaseDataFileFactory dataFactory; // my factory class.
protected static final int PAGE_FORMAT_ID_SIZE = 4;
/*
* the page need to be written and synced to disk
*/
public static final int WRITE_SYNC = 1;
/*
* the page need to be write to disk but not synced
*/
public static final int WRITE_NO_SYNC = 2;
public CachedPage()
{
super();
}
public final void setFactory(BaseDataFileFactory factory)
{
dataFactory = factory;
pageCache = factory.getPageCache();
containerCache = factory.getContainerCache();
}
/**
Initialize a CachedPage.
<p>
Initialize the object, ie. perform work normally perfomed in
constructor. Called by setIdentity() and createIdentity().
*/
protected void initialize()
{
super.initialize();
isDirty = false;
preDirty = false;
initialRowCount = 0;
containerRowCount = 0;
}
/*
** Methods of Cacheable
*/
/**
* Find the container and then read the page from that container.
* <p>
* This is the way new pages enter the page cache.
* <p>
*
* @return always true, higher levels have already checked the page number
* is valid for an open.
*
* @exception StandardException Standard Derby policy.
*
* @see Cacheable#setIdentity
**/
public Cacheable setIdentity(Object key)
throws StandardException
{
if (SanityManager.DEBUG)
{
SanityManager.ASSERT(key instanceof PageKey);
}
initialize();
PageKey newIdentity = (PageKey) key;
FileContainer myContainer =
(FileContainer) containerCache.find(newIdentity.getContainerId());
setContainerRowCount(myContainer.getEstimatedRowCount(0));
try
{
if (!alreadyReadPage)
{
// Fill in the pageData array by reading bytes from disk.
readPage(myContainer, newIdentity);
}
else
{
// pageData array already filled
alreadyReadPage = false;
}
// if the formatID on disk is not the same as this page instance's
// format id, instantiate the real page object
int fmtId = getTypeFormatId();
int onPageFormatId = FormatIdUtil.readFormatIdInteger(pageData);
if (fmtId != onPageFormatId)
{
return changeInstanceTo(
onPageFormatId, newIdentity).setIdentity(key);
}
// this is the correct page instance
initFromData(myContainer, newIdentity);
}
finally
{
containerCache.release(myContainer);
myContainer = null;
}
fillInIdentity(newIdentity);
initialRowCount = 0;
return this;
}
/**
* Find the container and then create the page in that container.
* <p>
* This is the process of creating a new page in a container, in that
* case no need to read the page from disk - just need to initialize it
* in the cache.
* <p>
*
* @return new page, higher levels have already checked the page number is
* valid for an open.
*
* @param key Which page is this?
* @param createParameter details needed to create page like size,
* format id, ...
*
* @exception StandardException Standard exception policy.
*
* @see Cacheable#createIdentity
**/
public Cacheable createIdentity(
Object key,
Object createParameter)
throws StandardException
{
if (SanityManager.DEBUG)
{
SanityManager.ASSERT(key instanceof PageKey);
}
initialize();
PageKey newIdentity = (PageKey) key;
int[] createArgs = (int[]) createParameter;
if (createArgs[0] == -1)
{
throw StandardException.newException(
SQLState.DATA_UNKNOWN_PAGE_FORMAT, newIdentity);
}
// createArgs[0] contains the integer form of the formatId
// if it is not the same as this instance's formatId, instantiate the
// real page object
if (createArgs[0] != getTypeFormatId())
{
return(
changeInstanceTo(createArgs[0], newIdentity).createIdentity(
key, createParameter));
}
// this is the correct page instance
initializeHeaders(5);
createPage(newIdentity, createArgs);
fillInIdentity(newIdentity);
initialRowCount = 0;
/*
* if we need to grow the container and the page has not been
* preallocated, writing page before the log is written so that we
* know if there is an IO error - like running out of disk space - then
* we don't write out the log record, because if we do, it may fail
* after the log goes to disk and then the database may not be
* recoverable.
*
* WRITE_SYNC is used when we create the page without first
* preallocating it
* WRITE_NO_SYNC is used when we are preallocating the page - there
* will be a SYNC call after all the pages are preallocated
* 0 means creating a page that has already been preallocated.
*/
if ((createArgs[1] & WRITE_SYNC) != 0 ||
(createArgs[1] & WRITE_NO_SYNC) != 0)
writePage(newIdentity, (createArgs[1] & WRITE_SYNC) != 0);
if (SanityManager.DEBUG)
{
if (SanityManager.DEBUG_ON(FileContainer.SPACE_TRACE))
{
String syncFlag =
((createArgs[1] & WRITE_SYNC) != 0) ? "Write_Sync" :
(((createArgs[1] & WRITE_NO_SYNC) != 0) ? "Write_NO_Sync" :
"No_write");
SanityManager.DEBUG(
FileContainer.SPACE_TRACE,
"creating new page " + newIdentity + " with " + syncFlag);
}
}
return this;
}
/**
* Convert this page to requested type, as defined by input format id.
* <p>
* The current cache entry is a different format id than the requested
* type, change it. This object is instantiated to the wrong subtype of
* cachedPage, this routine will create an object with the correct subtype,
* and transfer all pertinent information from this to the new correct
* object.
* <p>
*
* @return The new object created with the input fid and transfered info.
*
* @param fid The format id of the new page.
* @param newIdentity The key of the new page.
*
* @exception StandardException Standard exception policy.
**/
private CachedPage changeInstanceTo(int fid, PageKey newIdentity)
throws StandardException
{
CachedPage realPage;
try
{
realPage =
(CachedPage) Monitor.newInstanceFromIdentifier(fid);
}
catch (StandardException se)
{
if (se.getSeverity() > ExceptionSeverity.STATEMENT_SEVERITY)
{
throw se;
}
else
{
throw StandardException.newException(
SQLState.DATA_UNKNOWN_PAGE_FORMAT, se, newIdentity);
}
}
realPage.setFactory(dataFactory);
// avoid creating the data buffer if possible, transfer it to the new
// page if this is the first time the page buffer is used, then
// createPage will create the page array with the correct page size
if (this.pageData != null)
{
realPage.alreadyReadPage = true;
realPage.usePageBuffer(this.pageData);
}
// RESOLVE (12/15/06) - the following code is commented out, but
// not sure why.
// this page should not be used any more, null out all its content and
// wait for GC to clean it up
//destroyPage();// let this subtype have a chance to get rid of stuff
//this.pageData = null; // this instance no longer own the data array
//this.pageCache = null;
//this.dataFactory = null;
//this.containerCache = null;
return realPage;
}
/**
* Is the page dirty?
* <p>
* The isDirty flag indicates if the pageData or pageHeader has been
* modified. The preDirty flag indicates that the pageData or the
* pageHeader is about to be modified. The reason for these 2 flags
* instead of just one is to accomodate checkpoint. After a clean
* (latched) page sends a log record to the log stream but before that page
* is dirtied by the log operation, a checkpoint could be taken. If so,
* then the redoLWM will be after the log record but, without preDirty, the
* cache cleaning will not have waited for the change. So the preDirty bit
* is to stop the cache cleaning from skipping over this (latched) page
* even though it has not really been modified yet.
*
* @return true if the page is dirty.
*
* @see Cacheable#isDirty
**/
public boolean isDirty()
{
synchronized (this)
{
return isDirty || preDirty;
}
}
/**
* Has the page or its header been modified.
* <p>
* See comment on class header on meaning of isDirty and preDirty bits.
* <p>
*
* @return true if changes have actually been made to the page in memory.
**/
public boolean isActuallyDirty()
{
synchronized (this)
{
return isDirty;
}
}
/**
* Set state to indicate the page or its header is about to be modified.
* <p>
* See comment on class header on meaning of isDirty and preDirty bits.
**/
public void preDirty()
{
synchronized (this)
{
if (!isDirty)
preDirty = true;
}
}
/**
* Set state to indicate the page or its header has been modified.
* <p>
* See comment on class header on meaning of isDirty and preDirty bits.
* <p>
**/
protected void setDirty()
{
synchronized (this)
{
isDirty = true;
preDirty = false;
}
}
/**
* exclusive latch on page is being released.
* <p>
* The only work done in CachedPage is to update the row count on the
* container if it is too out of sync.
**/
protected void releaseExclusive()
{
// look at dirty bit without latching, the updating of the row
// count is just an optimization so does not need the latch.
//
// if this page actually has > 1/8 rows of the entire container, then
// consider updating the row count if it is different.
//
// No need to special case allocation pages because it has recordCount
// of zero, thus the if clause will never be true for an allocation
// page.
if (isDirty && !isOverflowPage() &&
(containerRowCount / 8) < recordCount())
{
int currentRowCount = internalNonDeletedRecordCount();
int delta = currentRowCount-initialRowCount;
int posDelta = delta > 0 ? delta : (-delta);
if ((containerRowCount/8) < posDelta)
{
// This pages delta row count represents a significant change
// with respect to current container row count so update
// container row count
FileContainer myContainer = null;
try
{
myContainer = (FileContainer)
containerCache.find(identity.getContainerId());
if (myContainer != null)
{
myContainer.updateEstimatedRowCount(delta);
setContainerRowCount(
myContainer.getEstimatedRowCount(0));
initialRowCount = currentRowCount;
// since I have the container, might as well update the
// unfilled information
myContainer.trackUnfilledPage(
identity.getPageNumber(), unfilled());
}
}
catch (StandardException se)
{
// do nothing, not sure what could fail but this update
// is just an optimization so no need to throw error.
}
finally
{
if (myContainer != null)
containerCache.release(myContainer);
}
}
}
super.releaseExclusive();
}
/**
* Write the page to disk.
* <p>
* MP - In a simple world we would just not allow clean until it held the
* latch on the page. But in order to fit into the cache system, we
* don't have enough state around to just make clean() latch the page
* while doing the I/O - but we still need someway to insure that no
* changes happen to the page while the I/O is taking place.
* Also someday it would be fine to allow reads of this page
* while the I/O was taking place.
*
*
* @exception StandardException Error writing the page.
*
* @see Cacheable#clean
**/
public void clean(boolean remove) throws StandardException
{
// must wait for the page to be unlatched
synchronized (this)
{
if (!isDirty())
return;
// is someone else cleaning it
while (inClean)
{
try
{
wait();
}
catch (InterruptedException ie)
{
throw StandardException.interrupt(ie);
}
}
// page is not "inClean" by other thread at this point.
if (!isDirty())
return;
inClean = true;
// If page is in LATCHED state (as opposed to UNLATCH or PRELATCH)
// wait for the page to move to UNLATCHED state. See Comments in
// Generic/BasePage.java describing the interaction of inClean,
// (owner != null), and preLatch.
while ((owner != null) && !preLatch)
{
try
{
wait();
}
catch (InterruptedException ie)
{
inClean = false;
throw StandardException.interrupt(ie);
}
}
// The page is now effectively latched by the cleaner.
// We only want to clean the page if the page is actually dirtied,
// not when it is just pre-dirtied.
if (!isActuallyDirty())
{
// the person who latched it gives up the
// latch without really dirtying the page
preDirty = false;
inClean = false;
notifyAll();
return;
}
}
try
{
writePage(getPageId(), false);
}
catch(StandardException se)
{
// If we get an error while trying to write a page, current
// recovery system requires that entire DB is shutdown. Then
// when system is rebooted we will run redo recovery which
// if it does not encounter disk errors will guarantee to recover
// to a transaction consistent state. If this write is a
// persistent device problem, redo recovery will likely fail
// attempting to the same I/O. Mark corrupt will stop all further
// writes of data and log by the system.
throw dataFactory.markCorrupt(se);
}
finally
{
// if there is something wrong in writing out the page,
// do not leave it inClean state or it will block the next cleaner
// forever
synchronized (this)
{
inClean = false;
notifyAll();
}
}
}
public void clearIdentity()
{
alreadyReadPage = false;
super.clearIdentity();
}
/**
* read the page from disk into this CachedPage object.
* <p>
* A page is read in from disk into the pageData array of this object,
* and then put in the cache.
* <p>
*
* @param myContainer the container to read the page from.
* @param newIdentity indentity (ie. page number) of the page to read
*
* @exception StandardException Standard exception policy.
**/
private void readPage(
FileContainer myContainer,
PageKey newIdentity)
throws StandardException
{
int pagesize = myContainer.getPageSize();
// we will reuse the existing page array if it is same size, the
// cache does support caching various sized pages.
setPageArray(pagesize);
for (int io_retry_count = 0;;)
{
try
{
myContainer.readPage(newIdentity.getPageNumber(), pageData);
break;
}
catch (IOException ioe)
{
io_retry_count++;
// Retrying read I/O's has been found to be successful sometimes
// in completing the read without having to fail the calling
// query, and in some cases avoiding complete db shutdown.
// Some situations are:
// spurious interrupts being sent to thread by clients.
// unreliable hardware like a network mounted file system.
//
// The only option other than retrying is to fail the I/O
// immediately and throwing an error, thus performance cost
// not really a consideration.
//
// The retry max of 4 is arbitrary, but has been enough that
// not many read I/O errors have been reported.
if (io_retry_count > 4)
{
// page cannot be physically read
StandardException se =
StandardException.newException(
SQLState.FILE_READ_PAGE_EXCEPTION,
ioe, newIdentity, new Integer(pagesize));
if (dataFactory.getLogFactory().inRFR())
{
//if in rollforward recovery, it is possible that this
//page actually does not exist on the disk yet because
//the log record we are proccessing now is actually
//creating the page, we will recreate the page if we
//are in rollforward recovery, so just throw the
//exception.
throw se;
}
else
{
if (SanityManager.DEBUG)
{
// by shutting down system in debug mode, maybe
// we can catch root cause of the interrupt.
throw dataFactory.markCorrupt(se);
}
else
{
// No need to shut down runtime database on read
// error in delivered system, throwing exception
// should be enough. Thrown exception has nested
// IO exception which is root cause of error.
throw se;
}
}
}
}
}
}
/**
* write the page from this CachedPage object to disk.
* <p>
*
* @param identity indentity (ie. page number) of the page to read
* @param syncMe does the write of this single page have to be sync'd?
*
* @exception StandardException Standard exception policy.
**/
private void writePage(
PageKey identity,
boolean syncMe)
throws StandardException
{
// make subclass write the page format
writeFormatId(identity);
// let subclass have a chance to write any cached data to page data
// array
writePage(identity);
// force WAL - and check to see if database is corrupt or is frozen.
// last log Instant may be null if the page is being forced
// to disk on a createPage (which violates the WAL protocol actually).
// See FileContainer.newPage
LogInstant flushLogTo = getLastLogInstant();
dataFactory.flush(flushLogTo);
if (flushLogTo != null)
{
clearLastLogInstant();
}
// find the container and file access object
FileContainer myContainer =
(FileContainer) containerCache.find(identity.getContainerId());
if (myContainer != null)
{
try
{
myContainer.writePage(
identity.getPageNumber(), pageData, syncMe);
//
// Do some in memory unlogged bookkeeping tasks while we have
// the container.
//
if (!isOverflowPage() && isDirty())
{
// let the container knows whether this page is a not
// filled, non-overflow page
myContainer.trackUnfilledPage(
identity.getPageNumber(), unfilled());
// if this is not an overflow page, see if the page's row
// count has changed since it come into the cache.
//
// if the page is not invalid, row count is 0. Otherwise,
// count non-deleted records on page.
//
// Cannot call nonDeletedRecordCount because the page is
// unlatched now even though nobody is changing it
int currentRowCount = internalNonDeletedRecordCount();
if (currentRowCount != initialRowCount)
{
myContainer.updateEstimatedRowCount(
currentRowCount - initialRowCount);
setContainerRowCount(
myContainer.getEstimatedRowCount(0));
initialRowCount = currentRowCount;
}
}
}
catch (IOException ioe)
{
// page cannot be written
throw StandardException.newException(
SQLState.FILE_WRITE_PAGE_EXCEPTION,
- ioe, identity, new Integer(myContainer.getPageSize()));
+ ioe, identity);
}
finally
{
containerCache.release(myContainer);
myContainer = null;
}
}
else
{
StandardException nested =
StandardException.newException(
SQLState.DATA_CONTAINER_VANISHED,
identity.getContainerId());
throw dataFactory.markCorrupt(
StandardException.newException(
SQLState.FILE_WRITE_PAGE_EXCEPTION, nested,
- identity, new Integer(myContainer.getPageSize())));
+ identity));
}
synchronized (this)
{
// change page state to not dirty after the successful write
isDirty = false;
preDirty = false;
}
}
public void setContainerRowCount(long rowCount)
{
containerRowCount = rowCount;
}
/**
** if the page size is different from the page buffer, then make a
** new page buffer and make subclass use the new page buffer
*/
protected void setPageArray(int pageSize)
{
if ((pageData == null) || (pageData.length != pageSize))
{
// Give a chance for garbage collection to free
// the old array before the new array is allocated.
// Just in case memory is low.
pageData = null;
pageData = new byte[pageSize];
usePageBuffer(pageData);
}
}
/**
* Returns the page data array used to write on disk version.
*
* <p>
* returns the page data array, that is actually written to the disk,
* when the page is cleaned from the page cache. Takes care of flushing
* in-memory information to the array (like page header and format id info).
* <p>
*
* @return The array of bytes that is the on disk version of page.
*
* @exception StandardException Standard exception policy.
**/
protected byte[] getPageArray() throws StandardException
{
// make subclass write the page format
writeFormatId(identity);
// let subclass have a chance to write any cached
// data to page data array
writePage(identity);
return pageData;
}
/* methods for subclass of cached page */
// use a new pageData buffer, initialize in memory structure that depend on
// the pageData's size. The actual disk data may not have not been read in
// yet so don't look at the content of the buffer
protected abstract void usePageBuffer(byte[] buffer);
// initialize in memory structure using the read in buffer in pageData
protected abstract void initFromData(FileContainer container, PageKey id)
throws StandardException;
// create the page
protected abstract void createPage(PageKey id, int[] args)
throws StandardException;
// page is about to be written, write everything to pageData array
protected abstract void writePage(PageKey id) throws StandardException;
// write out the formatId to the pageData
protected abstract void writeFormatId(PageKey identity)
throws StandardException;
}
| false | true | private void writePage(
PageKey identity,
boolean syncMe)
throws StandardException
{
// make subclass write the page format
writeFormatId(identity);
// let subclass have a chance to write any cached data to page data
// array
writePage(identity);
// force WAL - and check to see if database is corrupt or is frozen.
// last log Instant may be null if the page is being forced
// to disk on a createPage (which violates the WAL protocol actually).
// See FileContainer.newPage
LogInstant flushLogTo = getLastLogInstant();
dataFactory.flush(flushLogTo);
if (flushLogTo != null)
{
clearLastLogInstant();
}
// find the container and file access object
FileContainer myContainer =
(FileContainer) containerCache.find(identity.getContainerId());
if (myContainer != null)
{
try
{
myContainer.writePage(
identity.getPageNumber(), pageData, syncMe);
//
// Do some in memory unlogged bookkeeping tasks while we have
// the container.
//
if (!isOverflowPage() && isDirty())
{
// let the container knows whether this page is a not
// filled, non-overflow page
myContainer.trackUnfilledPage(
identity.getPageNumber(), unfilled());
// if this is not an overflow page, see if the page's row
// count has changed since it come into the cache.
//
// if the page is not invalid, row count is 0. Otherwise,
// count non-deleted records on page.
//
// Cannot call nonDeletedRecordCount because the page is
// unlatched now even though nobody is changing it
int currentRowCount = internalNonDeletedRecordCount();
if (currentRowCount != initialRowCount)
{
myContainer.updateEstimatedRowCount(
currentRowCount - initialRowCount);
setContainerRowCount(
myContainer.getEstimatedRowCount(0));
initialRowCount = currentRowCount;
}
}
}
catch (IOException ioe)
{
// page cannot be written
throw StandardException.newException(
SQLState.FILE_WRITE_PAGE_EXCEPTION,
ioe, identity, new Integer(myContainer.getPageSize()));
}
finally
{
containerCache.release(myContainer);
myContainer = null;
}
}
else
{
StandardException nested =
StandardException.newException(
SQLState.DATA_CONTAINER_VANISHED,
identity.getContainerId());
throw dataFactory.markCorrupt(
StandardException.newException(
SQLState.FILE_WRITE_PAGE_EXCEPTION, nested,
identity, new Integer(myContainer.getPageSize())));
}
synchronized (this)
{
// change page state to not dirty after the successful write
isDirty = false;
preDirty = false;
}
}
| private void writePage(
PageKey identity,
boolean syncMe)
throws StandardException
{
// make subclass write the page format
writeFormatId(identity);
// let subclass have a chance to write any cached data to page data
// array
writePage(identity);
// force WAL - and check to see if database is corrupt or is frozen.
// last log Instant may be null if the page is being forced
// to disk on a createPage (which violates the WAL protocol actually).
// See FileContainer.newPage
LogInstant flushLogTo = getLastLogInstant();
dataFactory.flush(flushLogTo);
if (flushLogTo != null)
{
clearLastLogInstant();
}
// find the container and file access object
FileContainer myContainer =
(FileContainer) containerCache.find(identity.getContainerId());
if (myContainer != null)
{
try
{
myContainer.writePage(
identity.getPageNumber(), pageData, syncMe);
//
// Do some in memory unlogged bookkeeping tasks while we have
// the container.
//
if (!isOverflowPage() && isDirty())
{
// let the container knows whether this page is a not
// filled, non-overflow page
myContainer.trackUnfilledPage(
identity.getPageNumber(), unfilled());
// if this is not an overflow page, see if the page's row
// count has changed since it come into the cache.
//
// if the page is not invalid, row count is 0. Otherwise,
// count non-deleted records on page.
//
// Cannot call nonDeletedRecordCount because the page is
// unlatched now even though nobody is changing it
int currentRowCount = internalNonDeletedRecordCount();
if (currentRowCount != initialRowCount)
{
myContainer.updateEstimatedRowCount(
currentRowCount - initialRowCount);
setContainerRowCount(
myContainer.getEstimatedRowCount(0));
initialRowCount = currentRowCount;
}
}
}
catch (IOException ioe)
{
// page cannot be written
throw StandardException.newException(
SQLState.FILE_WRITE_PAGE_EXCEPTION,
ioe, identity);
}
finally
{
containerCache.release(myContainer);
myContainer = null;
}
}
else
{
StandardException nested =
StandardException.newException(
SQLState.DATA_CONTAINER_VANISHED,
identity.getContainerId());
throw dataFactory.markCorrupt(
StandardException.newException(
SQLState.FILE_WRITE_PAGE_EXCEPTION, nested,
identity));
}
synchronized (this)
{
// change page state to not dirty after the successful write
isDirty = false;
preDirty = false;
}
}
|
diff --git a/Tanks/src/blueMaggot/BlueMaggot.java b/Tanks/src/blueMaggot/BlueMaggot.java
index 8e4e0ea..4a01e75 100644
--- a/Tanks/src/blueMaggot/BlueMaggot.java
+++ b/Tanks/src/blueMaggot/BlueMaggot.java
@@ -1,185 +1,185 @@
package blueMaggot;
import entity.Tank;
import gfx.GBC;
import gfx.GBC.Align;
import gfx.MenuAbout;
import gfx.MenuBackground;
import gfx.MenuField;
import gfx.MenuKeys;
import gfx.MenuLevelSelect;
import gfx.MenuOptions;
import gfx.MenuOptionsLan;
import gfx.MenuScoreBoard;
import gfx.MenuTitle;
import inputhandler.InputHandler;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLayeredPane;
import javax.swing.JPanel;
import javax.swing.JTextArea;
/**
* @author Habitats * this motherfucker starts the game
*/
public class BlueMaggot extends JFrame implements GameListener {
public InputHandler inputReal = new InputHandler();
private JLayeredPane layeredPane = new JLayeredPane();
private JPanel gamePanel;
public MenuScoreBoard menuScore;
public MenuLevelSelect menuLevelSelect;
public MenuOptions menuOptions;
public MenuOptionsLan menuOptionsLan;
public MenuAbout menuAbout;
public MenuTitle menuTitle;
public MenuKeys menuKeys;
public static Exception e;
Game game;
private MenuBackground menuBackground;
public BlueMaggot() {
GameState.getInstance().init();
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setPreferredSize(new Dimension(GameState.getInstance().getWidth(), GameState.getInstance().getHeight() + 28));
setFocusable(true);
setResizable(false);
layeredPane.setBounds(0, 0, GameState.getInstance().getWidth(), GameState.getInstance().getHeight());
layeredPane.setOpaque(false);
game = new blueMaggot.Game(this);
menuTitle = new MenuTitle(game, this);
menuOptions = new MenuOptions(game);
menuOptionsLan = new MenuOptionsLan(game);
menuAbout = new MenuAbout(game);
menuScore = new MenuScoreBoard(game);
menuLevelSelect = new MenuLevelSelect(game);
menuBackground = new MenuBackground(menuTitle);
menuKeys = new MenuKeys(game);
gamePanel = new JPanel();
gamePanel.setBackground(Color.DARK_GRAY);
layeredPane.add(gamePanel, new Integer(0));
layeredPane.add(menuBackground, new Integer(9));
layeredPane.add(menuTitle, new Integer(10));
layeredPane.add(menuOptions, new Integer(11));
layeredPane.add(menuOptionsLan, new Integer(11));
layeredPane.add(menuLevelSelect, new Integer(11));
layeredPane.add(menuAbout, new Integer(11));
layeredPane.add(menuKeys, new Integer(11));
layeredPane.add(menuScore, new Integer(12));
+ inputReal.resetLan();
try {
inputReal.readConfig();
System.out.println("reading keybinds from config");
} catch (Exception e) {
- inputReal.resetLan();
System.out.println("no config found, setting defaults");
}
for (MenuField menuField : MenuField.menuFields) {
menuField.reset();
}
add(layeredPane);
pack();
setLocationRelativeTo(null);
setVisible(true);
repaint();
}
private void setUpGame() {
game.setPreferredSize(GameState.getInstance().dimension);
gamePanel.setLayout(new BorderLayout());
gamePanel.setBounds(0, 0, GameState.getInstance().getWidth(), GameState.getInstance().getHeight());
gamePanel.add(game);
}
public static void main(String[] args) {
try {
(new BlueMaggot()).setUpGame();
} catch (Exception exception) {
e = exception;
} finally {
if (e != null) {
JFrame warning = new JFrame();
JTextArea content = new JTextArea();
warning.setLayout(new GridBagLayout());
content.append("FATAL MALVISIOUS ERROR!!11\n");
content.append("(╯°□°）╯︵ ┻━┻\n");
content.append("Protip:\nMake sure your \"lvl\" directory is in the same folder as your blueMaggot.jar file!\n\n");
content.append("Error:\n " + e.toString() + "\n\n");
content.append("StackTrace:\n");
for (StackTraceElement stack : e.getStackTrace()) {
content.append(stack.toString() + "\n");
}
warning.setTitle("ERROR");
e.printStackTrace();
JButton exit = new JButton("exit");
exit.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
System.exit(1);
}
});
warning.add(content, new GBC(0, 0, Align.MID));
warning.add(exit, new GBC(0, 1, Align.MID));
warning.pack();
warning.setVisible(true);
warning.setAlwaysOnTop(true);
warning.setLocationRelativeTo(null);
}
}
}
public void tick(Graphics2D g) {
for (Tank tank : GameState.getInstance().getPlayers()) {
if (tank.getNick() == null)
tank.setNick("Player");
}
if (inputReal.menu.clicked) {
inputReal.menu.clicked = false;
inputReal.releaseAll();
if (!menuTitle.isVisible()) {
menuTitle.setVisible(true);
menuBackground.setVisible(true);
GameState.getInstance().setPaused(true);
}
}
if (GameState.getInstance().isGameOver()) {
menuTitle.setVisible(true);
menuScore.setVisible(true);
menuScore.repaint();
GameState.getInstance().setRunning(false);
GameState.getInstance().setPaused(true);
GameState.getInstance().setGameOver(false);
menuBackground.setVisible(true);
}
}
@Override
public void ConnectionFailed(String msg) {
GameState.getInstance().setPaused(true);
menuTitle.setVisible(true);
System.out.println("game crashed, retreat!");
}
}
| false | true | public BlueMaggot() {
GameState.getInstance().init();
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setPreferredSize(new Dimension(GameState.getInstance().getWidth(), GameState.getInstance().getHeight() + 28));
setFocusable(true);
setResizable(false);
layeredPane.setBounds(0, 0, GameState.getInstance().getWidth(), GameState.getInstance().getHeight());
layeredPane.setOpaque(false);
game = new blueMaggot.Game(this);
menuTitle = new MenuTitle(game, this);
menuOptions = new MenuOptions(game);
menuOptionsLan = new MenuOptionsLan(game);
menuAbout = new MenuAbout(game);
menuScore = new MenuScoreBoard(game);
menuLevelSelect = new MenuLevelSelect(game);
menuBackground = new MenuBackground(menuTitle);
menuKeys = new MenuKeys(game);
gamePanel = new JPanel();
gamePanel.setBackground(Color.DARK_GRAY);
layeredPane.add(gamePanel, new Integer(0));
layeredPane.add(menuBackground, new Integer(9));
layeredPane.add(menuTitle, new Integer(10));
layeredPane.add(menuOptions, new Integer(11));
layeredPane.add(menuOptionsLan, new Integer(11));
layeredPane.add(menuLevelSelect, new Integer(11));
layeredPane.add(menuAbout, new Integer(11));
layeredPane.add(menuKeys, new Integer(11));
layeredPane.add(menuScore, new Integer(12));
try {
inputReal.readConfig();
System.out.println("reading keybinds from config");
} catch (Exception e) {
inputReal.resetLan();
System.out.println("no config found, setting defaults");
}
for (MenuField menuField : MenuField.menuFields) {
menuField.reset();
}
add(layeredPane);
pack();
setLocationRelativeTo(null);
setVisible(true);
repaint();
}
| public BlueMaggot() {
GameState.getInstance().init();
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setPreferredSize(new Dimension(GameState.getInstance().getWidth(), GameState.getInstance().getHeight() + 28));
setFocusable(true);
setResizable(false);
layeredPane.setBounds(0, 0, GameState.getInstance().getWidth(), GameState.getInstance().getHeight());
layeredPane.setOpaque(false);
game = new blueMaggot.Game(this);
menuTitle = new MenuTitle(game, this);
menuOptions = new MenuOptions(game);
menuOptionsLan = new MenuOptionsLan(game);
menuAbout = new MenuAbout(game);
menuScore = new MenuScoreBoard(game);
menuLevelSelect = new MenuLevelSelect(game);
menuBackground = new MenuBackground(menuTitle);
menuKeys = new MenuKeys(game);
gamePanel = new JPanel();
gamePanel.setBackground(Color.DARK_GRAY);
layeredPane.add(gamePanel, new Integer(0));
layeredPane.add(menuBackground, new Integer(9));
layeredPane.add(menuTitle, new Integer(10));
layeredPane.add(menuOptions, new Integer(11));
layeredPane.add(menuOptionsLan, new Integer(11));
layeredPane.add(menuLevelSelect, new Integer(11));
layeredPane.add(menuAbout, new Integer(11));
layeredPane.add(menuKeys, new Integer(11));
layeredPane.add(menuScore, new Integer(12));
inputReal.resetLan();
try {
inputReal.readConfig();
System.out.println("reading keybinds from config");
} catch (Exception e) {
System.out.println("no config found, setting defaults");
}
for (MenuField menuField : MenuField.menuFields) {
menuField.reset();
}
add(layeredPane);
pack();
setLocationRelativeTo(null);
setVisible(true);
repaint();
}
|
diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java
index c48166542..b99989cc9 100644
--- a/src/java/org/apache/poi/hssf/model/Sheet.java
+++ b/src/java/org/apache/poi/hssf/model/Sheet.java
@@ -1,2536 +1,2536 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. 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 the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache POI" 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 "Apache",
* "Apache POI", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* 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 THE APACHE SOFTWARE FOUNDATION 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.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.poi.hssf.model;
import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.poi.hssf
.record.*; // normally I don't do this, buy we literally mean ALL
import org.apache.poi.hssf.record.formula.Ptg;
import org.apache.poi.util.*;
import org.apache.poi.hssf.record
.aggregates.*; // normally I don't do this, buy we literally mean ALL
/**
* Low level model implementation of a Sheet (one workbook contains many sheets)
* This file contains the low level binary records starting at the sheets BOF and
* ending with the sheets EOF. Use HSSFSheet for a high level representation.
* <P>
* The structures of the highlevel API use references to this to perform most of their
* operations. Its probably unwise to use these low level structures directly unless you
* really know what you're doing. I recommend you read the Microsoft Excel 97 Developer's
* Kit (Microsoft Press) and the documentation at http://sc.openoffice.org/excelfileformat.pdf
* before even attempting to use this.
* <P>
* @author Andrew C. Oliver (acoliver at apache dot org)
* @author Glen Stampoultzis (glens at apache.org)
* @author Shawn Laubach (slaubach at apache dot org) Gridlines, Headers, Footers, and PrintSetup
* @author Jason Height (jheight at chariot dot net dot au) Clone support
* @author Brian Sanders (kestrel at burdell dot org) Active Cell support
*
* @see org.apache.poi.hssf.model.Workbook
* @see org.apache.poi.hssf.usermodel.HSSFSheet
* @version 1.0-pre
*/
public class Sheet implements Model
{
public static final short LeftMargin = 0;
public static final short RightMargin = 1;
public static final short TopMargin = 2;
public static final short BottomMargin = 3;
protected ArrayList records = null;
int preoffset = 0; // offset of the sheet in a new file
int loc = 0;
protected boolean containsLabels = false;
protected int dimsloc = 0;
protected DimensionsRecord dims;
protected DefaultColWidthRecord defaultcolwidth = null;
protected DefaultRowHeightRecord defaultrowheight = null;
protected GridsetRecord gridset = null;
protected PrintSetupRecord printSetup = null;
protected HeaderRecord header = null;
protected FooterRecord footer = null;
protected PrintGridlinesRecord printGridlines = null;
protected MergeCellsRecord merged = null;
protected ArrayList mergedRecords = new ArrayList();
protected ArrayList mergedLocs = new ArrayList();
protected int numMergedRegions = 0;
protected SelectionRecord selection = null;
private static POILogger log = POILogFactory.getLogger(Sheet.class);
private ArrayList columnSizes = null; // holds column info
protected ValueRecordsAggregate cells = null;
protected RowRecordsAggregate rows = null;
private Iterator valueRecIterator = null;
private Iterator rowRecIterator = null;
protected int eofLoc = 0;
public static final byte PANE_LOWER_RIGHT = (byte)0;
public static final byte PANE_UPPER_RIGHT = (byte)1;
public static final byte PANE_LOWER_LEFT = (byte)2;
public static final byte PANE_UPPER_LEFT = (byte)3;
/**
* Creates new Sheet with no intialization --useless at this point
* @see #createSheet(List,int,int)
*/
public Sheet()
{
}
/**
* read support (offset used as starting point for search) for low level
* API. Pass in an array of Record objects, the sheet number (0 based) and
* a record offset (should be the location of the sheets BOF record). A Sheet
* object is constructed and passed back with all of its initialization set
* to the passed in records and references to those records held. This function
* is normally called via Workbook.
*
* @param recs array containing those records in the sheet in sequence (normally obtained from RecordFactory)
* @param sheetnum integer specifying the sheet's number (0,1 or 2 in this release)
* @param offset of the sheet's BOF record
*
* @return Sheet object with all values set to those read from the file
*
* @see org.apache.poi.hssf.model.Workbook
* @see org.apache.poi.hssf.record.Record
*/
public static Sheet createSheet(List recs, int sheetnum, int offset)
{
log.logFormatted(log.DEBUG,
"Sheet createSheet (existing file) with %",
new Integer(recs.size()));
Sheet retval = new Sheet();
ArrayList records = new ArrayList(recs.size() / 5);
boolean isfirstcell = true;
boolean isfirstrow = true;
int bofEofNestingLevel = 0;
for (int k = offset; k < recs.size(); k++)
{
Record rec = ( Record ) recs.get(k);
if (rec.getSid() == LabelRecord.sid)
{
log.log(log.DEBUG, "Hit label record.");
retval.containsLabels = true;
}
else if (rec.getSid() == BOFRecord.sid)
{
bofEofNestingLevel++;
log.log(log.DEBUG, "Hit BOF record. Nesting increased to " + bofEofNestingLevel);
}
else if (rec.getSid() == EOFRecord.sid)
{
--bofEofNestingLevel;
log.log(log.DEBUG, "Hit EOF record. Nesting decreased to " + bofEofNestingLevel);
if (bofEofNestingLevel == 0) {
records.add(rec);
retval.eofLoc = k;
break;
}
}
else if (rec.getSid() == DimensionsRecord.sid)
{
retval.dims = ( DimensionsRecord ) rec;
retval.dimsloc = records.size();
}
else if (rec.getSid() == MergeCellsRecord.sid)
{
retval.mergedRecords.add(rec);
retval.merged = ( MergeCellsRecord ) rec;
retval.mergedLocs.add(new Integer(k - offset));
retval.numMergedRegions += retval.merged.getNumAreas();
}
else if (rec.getSid() == ColumnInfoRecord.sid)
{
if (retval.columnSizes == null)
{
retval.columnSizes = new ArrayList();
}
retval.columnSizes.add(rec);
}
else if (rec.getSid() == DefaultColWidthRecord.sid)
{
retval.defaultcolwidth = ( DefaultColWidthRecord ) rec;
}
else if (rec.getSid() == DefaultRowHeightRecord.sid)
{
retval.defaultrowheight = ( DefaultRowHeightRecord ) rec;
}
else if ( rec.isValue() && bofEofNestingLevel == 1 )
{
if ( isfirstcell )
{
retval.cells = new ValueRecordsAggregate();
rec = retval.cells;
retval.cells.construct( k, recs );
isfirstcell = false;
}
else
{
rec = null;
}
}
else if ( rec.getSid() == StringRecord.sid )
{
rec = null;
}
else if ( rec.getSid() == RowRecord.sid )
{
RowRecord row = (RowRecord)rec;
if (!isfirstrow) rec = null; //only add the aggregate once
if ( isfirstrow )
{
retval.rows = new RowRecordsAggregate();
rec = retval.rows;
isfirstrow = false;
}
retval.rows.insertRow(row);
}
else if ( rec.getSid() == PrintGridlinesRecord.sid )
{
retval.printGridlines = (PrintGridlinesRecord) rec;
}
- else if ( rec.getSid() == HeaderRecord.sid )
+ else if ( rec.getSid() == HeaderRecord.sid && bofEofNestingLevel == 1)
{
retval.header = (HeaderRecord) rec;
}
- else if ( rec.getSid() == FooterRecord.sid )
+ else if ( rec.getSid() == FooterRecord.sid && bofEofNestingLevel == 1)
{
retval.footer = (FooterRecord) rec;
}
- else if ( rec.getSid() == PrintSetupRecord.sid )
+ else if ( rec.getSid() == PrintSetupRecord.sid && bofEofNestingLevel == 1)
{
retval.printSetup = (PrintSetupRecord) rec;
}
else if ( rec.getSid() == SelectionRecord.sid )
{
retval.selection = (SelectionRecord) rec;
}
if (rec != null)
{
records.add(rec);
}
}
retval.records = records;
if (retval.rows == null)
{
retval.rows = new RowRecordsAggregate();
}
if (retval.cells == null)
{
retval.cells = new ValueRecordsAggregate();
}
log.log(log.DEBUG, "sheet createSheet (existing file) exited");
return retval;
}
/**
* Clones the low level records of this sheet and returns the new sheet instance.
* This method is implemented by adding methods for deep cloning to all records that
* can be added to a sheet. The <b>Record</b> object does not implement cloneable.
* When adding a new record, implement a public clone method if and only if the record
* belongs to a sheet.
*/
public Sheet cloneSheet()
{
ArrayList clonedRecords = new ArrayList(this.records.size());
for (int i=0; i<this.records.size();i++) {
Record rec = (Record)((Record)this.records.get(i)).clone();
//Need to pull out the Row record and the Value records from their
//Aggregates.
//This is probably the best way to do it since we probably dont want the createSheet
//To cater for these artificial Record types
if (rec instanceof RowRecordsAggregate) {
RowRecordsAggregate rrAgg = (RowRecordsAggregate)rec;
for (Iterator rowIter = rrAgg.getIterator();rowIter.hasNext();) {
Record rowRec = (Record)rowIter.next();
clonedRecords.add(rowRec);
}
} else if (rec instanceof ValueRecordsAggregate) {
ValueRecordsAggregate vrAgg = (ValueRecordsAggregate)rec;
for (Iterator cellIter = vrAgg.getIterator();cellIter.hasNext();) {
Record valRec = (Record)cellIter.next();
clonedRecords.add(valRec);
}
} else if (rec instanceof FormulaRecordAggregate) {
FormulaRecordAggregate fmAgg = (FormulaRecordAggregate)rec;
Record fmAggRec = fmAgg.getFormulaRecord();
if (fmAggRec != null)
clonedRecords.add(fmAggRec);
fmAggRec = fmAgg.getStringRecord();
if (fmAggRec != null)
clonedRecords.add(fmAggRec);
} else {
clonedRecords.add(rec);
}
}
return createSheet(clonedRecords, 0, 0);
}
/**
* read support (offset = 0) Same as createSheet(Record[] recs, int, int)
* only the record offset is assumed to be 0.
*
* @param records array containing those records in the sheet in sequence (normally obtained from RecordFactory)
* @param sheetnum integer specifying the sheet's number (0,1 or 2 in this release)
* @return Sheet object
*/
public static Sheet createSheet(List records, int sheetnum)
{
log.log(log.DEBUG,
"Sheet createSheet (exisiting file) assumed offset 0");
return createSheet(records, sheetnum, 0);
}
/**
* Creates a sheet with all the usual records minus values and the "index"
* record (not required). Sets the location pointer to where the first value
* records should go. Use this to create a sheet from "scratch".
*
* @return Sheet object with all values set to defaults
*/
public static Sheet createSheet()
{
log.log(log.DEBUG, "Sheet createsheet from scratch called");
Sheet retval = new Sheet();
ArrayList records = new ArrayList(30);
records.add(retval.createBOF());
// records.add(retval.createIndex());
records.add(retval.createCalcMode());
records.add(retval.createCalcCount() );
records.add( retval.createRefMode() );
records.add( retval.createIteration() );
records.add( retval.createDelta() );
records.add( retval.createSaveRecalc() );
records.add( retval.createPrintHeaders() );
retval.printGridlines = (PrintGridlinesRecord) retval.createPrintGridlines();
records.add( retval.printGridlines );
retval.gridset = (GridsetRecord) retval.createGridset();
records.add( retval.gridset );
records.add( retval.createGuts() );
retval.defaultrowheight =
(DefaultRowHeightRecord) retval.createDefaultRowHeight();
records.add( retval.defaultrowheight );
records.add( retval.createWSBool() );
retval.header = (HeaderRecord) retval.createHeader();
records.add( retval.header );
retval.footer = (FooterRecord) retval.createFooter();
records.add( retval.footer );
records.add( retval.createHCenter() );
records.add( retval.createVCenter() );
retval.printSetup = (PrintSetupRecord) retval.createPrintSetup();
records.add( retval.printSetup );
retval.defaultcolwidth =
(DefaultColWidthRecord) retval.createDefaultColWidth();
records.add( retval.defaultcolwidth);
retval.dims = ( DimensionsRecord ) retval.createDimensions();
retval.dimsloc = 19;
records.add(retval.dims);
records.add(retval.createWindowTwo());
retval.setLoc(records.size() - 1);
retval.selection =
(SelectionRecord) retval.createSelection();
records.add(retval.selection);
records.add(retval.createEOF());
retval.records = records;
log.log(log.DEBUG, "Sheet createsheet from scratch exit");
return retval;
}
private void checkCells()
{
if (cells == null)
{
cells = new ValueRecordsAggregate();
records.add(getDimsLoc() + 1, cells);
}
}
private void checkRows()
{
if (rows == null)
{
rows = new RowRecordsAggregate();
records.add(getDimsLoc() + 1, rows);
}
}
//public int addMergedRegion(short rowFrom, short colFrom, short rowTo,
public int addMergedRegion(int rowFrom, short colFrom, int rowTo,
short colTo)
{
if (merged == null || merged.getNumAreas() == 1027)
{
merged = ( MergeCellsRecord ) createMergedCells();
mergedRecords.add(merged);
mergedLocs.add(new Integer(records.size() - 1));
records.add(records.size() - 1, merged);
}
merged.addArea(rowFrom, colFrom, rowTo, colTo);
return numMergedRegions++;
}
public void removeMergedRegion(int index)
{
//safety checks
if (index >= numMergedRegions || mergedRecords.size() == 0)
return;
int pos = 0;
int startNumRegions = 0;
//optimisation for current record
if (numMergedRegions - index < merged.getNumAreas())
{
pos = mergedRecords.size() - 1;
startNumRegions = numMergedRegions - merged.getNumAreas();
}
else
{
for (int n = 0; n < mergedRecords.size(); n++)
{
MergeCellsRecord record = (MergeCellsRecord) mergedRecords.get(n);
if (startNumRegions + record.getNumAreas() > index)
{
pos = n;
break;
}
startNumRegions += record.getNumAreas();
}
}
MergeCellsRecord rec = (MergeCellsRecord) mergedRecords.get(pos);
rec.removeAreaAt(index - startNumRegions);
numMergedRegions--;
if (rec.getNumAreas() == 0)
{
mergedRecords.remove(pos);
if (merged == rec) {
//pull up the LAST record for operations when we finally
//support continue records for mergedRegions
if (mergedRecords.size() > 0) {
merged = (MergeCellsRecord) mergedRecords.get(mergedRecords.size() - 1);
} else {
merged = null;
}
}
int removePos = ((Integer) mergedLocs.get(pos)).intValue();
records.remove(removePos);
mergedLocs.remove(pos);
//if we're not tracking merged records, kill the pointer to reset the state
if (mergedRecords.size() == 0) merged = null;
}
}
public MergeCellsRecord.MergedRegion getMergedRegionAt(int index)
{
//safety checks
if (index >= numMergedRegions || mergedRecords.size() == 0)
return null;
int pos = 0;
int startNumRegions = 0;
//optimisation for current record
if (numMergedRegions - index < merged.getNumAreas())
{
pos = mergedRecords.size() - 1;
startNumRegions = numMergedRegions - merged.getNumAreas();
}
else
{
for (int n = 0; n < mergedRecords.size(); n++)
{
MergeCellsRecord record = (MergeCellsRecord) mergedRecords.get(n);
if (startNumRegions + record.getNumAreas() > index)
{
pos = n;
break;
}
startNumRegions += record.getNumAreas();
}
}
return ((MergeCellsRecord) mergedRecords.get(pos)).getAreaAt(index - startNumRegions);
}
public int getNumMergedRegions()
{
return numMergedRegions;
}
/**
* This is basically a kludge to deal with the now obsolete Label records. If
* you have to read in a sheet that contains Label records, be aware that the rest
* of the API doesn't deal with them, the low level structure only provides read-only
* semi-immutable structures (the sets are there for interface conformance with NO
* impelmentation). In short, you need to call this function passing it a reference
* to the Workbook object. All labels will be converted to LabelSST records and their
* contained strings will be written to the Shared String tabel (SSTRecord) within
* the Workbook.
*
* @param wb sheet's matching low level Workbook structure containing the SSTRecord.
* @see org.apache.poi.hssf.record.LabelRecord
* @see org.apache.poi.hssf.record.LabelSSTRecord
* @see org.apache.poi.hssf.record.SSTRecord
*/
public void convertLabelRecords(Workbook wb)
{
log.log(log.DEBUG, "convertLabelRecords called");
if (containsLabels)
{
for (int k = 0; k < records.size(); k++)
{
Record rec = ( Record ) records.get(k);
if (rec.getSid() == LabelRecord.sid)
{
LabelRecord oldrec = ( LabelRecord ) rec;
records.remove(k);
LabelSSTRecord newrec = new LabelSSTRecord();
int stringid =
wb.addSSTString(oldrec.getValue());
newrec.setRow(oldrec.getRow());
newrec.setColumn(oldrec.getColumn());
newrec.setXFIndex(oldrec.getXFIndex());
newrec.setSSTIndex(stringid);
records.add(k, newrec);
}
}
}
log.log(log.DEBUG, "convertLabelRecords exit");
}
/**
* Returns the number of low level binary records in this sheet. This adjusts things for the so called
* AgregateRecords.
*
* @see org.apache.poi.hssf.record.Record
*/
public int getNumRecords()
{
checkCells();
checkRows();
log.log(log.DEBUG, "Sheet.getNumRecords");
log.logFormatted(log.DEBUG, "returning % + % + % - 2 = %", new int[]
{
records.size(), cells.getPhysicalNumberOfCells(),
rows.getPhysicalNumberOfRows(),
records.size() + cells.getPhysicalNumberOfCells()
+ rows.getPhysicalNumberOfRows() - 2
});
return records.size() + cells.getPhysicalNumberOfCells()
+ rows.getPhysicalNumberOfRows() - 2;
}
/**
* Per an earlier reported bug in working with Andy Khan's excel read library. This
* sets the values in the sheet's DimensionsRecord object to be correct. Excel doesn't
* really care, but we want to play nice with other libraries.
*
* @see org.apache.poi.hssf.record.DimensionsRecord
*/
//public void setDimensions(short firstrow, short firstcol, short lastrow,
public void setDimensions(int firstrow, short firstcol, int lastrow,
short lastcol)
{
log.log(log.DEBUG, "Sheet.setDimensions");
log.log(log.DEBUG,
(new StringBuffer("firstrow")).append(firstrow)
.append("firstcol").append(firstcol).append("lastrow")
.append(lastrow).append("lastcol").append(lastcol)
.toString());
dims.setFirstCol(firstcol);
dims.setFirstRow(firstrow);
dims.setLastCol(lastcol);
dims.setLastRow(lastrow);
log.log(log.DEBUG, "Sheet.setDimensions exiting");
}
/**
* set the locator for where we should look for the next value record. The
* algorythm will actually start here and find the correct location so you
* can set this to 0 and watch performance go down the tubes but it will work.
* After a value is set this is automatically advanced. Its also set by the
* create method. So you probably shouldn't mess with this unless you have
* a compelling reason why or the help for the method you're calling says so.
* Check the other methods for whether they care about
* the loc pointer. Many of the "modify" and "remove" methods re-initialize this
* to "dimsloc" which is the location of the Dimensions Record and presumably the
* start of the value section (at or around 19 dec).
*
* @param loc the record number to start at
*
*/
public void setLoc(int loc)
{
valueRecIterator = null;
log.log(log.DEBUG, "sheet.setLoc(): " + loc);
this.loc = loc;
}
/**
* Returns the location pointer to the first record to look for when adding rows/values
*
*/
public int getLoc()
{
log.log(log.DEBUG, "sheet.getLoc():" + loc);
return loc;
}
/**
* Set the preoffset when using DBCELL records (currently unused) - this is
* the position of this sheet within the whole file.
*
* @param offset the offset of the sheet's BOF within the file.
*/
public void setPreOffset(int offset)
{
this.preoffset = offset;
}
/**
* get the preoffset when using DBCELL records (currently unused) - this is
* the position of this sheet within the whole file.
*
* @return offset the offset of the sheet's BOF within the file.
*/
public int getPreOffset()
{
return preoffset;
}
/**
* Serializes all records in the sheet into one big byte array. Use this to write
* the sheet out.
*
* @return byte[] array containing the binary representation of the records in this sheet
*
*/
public byte [] serialize()
{
log.log(log.DEBUG, "Sheet.serialize");
// addDBCellRecords();
byte[] retval = null;
// ArrayList bytes = new ArrayList(4096);
int arraysize = getSize();
int pos = 0;
// for (int k = 0; k < records.size(); k++)
// {
// bytes.add((( Record ) records.get(k)).serialize());
//
// }
// for (int k = 0; k < bytes.size(); k++)
// {
// arraysize += (( byte [] ) bytes.get(k)).length;
// log.debug((new StringBuffer("arraysize=")).append(arraysize)
// .toString());
// }
retval = new byte[ arraysize ];
for (int k = 0; k < records.size(); k++)
{
// byte[] rec = (( byte [] ) bytes.get(k));
// System.arraycopy(rec, 0, retval, pos, rec.length);
pos += (( Record ) records.get(k)).serialize(pos,
retval); // rec.length;
}
log.log(log.DEBUG, "Sheet.serialize returning " + retval);
return retval;
}
/**
* Serializes all records in the sheet into one big byte array. Use this to write
* the sheet out.
*
* @param offset to begin write at
* @param data array containing the binary representation of the records in this sheet
*
*/
public int serialize(int offset, byte [] data)
{
log.log(log.DEBUG, "Sheet.serialize using offsets");
// addDBCellRecords();
// ArrayList bytes = new ArrayList(4096);
// int arraysize = getSize(); // 0;
int pos = 0;
// for (int k = 0; k < records.size(); k++)
// {
// bytes.add((( Record ) records.get(k)).serialize());
//
// }
// for (int k = 0; k < bytes.size(); k++)
// {
// arraysize += (( byte [] ) bytes.get(k)).length;
// log.debug((new StringBuffer("arraysize=")).append(arraysize)
// .toString());
// }
for (int k = 0; k < records.size(); k++)
{
// byte[] rec = (( byte [] ) bytes.get(k));
// System.arraycopy(rec, 0, data, offset + pos, rec.length);
Record record = (( Record ) records.get(k));
//uncomment to test record sizes
// byte[] data2 = new byte[record.getRecordSize()];
// record.serialize(0, data2 ); // rec.length;
// if (LittleEndian.getUShort(data2, 2) != record.getRecordSize() - 4
// && record instanceof RowRecordsAggregate == false && record instanceof ValueRecordsAggregate == false)
// throw new RuntimeException("Blah!!!");
pos += record.serialize(pos + offset, data ); // rec.length;
}
log.log(log.DEBUG, "Sheet.serialize returning ");
return pos;
}
/**
* Create a row record. (does not add it to the records contained in this sheet)
*
* @param row number
* @return RowRecord created for the passed in row number
* @see org.apache.poi.hssf.record.RowRecord
*/
public RowRecord createRow(int row)
{
log.log(log.DEBUG, "create row number " + row);
RowRecord rowrec = new RowRecord();
//rowrec.setRowNumber(( short ) row);
rowrec.setRowNumber(row);
rowrec.setHeight(( short ) 0xff);
rowrec.setOptimize(( short ) 0x0);
rowrec.setOptionFlags(( short ) 0x0);
rowrec.setXFIndex(( short ) 0x0);
return rowrec;
}
/**
* Create a LABELSST Record (does not add it to the records contained in this sheet)
*
* @param row the row the LabelSST is a member of
* @param col the column the LabelSST defines
* @param index the index of the string within the SST (use workbook addSSTString method)
* @return LabelSSTRecord newly created containing your SST Index, row,col.
* @see org.apache.poi.hssf.record.SSTRecord
*/
//public LabelSSTRecord createLabelSST(short row, short col, int index)
public LabelSSTRecord createLabelSST(int row, short col, int index)
{
log.logFormatted(log.DEBUG, "create labelsst row,col,index %,%,%",
new int[]
{
row, col, index
});
LabelSSTRecord rec = new LabelSSTRecord();
rec.setRow(row);
rec.setColumn(col);
rec.setSSTIndex(index);
rec.setXFIndex(( short ) 0x0f);
return rec;
}
/**
* Create a NUMBER Record (does not add it to the records contained in this sheet)
*
* @param row the row the NumberRecord is a member of
* @param col the column the NumberRecord defines
* @param value for the number record
*
* @return NumberRecord for that row, col containing that value as added to the sheet
*/
//public NumberRecord createNumber(short row, short col, double value)
public NumberRecord createNumber(int row, short col, double value)
{
log.logFormatted(log.DEBUG, "create number row,col,value %,%,%",
new double[]
{
row, col, value
});
NumberRecord rec = new NumberRecord();
//rec.setRow(( short ) row);
rec.setRow(row);
rec.setColumn(col);
rec.setValue(value);
rec.setXFIndex(( short ) 0x0f);
return rec;
}
/**
* create a BLANK record (does not add it to the records contained in this sheet)
*
* @param row - the row the BlankRecord is a member of
* @param col - the column the BlankRecord is a member of
*/
//public BlankRecord createBlank(short row, short col)
public BlankRecord createBlank(int row, short col)
{
//log.logFormatted(log.DEBUG, "create blank row,col %,%", new short[]
log.logFormatted(log.DEBUG, "create blank row,col %,%", new int[]
{
row, col
});
BlankRecord rec = new BlankRecord();
//rec.setRow(( short ) row);
rec.setRow(row);
rec.setColumn(col);
rec.setXFIndex(( short ) 0x0f);
return rec;
}
/**
* Attempts to parse the formula into PTGs and create a formula record
* DOES NOT WORK YET
*
* @param row - the row for the formula record
* @param col - the column of the formula record
* @param formula - a String representing the formula. To be parsed to PTGs
* @return bogus/useless formula record
*/
//public FormulaRecord createFormula(short row, short col, String formula)
public FormulaRecord createFormula(int row, short col, String formula)
{
log.logFormatted(log.DEBUG, "create formula row,col,formula %,%,%",
//new short[]
new int[]
{
row, col
}, formula);
FormulaRecord rec = new FormulaRecord();
rec.setRow(row);
rec.setColumn(col);
rec.setOptions(( short ) 2);
rec.setValue(0);
rec.setXFIndex(( short ) 0x0f);
FormulaParser fp = new FormulaParser(formula,null); //fix - do we need this method?
fp.parse();
Ptg[] ptg = fp.getRPNPtg();
int size = 0;
for (int k = 0; k < ptg.length; k++)
{
size += ptg[ k ].getSize();
rec.pushExpressionToken(ptg[ k ]);
}
rec.setExpressionLength(( short ) size);
return rec;
}
/**
* Adds a value record to the sheet's contained binary records
* (i.e. LabelSSTRecord or NumberRecord).
* <P>
* This method is "loc" sensitive. Meaning you need to set LOC to where you
* want it to start searching. If you don't know do this: setLoc(getDimsLoc).
* When adding several rows you can just start at the last one by leaving loc
* at what this sets it to.
*
* @param row the row to add the cell value to
* @param col the cell value record itself.
*/
//public void addValueRecord(short row, CellValueRecordInterface col)
public void addValueRecord(int row, CellValueRecordInterface col)
{
checkCells();
log.logFormatted(log.DEBUG, "add value record row,loc %,%", new int[]
{
row, loc
});
DimensionsRecord d = ( DimensionsRecord ) records.get(getDimsLoc());
if (col.getColumn() > d.getLastCol())
{
d.setLastCol(( short ) (col.getColumn() + 1));
}
if (col.getColumn() < d.getFirstCol())
{
d.setFirstCol(col.getColumn());
}
cells.insertCell(col);
/*
* for (int k = loc; k < records.size(); k++)
* {
* Record rec = ( Record ) records.get(k);
*
* if (rec.getSid() == RowRecord.sid)
* {
* RowRecord rowrec = ( RowRecord ) rec;
*
* if (rowrec.getRowNumber() == col.getRow())
* {
* records.add(k + 1, col);
* loc = k;
* if (rowrec.getLastCol() <= col.getColumn())
* {
* rowrec.setLastCol((( short ) (col.getColumn() + 1)));
* }
* break;
* }
* }
* }
*/
}
/**
* remove a value record from the records array.
*
* This method is not loc sensitive, it resets loc to = dimsloc so no worries.
*
* @param row - the row of the value record you wish to remove
* @param col - a record supporting the CellValueRecordInterface.
* @see org.apache.poi.hssf.record.CellValueRecordInterface
*/
//public void removeValueRecord(short row, CellValueRecordInterface col)
public void removeValueRecord(int row, CellValueRecordInterface col)
{
checkCells();
log.logFormatted(log.DEBUG, "remove value record row,dimsloc %,%",
new int[]
{
row, dimsloc
});
loc = dimsloc;
cells.removeCell(col);
/*
* for (int k = loc; k < records.size(); k++)
* {
* Record rec = ( Record ) records.get(k);
*
* // checkDimsLoc(rec,k);
* if (rec.isValue())
* {
* CellValueRecordInterface cell =
* ( CellValueRecordInterface ) rec;
*
* if ((cell.getRow() == col.getRow())
* && (cell.getColumn() == col.getColumn()))
* {
* records.remove(k);
* break;
* }
* }
* }
*/
}
/**
* replace a value record from the records array.
*
* This method is not loc sensitive, it resets loc to = dimsloc so no worries.
*
* @param newval - a record supporting the CellValueRecordInterface. this will replace
* the cell value with the same row and column. If there isn't one, one will
* be added.
*/
public void replaceValueRecord(CellValueRecordInterface newval)
{
checkCells();
setLoc(dimsloc);
log.log(log.DEBUG, "replaceValueRecord ");
cells.insertCell(newval);
/*
* CellValueRecordInterface oldval = getNextValueRecord();
*
* while (oldval != null)
* {
* if (oldval.isEqual(newval))
* {
* records.set(( short ) (getLoc() - 1), newval);
* return;
* }
* oldval = getNextValueRecord();
* }
* addValueRecord(newval.getRow(), newval);
* setLoc(dimsloc);
*/
}
/**
* Adds a row record to the sheet
*
* <P>
* This method is "loc" sensitive. Meaning you need to set LOC to where you
* want it to start searching. If you don't know do this: setLoc(getDimsLoc).
* When adding several rows you can just start at the last one by leaving loc
* at what this sets it to.
*
* @param row the row record to be added
* @see #setLoc(int)
*/
public void addRow(RowRecord row)
{
checkRows();
log.log(log.DEBUG, "addRow ");
DimensionsRecord d = ( DimensionsRecord ) records.get(getDimsLoc());
if (row.getRowNumber() > d.getLastRow())
{
d.setLastRow(row.getRowNumber() + 1);
}
if (row.getRowNumber() < d.getFirstRow())
{
d.setFirstRow(row.getRowNumber());
}
//IndexRecord index = null;
//If the row exists remove it, so that any cells attached to the row are removed
RowRecord existingRow = rows.getRow(row.getRowNumber());
if (existingRow != null)
rows.removeRow(existingRow);
rows.insertRow(row);
/*
* for (int k = loc; k < records.size(); k++)
* {
* Record rec = ( Record ) records.get(k);
*
* if (rec.getSid() == IndexRecord.sid)
* {
* index = ( IndexRecord ) rec;
* }
* if (rec.getSid() == RowRecord.sid)
* {
* RowRecord rowrec = ( RowRecord ) rec;
*
* if (rowrec.getRowNumber() > row.getRowNumber())
* {
* records.add(k, row);
* loc = k;
* break;
* }
* }
* if (rec.getSid() == WindowTwoRecord.sid)
* {
* records.add(k, row);
* loc = k;
* break;
* }
* }
* if (index != null)
* {
* if (index.getLastRowAdd1() <= row.getRowNumber())
* {
* index.setLastRowAdd1(row.getRowNumber() + 1);
* }
* }
*/
log.log(log.DEBUG, "exit addRow");
}
/**
* Removes a row record
*
* This method is not loc sensitive, it resets loc to = dimsloc so no worries.
*
* @param row the row record to remove
*/
public void removeRow(RowRecord row)
{
checkRows();
// IndexRecord index = null;
setLoc(getDimsLoc());
rows.removeRow(row);
/*
* for (int k = loc; k < records.size(); k++)
* {
* Record rec = ( Record ) records.get(k);
*
* // checkDimsLoc(rec,k);
* if (rec.getSid() == RowRecord.sid)
* {
* RowRecord rowrec = ( RowRecord ) rec;
*
* if (rowrec.getRowNumber() == row.getRowNumber())
* {
* records.remove(k);
* break;
* }
* }
* if (rec.getSid() == WindowTwoRecord.sid)
* {
* break;
* }
* }
*/
}
/**
* get the NEXT value record (from LOC). The first record that is a value record
* (starting at LOC) will be returned.
*
* <P>
* This method is "loc" sensitive. Meaning you need to set LOC to where you
* want it to start searching. If you don't know do this: setLoc(getDimsLoc).
* When adding several rows you can just start at the last one by leaving loc
* at what this sets it to. For this method, set loc to dimsloc to start with,
* subsequent calls will return values in (physical) sequence or NULL when you get to the end.
*
* @return CellValueRecordInterface representing the next value record or NULL if there are no more
* @see #setLoc(int)
*/
public CellValueRecordInterface getNextValueRecord()
{
log.log(log.DEBUG, "getNextValue loc= " + loc);
if (valueRecIterator == null)
{
valueRecIterator = cells.getIterator();
}
if (!valueRecIterator.hasNext())
{
return null;
}
return ( CellValueRecordInterface ) valueRecIterator.next();
/*
* if (this.getLoc() < records.size())
* {
* for (int k = getLoc(); k < records.size(); k++)
* {
* Record rec = ( Record ) records.get(k);
*
* this.setLoc(k + 1);
* if (rec instanceof CellValueRecordInterface)
* {
* return ( CellValueRecordInterface ) rec;
* }
* }
* }
* return null;
*/
}
/**
* get the NEXT RowRecord or CellValueRecord(from LOC). The first record that
* is a Row record or CellValueRecord(starting at LOC) will be returned.
* <P>
* This method is "loc" sensitive. Meaning you need to set LOC to where you
* want it to start searching. If you don't know do this: setLoc(getDimsLoc).
* When adding several rows you can just start at the last one by leaving loc
* at what this sets it to. For this method, set loc to dimsloc to start with.
* subsequent calls will return rows in (physical) sequence or NULL when you get to the end.
*
* @return RowRecord representing the next row record or CellValueRecordInterface
* representing the next cellvalue or NULL if there are no more
* @see #setLoc(int)
*
*/
/* public Record getNextRowOrValue()
{
log.debug((new StringBuffer("getNextRow loc= ")).append(loc)
.toString());
if (this.getLoc() < records.size())
{
for (int k = this.getLoc(); k < records.size(); k++)
{
Record rec = ( Record ) records.get(k);
this.setLoc(k + 1);
if (rec.getSid() == RowRecord.sid)
{
return rec;
}
else if (rec.isValue())
{
return rec;
}
}
}
return null;
}
*/
/**
* get the NEXT RowRecord (from LOC). The first record that is a Row record
* (starting at LOC) will be returned.
* <P>
* This method is "loc" sensitive. Meaning you need to set LOC to where you
* want it to start searching. If you don't know do this: setLoc(getDimsLoc).
* When adding several rows you can just start at the last one by leaving loc
* at what this sets it to. For this method, set loc to dimsloc to start with.
* subsequent calls will return rows in (physical) sequence or NULL when you get to the end.
*
* @return RowRecord representing the next row record or NULL if there are no more
* @see #setLoc(int)
*
*/
public RowRecord getNextRow()
{
log.log(log.DEBUG, "getNextRow loc= " + loc);
if (rowRecIterator == null)
{
rowRecIterator = rows.getIterator();
}
if (!rowRecIterator.hasNext())
{
return null;
}
return ( RowRecord ) rowRecIterator.next();
/* if (this.getLoc() < records.size())
{
for (int k = this.getLoc(); k < records.size(); k++)
{
Record rec = ( Record ) records.get(k);
this.setLoc(k + 1);
if (rec.getSid() == RowRecord.sid)
{
return ( RowRecord ) rec;
}
}
}*/
}
/**
* get the NEXT (from LOC) RowRecord where rownumber matches the given rownum.
* The first record that is a Row record (starting at LOC) that has the
* same rownum as the given rownum will be returned.
* <P>
* This method is "loc" sensitive. Meaning you need to set LOC to where you
* want it to start searching. If you don't know do this: setLoc(getDimsLoc).
* When adding several rows you can just start at the last one by leaving loc
* at what this sets it to. For this method, set loc to dimsloc to start with.
* subsequent calls will return rows in (physical) sequence or NULL when you get to the end.
*
* @param rownum which row to return (careful with LOC)
* @return RowRecord representing the next row record or NULL if there are no more
* @see #setLoc(int)
*
*/
//public RowRecord getRow(short rownum)
public RowRecord getRow(int rownum)
{
log.log(log.DEBUG, "getNextRow loc= " + loc);
return rows.getRow(rownum);
/*
* if (this.getLoc() < records.size())
* {
* for (int k = this.getLoc(); k < records.size(); k++)
* {
* Record rec = ( Record ) records.get(k);
*
* this.setLoc(k + 1);
* if (rec.getSid() == RowRecord.sid)
* {
* if ((( RowRecord ) rec).getRowNumber() == rownum)
* {
* return ( RowRecord ) rec;
* }
* }
* }
* }
*/
// return null;
}
/**
* Not currently used method to calculate and add dbcell records
*
*/
public void addDBCellRecords()
{
int offset = 0;
int recnum = 0;
int rownum = 0;
//int lastrow = 0;
//long lastrowoffset = 0;
IndexRecord index = null;
// ArrayList rowOffsets = new ArrayList();
IntList rowOffsets = new IntList();
for (recnum = 0; recnum < records.size(); recnum++)
{
Record rec = ( Record ) records.get(recnum);
if (rec.getSid() == IndexRecord.sid)
{
index = ( IndexRecord ) rec;
}
if (rec.getSid() != RowRecord.sid)
{
offset += rec.serialize().length;
}
else
{
break;
}
}
// First Row Record
for (; recnum < records.size(); recnum++)
{
Record rec = ( Record ) records.get(recnum);
if (rec.getSid() == RowRecord.sid)
{
rownum++;
rowOffsets.add(offset);
if ((rownum % 32) == 0)
{
// if this is the last rec in a dbcell block
// find the next row or last value record
for (int rn = recnum; rn < records.size(); rn++)
{
rec = ( Record ) records.get(rn);
if ((!rec.isInValueSection())
|| (rec.getSid() == RowRecord.sid))
{
// here is the next row or last value record
records.add(rn,
createDBCell(offset, rowOffsets,
index));
recnum = rn;
break;
}
}
}
else
{
}
}
if (!rec.isInValueSection())
{
records.add(recnum, createDBCell(offset, rowOffsets, index));
break;
}
offset += rec.serialize().length;
}
}
/** not currently used */
private DBCellRecord createDBCell(int offset, IntList rowoffsets,
IndexRecord index)
{
DBCellRecord rec = new DBCellRecord();
rec.setRowOffset(offset - rowoffsets.get(0));
// test hack
rec.addCellOffset(( short ) 0x0);
// end test hack
addDbCellToIndex(offset, index);
return rec;
}
/** not currently used */
private void addDbCellToIndex(int offset, IndexRecord index)
{
int numdbcells = index.getNumDbcells() + 1;
index.addDbcell(offset + preoffset);
// stupid but whenever we add an offset that causes everything to be shifted down 4
for (int k = 0; k < numdbcells; k++)
{
int dbval = index.getDbcellAt(k);
index.setDbcell(k, dbval + 4);
}
}
/**
* creates the BOF record
* @see org.apache.poi.hssf.record.BOFRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a BOFRecord
*/
protected Record createBOF()
{
BOFRecord retval = new BOFRecord();
retval.setVersion(( short ) 0x600);
retval.setType(( short ) 0x010);
// retval.setBuild((short)0x10d3);
retval.setBuild(( short ) 0x0dbb);
retval.setBuildYear(( short ) 1996);
retval.setHistoryBitMask(0xc1);
retval.setRequiredVersion(0x6);
return retval;
}
/**
* creates the Index record - not currently used
* @see org.apache.poi.hssf.record.IndexRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a IndexRecord
*/
protected Record createIndex()
{
IndexRecord retval = new IndexRecord();
retval.setFirstRow(0); // must be set explicitly
retval.setLastRowAdd1(0);
return retval;
}
/**
* creates the CalcMode record and sets it to 1 (automatic formula caculation)
* @see org.apache.poi.hssf.record.CalcModeRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a CalcModeRecord
*/
protected Record createCalcMode()
{
CalcModeRecord retval = new CalcModeRecord();
retval.setCalcMode(( short ) 1);
return retval;
}
/**
* creates the CalcCount record and sets it to 0x64 (default number of iterations)
* @see org.apache.poi.hssf.record.CalcCountRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a CalcCountRecord
*/
protected Record createCalcCount()
{
CalcCountRecord retval = new CalcCountRecord();
retval.setIterations(( short ) 0x64); // default 64 iterations
return retval;
}
/**
* creates the RefMode record and sets it to A1 Mode (default reference mode)
* @see org.apache.poi.hssf.record.RefModeRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a RefModeRecord
*/
protected Record createRefMode()
{
RefModeRecord retval = new RefModeRecord();
retval.setMode(retval.USE_A1_MODE);
return retval;
}
/**
* creates the Iteration record and sets it to false (don't iteratively calculate formulas)
* @see org.apache.poi.hssf.record.IterationRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a IterationRecord
*/
protected Record createIteration()
{
IterationRecord retval = new IterationRecord();
retval.setIteration(false);
return retval;
}
/**
* creates the Delta record and sets it to 0.0010 (default accuracy)
* @see org.apache.poi.hssf.record.DeltaRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a DeltaRecord
*/
protected Record createDelta()
{
DeltaRecord retval = new DeltaRecord();
retval.setMaxChange(0.0010);
return retval;
}
/**
* creates the SaveRecalc record and sets it to true (recalculate before saving)
* @see org.apache.poi.hssf.record.SaveRecalcRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a SaveRecalcRecord
*/
protected Record createSaveRecalc()
{
SaveRecalcRecord retval = new SaveRecalcRecord();
retval.setRecalc(true);
return retval;
}
/**
* creates the PrintHeaders record and sets it to false (we don't create headers yet so why print them)
* @see org.apache.poi.hssf.record.PrintHeadersRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a PrintHeadersRecord
*/
protected Record createPrintHeaders()
{
PrintHeadersRecord retval = new PrintHeadersRecord();
retval.setPrintHeaders(false);
return retval;
}
/**
* creates the PrintGridlines record and sets it to false (that makes for ugly sheets). As far as I can
* tell this does the same thing as the GridsetRecord
*
* @see org.apache.poi.hssf.record.PrintGridlinesRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a PrintGridlinesRecord
*/
protected Record createPrintGridlines()
{
PrintGridlinesRecord retval = new PrintGridlinesRecord();
retval.setPrintGridlines(false);
return retval;
}
/**
* creates the Gridset record and sets it to true (user has mucked with the gridlines)
* @see org.apache.poi.hssf.record.GridsetRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a GridsetRecord
*/
protected Record createGridset()
{
GridsetRecord retval = new GridsetRecord();
retval.setGridset(true);
return retval;
}
/**
* creates the Guts record and sets leftrow/topcol guttter and rowlevelmax/collevelmax to 0
* @see org.apache.poi.hssf.record.GutsRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a GutsRecordRecord
*/
protected Record createGuts()
{
GutsRecord retval = new GutsRecord();
retval.setLeftRowGutter(( short ) 0);
retval.setTopColGutter(( short ) 0);
retval.setRowLevelMax(( short ) 0);
retval.setColLevelMax(( short ) 0);
return retval;
}
/**
* creates the DefaultRowHeight Record and sets its options to 0 and rowheight to 0xff
* @see org.apache.poi.hssf.record.DefaultRowHeightRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a DefaultRowHeightRecord
*/
protected Record createDefaultRowHeight()
{
DefaultRowHeightRecord retval = new DefaultRowHeightRecord();
retval.setOptionFlags(( short ) 0);
retval.setRowHeight(( short ) 0xff);
return retval;
}
/**
* creates the WSBoolRecord and sets its values to defaults
* @see org.apache.poi.hssf.record.WSBoolRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a WSBoolRecord
*/
protected Record createWSBool()
{
WSBoolRecord retval = new WSBoolRecord();
retval.setWSBool1(( byte ) 0x4);
retval.setWSBool2(( byte ) 0xffffffc1);
return retval;
}
/**
* creates the Header Record and sets it to nothing/0 length
* @see org.apache.poi.hssf.record.HeaderRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a HeaderRecord
*/
protected Record createHeader()
{
HeaderRecord retval = new HeaderRecord();
retval.setHeaderLength(( byte ) 0);
retval.setHeader(null);
return retval;
}
/**
* creates the Footer Record and sets it to nothing/0 length
* @see org.apache.poi.hssf.record.FooterRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a FooterRecord
*/
protected Record createFooter()
{
FooterRecord retval = new FooterRecord();
retval.setFooterLength(( byte ) 0);
retval.setFooter(null);
return retval;
}
/**
* creates the HCenter Record and sets it to false (don't horizontally center)
* @see org.apache.poi.hssf.record.HCenterRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a HCenterRecord
*/
protected Record createHCenter()
{
HCenterRecord retval = new HCenterRecord();
retval.setHCenter(false);
return retval;
}
/**
* creates the VCenter Record and sets it to false (don't horizontally center)
* @see org.apache.poi.hssf.record.VCenterRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a VCenterRecord
*/
protected Record createVCenter()
{
VCenterRecord retval = new VCenterRecord();
retval.setVCenter(false);
return retval;
}
/**
* creates the PrintSetup Record and sets it to defaults and marks it invalid
* @see org.apache.poi.hssf.record.PrintSetupRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a PrintSetupRecord
*/
protected Record createPrintSetup()
{
PrintSetupRecord retval = new PrintSetupRecord();
retval.setPaperSize(( short ) 1);
retval.setScale(( short ) 100);
retval.setPageStart(( short ) 1);
retval.setFitWidth(( short ) 1);
retval.setFitHeight(( short ) 1);
retval.setOptions(( short ) 2);
retval.setHResolution(( short ) 300);
retval.setVResolution(( short ) 300);
retval.setHeaderMargin( 0.5);
retval.setFooterMargin( 0.5);
retval.setCopies(( short ) 0);
return retval;
}
/**
* creates the DefaultColWidth Record and sets it to 8
* @see org.apache.poi.hssf.record.DefaultColWidthRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a DefaultColWidthRecord
*/
protected Record createDefaultColWidth()
{
DefaultColWidthRecord retval = new DefaultColWidthRecord();
retval.setColWidth(( short ) 8);
return retval;
}
/**
* creates the ColumnInfo Record and sets it to a default column/width
* @see org.apache.poi.hssf.record.ColumnInfoRecord
* @return record containing a ColumnInfoRecord
*/
protected Record createColInfo()
{
ColumnInfoRecord retval = new ColumnInfoRecord();
retval.setColumnWidth(( short ) 0x8);
retval.setOptions(( short ) 6);
retval.setXFIndex(( short ) 0x0f);
return retval;
}
/**
* get the default column width for the sheet (if the columns do not define their own width)
* @return default column width
*/
public short getDefaultColumnWidth()
{
return defaultcolwidth.getColWidth();
}
/**
* get whether gridlines are printed.
* @return true if printed
*/
public boolean isGridsPrinted()
{
return !gridset.getGridset();
}
/**
* set whether gridlines printed or not.
* @param value True if gridlines printed.
*/
public void setGridsPrinted(boolean value)
{
gridset.setGridset(!value);
}
/**
* set the default column width for the sheet (if the columns do not define their own width)
* @param dcw default column width
*/
public void setDefaultColumnWidth(short dcw)
{
defaultcolwidth.setColWidth(dcw);
}
/**
* set the default row height for the sheet (if the rows do not define their own height)
*/
public void setDefaultRowHeight(short dch)
{
defaultrowheight.setRowHeight(dch);
}
/**
* get the default row height for the sheet (if the rows do not define their own height)
* @return default row height
*/
public short getDefaultRowHeight()
{
return defaultrowheight.getRowHeight();
}
/**
* get the width of a given column in units of 1/20th of a point width (twips?)
* @param column index
* @see org.apache.poi.hssf.record.DefaultColWidthRecord
* @see org.apache.poi.hssf.record.ColumnInfoRecord
* @see #setColumnWidth(short,short)
* @return column width in units of 1/20th of a point (twips?)
*/
public short getColumnWidth(short column)
{
short retval = 0;
ColumnInfoRecord ci = null;
int k = 0;
if (columnSizes != null)
{
for (k = 0; k < columnSizes.size(); k++)
{
ci = ( ColumnInfoRecord ) columnSizes.get(k);
if ((ci.getFirstColumn() <= column)
&& (column <= ci.getLastColumn()))
{
break;
}
ci = null;
}
}
if (ci != null)
{
retval = ci.getColumnWidth();
}
else
{
retval = defaultcolwidth.getColWidth();
}
return retval;
}
/**
* set the width for a given column in 1/20th of a character width units
* @param column - the column number
* @param width (in units of 1/20th of a character width)
*/
public void setColumnWidth(short column, short width)
{
ColumnInfoRecord ci = null;
int k = 0;
if (columnSizes == null)
{
columnSizes = new ArrayList();
}
//int cioffset = getDimsLoc() - columnSizes.size();
for (k = 0; k < columnSizes.size(); k++)
{
ci = ( ColumnInfoRecord ) columnSizes.get(k);
if ((ci.getFirstColumn() <= column)
&& (column <= ci.getLastColumn()))
{
break;
}
ci = null;
}
if (ci != null)
{
if (ci.getColumnWidth() == width)
{
// do nothing...the cell's width is equal to what we're setting it to.
}
else if ((ci.getFirstColumn() == column)
&& (ci.getLastColumn() == column))
{ // if its only for this cell then
ci.setColumnWidth(width); // who cares, just change the width
}
else if ((ci.getFirstColumn() == column)
|| (ci.getLastColumn() == column))
{
// okay so the width is different but the first or last column == the column we'return setting
// we'll just divide the info and create a new one
if (ci.getFirstColumn() == column)
{
ci.setFirstColumn(( short ) (column + 1));
}
else
{
ci.setLastColumn(( short ) (column - 1));
}
ColumnInfoRecord nci = ( ColumnInfoRecord ) createColInfo();
nci.setFirstColumn(column);
nci.setLastColumn(column);
nci.setOptions(ci.getOptions());
nci.setXFIndex(ci.getXFIndex());
nci.setColumnWidth(width);
columnSizes.add(k, nci);
records.add((1 + getDimsLoc() - columnSizes.size()) + k, nci);
dimsloc++;
}
else{
//split to 3 records
short lastcolumn = ci.getLastColumn();
ci.setLastColumn(( short ) (column - 1));
ColumnInfoRecord nci = ( ColumnInfoRecord ) createColInfo();
nci.setFirstColumn(column);
nci.setLastColumn(column);
nci.setOptions(ci.getOptions());
nci.setXFIndex(ci.getXFIndex());
nci.setColumnWidth(width);
columnSizes.add(k, nci);
records.add((1 + getDimsLoc() - columnSizes.size()) + k, nci);
dimsloc++;
nci = ( ColumnInfoRecord ) createColInfo();
nci.setFirstColumn((short)(column+1));
nci.setLastColumn(lastcolumn);
nci.setOptions(ci.getOptions());
nci.setXFIndex(ci.getXFIndex());
nci.setColumnWidth(ci.getColumnWidth());
columnSizes.add(k, nci);
records.add((1 + getDimsLoc() - columnSizes.size()) + k, nci);
dimsloc++;
}
}
else
{
// okay so there ISN'T a column info record that cover's this column so lets create one!
ColumnInfoRecord nci = ( ColumnInfoRecord ) createColInfo();
nci.setFirstColumn(column);
nci.setLastColumn(column);
nci.setColumnWidth(width);
columnSizes.add(k, nci);
records.add((1 + getDimsLoc() - columnSizes.size()) + k, nci);
dimsloc++;
}
}
/**
* creates the Dimensions Record and sets it to bogus values (you should set this yourself
* or let the high level API do it for you)
* @see org.apache.poi.hssf.record.DimensionsRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a DimensionsRecord
*/
protected Record createDimensions()
{
DimensionsRecord retval = new DimensionsRecord();
retval.setFirstCol(( short ) 0);
retval.setLastRow(1); // one more than it is
retval.setFirstRow(0);
retval.setLastCol(( short ) 1); // one more than it is
return retval;
}
/**
* creates the WindowTwo Record and sets it to: <P>
* options = 0x6b6 <P>
* toprow = 0 <P>
* leftcol = 0 <P>
* headercolor = 0x40 <P>
* pagebreakzoom = 0x0 <P>
* normalzoom = 0x0 <p>
* @see org.apache.poi.hssf.record.WindowTwoRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a WindowTwoRecord
*/
protected Record createWindowTwo()
{
WindowTwoRecord retval = new WindowTwoRecord();
retval.setOptions(( short ) 0x6b6);
retval.setTopRow(( short ) 0);
retval.setLeftCol(( short ) 0);
retval.setHeaderColor(0x40);
retval.setPageBreakZoom(( short ) 0);
retval.setNormalZoom(( short ) 0);
return retval;
}
/**
* Creates the Selection record and sets it to nothing selected
*
* @see org.apache.poi.hssf.record.SelectionRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a SelectionRecord
*/
protected Record createSelection()
{
SelectionRecord retval = new SelectionRecord();
retval.setPane(( byte ) 0x3);
retval.setActiveCellCol(( short ) 0x0);
retval.setActiveCellRow(( short ) 0x0);
retval.setNumRefs(( short ) 0x0);
return retval;
}
/**
* Returns the active row
*
* @see org.apache.poi.hssf.record.SelectionRecord
* @return row the active row index
*/
public int getActiveCellRow()
{
if (selection == null)
{
return 0;
}
return selection.getActiveCellRow();
}
/**
* Sets the active row
*
* @param row the row index
* @see org.apache.poi.hssf.record.SelectionRecord
*/
public void setActiveCellRow(int row)
{
//shouldn't have a sheet w/o a SelectionRecord, but best to guard anyway
if (selection != null)
{
selection.setActiveCellRow(row);
}
}
/**
* Returns the active column
*
* @see org.apache.poi.hssf.record.SelectionRecord
* @return row the active column index
*/
public short getActiveCellCol()
{
if (selection == null)
{
return (short) 0;
}
return selection.getActiveCellCol();
}
/**
* Sets the active column
*
* @param col the column index
* @see org.apache.poi.hssf.record.SelectionRecord
*/
public void setActiveCellCol(short col)
{
//shouldn't have a sheet w/o a SelectionRecord, but best to guard anyway
if (selection != null)
{
selection.setActiveCellCol(col);
}
}
protected Record createMergedCells()
{
MergeCellsRecord retval = new MergeCellsRecord();
retval.setNumAreas(( short ) 0);
return retval;
}
/**
* creates the EOF record
* @see org.apache.poi.hssf.record.EOFRecord
* @see org.apache.poi.hssf.record.Record
* @return record containing a EOFRecord
*/
protected Record createEOF()
{
return new EOFRecord();
}
/**
* get the location of the DimensionsRecord (which is the last record before the value section)
* @return location in the array of records of the DimensionsRecord
*/
public int getDimsLoc()
{
log.log(log.DEBUG, "getDimsLoc dimsloc= " + dimsloc);
return dimsloc;
}
/**
* in the event the record is a dimensions record, resets both the loc index and dimsloc index
*/
public void checkDimsLoc(Record rec, int recloc)
{
if (rec.getSid() == DimensionsRecord.sid)
{
loc = recloc;
dimsloc = recloc;
}
}
public int getSize()
{
int retval = 0;
for (int k = 0; k < records.size(); k++)
{
retval += (( Record ) records.get(k)).getRecordSize();
}
return retval;
}
public List getRecords()
{
return records;
}
/**
* Gets the gridset record for this sheet.
*/
public GridsetRecord getGridsetRecord()
{
return gridset;
}
/**
* Returns the first occurance of a record matching a particular sid.
*/
public Record findFirstRecordBySid(short sid)
{
for (Iterator iterator = records.iterator(); iterator.hasNext(); )
{
Record record = ( Record ) iterator.next();
if (record.getSid() == sid)
{
return record;
}
}
return null;
}
/**
* Sets the SCL record or creates it in the correct place if it does not
* already exist.
*
* @param sclRecord The record to set.
*/
public void setSCLRecord(SCLRecord sclRecord)
{
int oldRecordLoc = findFirstRecordLocBySid(SCLRecord.sid);
if (oldRecordLoc == -1)
{
// Insert it after the window record
int windowRecordLoc = findFirstRecordLocBySid(WindowTwoRecord.sid);
records.add(windowRecordLoc+1, sclRecord);
}
else
{
records.set(oldRecordLoc, sclRecord);
}
}
/**
* Finds the first occurance of a record matching a particular sid and
* returns it's position.
* @param sid the sid to search for
* @return the record position of the matching record or -1 if no match
* is made.
*/
public int findFirstRecordLocBySid( short sid )
{
int index = 0;
for (Iterator iterator = records.iterator(); iterator.hasNext(); )
{
Record record = ( Record ) iterator.next();
if (record.getSid() == sid)
{
return index;
}
index++;
}
return -1;
}
/**
* Returns the HeaderRecord.
* @return HeaderRecord for the sheet.
*/
public HeaderRecord getHeader ()
{
return header;
}
/**
* Sets the HeaderRecord.
* @param newHeader The new HeaderRecord for the sheet.
*/
public void setHeader (HeaderRecord newHeader)
{
header = newHeader;
}
/**
* Returns the FooterRecord.
* @return FooterRecord for the sheet.
*/
public FooterRecord getFooter ()
{
return footer;
}
/**
* Sets the FooterRecord.
* @param newFooter The new FooterRecord for the sheet.
*/
public void setFooter (FooterRecord newFooter)
{
footer = newFooter;
}
/**
* Returns the PrintSetupRecord.
* @return PrintSetupRecord for the sheet.
*/
public PrintSetupRecord getPrintSetup ()
{
return printSetup;
}
/**
* Sets the PrintSetupRecord.
* @param newPrintSetup The new PrintSetupRecord for the sheet.
*/
public void setPrintSetup (PrintSetupRecord newPrintSetup)
{
printSetup = newPrintSetup;
}
/**
* Returns the PrintGridlinesRecord.
* @return PrintGridlinesRecord for the sheet.
*/
public PrintGridlinesRecord getPrintGridlines ()
{
return printGridlines;
}
/**
* Sets the PrintGridlinesRecord.
* @param newPrintGridlines The new PrintGridlinesRecord for the sheet.
*/
public void setPrintGridlines (PrintGridlinesRecord newPrintGridlines)
{
printGridlines = newPrintGridlines;
}
/**
* Sets whether the sheet is selected
* @param sel True to select the sheet, false otherwise.
*/
public void setSelected(boolean sel) {
WindowTwoRecord windowTwo = (WindowTwoRecord) findFirstRecordBySid(WindowTwoRecord.sid);
windowTwo.setSelected(sel);
}
/**
* Gets the size of the margin in inches.
* @param margin which margin to get
* @return the size of the margin
*/
public double getMargin(short margin) {
Margin m;
switch ( margin )
{
case LeftMargin:
m = (Margin) findFirstRecordBySid( LeftMarginRecord.sid );
if ( m == null )
return .75;
break;
case RightMargin:
m = (Margin) findFirstRecordBySid( RightMarginRecord.sid );
if ( m == null )
return .75;
break;
case TopMargin:
m = (Margin) findFirstRecordBySid( TopMarginRecord.sid );
if ( m == null )
return 1.0;
break;
case BottomMargin:
m = (Margin) findFirstRecordBySid( BottomMarginRecord.sid );
if ( m == null )
return 1.0;
break;
default :
throw new RuntimeException( "Unknown margin constant: " + margin );
}
return m.getMargin();
}
/**
* Sets the size of the margin in inches.
* @param margin which margin to get
* @param size the size of the margin
*/
public void setMargin(short margin, double size) {
Margin m;
switch ( margin )
{
case LeftMargin:
m = (Margin) findFirstRecordBySid( LeftMarginRecord.sid );
if ( m == null )
{
m = new LeftMarginRecord();
records.add( getDimsLoc() + 1, m );
}
break;
case RightMargin:
m = (Margin) findFirstRecordBySid( RightMarginRecord.sid );
if ( m == null )
{
m = new RightMarginRecord();
records.add( getDimsLoc() + 1, m );
}
break;
case TopMargin:
m = (Margin) findFirstRecordBySid( TopMarginRecord.sid );
if ( m == null )
{
m = new TopMarginRecord();
records.add( getDimsLoc() + 1, m );
}
break;
case BottomMargin:
m = (Margin) findFirstRecordBySid( BottomMarginRecord.sid );
if ( m == null )
{
m = new BottomMarginRecord();
records.add( getDimsLoc() + 1, m );
}
break;
default :
throw new RuntimeException( "Unknown margin constant: " + margin );
}
m.setMargin( size );
}
public int getEofLoc()
{
return eofLoc;
}
/**
* Creates a split (freezepane).
* @param colSplit Horizonatal position of split.
* @param rowSplit Vertical position of split.
* @param topRow Top row visible in bottom pane
* @param leftmostColumn Left column visible in right pane.
*/
public void createFreezePane(int colSplit, int rowSplit, int topRow, int leftmostColumn )
{
int loc = findFirstRecordLocBySid(WindowTwoRecord.sid);
PaneRecord pane = new PaneRecord();
pane.setX((short)colSplit);
pane.setY((short)rowSplit);
pane.setTopRow((short) topRow);
pane.setLeftColumn((short) leftmostColumn);
if (rowSplit == 0)
{
pane.setTopRow((short)0);
pane.setActivePane((short)1);
}
else if (colSplit == 0)
{
pane.setLeftColumn((short)64);
pane.setActivePane((short)2);
}
else
{
pane.setActivePane((short)0);
}
records.add(loc+1, pane);
WindowTwoRecord windowRecord = (WindowTwoRecord) records.get(loc);
windowRecord.setFreezePanes(true);
windowRecord.setFreezePanesNoSplit(true);
SelectionRecord sel = (SelectionRecord) findFirstRecordBySid(SelectionRecord.sid);
// SelectionRecord sel2 = (SelectionRecord) sel.clone();
// SelectionRecord sel3 = (SelectionRecord) sel.clone();
// SelectionRecord sel4 = (SelectionRecord) sel.clone();
// sel.setPane(PANE_LOWER_RIGHT); // 0
// sel3.setPane(PANE_UPPER_RIGHT); // 1
sel.setPane((byte)pane.getActivePane()); // 2
// sel2.setPane(PANE_UPPER_LEFT); // 3
// sel4.setActiveCellCol((short)Math.max(sel3.getActiveCellCol(), colSplit));
// sel3.setActiveCellRow((short)Math.max(sel4.getActiveCellRow(), rowSplit));
int selLoc = findFirstRecordLocBySid(SelectionRecord.sid);
// sel.setActiveCellCol((short)15);
// sel.setActiveCellRow((short)15);
// sel2.setActiveCellCol((short)0);
// sel2.setActiveCellRow((short)0);
// records.add(selLoc+1,sel2);
// records.add(selLoc+2,sel3);
// records.add(selLoc+3,sel4);
}
/**
* Creates a split pane.
* @param xSplitPos Horizonatal position of split (in 1/20th of a point).
* @param ySplitPos Vertical position of split (in 1/20th of a point).
* @param topRow Top row visible in bottom pane
* @param leftmostColumn Left column visible in right pane.
* @param activePane Active pane. One of: PANE_LOWER_RIGHT,
* PANE_UPPER_RIGHT, PANE_LOWER_LEFT, PANE_UPPER_LEFT
* @see #PANE_LOWER_LEFT
* @see #PANE_LOWER_RIGHT
* @see #PANE_UPPER_LEFT
* @see #PANE_UPPER_RIGHT
*/
public void createSplitPane(int xSplitPos, int ySplitPos, int topRow, int leftmostColumn, int activePane )
{
int loc = findFirstRecordLocBySid(WindowTwoRecord.sid);
PaneRecord r = new PaneRecord();
r.setX((short)xSplitPos);
r.setY((short)ySplitPos);
r.setTopRow((short) topRow);
r.setLeftColumn((short) leftmostColumn);
r.setActivePane((short) activePane);
records.add(loc+1, r);
WindowTwoRecord windowRecord = (WindowTwoRecord) records.get(loc);
windowRecord.setFreezePanes(false);
windowRecord.setFreezePanesNoSplit(false);
SelectionRecord sel = (SelectionRecord) findFirstRecordBySid(SelectionRecord.sid);
// SelectionRecord sel2 = (SelectionRecord) sel.clone();
// SelectionRecord sel3 = (SelectionRecord) sel.clone();
// SelectionRecord sel4 = (SelectionRecord) sel.clone();
sel.setPane(PANE_LOWER_RIGHT); // 0
// sel3.setPane(PANE_UPPER_RIGHT); // 1
// sel4.setPane(PANE_LOWER_LEFT); // 2
// sel2.setPane(PANE_UPPER_LEFT); // 3
// sel4.setActiveCellCol((short)Math.max(sel3.getActiveCellCol(), colSplit));
// sel3.setActiveCellRow((short)Math.max(sel4.getActiveCellRow(), rowSplit));
int selLoc = findFirstRecordLocBySid(SelectionRecord.sid);
// sel.setActiveCellCol((short)15);
// sel.setActiveCellRow((short)15);
// sel2.setActiveCellCol((short)0);
// sel2.setActiveCellRow((short)0);
// records.add(selLoc+1,sel2);
// records.add(selLoc+2,sel3);
// records.add(selLoc+3,sel4);
}
public SelectionRecord getSelection()
{
return selection;
}
public void setSelection( SelectionRecord selection )
{
this.selection = selection;
}
}
| false | true | public static Sheet createSheet(List recs, int sheetnum, int offset)
{
log.logFormatted(log.DEBUG,
"Sheet createSheet (existing file) with %",
new Integer(recs.size()));
Sheet retval = new Sheet();
ArrayList records = new ArrayList(recs.size() / 5);
boolean isfirstcell = true;
boolean isfirstrow = true;
int bofEofNestingLevel = 0;
for (int k = offset; k < recs.size(); k++)
{
Record rec = ( Record ) recs.get(k);
if (rec.getSid() == LabelRecord.sid)
{
log.log(log.DEBUG, "Hit label record.");
retval.containsLabels = true;
}
else if (rec.getSid() == BOFRecord.sid)
{
bofEofNestingLevel++;
log.log(log.DEBUG, "Hit BOF record. Nesting increased to " + bofEofNestingLevel);
}
else if (rec.getSid() == EOFRecord.sid)
{
--bofEofNestingLevel;
log.log(log.DEBUG, "Hit EOF record. Nesting decreased to " + bofEofNestingLevel);
if (bofEofNestingLevel == 0) {
records.add(rec);
retval.eofLoc = k;
break;
}
}
else if (rec.getSid() == DimensionsRecord.sid)
{
retval.dims = ( DimensionsRecord ) rec;
retval.dimsloc = records.size();
}
else if (rec.getSid() == MergeCellsRecord.sid)
{
retval.mergedRecords.add(rec);
retval.merged = ( MergeCellsRecord ) rec;
retval.mergedLocs.add(new Integer(k - offset));
retval.numMergedRegions += retval.merged.getNumAreas();
}
else if (rec.getSid() == ColumnInfoRecord.sid)
{
if (retval.columnSizes == null)
{
retval.columnSizes = new ArrayList();
}
retval.columnSizes.add(rec);
}
else if (rec.getSid() == DefaultColWidthRecord.sid)
{
retval.defaultcolwidth = ( DefaultColWidthRecord ) rec;
}
else if (rec.getSid() == DefaultRowHeightRecord.sid)
{
retval.defaultrowheight = ( DefaultRowHeightRecord ) rec;
}
else if ( rec.isValue() && bofEofNestingLevel == 1 )
{
if ( isfirstcell )
{
retval.cells = new ValueRecordsAggregate();
rec = retval.cells;
retval.cells.construct( k, recs );
isfirstcell = false;
}
else
{
rec = null;
}
}
else if ( rec.getSid() == StringRecord.sid )
{
rec = null;
}
else if ( rec.getSid() == RowRecord.sid )
{
RowRecord row = (RowRecord)rec;
if (!isfirstrow) rec = null; //only add the aggregate once
if ( isfirstrow )
{
retval.rows = new RowRecordsAggregate();
rec = retval.rows;
isfirstrow = false;
}
retval.rows.insertRow(row);
}
else if ( rec.getSid() == PrintGridlinesRecord.sid )
{
retval.printGridlines = (PrintGridlinesRecord) rec;
}
else if ( rec.getSid() == HeaderRecord.sid )
{
retval.header = (HeaderRecord) rec;
}
else if ( rec.getSid() == FooterRecord.sid )
{
retval.footer = (FooterRecord) rec;
}
else if ( rec.getSid() == PrintSetupRecord.sid )
{
retval.printSetup = (PrintSetupRecord) rec;
}
else if ( rec.getSid() == SelectionRecord.sid )
{
retval.selection = (SelectionRecord) rec;
}
if (rec != null)
{
records.add(rec);
}
}
retval.records = records;
if (retval.rows == null)
{
retval.rows = new RowRecordsAggregate();
}
if (retval.cells == null)
{
retval.cells = new ValueRecordsAggregate();
}
log.log(log.DEBUG, "sheet createSheet (existing file) exited");
return retval;
}
| public static Sheet createSheet(List recs, int sheetnum, int offset)
{
log.logFormatted(log.DEBUG,
"Sheet createSheet (existing file) with %",
new Integer(recs.size()));
Sheet retval = new Sheet();
ArrayList records = new ArrayList(recs.size() / 5);
boolean isfirstcell = true;
boolean isfirstrow = true;
int bofEofNestingLevel = 0;
for (int k = offset; k < recs.size(); k++)
{
Record rec = ( Record ) recs.get(k);
if (rec.getSid() == LabelRecord.sid)
{
log.log(log.DEBUG, "Hit label record.");
retval.containsLabels = true;
}
else if (rec.getSid() == BOFRecord.sid)
{
bofEofNestingLevel++;
log.log(log.DEBUG, "Hit BOF record. Nesting increased to " + bofEofNestingLevel);
}
else if (rec.getSid() == EOFRecord.sid)
{
--bofEofNestingLevel;
log.log(log.DEBUG, "Hit EOF record. Nesting decreased to " + bofEofNestingLevel);
if (bofEofNestingLevel == 0) {
records.add(rec);
retval.eofLoc = k;
break;
}
}
else if (rec.getSid() == DimensionsRecord.sid)
{
retval.dims = ( DimensionsRecord ) rec;
retval.dimsloc = records.size();
}
else if (rec.getSid() == MergeCellsRecord.sid)
{
retval.mergedRecords.add(rec);
retval.merged = ( MergeCellsRecord ) rec;
retval.mergedLocs.add(new Integer(k - offset));
retval.numMergedRegions += retval.merged.getNumAreas();
}
else if (rec.getSid() == ColumnInfoRecord.sid)
{
if (retval.columnSizes == null)
{
retval.columnSizes = new ArrayList();
}
retval.columnSizes.add(rec);
}
else if (rec.getSid() == DefaultColWidthRecord.sid)
{
retval.defaultcolwidth = ( DefaultColWidthRecord ) rec;
}
else if (rec.getSid() == DefaultRowHeightRecord.sid)
{
retval.defaultrowheight = ( DefaultRowHeightRecord ) rec;
}
else if ( rec.isValue() && bofEofNestingLevel == 1 )
{
if ( isfirstcell )
{
retval.cells = new ValueRecordsAggregate();
rec = retval.cells;
retval.cells.construct( k, recs );
isfirstcell = false;
}
else
{
rec = null;
}
}
else if ( rec.getSid() == StringRecord.sid )
{
rec = null;
}
else if ( rec.getSid() == RowRecord.sid )
{
RowRecord row = (RowRecord)rec;
if (!isfirstrow) rec = null; //only add the aggregate once
if ( isfirstrow )
{
retval.rows = new RowRecordsAggregate();
rec = retval.rows;
isfirstrow = false;
}
retval.rows.insertRow(row);
}
else if ( rec.getSid() == PrintGridlinesRecord.sid )
{
retval.printGridlines = (PrintGridlinesRecord) rec;
}
else if ( rec.getSid() == HeaderRecord.sid && bofEofNestingLevel == 1)
{
retval.header = (HeaderRecord) rec;
}
else if ( rec.getSid() == FooterRecord.sid && bofEofNestingLevel == 1)
{
retval.footer = (FooterRecord) rec;
}
else if ( rec.getSid() == PrintSetupRecord.sid && bofEofNestingLevel == 1)
{
retval.printSetup = (PrintSetupRecord) rec;
}
else if ( rec.getSid() == SelectionRecord.sid )
{
retval.selection = (SelectionRecord) rec;
}
if (rec != null)
{
records.add(rec);
}
}
retval.records = records;
if (retval.rows == null)
{
retval.rows = new RowRecordsAggregate();
}
if (retval.cells == null)
{
retval.cells = new ValueRecordsAggregate();
}
log.log(log.DEBUG, "sheet createSheet (existing file) exited");
return retval;
}
|
diff --git a/src/main/java/me/greatman/plugins/inn/IPlayerListener.java b/src/main/java/me/greatman/plugins/inn/IPlayerListener.java
index eaa3010..41d3420 100644
--- a/src/main/java/me/greatman/plugins/inn/IPlayerListener.java
+++ b/src/main/java/me/greatman/plugins/inn/IPlayerListener.java
@@ -1,55 +1,52 @@
package me.greatman.plugins.inn;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerBedEnterEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerListener;
public class IPlayerListener extends PlayerListener {
private final Inn plugin;
public IPlayerListener(Inn instance) {
plugin = instance;
}
@Override
public void onPlayerInteract(PlayerInteractEvent event) {
if (event.isCancelled())
return;
Player player = event.getPlayer();
String playerName = player.getName();
if (!plugin.getPlayerData().containsKey(playerName)) {
plugin.getPlayerData().put(playerName, new PlayerData(plugin, playerName));
}
// If our user is select & is not holding an item, selection time
if (plugin.getPlayerData().get(playerName).isSelecting() && player.getItemInHand().getType() == Material.AIR && event.getClickedBlock().getType() == Material.WOODEN_DOOR) {
int x, y, z;
Location loc = event.getClickedBlock().getLocation();
x = loc.getBlockX();
y = loc.getBlockY();
z = loc.getBlockZ();
- ILogger.info(Integer.toString(event.getClickedBlock().getTypeId()));
PlayerData pData = plugin.getPlayerData().get(playerName);
if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
int[] xyz = { x, y, z };
pData.setPositionA(xyz);
if(pData.checkSize()) {
player.sendMessage(ChatColor.DARK_AQUA + "Door selected");
- if(pData.getPositionA() != null && pData.getPositionB() == null) {
- player.sendMessage(ChatColor.DARK_AQUA + "Now, right click to select the far upper corner for the inn.");
- } else if(pData.getPositionA() != null) {
+ if(pData.getPositionA() != null) {
player.sendMessage(ChatColor.DARK_AQUA + "Type " + ChatColor.WHITE + "/inn create [Price]" + ChatColor.DARK_AQUA + ", if you're happy with your selection, otherwise keep selecting!");
}
}
}
}
}
}
| false | true | public void onPlayerInteract(PlayerInteractEvent event) {
if (event.isCancelled())
return;
Player player = event.getPlayer();
String playerName = player.getName();
if (!plugin.getPlayerData().containsKey(playerName)) {
plugin.getPlayerData().put(playerName, new PlayerData(plugin, playerName));
}
// If our user is select & is not holding an item, selection time
if (plugin.getPlayerData().get(playerName).isSelecting() && player.getItemInHand().getType() == Material.AIR && event.getClickedBlock().getType() == Material.WOODEN_DOOR) {
int x, y, z;
Location loc = event.getClickedBlock().getLocation();
x = loc.getBlockX();
y = loc.getBlockY();
z = loc.getBlockZ();
ILogger.info(Integer.toString(event.getClickedBlock().getTypeId()));
PlayerData pData = plugin.getPlayerData().get(playerName);
if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
int[] xyz = { x, y, z };
pData.setPositionA(xyz);
if(pData.checkSize()) {
player.sendMessage(ChatColor.DARK_AQUA + "Door selected");
if(pData.getPositionA() != null && pData.getPositionB() == null) {
player.sendMessage(ChatColor.DARK_AQUA + "Now, right click to select the far upper corner for the inn.");
} else if(pData.getPositionA() != null) {
player.sendMessage(ChatColor.DARK_AQUA + "Type " + ChatColor.WHITE + "/inn create [Price]" + ChatColor.DARK_AQUA + ", if you're happy with your selection, otherwise keep selecting!");
}
}
}
}
}
| public void onPlayerInteract(PlayerInteractEvent event) {
if (event.isCancelled())
return;
Player player = event.getPlayer();
String playerName = player.getName();
if (!plugin.getPlayerData().containsKey(playerName)) {
plugin.getPlayerData().put(playerName, new PlayerData(plugin, playerName));
}
// If our user is select & is not holding an item, selection time
if (plugin.getPlayerData().get(playerName).isSelecting() && player.getItemInHand().getType() == Material.AIR && event.getClickedBlock().getType() == Material.WOODEN_DOOR) {
int x, y, z;
Location loc = event.getClickedBlock().getLocation();
x = loc.getBlockX();
y = loc.getBlockY();
z = loc.getBlockZ();
PlayerData pData = plugin.getPlayerData().get(playerName);
if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
int[] xyz = { x, y, z };
pData.setPositionA(xyz);
if(pData.checkSize()) {
player.sendMessage(ChatColor.DARK_AQUA + "Door selected");
if(pData.getPositionA() != null) {
player.sendMessage(ChatColor.DARK_AQUA + "Type " + ChatColor.WHITE + "/inn create [Price]" + ChatColor.DARK_AQUA + ", if you're happy with your selection, otherwise keep selecting!");
}
}
}
}
}
|
diff --git a/src/com/dmdirc/installer/ui/StepWelcome.java b/src/com/dmdirc/installer/ui/StepWelcome.java
index 01ec3eff1..5c172eb4b 100644
--- a/src/com/dmdirc/installer/ui/StepWelcome.java
+++ b/src/com/dmdirc/installer/ui/StepWelcome.java
@@ -1,77 +1,77 @@
/*
* Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
*
* 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.dmdirc.installer.ui;
import java.awt.BorderLayout;
import java.awt.Image;
import java.awt.Toolkit;
/**
* Tells the user what this application does
*/
public final class StepWelcome extends SwingStep {
/**
* A version number for this class. It should be changed whenever the class
* structure is changed (or anything else that would prevent serialized
* objects being unserialized with the new class).
*/
private static final long serialVersionUID = 2;
/**
* Creates a new instance of StepWelcome.
*
* @param releaseName
*/
public StepWelcome(final String releaseName) {
super();
setLayout(new BorderLayout());
add(new TextLabel(
"Welcome to the " + releaseName + " installer. This program " +
"will install DMDirc on this computer.\n\nDMDirc is a " +
"cross-platform IRC client developed by Chris Smith, Shane " +
"Mc Cormack and Gregory Holmes. DMDirc is released for free " +
- "under the MIT license; for more information, please visit " +
+ "under the MIT licence; for more information, please visit " +
"www.DMDirc.com.\n\nClick \"Next\" to continue, or close " +
"this program to cancel the installation."), BorderLayout.CENTER);
}
/** {@inheritDoc} */
@Override
public String getStepName() {
return "Welcome";
}
/** {@inheritDoc} */
@Override
public Image getIcon() {
return Toolkit.getDefaultToolkit().createImage(ClassLoader.getSystemResource("com/dmdirc/res/icon.png"));
}
/** {@inheritDoc} */
@Override
public String getStepDescription() {
return "";
}
}
| true | true | public StepWelcome(final String releaseName) {
super();
setLayout(new BorderLayout());
add(new TextLabel(
"Welcome to the " + releaseName + " installer. This program " +
"will install DMDirc on this computer.\n\nDMDirc is a " +
"cross-platform IRC client developed by Chris Smith, Shane " +
"Mc Cormack and Gregory Holmes. DMDirc is released for free " +
"under the MIT license; for more information, please visit " +
"www.DMDirc.com.\n\nClick \"Next\" to continue, or close " +
"this program to cancel the installation."), BorderLayout.CENTER);
}
| public StepWelcome(final String releaseName) {
super();
setLayout(new BorderLayout());
add(new TextLabel(
"Welcome to the " + releaseName + " installer. This program " +
"will install DMDirc on this computer.\n\nDMDirc is a " +
"cross-platform IRC client developed by Chris Smith, Shane " +
"Mc Cormack and Gregory Holmes. DMDirc is released for free " +
"under the MIT licence; for more information, please visit " +
"www.DMDirc.com.\n\nClick \"Next\" to continue, or close " +
"this program to cancel the installation."), BorderLayout.CENTER);
}
|
diff --git a/src/main/java/uk/ac/ebi/fgpt/sampletab/Accessioner.java b/src/main/java/uk/ac/ebi/fgpt/sampletab/Accessioner.java
index c49250f3..75e561d3 100644
--- a/src/main/java/uk/ac/ebi/fgpt/sampletab/Accessioner.java
+++ b/src/main/java/uk/ac/ebi/fgpt/sampletab/Accessioner.java
@@ -1,371 +1,371 @@
package uk.ac.ebi.fgpt.sampletab;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.Writer;
import java.net.URL;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collection;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.dbcp.ConnectionFactory;
import org.apache.commons.dbcp.DriverManagerConnectionFactory;
import org.apache.commons.dbcp.PoolableConnectionFactory;
import org.apache.commons.dbcp.PoolingDriver;
import org.apache.commons.pool.ObjectPool;
import org.apache.commons.pool.impl.GenericObjectPool;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import uk.ac.ebi.arrayexpress2.sampletab.datamodel.scd.node.GroupNode;
import uk.ac.ebi.arrayexpress2.sampletab.datamodel.scd.node.SampleNode;
import uk.ac.ebi.arrayexpress2.magetab.exception.ParseException;
import uk.ac.ebi.arrayexpress2.sampletab.datamodel.SampleData;
import uk.ac.ebi.arrayexpress2.sampletab.parser.SampleTabSaferParser;
import uk.ac.ebi.arrayexpress2.sampletab.renderer.SampleTabWriter;
import uk.ac.ebi.arrayexpress2.sampletab.validator.SampleTabValidator;
public class Accessioner {
private String hostname;
private int port = 3306;
private String database;
private String username;
private String password;
private static boolean setup = false;
private static ObjectPool connectionPool = new GenericObjectPool();
private final SampleTabValidator validator = new SampleTabValidator();
private final SampleTabSaferParser parser = new SampleTabSaferParser(validator);
private Logger log = LoggerFactory.getLogger(getClass());
private BasicDataSource ds;
public Accessioner(String host, int port, String database, String username, String password)
throws ClassNotFoundException, SQLException {
// Setup the connection with the DB
this.username = username;
this.password = password;
this.hostname = host;
this.port = port;
this.database = database;
doSetup();
}
private String getAccession(Connection connect, String table, String userAccession, String submissionAccession) throws SQLException{
String prefix;
if (table.toLowerCase().equals("sample_assay")){
prefix = "SAMEA";
} else if (table.toLowerCase().equals("sample_groups")){
prefix = "SAMEG";
} else if (table.toLowerCase().equals("sample_reference")){
prefix = "SAME";
} else {
throw new IllegalArgumentException("invalud table "+table);
}
PreparedStatement statement = null;
ResultSet results = null;
String accession = null;
try {
statement = connect.prepareStatement("SELECT accession FROM " + table
+ " WHERE user_accession LIKE ? AND submission_accession LIKE ? LIMIT 1");
statement.setString(1, userAccession);
statement.setString(2, submissionAccession);
results = statement.executeQuery();
results.first();
Integer accessionID = results.getInt(1);
accession = prefix + accessionID;
} finally {
if (statement != null){
try {
statement.close();
} catch (SQLException e){
//do nothing
}
}
if (results != null){
try {
results.close();
} catch (SQLException e){
//do nothing
}
}
}
return accession;
}
private void doSetup() throws ClassNotFoundException, SQLException{
//this will only setup for the first instance
//therefore do not try to mix and match different connections in the same VM
if (setup){
return;
}
String connectURI = "jdbc:mysql://" + hostname + ":" + port + "/" + database;
connectURI = "jdbc:oracle:thin:@"+hostname+":"+port+":"+database;
ConnectionFactory connectionFactory = new DriverManagerConnectionFactory(connectURI, username, password);
PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(connectionFactory, connectionPool, null, null, false, true);
Class.forName("com.mysql.jdbc.Driver");
Class.forName("oracle.jdbc.driver.OracleDriver");
Class.forName("org.apache.commons.dbcp.PoolingDriver");
PoolingDriver driver = (PoolingDriver) DriverManager.getDriver("jdbc:apache:commons:dbcp:");
driver.registerPool("accessioner", connectionPool);
//
// Now we can just use the connect string "jdbc:apache:commons:dbcp:example"
// to access our pool of Connections.
//
setup = true;
}
public SampleData convert(String sampleTabFilename) throws IOException, ParseException, SQLException {
return convert(new File(sampleTabFilename));
}
public SampleData convert(File sampleTabFile) throws IOException, ParseException, SQLException {
return convert(parser.parse(sampleTabFile));
}
public SampleData convert(URL sampleTabURL) throws IOException, ParseException, SQLException {
return convert(parser.parse(sampleTabURL));
}
public SampleData convert(InputStream dataIn) throws ParseException, SQLException {
return convert(parser.parse(dataIn));
}
public SampleData convert(SampleData sampleIn) throws ParseException, SQLException {
String table = null;
String prefix = null;
if (sampleIn.msi.submissionReferenceLayer == true) {
prefix = "SAME";
table = "SAMPLE_REFERENCE";
} else if (sampleIn.msi.submissionReferenceLayer == false) {
prefix = "SAMEA";
table = "SAMPLE_ASSAY";
} else {
throw new ParseException("Must specify a Submission Reference Layer MSI attribute.");
}
Collection<SampleNode> samples = sampleIn.scd.getNodes(SampleNode.class);
log.debug("got " + samples.size() + " samples.");
String name;
String submission = sampleIn.msi.submissionIdentifier;
if (submission == null){
throw new ParseException("Submission Identifier cannot be null");
}
submission = submission.trim();
int accessionID;
String accession;
Connection connect = null;
PreparedStatement statement = null;
ResultSet results = null;
try {
connect = DriverManager.getConnection("jdbc:apache:commons:dbcp:accessioner");
log.info("Starting accessioning");
//first do one query to retrieve all that have already got accessions
long start = System.currentTimeMillis();
- statement = connect.prepareStatement("SELECT user_accession, accession FROM " + table
- + " WHERE submission_accession LIKE ? AND is_deleted = 0");
+ statement = connect.prepareStatement("SELECT USER_ACCESSION, ACCESSION FROM " + table
+ + " WHERE SUBMISSION_ACCESSION LIKE ? AND IS_DELETED = 0");
statement.setString(1, submission);
log.trace(statement.toString());
results = statement.executeQuery();
long end = System.currentTimeMillis();
log.debug("Time elapsed = "+(end-start)+"ms");
while (results.next()){
String samplename = results.getString(1).trim();
accessionID = results.getInt(2);
accession = prefix + accessionID;
SampleNode sample = sampleIn.scd.getNode(samplename, SampleNode.class);
log.trace(samplename+" : "+accession);
if (sample != null){
sample.setSampleAccession(accession);
} else {
log.warn("Unable to find SCD sample node "+samplename+" in submission "+submission);
}
}
//TODO try finally this
statement.close();
results.close();
- statement = connect.prepareStatement("SELECT user_accession, accession FROM SAMPLE_GROUPS WHERE submission_accession LIKE ? AND is_deleted = 0");
+ statement = connect.prepareStatement("SELECT USER_ACCESSION, ACCESSION FROM SAMPLE_GROUPS WHERE SUBMISSION_ACCESSION LIKE ? AND IS_DELETED = 0");
statement.setString(1, submission);
log.trace(statement.toString());
results = statement.executeQuery();
while (results.next()){
String groupname = results.getString(1).trim();
accessionID = results.getInt(2);
accession = prefix + accessionID;
GroupNode group = sampleIn.scd.getNode(groupname, GroupNode.class);
log.trace(groupname+" : "+accession);
if (group != null){
group.setGroupAccession(accession);
} else {
log.warn("Unable to find SCD group node "+groupname+" in submission "+submission);
}
}
//TODO try finally this
statement.close();
results.close();
//now assign and retrieve accessions for samples that do not have them
for (SampleNode sample : samples) {
if (sample.getSampleAccession() == null) {
name = sample.getNodeName().trim();
log.info("Assigning new accession for "+submission+" : "+name);
//insert it if not exists
start = System.currentTimeMillis();
statement = connect
.prepareStatement("INSERT INTO "
+ table
- + " (user_accession, submission_accession, date_assigned, is_deleted) VALUES (?, ?, SYSDATE, 0);");
+ + " (USER_ACCESSION, SUBMISSION_ACCESSION, DATE_ASSIGNED, IS_DELETED) VALUES ( ? , ? , SYSDATE, 0 )");
statement.setString(1, name);
statement.setString(2, submission);
log.trace(statement.toString());
statement.executeUpdate();
statement.close();
end = System.currentTimeMillis();
log.info("Time elapsed = "+(end-start)+"ms");
- statement = connect.prepareStatement("SELECT accession FROM " + table
- + " WHERE user_accession LIKE ? AND submission_accession LIKE ? LIMIT 1");
+ statement = connect.prepareStatement("SELECT ACCESSION FROM " + table
+ + " WHERE USER_ACCESSION LIKE ? AND SUBMISSION_ACCESSION LIKE ? LIMIT 1");
statement.setString(1, name);
statement.setString(2, submission);
log.trace(statement.toString());
results = statement.executeQuery();
results.first();
accessionID = results.getInt(1);
accession = prefix + accessionID;
statement.close();
results.close();
log.debug("Assigning " + accession + " to " + name);
sample.setSampleAccession(accession);
}
}
Collection<GroupNode> groups = sampleIn.scd.getNodes(GroupNode.class);
log.debug("got " + groups.size() + " groups.");
for (GroupNode group : groups) {
if (group.getGroupAccession() == null) {
name = group.getNodeName();
statement = connect
- .prepareStatement("INSERT INTO SAMPLE_GROUPS ( USER_ACCESSION , SUBMISSION_ACCESSION , DATE_ASSIGNED , IS_DELETED ) VALUES ( ? , ? , SYSDATE, 0 );");
+ .prepareStatement("INSERT INTO SAMPLE_GROUPS ( USER_ACCESSION , SUBMISSION_ACCESSION , DATE_ASSIGNED , IS_DELETED ) VALUES ( ? , ? , SYSDATE, 0 )");
statement.setString(1, name);
statement.setString(2, submission);
log.info(name);
log.info(submission);
statement.executeUpdate();
statement.close();
statement = connect
.prepareStatement("SELECT ACCESSION FROM SAMPLE_GROUPS WHERE USER_ACCESSION = ? AND SUBMISSION_ACCESSION = ?");
statement.setString(1, name);
statement.setString(2, submission);
log.trace(statement.toString());
results = statement.executeQuery();
results.first();
accessionID = results.getInt(1);
accession = "SAMEG" + accessionID;
statement.close();
results.close();
log.debug("Assigning " + accession + " to " + name);
group.setGroupAccession(accession);
}
}
} finally {
if (results != null){
try {
results.close();
} catch (Exception e) {
//do nothing
}
}
if (statement != null) {
try {
statement.close();
} catch (Exception e) {
//do nothing
}
}
if (connect != null) {
try {
connect.close();
} catch (Exception e) {
//do nothing
}
}
}
return sampleIn;
}
public void convert(SampleData sampleIn, Writer writer) throws IOException, ParseException, SQLException {
log.info("recieved magetab, preparing to convert");
SampleData sampleOut = convert(sampleIn);
log.info("sampletab converted, preparing to output");
SampleTabWriter sampletabwriter = new SampleTabWriter(writer);
log.info("created SampleTabWriter");
sampletabwriter.write(sampleOut);
sampletabwriter.close();
}
public void convert(File sampletabFile, Writer writer) throws IOException, ParseException, SQLException {
log.info("preparing to load SampleData");
SampleTabSaferParser stparser = new SampleTabSaferParser();
log.info("created SampleTabParser<SampleData>, beginning parse");
SampleData st = stparser.parse(sampletabFile);
convert(st, writer);
}
public void convert(File inputFile, String outputFilename) throws IOException, ParseException, SQLException {
convert(inputFile, new File(outputFilename));
}
public void convert(File inputFile, File outputFile) throws IOException, ParseException, SQLException {
convert(inputFile, new FileWriter(outputFile));
}
public void convert(String inputFilename, Writer writer) throws IOException, ParseException, SQLException {
convert(new File(inputFilename), writer);
}
public void convert(String inputFilename, File outputFile) throws IOException, ParseException, SQLException {
convert(inputFilename, new FileWriter(outputFile));
}
public void convert(String inputFilename, String outputFilename) throws IOException, ParseException, SQLException {
convert(inputFilename, new File(outputFilename));
}
}
| false | true | public SampleData convert(SampleData sampleIn) throws ParseException, SQLException {
String table = null;
String prefix = null;
if (sampleIn.msi.submissionReferenceLayer == true) {
prefix = "SAME";
table = "SAMPLE_REFERENCE";
} else if (sampleIn.msi.submissionReferenceLayer == false) {
prefix = "SAMEA";
table = "SAMPLE_ASSAY";
} else {
throw new ParseException("Must specify a Submission Reference Layer MSI attribute.");
}
Collection<SampleNode> samples = sampleIn.scd.getNodes(SampleNode.class);
log.debug("got " + samples.size() + " samples.");
String name;
String submission = sampleIn.msi.submissionIdentifier;
if (submission == null){
throw new ParseException("Submission Identifier cannot be null");
}
submission = submission.trim();
int accessionID;
String accession;
Connection connect = null;
PreparedStatement statement = null;
ResultSet results = null;
try {
connect = DriverManager.getConnection("jdbc:apache:commons:dbcp:accessioner");
log.info("Starting accessioning");
//first do one query to retrieve all that have already got accessions
long start = System.currentTimeMillis();
statement = connect.prepareStatement("SELECT user_accession, accession FROM " + table
+ " WHERE submission_accession LIKE ? AND is_deleted = 0");
statement.setString(1, submission);
log.trace(statement.toString());
results = statement.executeQuery();
long end = System.currentTimeMillis();
log.debug("Time elapsed = "+(end-start)+"ms");
while (results.next()){
String samplename = results.getString(1).trim();
accessionID = results.getInt(2);
accession = prefix + accessionID;
SampleNode sample = sampleIn.scd.getNode(samplename, SampleNode.class);
log.trace(samplename+" : "+accession);
if (sample != null){
sample.setSampleAccession(accession);
} else {
log.warn("Unable to find SCD sample node "+samplename+" in submission "+submission);
}
}
//TODO try finally this
statement.close();
results.close();
statement = connect.prepareStatement("SELECT user_accession, accession FROM SAMPLE_GROUPS WHERE submission_accession LIKE ? AND is_deleted = 0");
statement.setString(1, submission);
log.trace(statement.toString());
results = statement.executeQuery();
while (results.next()){
String groupname = results.getString(1).trim();
accessionID = results.getInt(2);
accession = prefix + accessionID;
GroupNode group = sampleIn.scd.getNode(groupname, GroupNode.class);
log.trace(groupname+" : "+accession);
if (group != null){
group.setGroupAccession(accession);
} else {
log.warn("Unable to find SCD group node "+groupname+" in submission "+submission);
}
}
//TODO try finally this
statement.close();
results.close();
//now assign and retrieve accessions for samples that do not have them
for (SampleNode sample : samples) {
if (sample.getSampleAccession() == null) {
name = sample.getNodeName().trim();
log.info("Assigning new accession for "+submission+" : "+name);
//insert it if not exists
start = System.currentTimeMillis();
statement = connect
.prepareStatement("INSERT INTO "
+ table
+ " (user_accession, submission_accession, date_assigned, is_deleted) VALUES (?, ?, SYSDATE, 0);");
statement.setString(1, name);
statement.setString(2, submission);
log.trace(statement.toString());
statement.executeUpdate();
statement.close();
end = System.currentTimeMillis();
log.info("Time elapsed = "+(end-start)+"ms");
statement = connect.prepareStatement("SELECT accession FROM " + table
+ " WHERE user_accession LIKE ? AND submission_accession LIKE ? LIMIT 1");
statement.setString(1, name);
statement.setString(2, submission);
log.trace(statement.toString());
results = statement.executeQuery();
results.first();
accessionID = results.getInt(1);
accession = prefix + accessionID;
statement.close();
results.close();
log.debug("Assigning " + accession + " to " + name);
sample.setSampleAccession(accession);
}
}
Collection<GroupNode> groups = sampleIn.scd.getNodes(GroupNode.class);
log.debug("got " + groups.size() + " groups.");
for (GroupNode group : groups) {
if (group.getGroupAccession() == null) {
name = group.getNodeName();
statement = connect
.prepareStatement("INSERT INTO SAMPLE_GROUPS ( USER_ACCESSION , SUBMISSION_ACCESSION , DATE_ASSIGNED , IS_DELETED ) VALUES ( ? , ? , SYSDATE, 0 );");
statement.setString(1, name);
statement.setString(2, submission);
log.info(name);
log.info(submission);
statement.executeUpdate();
statement.close();
statement = connect
.prepareStatement("SELECT ACCESSION FROM SAMPLE_GROUPS WHERE USER_ACCESSION = ? AND SUBMISSION_ACCESSION = ?");
statement.setString(1, name);
statement.setString(2, submission);
log.trace(statement.toString());
results = statement.executeQuery();
results.first();
accessionID = results.getInt(1);
accession = "SAMEG" + accessionID;
statement.close();
results.close();
log.debug("Assigning " + accession + " to " + name);
group.setGroupAccession(accession);
}
}
} finally {
if (results != null){
try {
results.close();
} catch (Exception e) {
//do nothing
}
}
if (statement != null) {
try {
statement.close();
} catch (Exception e) {
//do nothing
}
}
if (connect != null) {
try {
connect.close();
} catch (Exception e) {
//do nothing
}
}
}
return sampleIn;
}
| public SampleData convert(SampleData sampleIn) throws ParseException, SQLException {
String table = null;
String prefix = null;
if (sampleIn.msi.submissionReferenceLayer == true) {
prefix = "SAME";
table = "SAMPLE_REFERENCE";
} else if (sampleIn.msi.submissionReferenceLayer == false) {
prefix = "SAMEA";
table = "SAMPLE_ASSAY";
} else {
throw new ParseException("Must specify a Submission Reference Layer MSI attribute.");
}
Collection<SampleNode> samples = sampleIn.scd.getNodes(SampleNode.class);
log.debug("got " + samples.size() + " samples.");
String name;
String submission = sampleIn.msi.submissionIdentifier;
if (submission == null){
throw new ParseException("Submission Identifier cannot be null");
}
submission = submission.trim();
int accessionID;
String accession;
Connection connect = null;
PreparedStatement statement = null;
ResultSet results = null;
try {
connect = DriverManager.getConnection("jdbc:apache:commons:dbcp:accessioner");
log.info("Starting accessioning");
//first do one query to retrieve all that have already got accessions
long start = System.currentTimeMillis();
statement = connect.prepareStatement("SELECT USER_ACCESSION, ACCESSION FROM " + table
+ " WHERE SUBMISSION_ACCESSION LIKE ? AND IS_DELETED = 0");
statement.setString(1, submission);
log.trace(statement.toString());
results = statement.executeQuery();
long end = System.currentTimeMillis();
log.debug("Time elapsed = "+(end-start)+"ms");
while (results.next()){
String samplename = results.getString(1).trim();
accessionID = results.getInt(2);
accession = prefix + accessionID;
SampleNode sample = sampleIn.scd.getNode(samplename, SampleNode.class);
log.trace(samplename+" : "+accession);
if (sample != null){
sample.setSampleAccession(accession);
} else {
log.warn("Unable to find SCD sample node "+samplename+" in submission "+submission);
}
}
//TODO try finally this
statement.close();
results.close();
statement = connect.prepareStatement("SELECT USER_ACCESSION, ACCESSION FROM SAMPLE_GROUPS WHERE SUBMISSION_ACCESSION LIKE ? AND IS_DELETED = 0");
statement.setString(1, submission);
log.trace(statement.toString());
results = statement.executeQuery();
while (results.next()){
String groupname = results.getString(1).trim();
accessionID = results.getInt(2);
accession = prefix + accessionID;
GroupNode group = sampleIn.scd.getNode(groupname, GroupNode.class);
log.trace(groupname+" : "+accession);
if (group != null){
group.setGroupAccession(accession);
} else {
log.warn("Unable to find SCD group node "+groupname+" in submission "+submission);
}
}
//TODO try finally this
statement.close();
results.close();
//now assign and retrieve accessions for samples that do not have them
for (SampleNode sample : samples) {
if (sample.getSampleAccession() == null) {
name = sample.getNodeName().trim();
log.info("Assigning new accession for "+submission+" : "+name);
//insert it if not exists
start = System.currentTimeMillis();
statement = connect
.prepareStatement("INSERT INTO "
+ table
+ " (USER_ACCESSION, SUBMISSION_ACCESSION, DATE_ASSIGNED, IS_DELETED) VALUES ( ? , ? , SYSDATE, 0 )");
statement.setString(1, name);
statement.setString(2, submission);
log.trace(statement.toString());
statement.executeUpdate();
statement.close();
end = System.currentTimeMillis();
log.info("Time elapsed = "+(end-start)+"ms");
statement = connect.prepareStatement("SELECT ACCESSION FROM " + table
+ " WHERE USER_ACCESSION LIKE ? AND SUBMISSION_ACCESSION LIKE ? LIMIT 1");
statement.setString(1, name);
statement.setString(2, submission);
log.trace(statement.toString());
results = statement.executeQuery();
results.first();
accessionID = results.getInt(1);
accession = prefix + accessionID;
statement.close();
results.close();
log.debug("Assigning " + accession + " to " + name);
sample.setSampleAccession(accession);
}
}
Collection<GroupNode> groups = sampleIn.scd.getNodes(GroupNode.class);
log.debug("got " + groups.size() + " groups.");
for (GroupNode group : groups) {
if (group.getGroupAccession() == null) {
name = group.getNodeName();
statement = connect
.prepareStatement("INSERT INTO SAMPLE_GROUPS ( USER_ACCESSION , SUBMISSION_ACCESSION , DATE_ASSIGNED , IS_DELETED ) VALUES ( ? , ? , SYSDATE, 0 )");
statement.setString(1, name);
statement.setString(2, submission);
log.info(name);
log.info(submission);
statement.executeUpdate();
statement.close();
statement = connect
.prepareStatement("SELECT ACCESSION FROM SAMPLE_GROUPS WHERE USER_ACCESSION = ? AND SUBMISSION_ACCESSION = ?");
statement.setString(1, name);
statement.setString(2, submission);
log.trace(statement.toString());
results = statement.executeQuery();
results.first();
accessionID = results.getInt(1);
accession = "SAMEG" + accessionID;
statement.close();
results.close();
log.debug("Assigning " + accession + " to " + name);
group.setGroupAccession(accession);
}
}
} finally {
if (results != null){
try {
results.close();
} catch (Exception e) {
//do nothing
}
}
if (statement != null) {
try {
statement.close();
} catch (Exception e) {
//do nothing
}
}
if (connect != null) {
try {
connect.close();
} catch (Exception e) {
//do nothing
}
}
}
return sampleIn;
}
|
diff --git a/search/src/java/cz/incad/Kramerius/views/item/menu/ContextMenuItemsHolder.java b/search/src/java/cz/incad/Kramerius/views/item/menu/ContextMenuItemsHolder.java
index 2e8c99257..2cd1d9edd 100644
--- a/search/src/java/cz/incad/Kramerius/views/item/menu/ContextMenuItemsHolder.java
+++ b/search/src/java/cz/incad/Kramerius/views/item/menu/ContextMenuItemsHolder.java
@@ -1,95 +1,99 @@
/*
* Copyright (C) 2010 Pavel Stastny
*
* 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 cz.incad.Kramerius.views.item.menu;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import com.google.inject.Inject;
import com.google.inject.Provider;
import cz.incad.Kramerius.Initializable;
import cz.incad.Kramerius.views.AbstractViewObject;
import cz.incad.kramerius.security.SecuredActions;
import cz.incad.kramerius.security.User;
import cz.incad.kramerius.users.LoggedUsersSingleton;
import cz.incad.kramerius.utils.conf.KConfiguration;
/**
* Ctx menu holder
* @author pavels
*/
public class ContextMenuItemsHolder extends AbstractViewObject implements Initializable {
/* menu items*/
private List<ContextMenuItem> items = new ArrayList<ContextMenuItem>();
@Inject
LoggedUsersSingleton loggedUsersSingleton;
@Inject
KConfiguration kconfig;
@Inject
Provider<Locale> localesProvider;
@Override
public void init() {
String i18nServlet ="i18n";
items.add(new ContextMenuItem("administrator.menu.showmetadata", "", "viewMetadata", "", false));
items.add(new ContextMenuItem("administrator.menu.persistenturl", "", "persistentURL", "", true));
items.add(new ContextMenuItem("administrator.menu.generatepdf", "_data_x_role", "generatepdf", "", true));
items.add(new ContextMenuItem("administrator.menu.downloadOriginal", "_data_x_role", "downloadOriginalItem", "", true));
if (this.loggedUsersSingleton.isLoggedUser(this.requestProvider)) {
items.add(new ContextMenuItem("administrator.menu.print", "", "ctxPrint", "", true));
items.add(new ContextMenuItem("administrator.menu.reindex", "_data_x_role", "reindex", "", true));
items.add(new ContextMenuItem("administrator.menu.deletefromindex", "_data_x_role", "deletefromindex", "", true));
items.add(new ContextMenuItem("administrator.menu.deleteuuid", "_data_x_role", "deletePid", "", true));
items.add(new ContextMenuItem("administrator.menu.setpublic", "_data_x_role", "changeFlag.change", "", true));
items.add(new ContextMenuItem("administrator.menu.exportFOXML", "_data_x_role", "exportFOXML", "", true));
items.add(new ContextMenuItem("administrator.menu.exportcd", "_data_x_role", "exportToCD",
"'img','" + i18nServlet + "','" + localesProvider.get().getISO3Country() + "','" + localesProvider.get().getISO3Language() + "'", false));
items.add(new ContextMenuItem("administrator.menu.exportdvd", "_data_x_role", "exportToDVD",
"'img','" + i18nServlet + "','" + localesProvider.get().getISO3Country() + "','" + localesProvider.get().getISO3Language() + "'", false));
items.add(new ContextMenuItem("administrator.menu.generateDeepZoomTiles", "_data_x_role", "generateDeepZoomTiles", "", true));
items.add(new ContextMenuItem("administrator.menu.deleteGeneratedDeepZoomTiles", "_data_x_role", "deleteGeneratedDeepZoomTiles", "", true));
items.add(new ContextMenuItem("administrator.menu.showrights", "_data_x_role", "securedActionsTableForCtxMenu",
"'" + SecuredActions.READ.getFormalName() + "', '" + SecuredActions.ADMINISTRATE.getFormalName() + "'", true));
- items.add(new ContextMenuItem("administrator.menu.showstremrights", "_data_x_role", "securedStreamsTableForCtxMenu",
- "'" + SecuredActions.READ.getFormalName() + "', '" + SecuredActions.ADMINISTRATE.getFormalName() + "'", true));
+ java.util.logging.Logger tlogger = java.util.logging.Logger.getLogger(ContextMenuItemsHolder.class.getName());
+ tlogger.info("configuration .... ");
+ if (this.kconfig.getSecuredAditionalStreams() != null && this.kconfig.getSecuredAditionalStreams().length > 0) {
+ items.add(new ContextMenuItem("administrator.menu.showstremrights", "_data_x_role", "securedStreamsTableForCtxMenu",
+ "'" + SecuredActions.READ.getFormalName() + "', '" + SecuredActions.ADMINISTRATE.getFormalName() + "'", true));
+ }
items.add(new ContextMenuItem("administrator.menu.editor", "_data_x_role", "openEditor",
"'" + kconfig.getEditorURL() + "'", true));
}
}
public List<ContextMenuItem> getItems() {
return new ArrayList<ContextMenuItem>(this.items);
}
}
| true | true | public void init() {
String i18nServlet ="i18n";
items.add(new ContextMenuItem("administrator.menu.showmetadata", "", "viewMetadata", "", false));
items.add(new ContextMenuItem("administrator.menu.persistenturl", "", "persistentURL", "", true));
items.add(new ContextMenuItem("administrator.menu.generatepdf", "_data_x_role", "generatepdf", "", true));
items.add(new ContextMenuItem("administrator.menu.downloadOriginal", "_data_x_role", "downloadOriginalItem", "", true));
if (this.loggedUsersSingleton.isLoggedUser(this.requestProvider)) {
items.add(new ContextMenuItem("administrator.menu.print", "", "ctxPrint", "", true));
items.add(new ContextMenuItem("administrator.menu.reindex", "_data_x_role", "reindex", "", true));
items.add(new ContextMenuItem("administrator.menu.deletefromindex", "_data_x_role", "deletefromindex", "", true));
items.add(new ContextMenuItem("administrator.menu.deleteuuid", "_data_x_role", "deletePid", "", true));
items.add(new ContextMenuItem("administrator.menu.setpublic", "_data_x_role", "changeFlag.change", "", true));
items.add(new ContextMenuItem("administrator.menu.exportFOXML", "_data_x_role", "exportFOXML", "", true));
items.add(new ContextMenuItem("administrator.menu.exportcd", "_data_x_role", "exportToCD",
"'img','" + i18nServlet + "','" + localesProvider.get().getISO3Country() + "','" + localesProvider.get().getISO3Language() + "'", false));
items.add(new ContextMenuItem("administrator.menu.exportdvd", "_data_x_role", "exportToDVD",
"'img','" + i18nServlet + "','" + localesProvider.get().getISO3Country() + "','" + localesProvider.get().getISO3Language() + "'", false));
items.add(new ContextMenuItem("administrator.menu.generateDeepZoomTiles", "_data_x_role", "generateDeepZoomTiles", "", true));
items.add(new ContextMenuItem("administrator.menu.deleteGeneratedDeepZoomTiles", "_data_x_role", "deleteGeneratedDeepZoomTiles", "", true));
items.add(new ContextMenuItem("administrator.menu.showrights", "_data_x_role", "securedActionsTableForCtxMenu",
"'" + SecuredActions.READ.getFormalName() + "', '" + SecuredActions.ADMINISTRATE.getFormalName() + "'", true));
items.add(new ContextMenuItem("administrator.menu.showstremrights", "_data_x_role", "securedStreamsTableForCtxMenu",
"'" + SecuredActions.READ.getFormalName() + "', '" + SecuredActions.ADMINISTRATE.getFormalName() + "'", true));
items.add(new ContextMenuItem("administrator.menu.editor", "_data_x_role", "openEditor",
"'" + kconfig.getEditorURL() + "'", true));
}
}
| public void init() {
String i18nServlet ="i18n";
items.add(new ContextMenuItem("administrator.menu.showmetadata", "", "viewMetadata", "", false));
items.add(new ContextMenuItem("administrator.menu.persistenturl", "", "persistentURL", "", true));
items.add(new ContextMenuItem("administrator.menu.generatepdf", "_data_x_role", "generatepdf", "", true));
items.add(new ContextMenuItem("administrator.menu.downloadOriginal", "_data_x_role", "downloadOriginalItem", "", true));
if (this.loggedUsersSingleton.isLoggedUser(this.requestProvider)) {
items.add(new ContextMenuItem("administrator.menu.print", "", "ctxPrint", "", true));
items.add(new ContextMenuItem("administrator.menu.reindex", "_data_x_role", "reindex", "", true));
items.add(new ContextMenuItem("administrator.menu.deletefromindex", "_data_x_role", "deletefromindex", "", true));
items.add(new ContextMenuItem("administrator.menu.deleteuuid", "_data_x_role", "deletePid", "", true));
items.add(new ContextMenuItem("administrator.menu.setpublic", "_data_x_role", "changeFlag.change", "", true));
items.add(new ContextMenuItem("administrator.menu.exportFOXML", "_data_x_role", "exportFOXML", "", true));
items.add(new ContextMenuItem("administrator.menu.exportcd", "_data_x_role", "exportToCD",
"'img','" + i18nServlet + "','" + localesProvider.get().getISO3Country() + "','" + localesProvider.get().getISO3Language() + "'", false));
items.add(new ContextMenuItem("administrator.menu.exportdvd", "_data_x_role", "exportToDVD",
"'img','" + i18nServlet + "','" + localesProvider.get().getISO3Country() + "','" + localesProvider.get().getISO3Language() + "'", false));
items.add(new ContextMenuItem("administrator.menu.generateDeepZoomTiles", "_data_x_role", "generateDeepZoomTiles", "", true));
items.add(new ContextMenuItem("administrator.menu.deleteGeneratedDeepZoomTiles", "_data_x_role", "deleteGeneratedDeepZoomTiles", "", true));
items.add(new ContextMenuItem("administrator.menu.showrights", "_data_x_role", "securedActionsTableForCtxMenu",
"'" + SecuredActions.READ.getFormalName() + "', '" + SecuredActions.ADMINISTRATE.getFormalName() + "'", true));
java.util.logging.Logger tlogger = java.util.logging.Logger.getLogger(ContextMenuItemsHolder.class.getName());
tlogger.info("configuration .... ");
if (this.kconfig.getSecuredAditionalStreams() != null && this.kconfig.getSecuredAditionalStreams().length > 0) {
items.add(new ContextMenuItem("administrator.menu.showstremrights", "_data_x_role", "securedStreamsTableForCtxMenu",
"'" + SecuredActions.READ.getFormalName() + "', '" + SecuredActions.ADMINISTRATE.getFormalName() + "'", true));
}
items.add(new ContextMenuItem("administrator.menu.editor", "_data_x_role", "openEditor",
"'" + kconfig.getEditorURL() + "'", true));
}
}
|
diff --git a/announcement-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java b/announcement-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java
index b9ae1ef..7da3534 100644
--- a/announcement-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java
+++ b/announcement-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java
@@ -1,402 +1,406 @@
/**********************************************************************************
* $URL$
* $Id$
***********************************************************************************
*
* Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008 Sakai Foundation
*
* Licensed under the Educational Community 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.osedu.org/licenses/ECL-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.sakaiproject.announcement.impl;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.sakaiproject.announcement.api.AnnouncementChannel;
import org.sakaiproject.announcement.api.AnnouncementMessage;
import org.sakaiproject.announcement.api.AnnouncementMessageEdit;
import org.sakaiproject.announcement.api.AnnouncementMessageHeader;
import org.sakaiproject.announcement.api.AnnouncementService;
import org.sakaiproject.api.app.scheduler.ScheduledInvocationManager;
import org.sakaiproject.api.app.scheduler.ScheduledInvocationCommand;
import org.sakaiproject.authz.api.SecurityAdvisor;
import org.sakaiproject.authz.cover.SecurityService;
import org.sakaiproject.component.cover.ServerConfigurationService;
import org.sakaiproject.event.api.NotificationService;
import org.sakaiproject.event.api.NotificationEdit;
import org.sakaiproject.entity.api.Reference;
import org.sakaiproject.entity.api.ResourceProperties;
import org.sakaiproject.entity.api.ResourcePropertiesEdit;
import org.sakaiproject.entity.cover.EntityManager;
import org.sakaiproject.event.api.Event;
import org.sakaiproject.event.api.Notification;
import org.sakaiproject.event.api.NotificationAction;
import org.sakaiproject.event.cover.EventTrackingService;
import org.sakaiproject.exception.IdUnusedException;
import org.sakaiproject.exception.PermissionException;
import org.sakaiproject.site.api.Site;
import org.sakaiproject.site.cover.SiteService;
import org.sakaiproject.time.api.Time;
import org.sakaiproject.time.cover.TimeService;
import org.sakaiproject.util.EmailNotification;
import org.sakaiproject.util.FormattedText;
import org.sakaiproject.util.SiteEmailNotification;
import org.sakaiproject.util.StringUtil;
import org.sakaiproject.component.cover.ComponentManager;
import org.sakaiproject.util.ResourceLoader;
/**
* <p>
* SiteEmailNotificationAnnc fills the notification message and headers with details from the announcement message that triggered the notification event.
* </p>
*/
public class SiteEmailNotificationAnnc extends SiteEmailNotification
implements ScheduledInvocationCommand
{
private ResourceLoader rb = new ResourceLoader("siteemaanc");
/** Our logger. */
private static Log M_log = LogFactory.getLog(SiteEmailNotificationAnnc.class);
private ScheduledInvocationManager scheduledInvocationManager;
private ComponentManager componentManager;
/**
* Construct.
*/
public SiteEmailNotificationAnnc()
{
}
/**
* Construct.
*/
public SiteEmailNotificationAnnc(String siteId)
{
super(siteId);
}
/**
* Inject ScheudledInvocationManager
*/
public void setScheduledInvocationManager(
ScheduledInvocationManager service)
{
scheduledInvocationManager = service;
}
/**
* Inject ComponentManager
*/
public void setComponentManager(ComponentManager componentManager) {
this.componentManager = componentManager;
}
/**
* @inheritDoc
*/
protected String getResourceAbility()
{
return AnnouncementService.SECURE_ANNC_READ;
}
/**
* @inheritDoc
*/
public void notify(Notification notification, Event event)
{
// get the message
Reference ref = EntityManager.newReference(event.getResource());
AnnouncementMessageEdit msg = (AnnouncementMessageEdit) ref.getEntity();
AnnouncementMessageHeader hdr = (AnnouncementMessageHeader) msg.getAnnouncementHeader();
// do not do notification for hidden (draft) messages
if (hdr.getDraft()) return;
// Put here since if release date after now, do not notify
// since scheduled notification has been set.
Time now = TimeService.newTime();
if (now.after(hdr.getDate()))
{
super.notify(notification, event);
}
}
/**
* @inheritDoc
*/
protected String htmlContent(Event event)
{
StringBuilder buf = new StringBuilder();
String newline = "<br />\n";
// get the message
Reference ref = EntityManager.newReference(event.getResource());
AnnouncementMessage msg = (AnnouncementMessage) ref.getEntity();
AnnouncementMessageHeader hdr = (AnnouncementMessageHeader) msg.getAnnouncementHeader();
// use either the configured site, or if not configured, the site (context) of the resource
String siteId = (getSite() != null) ? getSite() : ref.getContext();
// get a site title
String title = siteId;
try
{
Site site = SiteService.getSite(siteId);
title = site.getTitle();
}
catch (Exception ignore)
{
}
// Now build up the message text.
buf.append(rb.getString("An_announcement_has_been"));
if (AnnouncementService.SECURE_ANNC_ADD.equals(event.getEvent()))
{
buf.append(" " + rb.getString("added"));
}
else
{
buf.append(" " + rb.getString("updated"));
}
buf.append(" " + rb.getString("in_the") + " \"");
buf.append(title);
buf.append("\" " + rb.getString("site_at"));
buf.append(" " + ServerConfigurationService.getString("ui.service", "Sakai"));
buf.append(" (<a href=\"");
buf.append(ServerConfigurationService.getPortalUrl());
+ buf.append("/site/");
+ buf.append(siteId);
buf.append("\">");
buf.append(ServerConfigurationService.getPortalUrl());
+ buf.append("/site/");
+ buf.append(siteId);
buf.append("</a>)");
buf.append(newline);
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("Subject") + ": ");
buf.append(hdr.getSubject());
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("From") + ": ");
buf.append(hdr.getFrom().getDisplayName());
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("Date") + ": ");
buf.append(hdr.getDate().toStringLocalFull());
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("Message") + ": ");
buf.append(newline);
buf.append(newline);
buf.append(msg.getBody());
buf.append(newline);
buf.append(newline);
// add any attachments
List attachments = hdr.getAttachments();
if (attachments.size() > 0)
{
buf.append(newline + rb.getString("Attachments") + newline);
for (Iterator iAttachments = attachments.iterator(); iAttachments.hasNext();)
{
Reference attachment = (Reference) iAttachments.next();
String attachmentTitle = attachment.getProperties().getPropertyFormatted(ResourceProperties.PROP_DISPLAY_NAME);
buf.append("<a href=\"" + attachment.getUrl() + "\">" + attachmentTitle + "</a>" + newline);
}
}
return buf.toString();
}
/**
* @inheritDoc
*/
protected List getHeaders(Event event)
{
List rv = super.getHeaders(event);
// Set the content type of the message body to HTML
// rv.add("Content-Type: text/html");
// set the subject
rv.add("Subject: " + getSubject(event));
// from
rv.add(getFrom(event));
// to
rv.add(getTo(event));
return rv;
}
/**
* @inheritDoc
*/
protected String getTag(String title, boolean shouldUseHtml)
{
if (shouldUseHtml) {
return ("<hr/><br/>" + rb.getString("this") + " "
+ ServerConfigurationService.getString("ui.service", "Sakai") + " (<a href=\""
+ ServerConfigurationService.getPortalUrl() + "\">" + ServerConfigurationService.getPortalUrl() + "</a>) "
+ rb.getString("forthe") + " " + title + " " + rb.getString("site") + "<br/>" + rb.getString("youcan") + "<br/>");
} else {
return (rb.getString("separator") + "\n" + rb.getString("this") + " "
+ ServerConfigurationService.getString("ui.service", "Sakai") + " (" + ServerConfigurationService.getPortalUrl()
+ ") " + rb.getString("forthe") + " " + title + " " + rb.getString("site") + "\n" + rb.getString("youcan")
+ "\n");
}
}
/**
* Format the announcement notification subject line.
*
* @param event
* The event that matched criteria to cause the notification.
* @return the announcement notification subject line.
*/
protected String getSubject(Event event)
{
// get the message
Reference ref = EntityManager.newReference(event.getResource());
AnnouncementMessage msg = (AnnouncementMessage) ref.getEntity();
AnnouncementMessageHeader hdr = (AnnouncementMessageHeader) msg.getAnnouncementHeader();
// use either the configured site, or if not configured, the site (context) of the resource
String siteId = (getSite() != null) ? getSite() : ref.getContext();
// get a site title
String title = siteId;
try
{
Site site = SiteService.getSite(siteId);
title = site.getTitle();
}
catch (Exception ignore)
{
}
// use the message's subject
return "[ " + title + " - " + rb.getString("Announcement") + " ] " + hdr.getSubject();
}
/**
* Add to the user list any other users who should be notified about this ref's change.
*
* @param users
* The user list, already populated based on site visit and resource ability.
* @param ref
* The entity reference.
*/
protected void addSpecialRecipients(List users, Reference ref)
{
// include any users who have AnnouncementService.SECURE_ALL_GROUPS and getResourceAbility() in the context
String contextRef = SiteService.siteReference(ref.getContext());
// get the list of users who have SECURE_ALL_GROUPS
List allGroupUsers = SecurityService.unlockUsers(AnnouncementService.SECURE_ANNC_ALL_GROUPS, contextRef);
// filter down by the permission
if (getResourceAbility() != null)
{
List allGroupUsers2 = SecurityService.unlockUsers(getResourceAbility(), contextRef);
allGroupUsers.retainAll(allGroupUsers2);
}
// remove any in the list already
allGroupUsers.removeAll(users);
// combine
users.addAll(allGroupUsers);
}
/**
* Implementation of command pattern. Will be called by ScheduledInvocationManager
* for delayed announcement notifications
*
* @param opaqueContext
* reference (context) for message
*/
public void execute(String opaqueContext)
{
// get the message
final Reference ref = EntityManager.newReference(opaqueContext);
// needed to access the message
enableSecurityAdvisor();
final AnnouncementMessage msg = (AnnouncementMessage) ref.getEntity();
final AnnouncementMessageHeader hdr = (AnnouncementMessageHeader) msg.getAnnouncementHeader();
// read the notification options
final String notification = msg.getProperties().getProperty("notificationLevel");
int noti = NotificationService.NOTI_OPTIONAL;
if ("r".equals(notification))
{
noti = NotificationService.NOTI_REQUIRED;
}
else if ("n".equals(notification))
{
noti = NotificationService.NOTI_NONE;
}
final Event delayedNotificationEvent = EventTrackingService.newEvent("annc.schInv.notify", msg.getReference(), true, noti);
// EventTrackingService.post(event);
final NotificationService notificationService = (NotificationService) ComponentManager.get(org.sakaiproject.event.api.NotificationService.class);
NotificationEdit notify = notificationService.addTransientNotification();
super.notify(notify, delayedNotificationEvent);
// since we build the notification by accessing the
// message within the super class, can't remove the
// SecurityAdvisor until this point
// done with access, need to remove from stack
SecurityService.clearAdvisors();
}
/**
* Establish a security advisor to allow the "embedded" azg work to occur
* with no need for additional security permissions.
*/
protected void enableSecurityAdvisor() {
// put in a security advisor so we can do our podcast work without need
// of further permissions
SecurityService.pushAdvisor(new SecurityAdvisor() {
public SecurityAdvice isAllowed(String userId, String function,
String reference) {
return SecurityAdvice.ALLOWED;
}
});
}
@Override
protected EmailNotification makeEmailNotification() {
return new SiteEmailNotificationAnnc();
}
@Override
protected String plainTextContent(Event event) {
String content = htmlContent(event);
content = FormattedText.convertFormattedTextToPlaintext(content);
return content;
}
}
| false | true | protected String htmlContent(Event event)
{
StringBuilder buf = new StringBuilder();
String newline = "<br />\n";
// get the message
Reference ref = EntityManager.newReference(event.getResource());
AnnouncementMessage msg = (AnnouncementMessage) ref.getEntity();
AnnouncementMessageHeader hdr = (AnnouncementMessageHeader) msg.getAnnouncementHeader();
// use either the configured site, or if not configured, the site (context) of the resource
String siteId = (getSite() != null) ? getSite() : ref.getContext();
// get a site title
String title = siteId;
try
{
Site site = SiteService.getSite(siteId);
title = site.getTitle();
}
catch (Exception ignore)
{
}
// Now build up the message text.
buf.append(rb.getString("An_announcement_has_been"));
if (AnnouncementService.SECURE_ANNC_ADD.equals(event.getEvent()))
{
buf.append(" " + rb.getString("added"));
}
else
{
buf.append(" " + rb.getString("updated"));
}
buf.append(" " + rb.getString("in_the") + " \"");
buf.append(title);
buf.append("\" " + rb.getString("site_at"));
buf.append(" " + ServerConfigurationService.getString("ui.service", "Sakai"));
buf.append(" (<a href=\"");
buf.append(ServerConfigurationService.getPortalUrl());
buf.append("\">");
buf.append(ServerConfigurationService.getPortalUrl());
buf.append("</a>)");
buf.append(newline);
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("Subject") + ": ");
buf.append(hdr.getSubject());
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("From") + ": ");
buf.append(hdr.getFrom().getDisplayName());
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("Date") + ": ");
buf.append(hdr.getDate().toStringLocalFull());
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("Message") + ": ");
buf.append(newline);
buf.append(newline);
buf.append(msg.getBody());
buf.append(newline);
buf.append(newline);
// add any attachments
List attachments = hdr.getAttachments();
if (attachments.size() > 0)
{
buf.append(newline + rb.getString("Attachments") + newline);
for (Iterator iAttachments = attachments.iterator(); iAttachments.hasNext();)
{
Reference attachment = (Reference) iAttachments.next();
String attachmentTitle = attachment.getProperties().getPropertyFormatted(ResourceProperties.PROP_DISPLAY_NAME);
buf.append("<a href=\"" + attachment.getUrl() + "\">" + attachmentTitle + "</a>" + newline);
}
}
return buf.toString();
}
| protected String htmlContent(Event event)
{
StringBuilder buf = new StringBuilder();
String newline = "<br />\n";
// get the message
Reference ref = EntityManager.newReference(event.getResource());
AnnouncementMessage msg = (AnnouncementMessage) ref.getEntity();
AnnouncementMessageHeader hdr = (AnnouncementMessageHeader) msg.getAnnouncementHeader();
// use either the configured site, or if not configured, the site (context) of the resource
String siteId = (getSite() != null) ? getSite() : ref.getContext();
// get a site title
String title = siteId;
try
{
Site site = SiteService.getSite(siteId);
title = site.getTitle();
}
catch (Exception ignore)
{
}
// Now build up the message text.
buf.append(rb.getString("An_announcement_has_been"));
if (AnnouncementService.SECURE_ANNC_ADD.equals(event.getEvent()))
{
buf.append(" " + rb.getString("added"));
}
else
{
buf.append(" " + rb.getString("updated"));
}
buf.append(" " + rb.getString("in_the") + " \"");
buf.append(title);
buf.append("\" " + rb.getString("site_at"));
buf.append(" " + ServerConfigurationService.getString("ui.service", "Sakai"));
buf.append(" (<a href=\"");
buf.append(ServerConfigurationService.getPortalUrl());
buf.append("/site/");
buf.append(siteId);
buf.append("\">");
buf.append(ServerConfigurationService.getPortalUrl());
buf.append("/site/");
buf.append(siteId);
buf.append("</a>)");
buf.append(newline);
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("Subject") + ": ");
buf.append(hdr.getSubject());
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("From") + ": ");
buf.append(hdr.getFrom().getDisplayName());
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("Date") + ": ");
buf.append(hdr.getDate().toStringLocalFull());
buf.append(newline);
buf.append(newline);
buf.append(rb.getString("Message") + ": ");
buf.append(newline);
buf.append(newline);
buf.append(msg.getBody());
buf.append(newline);
buf.append(newline);
// add any attachments
List attachments = hdr.getAttachments();
if (attachments.size() > 0)
{
buf.append(newline + rb.getString("Attachments") + newline);
for (Iterator iAttachments = attachments.iterator(); iAttachments.hasNext();)
{
Reference attachment = (Reference) iAttachments.next();
String attachmentTitle = attachment.getProperties().getPropertyFormatted(ResourceProperties.PROP_DISPLAY_NAME);
buf.append("<a href=\"" + attachment.getUrl() + "\">" + attachmentTitle + "</a>" + newline);
}
}
return buf.toString();
}
|
diff --git a/CASi/src/de/uniluebeck/imis/casi/ui/simplegui/InformationPanel.java b/CASi/src/de/uniluebeck/imis/casi/ui/simplegui/InformationPanel.java
index 9b10ffa..42218cc 100644
--- a/CASi/src/de/uniluebeck/imis/casi/ui/simplegui/InformationPanel.java
+++ b/CASi/src/de/uniluebeck/imis/casi/ui/simplegui/InformationPanel.java
@@ -1,449 +1,449 @@
/* CASi Context Awareness Simulation Software
* Copyright (C) 2012 2012 Moritz Buerger, Marvin Frick, Tobias Mende
*
* This program is free software. It is licensed under the
* GNU Lesser General Public License with one clarification.
*
* You should have received a copy of the
* GNU Lesser General Public License along with this program.
* See the LICENSE.txt file in this projects root folder or visit
* <http://www.gnu.org/licenses/lgpl.html> for more details.
*/
package de.uniluebeck.imis.casi.ui.simplegui;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.Vector;
import java.util.logging.Logger;
import javax.swing.BorderFactory;
import javax.swing.JComboBox;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import de.uniluebeck.imis.casi.simulation.engine.ISimulationClockListener;
import de.uniluebeck.imis.casi.simulation.engine.SimulationClock;
import de.uniluebeck.imis.casi.simulation.engine.SimulationEngine;
import de.uniluebeck.imis.casi.simulation.model.AbstractInteractionComponent;
import de.uniluebeck.imis.casi.simulation.model.Agent;
import de.uniluebeck.imis.casi.simulation.model.Door;
import de.uniluebeck.imis.casi.simulation.model.Room;
import de.uniluebeck.imis.casi.simulation.model.SimulationTime;
import de.uniluebeck.imis.casi.simulation.model.actionHandling.AbstractAction;
/**
* The InformationPanel is a JPanel. It allows to select an agent or interaction
* component of the simulation and shows further information of it.
*
* @author Moritz Bürger
*
*/
@SuppressWarnings("serial")
public class InformationPanel extends JPanel implements ActionListener,
ISimulationClockListener {
private static final Logger log = Logger.getLogger(InformationPanel.class
.getName());
private JComboBox selectComponentBox;
private JTextArea informationTextArea;
private JTextArea informationTextAreaRoom;
private ArrayList<Agent> agentList;
private ArrayList<AbstractInteractionComponent> interactionCompList;
private Room shownRoom;
// private ArrayList<Room> roomList;
/**
* The constructor sets layout and components.
*/
public InformationPanel() {
/** Set layout to FlowLayout */
this.setLayout(new BorderLayout());
/** Set the components */
this.setComponents();
/** Set preferred size */
this.setPreferredSize(new Dimension(250, 0));
}
/**
* Sets components of the information panel.
*/
private void setComponents() {
JPanel infoPanel = new JPanel();
infoPanel.setLayout(new GridLayout(0, 1));
informationTextArea = new JTextArea();
informationTextArea.setBorder(BorderFactory
.createTitledBorder("Information:"));
informationTextArea.setEditable(false);
JScrollPane scrollPane = new JScrollPane(informationTextArea);
informationTextAreaRoom = new JTextArea();
informationTextAreaRoom.setBorder(BorderFactory
.createTitledBorder("Room information:"));
informationTextAreaRoom.setEditable(false);
JScrollPane scrollPaneRoom = new JScrollPane(informationTextAreaRoom);
infoPanel.add(scrollPane);
infoPanel.add(scrollPaneRoom);
add(infoPanel, BorderLayout.CENTER);
}
/**
* This method sets the entries of the JComboBox.
*/
public void setInformationComboBox() {
try {
agentList = new ArrayList<Agent>();
for (Agent agent : SimulationEngine.getInstance().getWorld()
.getAgents()) {
agentList.add(agent);
}
interactionCompList = new ArrayList<AbstractInteractionComponent>();
for (AbstractInteractionComponent interactionComp : SimulationEngine
.getInstance().getWorld().getInteractionComponents()) {
interactionCompList.add(interactionComp);
}
// roomList = new ArrayList<Room>();
//
// for(Room room : SimulationEngine
// .getInstance().getWorld().getRooms()) {
//
// roomList.add(room);
// }
} catch (IllegalAccessException e) {
log.warning("Exception: " + e.toString());
}
selectComponentBox = new JComboBox(getVectorData());
selectComponentBox.setBorder(BorderFactory
.createTitledBorder("Select component:"));
selectComponentBox.addActionListener(this);
selectComponentBox.setRenderer(new ComboBoxRenderer());
/*
* see here:
* http://www.java2s.com/Code/Java/Swing-Components/BlockComboBoxExample
* .htm
*/
add(selectComponentBox, BorderLayout.NORTH);
/** Add the information panel as listener on the simulation clock */
SimulationClock.getInstance().addListener(this);
}
private Vector<String> getVectorData() {
Vector<String> data = new Vector<String>();
/** Add agent to vector */
for (Agent agent : agentList) {
data.addElement(agent.getName());
}
/** Add separator to vector */
data.addElement(ComboBoxRenderer.SEPERATOR);
/** Add interaction components to vector */
for (AbstractInteractionComponent interactionComp : interactionCompList) {
data.addElement(interactionComp.getIdentifier() + "::"
+ interactionComp.getType());
}
// /** Add separator to vector */
// data.addElement(ComboBoxRenderer.SEPERATOR);
//
// /** Add rooms to vector */
// for (Room room : roomList) {
//
// data.addElement(room.toString());
// }
return data;
}
/**
* Sets the room, that is shown.
*
* @param room
* thr room
*/
public void showRoomInformationOf(Room room) {
this.shownRoom = room;
setInformation();
}
@Override
public void actionPerformed(ActionEvent arg0) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
setInformation();
}
});
}
/**
* This method updates the information of the selected component.
*/
private void setInformation() {
int selectedIndex_A = this.selectComponentBox.getSelectedIndex();
int selectedIndex_I = selectedIndex_A - agentList.size() - 1;
// if the selected index is an agent
if (selectedIndex_I < -1) {
String newInfo = getAgentInformation(agentList.get(selectedIndex_A));
if (!informationTextArea.getText().equals(newInfo)) {
informationTextArea.setText(newInfo);
}
// if the selected index is an interaction component
} else if (selectedIndex_I > -1) {
String newInfo = getInteractionComponentInformation(interactionCompList
.get(selectedIndex_I));
if (!informationTextArea.getText().equals(newInfo)) {
informationTextArea.setText(newInfo);
}
// if the separator is selected
} else {
// do nothing
}
if (shownRoom != null) {
String newInfo = getRoomInformation(shownRoom);
if (!informationTextAreaRoom.getText().equals(newInfo)) {
informationTextAreaRoom.setText(newInfo);
}
}
}
/**
* This method returns the information of an agent as String.
*
* @param agent
* the agent
* @return the information
*/
private String getAgentInformation(Agent agent) {
String info;
if (agent.getCurrentAction() != null) {
info = "Name: " + agent.getName() + "\n" + "Indentifier: "
+ agent.getIdentifier() + "\n" + "Status: "
+ agent.getState() + "\n" + "Current action: \n"
+ " - Name: "
+ agent.getCurrentAction().getClass().getSimpleName()
+ "\n" + " - Type: " + agent.getCurrentAction().getType()
+ "\n" + " - State: "
+ agent.getCurrentAction().getState() + "\n"
+ " - Description: "
+ agent.getCurrentAction().getInformationDescription()
+ "\n" + " - Duration: "
+ agent.getCurrentAction().getDuration() + " minutes\n"
+ "Current position: " + agent.getCurrentPosition() + "\n";
info = info + "Action pool:\n";
for (AbstractAction abstractAction : agent.getActionPoolCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
info = info + "Todo list:\n";
for (AbstractAction abstractAction : agent.getTodoListCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
} else {
info = "Name: " + agent.getName() + "\n" + "Indentifier: "
+ agent.getIdentifier() + "\n" + "Status: "
+ agent.getState() + "\n" + "Current action: ---\n"
- + "Current position: " + agent.getCurrentPosition();
+ + "Current position: " + agent.getCurrentPosition() + "\n";
info = info + "Action pool:\n";
for (AbstractAction abstractAction : agent.getActionPoolCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
info = info + "Todo list:\n";
for (AbstractAction abstractAction : agent.getTodoListCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
}
return info;
}
/**
* This method returns the information of an interaction component as
* String.
*
* @param interactionComp
* the interaction component
* @return the information
*/
private String getInteractionComponentInformation(
AbstractInteractionComponent interactionComp) {
String info;
info = "Indentifier: " + interactionComp.getIdentifier() + "\n"
+ "Type: " + interactionComp.getType() + "\n" + "Position: "
+ interactionComp.getCurrentPosition() + "\n" + "Wearable: "
+ interactionComp.isWearable() + "\n" + "Agent: "
+ interactionComp.getAgent() + "\n" + "Current value: "
+ interactionComp.getHumanReadableValue();
return info;
}
private String getRoomInformation(Room room) {
String info;
info = "Identifier: " + room.getIdentifier() + "\n"
+ "Number of doors: " + room.getDoors().size() + "\n";
int index = 1;
for (Door door : room.getDoors()) {
info = info + " " + index + ". Door: \n" + " Identifier: "
+ door.getIdentifier() + "\n" + " State: "
+ door.getState() + "\n";
index++;
}
return info;
}
/**
* This method sets the given agent as selected, if it is in the list.
*
* @param agent
* the agent
*/
public void setSelectedAgent(Agent agent) {
/* get index of agent in list */
int index = agentList.indexOf(agent);
/* set index of combobox */
if (index != -1) {
selectComponentBox.setSelectedIndex(index);
}
}
/**
* This method sets the given interaction component as selected, if it is in
* the list.
*
* @param interactionComp
* the interaction component
*/
public void setSelectedInteractionComponent(
AbstractInteractionComponent interactionComp) {
/* get index of interaction component in list */
int index = interactionCompList.indexOf(interactionComp);
/* set index of combobox */
if (index != -1) {
selectComponentBox.setSelectedIndex(agentList.size() + 1 + index);
}
}
/**
* Sets information new, if time changed.
*/
@Override
public void timeChanged(SimulationTime newTime) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
setInformation();
}
});
}
@Override
public void simulationPaused(boolean pause) {
}
@Override
public void simulationStopped() {
}
@Override
public void simulationStarted() {
}
}
| true | true | private String getAgentInformation(Agent agent) {
String info;
if (agent.getCurrentAction() != null) {
info = "Name: " + agent.getName() + "\n" + "Indentifier: "
+ agent.getIdentifier() + "\n" + "Status: "
+ agent.getState() + "\n" + "Current action: \n"
+ " - Name: "
+ agent.getCurrentAction().getClass().getSimpleName()
+ "\n" + " - Type: " + agent.getCurrentAction().getType()
+ "\n" + " - State: "
+ agent.getCurrentAction().getState() + "\n"
+ " - Description: "
+ agent.getCurrentAction().getInformationDescription()
+ "\n" + " - Duration: "
+ agent.getCurrentAction().getDuration() + " minutes\n"
+ "Current position: " + agent.getCurrentPosition() + "\n";
info = info + "Action pool:\n";
for (AbstractAction abstractAction : agent.getActionPoolCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
info = info + "Todo list:\n";
for (AbstractAction abstractAction : agent.getTodoListCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
} else {
info = "Name: " + agent.getName() + "\n" + "Indentifier: "
+ agent.getIdentifier() + "\n" + "Status: "
+ agent.getState() + "\n" + "Current action: ---\n"
+ "Current position: " + agent.getCurrentPosition();
info = info + "Action pool:\n";
for (AbstractAction abstractAction : agent.getActionPoolCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
info = info + "Todo list:\n";
for (AbstractAction abstractAction : agent.getTodoListCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
}
return info;
}
| private String getAgentInformation(Agent agent) {
String info;
if (agent.getCurrentAction() != null) {
info = "Name: " + agent.getName() + "\n" + "Indentifier: "
+ agent.getIdentifier() + "\n" + "Status: "
+ agent.getState() + "\n" + "Current action: \n"
+ " - Name: "
+ agent.getCurrentAction().getClass().getSimpleName()
+ "\n" + " - Type: " + agent.getCurrentAction().getType()
+ "\n" + " - State: "
+ agent.getCurrentAction().getState() + "\n"
+ " - Description: "
+ agent.getCurrentAction().getInformationDescription()
+ "\n" + " - Duration: "
+ agent.getCurrentAction().getDuration() + " minutes\n"
+ "Current position: " + agent.getCurrentPosition() + "\n";
info = info + "Action pool:\n";
for (AbstractAction abstractAction : agent.getActionPoolCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
info = info + "Todo list:\n";
for (AbstractAction abstractAction : agent.getTodoListCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
} else {
info = "Name: " + agent.getName() + "\n" + "Indentifier: "
+ agent.getIdentifier() + "\n" + "Status: "
+ agent.getState() + "\n" + "Current action: ---\n"
+ "Current position: " + agent.getCurrentPosition() + "\n";
info = info + "Action pool:\n";
for (AbstractAction abstractAction : agent.getActionPoolCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
info = info + "Todo list:\n";
for (AbstractAction abstractAction : agent.getTodoListCopy()) {
info = info + " " + abstractAction.getInformationDescription()
+ "\n";
}
}
return info;
}
|
diff --git a/src/org/pentaho/pac/server/datasources/DataSourceMgmtService.java b/src/org/pentaho/pac/server/datasources/DataSourceMgmtService.java
index 174b9b3..0abe4cf 100644
--- a/src/org/pentaho/pac/server/datasources/DataSourceMgmtService.java
+++ b/src/org/pentaho/pac/server/datasources/DataSourceMgmtService.java
@@ -1,85 +1,85 @@
package org.pentaho.pac.server.datasources;
import java.util.List;
import org.pentaho.pac.common.PentahoSecurityException;
import org.pentaho.pac.common.datasources.DuplicateDataSourceException;
import org.pentaho.pac.common.datasources.IPentahoDataSource;
import org.pentaho.pac.common.datasources.NonExistingDataSourceException;
import org.pentaho.pac.server.common.DAOException;
import org.pentaho.pac.server.common.DAOFactory;
public class DataSourceMgmtService implements IDataSourceMgmtService {
IDataSourceDAO dataSourceDAO = null;
public DataSourceMgmtService() {
dataSourceDAO = DAOFactory.getDataSourceDAO();
}
public void createDataSource(IPentahoDataSource newDataSource) throws DuplicateDataSourceException, DAOException, PentahoSecurityException {
if (hasCreateDataSourcePerm(newDataSource)) {
dataSourceDAO.createDataSource(newDataSource);
} else {
throw new PentahoSecurityException();
}
}
public void deleteDataSource(String jndiName) throws NonExistingDataSourceException, DAOException, PentahoSecurityException {
IPentahoDataSource dataSource = dataSourceDAO.getDataSource(jndiName);
- if (jndiName != null) {
- deleteDataSource(jndiName);
+ if (dataSource != null) {
+ deleteDataSource(dataSource);
} else {
throw new NonExistingDataSourceException(jndiName);
}
}
public void deleteDataSource(IPentahoDataSource dataSource) throws NonExistingDataSourceException, DAOException, PentahoSecurityException {
if (hasDeleteDataSourcePerm(dataSource)) {
dataSourceDAO.deleteDataSource(dataSource);
} else {
throw new PentahoSecurityException();
}
}
public IPentahoDataSource getDataSource(String jndiName) throws DAOException {
return dataSourceDAO.getDataSource(jndiName);
}
public List<IPentahoDataSource> getDataSources() throws DAOException {
return dataSourceDAO.getDataSources();
}
public void updateDataSource(IPentahoDataSource dataSource) throws DAOException, PentahoSecurityException, NonExistingDataSourceException {
if (hasUpdateDataSourcePerm(dataSource)) {
dataSourceDAO.updateDataSource(dataSource);
} else {
throw new PentahoSecurityException();
}
}
public void beginTransaction() throws DAOException {
dataSourceDAO.beginTransaction();
}
public void commitTransaction() throws DAOException {
dataSourceDAO.commitTransaction();
}
public void rollbackTransaction() throws DAOException {
dataSourceDAO.rollbackTransaction();
}
public void closeSession() {
dataSourceDAO.closeSession();
}
protected boolean hasCreateDataSourcePerm(IPentahoDataSource dataSource) {
return true;
}
protected boolean hasUpdateDataSourcePerm(IPentahoDataSource dataSource) {
return true;
}
protected boolean hasDeleteDataSourcePerm(IPentahoDataSource dataSource) {
return true;
}
}
| true | true | public void deleteDataSource(String jndiName) throws NonExistingDataSourceException, DAOException, PentahoSecurityException {
IPentahoDataSource dataSource = dataSourceDAO.getDataSource(jndiName);
if (jndiName != null) {
deleteDataSource(jndiName);
} else {
throw new NonExistingDataSourceException(jndiName);
}
}
| public void deleteDataSource(String jndiName) throws NonExistingDataSourceException, DAOException, PentahoSecurityException {
IPentahoDataSource dataSource = dataSourceDAO.getDataSource(jndiName);
if (dataSource != null) {
deleteDataSource(dataSource);
} else {
throw new NonExistingDataSourceException(jndiName);
}
}
|
diff --git a/src/frontend/org/voltdb/planner/PlanAssembler.java b/src/frontend/org/voltdb/planner/PlanAssembler.java
index 543f33470..4794fcd1a 100644
--- a/src/frontend/org/voltdb/planner/PlanAssembler.java
+++ b/src/frontend/org/voltdb/planner/PlanAssembler.java
@@ -1,1469 +1,1469 @@
/* This file is part of VoltDB.
* Copyright (C) 2008-2012 VoltDB Inc.
*
* VoltDB 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.
*
* VoltDB 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 VoltDB. If not, see <http://www.gnu.org/licenses/>.
*/
package org.voltdb.planner;
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.Stack;
import org.voltdb.VoltType;
import org.voltdb.catalog.CatalogMap;
import org.voltdb.catalog.Cluster;
import org.voltdb.catalog.Column;
import org.voltdb.catalog.ColumnRef;
import org.voltdb.catalog.Connector;
import org.voltdb.catalog.ConnectorTableInfo;
import org.voltdb.catalog.Database;
import org.voltdb.catalog.Index;
import org.voltdb.catalog.Table;
import org.voltdb.expressions.AbstractExpression;
import org.voltdb.expressions.AggregateExpression;
import org.voltdb.expressions.ConstantValueExpression;
import org.voltdb.expressions.ExpressionUtil;
import org.voltdb.expressions.OperatorExpression;
import org.voltdb.expressions.TupleAddressExpression;
import org.voltdb.expressions.TupleValueExpression;
import org.voltdb.planner.ParsedSelectStmt.ParsedColInfo;
import org.voltdb.plannodes.AbstractPlanNode;
import org.voltdb.plannodes.AbstractScanPlanNode;
import org.voltdb.plannodes.AggregatePlanNode;
import org.voltdb.plannodes.DeletePlanNode;
import org.voltdb.plannodes.DistinctPlanNode;
import org.voltdb.plannodes.HashAggregatePlanNode;
import org.voltdb.plannodes.IndexScanPlanNode;
import org.voltdb.plannodes.InsertPlanNode;
import org.voltdb.plannodes.LimitPlanNode;
import org.voltdb.plannodes.MaterializePlanNode;
import org.voltdb.plannodes.NodeSchema;
import org.voltdb.plannodes.OrderByPlanNode;
import org.voltdb.plannodes.ProjectionPlanNode;
import org.voltdb.plannodes.ReceivePlanNode;
import org.voltdb.plannodes.SchemaColumn;
import org.voltdb.plannodes.SendPlanNode;
import org.voltdb.plannodes.SeqScanPlanNode;
import org.voltdb.plannodes.UpdatePlanNode;
import org.voltdb.types.ExpressionType;
import org.voltdb.types.PlanNodeType;
import org.voltdb.types.SortDirectionType;
import org.voltdb.utils.CatalogUtil;
/**
* The query planner accepts catalog data, SQL statements from the catalog, then
* outputs a set of complete and correct query plans. It will output MANY plans
* and some of them will be stupid. The best plan will be selected by computing
* resource usage statistics for the plans, then using those statistics to
* compute the cost of a specific plan. The plan with the lowest cost wins.
*
*/
public class PlanAssembler {
/** convenience pointer to the cluster object in the catalog */
final Cluster m_catalogCluster;
/** convenience pointer to the database object in the catalog */
final Database m_catalogDb;
/** parsed statement for an insert */
ParsedInsertStmt m_parsedInsert = null;
/** parsed statement for an update */
ParsedUpdateStmt m_parsedUpdate = null;
/** parsed statement for an delete */
ParsedDeleteStmt m_parsedDelete = null;
/** parsed statement for an select */
ParsedSelectStmt m_parsedSelect = null;
/** does the statement touch more than one partition? */
final boolean m_singlePartition;
/** The number of partitions (fetched from the cluster info) */
final int m_partitionCount;
/**
* Used to generate the table-touching parts of a plan. All join-order and
* access path selection stuff is done by the SelectSubPlanAssember.
*/
SubPlanAssembler subAssembler = null;
/**
* Counter for the number of plans generated to date for a single statement.
*/
boolean m_insertPlanWasGenerated = false;
/**
* Whenever a parameter has its type changed during compilation, the new type is stored
* here, indexed by parameter index.
*/
Map<Integer, VoltType> m_paramTypeOverrideMap = new HashMap<Integer, VoltType>();
/**
*
* @param catalogCluster
* Catalog info about the physical layout of the cluster.
* @param catalogDb
* Catalog info about schema, metadata and procedures.
*/
PlanAssembler(Cluster catalogCluster, Database catalogDb, boolean singlePartition) {
m_catalogCluster = catalogCluster;
m_catalogDb = catalogDb;
m_partitionCount = m_catalogCluster.getPartitions().size();
m_singlePartition = singlePartition;
}
String getSQLText() {
if (m_parsedDelete != null) {
return m_parsedDelete.sql;
}
else if (m_parsedInsert != null) {
return m_parsedInsert.sql;
}
else if (m_parsedUpdate != null) {
return m_parsedUpdate.sql;
}
else if (m_parsedSelect != null) {
return m_parsedSelect.sql;
}
assert(false);
return null;
}
/**
* Return true if tableList includes at least one matview.
*/
private boolean tableListIncludesView(List<Table> tableList) {
for (Table table : tableList) {
if (table.getMaterializer() != null) {
return true;
}
}
return false;
}
/**
* Return true if tableList includes at least one export table.
*/
private boolean tableListIncludesExportOnly(List<Table> tableList) {
// the single well-known connector
Connector connector = m_catalogDb.getConnectors().get("0");
// no export tables with out a connector
if (connector == null) {
return false;
}
CatalogMap<ConnectorTableInfo> tableinfo = connector.getTableinfo();
// this loop is O(number-of-joins * number-of-export-tables)
// which seems acceptable if not great. Probably faster than
// re-hashing the export only tables for faster lookup.
for (Table table : tableList) {
for (ConnectorTableInfo ti : tableinfo) {
if (ti.getAppendonly() &&
ti.getTable().getTypeName().equalsIgnoreCase(table.getTypeName()))
{
return true;
}
}
}
return false;
}
/**
* Clear any old state and get ready to plan a new plan. The next call to
* getNextPlan() will return the first candidate plan for these parameters.
*
* @param xmlSQL
* The parsed/analyzed SQL in XML form from HSQLDB to be planned.
* @param readOnly
* Is the SQL statement read only.
* @param singlePartition
* Does the SQL statement use only a single partition?
*/
void setupForNewPlans(AbstractParsedStmt parsedStmt)
{
if (parsedStmt instanceof ParsedSelectStmt) {
if (tableListIncludesExportOnly(parsedStmt.tableList)) {
throw new RuntimeException(
"Illegal to read an export table.");
}
m_parsedSelect = (ParsedSelectStmt) parsedStmt;
subAssembler =
new SelectSubPlanAssembler(m_catalogDb,
parsedStmt, m_singlePartition,
m_partitionCount);
} else {
// check that no modification happens to views
if (tableListIncludesView(parsedStmt.tableList)) {
throw new RuntimeException(
"Illegal to modify a materialized view.");
}
if (parsedStmt instanceof ParsedInsertStmt) {
m_parsedInsert = (ParsedInsertStmt) parsedStmt;
} else if (parsedStmt instanceof ParsedUpdateStmt) {
if (tableListIncludesExportOnly(parsedStmt.tableList)) {
throw new RuntimeException(
"Illegal to update an export table.");
}
m_parsedUpdate = (ParsedUpdateStmt) parsedStmt;
subAssembler =
new WriterSubPlanAssembler(m_catalogDb, parsedStmt, m_singlePartition, m_partitionCount);
} else if (parsedStmt instanceof ParsedDeleteStmt) {
if (tableListIncludesExportOnly(parsedStmt.tableList)) {
throw new RuntimeException(
"Illegal to delete from an export table.");
}
m_parsedDelete = (ParsedDeleteStmt) parsedStmt;
subAssembler =
new WriterSubPlanAssembler(m_catalogDb, parsedStmt, m_singlePartition, m_partitionCount);
} else
throw new RuntimeException(
"Unknown subclass of AbstractParsedStmt.");
}
}
/**
* Generate a unique and correct plan for the current SQL statement context.
* This method gets called repeatedly until it returns null, meaning there
* are no more plans.
*
* @return A not-previously returned query plan or null if no more
* computable plans.
*/
CompiledPlan getNextPlan() {
// reset the plan column guids and pool
//PlanColumn.resetAll();
CompiledPlan retval = new CompiledPlan();
CompiledPlan.Fragment fragment = new CompiledPlan.Fragment();
retval.fragments.add(fragment);
AbstractParsedStmt nextStmt = null;
if (m_parsedSelect != null) {
nextStmt = m_parsedSelect;
fragment.planGraph = getNextSelectPlan();
if (fragment.planGraph != null)
{
// only add the output columns if we actually have a plan
// avoid PlanColumn resource leakage
addColumns(retval, m_parsedSelect);
}
} else {
if (m_parsedInsert != null) {
nextStmt = m_parsedInsert;
fragment.planGraph = getNextInsertPlan();
} else if (m_parsedUpdate != null) {
nextStmt = m_parsedUpdate;
fragment.planGraph = getNextUpdatePlan();
// note that for replicated tables, multi-fragment plans
// need to divide the result by the number of partitions
} else if (m_parsedDelete != null) {
nextStmt = m_parsedDelete;
fragment.planGraph = getNextDeletePlan();
// note that for replicated tables, multi-fragment plans
// need to divide the result by the number of partitions
} else {
throw new RuntimeException(
"setupForNewPlans not called or not successfull.");
}
assert (nextStmt.tableList.size() == 1);
if (nextStmt.tableList.get(0).getIsreplicated())
retval.replicatedTableDML = true;
}
if (fragment.planGraph == null)
{
return null;
}
assert (nextStmt != null);
addParameters(retval, nextStmt);
retval.fullWhereClause = nextStmt.where;
retval.fullWinnerPlan = fragment.planGraph;
// Do a final generateOutputSchema pass.
fragment.planGraph.generateOutputSchema(m_catalogDb);
return retval;
}
private void addColumns(CompiledPlan plan, ParsedSelectStmt stmt) {
NodeSchema output_schema = plan.fragments.get(0).planGraph.getOutputSchema();
// Sanity-check the output NodeSchema columns against the display columns
if (stmt.displayColumns.size() != output_schema.size())
{
throw new PlanningErrorException("Mismatched plan output cols " +
"to parsed display columns");
}
for (ParsedColInfo display_col : stmt.displayColumns)
{
SchemaColumn col = output_schema.find(display_col.tableName,
display_col.columnName,
display_col.alias);
if (col == null)
{
throw new PlanningErrorException("Mismatched plan output cols " +
"to parsed display columns");
}
}
plan.columns = output_schema;
}
private void addParameters(CompiledPlan plan, AbstractParsedStmt stmt) {
ParameterInfo outParam = null;
for (ParameterInfo param : stmt.paramList) {
outParam = new ParameterInfo();
outParam.index = param.index;
VoltType override = m_paramTypeOverrideMap.get(param.index);
if (override != null) {
outParam.type = override;
}
else {
outParam.type = param.type;
}
plan.parameters.add(outParam);
}
}
private AbstractPlanNode getNextSelectPlan() {
assert (subAssembler != null);
AbstractPlanNode subSelectRoot = subAssembler.nextPlan();
if (subSelectRoot == null)
return null;
AbstractPlanNode root = subSelectRoot;
/*
* Establish the output columns for the sub select plan.
*/
root.generateOutputSchema(m_catalogDb);
root = handleAggregationOperators(root);
if ((subSelectRoot.getPlanNodeType() != PlanNodeType.INDEXSCAN ||
((IndexScanPlanNode) subSelectRoot).getSortDirection() == SortDirectionType.INVALID) &&
m_parsedSelect.orderColumns.size() > 0) {
root = addOrderBy(root);
}
if ((root.getPlanNodeType() != PlanNodeType.AGGREGATE) &&
(root.getPlanNodeType() != PlanNodeType.HASHAGGREGATE) &&
(root.getPlanNodeType() != PlanNodeType.DISTINCT) &&
(root.getPlanNodeType() != PlanNodeType.PROJECTION)) {
root = addProjection(root);
}
if (m_parsedSelect.hasLimitOrOffset())
{
root = handleLimitOperator(root);
}
SendPlanNode sendNode = new SendPlanNode();
// connect the nodes to build the graph
sendNode.addAndLinkChild(root);
sendNode.generateOutputSchema(m_catalogDb);
return sendNode;
}
private AbstractPlanNode getNextDeletePlan() {
assert (subAssembler != null);
// figure out which table we're deleting from
assert (m_parsedDelete.tableList.size() == 1);
Table targetTable = m_parsedDelete.tableList.get(0);
// this is never going to go well
if (m_singlePartition && (targetTable.getIsreplicated())) {
String msg =
"Trying to delete from replicated table '"
+ targetTable.getTypeName() + "'";
msg += " in a single-partition procedure.";
throw new PlanningErrorException(msg);
}
AbstractPlanNode subSelectRoot = subAssembler.nextPlan();
if (subSelectRoot == null)
return null;
// generate the delete node with the right target table
DeletePlanNode deleteNode = new DeletePlanNode();
deleteNode.setTargetTableName(targetTable.getTypeName());
ProjectionPlanNode projectionNode = new ProjectionPlanNode();
AbstractExpression addressExpr = new TupleAddressExpression();
NodeSchema proj_schema = new NodeSchema();
// This planner-created column is magic.
proj_schema.addColumn(new SchemaColumn("VOLT_TEMP_TABLE",
"tuple_address",
"tuple_address",
addressExpr));
projectionNode.setOutputSchema(proj_schema);
if (m_singlePartition == true) {
assert(subSelectRoot instanceof AbstractScanPlanNode);
// if the scan below matches all nodes, we can throw away the scan
// nodes and use a truncate delete node
if ((subSelectRoot instanceof SeqScanPlanNode)
&& (((AbstractScanPlanNode) subSelectRoot).getPredicate() == null)) {
deleteNode.setTruncate(true);
return deleteNode;
}
// OPTIMIZATION: Projection Inline
// If the root node we got back from createSelectTree() is an
// AbstractScanNode, then
// we put the Projection node we just created inside of it
// When we inline this projection into the scan, we're going
// to overwrite any original projection that we might have inlined
// in order to simply cull the columns from the persistent table.
// The call here to generateOutputSchema() will recurse down to
// the scan node and cause it to update appropriately.
subSelectRoot.addInlinePlanNode(projectionNode);
// connect the nodes to build the graph
deleteNode.addAndLinkChild(subSelectRoot);
deleteNode.generateOutputSchema(m_catalogDb);
return deleteNode;
} else {
// make sure the thing we have is a receive node which
// indicates it's a multi-site plan
assert (subSelectRoot instanceof ReceivePlanNode);
// put the delete node in the right place
// get the recv node
ReceivePlanNode recvNode = (ReceivePlanNode) subSelectRoot;
// get the send node
assert (recvNode.getChildCount() == 1);
AbstractPlanNode sendNode = recvNode.getChild(0);
// get the scan node and unlink
assert (sendNode.getChildCount() == 1);
AbstractPlanNode scanNode = sendNode.getChild(0);
sendNode.unlinkChild(scanNode);
// link in the delete node
assert (scanNode instanceof AbstractScanPlanNode);
scanNode.addInlinePlanNode(projectionNode);
deleteNode.addAndLinkChild(scanNode);
deleteNode.generateOutputSchema(m_catalogDb);
sendNode.addAndLinkChild(deleteNode);
sendNode.generateOutputSchema(m_catalogDb);
// fix the receive node's output columns
recvNode.generateOutputSchema(m_catalogDb);
// add a sum and send on top of the union
return addSumAndSendToDMLNode(subSelectRoot);
}
}
private AbstractPlanNode getNextUpdatePlan() {
assert (subAssembler != null);
// figure out which table we're updating
assert (m_parsedUpdate.tableList.size() == 1);
Table targetTable = m_parsedUpdate.tableList.get(0);
// this is never going to go well
if (m_singlePartition && (targetTable.getIsreplicated())) {
String msg =
"Trying to update replicated table '" + targetTable.getTypeName()
+ "'";
msg += " in a single-partition procedure.";
throw new PlanningErrorException(msg);
}
AbstractPlanNode subSelectRoot = subAssembler.nextPlan();
if (subSelectRoot == null)
return null;
UpdatePlanNode updateNode = new UpdatePlanNode();
updateNode.setTargetTableName(targetTable.getTypeName());
// set this to false until proven otherwise
updateNode.setUpdateIndexes(false);
ProjectionPlanNode projectionNode = new ProjectionPlanNode();
TupleAddressExpression tae = new TupleAddressExpression();
NodeSchema proj_schema = new NodeSchema();
// This planner-generated column is magic.
proj_schema.addColumn(new SchemaColumn("VOLT_TEMP_TABLE",
"tuple_address",
"tuple_address",
tae));
// get the set of columns affected by indexes
Set<String> affectedColumns = getIndexedColumnSetForTable(targetTable);
// add the output columns we need to the projection
//
// Right now, the EE is going to use the original column names
// and compare these to the persistent table column names in the
// update executor in order to figure out which table columns get
// updated. We'll associate the actual values with VOLT_TEMP_TABLE
// to avoid any false schema/column matches with the actual table.
for (Entry<Column, AbstractExpression> col : m_parsedUpdate.columns.entrySet()) {
// make the literal type we're going to insert match the column type
AbstractExpression castedExpr = null;
try {
castedExpr = (AbstractExpression) col.getValue().clone();
ExpressionUtil.setOutputTypeForInsertExpression(
castedExpr, VoltType.get((byte) col.getKey().getType()), col.getKey().getSize(), m_paramTypeOverrideMap);
} catch (Exception e) {
throw new PlanningErrorException(e.getMessage());
}
proj_schema.addColumn(new SchemaColumn("VOLT_TEMP_TABLE",
col.getKey().getTypeName(),
col.getKey().getTypeName(),
castedExpr));
// check if this column is an indexed column
if (affectedColumns.contains(col.getKey().getTypeName()))
{
updateNode.setUpdateIndexes(true);
}
}
projectionNode.setOutputSchema(proj_schema);
if (m_singlePartition == true) {
// add the projection inline (TODO: this will break if more than one
// layer is below this)
//
// When we inline this projection into the scan, we're going
// to overwrite any original projection that we might have inlined
// in order to simply cull the columns from the persistent table.
// The call here to generateOutputSchema() will recurse down to
// the scan node and cause it to update appropriately.
assert(subSelectRoot instanceof AbstractScanPlanNode);
subSelectRoot.addInlinePlanNode(projectionNode);
// connect the nodes to build the graph
updateNode.addAndLinkChild(subSelectRoot);
updateNode.generateOutputSchema(m_catalogDb);
return updateNode;
} else {
// make sure the thing we have is a receive node which
// indicates it's a multi-site plan
assert (subSelectRoot instanceof ReceivePlanNode);
// put the update node in the right place
// get the recv node
ReceivePlanNode recvNode = (ReceivePlanNode) subSelectRoot;
// get the send node
assert (recvNode.getChildCount() == 1);
AbstractPlanNode sendNode = recvNode.getChild(0);
// get the scan node and unlink
assert (sendNode.getChildCount() == 1);
AbstractPlanNode scanNode = sendNode.getChild(0);
sendNode.unlinkChild(scanNode);
// link in the update node
assert (scanNode instanceof AbstractScanPlanNode);
scanNode.addInlinePlanNode(projectionNode);
updateNode.addAndLinkChild(scanNode);
updateNode.generateOutputSchema(m_catalogDb);
sendNode.addAndLinkChild(updateNode);
sendNode.generateOutputSchema(m_catalogDb);
// fix the receive node's output columns
recvNode.generateOutputSchema(m_catalogDb);
// add a count and send on top of the union
return addSumAndSendToDMLNode(subSelectRoot);
}
}
/**
* Get the next (only) plan for a SQL insertion. Inserts are pretty simple
* and this will only generate a single plan.
*
* @return The next plan for a given insert statement.
*/
private AbstractPlanNode getNextInsertPlan() {
// there's really only one way to do an insert, so just
// do it the right way once, then return null after that
if (m_insertPlanWasGenerated)
return null;
m_insertPlanWasGenerated = true;
// figure out which table we're inserting into
assert (m_parsedInsert.tableList.size() == 1);
Table targetTable = m_parsedInsert.tableList.get(0);
// this is never going to go well
if (m_singlePartition && targetTable.getIsreplicated()) {
String msg =
"Trying to insert into replicated table '"
+ targetTable.getTypeName() + "'";
msg += " in a single-partition procedure.";
throw new PlanningErrorException(msg);
}
// the root of the insert plan is always an InsertPlanNode
InsertPlanNode insertNode = new InsertPlanNode();
insertNode.setTargetTableName(targetTable.getTypeName());
insertNode.setMultiPartition(m_singlePartition == false);
// the materialize node creates a tuple to insert (which is frankly not
// always optimal)
MaterializePlanNode materializeNode = new MaterializePlanNode();
NodeSchema mat_schema = new NodeSchema();
// get the ordered list of columns for the targettable using a helper
// function they're not guaranteed to be in order in the catalog
List<Column> columns =
CatalogUtil.getSortedCatalogItems(targetTable.getColumns(), "index");
// for each column in the table in order...
for (Column column : columns) {
// get the expression for the column
AbstractExpression expr = m_parsedInsert.columns.get(column);
// if there's no expression, make sure the column has
// some supported default value
if (expr == null) {
// if it's not nullable or defaulted we have a problem
if (column.getNullable() == false && column.getDefaulttype() == 0)
{
throw new PlanningErrorException("Column " + column.getName()
+ " has no default and is not nullable.");
}
ConstantValueExpression const_expr =
new ConstantValueExpression();
expr = const_expr;
if (column.getDefaulttype() != 0)
{
const_expr.setValue(column.getDefaultvalue());
const_expr.setValueType(VoltType.get((byte) column.getDefaulttype()));
}
else
{
const_expr.setValue(null);
}
}
if (expr.getValueType() == VoltType.NULL) {
ConstantValueExpression const_expr =
new ConstantValueExpression();
const_expr.setValue("NULL");
}
// set the expression type to match the corresponding Column.
try {
ExpressionUtil.setOutputTypeForInsertExpression(expr, VoltType.get((byte)column.getType()), column.getSize(), m_paramTypeOverrideMap);
} catch (Exception e) {
throw new PlanningErrorException(e.getMessage());
}
// add column to the materialize node.
// This table name is magic.
mat_schema.addColumn(new SchemaColumn("VOLT_TEMP_TABLE",
column.getTypeName(),
column.getTypeName(),
expr));
}
materializeNode.setOutputSchema(mat_schema);
// connect the insert and the materialize nodes together
insertNode.addAndLinkChild(materializeNode);
insertNode.generateOutputSchema(m_catalogDb);
AbstractPlanNode rootNode = insertNode;
if (m_singlePartition == false) {
// all sites to a scan -> send
// root site has many recvs feeding into a union
SendPlanNode sendNode = new SendPlanNode();
// this will make the child planfragment be sent to all partitions
sendNode.isMultiPartition = true;
sendNode.addAndLinkChild(rootNode);
sendNode.generateOutputSchema(m_catalogDb);
ReceivePlanNode recvNode = new ReceivePlanNode();
recvNode.addAndLinkChild(sendNode);
recvNode.generateOutputSchema(m_catalogDb);
rootNode = recvNode;
// add a count and send on top of the union
rootNode = addSumAndSendToDMLNode(rootNode);
}
return rootNode;
}
AbstractPlanNode addSumAndSendToDMLNode(AbstractPlanNode dmlRoot)
{
// create the nodes being pushed on top of dmlRoot.
AggregatePlanNode countNode = new AggregatePlanNode();
SendPlanNode sendNode = new SendPlanNode();
// configure the count aggregate (sum) node to produce a single
// output column containing the result of the sum.
// Create a TVE that should match the tuple count input column
// This TVE is magic.
// really really need to make this less hard-wired
TupleValueExpression count_tve = new TupleValueExpression();
count_tve.setValueType(VoltType.BIGINT);
count_tve.setValueSize(VoltType.BIGINT.getLengthInBytesForFixedTypes());
count_tve.setColumnIndex(0);
count_tve.setColumnName("modified_tuples");
count_tve.setColumnAlias("modified_tuples");
count_tve.setTableName("VOLT_TEMP_TABLE");
countNode.addAggregate(ExpressionType.AGGREGATE_SUM, false, 0, count_tve);
// The output column. Not really based on a TVE (it is really the
// count expression represented by the count configured above). But
// this is sufficient for now. This looks identical to the above
// TVE but it's logically different so we'll create a fresh one.
// And yes, oh, oh, it's magic</elo>
TupleValueExpression tve = new TupleValueExpression();
tve.setValueType(VoltType.BIGINT);
tve.setValueSize(VoltType.BIGINT.getLengthInBytesForFixedTypes());
tve.setColumnIndex(0);
tve.setColumnName("modified_tuples");
tve.setColumnAlias("modified_tuples");
tve.setTableName("VOLT_TEMP_TABLE");
NodeSchema count_schema = new NodeSchema();
SchemaColumn col = new SchemaColumn("VOLT_TEMP_TABLE",
"modified_tuples",
"modified_tuples",
tve);
count_schema.addColumn(col);
countNode.setOutputSchema(count_schema);
// connect the nodes to build the graph
countNode.addAndLinkChild(dmlRoot);
countNode.generateOutputSchema(m_catalogDb);
sendNode.addAndLinkChild(countNode);
sendNode.generateOutputSchema(m_catalogDb);
return sendNode;
}
/**
* Given a relatively complete plan-sub-graph, apply a trivial projection
* (filter) to it. If the root node can embed the projection do so. If not,
* add a new projection node.
*
* @param rootNode
* The root of the plan-sub-graph to add the projection to.
* @return The new root of the plan-sub-graph (might be the same as the
* input).
*/
AbstractPlanNode addProjection(AbstractPlanNode rootNode) {
assert (m_parsedSelect != null);
assert (m_parsedSelect.displayColumns != null);
ProjectionPlanNode projectionNode =
new ProjectionPlanNode();
NodeSchema proj_schema = new NodeSchema();
// Build the output schema for the projection based on the display columns
for (ParsedSelectStmt.ParsedColInfo outputCol : m_parsedSelect.displayColumns)
{
assert(outputCol.expression != null);
SchemaColumn col = new SchemaColumn(outputCol.tableName,
outputCol.columnName,
outputCol.alias,
outputCol.expression);
proj_schema.addColumn(col);
}
projectionNode.setOutputSchema(proj_schema);
// if the projection can be done inline...
if (rootNode instanceof AbstractScanPlanNode) {
rootNode.addInlinePlanNode(projectionNode);
return rootNode;
} else {
projectionNode.addAndLinkChild(rootNode);
projectionNode.generateOutputSchema(m_catalogDb);
return projectionNode;
}
}
/**
* Configure the sort columns for a new OrderByPlanNode
* @return new OrderByPlanNode
*/
OrderByPlanNode createOrderBy() {
assert (m_parsedSelect != null);
OrderByPlanNode orderByNode = new OrderByPlanNode();
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.orderColumns) {
orderByNode.addSort(col.expression,
col.ascending ? SortDirectionType.ASC
: SortDirectionType.DESC);
}
return orderByNode;
}
/**
* Create an order by node and add make it a parent of root.
* @param root
* @return new orderByNode (the new root)
*/
AbstractPlanNode addOrderBy(AbstractPlanNode root) {
OrderByPlanNode orderByNode = createOrderBy();
orderByNode.addAndLinkChild(root);
orderByNode.generateOutputSchema(m_catalogDb);
return orderByNode;
}
/**
* Add a limit, pushed-down if possible, and return the new root.
* @param root top of the original plan
* @return new plan's root node
*/
AbstractPlanNode handleLimitOperator(AbstractPlanNode root) {
// The nodes that need to be applied at the coordinator
Stack<AbstractPlanNode> coordGraph = new Stack<AbstractPlanNode>();
// The nodes that need to be applied at the distributed plan.
Stack<AbstractPlanNode> distGraph = new Stack<AbstractPlanNode>();
int limitParamIndex = m_parsedSelect.getLimitParameterIndex();
int offsetParamIndex = m_parsedSelect.getOffsetParameterIndex();
// The coordinator's top limit graph fragment for a MP plan.
// If planning "order by ... limit", getNextSelectPlan()
// will have already added an order by to the coordinator frag.
// This is the only limit node in a SP plan
LimitPlanNode topLimit = new LimitPlanNode();
topLimit.setLimit((int)m_parsedSelect.limit);
topLimit.setOffset((int) m_parsedSelect.offset);
topLimit.setLimitParameterIndex(limitParamIndex);
topLimit.setOffsetParameterIndex(offsetParamIndex);
/*
* TODO: allow push down limit with distinct (select distinct C from T limit 5)
* or distinct in aggregates.
*/
// Whether or not we can push the limit node down
boolean canPushDown = true;
if (m_parsedSelect.distinct || checkPushDownViability(root) == null) {
canPushDown = false;
}
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.displayColumns) {
AbstractExpression rootExpr = col.expression;
if (rootExpr instanceof AggregateExpression) {
if (((AggregateExpression)rootExpr).m_distinct) {
canPushDown = false;
break;
}
}
}
/*
* Push down the limit plan node when possible even if offset is set. If
* the plan is for a partitioned table, do the push down. Otherwise,
* there is no need to do the push down work, the limit plan node will
* be run in the partition.
*/
if ((canPushDown == false) || (root.hasAnyNodeOfType(PlanNodeType.RECEIVE) == false)) {
// not for partitioned table or cannot push down
distGraph.push(topLimit);
} else {
/*
* For partitioned table, the pushed-down limit plan node has a limit based
* on the combined limit and offset, which may require an expression if either of these was not a hard-coded constant.
* The top level limit plan node remains the same, with the original limit and offset values.
*/
coordGraph.push(topLimit);
LimitPlanNode distLimit = new LimitPlanNode();
// Offset on a pushed-down limit node makes no sense, just defaults to 0
// -- the original offset must be factored into the pushed-down limit as a pad on the limit.
if (m_parsedSelect.limit != -1) {
distLimit.setLimit((int) (m_parsedSelect.limit + m_parsedSelect.offset));
}
if (m_parsedSelect.hasLimitOrOffsetParameters()) {
AbstractExpression left = m_parsedSelect.getOffsetExpression();
assert (left != null);
AbstractExpression right = m_parsedSelect.getLimitExpression();
assert (right != null);
OperatorExpression expr = new OperatorExpression(ExpressionType.OPERATOR_PLUS, left, right);
expr.setValueType(VoltType.INTEGER);
expr.setValueSize(VoltType.INTEGER.getLengthInBytesForFixedTypes());
distLimit.setLimitExpression(expr);
}
// else let the parameterized forms of offset/limit default to unused/invalid.
distGraph.push(distLimit);
}
return pushDownLimit(root, distGraph, coordGraph);
}
AbstractPlanNode handleAggregationOperators(AbstractPlanNode root) {
boolean containsAggregateExpression = false;
AggregatePlanNode aggNode = null;
/* Check if any aggregate expressions are present */
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.displayColumns) {
if (col.expression.hasAnySubexpressionOfClass(AggregateExpression.class)) {
containsAggregateExpression = true;
break;
}
}
/*
* "Select A from T group by A" is grouped but has no aggregate operator
* expressions. Catch that case by checking the grouped flag
*/
if (containsAggregateExpression || m_parsedSelect.grouped) {
AggregatePlanNode topAggNode;
if (root.getPlanNodeType() != PlanNodeType.INDEXSCAN ||
((IndexScanPlanNode) root).getSortDirection() == SortDirectionType.INVALID) {
aggNode = new HashAggregatePlanNode();
topAggNode = new HashAggregatePlanNode();
} else {
aggNode = new AggregatePlanNode();
topAggNode = new AggregatePlanNode();
}
int outputColumnIndex = 0;
int topOutputColumnIndex = 0;
NodeSchema agg_schema = new NodeSchema();
NodeSchema topAggSchema = new NodeSchema();
boolean hasAggregates = false;
boolean isPushDownAgg = true;
// TODO: Aggregates could theoretically ONLY appear in the ORDER BY clause but not the display columns, but we don't support that yet.
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.displayColumns)
{
AbstractExpression rootExpr = col.expression;
AbstractExpression agg_input_expr = null;
SchemaColumn schema_col = null;
SchemaColumn topSchemaCol = null;
ExpressionType agg_expression_type = rootExpr.getExpressionType();
if (rootExpr.hasAnySubexpressionOfClass(AggregateExpression.class)) {
// If the rootExpr is not itself an AggregateExpression but simply contains one (or more)
// like "MAX(counter)+1" or "MAX(col)/MIN(col)",
// it gets classified as a non-push-down-able aggregate.
// That beats getting it confused with a pass-through column.
// TODO: support expressions of aggregates by greater differentiation of display columns between the top-level
// aggregate (potentially containing aggregate functions and expressions of aggregate functions) and the pushed-down
// aggregate (potentially containing aggregate functions and aggregate functions of expressions).
agg_input_expr = rootExpr.getLeft();
hasAggregates = true;
// count(*) hack. we're not getting AGGREGATE_COUNT_STAR
// expression types from the parsing, so we have
// to detect the null inner expression case and do the
// switcharoo ourselves.
if (rootExpr.getExpressionType() == ExpressionType.AGGREGATE_COUNT &&
rootExpr.getLeft() == null)
{
agg_expression_type = ExpressionType.AGGREGATE_COUNT_STAR;
// Just need a random input column for now.
// The EE won't actually evaluate this, so we
// just pick something innocuous
// At some point we should special-case count-star so
// we don't go digging for TVEs
- // XXX: Danger: according to standard SQL, if first_col has nulls, COUNT(first_col) < COUNT(*)
+ // XXX: Danger: according to standard SQL, if first_col has nulls, COUNT(first_col) < COUNT(*)
// -- consider using something non-nullable like TupleAddressExpression?
SchemaColumn first_col = root.getOutputSchema().getColumns().get(0);
TupleValueExpression tve = new TupleValueExpression();
tve.setValueType(first_col.getType());
tve.setValueSize(first_col.getSize());
tve.setColumnIndex(0);
tve.setColumnName(first_col.getColumnName());
tve.setColumnAlias(first_col.getColumnName());
tve.setTableName(first_col.getTableName());
agg_input_expr = tve;
}
// A bit of a hack: ProjectionNodes after the
// aggregate node need the output columns here to
// contain TupleValueExpressions (effectively on a temp table).
// So we construct one based on the output of the
// aggregate expression, the column alias provided by HSQL,
// and the offset into the output table schema for the
// aggregate node that we're computing.
// Oh, oh, it's magic, you know..
TupleValueExpression tve = new TupleValueExpression();
tve.setValueType(rootExpr.getValueType());
tve.setValueSize(rootExpr.getValueSize());
tve.setColumnIndex(outputColumnIndex);
tve.setColumnName("");
tve.setColumnAlias(col.alias);
tve.setTableName("VOLT_TEMP_TABLE");
boolean is_distinct = ((AggregateExpression)rootExpr).m_distinct;
aggNode.addAggregate(agg_expression_type, is_distinct,
outputColumnIndex, agg_input_expr);
schema_col = new SchemaColumn("VOLT_TEMP_TABLE",
"",
col.alias,
tve);
/*
* Special case count(*), count(), sum(), min() and max() to
* push them down to each partition. It will do the
* push-down if the select columns only contains the listed
* aggregate operators and other group-by columns. If the
* select columns includes any other aggregates, it will not
* do the push-down. - nshi
*/
if (!is_distinct &&
(agg_expression_type == ExpressionType.AGGREGATE_COUNT_STAR ||
agg_expression_type == ExpressionType.AGGREGATE_COUNT ||
agg_expression_type == ExpressionType.AGGREGATE_SUM))
{
/*
* For count(*), count() and sum(), the pushed-down
* aggregate node doesn't change. An extra sum()
* aggregate node is added to the coordinator to sum up
* the numbers from all the partitions. The input schema
* and the output schema of the sum() aggregate node is
* the same as the output schema of the push-down
* aggregate node.
*
* If DISTINCT is specified, don't do push-down for
* count() and sum()
*/
// Output column for the sum() aggregate node
TupleValueExpression topOutputExpr = new TupleValueExpression();
topOutputExpr.setValueType(rootExpr.getValueType());
topOutputExpr.setValueSize(rootExpr.getValueSize());
topOutputExpr.setColumnIndex(topOutputColumnIndex);
topOutputExpr.setColumnName("");
topOutputExpr.setColumnAlias(col.alias);
topOutputExpr.setTableName("VOLT_TEMP_TABLE");
/*
* Input column of the sum() aggregate node is the
* output column of the push-down aggregate node
*/
topAggNode.addAggregate(ExpressionType.AGGREGATE_SUM,
false,
outputColumnIndex,
tve);
topSchemaCol = new SchemaColumn("VOLT_TEMP_TABLE",
"",
col.alias,
topOutputExpr);
}
else if (agg_expression_type == ExpressionType.AGGREGATE_MIN ||
agg_expression_type == ExpressionType.AGGREGATE_MAX)
{
/*
* For min() and max(), the pushed-down aggregate node
* doesn't change. An extra aggregate node of the same
* type is added to the coordinator. The input schema
* and the output schema of the top aggregate node is
* the same as the output schema of the pushed-down
* aggregate node.
*/
topAggNode.addAggregate(agg_expression_type,
is_distinct,
outputColumnIndex,
tve);
topSchemaCol = schema_col;
}
else
{
/*
* Unsupported aggregate (AVG for example)
* or some expression of aggregates.
*/
isPushDownAgg = false;
}
}
else
{
/*
* These columns are the pass through columns that are not being
* aggregated on. These are the ones from the SELECT list. They
* MUST already exist in the child node's output. Find them and
* add them to the aggregate's output.
*/
schema_col = new SchemaColumn(col.tableName,
col.columnName,
col.alias,
col.expression);
}
if (topSchemaCol == null)
{
/*
* If we didn't set the column schema for the top node, it
* means either it's not a count(*) aggregate or it's a
* pass-through column. So just copy it.
*/
topSchemaCol = new SchemaColumn(schema_col.getTableName(),
schema_col.getColumnName(),
schema_col.getColumnAlias(),
schema_col.getExpression());
}
agg_schema.addColumn(schema_col);
topAggSchema.addColumn(topSchemaCol);
outputColumnIndex++;
topOutputColumnIndex++;
}
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.groupByColumns)
{
if (agg_schema.find(col.tableName, col.columnName, col.alias) == null)
{
throw new PlanningErrorException("GROUP BY column " + col.alias +
" is not in the display columns." +
" Please specify " + col.alias +
" as a display column.");
}
aggNode.addGroupByExpression(col.expression);
topAggNode.addGroupByExpression(col.expression);
}
aggNode.setOutputSchema(agg_schema);
topAggNode.setOutputSchema(agg_schema);
/*
* Is there a necessary coordinator-aggregate node...
*/
if (!hasAggregates || !isPushDownAgg)
{
topAggNode = null;
}
root = pushDownAggregate(root, aggNode, topAggNode);
}
else
{
/*
* Handle DISTINCT only when there is no aggregate operator
* expression
*/
root = handleDistinct(root);
}
return root;
}
/**
* Push the given aggregate if the plan is distributed, then add the
* coordinator node on top of the send/receive pair. If the plan
* is not distributed, or coordNode is not provided, the distNode
* is added at the top of the plan.
*
* Note: this works in part because the push-down node is also an acceptable
* top level node if the plan is not distributed. This wouldn't be true
* if we started pushing down something like (sum, count) to calculate
* a distributed average.
*
* @param root
* The root node
* @param distNode
* The node to push down
* @param coordNode
* The top node to put on top of the send/receive pair after
* push-down. If this is null, no push-down will be performed.
* @return The new root node.
*/
AbstractPlanNode pushDownAggregate(AbstractPlanNode root,
AggregatePlanNode distNode,
AggregatePlanNode coordNode) {
// remember that coordinating aggregation has a pushed-down
// counterpart deeper in the plan. this allows other operators
// to be pushed down past the receive as well.
if (coordNode != null) {
coordNode.m_isCoordinatingAggregator = true;
}
/*
* Push this node down to partition if it's distributed. First remove
* the send/receive pair, add the node, then put the send/receive pair
* back on top of the node, followed by another top node at the
* coordinator.
*/
AbstractPlanNode accessPlanTemp = root;
if (coordNode != null && root instanceof ReceivePlanNode) {
root = root.getChild(0).getChild(0);
root.clearParents();
} else {
accessPlanTemp = null;
}
distNode.addAndLinkChild(root);
distNode.generateOutputSchema(m_catalogDb);
root = distNode;
// Put the send/receive pair back into place
if (accessPlanTemp != null) {
accessPlanTemp.getChild(0).clearChildren();
accessPlanTemp.getChild(0).addAndLinkChild(root);
root = accessPlanTemp;
// Add the top node
coordNode.addAndLinkChild(root);
coordNode.generateOutputSchema(m_catalogDb);
root = coordNode;
}
return root;
}
/**
* Push the distributed node down if the plan is distributed, then add the
* coord. nodes at the top of the root plan. If the coord node is not given,
* nothing is pushed down - the distributed node is added on top of the
* send/receive pair directly.
*
* Note: this works in part because the push-down node is also an acceptable
* top level node if the plan is not distributed. This wouldn't be true
* if we started pushing down something like (sum, count) to calculate
* a distributed average.
*
* @param root
* The root node
* @param distributedNode
* The node to push down
* @param coordNodes
* New coordinator node(s) to put on top of the plan.
* If this is null, no push-down will be performed.
* @return The new root node.
*/
AbstractPlanNode pushDownLimit(AbstractPlanNode root,
Stack<AbstractPlanNode> distNodes,
Stack<AbstractPlanNode> coordNodes) {
AbstractPlanNode receiveNode = checkPushDownViability(root);
// If there is work to distribute and a receive node was found,
// disconnect the coordinator and distributed parts of the plan
// below the SEND node
AbstractPlanNode distributedPlan = root;
if (!coordNodes.isEmpty() && receiveNode != null) {
distributedPlan = receiveNode.getChild(0).getChild(0);
distributedPlan.clearParents();
receiveNode.getChild(0).clearChildren();
}
// If there is work to distribute, determine if the distributed
// limit must be performed on ordered input. If so, produce that
// order if an explicit sort is necessary
if (!coordNodes.isEmpty() && receiveNode != null) {
if ((distributedPlan.getPlanNodeType() != PlanNodeType.INDEXSCAN ||
((IndexScanPlanNode) distributedPlan).getSortDirection() == SortDirectionType.INVALID) &&
m_parsedSelect.orderColumns.size() > 0) {
distNodes.push(createOrderBy());
}
}
// Add the distributed work to the plan
while (!distNodes.isEmpty()) {
AbstractPlanNode distributedNode = distNodes.pop();
distributedNode.addAndLinkChild(distributedPlan);
distributedPlan = distributedNode;
}
// Reconnect the plans and add the coordinator's work
if (!coordNodes.isEmpty() && receiveNode != null) {
receiveNode.getChild(0).addAndLinkChild(distributedPlan);
while (!coordNodes.isEmpty()) {
AbstractPlanNode coordNode = coordNodes.pop();
coordNode.addAndLinkChild(root);
root = coordNode;
}
}
else {
root = distributedPlan;
}
root.generateOutputSchema(m_catalogDb);
return root;
}
/**
* Check if we can push the limit node down.
*
* @param root
* @return If we can push it down, the receive node is returned. Otherwise,
* it returns null.
*/
protected AbstractPlanNode checkPushDownViability(AbstractPlanNode root) {
AbstractPlanNode receiveNode = root;
// Find a receive node, if one exists. There is guaranteed to be at
// most a single receive. Abort the search if between root and receive
// a node that can't be pushed down past is found.
//
// Can only push past:
// * coordinatingAggregator: a distributed aggregator has
// has already been pushed down. Distributed LIMIT of that
// aggregation is correct.
//
// * order by: if the plan requires a sort, getNextSelectPlan()
// will have already added an ORDER BY. LIMIT will be added
// above that sort. However, if LIMIT can be successfully
// pushed down, it may be necessary to create and push down
// a distributed sort as well. That work is done here.
//
// * projection: we only LIMIT on constant value expressions.
// whether the LIMIT happens pre-or-post projection is
// is irrelevant.
//
// Set receiveNode to null if the plan is not distributed or if
// the distributed plan does not allow push-down of a limit.
while (!(receiveNode instanceof ReceivePlanNode)) {
// Limitation: can only push past some nodes (see above comment)
if (!(receiveNode instanceof AggregatePlanNode) &&
!(receiveNode instanceof OrderByPlanNode) &&
!(receiveNode instanceof ProjectionPlanNode)) {
receiveNode = null;
break;
}
// Limitation: can only push past coordinating aggregation nodes
if (receiveNode instanceof AggregatePlanNode &&
!((AggregatePlanNode)receiveNode).m_isCoordinatingAggregator) {
receiveNode = null;
break;
}
// Traverse...
if (receiveNode.getChildCount() == 0) {
receiveNode = null;
break;
}
// nothing that allows pushing past has multiple inputs
assert(receiveNode.getChildCount() == 1);
receiveNode = receiveNode.getChild(0);
}
return receiveNode;
}
/**
* Handle select distinct a from t
*
* @param root
* @return
*/
AbstractPlanNode handleDistinct(AbstractPlanNode root) {
if (m_parsedSelect.distinct) {
// We currently can't handle DISTINCT of multiple columns.
// Throw a planner error if this is attempted.
if (m_parsedSelect.displayColumns.size() > 1)
{
throw new PlanningErrorException("Multiple DISTINCT columns currently unsupported");
}
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.displayColumns) {
// Distinct can in theory handle any expression now, but it's
// untested so we'll balk on anything other than a TVE here
// --izzy
if (col.expression instanceof TupleValueExpression)
{
// Add distinct node(s) to the plan
root = addDistinctNodes(root, col.expression);
// aggregate handlers are expected to produce the required projection.
// the other aggregates do this inherently but distinct may need a
// projection node.
root = addProjection(root);
}
else
{
throw new PlanningErrorException("DISTINCT of an expression currently unsupported");
}
}
}
return root;
}
/**
* If plan is distributed than add distinct nodes to each partition and the coordinator.
* Otherwise simply add the distinct node on top of the current root
*
* @param root The root node
* @param expr The distinct expression
* @return The new root node.
*/
AbstractPlanNode addDistinctNodes(AbstractPlanNode root, AbstractExpression expr)
{
assert(root != null);
AbstractPlanNode accessPlanTemp = root;
if (root instanceof ReceivePlanNode) {
// Temporarily strip send/receive pair
accessPlanTemp = root.getChild(0).getChild(0);
accessPlanTemp.clearParents();
root.getChild(0).unlinkChild(accessPlanTemp);
// Add new distinct node to each partition
AbstractPlanNode distinctNode = addDistinctNode(accessPlanTemp, expr);
// Add send/receive pair back
root.getChild(0).addAndLinkChild(distinctNode);
}
// Add new distinct node to the coordinator
root = addDistinctNode(root, expr);
return root;
}
/**
* Build new distinct node and put it on top of the current root
*
* @param root The root node
* @param expr The distinct expression
* @return The new root node.
*/
AbstractPlanNode addDistinctNode(AbstractPlanNode root, AbstractExpression expr)
{
DistinctPlanNode distinctNode = new DistinctPlanNode();
distinctNode.setDistinctExpression(expr);
distinctNode.addAndLinkChild(root);
distinctNode.generateOutputSchema(m_catalogDb);
return distinctNode;
}
/**
* Get the unique set of names of all columns that are part of an index on
* the given table.
*
* @param table
* The table to build the list of index-affected columns with.
* @return The set of column names affected by indexes with duplicates
* removed.
*/
public Set<String> getIndexedColumnSetForTable(Table table) {
HashSet<String> columns = new HashSet<String>();
for (Index index : table.getIndexes()) {
for (ColumnRef colRef : index.getColumns()) {
columns.add(colRef.getColumn().getTypeName());
}
}
return columns;
}
}
| true | true | AbstractPlanNode handleAggregationOperators(AbstractPlanNode root) {
boolean containsAggregateExpression = false;
AggregatePlanNode aggNode = null;
/* Check if any aggregate expressions are present */
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.displayColumns) {
if (col.expression.hasAnySubexpressionOfClass(AggregateExpression.class)) {
containsAggregateExpression = true;
break;
}
}
/*
* "Select A from T group by A" is grouped but has no aggregate operator
* expressions. Catch that case by checking the grouped flag
*/
if (containsAggregateExpression || m_parsedSelect.grouped) {
AggregatePlanNode topAggNode;
if (root.getPlanNodeType() != PlanNodeType.INDEXSCAN ||
((IndexScanPlanNode) root).getSortDirection() == SortDirectionType.INVALID) {
aggNode = new HashAggregatePlanNode();
topAggNode = new HashAggregatePlanNode();
} else {
aggNode = new AggregatePlanNode();
topAggNode = new AggregatePlanNode();
}
int outputColumnIndex = 0;
int topOutputColumnIndex = 0;
NodeSchema agg_schema = new NodeSchema();
NodeSchema topAggSchema = new NodeSchema();
boolean hasAggregates = false;
boolean isPushDownAgg = true;
// TODO: Aggregates could theoretically ONLY appear in the ORDER BY clause but not the display columns, but we don't support that yet.
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.displayColumns)
{
AbstractExpression rootExpr = col.expression;
AbstractExpression agg_input_expr = null;
SchemaColumn schema_col = null;
SchemaColumn topSchemaCol = null;
ExpressionType agg_expression_type = rootExpr.getExpressionType();
if (rootExpr.hasAnySubexpressionOfClass(AggregateExpression.class)) {
// If the rootExpr is not itself an AggregateExpression but simply contains one (or more)
// like "MAX(counter)+1" or "MAX(col)/MIN(col)",
// it gets classified as a non-push-down-able aggregate.
// That beats getting it confused with a pass-through column.
// TODO: support expressions of aggregates by greater differentiation of display columns between the top-level
// aggregate (potentially containing aggregate functions and expressions of aggregate functions) and the pushed-down
// aggregate (potentially containing aggregate functions and aggregate functions of expressions).
agg_input_expr = rootExpr.getLeft();
hasAggregates = true;
// count(*) hack. we're not getting AGGREGATE_COUNT_STAR
// expression types from the parsing, so we have
// to detect the null inner expression case and do the
// switcharoo ourselves.
if (rootExpr.getExpressionType() == ExpressionType.AGGREGATE_COUNT &&
rootExpr.getLeft() == null)
{
agg_expression_type = ExpressionType.AGGREGATE_COUNT_STAR;
// Just need a random input column for now.
// The EE won't actually evaluate this, so we
// just pick something innocuous
// At some point we should special-case count-star so
// we don't go digging for TVEs
// XXX: Danger: according to standard SQL, if first_col has nulls, COUNT(first_col) < COUNT(*)
// -- consider using something non-nullable like TupleAddressExpression?
SchemaColumn first_col = root.getOutputSchema().getColumns().get(0);
TupleValueExpression tve = new TupleValueExpression();
tve.setValueType(first_col.getType());
tve.setValueSize(first_col.getSize());
tve.setColumnIndex(0);
tve.setColumnName(first_col.getColumnName());
tve.setColumnAlias(first_col.getColumnName());
tve.setTableName(first_col.getTableName());
agg_input_expr = tve;
}
// A bit of a hack: ProjectionNodes after the
// aggregate node need the output columns here to
// contain TupleValueExpressions (effectively on a temp table).
// So we construct one based on the output of the
// aggregate expression, the column alias provided by HSQL,
// and the offset into the output table schema for the
// aggregate node that we're computing.
// Oh, oh, it's magic, you know..
TupleValueExpression tve = new TupleValueExpression();
tve.setValueType(rootExpr.getValueType());
tve.setValueSize(rootExpr.getValueSize());
tve.setColumnIndex(outputColumnIndex);
tve.setColumnName("");
tve.setColumnAlias(col.alias);
tve.setTableName("VOLT_TEMP_TABLE");
boolean is_distinct = ((AggregateExpression)rootExpr).m_distinct;
aggNode.addAggregate(agg_expression_type, is_distinct,
outputColumnIndex, agg_input_expr);
schema_col = new SchemaColumn("VOLT_TEMP_TABLE",
"",
col.alias,
tve);
/*
* Special case count(*), count(), sum(), min() and max() to
* push them down to each partition. It will do the
* push-down if the select columns only contains the listed
* aggregate operators and other group-by columns. If the
* select columns includes any other aggregates, it will not
* do the push-down. - nshi
*/
if (!is_distinct &&
(agg_expression_type == ExpressionType.AGGREGATE_COUNT_STAR ||
agg_expression_type == ExpressionType.AGGREGATE_COUNT ||
agg_expression_type == ExpressionType.AGGREGATE_SUM))
{
/*
* For count(*), count() and sum(), the pushed-down
* aggregate node doesn't change. An extra sum()
* aggregate node is added to the coordinator to sum up
* the numbers from all the partitions. The input schema
* and the output schema of the sum() aggregate node is
* the same as the output schema of the push-down
* aggregate node.
*
* If DISTINCT is specified, don't do push-down for
* count() and sum()
*/
// Output column for the sum() aggregate node
TupleValueExpression topOutputExpr = new TupleValueExpression();
topOutputExpr.setValueType(rootExpr.getValueType());
topOutputExpr.setValueSize(rootExpr.getValueSize());
topOutputExpr.setColumnIndex(topOutputColumnIndex);
topOutputExpr.setColumnName("");
topOutputExpr.setColumnAlias(col.alias);
topOutputExpr.setTableName("VOLT_TEMP_TABLE");
/*
* Input column of the sum() aggregate node is the
* output column of the push-down aggregate node
*/
topAggNode.addAggregate(ExpressionType.AGGREGATE_SUM,
false,
outputColumnIndex,
tve);
topSchemaCol = new SchemaColumn("VOLT_TEMP_TABLE",
"",
col.alias,
topOutputExpr);
}
else if (agg_expression_type == ExpressionType.AGGREGATE_MIN ||
agg_expression_type == ExpressionType.AGGREGATE_MAX)
{
/*
* For min() and max(), the pushed-down aggregate node
* doesn't change. An extra aggregate node of the same
* type is added to the coordinator. The input schema
* and the output schema of the top aggregate node is
* the same as the output schema of the pushed-down
* aggregate node.
*/
topAggNode.addAggregate(agg_expression_type,
is_distinct,
outputColumnIndex,
tve);
topSchemaCol = schema_col;
}
else
{
/*
* Unsupported aggregate (AVG for example)
* or some expression of aggregates.
*/
isPushDownAgg = false;
}
}
else
{
/*
* These columns are the pass through columns that are not being
* aggregated on. These are the ones from the SELECT list. They
* MUST already exist in the child node's output. Find them and
* add them to the aggregate's output.
*/
schema_col = new SchemaColumn(col.tableName,
col.columnName,
col.alias,
col.expression);
}
if (topSchemaCol == null)
{
/*
* If we didn't set the column schema for the top node, it
* means either it's not a count(*) aggregate or it's a
* pass-through column. So just copy it.
*/
topSchemaCol = new SchemaColumn(schema_col.getTableName(),
schema_col.getColumnName(),
schema_col.getColumnAlias(),
schema_col.getExpression());
}
agg_schema.addColumn(schema_col);
topAggSchema.addColumn(topSchemaCol);
outputColumnIndex++;
topOutputColumnIndex++;
}
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.groupByColumns)
{
if (agg_schema.find(col.tableName, col.columnName, col.alias) == null)
{
throw new PlanningErrorException("GROUP BY column " + col.alias +
" is not in the display columns." +
" Please specify " + col.alias +
" as a display column.");
}
aggNode.addGroupByExpression(col.expression);
topAggNode.addGroupByExpression(col.expression);
}
aggNode.setOutputSchema(agg_schema);
topAggNode.setOutputSchema(agg_schema);
/*
* Is there a necessary coordinator-aggregate node...
*/
if (!hasAggregates || !isPushDownAgg)
{
topAggNode = null;
}
root = pushDownAggregate(root, aggNode, topAggNode);
}
else
{
/*
* Handle DISTINCT only when there is no aggregate operator
* expression
*/
root = handleDistinct(root);
}
return root;
}
| AbstractPlanNode handleAggregationOperators(AbstractPlanNode root) {
boolean containsAggregateExpression = false;
AggregatePlanNode aggNode = null;
/* Check if any aggregate expressions are present */
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.displayColumns) {
if (col.expression.hasAnySubexpressionOfClass(AggregateExpression.class)) {
containsAggregateExpression = true;
break;
}
}
/*
* "Select A from T group by A" is grouped but has no aggregate operator
* expressions. Catch that case by checking the grouped flag
*/
if (containsAggregateExpression || m_parsedSelect.grouped) {
AggregatePlanNode topAggNode;
if (root.getPlanNodeType() != PlanNodeType.INDEXSCAN ||
((IndexScanPlanNode) root).getSortDirection() == SortDirectionType.INVALID) {
aggNode = new HashAggregatePlanNode();
topAggNode = new HashAggregatePlanNode();
} else {
aggNode = new AggregatePlanNode();
topAggNode = new AggregatePlanNode();
}
int outputColumnIndex = 0;
int topOutputColumnIndex = 0;
NodeSchema agg_schema = new NodeSchema();
NodeSchema topAggSchema = new NodeSchema();
boolean hasAggregates = false;
boolean isPushDownAgg = true;
// TODO: Aggregates could theoretically ONLY appear in the ORDER BY clause but not the display columns, but we don't support that yet.
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.displayColumns)
{
AbstractExpression rootExpr = col.expression;
AbstractExpression agg_input_expr = null;
SchemaColumn schema_col = null;
SchemaColumn topSchemaCol = null;
ExpressionType agg_expression_type = rootExpr.getExpressionType();
if (rootExpr.hasAnySubexpressionOfClass(AggregateExpression.class)) {
// If the rootExpr is not itself an AggregateExpression but simply contains one (or more)
// like "MAX(counter)+1" or "MAX(col)/MIN(col)",
// it gets classified as a non-push-down-able aggregate.
// That beats getting it confused with a pass-through column.
// TODO: support expressions of aggregates by greater differentiation of display columns between the top-level
// aggregate (potentially containing aggregate functions and expressions of aggregate functions) and the pushed-down
// aggregate (potentially containing aggregate functions and aggregate functions of expressions).
agg_input_expr = rootExpr.getLeft();
hasAggregates = true;
// count(*) hack. we're not getting AGGREGATE_COUNT_STAR
// expression types from the parsing, so we have
// to detect the null inner expression case and do the
// switcharoo ourselves.
if (rootExpr.getExpressionType() == ExpressionType.AGGREGATE_COUNT &&
rootExpr.getLeft() == null)
{
agg_expression_type = ExpressionType.AGGREGATE_COUNT_STAR;
// Just need a random input column for now.
// The EE won't actually evaluate this, so we
// just pick something innocuous
// At some point we should special-case count-star so
// we don't go digging for TVEs
// XXX: Danger: according to standard SQL, if first_col has nulls, COUNT(first_col) < COUNT(*)
// -- consider using something non-nullable like TupleAddressExpression?
SchemaColumn first_col = root.getOutputSchema().getColumns().get(0);
TupleValueExpression tve = new TupleValueExpression();
tve.setValueType(first_col.getType());
tve.setValueSize(first_col.getSize());
tve.setColumnIndex(0);
tve.setColumnName(first_col.getColumnName());
tve.setColumnAlias(first_col.getColumnName());
tve.setTableName(first_col.getTableName());
agg_input_expr = tve;
}
// A bit of a hack: ProjectionNodes after the
// aggregate node need the output columns here to
// contain TupleValueExpressions (effectively on a temp table).
// So we construct one based on the output of the
// aggregate expression, the column alias provided by HSQL,
// and the offset into the output table schema for the
// aggregate node that we're computing.
// Oh, oh, it's magic, you know..
TupleValueExpression tve = new TupleValueExpression();
tve.setValueType(rootExpr.getValueType());
tve.setValueSize(rootExpr.getValueSize());
tve.setColumnIndex(outputColumnIndex);
tve.setColumnName("");
tve.setColumnAlias(col.alias);
tve.setTableName("VOLT_TEMP_TABLE");
boolean is_distinct = ((AggregateExpression)rootExpr).m_distinct;
aggNode.addAggregate(agg_expression_type, is_distinct,
outputColumnIndex, agg_input_expr);
schema_col = new SchemaColumn("VOLT_TEMP_TABLE",
"",
col.alias,
tve);
/*
* Special case count(*), count(), sum(), min() and max() to
* push them down to each partition. It will do the
* push-down if the select columns only contains the listed
* aggregate operators and other group-by columns. If the
* select columns includes any other aggregates, it will not
* do the push-down. - nshi
*/
if (!is_distinct &&
(agg_expression_type == ExpressionType.AGGREGATE_COUNT_STAR ||
agg_expression_type == ExpressionType.AGGREGATE_COUNT ||
agg_expression_type == ExpressionType.AGGREGATE_SUM))
{
/*
* For count(*), count() and sum(), the pushed-down
* aggregate node doesn't change. An extra sum()
* aggregate node is added to the coordinator to sum up
* the numbers from all the partitions. The input schema
* and the output schema of the sum() aggregate node is
* the same as the output schema of the push-down
* aggregate node.
*
* If DISTINCT is specified, don't do push-down for
* count() and sum()
*/
// Output column for the sum() aggregate node
TupleValueExpression topOutputExpr = new TupleValueExpression();
topOutputExpr.setValueType(rootExpr.getValueType());
topOutputExpr.setValueSize(rootExpr.getValueSize());
topOutputExpr.setColumnIndex(topOutputColumnIndex);
topOutputExpr.setColumnName("");
topOutputExpr.setColumnAlias(col.alias);
topOutputExpr.setTableName("VOLT_TEMP_TABLE");
/*
* Input column of the sum() aggregate node is the
* output column of the push-down aggregate node
*/
topAggNode.addAggregate(ExpressionType.AGGREGATE_SUM,
false,
outputColumnIndex,
tve);
topSchemaCol = new SchemaColumn("VOLT_TEMP_TABLE",
"",
col.alias,
topOutputExpr);
}
else if (agg_expression_type == ExpressionType.AGGREGATE_MIN ||
agg_expression_type == ExpressionType.AGGREGATE_MAX)
{
/*
* For min() and max(), the pushed-down aggregate node
* doesn't change. An extra aggregate node of the same
* type is added to the coordinator. The input schema
* and the output schema of the top aggregate node is
* the same as the output schema of the pushed-down
* aggregate node.
*/
topAggNode.addAggregate(agg_expression_type,
is_distinct,
outputColumnIndex,
tve);
topSchemaCol = schema_col;
}
else
{
/*
* Unsupported aggregate (AVG for example)
* or some expression of aggregates.
*/
isPushDownAgg = false;
}
}
else
{
/*
* These columns are the pass through columns that are not being
* aggregated on. These are the ones from the SELECT list. They
* MUST already exist in the child node's output. Find them and
* add them to the aggregate's output.
*/
schema_col = new SchemaColumn(col.tableName,
col.columnName,
col.alias,
col.expression);
}
if (topSchemaCol == null)
{
/*
* If we didn't set the column schema for the top node, it
* means either it's not a count(*) aggregate or it's a
* pass-through column. So just copy it.
*/
topSchemaCol = new SchemaColumn(schema_col.getTableName(),
schema_col.getColumnName(),
schema_col.getColumnAlias(),
schema_col.getExpression());
}
agg_schema.addColumn(schema_col);
topAggSchema.addColumn(topSchemaCol);
outputColumnIndex++;
topOutputColumnIndex++;
}
for (ParsedSelectStmt.ParsedColInfo col : m_parsedSelect.groupByColumns)
{
if (agg_schema.find(col.tableName, col.columnName, col.alias) == null)
{
throw new PlanningErrorException("GROUP BY column " + col.alias +
" is not in the display columns." +
" Please specify " + col.alias +
" as a display column.");
}
aggNode.addGroupByExpression(col.expression);
topAggNode.addGroupByExpression(col.expression);
}
aggNode.setOutputSchema(agg_schema);
topAggNode.setOutputSchema(agg_schema);
/*
* Is there a necessary coordinator-aggregate node...
*/
if (!hasAggregates || !isPushDownAgg)
{
topAggNode = null;
}
root = pushDownAggregate(root, aggNode, topAggNode);
}
else
{
/*
* Handle DISTINCT only when there is no aggregate operator
* expression
*/
root = handleDistinct(root);
}
return root;
}
|
diff --git a/plugins/org.fornax.soa.servicedsl/src/org/fornax/soa/scoping/ServiceDslScopeProvider.java b/plugins/org.fornax.soa.servicedsl/src/org/fornax/soa/scoping/ServiceDslScopeProvider.java
index 625988a8..47818f12 100644
--- a/plugins/org.fornax.soa.servicedsl/src/org/fornax/soa/scoping/ServiceDslScopeProvider.java
+++ b/plugins/org.fornax.soa.servicedsl/src/org/fornax/soa/scoping/ServiceDslScopeProvider.java
@@ -1,528 +1,528 @@
/*
* generated by Xtext
*/
package org.fornax.soa.scoping;
import org.apache.log4j.Logger;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.xtext.naming.IQualifiedNameProvider;
import org.eclipse.xtext.naming.QualifiedName;
import org.eclipse.xtext.resource.IEObjectDescription;
import org.eclipse.xtext.scoping.IScope;
import org.fornax.soa.basedsl.sOABaseDsl.AssetRef;
import org.fornax.soa.basedsl.sOABaseDsl.FixedVersionRef;
import org.fornax.soa.basedsl.sOABaseDsl.LowerBoundRangeVersionRef;
import org.fornax.soa.basedsl.sOABaseDsl.MajorVersionRef;
import org.fornax.soa.basedsl.sOABaseDsl.MaxVersionRef;
import org.fornax.soa.basedsl.sOABaseDsl.MinVersionRef;
import org.fornax.soa.basedsl.sOABaseDsl.SOABaseDslPackage;
import org.fornax.soa.basedsl.sOABaseDsl.VersionRef;
import org.fornax.soa.basedsl.scoping.versions.VersionFilteringScope;
import org.fornax.soa.basedsl.scoping.versions.filter.AbstractPredicateVersionFilter;
import org.fornax.soa.basedsl.scoping.versions.filter.FixedVersionFilter;
import org.fornax.soa.basedsl.scoping.versions.filter.LatestMajorVersionFilter;
import org.fornax.soa.basedsl.scoping.versions.filter.LatestMaxExclVersionFilter;
import org.fornax.soa.basedsl.scoping.versions.filter.LatestMinInclMaxExclRangeVersionFilter;
import org.fornax.soa.basedsl.scoping.versions.filter.LatestMinInclVersionFilter;
import org.fornax.soa.basedsl.scoping.versions.filter.NullVersionFilter;
import org.fornax.soa.basedsl.scoping.versions.filter.VersionedImportedNamespaceAwareScopeProvider;
import org.fornax.soa.basedsl.search.IEObjectLookup;
import org.fornax.soa.basedsl.version.IScopeVersionResolver;
import org.fornax.soa.basedsl.version.SimpleScopeVersionResolver;
import org.fornax.soa.basedsl.version.VersionedOwnerScopeVersionResolver;
import org.fornax.soa.profiledsl.sOAProfileDsl.LifecycleState;
import org.fornax.soa.profiledsl.scoping.versions.ILifecycleStateResolver;
import org.fornax.soa.profiledsl.scoping.versions.RelaxedLatestMajorVersionForOwnerStateFilter;
import org.fornax.soa.profiledsl.scoping.versions.RelaxedLatestMinMaxVersionForOwnerStateFilter;
import org.fornax.soa.profiledsl.scoping.versions.RelaxedLatestMinVersionForOwnerStateFilter;
import org.fornax.soa.profiledsl.scoping.versions.RelaxedMaxVersionForOwnerStateFilter;
import org.fornax.soa.profiledsl.scoping.versions.StateAttributeLifecycleStateResolver;
import org.fornax.soa.service.util.ServiceDslElementAccessor;
import org.fornax.soa.serviceDsl.BusinessObjectRef;
import org.fornax.soa.serviceDsl.CapabilityRef;
import org.fornax.soa.serviceDsl.ComplexConsiderationPropertyRef;
import org.fornax.soa.serviceDsl.ConsiderationParameterRef;
import org.fornax.soa.serviceDsl.ConsiderationPropertyRef;
import org.fornax.soa.serviceDsl.ConsiderationSpec;
import org.fornax.soa.serviceDsl.EnumTypeRef;
import org.fornax.soa.serviceDsl.EventRef;
import org.fornax.soa.serviceDsl.ExceptionRef;
import org.fornax.soa.serviceDsl.MessageHeaderRef;
import org.fornax.soa.serviceDsl.Operation;
import org.fornax.soa.serviceDsl.OperationRef;
import org.fornax.soa.serviceDsl.Parameter;
import org.fornax.soa.serviceDsl.RequiredServiceRef;
import org.fornax.soa.serviceDsl.ServiceDslPackage;
import org.fornax.soa.serviceDsl.ServiceRef;
import org.fornax.soa.serviceDsl.SimpleConsiderationPropertyRef;
import org.fornax.soa.serviceDsl.SimpleOperationRef;
import org.fornax.soa.serviceDsl.TypeRef;
import org.fornax.soa.serviceDsl.VersionedTypeRef;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
import com.google.inject.Injector;
/**
* This class contains custom scoping description.
*
* see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#scoping
* on how and when to use it
*
*/
public class ServiceDslScopeProvider extends VersionedImportedNamespaceAwareScopeProvider {
private static final Logger logger = Logger.getLogger(ServiceDslScopeProvider.class);
@Inject Injector injector;
@Inject
private IQualifiedNameProvider nameProvider;
@Inject IEObjectLookup objLookup;
public void setNameProvider(IQualifiedNameProvider nameProvider) {
this.nameProvider = nameProvider;
}
public IQualifiedNameProvider getNameProvider() {
return nameProvider;
}
@Override
protected IScope getLocalElementsScope(IScope parent, final EObject ctx,
final EReference reference) {
if (parent instanceof VersionFilteringScope && ctx instanceof ConsiderationPropertyRef ) {
IScope currentParent = parent;
while (currentParent instanceof VersionFilteringScope && ((VersionFilteringScope) currentParent).getParent() instanceof VersionFilteringScope) {
currentParent = ((VersionFilteringScope) currentParent).getParent();
}
if (currentParent != null) {
IScope result = super.getLocalElementsScope(currentParent, ctx, reference);
return result;
}
}
return super.getLocalElementsScope(parent, ctx, reference);
}
@Override
protected AbstractPredicateVersionFilter<IEObjectDescription> getVersionFilterFromContext (
EObject ctx, final EReference reference) {
if (reference==ServiceDslPackage.Literals.VERSIONED_TYPE_REF__TYPE
&& ctx instanceof VersionedTypeRef) {
final VersionRef v = ((VersionedTypeRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference==ServiceDslPackage.Literals.BUSINESS_OBJECT_REF__TYPE
&& ctx instanceof BusinessObjectRef) {
final VersionRef v = ((BusinessObjectRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
//FIXME verify this ref
} else if (reference==ServiceDslPackage.Literals.BUSINESS_OBJECT__SUPER_BUSINESS_OBJECT
&& ctx instanceof BusinessObjectRef) {
final VersionRef v = ((BusinessObjectRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.ENUM_TYPE_REF__TYPE
&& ctx instanceof EnumTypeRef) {
final VersionRef v = ((EnumTypeRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.SERVICE_REF__SERVICE
&& ctx instanceof ServiceRef) {
final VersionRef v = ((ServiceRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.EXCEPTION_REF__EXCEPTION
&& ctx instanceof ExceptionRef) {
- final VersionRef v = ((ExceptionRef) ctx).getVersion();
+ final VersionRef v = ((ExceptionRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.EVENT_REF__EVENT
&& ctx instanceof EventRef) {
final VersionRef v = ((EventRef) ctx).getVersionRef();
return createVersionFilter(v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.OPERATION_REF__OPERATION
&& ctx instanceof OperationRef) {
final VersionRef v = ((OperationRef) ctx).getVersionRef();
return createEContainerVersionFilter(v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.SIMPLE_OPERATION_REF__OPERATION
&& ctx instanceof SimpleOperationRef && ctx.eContainer() instanceof RequiredServiceRef) {
RequiredServiceRef requiredServiceRef = (RequiredServiceRef) ctx.eContainer();
final VersionRef v = requiredServiceRef.getVersionRef();
final QualifiedName serviceName = nameProvider.getFullyQualifiedName(requiredServiceRef.getService());
AbstractPredicateVersionFilter<IEObjectDescription> versionFilter = createEContainerVersionFilter(v, objLookup.getVersionedOwner(ctx));
versionFilter.setPreFilterPredicate(new Predicate<IEObjectDescription>() {
public boolean apply(IEObjectDescription input) {
if (input.getQualifiedName().startsWith(serviceName))
return true;
else
return false;
}
});
return versionFilter;
} else if (reference == ServiceDslPackage.Literals.CONSIDERATION_PARAMETER_REF__PARAM
&& ctx instanceof ConsiderationParameterRef
&& ctx.eContainer() instanceof ConsiderationSpec) {
ConsiderationParameterRef paramRef = (ConsiderationParameterRef)ctx;
AbstractPredicateVersionFilter<IEObjectDescription> scopeFilter = createConsiderationParameterScopeFilter(paramRef);
if (scopeFilter != null)
return scopeFilter;
} else if (reference == ServiceDslPackage.Literals.CONSIDERATION_PARAMETER_REF__PROPERTY_REF
&& ctx instanceof ConsiderationParameterRef) {
TypeRef typeRef = ((ConsiderationParameterRef) ctx).getParam().getType();
AbstractPredicateVersionFilter<IEObjectDescription> f = AbstractPredicateVersionFilter.NULL_VERSION_FILTER;
if (typeRef instanceof BusinessObjectRef)
f = createEContainerVersionFilter (((BusinessObjectRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
else if (typeRef instanceof EnumTypeRef)
f = createEContainerVersionFilter (((EnumTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
return f;
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF
&& ctx instanceof SimpleConsiderationPropertyRef) {
TypeRef typeRef = null;
if (ctx.eContainer() instanceof ComplexConsiderationPropertyRef) {
typeRef = ((ComplexConsiderationPropertyRef) ctx.eContainer()).getParentProperty().getType();
} else {
typeRef = ((SimpleConsiderationPropertyRef) ctx).getProperty().getType();
}
AbstractPredicateVersionFilter<IEObjectDescription> f = new NullVersionFilter<IEObjectDescription>();
if (typeRef instanceof BusinessObjectRef)
f = createEContainerVersionFilter (((BusinessObjectRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
else if (typeRef instanceof EnumTypeRef)
f = createEContainerVersionFilter (((EnumTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
if (typeRef instanceof VersionedTypeRef) {
VersionedTypeRef verTypeRef = (VersionedTypeRef) typeRef;
final QualifiedName verTypeName = nameProvider.getFullyQualifiedName (verTypeRef.getType());
f.setPreFilterPredicate(new Predicate<IEObjectDescription> () {
public boolean apply(IEObjectDescription input) {
if (input.getQualifiedName().startsWith(verTypeName))
return true;
else
return false;
}
});
}
return f;
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY
&& ctx instanceof SimpleConsiderationPropertyRef) {
return createFilterForSimpleConsPropRefProperty(ctx);
} else if (
reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY &&
ctx instanceof ComplexConsiderationPropertyRef) {
//intermediate state in content assist -> block all canditates
return createBlockingFilter(ctx);
} else if (reference == ServiceDslPackage.Literals.MESSAGE_HEADER_REF__HEADER
&& ctx instanceof MessageHeaderRef) {
final VersionRef v = ((MessageHeaderRef) ctx).getVersionRef();
return createStateLessVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference==ServiceDslPackage.Literals.CAPABILITY_REF__VERSION_REF
&& ctx instanceof CapabilityRef) {
final VersionRef v = ((CapabilityRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference.eContainer() instanceof EClass && "operation".equals(reference.getName())
&& ctx instanceof RequiredServiceRef) {
return createFilterForOperationRef(ctx);
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY
&& ctx.eContainer() instanceof ConsiderationParameterRef) {
//FIXME obsolete
return createFilterForSimpleConsPropRefBelowConsParamRef(ctx);
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY && ctx instanceof ConsiderationParameterRef) {
try {
TypeRef typeRef = ((ConsiderationParameterRef) ctx).getParam().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
} catch (Throwable ex) {
logger.warn("Error resolving a SimpleConsiderationPropertyRef propertyRef of a ConsiderationParameterRef", ex);
}
} else if (reference == ServiceDslPackage.Literals.COMPLEX_CONSIDERATION_PROPERTY_REF__PARENT_PROPERTY && ctx instanceof ConsiderationParameterRef) {
try {
TypeRef typeRef = ((ConsiderationParameterRef) ctx).getParam().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
} catch (Throwable ex) {
logger.warn("Error resolving a ComplexConsiderationProperty parentPropertyRef of a ConsiderationParameterRef", ex);
}
} else if (reference == ServiceDslPackage.Literals.COMPLEX_CONSIDERATION_PROPERTY_REF__PARENT_PROPERTY && ctx instanceof ComplexConsiderationPropertyRef) {
//FIXME only required for content assist, resolution of static defined model leads to linking cycles
try {
TypeRef typeRef = ((ComplexConsiderationPropertyRef) ctx).getParentProperty().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
} catch (Throwable ex) {
// logger.debug("Error resolving a ComplexConsiderationProperty parentPropertyRef of a ComplexConsiderationPropertyRef", ex);
}
} else if (reference == SOABaseDslPackage.Literals.ASSET_REF__ASSET
&& ctx instanceof AssetRef) {
final VersionRef v = ((AssetRef) ctx).getVersionRef();
return createVersionFilter (v);
}
return new NullVersionFilter<IEObjectDescription>();
}
private AbstractPredicateVersionFilter<IEObjectDescription> createFilterForOperationRef(
EObject ctx) {
RequiredServiceRef requiredServiceRef = (RequiredServiceRef) ctx;
final VersionRef v = requiredServiceRef.getVersionRef();
final QualifiedName serviceName = nameProvider.getFullyQualifiedName(requiredServiceRef.getService());
AbstractPredicateVersionFilter<IEObjectDescription> versionFilter = createEContainerVersionFilter(v, objLookup.getVersionedOwner(ctx));
versionFilter.setPreFilterPredicate(new Predicate<IEObjectDescription>() {
public boolean apply(IEObjectDescription input) {
if (input.getQualifiedName().startsWith(serviceName))
return true;
else
return false;
}
});
return versionFilter;
}
private AbstractPredicateVersionFilter<IEObjectDescription> createFilterForSimpleConsPropRefProperty(
EObject ctx) {
TypeRef typeRef = null;
if (ctx.eContainer() instanceof ComplexConsiderationPropertyRef) {
typeRef = ((ComplexConsiderationPropertyRef) ctx.eContainer()).getParentProperty().getType();
} else if (ctx.eContainer() instanceof ConsiderationParameterRef){
typeRef = ((ConsiderationParameterRef) ctx.eContainer()).getParam().getType();
} else if (ctx.eContainer() instanceof SimpleConsiderationPropertyRef) {
typeRef = ((ConsiderationParameterRef) ctx.eContainer()).getParam().getType();
}
AbstractPredicateVersionFilter<IEObjectDescription> f = new NullVersionFilter<IEObjectDescription>();
if (typeRef instanceof BusinessObjectRef)
f = createVersionFilter (((BusinessObjectRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
else if (typeRef instanceof EnumTypeRef)
f = createVersionFilter (((EnumTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
if (typeRef instanceof VersionedTypeRef) {
f = createVersionFilter (((VersionedTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
VersionedTypeRef verTypeRef = (VersionedTypeRef) typeRef;
final QualifiedName verTypeName = nameProvider.getFullyQualifiedName (verTypeRef.getType());
f.setPreFilterPredicate(new Predicate<IEObjectDescription> () {
public boolean apply(IEObjectDescription input) {
QualifiedName qualifiedName = input.getQualifiedName();
if (qualifiedName.startsWith(verTypeName))
return true;
else
return false;
}
});
}
return f;
}
private AbstractPredicateVersionFilter<IEObjectDescription> createFilterForPropertyOfComplexConsPropertyRef(
EObject ctx) {
TypeRef typeRef = null;
if (ctx.eContainer() instanceof ComplexConsiderationPropertyRef) {
typeRef = ((ComplexConsiderationPropertyRef) ctx.eContainer()).getParentProperty().getType();
} else {
typeRef = ((ComplexConsiderationPropertyRef) ctx).getParentProperty().getType();
}
AbstractPredicateVersionFilter<IEObjectDescription> f = new NullVersionFilter<IEObjectDescription>();
if (typeRef instanceof BusinessObjectRef)
f = createVersionFilter (((BusinessObjectRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
else if (typeRef instanceof EnumTypeRef)
f = createVersionFilter (((EnumTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
if (typeRef instanceof VersionedTypeRef) {
f = createVersionFilter (((VersionedTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
VersionedTypeRef verTypeRef = (VersionedTypeRef) typeRef;
final QualifiedName verTypeName = nameProvider.getFullyQualifiedName (verTypeRef.getType());
f.setPreFilterPredicate(new Predicate<IEObjectDescription> () {
public boolean apply(IEObjectDescription input) {
QualifiedName qualifiedName = input.getQualifiedName();
if (qualifiedName.startsWith(verTypeName))
return true;
else
return false;
}
});
}
return f;
}
private AbstractPredicateVersionFilter<IEObjectDescription> createBlockingFilter (EObject ctx) {
AbstractPredicateVersionFilter<IEObjectDescription> f = new NullVersionFilter<IEObjectDescription>();
f.setPreFilterPredicate(new Predicate<IEObjectDescription> () {
public boolean apply(IEObjectDescription input) {
return false;
}
});
return f;
}
private AbstractPredicateVersionFilter<IEObjectDescription> createFilterForSimpleConsPropRefBelowConsParamRef(
EObject ctx) {
TypeRef typeRef = ((ConsiderationParameterRef) ctx.eContainer()).getParam().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
}
private AbstractPredicateVersionFilter<IEObjectDescription> getPropertyFilterFromTypeRef(
EObject ctx, TypeRef typeRef) {
AbstractPredicateVersionFilter<IEObjectDescription> versionFilter = new NullVersionFilter<IEObjectDescription>();
if (typeRef instanceof BusinessObjectRef) {
versionFilter = createEContainerVersionFilter (((BusinessObjectRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
BusinessObjectRef verTypeRef = (BusinessObjectRef) typeRef;
final QualifiedName verTypeName = nameProvider.getFullyQualifiedName (verTypeRef.getType());
versionFilter.setPreFilterPredicate(new Predicate<IEObjectDescription> () {
public boolean apply(IEObjectDescription input) {
if (input.getQualifiedName().startsWith(verTypeName))
return true;
else
return false;
}
});
} else if (typeRef instanceof EnumTypeRef) {
versionFilter = createEContainerVersionFilter (((EnumTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
} else if (typeRef instanceof VersionedTypeRef) {
versionFilter = createVersionFilter (((VersionedTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
VersionedTypeRef verTypeRef = (VersionedTypeRef) typeRef;
final QualifiedName verTypeName = nameProvider.getFullyQualifiedName (verTypeRef.getType());
versionFilter.setPreFilterPredicate(new Predicate<IEObjectDescription> () {
public boolean apply(IEObjectDescription input) {
if (input.getQualifiedName().startsWith(verTypeName))
return true;
else
return false;
}
});
}
return versionFilter;
}
private AbstractPredicateVersionFilter<IEObjectDescription> createConsiderationParameterScopeFilter(ConsiderationParameterRef paramRef) {
try {
Operation op = objLookup.getOwnerByType(paramRef, Operation.class);
if (op != null) {
Iterable<Parameter> params = Iterables.concat(op.getParameters(), op.getReturn());
final Iterable<QualifiedName> paramNames = Iterables.transform(params, new Function<Parameter, QualifiedName>() {
public QualifiedName apply(Parameter input) {
return nameProvider.getFullyQualifiedName(input);
}
});
AbstractPredicateVersionFilter<IEObjectDescription> filter = new NullVersionFilter<IEObjectDescription>();
filter.setPreFilterPredicate (new Predicate<IEObjectDescription>(){
public boolean apply(IEObjectDescription input) {
try {
for(QualifiedName paramName : paramNames) {
if (paramName.equals (input.getQualifiedName()))
return true;
}
} catch (Exception e) {
logger.error("Error filtering Parameters", e);
}
return false;
}
});
return filter;
}
} catch (Exception ex) {
logger.error("Error creating scope filter for ConsiderationParameterRefs", ex);
}
return null;
}
@Override
protected AbstractPredicateVersionFilter<IEObjectDescription> createVersionFilter(final VersionRef v, EObject owner) {
AbstractPredicateVersionFilter<IEObjectDescription> filter = new NullVersionFilter<IEObjectDescription>();
if (v != null) {
IScopeVersionResolver verResolver = new SimpleScopeVersionResolver (v.eResource().getResourceSet());
ILifecycleStateResolver stateResolver = new StateAttributeLifecycleStateResolver (v.eResource().getResourceSet());
LifecycleState ownerState = stateResolver.getLifecycleState(owner);
if (v instanceof MajorVersionRef) {
RelaxedLatestMajorVersionForOwnerStateFilter<IEObjectDescription> stateFilter = new RelaxedLatestMajorVersionForOwnerStateFilter<IEObjectDescription> (verResolver, new Integer(((MajorVersionRef)v).getMajorVersion()).toString(), stateResolver, ownerState);
injector.injectMembers (stateFilter);
return stateFilter;
}
if (v instanceof MaxVersionRef)
return new LatestMaxExclVersionFilter<IEObjectDescription>(verResolver, ((MaxVersionRef)v).getMaxVersion());
if (v instanceof MinVersionRef)
return new LatestMinInclVersionFilter<IEObjectDescription>(verResolver, ((MinVersionRef)v).getMinVersion());
if (v instanceof LowerBoundRangeVersionRef)
return new LatestMinInclMaxExclRangeVersionFilter<IEObjectDescription>(verResolver, ((LowerBoundRangeVersionRef)v).getMinVersion(), ((LowerBoundRangeVersionRef)v).getMaxVersion());
}
return filter;
}
private AbstractPredicateVersionFilter<IEObjectDescription> createStateLessVersionFilter(final VersionRef v, EObject owner) {
AbstractPredicateVersionFilter<IEObjectDescription> filter = new NullVersionFilter<IEObjectDescription>();
if (v != null) {
IScopeVersionResolver verResolver = new SimpleScopeVersionResolver (v.eResource().getResourceSet());
if (v instanceof MajorVersionRef)
return new LatestMajorVersionFilter<IEObjectDescription> (verResolver, new Integer(((MajorVersionRef)v).getMajorVersion()).toString());
if (v instanceof MaxVersionRef)
return new LatestMaxExclVersionFilter<IEObjectDescription> (verResolver, ((MaxVersionRef)v).getMaxVersion());
if (v instanceof MinVersionRef)
return new LatestMinInclVersionFilter<IEObjectDescription> (verResolver, ((MinVersionRef)v).getMinVersion());
if (v instanceof LowerBoundRangeVersionRef)
return new LatestMinInclMaxExclRangeVersionFilter<IEObjectDescription> (verResolver, ((LowerBoundRangeVersionRef)v).getMinVersion(), ((LowerBoundRangeVersionRef)v).getMaxVersion());
if (v instanceof FixedVersionRef)
return new FixedVersionFilter<IEObjectDescription>(verResolver, ((FixedVersionRef) v).getFixedVersion());
}
return filter;
}
private AbstractPredicateVersionFilter<IEObjectDescription> createEContainerVersionFilter(final VersionRef v, EObject owner) {
AbstractPredicateVersionFilter<IEObjectDescription> filter = new NullVersionFilter<IEObjectDescription>();
if (v != null) {
IScopeVersionResolver verResolver = new VersionedOwnerScopeVersionResolver (v.eResource().getResourceSet());
ILifecycleStateResolver stateResolver = new StateAttributeLifecycleStateResolver (v.eResource().getResourceSet());
LifecycleState ownerState = stateResolver.getLifecycleState(owner);
if (v instanceof MajorVersionRef) {
RelaxedLatestMajorVersionForOwnerStateFilter<IEObjectDescription> stateFilter = new RelaxedLatestMajorVersionForOwnerStateFilter<IEObjectDescription> (verResolver, new Integer(((MajorVersionRef)v).getMajorVersion()).toString(), stateResolver, ownerState);
injector.injectMembers (stateFilter);
return stateFilter;
}
if (v instanceof MaxVersionRef) {
RelaxedMaxVersionForOwnerStateFilter<IEObjectDescription> stateFilter = new RelaxedMaxVersionForOwnerStateFilter<IEObjectDescription> (verResolver, ((MaxVersionRef)v).getMaxVersion(), stateResolver, ownerState);
injector.injectMembers (stateFilter);
return stateFilter;
}
if (v instanceof MinVersionRef) {
RelaxedLatestMinVersionForOwnerStateFilter<IEObjectDescription> stateFilter = new RelaxedLatestMinVersionForOwnerStateFilter<IEObjectDescription> (verResolver, ((MinVersionRef)v).getMinVersion(), stateResolver, ownerState);
injector.injectMembers (stateFilter);
return stateFilter;
}
if (v instanceof LowerBoundRangeVersionRef) {
RelaxedLatestMinMaxVersionForOwnerStateFilter<IEObjectDescription> stateFilter = new RelaxedLatestMinMaxVersionForOwnerStateFilter<IEObjectDescription> (verResolver, ((LowerBoundRangeVersionRef)v).getMinVersion(), ((LowerBoundRangeVersionRef)v).getMaxVersion(), stateResolver, ownerState);
injector.injectMembers (stateFilter);
return stateFilter;
}
if (v instanceof FixedVersionRef)
return new FixedVersionFilter<IEObjectDescription>(verResolver, ((FixedVersionRef) v).getFixedVersion());
}
return filter;
}
}
| true | true | protected AbstractPredicateVersionFilter<IEObjectDescription> getVersionFilterFromContext (
EObject ctx, final EReference reference) {
if (reference==ServiceDslPackage.Literals.VERSIONED_TYPE_REF__TYPE
&& ctx instanceof VersionedTypeRef) {
final VersionRef v = ((VersionedTypeRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference==ServiceDslPackage.Literals.BUSINESS_OBJECT_REF__TYPE
&& ctx instanceof BusinessObjectRef) {
final VersionRef v = ((BusinessObjectRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
//FIXME verify this ref
} else if (reference==ServiceDslPackage.Literals.BUSINESS_OBJECT__SUPER_BUSINESS_OBJECT
&& ctx instanceof BusinessObjectRef) {
final VersionRef v = ((BusinessObjectRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.ENUM_TYPE_REF__TYPE
&& ctx instanceof EnumTypeRef) {
final VersionRef v = ((EnumTypeRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.SERVICE_REF__SERVICE
&& ctx instanceof ServiceRef) {
final VersionRef v = ((ServiceRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.EXCEPTION_REF__EXCEPTION
&& ctx instanceof ExceptionRef) {
final VersionRef v = ((ExceptionRef) ctx).getVersion();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.EVENT_REF__EVENT
&& ctx instanceof EventRef) {
final VersionRef v = ((EventRef) ctx).getVersionRef();
return createVersionFilter(v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.OPERATION_REF__OPERATION
&& ctx instanceof OperationRef) {
final VersionRef v = ((OperationRef) ctx).getVersionRef();
return createEContainerVersionFilter(v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.SIMPLE_OPERATION_REF__OPERATION
&& ctx instanceof SimpleOperationRef && ctx.eContainer() instanceof RequiredServiceRef) {
RequiredServiceRef requiredServiceRef = (RequiredServiceRef) ctx.eContainer();
final VersionRef v = requiredServiceRef.getVersionRef();
final QualifiedName serviceName = nameProvider.getFullyQualifiedName(requiredServiceRef.getService());
AbstractPredicateVersionFilter<IEObjectDescription> versionFilter = createEContainerVersionFilter(v, objLookup.getVersionedOwner(ctx));
versionFilter.setPreFilterPredicate(new Predicate<IEObjectDescription>() {
public boolean apply(IEObjectDescription input) {
if (input.getQualifiedName().startsWith(serviceName))
return true;
else
return false;
}
});
return versionFilter;
} else if (reference == ServiceDslPackage.Literals.CONSIDERATION_PARAMETER_REF__PARAM
&& ctx instanceof ConsiderationParameterRef
&& ctx.eContainer() instanceof ConsiderationSpec) {
ConsiderationParameterRef paramRef = (ConsiderationParameterRef)ctx;
AbstractPredicateVersionFilter<IEObjectDescription> scopeFilter = createConsiderationParameterScopeFilter(paramRef);
if (scopeFilter != null)
return scopeFilter;
} else if (reference == ServiceDslPackage.Literals.CONSIDERATION_PARAMETER_REF__PROPERTY_REF
&& ctx instanceof ConsiderationParameterRef) {
TypeRef typeRef = ((ConsiderationParameterRef) ctx).getParam().getType();
AbstractPredicateVersionFilter<IEObjectDescription> f = AbstractPredicateVersionFilter.NULL_VERSION_FILTER;
if (typeRef instanceof BusinessObjectRef)
f = createEContainerVersionFilter (((BusinessObjectRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
else if (typeRef instanceof EnumTypeRef)
f = createEContainerVersionFilter (((EnumTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
return f;
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF
&& ctx instanceof SimpleConsiderationPropertyRef) {
TypeRef typeRef = null;
if (ctx.eContainer() instanceof ComplexConsiderationPropertyRef) {
typeRef = ((ComplexConsiderationPropertyRef) ctx.eContainer()).getParentProperty().getType();
} else {
typeRef = ((SimpleConsiderationPropertyRef) ctx).getProperty().getType();
}
AbstractPredicateVersionFilter<IEObjectDescription> f = new NullVersionFilter<IEObjectDescription>();
if (typeRef instanceof BusinessObjectRef)
f = createEContainerVersionFilter (((BusinessObjectRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
else if (typeRef instanceof EnumTypeRef)
f = createEContainerVersionFilter (((EnumTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
if (typeRef instanceof VersionedTypeRef) {
VersionedTypeRef verTypeRef = (VersionedTypeRef) typeRef;
final QualifiedName verTypeName = nameProvider.getFullyQualifiedName (verTypeRef.getType());
f.setPreFilterPredicate(new Predicate<IEObjectDescription> () {
public boolean apply(IEObjectDescription input) {
if (input.getQualifiedName().startsWith(verTypeName))
return true;
else
return false;
}
});
}
return f;
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY
&& ctx instanceof SimpleConsiderationPropertyRef) {
return createFilterForSimpleConsPropRefProperty(ctx);
} else if (
reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY &&
ctx instanceof ComplexConsiderationPropertyRef) {
//intermediate state in content assist -> block all canditates
return createBlockingFilter(ctx);
} else if (reference == ServiceDslPackage.Literals.MESSAGE_HEADER_REF__HEADER
&& ctx instanceof MessageHeaderRef) {
final VersionRef v = ((MessageHeaderRef) ctx).getVersionRef();
return createStateLessVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference==ServiceDslPackage.Literals.CAPABILITY_REF__VERSION_REF
&& ctx instanceof CapabilityRef) {
final VersionRef v = ((CapabilityRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference.eContainer() instanceof EClass && "operation".equals(reference.getName())
&& ctx instanceof RequiredServiceRef) {
return createFilterForOperationRef(ctx);
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY
&& ctx.eContainer() instanceof ConsiderationParameterRef) {
//FIXME obsolete
return createFilterForSimpleConsPropRefBelowConsParamRef(ctx);
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY && ctx instanceof ConsiderationParameterRef) {
try {
TypeRef typeRef = ((ConsiderationParameterRef) ctx).getParam().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
} catch (Throwable ex) {
logger.warn("Error resolving a SimpleConsiderationPropertyRef propertyRef of a ConsiderationParameterRef", ex);
}
} else if (reference == ServiceDslPackage.Literals.COMPLEX_CONSIDERATION_PROPERTY_REF__PARENT_PROPERTY && ctx instanceof ConsiderationParameterRef) {
try {
TypeRef typeRef = ((ConsiderationParameterRef) ctx).getParam().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
} catch (Throwable ex) {
logger.warn("Error resolving a ComplexConsiderationProperty parentPropertyRef of a ConsiderationParameterRef", ex);
}
} else if (reference == ServiceDslPackage.Literals.COMPLEX_CONSIDERATION_PROPERTY_REF__PARENT_PROPERTY && ctx instanceof ComplexConsiderationPropertyRef) {
//FIXME only required for content assist, resolution of static defined model leads to linking cycles
try {
TypeRef typeRef = ((ComplexConsiderationPropertyRef) ctx).getParentProperty().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
} catch (Throwable ex) {
// logger.debug("Error resolving a ComplexConsiderationProperty parentPropertyRef of a ComplexConsiderationPropertyRef", ex);
}
} else if (reference == SOABaseDslPackage.Literals.ASSET_REF__ASSET
&& ctx instanceof AssetRef) {
final VersionRef v = ((AssetRef) ctx).getVersionRef();
return createVersionFilter (v);
}
return new NullVersionFilter<IEObjectDescription>();
}
| protected AbstractPredicateVersionFilter<IEObjectDescription> getVersionFilterFromContext (
EObject ctx, final EReference reference) {
if (reference==ServiceDslPackage.Literals.VERSIONED_TYPE_REF__TYPE
&& ctx instanceof VersionedTypeRef) {
final VersionRef v = ((VersionedTypeRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference==ServiceDslPackage.Literals.BUSINESS_OBJECT_REF__TYPE
&& ctx instanceof BusinessObjectRef) {
final VersionRef v = ((BusinessObjectRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
//FIXME verify this ref
} else if (reference==ServiceDslPackage.Literals.BUSINESS_OBJECT__SUPER_BUSINESS_OBJECT
&& ctx instanceof BusinessObjectRef) {
final VersionRef v = ((BusinessObjectRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.ENUM_TYPE_REF__TYPE
&& ctx instanceof EnumTypeRef) {
final VersionRef v = ((EnumTypeRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.SERVICE_REF__SERVICE
&& ctx instanceof ServiceRef) {
final VersionRef v = ((ServiceRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.EXCEPTION_REF__EXCEPTION
&& ctx instanceof ExceptionRef) {
final VersionRef v = ((ExceptionRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.EVENT_REF__EVENT
&& ctx instanceof EventRef) {
final VersionRef v = ((EventRef) ctx).getVersionRef();
return createVersionFilter(v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.OPERATION_REF__OPERATION
&& ctx instanceof OperationRef) {
final VersionRef v = ((OperationRef) ctx).getVersionRef();
return createEContainerVersionFilter(v, objLookup.getVersionedOwner(ctx));
} else if (reference == ServiceDslPackage.Literals.SIMPLE_OPERATION_REF__OPERATION
&& ctx instanceof SimpleOperationRef && ctx.eContainer() instanceof RequiredServiceRef) {
RequiredServiceRef requiredServiceRef = (RequiredServiceRef) ctx.eContainer();
final VersionRef v = requiredServiceRef.getVersionRef();
final QualifiedName serviceName = nameProvider.getFullyQualifiedName(requiredServiceRef.getService());
AbstractPredicateVersionFilter<IEObjectDescription> versionFilter = createEContainerVersionFilter(v, objLookup.getVersionedOwner(ctx));
versionFilter.setPreFilterPredicate(new Predicate<IEObjectDescription>() {
public boolean apply(IEObjectDescription input) {
if (input.getQualifiedName().startsWith(serviceName))
return true;
else
return false;
}
});
return versionFilter;
} else if (reference == ServiceDslPackage.Literals.CONSIDERATION_PARAMETER_REF__PARAM
&& ctx instanceof ConsiderationParameterRef
&& ctx.eContainer() instanceof ConsiderationSpec) {
ConsiderationParameterRef paramRef = (ConsiderationParameterRef)ctx;
AbstractPredicateVersionFilter<IEObjectDescription> scopeFilter = createConsiderationParameterScopeFilter(paramRef);
if (scopeFilter != null)
return scopeFilter;
} else if (reference == ServiceDslPackage.Literals.CONSIDERATION_PARAMETER_REF__PROPERTY_REF
&& ctx instanceof ConsiderationParameterRef) {
TypeRef typeRef = ((ConsiderationParameterRef) ctx).getParam().getType();
AbstractPredicateVersionFilter<IEObjectDescription> f = AbstractPredicateVersionFilter.NULL_VERSION_FILTER;
if (typeRef instanceof BusinessObjectRef)
f = createEContainerVersionFilter (((BusinessObjectRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
else if (typeRef instanceof EnumTypeRef)
f = createEContainerVersionFilter (((EnumTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
return f;
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF
&& ctx instanceof SimpleConsiderationPropertyRef) {
TypeRef typeRef = null;
if (ctx.eContainer() instanceof ComplexConsiderationPropertyRef) {
typeRef = ((ComplexConsiderationPropertyRef) ctx.eContainer()).getParentProperty().getType();
} else {
typeRef = ((SimpleConsiderationPropertyRef) ctx).getProperty().getType();
}
AbstractPredicateVersionFilter<IEObjectDescription> f = new NullVersionFilter<IEObjectDescription>();
if (typeRef instanceof BusinessObjectRef)
f = createEContainerVersionFilter (((BusinessObjectRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
else if (typeRef instanceof EnumTypeRef)
f = createEContainerVersionFilter (((EnumTypeRef)typeRef).getVersionRef(), objLookup.getVersionedOwner(ctx));
if (typeRef instanceof VersionedTypeRef) {
VersionedTypeRef verTypeRef = (VersionedTypeRef) typeRef;
final QualifiedName verTypeName = nameProvider.getFullyQualifiedName (verTypeRef.getType());
f.setPreFilterPredicate(new Predicate<IEObjectDescription> () {
public boolean apply(IEObjectDescription input) {
if (input.getQualifiedName().startsWith(verTypeName))
return true;
else
return false;
}
});
}
return f;
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY
&& ctx instanceof SimpleConsiderationPropertyRef) {
return createFilterForSimpleConsPropRefProperty(ctx);
} else if (
reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY &&
ctx instanceof ComplexConsiderationPropertyRef) {
//intermediate state in content assist -> block all canditates
return createBlockingFilter(ctx);
} else if (reference == ServiceDslPackage.Literals.MESSAGE_HEADER_REF__HEADER
&& ctx instanceof MessageHeaderRef) {
final VersionRef v = ((MessageHeaderRef) ctx).getVersionRef();
return createStateLessVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference==ServiceDslPackage.Literals.CAPABILITY_REF__VERSION_REF
&& ctx instanceof CapabilityRef) {
final VersionRef v = ((CapabilityRef) ctx).getVersionRef();
return createVersionFilter (v, objLookup.getVersionedOwner(ctx));
} else if (reference.eContainer() instanceof EClass && "operation".equals(reference.getName())
&& ctx instanceof RequiredServiceRef) {
return createFilterForOperationRef(ctx);
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY
&& ctx.eContainer() instanceof ConsiderationParameterRef) {
//FIXME obsolete
return createFilterForSimpleConsPropRefBelowConsParamRef(ctx);
} else if (reference == ServiceDslPackage.Literals.SIMPLE_CONSIDERATION_PROPERTY_REF__PROPERTY && ctx instanceof ConsiderationParameterRef) {
try {
TypeRef typeRef = ((ConsiderationParameterRef) ctx).getParam().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
} catch (Throwable ex) {
logger.warn("Error resolving a SimpleConsiderationPropertyRef propertyRef of a ConsiderationParameterRef", ex);
}
} else if (reference == ServiceDslPackage.Literals.COMPLEX_CONSIDERATION_PROPERTY_REF__PARENT_PROPERTY && ctx instanceof ConsiderationParameterRef) {
try {
TypeRef typeRef = ((ConsiderationParameterRef) ctx).getParam().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
} catch (Throwable ex) {
logger.warn("Error resolving a ComplexConsiderationProperty parentPropertyRef of a ConsiderationParameterRef", ex);
}
} else if (reference == ServiceDslPackage.Literals.COMPLEX_CONSIDERATION_PROPERTY_REF__PARENT_PROPERTY && ctx instanceof ComplexConsiderationPropertyRef) {
//FIXME only required for content assist, resolution of static defined model leads to linking cycles
try {
TypeRef typeRef = ((ComplexConsiderationPropertyRef) ctx).getParentProperty().getType();
return getPropertyFilterFromTypeRef(ctx, typeRef);
} catch (Throwable ex) {
// logger.debug("Error resolving a ComplexConsiderationProperty parentPropertyRef of a ComplexConsiderationPropertyRef", ex);
}
} else if (reference == SOABaseDslPackage.Literals.ASSET_REF__ASSET
&& ctx instanceof AssetRef) {
final VersionRef v = ((AssetRef) ctx).getVersionRef();
return createVersionFilter (v);
}
return new NullVersionFilter<IEObjectDescription>();
}
|
diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
index 3dc0896c..6f897cbb 100644
--- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
+++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
@@ -1,168 +1,168 @@
package net.osmand.plus.voice;
import java.io.File;
import java.util.List;
import java.util.Locale;
import net.osmand.Algoritms;
import net.osmand.plus.R;
import net.osmand.plus.activities.SettingsActivity;
import alice.tuprolog.Struct;
import alice.tuprolog.Term;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech.OnInitListener;
public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
private final class IntentStarter implements
DialogInterface.OnClickListener {
private final Context ctx;
private final String intentAction;
private final Uri intentData;
private IntentStarter(Context ctx, String intentAction) {
this(ctx,intentAction, null);
}
private IntentStarter(Context ctx, String intentAction, Uri intentData) {
this.ctx = ctx;
this.intentAction = intentAction;
this.intentData = intentData;
}
@Override
public void onClick(DialogInterface dialog, int which) {
Intent installIntent = new Intent();
installIntent.setAction(intentAction);
if (intentData != null) {
installIntent.setData(intentData);
}
ctx.startActivity(installIntent);
}
}
private static final String CONFIG_FILE = "_ttsconfig.p";
private static final int[] TTS_VOICE_VERSION = new int[] { 100, 101 }; // !! MUST BE SORTED
private TextToSpeech mTts;
private Context mTtsContext;
private String language;
protected TTSCommandPlayerImpl(Activity ctx, String voiceProvider)
throws CommandPlayerException {
super(ctx, voiceProvider, CONFIG_FILE, TTS_VOICE_VERSION);
final Term langVal = solveSimplePredicate("language");
if (langVal instanceof Struct) {
language = ((Struct) langVal).getName();
}
if (Algoritms.isEmpty(language)) {
throw new CommandPlayerException(
ctx.getString(R.string.voice_data_corrupted));
}
initializeEngine(ctx.getApplicationContext(), ctx);
}
@Override
public void playCommands(CommandBuilder builder) {
if (mTts != null) {
final List<String> execute = builder.execute(); //list of strings, the speech text, play it
StringBuilder bld = new StringBuilder();
for (String s : execute) {
bld.append(s).append(' ');
}
mTts.speak(bld.toString(), TextToSpeech.QUEUE_ADD, null);
}
}
private void initializeEngine(final Context ctx, final Activity act)
{
if (mTts != null && mTtsContext != ctx) {
internalClear();
}
if (mTts == null) {
mTtsContext = ctx;
mTts = new TextToSpeech(ctx, new OnInitListener() {
@Override
public void onInit(int status) {
if (status != TextToSpeech.SUCCESS) {
internalClear();
} else if (mTts != null) {
switch (mTts.isLanguageAvailable(new Locale(language)))
{
case TextToSpeech.LANG_MISSING_DATA:
if (isSettingsActivity(act)) {
Builder builder = createAlertDialog(
R.string.tts_missing_language_data_title,
R.string.tts_missing_language_data,
new IntentStarter(
- ctx,
+ act,
TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA),
act);
builder.show();
}
break;
case TextToSpeech.LANG_AVAILABLE:
mTts.setLanguage(new Locale(language));
break;
case TextToSpeech.LANG_NOT_SUPPORTED:
//maybe weird, but I didn't want to introduce parameter in around 5 methods just to do
//this if condition
if (isSettingsActivity(act)) {
Builder builder = createAlertDialog(
R.string.tts_language_not_supported_title,
R.string.tts_language_not_supported,
new IntentStarter(
- ctx,
+ act,
Intent.ACTION_VIEW, Uri.parse("market://search?q=text to speech engine"
)),
act);
builder.show();
}
break;
}
}
}
private boolean isSettingsActivity(final Context ctx) {
return ctx instanceof SettingsActivity;
}
});
}
}
private Builder createAlertDialog(int titleResID, int messageResID,
IntentStarter intentStarter, final Activity ctx) {
Builder builder = new AlertDialog.Builder(ctx);
builder.setCancelable(true);
builder.setNegativeButton(R.string.default_buttons_no, null);
builder.setPositiveButton(R.string.default_buttons_yes, intentStarter);
builder.setTitle(titleResID);
builder.setMessage(messageResID);
return builder;
}
private void internalClear() {
if (mTts != null) {
mTts.shutdown();
mTtsContext = null;
mTts = null;
}
}
@Override
public void clear() {
super.clear();
internalClear();
}
public static boolean isMyData(File voiceDir) throws CommandPlayerException {
return new File(voiceDir, CONFIG_FILE).exists();
}
}
| false | true | private void initializeEngine(final Context ctx, final Activity act)
{
if (mTts != null && mTtsContext != ctx) {
internalClear();
}
if (mTts == null) {
mTtsContext = ctx;
mTts = new TextToSpeech(ctx, new OnInitListener() {
@Override
public void onInit(int status) {
if (status != TextToSpeech.SUCCESS) {
internalClear();
} else if (mTts != null) {
switch (mTts.isLanguageAvailable(new Locale(language)))
{
case TextToSpeech.LANG_MISSING_DATA:
if (isSettingsActivity(act)) {
Builder builder = createAlertDialog(
R.string.tts_missing_language_data_title,
R.string.tts_missing_language_data,
new IntentStarter(
ctx,
TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA),
act);
builder.show();
}
break;
case TextToSpeech.LANG_AVAILABLE:
mTts.setLanguage(new Locale(language));
break;
case TextToSpeech.LANG_NOT_SUPPORTED:
//maybe weird, but I didn't want to introduce parameter in around 5 methods just to do
//this if condition
if (isSettingsActivity(act)) {
Builder builder = createAlertDialog(
R.string.tts_language_not_supported_title,
R.string.tts_language_not_supported,
new IntentStarter(
ctx,
Intent.ACTION_VIEW, Uri.parse("market://search?q=text to speech engine"
)),
act);
builder.show();
}
break;
}
}
}
private boolean isSettingsActivity(final Context ctx) {
return ctx instanceof SettingsActivity;
}
});
}
}
| private void initializeEngine(final Context ctx, final Activity act)
{
if (mTts != null && mTtsContext != ctx) {
internalClear();
}
if (mTts == null) {
mTtsContext = ctx;
mTts = new TextToSpeech(ctx, new OnInitListener() {
@Override
public void onInit(int status) {
if (status != TextToSpeech.SUCCESS) {
internalClear();
} else if (mTts != null) {
switch (mTts.isLanguageAvailable(new Locale(language)))
{
case TextToSpeech.LANG_MISSING_DATA:
if (isSettingsActivity(act)) {
Builder builder = createAlertDialog(
R.string.tts_missing_language_data_title,
R.string.tts_missing_language_data,
new IntentStarter(
act,
TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA),
act);
builder.show();
}
break;
case TextToSpeech.LANG_AVAILABLE:
mTts.setLanguage(new Locale(language));
break;
case TextToSpeech.LANG_NOT_SUPPORTED:
//maybe weird, but I didn't want to introduce parameter in around 5 methods just to do
//this if condition
if (isSettingsActivity(act)) {
Builder builder = createAlertDialog(
R.string.tts_language_not_supported_title,
R.string.tts_language_not_supported,
new IntentStarter(
act,
Intent.ACTION_VIEW, Uri.parse("market://search?q=text to speech engine"
)),
act);
builder.show();
}
break;
}
}
}
private boolean isSettingsActivity(final Context ctx) {
return ctx instanceof SettingsActivity;
}
});
}
}
|
diff --git a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
index ada305787..694677c8c 100644
--- a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -1,163 +1,163 @@
package hudson.maven;
import hudson.FilePath.FileCallable;
import hudson.model.AbstractBuild;
import hudson.model.Build;
import hudson.model.BuildListener;
import hudson.model.Hudson;
import hudson.model.Result;
import hudson.remoting.VirtualChannel;
import hudson.util.IOException2;
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* {@link Build} for {@link MavenModuleSet}.
*
* <p>
* A "build" of {@link MavenModuleSet} consists of:
*
* <ol>
* <li>Update the workspace.
* <li>Parse POMs
* <li>Trigger module builds.
* </ol>
*
* This object remembers the changelog and what {@link MavenBuild}s are done
* on this.
*
* @author Kohsuke Kawaguchi
*/
public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,MavenModuleSetBuild> {
public MavenModuleSetBuild(MavenModuleSet job) throws IOException {
super(job);
}
MavenModuleSetBuild(MavenModuleSet project, File buildDir) throws IOException {
super(project, buildDir);
}
public void run() {
run(new RunnerImpl());
}
/**
* The sole job of the {@link MavenModuleSet} build is to update SCM
* and triggers module builds.
*/
private class RunnerImpl extends AbstractRunner {
protected Result doRun(final BuildListener listener) throws Exception {
try {
listener.getLogger().println("Parsing POMs");
- List<PomInfo> poms = project.getWorkspace().act(new PomParser(listener,project.getRootPOM()));
+ List<PomInfo> poms = project.getModuleRoot().act(new PomParser(listener,project.getRootPOM()));
// update the module list
Map<ModuleName,MavenModule> modules = project.modules;
synchronized(modules) {
Map<ModuleName,MavenModule> old = new HashMap<ModuleName, MavenModule>(modules);
modules.clear();
project.reconfigure(poms.get(0));
for (PomInfo pom : poms) {
MavenModule mm = old.get(pom.name);
if(mm!=null) {// found an existing matching module
mm.reconfigure(pom);
modules.put(pom.name,mm);
} else {// this looks like a new module
mm = new MavenModule(project,pom);
modules.put(mm.getModuleName(),mm);
}
mm.save();
}
// remaining modules are no longer active.
old.keySet().removeAll(modules.keySet());
for (MavenModule om : old.values())
om.disable();
modules.putAll(old);
}
Hudson.getInstance().rebuildDependencyGraph();
// start the build
listener.getLogger().println("Triggering "+project.getRootModule().getModuleName());
project.getRootModule().scheduleBuild();
return null;
} catch (AbortException e) {
// error should have been already reported.
return Result.FAILURE;
} catch (IOException e) {
e.printStackTrace(listener.error("Failed to parse POMs"));
return Result.FAILURE;
} catch (InterruptedException e) {
e.printStackTrace(listener.error("Aborted"));
return Result.FAILURE;
} catch (RuntimeException e) {
// bug in the code.
e.printStackTrace(listener.error("Processing failed due to a bug in the code. Please report thus to [email protected]"));
throw e;
}
}
public void post(BuildListener listener) {
}
}
private static final class PomParser implements FileCallable<List<PomInfo>> {
private final BuildListener listener;
private final String rootPOM;
public PomParser(BuildListener listener, String rootPOM) {
this.listener = listener;
this.rootPOM = rootPOM;
}
public List<PomInfo> invoke(File ws, VirtualChannel channel) throws IOException {
File pom = new File(ws,rootPOM);
if(!pom.exists()) {
listener.getLogger().println("No such file "+pom);
listener.getLogger().println("Perhaps you need to specify the correct POM file path in the project configuration?");
throw new AbortException();
}
try {
MavenEmbedder embedder = MavenUtil.createEmbedder(listener);
MavenProject mp = embedder.readProject(pom);
Map<MavenProject,String> relPath = new HashMap<MavenProject,String>();
MavenUtil.resolveModules(embedder,mp,"",relPath);
List<PomInfo> infos = new ArrayList<PomInfo>();
toPomInfo(mp,relPath,infos);
return infos;
} catch (MavenEmbedderException e) {
// TODO: better error handling needed
throw new IOException2(e);
} catch (ProjectBuildingException e) {
throw new IOException2(e);
}
}
private void toPomInfo(MavenProject mp, Map<MavenProject,String> relPath, List<PomInfo> infos) {
infos.add(new PomInfo(mp,relPath.get(mp)));
for (MavenProject child : (List<MavenProject>)mp.getCollectedProjects())
toPomInfo(child,relPath,infos);
}
private static final long serialVersionUID = 1L;
}
private static class AbortException extends IOException {
private static final long serialVersionUID = 1L;
}
}
| true | true | protected Result doRun(final BuildListener listener) throws Exception {
try {
listener.getLogger().println("Parsing POMs");
List<PomInfo> poms = project.getWorkspace().act(new PomParser(listener,project.getRootPOM()));
// update the module list
Map<ModuleName,MavenModule> modules = project.modules;
synchronized(modules) {
Map<ModuleName,MavenModule> old = new HashMap<ModuleName, MavenModule>(modules);
modules.clear();
project.reconfigure(poms.get(0));
for (PomInfo pom : poms) {
MavenModule mm = old.get(pom.name);
if(mm!=null) {// found an existing matching module
mm.reconfigure(pom);
modules.put(pom.name,mm);
} else {// this looks like a new module
mm = new MavenModule(project,pom);
modules.put(mm.getModuleName(),mm);
}
mm.save();
}
// remaining modules are no longer active.
old.keySet().removeAll(modules.keySet());
for (MavenModule om : old.values())
om.disable();
modules.putAll(old);
}
Hudson.getInstance().rebuildDependencyGraph();
// start the build
listener.getLogger().println("Triggering "+project.getRootModule().getModuleName());
project.getRootModule().scheduleBuild();
return null;
} catch (AbortException e) {
// error should have been already reported.
return Result.FAILURE;
} catch (IOException e) {
e.printStackTrace(listener.error("Failed to parse POMs"));
return Result.FAILURE;
} catch (InterruptedException e) {
e.printStackTrace(listener.error("Aborted"));
return Result.FAILURE;
} catch (RuntimeException e) {
// bug in the code.
e.printStackTrace(listener.error("Processing failed due to a bug in the code. Please report thus to [email protected]"));
throw e;
}
}
| protected Result doRun(final BuildListener listener) throws Exception {
try {
listener.getLogger().println("Parsing POMs");
List<PomInfo> poms = project.getModuleRoot().act(new PomParser(listener,project.getRootPOM()));
// update the module list
Map<ModuleName,MavenModule> modules = project.modules;
synchronized(modules) {
Map<ModuleName,MavenModule> old = new HashMap<ModuleName, MavenModule>(modules);
modules.clear();
project.reconfigure(poms.get(0));
for (PomInfo pom : poms) {
MavenModule mm = old.get(pom.name);
if(mm!=null) {// found an existing matching module
mm.reconfigure(pom);
modules.put(pom.name,mm);
} else {// this looks like a new module
mm = new MavenModule(project,pom);
modules.put(mm.getModuleName(),mm);
}
mm.save();
}
// remaining modules are no longer active.
old.keySet().removeAll(modules.keySet());
for (MavenModule om : old.values())
om.disable();
modules.putAll(old);
}
Hudson.getInstance().rebuildDependencyGraph();
// start the build
listener.getLogger().println("Triggering "+project.getRootModule().getModuleName());
project.getRootModule().scheduleBuild();
return null;
} catch (AbortException e) {
// error should have been already reported.
return Result.FAILURE;
} catch (IOException e) {
e.printStackTrace(listener.error("Failed to parse POMs"));
return Result.FAILURE;
} catch (InterruptedException e) {
e.printStackTrace(listener.error("Aborted"));
return Result.FAILURE;
} catch (RuntimeException e) {
// bug in the code.
e.printStackTrace(listener.error("Processing failed due to a bug in the code. Please report thus to [email protected]"));
throw e;
}
}
|
diff --git a/org.emftext.sdk.codegen.resource.ui/src/org/emftext/sdk/codegen/resource/ui/generators/ui/CompletionProcessorGenerator.java b/org.emftext.sdk.codegen.resource.ui/src/org/emftext/sdk/codegen/resource/ui/generators/ui/CompletionProcessorGenerator.java
index 7e08083b0..d5c4a0edd 100644
--- a/org.emftext.sdk.codegen.resource.ui/src/org/emftext/sdk/codegen/resource/ui/generators/ui/CompletionProcessorGenerator.java
+++ b/org.emftext.sdk.codegen.resource.ui/src/org/emftext/sdk/codegen/resource/ui/generators/ui/CompletionProcessorGenerator.java
@@ -1,159 +1,162 @@
/*******************************************************************************
* Copyright (c) 2006-2012
* Software Technology Group, Dresden University of Technology
* DevBoost GmbH, Berlin, Amtsgericht Charlottenburg, HRB 140026
*
* 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:
* Software Technology Group - TU Dresden, Germany;
* DevBoost GmbH - Berlin, Germany
* - initial API and implementation
******************************************************************************/
package org.emftext.sdk.codegen.resource.ui.generators.ui;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.ARRAYS;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.ARRAY_LIST;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.COLLECTIONS;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.COMPLETION_PROPOSAL;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.CONTEXT_INFORMATION;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.IMAGE;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.I_COMPLETION_PROPOSAL;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.I_CONTENT_ASSIST_PROCESSOR;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.I_CONTEXT_INFORMATION;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.I_CONTEXT_INFORMATION_VALIDATOR;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.I_TEXT_VIEWER;
import static org.emftext.sdk.codegen.resource.ui.IUIClassNameConstants.LIST;
import org.emftext.sdk.codegen.composites.JavaComposite;
import org.emftext.sdk.codegen.composites.StringComposite;
import org.emftext.sdk.codegen.parameters.ArtifactParameter;
import org.emftext.sdk.codegen.resource.GenerationContext;
import org.emftext.sdk.codegen.resource.ui.generators.UIJavaBaseGenerator;
public class CompletionProcessorGenerator extends UIJavaBaseGenerator<ArtifactParameter<GenerationContext>> {
public void generateJavaContents(JavaComposite sc) {
sc.add("package " + getResourcePackageName() + ";");
sc.addLineBreak();
sc.add("public class " + getResourceClassName() + " implements " + I_CONTENT_ASSIST_PROCESSOR + " {");
sc.addLineBreak();
addFields(sc);
addConstructor(sc);
addMethods(sc);
sc.add("}");
}
private void addFields(StringComposite sc) {
sc.add("private " + iResourceProviderClassName + " resourceProvider;");
sc.add("private " + iBracketHandlerProviderClassName + " bracketHandlerProvider;");
sc.addLineBreak();
}
private void addMethods(JavaComposite sc) {
addComputeCompletionProposalsMethod(sc);
addComputeContextInformationMethod(sc);
addGetCompletionProposalAutoActivationCharactersMethod(sc);
addGetContextInformationAutoActivationCharactersMethod(sc);
addGetContextInformationValidatorMethod(sc);
addGetErrorMessageMethod(sc);
}
private void addGetErrorMessageMethod(StringComposite sc) {
sc.add("public String getErrorMessage() {");
sc.add("return null;");
sc.add("}");
}
private void addGetContextInformationValidatorMethod(StringComposite sc) {
sc.add("public " + I_CONTEXT_INFORMATION_VALIDATOR + " getContextInformationValidator() {");
sc.add("return null;");
sc.add("}");
sc.addLineBreak();
}
private void addGetContextInformationAutoActivationCharactersMethod(StringComposite sc) {
sc.add("public char[] getContextInformationAutoActivationCharacters() {");
sc.add("return null;");
sc.add("}");
sc.addLineBreak();
}
private void addGetCompletionProposalAutoActivationCharactersMethod(StringComposite sc) {
sc.add("public char[] getCompletionProposalAutoActivationCharacters() {");
sc.add("return null;");
sc.add("}");
sc.addLineBreak();
}
private void addComputeContextInformationMethod(StringComposite sc) {
sc.add("public " + I_CONTEXT_INFORMATION + "[] computeContextInformation(" + I_TEXT_VIEWER + " viewer, int offset) {");
sc.add("return null;");
sc.add("}");
sc.addLineBreak();
}
private void addComputeCompletionProposalsMethod(JavaComposite sc) {
sc.add("public " + I_COMPLETION_PROPOSAL + "[] computeCompletionProposals(" + I_TEXT_VIEWER + " viewer, int offset) {");
sc.add(iTextResourceClassName + " textResource = resourceProvider.getResource();");
+ sc.add("if (textResource == null) {");
+ sc.add("return new " + I_COMPLETION_PROPOSAL + "[0];");
+ sc.add("}");
sc.add("String content = viewer.getDocument().get();");
sc.add(codeCompletionHelperClassName + " helper = new " + codeCompletionHelperClassName + "();");
sc.add(completionProposalClassName + "[] computedProposals = helper.computeCompletionProposals(textResource, content, offset);");
sc.addLineBreak();
sc.addComment("call completion proposal post processor to allow for customizing the proposals");
sc.add(proposalPostProcessorClassName + " proposalPostProcessor = new " + proposalPostProcessorClassName + "();");
sc.add(LIST + "<" + completionProposalClassName + "> computedProposalList = " + ARRAYS + ".asList(computedProposals);");
sc.add(LIST + "<" + completionProposalClassName + "> extendedProposalList = proposalPostProcessor.process(computedProposalList);");
sc.add("if (extendedProposalList == null) {");
sc.add("extendedProposalList = " + COLLECTIONS + ".emptyList();");
sc.add("}");
sc.add(LIST + "<" + completionProposalClassName + "> finalProposalList = new " + ARRAY_LIST + "<" + completionProposalClassName + ">();");
sc.add("for (" + completionProposalClassName + " proposal : extendedProposalList) {");
sc.add("if (proposal.getMatchesPrefix()) {");
sc.add("finalProposalList.add(proposal);");
sc.add("}");
sc.add("}");
sc.add(I_COMPLETION_PROPOSAL + "[] result = new " + I_COMPLETION_PROPOSAL + "[finalProposalList.size()];");
sc.add("int i = 0;");
sc.add("for (" + completionProposalClassName + " proposal : finalProposalList) {");
sc.add("String proposalString = proposal.getInsertString();");
sc.add("String displayString = proposal.getDisplayString();");
sc.add("String prefix = proposal.getPrefix();");
sc.add(IMAGE + " image = proposal.getImage();");
sc.add(I_CONTEXT_INFORMATION + " info;");
sc.add("info = new " + CONTEXT_INFORMATION + "(image, proposalString, proposalString);");
sc.add("int begin = offset - prefix.length();");
sc.add("int replacementLength = prefix.length();");
sc.addComment(
"if a closing bracket was automatically inserted right before, " +
"we enlarge the replacement length in order to overwrite the bracket."
);
sc.add(iBracketHandlerClassName + " bracketHandler = bracketHandlerProvider.getBracketHandler();");
sc.add("String closingBracket = bracketHandler.getClosingBracket();");
sc.add("if (bracketHandler.addedClosingBracket() && proposalString.endsWith(closingBracket)) {");
sc.add("replacementLength += closingBracket.length();");
sc.add("}");
sc.add("result[i++] = new " + COMPLETION_PROPOSAL + "(proposalString, begin, replacementLength, proposalString.length(), image, displayString, info, proposalString);");
sc.add("}");
sc.add("return result;");
sc.add("}");
sc.addLineBreak();
}
private void addConstructor(StringComposite sc) {
sc.add("public " + getResourceClassName() + "(" + iResourceProviderClassName + " resourceProvider, " + iBracketHandlerProviderClassName + " bracketHandlerProvider) {");
sc.add("this.resourceProvider = resourceProvider;");
sc.add("this.bracketHandlerProvider = bracketHandlerProvider;");
sc.add("}");
sc.addLineBreak();
}
}
| true | true | private void addComputeCompletionProposalsMethod(JavaComposite sc) {
sc.add("public " + I_COMPLETION_PROPOSAL + "[] computeCompletionProposals(" + I_TEXT_VIEWER + " viewer, int offset) {");
sc.add(iTextResourceClassName + " textResource = resourceProvider.getResource();");
sc.add("String content = viewer.getDocument().get();");
sc.add(codeCompletionHelperClassName + " helper = new " + codeCompletionHelperClassName + "();");
sc.add(completionProposalClassName + "[] computedProposals = helper.computeCompletionProposals(textResource, content, offset);");
sc.addLineBreak();
sc.addComment("call completion proposal post processor to allow for customizing the proposals");
sc.add(proposalPostProcessorClassName + " proposalPostProcessor = new " + proposalPostProcessorClassName + "();");
sc.add(LIST + "<" + completionProposalClassName + "> computedProposalList = " + ARRAYS + ".asList(computedProposals);");
sc.add(LIST + "<" + completionProposalClassName + "> extendedProposalList = proposalPostProcessor.process(computedProposalList);");
sc.add("if (extendedProposalList == null) {");
sc.add("extendedProposalList = " + COLLECTIONS + ".emptyList();");
sc.add("}");
sc.add(LIST + "<" + completionProposalClassName + "> finalProposalList = new " + ARRAY_LIST + "<" + completionProposalClassName + ">();");
sc.add("for (" + completionProposalClassName + " proposal : extendedProposalList) {");
sc.add("if (proposal.getMatchesPrefix()) {");
sc.add("finalProposalList.add(proposal);");
sc.add("}");
sc.add("}");
sc.add(I_COMPLETION_PROPOSAL + "[] result = new " + I_COMPLETION_PROPOSAL + "[finalProposalList.size()];");
sc.add("int i = 0;");
sc.add("for (" + completionProposalClassName + " proposal : finalProposalList) {");
sc.add("String proposalString = proposal.getInsertString();");
sc.add("String displayString = proposal.getDisplayString();");
sc.add("String prefix = proposal.getPrefix();");
sc.add(IMAGE + " image = proposal.getImage();");
sc.add(I_CONTEXT_INFORMATION + " info;");
sc.add("info = new " + CONTEXT_INFORMATION + "(image, proposalString, proposalString);");
sc.add("int begin = offset - prefix.length();");
sc.add("int replacementLength = prefix.length();");
sc.addComment(
"if a closing bracket was automatically inserted right before, " +
"we enlarge the replacement length in order to overwrite the bracket."
);
sc.add(iBracketHandlerClassName + " bracketHandler = bracketHandlerProvider.getBracketHandler();");
sc.add("String closingBracket = bracketHandler.getClosingBracket();");
sc.add("if (bracketHandler.addedClosingBracket() && proposalString.endsWith(closingBracket)) {");
sc.add("replacementLength += closingBracket.length();");
sc.add("}");
sc.add("result[i++] = new " + COMPLETION_PROPOSAL + "(proposalString, begin, replacementLength, proposalString.length(), image, displayString, info, proposalString);");
sc.add("}");
sc.add("return result;");
sc.add("}");
sc.addLineBreak();
}
| private void addComputeCompletionProposalsMethod(JavaComposite sc) {
sc.add("public " + I_COMPLETION_PROPOSAL + "[] computeCompletionProposals(" + I_TEXT_VIEWER + " viewer, int offset) {");
sc.add(iTextResourceClassName + " textResource = resourceProvider.getResource();");
sc.add("if (textResource == null) {");
sc.add("return new " + I_COMPLETION_PROPOSAL + "[0];");
sc.add("}");
sc.add("String content = viewer.getDocument().get();");
sc.add(codeCompletionHelperClassName + " helper = new " + codeCompletionHelperClassName + "();");
sc.add(completionProposalClassName + "[] computedProposals = helper.computeCompletionProposals(textResource, content, offset);");
sc.addLineBreak();
sc.addComment("call completion proposal post processor to allow for customizing the proposals");
sc.add(proposalPostProcessorClassName + " proposalPostProcessor = new " + proposalPostProcessorClassName + "();");
sc.add(LIST + "<" + completionProposalClassName + "> computedProposalList = " + ARRAYS + ".asList(computedProposals);");
sc.add(LIST + "<" + completionProposalClassName + "> extendedProposalList = proposalPostProcessor.process(computedProposalList);");
sc.add("if (extendedProposalList == null) {");
sc.add("extendedProposalList = " + COLLECTIONS + ".emptyList();");
sc.add("}");
sc.add(LIST + "<" + completionProposalClassName + "> finalProposalList = new " + ARRAY_LIST + "<" + completionProposalClassName + ">();");
sc.add("for (" + completionProposalClassName + " proposal : extendedProposalList) {");
sc.add("if (proposal.getMatchesPrefix()) {");
sc.add("finalProposalList.add(proposal);");
sc.add("}");
sc.add("}");
sc.add(I_COMPLETION_PROPOSAL + "[] result = new " + I_COMPLETION_PROPOSAL + "[finalProposalList.size()];");
sc.add("int i = 0;");
sc.add("for (" + completionProposalClassName + " proposal : finalProposalList) {");
sc.add("String proposalString = proposal.getInsertString();");
sc.add("String displayString = proposal.getDisplayString();");
sc.add("String prefix = proposal.getPrefix();");
sc.add(IMAGE + " image = proposal.getImage();");
sc.add(I_CONTEXT_INFORMATION + " info;");
sc.add("info = new " + CONTEXT_INFORMATION + "(image, proposalString, proposalString);");
sc.add("int begin = offset - prefix.length();");
sc.add("int replacementLength = prefix.length();");
sc.addComment(
"if a closing bracket was automatically inserted right before, " +
"we enlarge the replacement length in order to overwrite the bracket."
);
sc.add(iBracketHandlerClassName + " bracketHandler = bracketHandlerProvider.getBracketHandler();");
sc.add("String closingBracket = bracketHandler.getClosingBracket();");
sc.add("if (bracketHandler.addedClosingBracket() && proposalString.endsWith(closingBracket)) {");
sc.add("replacementLength += closingBracket.length();");
sc.add("}");
sc.add("result[i++] = new " + COMPLETION_PROPOSAL + "(proposalString, begin, replacementLength, proposalString.length(), image, displayString, info, proposalString);");
sc.add("}");
sc.add("return result;");
sc.add("}");
sc.addLineBreak();
}
|
diff --git a/app/src/main/java/com/f2prateek/dfg/model/DeviceProvider.java b/app/src/main/java/com/f2prateek/dfg/model/DeviceProvider.java
index a84f63d..6a0830f 100644
--- a/app/src/main/java/com/f2prateek/dfg/model/DeviceProvider.java
+++ b/app/src/main/java/com/f2prateek/dfg/model/DeviceProvider.java
@@ -1,169 +1,169 @@
/*
* Copyright 2013 Prateek Srivastava (@f2prateek)
*
* 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.f2prateek.dfg.model;
import com.f2prateek.dfg.R;
import java.util.ArrayList;
public class DeviceProvider {
private static ArrayList<Device> devices;
private static ArrayList<Device> generateDevices() {
ArrayList<Device> devices = new ArrayList<Device>();
devices.add(new Device.Builder().setId("nexus_s")
.setName("Nexus S")
.setUrl("http://www.google.com/phone/detail/nexus-s")
.setPhysicalSize(4.0f)
.setDensity("HDPI")
.setLandOffset(new int[] { 247, 135 })
.setPortOffset(new int[] { 134, 247 })
.setPortSize(new int[] { 480, 800 })
.setRealSize(new int[] { 480, 800 })
.setThumbnail(R.drawable.nexus_s_thumb)
.build());
devices.add(new Device.Builder().setId("galaxy_nexus")
.setName("Galaxy Nexus")
.setUrl("http://www.android.com/devices/detail/galaxy-nexus")
.setPhysicalSize(4.65f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 371, 199 })
.setPortOffset(new int[] { 216, 353 })
.setPortSize(new int[] { 720, 1280 })
.setRealSize(new int[] { 720, 1280 })
.setThumbnail(R.drawable.galaxy_nexus_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_4")
.setName("Nexus 4")
.setUrl("http://www.google.com/nexus/4/")
.setPhysicalSize(4.7f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 349, 214 })
.setPortOffset(new int[] { 213, 350 })
.setPortSize(new int[] { 768, 1280 })
.setRealSize(new int[] { 768, 1280 })
.setThumbnail(R.drawable.nexus_4_thumb)
.build());
- devices.add(new Device.Builder().setId("nexus_7")
+ devices.add(new Device.Builder().setId("nexus_7_2013")
.setName("Nexus 7 (2013)")
.setUrl("http://www.google.com/nexus/7/")
.setPhysicalSize(8f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 326, 245 })
- .setPortOffset(new int[] { 224, 326 })
+ .setPortOffset(new int[] { 244, 326 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.nexus_7_2013_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_7")
.setName("Nexus 7")
.setUrl("http://www.android.com/devices/detail/nexus-7")
.setPhysicalSize(7f)
.setDensity("213 dpi")
.setLandOffset(new int[] { 315, 270 })
.setPortOffset(new int[] { 264, 311 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.nexus_7_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_10")
.setName("Nexus 10")
.setUrl("http://www.google.com/nexus/10/")
.setPhysicalSize(10f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 227, 217 })
.setPortOffset(new int[] { 217, 223 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 1600, 2560 })
.setThumbnail(R.drawable.nexus_10_thumb)
.build());
devices.add(new Device.Builder().setId("htc_one_x")
.setName("HTC One X")
.setUrl("http://www.htc.com/www/smartphones/htc-one-x/")
.setPhysicalSize(4.7f)
.setDensity("320 dpi")
.setLandOffset(new int[] { 346, 211 })
.setPortOffset(new int[] { 302, 306 })
.setPortSize(new int[] { 720, 1280 })
.setRealSize(new int[] { 720, 1280 })
.setThumbnail(R.drawable.htc_one_x_thumb)
.build());
devices.add(new Device.Builder().setId("samsung_galaxy_note")
.setName("Samsung Galaxy Note")
.setUrl("http://www.samsung.com/global/microsite/galaxynote/note/index.html")
.setPhysicalSize(5.3f)
.setDensity("320 dpi")
.setLandOffset(new int[] { 353, 209 })
.setPortOffset(new int[] { 289, 312 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.samsung_galaxy_note_thumb)
.build());
devices.add(new Device.Builder().setId("samsung_galaxy_s3")
.setName("Samsung Galaxy S III")
.setUrl("http://www.samsung.com/global/galaxys3/")
.setPhysicalSize(4.8f)
.setDensity("320 dpi")
.setLandOffset(new int[] { 346, 211 })
.setPortOffset(new int[] { 302, 307 })
.setPortSize(new int[] { 720, 1280 })
.setRealSize(new int[] { 720, 1280 })
.setThumbnail(R.drawable.samsung_galaxy_s3_thumb)
.build());
devices.add(new Device.Builder().setId("samsung_galaxy_tab_2_7inch")
.setName("Samsung Galaxy Tab 2")
.setUrl("http://www.samsung.com/global/microsite/galaxytab2/7.0/index.html")
.setPhysicalSize(7f)
.setDensity("160 dpi")
.setLandOffset(new int[] { 230, 203 })
.setPortOffset(new int[] { 274, 222 })
.setPortSize(new int[] { 600, 1024 })
.setRealSize(new int[] { 600, 1024 })
.setThumbnail(R.drawable.samsung_galaxy_tab_2_7inch_thumb)
.build());
devices.add(new Device.Builder().setId("xoom")
.setName("Motorola XOOM")
.setUrl("http://www.google.com/phone/detail/motorola-xoom")
.setPhysicalSize(10f)
.setDensity("MDPI")
.setLandOffset(new int[] { 218, 191 })
.setPortOffset(new int[] { 199, 200 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.xoom_thumb)
.build());
devices.add(new Device.Builder().setId("htc_m7")
.setName("HTC One")
.setUrl("http://www.htc.com/www/smartphones/htc-one/")
.setPhysicalSize(4.7f)
.setDensity("468 dpi")
.setLandOffset(new int[] { 624, 324 })
.setPortOffset(new int[] { 324, 624 })
.setPortSize(new int[] { 1080, 1920 })
.setRealSize(new int[] { 1080, 1920 })
.setThumbnail(R.drawable.htc_m7_thumb)
.build());
return devices;
}
public static ArrayList<Device> getDevices() {
if (devices == null) {
devices = generateDevices();
}
return devices;
}
}
| false | true | private static ArrayList<Device> generateDevices() {
ArrayList<Device> devices = new ArrayList<Device>();
devices.add(new Device.Builder().setId("nexus_s")
.setName("Nexus S")
.setUrl("http://www.google.com/phone/detail/nexus-s")
.setPhysicalSize(4.0f)
.setDensity("HDPI")
.setLandOffset(new int[] { 247, 135 })
.setPortOffset(new int[] { 134, 247 })
.setPortSize(new int[] { 480, 800 })
.setRealSize(new int[] { 480, 800 })
.setThumbnail(R.drawable.nexus_s_thumb)
.build());
devices.add(new Device.Builder().setId("galaxy_nexus")
.setName("Galaxy Nexus")
.setUrl("http://www.android.com/devices/detail/galaxy-nexus")
.setPhysicalSize(4.65f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 371, 199 })
.setPortOffset(new int[] { 216, 353 })
.setPortSize(new int[] { 720, 1280 })
.setRealSize(new int[] { 720, 1280 })
.setThumbnail(R.drawable.galaxy_nexus_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_4")
.setName("Nexus 4")
.setUrl("http://www.google.com/nexus/4/")
.setPhysicalSize(4.7f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 349, 214 })
.setPortOffset(new int[] { 213, 350 })
.setPortSize(new int[] { 768, 1280 })
.setRealSize(new int[] { 768, 1280 })
.setThumbnail(R.drawable.nexus_4_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_7")
.setName("Nexus 7 (2013)")
.setUrl("http://www.google.com/nexus/7/")
.setPhysicalSize(8f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 326, 245 })
.setPortOffset(new int[] { 224, 326 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.nexus_7_2013_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_7")
.setName("Nexus 7")
.setUrl("http://www.android.com/devices/detail/nexus-7")
.setPhysicalSize(7f)
.setDensity("213 dpi")
.setLandOffset(new int[] { 315, 270 })
.setPortOffset(new int[] { 264, 311 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.nexus_7_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_10")
.setName("Nexus 10")
.setUrl("http://www.google.com/nexus/10/")
.setPhysicalSize(10f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 227, 217 })
.setPortOffset(new int[] { 217, 223 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 1600, 2560 })
.setThumbnail(R.drawable.nexus_10_thumb)
.build());
devices.add(new Device.Builder().setId("htc_one_x")
.setName("HTC One X")
.setUrl("http://www.htc.com/www/smartphones/htc-one-x/")
.setPhysicalSize(4.7f)
.setDensity("320 dpi")
.setLandOffset(new int[] { 346, 211 })
.setPortOffset(new int[] { 302, 306 })
.setPortSize(new int[] { 720, 1280 })
.setRealSize(new int[] { 720, 1280 })
.setThumbnail(R.drawable.htc_one_x_thumb)
.build());
devices.add(new Device.Builder().setId("samsung_galaxy_note")
.setName("Samsung Galaxy Note")
.setUrl("http://www.samsung.com/global/microsite/galaxynote/note/index.html")
.setPhysicalSize(5.3f)
.setDensity("320 dpi")
.setLandOffset(new int[] { 353, 209 })
.setPortOffset(new int[] { 289, 312 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.samsung_galaxy_note_thumb)
.build());
devices.add(new Device.Builder().setId("samsung_galaxy_s3")
.setName("Samsung Galaxy S III")
.setUrl("http://www.samsung.com/global/galaxys3/")
.setPhysicalSize(4.8f)
.setDensity("320 dpi")
.setLandOffset(new int[] { 346, 211 })
.setPortOffset(new int[] { 302, 307 })
.setPortSize(new int[] { 720, 1280 })
.setRealSize(new int[] { 720, 1280 })
.setThumbnail(R.drawable.samsung_galaxy_s3_thumb)
.build());
devices.add(new Device.Builder().setId("samsung_galaxy_tab_2_7inch")
.setName("Samsung Galaxy Tab 2")
.setUrl("http://www.samsung.com/global/microsite/galaxytab2/7.0/index.html")
.setPhysicalSize(7f)
.setDensity("160 dpi")
.setLandOffset(new int[] { 230, 203 })
.setPortOffset(new int[] { 274, 222 })
.setPortSize(new int[] { 600, 1024 })
.setRealSize(new int[] { 600, 1024 })
.setThumbnail(R.drawable.samsung_galaxy_tab_2_7inch_thumb)
.build());
devices.add(new Device.Builder().setId("xoom")
.setName("Motorola XOOM")
.setUrl("http://www.google.com/phone/detail/motorola-xoom")
.setPhysicalSize(10f)
.setDensity("MDPI")
.setLandOffset(new int[] { 218, 191 })
.setPortOffset(new int[] { 199, 200 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.xoom_thumb)
.build());
devices.add(new Device.Builder().setId("htc_m7")
.setName("HTC One")
.setUrl("http://www.htc.com/www/smartphones/htc-one/")
.setPhysicalSize(4.7f)
.setDensity("468 dpi")
.setLandOffset(new int[] { 624, 324 })
.setPortOffset(new int[] { 324, 624 })
.setPortSize(new int[] { 1080, 1920 })
.setRealSize(new int[] { 1080, 1920 })
.setThumbnail(R.drawable.htc_m7_thumb)
.build());
return devices;
}
| private static ArrayList<Device> generateDevices() {
ArrayList<Device> devices = new ArrayList<Device>();
devices.add(new Device.Builder().setId("nexus_s")
.setName("Nexus S")
.setUrl("http://www.google.com/phone/detail/nexus-s")
.setPhysicalSize(4.0f)
.setDensity("HDPI")
.setLandOffset(new int[] { 247, 135 })
.setPortOffset(new int[] { 134, 247 })
.setPortSize(new int[] { 480, 800 })
.setRealSize(new int[] { 480, 800 })
.setThumbnail(R.drawable.nexus_s_thumb)
.build());
devices.add(new Device.Builder().setId("galaxy_nexus")
.setName("Galaxy Nexus")
.setUrl("http://www.android.com/devices/detail/galaxy-nexus")
.setPhysicalSize(4.65f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 371, 199 })
.setPortOffset(new int[] { 216, 353 })
.setPortSize(new int[] { 720, 1280 })
.setRealSize(new int[] { 720, 1280 })
.setThumbnail(R.drawable.galaxy_nexus_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_4")
.setName("Nexus 4")
.setUrl("http://www.google.com/nexus/4/")
.setPhysicalSize(4.7f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 349, 214 })
.setPortOffset(new int[] { 213, 350 })
.setPortSize(new int[] { 768, 1280 })
.setRealSize(new int[] { 768, 1280 })
.setThumbnail(R.drawable.nexus_4_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_7_2013")
.setName("Nexus 7 (2013)")
.setUrl("http://www.google.com/nexus/7/")
.setPhysicalSize(8f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 326, 245 })
.setPortOffset(new int[] { 244, 326 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.nexus_7_2013_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_7")
.setName("Nexus 7")
.setUrl("http://www.android.com/devices/detail/nexus-7")
.setPhysicalSize(7f)
.setDensity("213 dpi")
.setLandOffset(new int[] { 315, 270 })
.setPortOffset(new int[] { 264, 311 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.nexus_7_thumb)
.build());
devices.add(new Device.Builder().setId("nexus_10")
.setName("Nexus 10")
.setUrl("http://www.google.com/nexus/10/")
.setPhysicalSize(10f)
.setDensity("XHDPI")
.setLandOffset(new int[] { 227, 217 })
.setPortOffset(new int[] { 217, 223 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 1600, 2560 })
.setThumbnail(R.drawable.nexus_10_thumb)
.build());
devices.add(new Device.Builder().setId("htc_one_x")
.setName("HTC One X")
.setUrl("http://www.htc.com/www/smartphones/htc-one-x/")
.setPhysicalSize(4.7f)
.setDensity("320 dpi")
.setLandOffset(new int[] { 346, 211 })
.setPortOffset(new int[] { 302, 306 })
.setPortSize(new int[] { 720, 1280 })
.setRealSize(new int[] { 720, 1280 })
.setThumbnail(R.drawable.htc_one_x_thumb)
.build());
devices.add(new Device.Builder().setId("samsung_galaxy_note")
.setName("Samsung Galaxy Note")
.setUrl("http://www.samsung.com/global/microsite/galaxynote/note/index.html")
.setPhysicalSize(5.3f)
.setDensity("320 dpi")
.setLandOffset(new int[] { 353, 209 })
.setPortOffset(new int[] { 289, 312 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.samsung_galaxy_note_thumb)
.build());
devices.add(new Device.Builder().setId("samsung_galaxy_s3")
.setName("Samsung Galaxy S III")
.setUrl("http://www.samsung.com/global/galaxys3/")
.setPhysicalSize(4.8f)
.setDensity("320 dpi")
.setLandOffset(new int[] { 346, 211 })
.setPortOffset(new int[] { 302, 307 })
.setPortSize(new int[] { 720, 1280 })
.setRealSize(new int[] { 720, 1280 })
.setThumbnail(R.drawable.samsung_galaxy_s3_thumb)
.build());
devices.add(new Device.Builder().setId("samsung_galaxy_tab_2_7inch")
.setName("Samsung Galaxy Tab 2")
.setUrl("http://www.samsung.com/global/microsite/galaxytab2/7.0/index.html")
.setPhysicalSize(7f)
.setDensity("160 dpi")
.setLandOffset(new int[] { 230, 203 })
.setPortOffset(new int[] { 274, 222 })
.setPortSize(new int[] { 600, 1024 })
.setRealSize(new int[] { 600, 1024 })
.setThumbnail(R.drawable.samsung_galaxy_tab_2_7inch_thumb)
.build());
devices.add(new Device.Builder().setId("xoom")
.setName("Motorola XOOM")
.setUrl("http://www.google.com/phone/detail/motorola-xoom")
.setPhysicalSize(10f)
.setDensity("MDPI")
.setLandOffset(new int[] { 218, 191 })
.setPortOffset(new int[] { 199, 200 })
.setPortSize(new int[] { 800, 1280 })
.setRealSize(new int[] { 800, 1280 })
.setThumbnail(R.drawable.xoom_thumb)
.build());
devices.add(new Device.Builder().setId("htc_m7")
.setName("HTC One")
.setUrl("http://www.htc.com/www/smartphones/htc-one/")
.setPhysicalSize(4.7f)
.setDensity("468 dpi")
.setLandOffset(new int[] { 624, 324 })
.setPortOffset(new int[] { 324, 624 })
.setPortSize(new int[] { 1080, 1920 })
.setRealSize(new int[] { 1080, 1920 })
.setThumbnail(R.drawable.htc_m7_thumb)
.build());
return devices;
}
|
diff --git a/dwarfguide-core/src/test/java/ru/sid0renk0/dwarfguide/CreaturesXMLSerializerTest.java b/dwarfguide-core/src/test/java/ru/sid0renk0/dwarfguide/CreaturesXMLSerializerTest.java
index 789f1f4..4f30dc2 100644
--- a/dwarfguide-core/src/test/java/ru/sid0renk0/dwarfguide/CreaturesXMLSerializerTest.java
+++ b/dwarfguide-core/src/test/java/ru/sid0renk0/dwarfguide/CreaturesXMLSerializerTest.java
@@ -1,89 +1,89 @@
/*
* Copyright (c) 2010-2011, Dmitry Sidorenko. 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 ru.sid0renk0.dwarfguide;
import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.sid0renk0.dwarfguide.model.Creature;
import ru.sid0renk0.dwarfguide.model.Creatures;
import ru.sid0renk0.dwarfguide.model.TraitInstance;
import ru.sid0renk0.dwarfguide.model.configuration.DFHackConfiguration;
import ru.sid0renk0.dwarfguide.model.configuration.Sex;
import java.io.InputStream;
import java.util.Calendar;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.*;
/**
* @author Dmitry Sidorenko
*/
public class CreaturesXMLSerializerTest {
@SuppressWarnings({"unused"})
private static final Logger LOGGER = LoggerFactory.getLogger(CreaturesXMLSerializerTest.class);
@Test
public void testDeserialize() throws Exception {
InputStream configXML = this.getClass().getClassLoader().getResourceAsStream("Memory.xml");
InputStream dwarvesXML = this.getClass().getClassLoader().getResourceAsStream("TestDwarves.xml");
DFHackConfiguration configuration = DFHackConfiguration.deserialize(configXML);
Creatures dwarves = CreaturesXMLSerializer.deserialize(dwarvesXML, configuration.getBaseByVersion("DF2010"));
assertThat(dwarves.getCreatures(), notNullValue());
assertThat(dwarves.getCreatures().size(), is(110));
Creature dwarfBerMedenoddom = dwarves.getCreatures().get(0);
assertThat(dwarfBerMedenoddom.getName(), is("Ber Medenoddom"));
assertThat(dwarfBerMedenoddom.getEnglishName(), is("Ber Tribecloister"));
assertThat(dwarfBerMedenoddom.getNickname(), is("Manager"));
- assertThat(dwarfBerMedenoddom.getHappiness(), is(138));
+ assertThat(dwarfBerMedenoddom.getHappiness(), is(148));
assertThat(dwarfBerMedenoddom.getProfession().getName(), is("ADMINISTRATOR"));
assertThat(dwarfBerMedenoddom.getSex(), is(Sex.FEMALE));
{
Calendar calendar = Calendar.getInstance();
calendar.setTime(dwarfBerMedenoddom.getBirthday());
assertThat(calendar.get(Calendar.DAY_OF_MONTH), is(7));
assertThat(calendar.get(Calendar.MONTH), is(9));
assertThat(calendar.get(Calendar.YEAR), is(990));
}
assertThat(dwarfBerMedenoddom.getAge(), is(65));
assertThat(dwarfBerMedenoddom.getCustomProfession(), is(""));
assertThat(dwarfBerMedenoddom.getSkills().get(1).getSkill().getId(), is(24));
assertThat(dwarfBerMedenoddom.getSkills().get(1).getExperience(), is(40));
- assertThat(dwarfBerMedenoddom.getMood().getId(), is(0));
- assertThat(dwarfBerMedenoddom.getMoodSkill().getId(), is(36));
+// assertThat(dwarfBerMedenoddom.getMood().getId(), is(0));
+// assertThat(dwarfBerMedenoddom.getMoodSkill().getId(), is(36));
assertThat(dwarfBerMedenoddom.getTraits().size(), is(12));
TraitInstance traitInstance = dwarfBerMedenoddom.getTraits().get(0);
assertThat(traitInstance.getLevel(), is(2));
assertThat(traitInstance.getValue(), is(40));
assertThat(traitInstance.getTrait().getId(), is(1));
}
}
| false | true | public void testDeserialize() throws Exception {
InputStream configXML = this.getClass().getClassLoader().getResourceAsStream("Memory.xml");
InputStream dwarvesXML = this.getClass().getClassLoader().getResourceAsStream("TestDwarves.xml");
DFHackConfiguration configuration = DFHackConfiguration.deserialize(configXML);
Creatures dwarves = CreaturesXMLSerializer.deserialize(dwarvesXML, configuration.getBaseByVersion("DF2010"));
assertThat(dwarves.getCreatures(), notNullValue());
assertThat(dwarves.getCreatures().size(), is(110));
Creature dwarfBerMedenoddom = dwarves.getCreatures().get(0);
assertThat(dwarfBerMedenoddom.getName(), is("Ber Medenoddom"));
assertThat(dwarfBerMedenoddom.getEnglishName(), is("Ber Tribecloister"));
assertThat(dwarfBerMedenoddom.getNickname(), is("Manager"));
assertThat(dwarfBerMedenoddom.getHappiness(), is(138));
assertThat(dwarfBerMedenoddom.getProfession().getName(), is("ADMINISTRATOR"));
assertThat(dwarfBerMedenoddom.getSex(), is(Sex.FEMALE));
{
Calendar calendar = Calendar.getInstance();
calendar.setTime(dwarfBerMedenoddom.getBirthday());
assertThat(calendar.get(Calendar.DAY_OF_MONTH), is(7));
assertThat(calendar.get(Calendar.MONTH), is(9));
assertThat(calendar.get(Calendar.YEAR), is(990));
}
assertThat(dwarfBerMedenoddom.getAge(), is(65));
assertThat(dwarfBerMedenoddom.getCustomProfession(), is(""));
assertThat(dwarfBerMedenoddom.getSkills().get(1).getSkill().getId(), is(24));
assertThat(dwarfBerMedenoddom.getSkills().get(1).getExperience(), is(40));
assertThat(dwarfBerMedenoddom.getMood().getId(), is(0));
assertThat(dwarfBerMedenoddom.getMoodSkill().getId(), is(36));
assertThat(dwarfBerMedenoddom.getTraits().size(), is(12));
TraitInstance traitInstance = dwarfBerMedenoddom.getTraits().get(0);
assertThat(traitInstance.getLevel(), is(2));
assertThat(traitInstance.getValue(), is(40));
assertThat(traitInstance.getTrait().getId(), is(1));
}
| public void testDeserialize() throws Exception {
InputStream configXML = this.getClass().getClassLoader().getResourceAsStream("Memory.xml");
InputStream dwarvesXML = this.getClass().getClassLoader().getResourceAsStream("TestDwarves.xml");
DFHackConfiguration configuration = DFHackConfiguration.deserialize(configXML);
Creatures dwarves = CreaturesXMLSerializer.deserialize(dwarvesXML, configuration.getBaseByVersion("DF2010"));
assertThat(dwarves.getCreatures(), notNullValue());
assertThat(dwarves.getCreatures().size(), is(110));
Creature dwarfBerMedenoddom = dwarves.getCreatures().get(0);
assertThat(dwarfBerMedenoddom.getName(), is("Ber Medenoddom"));
assertThat(dwarfBerMedenoddom.getEnglishName(), is("Ber Tribecloister"));
assertThat(dwarfBerMedenoddom.getNickname(), is("Manager"));
assertThat(dwarfBerMedenoddom.getHappiness(), is(148));
assertThat(dwarfBerMedenoddom.getProfession().getName(), is("ADMINISTRATOR"));
assertThat(dwarfBerMedenoddom.getSex(), is(Sex.FEMALE));
{
Calendar calendar = Calendar.getInstance();
calendar.setTime(dwarfBerMedenoddom.getBirthday());
assertThat(calendar.get(Calendar.DAY_OF_MONTH), is(7));
assertThat(calendar.get(Calendar.MONTH), is(9));
assertThat(calendar.get(Calendar.YEAR), is(990));
}
assertThat(dwarfBerMedenoddom.getAge(), is(65));
assertThat(dwarfBerMedenoddom.getCustomProfession(), is(""));
assertThat(dwarfBerMedenoddom.getSkills().get(1).getSkill().getId(), is(24));
assertThat(dwarfBerMedenoddom.getSkills().get(1).getExperience(), is(40));
// assertThat(dwarfBerMedenoddom.getMood().getId(), is(0));
// assertThat(dwarfBerMedenoddom.getMoodSkill().getId(), is(36));
assertThat(dwarfBerMedenoddom.getTraits().size(), is(12));
TraitInstance traitInstance = dwarfBerMedenoddom.getTraits().get(0);
assertThat(traitInstance.getLevel(), is(2));
assertThat(traitInstance.getValue(), is(40));
assertThat(traitInstance.getTrait().getId(), is(1));
}
|
diff --git a/src/test/java/org/atlasapi/remotesite/synd/SyndicationFeedClientTest.java b/src/test/java/org/atlasapi/remotesite/synd/SyndicationFeedClientTest.java
index 0ed17e610..791cbc95a 100644
--- a/src/test/java/org/atlasapi/remotesite/synd/SyndicationFeedClientTest.java
+++ b/src/test/java/org/atlasapi/remotesite/synd/SyndicationFeedClientTest.java
@@ -1,84 +1,84 @@
/* Copyright 2009 British Broadcasting Corporation
Copyright 2009 Meta Broadcast 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 org.atlasapi.remotesite.synd;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.startsWith;
import java.util.List;
import junit.framework.TestCase;
import org.jdom.Element;
import com.sun.syndication.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndFeed;
/**
* Unit test for {@link SyndicationFeedClient}.
*
* @author Robert Chatley ([email protected])
*/
public class SyndicationFeedClientTest extends TestCase {
public void testCanReadRssPodcast() throws Exception {
String feedUrl = "http://downloads.bbc.co.uk/podcasts/radio4/bh/rss.xml";
SyndFeed feed = new SyndicationFeedClient().get(feedUrl);
assertThat(feed.getTitle(), is("Broadcasting House"));
assertThat(feed.getUri(), is(nullValue()));
assertThat(feed.getLinks(), is(nullValue()));
List<Element> foreignMarkup = foreignMarkupFrom(feed);
for (Element element : foreignMarkup) {
if (element.getName().equals("systemRef")) {
if (element.getAttributeValue("systemId").equals("pid.brand")) {
assertThat(element.getNamespacePrefix(), is("ppg"));
assertThat(element.getAttributeValue("key"), startsWith("b00"));
}
if (element.getAttributeValue("systemId").equals("pid.genre")) {
//TODO: find out the correct values for genres
}
}
}
List<SyndEntry> entries = entriesFrom(feed);
for (SyndEntry syndEntry : entries) {
assertThat(syndEntry.getTitle(), containsString("BH"));
// assertThat(syndEntry.getDescription().getValue(), containsString("Paddy O'Connell"));
- assertThat(syndEntry.getUri(), startsWith("http://downloads.bbc.co.uk/podcasts/radio4"));
- assertThat(syndEntry.getLink(), startsWith("http://downloads.bbc.co.uk/podcasts/radio4"));
+ assertThat(syndEntry.getUri(), startsWith("http://downloads.bbc.co.uk/podcasts"));
+ assertThat(syndEntry.getLink(), startsWith("http://downloads.bbc.co.uk/podcasts"));
}
}
@SuppressWarnings("unchecked")
private List<Element> foreignMarkupFrom(SyndFeed feed) {
return (List<Element>) feed.getForeignMarkup();
}
@SuppressWarnings("unchecked")
private List<SyndEntry> entriesFrom(SyndFeed feed) {
return feed.getEntries();
}
}
| true | true | public void testCanReadRssPodcast() throws Exception {
String feedUrl = "http://downloads.bbc.co.uk/podcasts/radio4/bh/rss.xml";
SyndFeed feed = new SyndicationFeedClient().get(feedUrl);
assertThat(feed.getTitle(), is("Broadcasting House"));
assertThat(feed.getUri(), is(nullValue()));
assertThat(feed.getLinks(), is(nullValue()));
List<Element> foreignMarkup = foreignMarkupFrom(feed);
for (Element element : foreignMarkup) {
if (element.getName().equals("systemRef")) {
if (element.getAttributeValue("systemId").equals("pid.brand")) {
assertThat(element.getNamespacePrefix(), is("ppg"));
assertThat(element.getAttributeValue("key"), startsWith("b00"));
}
if (element.getAttributeValue("systemId").equals("pid.genre")) {
//TODO: find out the correct values for genres
}
}
}
List<SyndEntry> entries = entriesFrom(feed);
for (SyndEntry syndEntry : entries) {
assertThat(syndEntry.getTitle(), containsString("BH"));
// assertThat(syndEntry.getDescription().getValue(), containsString("Paddy O'Connell"));
assertThat(syndEntry.getUri(), startsWith("http://downloads.bbc.co.uk/podcasts/radio4"));
assertThat(syndEntry.getLink(), startsWith("http://downloads.bbc.co.uk/podcasts/radio4"));
}
}
| public void testCanReadRssPodcast() throws Exception {
String feedUrl = "http://downloads.bbc.co.uk/podcasts/radio4/bh/rss.xml";
SyndFeed feed = new SyndicationFeedClient().get(feedUrl);
assertThat(feed.getTitle(), is("Broadcasting House"));
assertThat(feed.getUri(), is(nullValue()));
assertThat(feed.getLinks(), is(nullValue()));
List<Element> foreignMarkup = foreignMarkupFrom(feed);
for (Element element : foreignMarkup) {
if (element.getName().equals("systemRef")) {
if (element.getAttributeValue("systemId").equals("pid.brand")) {
assertThat(element.getNamespacePrefix(), is("ppg"));
assertThat(element.getAttributeValue("key"), startsWith("b00"));
}
if (element.getAttributeValue("systemId").equals("pid.genre")) {
//TODO: find out the correct values for genres
}
}
}
List<SyndEntry> entries = entriesFrom(feed);
for (SyndEntry syndEntry : entries) {
assertThat(syndEntry.getTitle(), containsString("BH"));
// assertThat(syndEntry.getDescription().getValue(), containsString("Paddy O'Connell"));
assertThat(syndEntry.getUri(), startsWith("http://downloads.bbc.co.uk/podcasts"));
assertThat(syndEntry.getLink(), startsWith("http://downloads.bbc.co.uk/podcasts"));
}
}
|
diff --git a/BookEditor/src/main/java/syam/BookEditor/Command/CopyCommand.java b/BookEditor/src/main/java/syam/BookEditor/Command/CopyCommand.java
index 8047c79..93315a0 100644
--- a/BookEditor/src/main/java/syam/BookEditor/Command/CopyCommand.java
+++ b/BookEditor/src/main/java/syam/BookEditor/Command/CopyCommand.java
@@ -1,86 +1,86 @@
/**
* BookEditor - Package: syam.BookEditor.Command
* Created: 2012/09/08 15:30:53
*/
package syam.BookEditor.Command;
import org.bukkit.Material;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import syam.BookEditor.BookEditor;
import syam.BookEditor.Book.Book;
import syam.BookEditor.Book.BookActions;
import syam.BookEditor.Enum.Permission;
import syam.BookEditor.Util.Actions;
/**
* CopyCommand (CopyCommand.java)
* @author syam
*/
public class CopyCommand extends BaseCommand{
public CopyCommand(){
bePlayer = true;
name = "copy";
argLength = 0;
usage = "<- copy your book";
}
@Override
public void execute() {
ItemStack is = player.getItemInHand();
// Check inHand item
if (is.getType() == Material.BOOK_AND_QUILL){
Actions.message(null, player, "&cコピーするためには本に署名する必要があります！");
return;
}
else if (is.getType() != Material.WRITTEN_BOOK){
Actions.message(null, player, "&c持っているアイテムが署名済みの本ではありません！");
return;
}
// Check Author
Book book = new Book(is);
if (!player.getName().equalsIgnoreCase(book.getAuthor()) && !Permission.COPY_OTHER.hasPerm(player)){
Actions.message(null, player, "&cそれはあなたが書いた本ではありません！");
return;
}
// Check empty slot
PlayerInventory inv = player.getInventory();
if (inv.firstEmpty() < 0){
Actions.message(null, player, "&cインベントリがいっぱいです！");
return;
}
// Pay cost
boolean paid = false;
int cost = 100; // 100 Coins
- if (!Permission.COPY_FREE.hasPerm(sender)){
+ if (plugin.getConfigs().useVault && !Permission.COPY_FREE.hasPerm(sender)){
paid = Actions.takeMoney(player.getName(), cost);
if (!paid){
Actions.message(null, player, "&cお金が足りません！ " + cost + " Coin 必要です！");
return;
}
}
// Copy
inv.addItem(is.clone());
String msg = "&aタイトル'&6" + book.getTitle() + "&a'の本をコピーしました！";
if (paid) msg = msg + " &c(-" + cost + " Coins)";
Actions.message(null, player, msg);
return;
}
@Override
public boolean permission() {
return Permission.COPY.hasPerm(sender);
}
}
| true | true | public void execute() {
ItemStack is = player.getItemInHand();
// Check inHand item
if (is.getType() == Material.BOOK_AND_QUILL){
Actions.message(null, player, "&cコピーするためには本に署名する必要があります！");
return;
}
else if (is.getType() != Material.WRITTEN_BOOK){
Actions.message(null, player, "&c持っているアイテムが署名済みの本ではありません！");
return;
}
// Check Author
Book book = new Book(is);
if (!player.getName().equalsIgnoreCase(book.getAuthor()) && !Permission.COPY_OTHER.hasPerm(player)){
Actions.message(null, player, "&cそれはあなたが書いた本ではありません！");
return;
}
// Check empty slot
PlayerInventory inv = player.getInventory();
if (inv.firstEmpty() < 0){
Actions.message(null, player, "&cインベントリがいっぱいです！");
return;
}
// Pay cost
boolean paid = false;
int cost = 100; // 100 Coins
if (!Permission.COPY_FREE.hasPerm(sender)){
paid = Actions.takeMoney(player.getName(), cost);
if (!paid){
Actions.message(null, player, "&cお金が足りません！ " + cost + " Coin 必要です！");
return;
}
}
// Copy
inv.addItem(is.clone());
String msg = "&aタイトル'&6" + book.getTitle() + "&a'の本をコピーしました！";
if (paid) msg = msg + " &c(-" + cost + " Coins)";
Actions.message(null, player, msg);
return;
}
| public void execute() {
ItemStack is = player.getItemInHand();
// Check inHand item
if (is.getType() == Material.BOOK_AND_QUILL){
Actions.message(null, player, "&cコピーするためには本に署名する必要があります！");
return;
}
else if (is.getType() != Material.WRITTEN_BOOK){
Actions.message(null, player, "&c持っているアイテムが署名済みの本ではありません！");
return;
}
// Check Author
Book book = new Book(is);
if (!player.getName().equalsIgnoreCase(book.getAuthor()) && !Permission.COPY_OTHER.hasPerm(player)){
Actions.message(null, player, "&cそれはあなたが書いた本ではありません！");
return;
}
// Check empty slot
PlayerInventory inv = player.getInventory();
if (inv.firstEmpty() < 0){
Actions.message(null, player, "&cインベントリがいっぱいです！");
return;
}
// Pay cost
boolean paid = false;
int cost = 100; // 100 Coins
if (plugin.getConfigs().useVault && !Permission.COPY_FREE.hasPerm(sender)){
paid = Actions.takeMoney(player.getName(), cost);
if (!paid){
Actions.message(null, player, "&cお金が足りません！ " + cost + " Coin 必要です！");
return;
}
}
// Copy
inv.addItem(is.clone());
String msg = "&aタイトル'&6" + book.getTitle() + "&a'の本をコピーしました！";
if (paid) msg = msg + " &c(-" + cost + " Coins)";
Actions.message(null, player, msg);
return;
}
|
diff --git a/src/nu/nerd/modreq/ModReq.java b/src/nu/nerd/modreq/ModReq.java
index 1064cf1..1961eb5 100644
--- a/src/nu/nerd/modreq/ModReq.java
+++ b/src/nu/nerd/modreq/ModReq.java
@@ -1,455 +1,455 @@
package nu.nerd.modreq;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import javax.persistence.PersistenceException;
import nu.nerd.modreq.database.Request;
import nu.nerd.modreq.database.Request.RequestStatus;
import nu.nerd.modreq.database.RequestTable;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player;
import org.bukkit.permissions.Permissible;
import org.bukkit.plugin.java.JavaPlugin;
public class ModReq extends JavaPlugin {
ModReqListener listener = new ModReqListener(this);
RequestTable reqTable;
@Override
public void onEnable() {
setupDatabase();
reqTable = new RequestTable(this);
getServer().getPluginManager().registerEvents(listener, this);
}
@Override
public void onDisable() {
// tear down
}
public void setupDatabase() {
try {
getDatabase().find(Request.class).findRowCount();
} catch (PersistenceException ex) {
getLogger().log(Level.INFO, "First run, initializing database.");
installDDL();
}
}
@Override
public ArrayList<Class<?>> getDatabaseClasses() {
ArrayList<Class<?>> list = new ArrayList<Class<?>>();
list.add(Request.class);
return list;
}
@Override
public boolean onCommand(CommandSender sender, Command command, String name, String[] args) {
String senderName = ChatColor.stripColor(sender.getName());
if (sender instanceof ConsoleCommandSender) {
senderName = "Console";
}
if (command.getName().equalsIgnoreCase("modreq")) {
if (args.length == 0) {
return false;
}
StringBuilder request = new StringBuilder(args[0]);
for (int i = 1; i < args.length; i++) {
request.append(" ").append(args[i]);
}
if (sender instanceof Player) {
Player player = (Player)sender;
- if (reqTable.getNumRequestFromUser(senderName) <= 5) {
+ if (reqTable.getNumRequestFromUser(senderName) < 5) {
Request req = new Request();
req.setPlayerName(senderName);
req.setRequest(request.toString());
req.setRequestTime(System.currentTimeMillis());
String location = String.format("%s,%f,%f,%f", player.getWorld().getName(), player.getLocation().getX(), player.getLocation().getY(), player.getLocation().getZ());
req.setRequestLocation(location);
req.setStatus(RequestStatus.OPEN);
reqTable.save(req);
messageMods(ChatColor.GREEN + "New request. Type /check for more");
sender.sendMessage(ChatColor.GREEN + "Request has been filed. Please be patient for a moderator to complete your request.");
} else {
sender.sendMessage(ChatColor.RED + "You already have 5 open requests, please wait for them to be completed.");
}
}
}
else if (command.getName().equalsIgnoreCase("check")) {
int page = 1;
int requestId = 0;
int totalRequests = 0;
String limitName = null;
if (args.length > 0 && !args[0].startsWith("p:")) {
try {
requestId = Integer.parseInt(args[0]);
page = 0;
} catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "You must provide a number for requests.");
return true;
}
}
if (sender.hasPermission("modreq.check")) {
if (args.length == 0) {
page = 1;
}
else if (args[0].startsWith("p:")) {
try {
page = Integer.parseInt(args[0].substring(2));
} catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "You must provide a number for pages.");
return true;
}
}
}
else {
limitName = senderName;
}
List<Request> requests = new ArrayList<Request>();
if (page > 0) {
if (limitName != null) {
requests.addAll(reqTable.getUserRequests(limitName));
totalRequests = requests.size();
} else {
requests.addAll(reqTable.getRequestPage(page - 1, 5, RequestStatus.OPEN));
totalRequests = reqTable.getTotalOpenRequest();
}
} else if (requestId > 0) {
Request req = reqTable.getRequest(requestId);
totalRequests = 1;
if (limitName != null && req.getPlayerName().equalsIgnoreCase(limitName)) {
requests.add(req);
} else if (limitName == null) {
requests.add(req);
} else {
totalRequests = 0;
}
}
if (totalRequests == 0) {
if (limitName != null) {
if (requestId > 0) {
sender.sendMessage(ChatColor.GREEN + "Either that request doesn't exist, or you do not have permission to view it.");
}
else {
sender.sendMessage(ChatColor.GREEN + "You don't have any outstanding mod requests.");
}
}
else {
if (page > 0) {
sender.sendMessage(ChatColor.GREEN + "There are no results for that page.");
}
else {
sender.sendMessage(ChatColor.GREEN + "There are currently no open mod requests.");
}
}
} else if (totalRequests == 1 && requestId > 0) {
messageRequestToPlayer(sender, requests.get(0));
} else if (totalRequests > 0) {
boolean showPage = true;
if (limitName != null) {
showPage = false;
}
messageRequestListToPlayer(sender, requests, page, totalRequests, showPage);
} else {
// there was an error.
}
}
else if (command.getName().equalsIgnoreCase("tp-id")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
player.sendMessage(ChatColor.GREEN + "[ModReq] Teleporting you to request " + requestId);
Location loc = stringToLocation(req.getRequestLocation());
player.teleport(loc);
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("claim")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
if (req.getStatus() == RequestStatus.OPEN) {
req.setStatus(RequestStatus.CLAIMED);
req.setAssignedMod(senderName);
reqTable.save(req);
messageMods(String.format("%s%s is now handling request #%d", ChatColor.GREEN, senderName, requestId));
}
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("unclaim")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
if (req.getAssignedMod().equalsIgnoreCase(senderName) && req.getStatus() == RequestStatus.CLAIMED) {
req.setStatus(RequestStatus.OPEN);
req.setAssignedMod(null);
reqTable.save(req);
messageMods(String.format("%s%s is no longer handling request #%d", ChatColor.GREEN, senderName, requestId));
}
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("done")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
String doneMessage = null;
if (args.length > 2) {
StringBuilder doneMessageBuilder = new StringBuilder(args[1]);
for (int i = 2; i < args.length; i++) {
doneMessageBuilder.append(" ").append(args[i]);
}
doneMessage = doneMessageBuilder.toString();
}
Request req = reqTable.getRequest(requestId);
if (sender.hasPermission("modreq.done")) {
String msg = "";
msg = String.format("%sRequest #%d has been completed by %s", ChatColor.GREEN, requestId, senderName);
messageMods(msg);
if (doneMessage != null && !doneMessage.isEmpty()) {
msg = String.format("Close Message - %s%s", ChatColor.GRAY, doneMessage);
messageMods(msg);
}
}
else {
if (!req.getPlayerName().equalsIgnoreCase(senderName)) {
req = null;
sender.sendMessage(String.format("%s[ModReq] Error, you can only close your own requests.", ChatColor.RED));
}
}
if (req != null) {
req.setStatus(RequestStatus.CLOSED);
req.setCloseTime(System.currentTimeMillis());
req.setCloseMessage(doneMessage);
req.setAssignedMod(senderName);
Player requestCreator = getServer().getPlayerExact(req.getPlayerName());
if (requestCreator != null) {
if (!requestCreator.getName().equalsIgnoreCase(senderName)) {
String message = "";
if (doneMessage != null && !doneMessage.isEmpty()) {
message = String.format("%s completed your request - %s%s", senderName, ChatColor.GRAY, doneMessage);
} else {
message = String.format("%s completed your request", senderName);
}
requestCreator.sendMessage(ChatColor.GREEN + message);
}
else {
if (!sender.hasPermission("modreq.done")) {
messageMods(ChatColor.GREEN + String.format("Request #%d no longer needs to be handled", requestId));
sender.sendMessage(ChatColor.GREEN + String.format("Request #%d has been closed by you.", requestId));
}
}
req.setCloseSeenByUser(true);
}
reqTable.save(req);
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("reopen")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
if ((req.getAssignedMod().equalsIgnoreCase(senderName) && req.getStatus() == RequestStatus.CLAIMED) || req.getStatus() == RequestStatus.CLOSED) {
req.setStatus(RequestStatus.OPEN);
req.setAssignedMod(null);
req.setCloseSeenByUser(false);
reqTable.save(req);
messageMods(ChatColor.GREEN + String.format("[ModReq] Request #%d is no longer claimed.", requestId));
}
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
} else if (command.getName().equalsIgnoreCase("elevate")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
Request req = reqTable.getRequest(requestId);
if (req.getStatus() == RequestStatus.OPEN) {
req.setFlagForAdmin(true);
messageMods(String.format("%s[ModReq] Request #%d has been flagged for admin.", ChatColor.GREEN, req.getId()));
reqTable.save(req);
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
return true;
}
private Location stringToLocation(String requestLocation) {
Location loc;
double x, y, z;
String world;
String[] split = requestLocation.split(",");
world = split[0];
x = Double.parseDouble(split[1]);
y = Double.parseDouble(split[2]);
z = Double.parseDouble(split[3]);
loc = new Location(getServer().getWorld(world), x, y, z);
return loc;
}
private String timestampToDateString(long timestamp) {
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(timestamp);
SimpleDateFormat format = new SimpleDateFormat("[email protected]");
return format.format(cal.getTime());
}
private void messageRequestToPlayer(CommandSender sender, Request req) {
List<String> messages = new ArrayList<String>();
ChatColor onlineStatus = ChatColor.RED;
if (getServer().getPlayerExact(req.getPlayerName()) != null) {
onlineStatus = ChatColor.GREEN;
}
Location loc = stringToLocation(req.getRequestLocation());
String location = String.format("%s, %d, %d, %d", loc.getWorld().getName(), Math.round(loc.getX()), Math.round(loc.getY()), Math.round(loc.getZ()));
messages.add(String.format("%sMod Request #%d - %s%s", ChatColor.AQUA, req.getId(), ChatColor.YELLOW, req.getStatus().toString() ));
messages.add(String.format("%sFiled by %s%s%s at %s%s%s at %s%s", ChatColor.YELLOW, onlineStatus, req.getPlayerName(), ChatColor.YELLOW, ChatColor.GREEN, timestampToDateString(req.getRequestTime()), ChatColor.YELLOW, ChatColor.GREEN, location));
messages.add(String.format("%s%s", ChatColor.GRAY, req.getRequest()));
sender.sendMessage(messages.toArray(new String[1]));
}
private void messageRequestListToPlayer(CommandSender sender, List<Request> reqs, int page, int totalRequests, boolean showPage) {
List<String> messages = new ArrayList<String>();
messages.add(String.format("%s---- %d Mod Requests ----", ChatColor.AQUA, totalRequests));
for (Request r : reqs) {
ChatColor onlineStatus = ChatColor.RED;
String message = "";
if (r.getRequest().length() > 20) {
message = r.getRequest().substring(1, 17) + "...";
} else {
message = r.getRequest();
}
if (getServer().getPlayerExact(r.getPlayerName()) != null) {
onlineStatus = ChatColor.GREEN;
}
try {
messages.add(String.format("%s#%d.%s %s by %s%s%s - %s%s", ChatColor.GOLD, r.getId(), ((r.isFlagForAdmin())?(ChatColor.AQUA + " [ADMIN]" + ChatColor.GOLD):""), timestampToDateString(r.getRequestTime()), onlineStatus, r.getPlayerName(), ChatColor.GOLD, ChatColor.GRAY, message));
}
catch (Exception ex) {
ex.printStackTrace();
}
}
if (showPage) {
messages.add(String.format("%s---- Page %d of %d ----", ChatColor.AQUA, page, (int)Math.ceil(totalRequests / 5.0)));
}
sender.sendMessage(messages.toArray(new String[1]));
}
public void messageMods(String message) {
String permission = "modreq.mod";
this.getServer().broadcast(message, permission);
Set<Permissible> subs = getServer().getPluginManager().getPermissionSubscriptions(permission);
for (Player player : getServer().getOnlinePlayers()) {
if (player.hasPermission(permission) && !subs.contains(player)) {
player.sendMessage(message);
}
}
}
}
| true | true | public boolean onCommand(CommandSender sender, Command command, String name, String[] args) {
String senderName = ChatColor.stripColor(sender.getName());
if (sender instanceof ConsoleCommandSender) {
senderName = "Console";
}
if (command.getName().equalsIgnoreCase("modreq")) {
if (args.length == 0) {
return false;
}
StringBuilder request = new StringBuilder(args[0]);
for (int i = 1; i < args.length; i++) {
request.append(" ").append(args[i]);
}
if (sender instanceof Player) {
Player player = (Player)sender;
if (reqTable.getNumRequestFromUser(senderName) <= 5) {
Request req = new Request();
req.setPlayerName(senderName);
req.setRequest(request.toString());
req.setRequestTime(System.currentTimeMillis());
String location = String.format("%s,%f,%f,%f", player.getWorld().getName(), player.getLocation().getX(), player.getLocation().getY(), player.getLocation().getZ());
req.setRequestLocation(location);
req.setStatus(RequestStatus.OPEN);
reqTable.save(req);
messageMods(ChatColor.GREEN + "New request. Type /check for more");
sender.sendMessage(ChatColor.GREEN + "Request has been filed. Please be patient for a moderator to complete your request.");
} else {
sender.sendMessage(ChatColor.RED + "You already have 5 open requests, please wait for them to be completed.");
}
}
}
else if (command.getName().equalsIgnoreCase("check")) {
int page = 1;
int requestId = 0;
int totalRequests = 0;
String limitName = null;
if (args.length > 0 && !args[0].startsWith("p:")) {
try {
requestId = Integer.parseInt(args[0]);
page = 0;
} catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "You must provide a number for requests.");
return true;
}
}
if (sender.hasPermission("modreq.check")) {
if (args.length == 0) {
page = 1;
}
else if (args[0].startsWith("p:")) {
try {
page = Integer.parseInt(args[0].substring(2));
} catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "You must provide a number for pages.");
return true;
}
}
}
else {
limitName = senderName;
}
List<Request> requests = new ArrayList<Request>();
if (page > 0) {
if (limitName != null) {
requests.addAll(reqTable.getUserRequests(limitName));
totalRequests = requests.size();
} else {
requests.addAll(reqTable.getRequestPage(page - 1, 5, RequestStatus.OPEN));
totalRequests = reqTable.getTotalOpenRequest();
}
} else if (requestId > 0) {
Request req = reqTable.getRequest(requestId);
totalRequests = 1;
if (limitName != null && req.getPlayerName().equalsIgnoreCase(limitName)) {
requests.add(req);
} else if (limitName == null) {
requests.add(req);
} else {
totalRequests = 0;
}
}
if (totalRequests == 0) {
if (limitName != null) {
if (requestId > 0) {
sender.sendMessage(ChatColor.GREEN + "Either that request doesn't exist, or you do not have permission to view it.");
}
else {
sender.sendMessage(ChatColor.GREEN + "You don't have any outstanding mod requests.");
}
}
else {
if (page > 0) {
sender.sendMessage(ChatColor.GREEN + "There are no results for that page.");
}
else {
sender.sendMessage(ChatColor.GREEN + "There are currently no open mod requests.");
}
}
} else if (totalRequests == 1 && requestId > 0) {
messageRequestToPlayer(sender, requests.get(0));
} else if (totalRequests > 0) {
boolean showPage = true;
if (limitName != null) {
showPage = false;
}
messageRequestListToPlayer(sender, requests, page, totalRequests, showPage);
} else {
// there was an error.
}
}
else if (command.getName().equalsIgnoreCase("tp-id")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
player.sendMessage(ChatColor.GREEN + "[ModReq] Teleporting you to request " + requestId);
Location loc = stringToLocation(req.getRequestLocation());
player.teleport(loc);
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("claim")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
if (req.getStatus() == RequestStatus.OPEN) {
req.setStatus(RequestStatus.CLAIMED);
req.setAssignedMod(senderName);
reqTable.save(req);
messageMods(String.format("%s%s is now handling request #%d", ChatColor.GREEN, senderName, requestId));
}
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("unclaim")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
if (req.getAssignedMod().equalsIgnoreCase(senderName) && req.getStatus() == RequestStatus.CLAIMED) {
req.setStatus(RequestStatus.OPEN);
req.setAssignedMod(null);
reqTable.save(req);
messageMods(String.format("%s%s is no longer handling request #%d", ChatColor.GREEN, senderName, requestId));
}
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("done")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
String doneMessage = null;
if (args.length > 2) {
StringBuilder doneMessageBuilder = new StringBuilder(args[1]);
for (int i = 2; i < args.length; i++) {
doneMessageBuilder.append(" ").append(args[i]);
}
doneMessage = doneMessageBuilder.toString();
}
Request req = reqTable.getRequest(requestId);
if (sender.hasPermission("modreq.done")) {
String msg = "";
msg = String.format("%sRequest #%d has been completed by %s", ChatColor.GREEN, requestId, senderName);
messageMods(msg);
if (doneMessage != null && !doneMessage.isEmpty()) {
msg = String.format("Close Message - %s%s", ChatColor.GRAY, doneMessage);
messageMods(msg);
}
}
else {
if (!req.getPlayerName().equalsIgnoreCase(senderName)) {
req = null;
sender.sendMessage(String.format("%s[ModReq] Error, you can only close your own requests.", ChatColor.RED));
}
}
if (req != null) {
req.setStatus(RequestStatus.CLOSED);
req.setCloseTime(System.currentTimeMillis());
req.setCloseMessage(doneMessage);
req.setAssignedMod(senderName);
Player requestCreator = getServer().getPlayerExact(req.getPlayerName());
if (requestCreator != null) {
if (!requestCreator.getName().equalsIgnoreCase(senderName)) {
String message = "";
if (doneMessage != null && !doneMessage.isEmpty()) {
message = String.format("%s completed your request - %s%s", senderName, ChatColor.GRAY, doneMessage);
} else {
message = String.format("%s completed your request", senderName);
}
requestCreator.sendMessage(ChatColor.GREEN + message);
}
else {
if (!sender.hasPermission("modreq.done")) {
messageMods(ChatColor.GREEN + String.format("Request #%d no longer needs to be handled", requestId));
sender.sendMessage(ChatColor.GREEN + String.format("Request #%d has been closed by you.", requestId));
}
}
req.setCloseSeenByUser(true);
}
reqTable.save(req);
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("reopen")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
if ((req.getAssignedMod().equalsIgnoreCase(senderName) && req.getStatus() == RequestStatus.CLAIMED) || req.getStatus() == RequestStatus.CLOSED) {
req.setStatus(RequestStatus.OPEN);
req.setAssignedMod(null);
req.setCloseSeenByUser(false);
reqTable.save(req);
messageMods(ChatColor.GREEN + String.format("[ModReq] Request #%d is no longer claimed.", requestId));
}
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
} else if (command.getName().equalsIgnoreCase("elevate")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
Request req = reqTable.getRequest(requestId);
if (req.getStatus() == RequestStatus.OPEN) {
req.setFlagForAdmin(true);
messageMods(String.format("%s[ModReq] Request #%d has been flagged for admin.", ChatColor.GREEN, req.getId()));
reqTable.save(req);
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
return true;
}
| public boolean onCommand(CommandSender sender, Command command, String name, String[] args) {
String senderName = ChatColor.stripColor(sender.getName());
if (sender instanceof ConsoleCommandSender) {
senderName = "Console";
}
if (command.getName().equalsIgnoreCase("modreq")) {
if (args.length == 0) {
return false;
}
StringBuilder request = new StringBuilder(args[0]);
for (int i = 1; i < args.length; i++) {
request.append(" ").append(args[i]);
}
if (sender instanceof Player) {
Player player = (Player)sender;
if (reqTable.getNumRequestFromUser(senderName) < 5) {
Request req = new Request();
req.setPlayerName(senderName);
req.setRequest(request.toString());
req.setRequestTime(System.currentTimeMillis());
String location = String.format("%s,%f,%f,%f", player.getWorld().getName(), player.getLocation().getX(), player.getLocation().getY(), player.getLocation().getZ());
req.setRequestLocation(location);
req.setStatus(RequestStatus.OPEN);
reqTable.save(req);
messageMods(ChatColor.GREEN + "New request. Type /check for more");
sender.sendMessage(ChatColor.GREEN + "Request has been filed. Please be patient for a moderator to complete your request.");
} else {
sender.sendMessage(ChatColor.RED + "You already have 5 open requests, please wait for them to be completed.");
}
}
}
else if (command.getName().equalsIgnoreCase("check")) {
int page = 1;
int requestId = 0;
int totalRequests = 0;
String limitName = null;
if (args.length > 0 && !args[0].startsWith("p:")) {
try {
requestId = Integer.parseInt(args[0]);
page = 0;
} catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "You must provide a number for requests.");
return true;
}
}
if (sender.hasPermission("modreq.check")) {
if (args.length == 0) {
page = 1;
}
else if (args[0].startsWith("p:")) {
try {
page = Integer.parseInt(args[0].substring(2));
} catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "You must provide a number for pages.");
return true;
}
}
}
else {
limitName = senderName;
}
List<Request> requests = new ArrayList<Request>();
if (page > 0) {
if (limitName != null) {
requests.addAll(reqTable.getUserRequests(limitName));
totalRequests = requests.size();
} else {
requests.addAll(reqTable.getRequestPage(page - 1, 5, RequestStatus.OPEN));
totalRequests = reqTable.getTotalOpenRequest();
}
} else if (requestId > 0) {
Request req = reqTable.getRequest(requestId);
totalRequests = 1;
if (limitName != null && req.getPlayerName().equalsIgnoreCase(limitName)) {
requests.add(req);
} else if (limitName == null) {
requests.add(req);
} else {
totalRequests = 0;
}
}
if (totalRequests == 0) {
if (limitName != null) {
if (requestId > 0) {
sender.sendMessage(ChatColor.GREEN + "Either that request doesn't exist, or you do not have permission to view it.");
}
else {
sender.sendMessage(ChatColor.GREEN + "You don't have any outstanding mod requests.");
}
}
else {
if (page > 0) {
sender.sendMessage(ChatColor.GREEN + "There are no results for that page.");
}
else {
sender.sendMessage(ChatColor.GREEN + "There are currently no open mod requests.");
}
}
} else if (totalRequests == 1 && requestId > 0) {
messageRequestToPlayer(sender, requests.get(0));
} else if (totalRequests > 0) {
boolean showPage = true;
if (limitName != null) {
showPage = false;
}
messageRequestListToPlayer(sender, requests, page, totalRequests, showPage);
} else {
// there was an error.
}
}
else if (command.getName().equalsIgnoreCase("tp-id")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
player.sendMessage(ChatColor.GREEN + "[ModReq] Teleporting you to request " + requestId);
Location loc = stringToLocation(req.getRequestLocation());
player.teleport(loc);
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("claim")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
if (req.getStatus() == RequestStatus.OPEN) {
req.setStatus(RequestStatus.CLAIMED);
req.setAssignedMod(senderName);
reqTable.save(req);
messageMods(String.format("%s%s is now handling request #%d", ChatColor.GREEN, senderName, requestId));
}
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("unclaim")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
if (req.getAssignedMod().equalsIgnoreCase(senderName) && req.getStatus() == RequestStatus.CLAIMED) {
req.setStatus(RequestStatus.OPEN);
req.setAssignedMod(null);
reqTable.save(req);
messageMods(String.format("%s%s is no longer handling request #%d", ChatColor.GREEN, senderName, requestId));
}
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("done")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
String doneMessage = null;
if (args.length > 2) {
StringBuilder doneMessageBuilder = new StringBuilder(args[1]);
for (int i = 2; i < args.length; i++) {
doneMessageBuilder.append(" ").append(args[i]);
}
doneMessage = doneMessageBuilder.toString();
}
Request req = reqTable.getRequest(requestId);
if (sender.hasPermission("modreq.done")) {
String msg = "";
msg = String.format("%sRequest #%d has been completed by %s", ChatColor.GREEN, requestId, senderName);
messageMods(msg);
if (doneMessage != null && !doneMessage.isEmpty()) {
msg = String.format("Close Message - %s%s", ChatColor.GRAY, doneMessage);
messageMods(msg);
}
}
else {
if (!req.getPlayerName().equalsIgnoreCase(senderName)) {
req = null;
sender.sendMessage(String.format("%s[ModReq] Error, you can only close your own requests.", ChatColor.RED));
}
}
if (req != null) {
req.setStatus(RequestStatus.CLOSED);
req.setCloseTime(System.currentTimeMillis());
req.setCloseMessage(doneMessage);
req.setAssignedMod(senderName);
Player requestCreator = getServer().getPlayerExact(req.getPlayerName());
if (requestCreator != null) {
if (!requestCreator.getName().equalsIgnoreCase(senderName)) {
String message = "";
if (doneMessage != null && !doneMessage.isEmpty()) {
message = String.format("%s completed your request - %s%s", senderName, ChatColor.GRAY, doneMessage);
} else {
message = String.format("%s completed your request", senderName);
}
requestCreator.sendMessage(ChatColor.GREEN + message);
}
else {
if (!sender.hasPermission("modreq.done")) {
messageMods(ChatColor.GREEN + String.format("Request #%d no longer needs to be handled", requestId));
sender.sendMessage(ChatColor.GREEN + String.format("Request #%d has been closed by you.", requestId));
}
}
req.setCloseSeenByUser(true);
}
reqTable.save(req);
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
else if (command.getName().equalsIgnoreCase("reopen")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
if (sender instanceof Player) {
Player player = (Player)sender;
Request req = reqTable.getRequest(requestId);
if ((req.getAssignedMod().equalsIgnoreCase(senderName) && req.getStatus() == RequestStatus.CLAIMED) || req.getStatus() == RequestStatus.CLOSED) {
req.setStatus(RequestStatus.OPEN);
req.setAssignedMod(null);
req.setCloseSeenByUser(false);
reqTable.save(req);
messageMods(ChatColor.GREEN + String.format("[ModReq] Request #%d is no longer claimed.", requestId));
}
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
} else if (command.getName().equalsIgnoreCase("elevate")) {
if (args.length == 0) {
return false;
}
int requestId = 0;
try {
requestId = Integer.parseInt(args[0]);
Request req = reqTable.getRequest(requestId);
if (req.getStatus() == RequestStatus.OPEN) {
req.setFlagForAdmin(true);
messageMods(String.format("%s[ModReq] Request #%d has been flagged for admin.", ChatColor.GREEN, req.getId()));
reqTable.save(req);
}
}
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "[ModReq] Error: Expected a number for request.");
}
}
return true;
}
|
diff --git a/river/src/main/java/org/jboss/marshalling/river/RiverUnmarshaller.java b/river/src/main/java/org/jboss/marshalling/river/RiverUnmarshaller.java
index 2c9ab7d..c229d9c 100644
--- a/river/src/main/java/org/jboss/marshalling/river/RiverUnmarshaller.java
+++ b/river/src/main/java/org/jboss/marshalling/river/RiverUnmarshaller.java
@@ -1,1621 +1,1621 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software 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 software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.marshalling.river;
import java.io.Externalizable;
import java.io.IOException;
import java.io.InvalidClassException;
import java.io.InvalidObjectException;
import java.io.NotSerializableException;
import java.io.ObjectInputValidation;
import java.io.Serializable;
import java.io.StreamCorruptedException;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.IdentityHashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.EnumSet;
import java.util.EnumMap;
import java.util.AbstractCollection;
import java.util.AbstractList;
import java.util.AbstractQueue;
import java.util.AbstractSequentialList;
import java.util.AbstractSet;
import java.util.Vector;
import java.util.Stack;
import org.jboss.marshalling.AbstractUnmarshaller;
import org.jboss.marshalling.Creator;
import org.jboss.marshalling.Externalizer;
import org.jboss.marshalling.MarshallingConfiguration;
import org.jboss.marshalling.UTFUtils;
import org.jboss.marshalling.TraceInformation;
import org.jboss.marshalling.reflect.SerializableClass;
import org.jboss.marshalling.reflect.SerializableClassRegistry;
import org.jboss.marshalling.reflect.SerializableField;
import static org.jboss.marshalling.river.Protocol.*;
/**
*
*/
public class RiverUnmarshaller extends AbstractUnmarshaller {
private final ArrayList<Object> instanceCache;
private final ArrayList<ClassDescriptor> classCache;
private final SerializableClassRegistry registry;
private int version;
private int depth;
private BlockUnmarshaller blockUnmarshaller;
private RiverObjectInputStream objectInputStream;
private SortedSet<Validator> validators;
private int validatorSeq;
private static final Field proxyInvocationHandler;
static {
proxyInvocationHandler = AccessController.doPrivileged(new PrivilegedAction<Field>() {
public Field run() {
try {
final Field field = Proxy.class.getDeclaredField("h");
field.setAccessible(true);
return field;
} catch (NoSuchFieldException e) {
throw new NoSuchFieldError(e.getMessage());
}
}
});
}
protected RiverUnmarshaller(final RiverMarshallerFactory marshallerFactory, final SerializableClassRegistry registry, final MarshallingConfiguration configuration) {
super(marshallerFactory, configuration);
this.registry = registry;
instanceCache = new ArrayList<Object>(configuration.getInstanceCount());
classCache = new ArrayList<ClassDescriptor>(configuration.getClassCount());
}
public void clearInstanceCache() throws IOException {
instanceCache.clear();
}
public void clearClassCache() throws IOException {
clearInstanceCache();
classCache.clear();
}
public void close() throws IOException {
finish();
}
public void finish() throws IOException {
super.finish();
blockUnmarshaller = null;
objectInputStream = null;
}
private BlockUnmarshaller getBlockUnmarshaller() {
final BlockUnmarshaller blockUnmarshaller = this.blockUnmarshaller;
return blockUnmarshaller == null ? this.blockUnmarshaller = new BlockUnmarshaller(this) : blockUnmarshaller;
}
private final PrivilegedExceptionAction<RiverObjectInputStream> createObjectInputStreamAction = new PrivilegedExceptionAction<RiverObjectInputStream>() {
public RiverObjectInputStream run() throws IOException {
return new RiverObjectInputStream(RiverUnmarshaller.this, getBlockUnmarshaller());
}
};
private RiverObjectInputStream getObjectInputStream() throws IOException {
final RiverObjectInputStream objectInputStream = this.objectInputStream;
return objectInputStream == null ? this.objectInputStream = createObjectInputStream() : objectInputStream;
}
private RiverObjectInputStream createObjectInputStream() throws IOException {
try {
return AccessController.doPrivileged(createObjectInputStreamAction);
} catch (PrivilegedActionException e) {
throw (IOException) e.getCause();
}
}
Object doReadNestedObject(final boolean unshared, final String enclosingClassName) throws ClassNotFoundException, IOException {
try {
return doReadObject(unshared);
} catch (IOException e) {
TraceInformation.addIncompleteObjectInformation(e, enclosingClassName);
throw e;
} catch (ClassNotFoundException e) {
TraceInformation.addIncompleteObjectInformation(e, enclosingClassName);
throw e;
} catch (RuntimeException e) {
TraceInformation.addIncompleteObjectInformation(e, enclosingClassName);
throw e;
}
}
Object doReadCollectionObject(final boolean unshared, final int idx, final int size) throws ClassNotFoundException, IOException {
try {
return doReadObject(unshared);
} catch (IOException e) {
TraceInformation.addIndexInformation(e, idx, size, TraceInformation.IndexType.ELEMENT);
throw e;
} catch (ClassNotFoundException e) {
TraceInformation.addIndexInformation(e, idx, size, TraceInformation.IndexType.ELEMENT);
throw e;
} catch (RuntimeException e) {
TraceInformation.addIndexInformation(e, idx, size, TraceInformation.IndexType.ELEMENT);
throw e;
}
}
Object doReadMapObject(final boolean unshared, final int idx, final int size, final boolean key) throws ClassNotFoundException, IOException {
try {
return doReadObject(unshared);
} catch (IOException e) {
TraceInformation.addIndexInformation(e, idx, size, key ? TraceInformation.IndexType.MAP_KEY : TraceInformation.IndexType.MAP_VALUE);
throw e;
} catch (ClassNotFoundException e) {
TraceInformation.addIndexInformation(e, idx, size, key ? TraceInformation.IndexType.MAP_KEY : TraceInformation.IndexType.MAP_VALUE);
throw e;
} catch (RuntimeException e) {
TraceInformation.addIndexInformation(e, idx, size, key ? TraceInformation.IndexType.MAP_KEY : TraceInformation.IndexType.MAP_VALUE);
throw e;
}
}
protected Object doReadObject(final boolean unshared) throws ClassNotFoundException, IOException {
final Object obj = doReadObject(readUnsignedByte(), unshared);
if (depth == 0) {
final SortedSet<Validator> validators = this.validators;
if (validators != null) {
this.validators = null;
validatorSeq = 0;
for (Validator validator : validators) {
validator.getValidation().validateObject();
}
}
}
return obj;
}
@SuppressWarnings({ "unchecked" })
Object doReadObject(int leadByte, final boolean unshared) throws IOException, ClassNotFoundException {
depth ++;
try {
for (;;) switch (leadByte) {
case ID_NULL: {
return null;
}
case ID_REPEAT_OBJECT_FAR: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a backreference as unshared");
}
final int index = readInt();
try {
final Object obj = instanceCache.get(index);
if (obj != null) return obj;
} catch (IndexOutOfBoundsException e) {
}
throw new InvalidObjectException("Attempt to read a backreference with an invalid ID (absolute " + index + ")");
}
case ID_REPEAT_OBJECT_NEAR: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a backreference as unshared");
}
final int index = readByte() | 0xffffff00;
try {
final Object obj = instanceCache.get(index + instanceCache.size());
if (obj != null) return obj;
} catch (IndexOutOfBoundsException e) {
}
throw new InvalidObjectException("Attempt to read a backreference with an invalid ID (relative near " + index + ")");
}
case ID_REPEAT_OBJECT_NEARISH: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a backreference as unshared");
}
final int index = readShort() | 0xffff0000;
try {
final Object obj = instanceCache.get(index + instanceCache.size());
if (obj != null) return obj;
} catch (IndexOutOfBoundsException e) {
}
throw new InvalidObjectException("Attempt to read a backreference with an invalid ID (relative nearish " + index + ")");
}
case ID_NEW_OBJECT:
case ID_NEW_OBJECT_UNSHARED: {
if (unshared != (leadByte == ID_NEW_OBJECT_UNSHARED)) {
throw sharedMismatch();
}
return doReadNewObject(readUnsignedByte(), unshared);
}
// v2 string types
case ID_STRING_EMPTY: {
return "";
}
case ID_STRING_SMALL: {
// ignore unshared setting
int length = readUnsignedByte();
final String s = UTFUtils.readUTFBytes(this, length == 0 ? 0x100 : length);
instanceCache.add(s);
return s;
}
case ID_STRING_MEDIUM: {
// ignore unshared setting
int length = readUnsignedShort();
final String s = UTFUtils.readUTFBytes(this, length == 0 ? 0x10000 : length);
instanceCache.add(s);
return s;
}
case ID_STRING_LARGE: {
// ignore unshared setting
int length = readInt();
if (length <= 0) {
throw new StreamCorruptedException("Invalid length value for string in stream (" + length + ")");
}
final String s = UTFUtils.readUTFBytes(this, length);
instanceCache.add(s);
return s;
}
case ID_ARRAY_EMPTY:
case ID_ARRAY_EMPTY_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_EMPTY_UNSHARED)) {
throw sharedMismatch();
}
final ArrayList<Object> instanceCache = this.instanceCache;
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Array.newInstance(doReadClassDescriptor(readUnsignedByte()).getType(), 0);
instanceCache.set(idx, obj);
final Object resolvedObject = objectResolver.readResolve(obj);
if (unshared) {
instanceCache.set(idx, null);
} else if (obj != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return obj;
}
case ID_ARRAY_SMALL:
case ID_ARRAY_SMALL_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_SMALL_UNSHARED)) {
throw sharedMismatch();
}
final int len = readUnsignedByte();
return doReadArray(len == 0 ? 0x100 : len, unshared);
}
case ID_ARRAY_MEDIUM:
case ID_ARRAY_MEDIUM_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_MEDIUM_UNSHARED)) {
throw sharedMismatch();
}
final int len = readUnsignedShort();
return doReadArray(len == 0 ? 0x10000 : len, unshared);
}
case ID_ARRAY_LARGE:
case ID_ARRAY_LARGE_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_LARGE_UNSHARED)) {
throw sharedMismatch();
}
final int len = readInt();
if (len <= 0) {
throw new StreamCorruptedException("Invalid length value for array in stream (" + len + ")");
}
return doReadArray(len, unshared);
}
case ID_PREDEFINED_OBJECT: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a predefined object as unshared");
}
if (version == 1) {
final BlockUnmarshaller blockUnmarshaller = getBlockUnmarshaller();
final Object obj = objectTable.readObject(blockUnmarshaller);
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
return obj;
} else {
// v2 does not require a block for this
return objectTable.readObject(this);
}
}
case ID_BOOLEAN_OBJECT_TRUE: {
return objectResolver.readResolve(Boolean.TRUE);
}
case ID_BOOLEAN_OBJECT_FALSE: {
return objectResolver.readResolve(Boolean.FALSE);
}
case ID_BYTE_OBJECT: {
return objectResolver.readResolve(Byte.valueOf(readByte()));
}
case ID_SHORT_OBJECT: {
return objectResolver.readResolve(Short.valueOf(readShort()));
}
case ID_INTEGER_OBJECT: {
return objectResolver.readResolve(Integer.valueOf(readInt()));
}
case ID_LONG_OBJECT: {
return objectResolver.readResolve(Long.valueOf(readLong()));
}
case ID_FLOAT_OBJECT: {
return objectResolver.readResolve(Float.valueOf(readFloat()));
}
case ID_DOUBLE_OBJECT: {
return objectResolver.readResolve(Double.valueOf(readDouble()));
}
case ID_CHARACTER_OBJECT: {
return objectResolver.readResolve(Character.valueOf(readChar()));
}
case ID_PRIM_BYTE: {
return byte.class;
}
case ID_PRIM_BOOLEAN: {
return boolean.class;
}
case ID_PRIM_CHAR: {
return char.class;
}
case ID_PRIM_DOUBLE: {
return double.class;
}
case ID_PRIM_FLOAT: {
return float.class;
}
case ID_PRIM_INT: {
return int.class;
}
case ID_PRIM_LONG: {
return long.class;
}
case ID_PRIM_SHORT: {
return short.class;
}
case ID_VOID: {
return void.class;
}
case ID_BYTE_CLASS: {
return Byte.class;
}
case ID_BOOLEAN_CLASS: {
return Boolean.class;
}
case ID_CHARACTER_CLASS: {
return Character.class;
}
case ID_DOUBLE_CLASS: {
return Double.class;
}
case ID_FLOAT_CLASS: {
return Float.class;
}
case ID_INTEGER_CLASS: {
return Integer.class;
}
case ID_LONG_CLASS: {
return Long.class;
}
case ID_SHORT_CLASS: {
return Short.class;
}
case ID_VOID_CLASS: {
return Void.class;
}
case ID_OBJECT_CLASS: {
return Object.class;
}
case ID_CLASS_CLASS: {
return Class.class;
}
case ID_STRING_CLASS: {
return String.class;
}
case ID_ENUM_CLASS: {
return Enum.class;
}
case ID_BYTE_ARRAY_CLASS: {
return byte[].class;
}
case ID_BOOLEAN_ARRAY_CLASS: {
return boolean[].class;
}
case ID_CHAR_ARRAY_CLASS: {
return char[].class;
}
case ID_DOUBLE_ARRAY_CLASS: {
return double[].class;
}
case ID_FLOAT_ARRAY_CLASS: {
return float[].class;
}
case ID_INT_ARRAY_CLASS: {
return int[].class;
}
case ID_LONG_ARRAY_CLASS: {
return long[].class;
}
case ID_SHORT_ARRAY_CLASS: {
return short[].class;
}
case ID_CC_ARRAY_LIST: {
return ArrayList.class;
}
case ID_CC_HASH_MAP: {
return HashMap.class;
}
case ID_CC_HASH_SET: {
return HashSet.class;
}
case ID_CC_HASHTABLE: {
return Hashtable.class;
}
case ID_CC_IDENTITY_HASH_MAP: {
- return HashMap.class;
+ return IdentityHashMap.class;
}
case ID_CC_LINKED_HASH_MAP: {
return LinkedHashMap.class;
}
case ID_CC_LINKED_HASH_SET: {
return LinkedHashSet.class;
}
case ID_CC_LINKED_LIST: {
return LinkedList.class;
}
case ID_CC_TREE_MAP: {
return TreeMap.class;
}
case ID_CC_TREE_SET: {
return TreeSet.class;
}
case ID_ABSTRACT_COLLECTION: {
return AbstractCollection.class;
}
case ID_ABSTRACT_LIST: {
return AbstractList.class;
}
case ID_ABSTRACT_QUEUE: {
return AbstractQueue.class;
}
case ID_ABSTRACT_SEQUENTIAL_LIST: {
return AbstractSequentialList.class;
}
case ID_ABSTRACT_SET: {
return AbstractSet.class;
}
case ID_SINGLETON_LIST_OBJECT: {
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Collections.singletonList(doReadNestedObject(false, "Collections#singletonList()"));
final Object resolvedObject = objectResolver.readResolve(obj);
if (! unshared) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_SINGLETON_SET_OBJECT: {
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Collections.singleton(doReadNestedObject(false, "Collections#singleton()"));
final Object resolvedObject = objectResolver.readResolve(obj);
if (! unshared) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_SINGLETON_MAP_OBJECT: {
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Collections.singletonMap(doReadNestedObject(false, "Collections#singletonMap() [key]"), doReadNestedObject(false, "Collections#singletonMap() [value]"));
final Object resolvedObject = objectResolver.readResolve(obj);
if (! unshared) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_EMPTY_LIST_OBJECT: {
return Collections.emptyList();
}
case ID_EMPTY_SET_OBJECT: {
return Collections.emptySet();
}
case ID_EMPTY_MAP_OBJECT: {
return Collections.emptyMap();
}
case ID_COLLECTION_EMPTY:
case ID_COLLECTION_EMPTY_UNSHARED:
case ID_COLLECTION_SMALL:
case ID_COLLECTION_SMALL_UNSHARED:
case ID_COLLECTION_MEDIUM:
case ID_COLLECTION_MEDIUM_UNSHARED:
case ID_COLLECTION_LARGE:
case ID_COLLECTION_LARGE_UNSHARED:
{
final int len;
switch (leadByte) {
case ID_COLLECTION_EMPTY:
case ID_COLLECTION_EMPTY_UNSHARED: {
len = 0;
break;
}
case ID_COLLECTION_SMALL:
case ID_COLLECTION_SMALL_UNSHARED: {
int b = readUnsignedByte();
len = b == 0 ? 0x100 : b;
break;
}
case ID_COLLECTION_MEDIUM:
case ID_COLLECTION_MEDIUM_UNSHARED: {
int b = readUnsignedShort();
len = b == 0 ? 0x10000 : b;
break;
}
case ID_COLLECTION_LARGE:
case ID_COLLECTION_LARGE_UNSHARED: {
len = readInt();
break;
}
default: {
throw new IllegalStateException();
}
}
final int id = readUnsignedByte();
switch (id) {
case ID_CC_ARRAY_LIST: {
return readCollectionData(unshared, len, new ArrayList(len));
}
case ID_CC_HASH_SET: {
return readCollectionData(unshared, len, new HashSet(len));
}
case ID_CC_LINKED_HASH_SET: {
return readCollectionData(unshared, len, new LinkedHashSet(len));
}
case ID_CC_LINKED_LIST: {
return readCollectionData(unshared, len, new LinkedList());
}
case ID_CC_TREE_SET: {
return readCollectionData(unshared, len, new TreeSet((Comparator)doReadNestedObject(false, "java.util.TreeSet comparator")));
}
case ID_CC_ENUM_SET_PROXY: {
final ClassDescriptor nestedDescriptor = doReadClassDescriptor(readUnsignedByte());
final Class<? extends Enum> elementType = nestedDescriptor.getType().asSubclass(Enum.class);
return readCollectionData(unshared, len, EnumSet.noneOf(elementType));
}
case ID_CC_VECTOR: {
return readCollectionData(unshared, len, new Vector(len));
}
case ID_CC_STACK: {
return readCollectionData(unshared, len, new Stack());
}
case ID_CC_HASH_MAP: {
return readMapData(unshared, len, new HashMap(len));
}
case ID_CC_HASHTABLE: {
return readMapData(unshared, len, new Hashtable(len));
}
case ID_CC_IDENTITY_HASH_MAP: {
return readMapData(unshared, len, new IdentityHashMap(len));
}
case ID_CC_LINKED_HASH_MAP: {
return readMapData(unshared, len, new LinkedHashMap(len));
}
case ID_CC_TREE_MAP: {
return readMapData(unshared, len, new TreeMap((Comparator)doReadNestedObject(false, "java.util.TreeMap comparator")));
}
case ID_CC_ENUM_MAP: {
final ClassDescriptor nestedDescriptor = doReadClassDescriptor(readUnsignedByte());
final Class<? extends Enum> elementType = nestedDescriptor.getType().asSubclass(Enum.class);
return readMapData(unshared, len, new EnumMap(elementType));
}
default: {
throw new StreamCorruptedException("Unexpected byte found when reading a collection type: " + leadByte);
}
}
}
case ID_CLEAR_CLASS_CACHE: {
if (depth > 1) {
throw new StreamCorruptedException("ID_CLEAR_CLASS_CACHE token in the middle of stream processing");
}
classCache.clear();
instanceCache.clear();
leadByte = readUnsignedByte();
continue;
}
case ID_CLEAR_INSTANCE_CACHE: {
if (depth > 1) {
throw new StreamCorruptedException("ID_CLEAR_INSTANCE_CACHE token in the middle of stream processing");
}
instanceCache.clear();
continue;
}
default: {
throw new StreamCorruptedException("Unexpected byte found when reading an object: " + leadByte);
}
}
} finally {
depth --;
}
}
@SuppressWarnings({ "unchecked" })
private Object readCollectionData(final boolean unshared, final int len, final Collection target) throws ClassNotFoundException, IOException {
final ArrayList<Object> instanceCache = this.instanceCache;
final int idx;
idx = instanceCache.size();
instanceCache.add(target);
for (int i = 0; i < len; i ++) {
target.add(doReadCollectionObject(false, idx, len));
}
final Object resolvedObject = objectResolver.readResolve(target);
if (unshared) {
instanceCache.set(idx, null);
} else if (target != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
@SuppressWarnings({ "unchecked" })
private Object readMapData(final boolean unshared, final int len, final Map target) throws ClassNotFoundException, IOException {
final ArrayList<Object> instanceCache = this.instanceCache;
final int idx;
idx = instanceCache.size();
instanceCache.add(target);
for (int i = 0; i < len; i ++) {
target.put(doReadMapObject(false, idx, len, true), doReadMapObject(false, idx, len, false));
}
final Object resolvedObject = objectResolver.readResolve(target);
if (unshared) {
instanceCache.set(idx, null);
} else if (target != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
private static InvalidObjectException sharedMismatch() {
return new InvalidObjectException("Shared/unshared object mismatch");
}
ClassDescriptor doReadClassDescriptor(final int classType) throws IOException, ClassNotFoundException {
final ArrayList<ClassDescriptor> classCache = this.classCache;
switch (classType) {
case ID_REPEAT_CLASS_FAR: {
return classCache.get(readInt());
}
case ID_REPEAT_CLASS_NEAR: {
return classCache.get((readByte() | 0xffffff00) + classCache.size());
}
case ID_REPEAT_CLASS_NEARISH: {
return classCache.get((readShort() | 0xffff0000) + classCache.size());
}
case ID_PREDEFINED_ENUM_TYPE_CLASS: {
final int idx = classCache.size();
classCache.add(null);
final Class<?> type = readClassTableClass();
final ClassDescriptor descriptor = new ClassDescriptor(type, ID_ENUM_TYPE_CLASS);
classCache.set(idx, descriptor);
return descriptor;
}
case ID_PREDEFINED_EXTERNALIZABLE_CLASS: {
final int idx = classCache.size();
classCache.add(null);
final Class<?> type = readClassTableClass();
final ClassDescriptor descriptor = new ClassDescriptor(type, ID_EXTERNALIZABLE_CLASS);
classCache.set(idx, descriptor);
return descriptor;
}
case ID_PREDEFINED_EXTERNALIZER_CLASS: {
final int idx = classCache.size();
classCache.add(null);
final Class<?> type = readClassTableClass();
final Externalizer externalizer = (Externalizer) readObject();
final ClassDescriptor descriptor = new ExternalizerClassDescriptor(type, externalizer);
classCache.set(idx, descriptor);
return descriptor;
}
case ID_PREDEFINED_PLAIN_CLASS: {
final int idx = classCache.size();
classCache.add(null);
final Class<?> type = readClassTableClass();
final ClassDescriptor descriptor = new ClassDescriptor(type, ID_PLAIN_CLASS);
classCache.set(idx, descriptor);
return descriptor;
}
case ID_PREDEFINED_PROXY_CLASS: {
final int idx = classCache.size();
classCache.add(null);
final Class<?> type = readClassTableClass();
final ClassDescriptor descriptor = new ClassDescriptor(type, ID_PROXY_CLASS);
classCache.set(idx, descriptor);
return descriptor;
}
case ID_PREDEFINED_SERIALIZABLE_CLASS: {
final int idx = classCache.size();
classCache.add(null);
final Class<?> type = readClassTableClass();
final SerializableClass serializableClass = registry.lookup(type);
int descType = serializableClass.hasWriteObject() ? ID_WRITE_OBJECT_CLASS : ID_SERIALIZABLE_CLASS;
final ClassDescriptor descriptor = new SerializableClassDescriptor(serializableClass, doReadClassDescriptor(readUnsignedByte()), serializableClass.getFields(), descType);
classCache.set(idx, descriptor);
return descriptor;
}
case ID_PLAIN_CLASS: {
final String className = readString();
final Class<?> clazz = doResolveClass(className, 0L);
final ClassDescriptor descriptor = new ClassDescriptor(clazz, ID_PLAIN_CLASS);
classCache.add(descriptor);
return descriptor;
}
case ID_PROXY_CLASS: {
String[] interfaces = new String[readInt()];
for (int i = 0; i < interfaces.length; i ++) {
interfaces[i] = readString();
}
final ClassDescriptor descriptor;
if (version == 1) {
final BlockUnmarshaller blockUnmarshaller = getBlockUnmarshaller();
descriptor = new ClassDescriptor(classResolver.resolveProxyClass(blockUnmarshaller, interfaces), ID_PROXY_CLASS);
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
} else {
// v2 does not require a block for this
descriptor = new ClassDescriptor(classResolver.resolveProxyClass(this, interfaces), ID_PROXY_CLASS);
}
classCache.add(descriptor);
return descriptor;
}
case ID_WRITE_OBJECT_CLASS:
case ID_SERIALIZABLE_CLASS: {
int idx = classCache.size();
classCache.add(null);
final String className = readString();
final long uid = readLong();
final Class<?> clazz = doResolveClass(className, uid);
final Class<?> superClazz = clazz.getSuperclass();
classCache.set(idx, new IncompleteClassDescriptor(clazz, classType));
final int cnt = readInt();
final String[] names = new String[cnt];
final ClassDescriptor[] descriptors = new ClassDescriptor[cnt];
final boolean[] unshareds = new boolean[cnt];
for (int i = 0; i < cnt; i ++) {
names[i] = readUTF();
descriptors[i] = doReadClassDescriptor(readUnsignedByte());
unshareds[i] = readBoolean();
}
ClassDescriptor superDescriptor = doReadClassDescriptor(readUnsignedByte());
if (superDescriptor != null) {
final Class<?> superType = superDescriptor.getType();
if (! superType.isAssignableFrom(clazz)) {
throw new InvalidClassException(clazz.getName(), "Class does not extend stream superclass");
}
Class<?> cl = superClazz;
while (cl != superType) {
superDescriptor = new SerializableClassDescriptor(registry.lookup(cl), superDescriptor);
cl = cl.getSuperclass();
}
} else if (superClazz != null) {
Class<?> cl = superClazz;
while (Serializable.class.isAssignableFrom(cl)) {
superDescriptor = new SerializableClassDescriptor(registry.lookup(cl), superDescriptor);
cl = cl.getSuperclass();
}
}
final SerializableClass serializableClass = registry.lookup(clazz);
final SerializableField[] fields = new SerializableField[cnt];
for (int i = 0; i < cnt; i ++) {
fields[i] = serializableClass.getSerializableField(names[i], descriptors[i].getType(), unshareds[i]);
}
final ClassDescriptor descriptor = new SerializableClassDescriptor(serializableClass, superDescriptor, fields, classType);
classCache.set(idx, descriptor);
return descriptor;
}
case ID_EXTERNALIZABLE_CLASS: {
final String className = readString();
final long uid = readLong();
final Class<?> clazz = doResolveClass(className, uid);
final ClassDescriptor descriptor = new ClassDescriptor(clazz, ID_EXTERNALIZABLE_CLASS);
classCache.add(descriptor);
return descriptor;
}
case ID_EXTERNALIZER_CLASS: {
final String className = readString();
int idx = classCache.size();
classCache.add(null);
final Class<?> clazz = doResolveClass(className, 0L);
final Externalizer externalizer = (Externalizer) readObject();
final ClassDescriptor descriptor = new ExternalizerClassDescriptor(clazz, externalizer);
classCache.set(idx, descriptor);
return descriptor;
}
case ID_ENUM_TYPE_CLASS: {
final ClassDescriptor descriptor = new ClassDescriptor(doResolveClass(readString(), 0L), ID_ENUM_TYPE_CLASS);
classCache.add(descriptor);
return descriptor;
}
case ID_OBJECT_ARRAY_TYPE_CLASS: {
final ClassDescriptor elementType = doReadClassDescriptor(readUnsignedByte());
final ClassDescriptor arrayDescriptor = new ClassDescriptor(Array.newInstance(elementType.getType(), 0).getClass(), ID_OBJECT_ARRAY_TYPE_CLASS);
classCache.add(arrayDescriptor);
return arrayDescriptor;
}
case ID_CC_ARRAY_LIST: {
return ClassDescriptor.CC_ARRAY_LIST;
}
case ID_CC_LINKED_LIST: {
return ClassDescriptor.CC_LINKED_LIST;
}
case ID_CC_HASH_SET: {
return ClassDescriptor.CC_HASH_SET;
}
case ID_CC_LINKED_HASH_SET: {
return ClassDescriptor.CC_LINKED_HASH_SET;
}
case ID_CC_TREE_SET: {
return ClassDescriptor.CC_TREE_SET;
}
case ID_CC_IDENTITY_HASH_MAP: {
return ClassDescriptor.CC_IDENTITY_HASH_MAP;
}
case ID_CC_HASH_MAP: {
return ClassDescriptor.CC_HASH_MAP;
}
case ID_CC_HASHTABLE: {
return ClassDescriptor.CC_HASHTABLE;
}
case ID_CC_LINKED_HASH_MAP: {
return ClassDescriptor.CC_LINKED_HASH_MAP;
}
case ID_CC_TREE_MAP: {
return ClassDescriptor.CC_TREE_MAP;
}
case ID_CC_ENUM_SET: {
return ClassDescriptor.CC_ENUM_SET;
}
case ID_CC_ENUM_MAP: {
return ClassDescriptor.CC_ENUM_MAP;
}
case ID_ABSTRACT_COLLECTION: {
return ClassDescriptor.ABSTRACT_COLLECTION;
}
case ID_ABSTRACT_LIST: {
return ClassDescriptor.ABSTRACT_LIST;
}
case ID_ABSTRACT_QUEUE: {
return ClassDescriptor.ABSTRACT_QUEUE;
}
case ID_ABSTRACT_SEQUENTIAL_LIST: {
return ClassDescriptor.ABSTRACT_SEQUENTIAL_LIST;
}
case ID_ABSTRACT_SET: {
return ClassDescriptor.ABSTRACT_SET;
}
case ID_CC_CONCURRENT_HASH_MAP: {
return ClassDescriptor.CONCURRENT_HASH_MAP;
}
case ID_CC_COPY_ON_WRITE_ARRAY_LIST: {
return ClassDescriptor.COPY_ON_WRITE_ARRAY_LIST;
}
case ID_CC_COPY_ON_WRITE_ARRAY_SET: {
return ClassDescriptor.COPY_ON_WRITE_ARRAY_SET;
}
case ID_CC_VECTOR: {
return ClassDescriptor.VECTOR;
}
case ID_CC_STACK: {
return ClassDescriptor.STACK;
}
case ID_STRING_CLASS: {
return ClassDescriptor.STRING_DESCRIPTOR;
}
case ID_OBJECT_CLASS: {
return ClassDescriptor.OBJECT_DESCRIPTOR;
}
case ID_CLASS_CLASS: {
return ClassDescriptor.CLASS_DESCRIPTOR;
}
case ID_ENUM_CLASS: {
return ClassDescriptor.ENUM_DESCRIPTOR;
}
case ID_BOOLEAN_ARRAY_CLASS: {
return ClassDescriptor.BOOLEAN_ARRAY;
}
case ID_BYTE_ARRAY_CLASS: {
return ClassDescriptor.BYTE_ARRAY;
}
case ID_SHORT_ARRAY_CLASS: {
return ClassDescriptor.SHORT_ARRAY;
}
case ID_INT_ARRAY_CLASS: {
return ClassDescriptor.INT_ARRAY;
}
case ID_LONG_ARRAY_CLASS: {
return ClassDescriptor.LONG_ARRAY;
}
case ID_CHAR_ARRAY_CLASS: {
return ClassDescriptor.CHAR_ARRAY;
}
case ID_FLOAT_ARRAY_CLASS: {
return ClassDescriptor.FLOAT_ARRAY;
}
case ID_DOUBLE_ARRAY_CLASS: {
return ClassDescriptor.DOUBLE_ARRAY;
}
case ID_PRIM_BOOLEAN: {
return ClassDescriptor.BOOLEAN;
}
case ID_PRIM_BYTE: {
return ClassDescriptor.BYTE;
}
case ID_PRIM_CHAR: {
return ClassDescriptor.CHAR;
}
case ID_PRIM_DOUBLE: {
return ClassDescriptor.DOUBLE;
}
case ID_PRIM_FLOAT: {
return ClassDescriptor.FLOAT;
}
case ID_PRIM_INT: {
return ClassDescriptor.INT;
}
case ID_PRIM_LONG: {
return ClassDescriptor.LONG;
}
case ID_PRIM_SHORT: {
return ClassDescriptor.SHORT;
}
case ID_VOID: {
return ClassDescriptor.VOID;
}
case ID_BOOLEAN_CLASS: {
return ClassDescriptor.BOOLEAN_OBJ;
}
case ID_BYTE_CLASS: {
return ClassDescriptor.BYTE_OBJ;
}
case ID_SHORT_CLASS: {
return ClassDescriptor.SHORT_OBJ;
}
case ID_INTEGER_CLASS: {
return ClassDescriptor.INTEGER_OBJ;
}
case ID_LONG_CLASS: {
return ClassDescriptor.LONG_OBJ;
}
case ID_CHARACTER_CLASS: {
return ClassDescriptor.CHARACTER_OBJ;
}
case ID_FLOAT_CLASS: {
return ClassDescriptor.FLOAT_OBJ;
}
case ID_DOUBLE_CLASS: {
return ClassDescriptor.DOUBLE_OBJ;
}
case ID_VOID_CLASS: {
return ClassDescriptor.VOID_OBJ;
}
default: {
throw new InvalidClassException("Unexpected class ID " + classType);
}
}
}
private Class<?> readClassTableClass() throws IOException, ClassNotFoundException {
if (version == 1) {
final BlockUnmarshaller blockUnmarshaller = getBlockUnmarshaller();
final Class<?> type = classTable.readClass(blockUnmarshaller);
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
return type;
} else {
// v2 does not require a block for this
return classTable.readClass(this);
}
}
private Class<?> doResolveClass(final String className, final long uid) throws IOException, ClassNotFoundException {
if (version == 1) {
final BlockUnmarshaller blockUnmarshaller = getBlockUnmarshaller();
final Class<?> resolvedClass = classResolver.resolveClass(blockUnmarshaller, className, uid);
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
return resolvedClass;
} else {
// v2 does not require a block for this
return classResolver.resolveClass(this, className, uid);
}
}
protected String readString() throws IOException {
final int length = readInt();
return UTFUtils.readUTFBytes(this, length);
}
private static final class DummyInvocationHandler implements InvocationHandler {
public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
throw new NoSuchMethodError("Invocation handler not yet loaded");
}
}
protected void doStart() throws IOException {
super.doStart();
int version = readUnsignedByte();
if (version < MIN_VERSION || version > configuredVersion || version > MAX_VERSION) {
throw new IOException("Unsupported protocol version " + version);
}
this.version = version;
}
private static final InvocationHandler DUMMY_HANDLER = new DummyInvocationHandler();
private static Object createProxyInstance(Creator creator, Class<?> type) throws IOException {
try {
return creator.create(type);
} catch (Exception e) {
return Proxy.newProxyInstance(type.getClassLoader(), type.getInterfaces(), DUMMY_HANDLER);
}
}
protected Object doReadNewObject(final int streamClassType, final boolean unshared) throws ClassNotFoundException, IOException {
final ClassDescriptor descriptor = doReadClassDescriptor(streamClassType);
try {
final int classType = descriptor.getTypeID();
final List<Object> instanceCache = this.instanceCache;
switch (classType) {
case ID_PROXY_CLASS: {
final Class<?> type = descriptor.getType();
final Object obj = createProxyInstance(creator, type);
final int idx = instanceCache.size();
instanceCache.add(obj);
try {
proxyInvocationHandler.set(obj, doReadNestedObject(unshared, "[proxy invocation handler]"));
} catch (IllegalAccessException e) {
throw new InvalidClassException(type.getName(), "Unable to set proxy invocation handler");
}
final Object resolvedObject = objectResolver.readResolve(obj);
if (unshared) {
instanceCache.set(idx, null);
} else if (obj != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_WRITE_OBJECT_CLASS:
case ID_SERIALIZABLE_CLASS: {
final SerializableClassDescriptor serializableClassDescriptor = (SerializableClassDescriptor) descriptor;
final Class<?> type = descriptor.getType();
final SerializableClass serializableClass = serializableClassDescriptor.getSerializableClass();
final Object obj = creator.create(type);
final int idx = instanceCache.size();
instanceCache.add(obj);
doInitSerializable(obj, serializableClassDescriptor);
final Object resolvedObject = objectResolver.readResolve(serializableClass.hasReadResolve() ? serializableClass.callReadResolve(obj) : obj);
if (unshared) {
instanceCache.set(idx, null);
} else if (obj != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_EXTERNALIZABLE_CLASS: {
final Class<?> type = descriptor.getType();
final SerializableClass serializableClass = registry.lookup(type);
final Externalizable obj = (Externalizable) creator.create(type);
final int idx = instanceCache.size();
instanceCache.add(obj);
final BlockUnmarshaller blockUnmarshaller = getBlockUnmarshaller();
obj.readExternal(blockUnmarshaller);
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
final Object resolvedObject = objectResolver.readResolve(serializableClass.hasReadResolve() ? serializableClass.callReadResolve(obj) : obj);
if (unshared) {
instanceCache.set(idx, null);
} else if (obj != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_EXTERNALIZER_CLASS: {
final int idx = instanceCache.size();
instanceCache.add(null);
Externalizer externalizer = ((ExternalizerClassDescriptor) descriptor).getExternalizer();
final Class<?> type = descriptor.getType();
final SerializableClass serializableClass = registry.lookup(type);
final Object obj;
final BlockUnmarshaller blockUnmarshaller = getBlockUnmarshaller();
obj = externalizer.createExternal(type, blockUnmarshaller, creator);
instanceCache.set(idx, obj);
externalizer.readExternal(obj, blockUnmarshaller);
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
final Object resolvedObject = objectResolver.readResolve(serializableClass.hasReadResolve() ? serializableClass.callReadResolve(obj) : obj);
if (unshared) {
instanceCache.set(idx, null);
} else if (obj != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_ENUM_TYPE_CLASS: {
final String name = readString();
final Enum obj = resolveEnumConstant(descriptor, name);
final int idx = instanceCache.size();
instanceCache.add(obj);
final Object resolvedObject = objectResolver.readResolve(obj);
if (unshared) {
instanceCache.set(idx, null);
} else if (obj != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_OBJECT_ARRAY_TYPE_CLASS: {
return doReadObjectArray(readInt(), descriptor.getType().getComponentType(), unshared);
}
case ID_STRING_CLASS: {
// v1 string
final String obj = readString();
final Object resolvedObject = objectResolver.readResolve(obj);
instanceCache.add(unshared ? null : resolvedObject);
return resolvedObject;
}
case ID_CLASS_CLASS: {
final ClassDescriptor nestedDescriptor = doReadClassDescriptor(readUnsignedByte());
// Classes are not resolved and may not be unshared!
final Class<?> obj = nestedDescriptor.getType();
return obj;
}
case ID_BOOLEAN_ARRAY_CLASS: {
return doReadBooleanArray(readInt(), unshared);
}
case ID_BYTE_ARRAY_CLASS: {
return doReadByteArray(readInt(), unshared);
}
case ID_SHORT_ARRAY_CLASS: {
return doReadShortArray(readInt(), unshared);
}
case ID_INT_ARRAY_CLASS: {
return doReadIntArray(readInt(), unshared);
}
case ID_LONG_ARRAY_CLASS: {
return doReadLongArray(readInt(), unshared);
}
case ID_CHAR_ARRAY_CLASS: {
return doReadCharArray(readInt(), unshared);
}
case ID_FLOAT_ARRAY_CLASS: {
return doReadFloatArray(readInt(), unshared);
}
case ID_DOUBLE_ARRAY_CLASS: {
return doReadDoubleArray(readInt(), unshared);
}
case ID_BOOLEAN_CLASS: {
return objectResolver.readResolve(Boolean.valueOf(readBoolean()));
}
case ID_BYTE_CLASS: {
return objectResolver.readResolve(Byte.valueOf(readByte()));
}
case ID_SHORT_CLASS: {
return objectResolver.readResolve(Short.valueOf(readShort()));
}
case ID_INTEGER_CLASS: {
return objectResolver.readResolve(Integer.valueOf(readInt()));
}
case ID_LONG_CLASS: {
return objectResolver.readResolve(Long.valueOf(readLong()));
}
case ID_CHARACTER_CLASS: {
return objectResolver.readResolve(Character.valueOf(readChar()));
}
case ID_FLOAT_CLASS: {
return objectResolver.readResolve(Float.valueOf(readFloat()));
}
case ID_DOUBLE_CLASS: {
return objectResolver.readResolve(Double.valueOf(readDouble()));
}
case ID_OBJECT_CLASS:
case ID_PLAIN_CLASS: {
throw new NotSerializableException("(remote)" + descriptor.getType().getName());
}
default: {
throw new InvalidObjectException("Unexpected class type " + classType);
}
}
} catch (IOException e) {
TraceInformation.addIncompleteObjectInformation(e, descriptor.getType());
exceptionListener.handleUnmarshallingException(e, descriptor.getType());
throw e;
} catch (ClassNotFoundException e) {
TraceInformation.addIncompleteObjectInformation(e, descriptor.getType());
exceptionListener.handleUnmarshallingException(e, descriptor.getType());
throw e;
} catch (RuntimeException e) {
TraceInformation.addIncompleteObjectInformation(e, descriptor.getType());
exceptionListener.handleUnmarshallingException(e, descriptor.getType());
throw e;
}
}
private Object doReadDoubleArray(final int cnt, final boolean unshared) throws IOException {
final double[] array = new double[cnt];
for (int i = 0; i < cnt; i ++) {
array[i] = readDouble();
}
final Object resolvedObject = objectResolver.readResolve(array);
instanceCache.add(unshared ? null : resolvedObject);
return resolvedObject;
}
private Object doReadFloatArray(final int cnt, final boolean unshared) throws IOException {
final float[] array = new float[cnt];
for (int i = 0; i < cnt; i ++) {
array[i] = readFloat();
}
final Object resolvedObject = objectResolver.readResolve(array);
instanceCache.add(unshared ? null : resolvedObject);
return resolvedObject;
}
private Object doReadCharArray(final int cnt, final boolean unshared) throws IOException {
final char[] array = new char[cnt];
for (int i = 0; i < cnt; i ++) {
array[i] = readChar();
}
final Object resolvedObject = objectResolver.readResolve(array);
instanceCache.add(unshared ? null : resolvedObject);
return resolvedObject;
}
private Object doReadLongArray(final int cnt, final boolean unshared) throws IOException {
final long[] array = new long[cnt];
for (int i = 0; i < cnt; i ++) {
array[i] = readLong();
}
final Object resolvedObject = objectResolver.readResolve(array);
instanceCache.add(unshared ? null : resolvedObject);
return resolvedObject;
}
private Object doReadIntArray(final int cnt, final boolean unshared) throws IOException {
final int[] array = new int[cnt];
for (int i = 0; i < cnt; i ++) {
array[i] = readInt();
}
final Object resolvedObject = objectResolver.readResolve(array);
instanceCache.add(unshared ? null : resolvedObject);
return resolvedObject;
}
private Object doReadShortArray(final int cnt, final boolean unshared) throws IOException {
final short[] array = new short[cnt];
for (int i = 0; i < cnt; i ++) {
array[i] = readShort();
}
final Object resolvedObject = objectResolver.readResolve(array);
instanceCache.add(unshared ? null : resolvedObject);
return resolvedObject;
}
private Object doReadByteArray(final int cnt, final boolean unshared) throws IOException {
final byte[] array = new byte[cnt];
readFully(array, 0, array.length);
final Object resolvedObject = objectResolver.readResolve(array);
instanceCache.add(unshared ? null : resolvedObject);
return resolvedObject;
}
private Object doReadBooleanArray(final int cnt, final boolean unshared) throws IOException {
final boolean[] array = new boolean[cnt];
int v = 0;
int bc = cnt & ~7;
for (int i = 0; i < bc; ) {
v = readByte();
array[i++] = (v & 1) != 0;
array[i++] = (v & 2) != 0;
array[i++] = (v & 4) != 0;
array[i++] = (v & 8) != 0;
array[i++] = (v & 16) != 0;
array[i++] = (v & 32) != 0;
array[i++] = (v & 64) != 0;
array[i++] = (v & 128) != 0;
}
if (bc < cnt) {
v = readByte();
switch (cnt & 7) {
case 7:
array[bc + 6] = (v & 64) != 0;
case 6:
array[bc + 5] = (v & 32) != 0;
case 5:
array[bc + 4] = (v & 16) != 0;
case 4:
array[bc + 3] = (v & 8) != 0;
case 3:
array[bc + 2] = (v & 4) != 0;
case 2:
array[bc + 1] = (v & 2) != 0;
case 1:
array[bc] = (v & 1) != 0;
}
}
final Object resolvedObject = objectResolver.readResolve(array);
instanceCache.add(unshared ? null : resolvedObject);
return resolvedObject;
}
private Object doReadObjectArray(final int cnt, final Class<?> type, final boolean unshared) throws ClassNotFoundException, IOException {
final Object[] array = (Object[]) Array.newInstance(type, cnt);
final int idx = instanceCache.size();
instanceCache.add(array);
for (int i = 0; i < cnt; i ++) {
array[i] = doReadCollectionObject(unshared, i, cnt);
}
final Object resolvedObject = objectResolver.readResolve(array);
if (unshared) {
instanceCache.set(idx, null);
} else if (array != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
private Object doReadArray(final int cnt, final boolean unshared) throws ClassNotFoundException, IOException {
final int leadByte = readUnsignedByte();
switch (leadByte) {
case ID_PRIM_BOOLEAN: {
return doReadBooleanArray(cnt, unshared);
}
case ID_PRIM_BYTE: {
return doReadByteArray(cnt, unshared);
}
case ID_PRIM_CHAR: {
return doReadCharArray(cnt, unshared);
}
case ID_PRIM_DOUBLE: {
return doReadDoubleArray(cnt, unshared);
}
case ID_PRIM_FLOAT: {
return doReadFloatArray(cnt, unshared);
}
case ID_PRIM_INT: {
return doReadIntArray(cnt, unshared);
}
case ID_PRIM_LONG: {
return doReadLongArray(cnt, unshared);
}
case ID_PRIM_SHORT: {
return doReadShortArray(cnt, unshared);
}
default: {
return doReadObjectArray(cnt, doReadClassDescriptor(leadByte).getType(), unshared);
}
}
}
@SuppressWarnings({"unchecked"})
private static Enum resolveEnumConstant(final ClassDescriptor descriptor, final String name) {
return Enum.valueOf((Class<? extends Enum>)descriptor.getType(), name);
}
private void doInitSerializable(final Object obj, final SerializableClassDescriptor descriptor) throws IOException, ClassNotFoundException {
final Class<?> type = descriptor.getType();
final SerializableClass info = registry.lookup(type);
final ClassDescriptor superDescriptor = descriptor.getSuperClassDescriptor();
if (superDescriptor instanceof SerializableClassDescriptor) {
final SerializableClassDescriptor serializableSuperDescriptor = (SerializableClassDescriptor) superDescriptor;
doInitSerializable(obj, serializableSuperDescriptor);
}
final int typeId = descriptor.getTypeID();
final BlockUnmarshaller blockUnmarshaller = getBlockUnmarshaller();
if (descriptor.isGap()) {
if (info.hasReadObjectNoData()) {
info.callReadObjectNoData(obj);
}
} else if (info.hasReadObject()) {
final RiverObjectInputStream objectInputStream = getObjectInputStream();
final SerializableClassDescriptor oldDescriptor = objectInputStream.swapClass(descriptor);
final Object oldObj = objectInputStream.swapCurrent(obj);
final RiverObjectInputStream.State restoreState = objectInputStream.start();
boolean ok = false;
try {
if (typeId == ID_WRITE_OBJECT_CLASS) {
// read fields
info.callReadObject(obj, objectInputStream);
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
} else { // typeid == ID_SERIALIZABLE_CLASS
// no user data to read - mark the OIS so that it calls endOfBlock after reading fields!
objectInputStream.noCustomData();
info.callReadObject(obj, objectInputStream);
blockUnmarshaller.restore(objectInputStream.getRestoreIdx());
}
objectInputStream.finish(restoreState);
objectInputStream.swapCurrent(oldObj);
objectInputStream.swapClass(oldDescriptor);
ok = true;
} finally {
if (! ok) {
objectInputStream.fullReset();
}
}
} else {
readFields(obj, descriptor);
if (typeId == ID_WRITE_OBJECT_CLASS) {
// useless user data
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
}
}
}
protected void readFields(final Object obj, final SerializableClassDescriptor descriptor) throws IOException, ClassNotFoundException {
for (SerializableField serializableField : descriptor.getFields()) {
try {
final Field field = serializableField.getField();
if (field == null) {
// missing; consume stream data only
switch (serializableField.getKind()) {
case BOOLEAN: {
readBoolean();
break;
}
case BYTE: {
readByte();
break;
}
case CHAR: {
readChar();
break;
}
case DOUBLE: {
readDouble();
break;
}
case FLOAT: {
readFloat();
break;
}
case INT: {
readInt();
break;
}
case LONG: {
readLong();
break;
}
case OBJECT: {
doReadObject(serializableField.isUnshared());
break;
}
case SHORT: {
readShort();
break;
}
}
} else try {
switch (serializableField.getKind()) {
case BOOLEAN: {
field.setBoolean(obj, readBoolean());
break;
}
case BYTE: {
field.setByte(obj, readByte());
break;
}
case CHAR: {
field.setChar(obj, readChar());
break;
}
case DOUBLE: {
field.setDouble(obj, readDouble());
break;
}
case FLOAT: {
field.setFloat(obj, readFloat());
break;
}
case INT: {
field.setInt(obj, readInt());
break;
}
case LONG: {
field.setLong(obj, readLong());
break;
}
case OBJECT: {
field.set(obj, doReadObject(serializableField.isUnshared()));
break;
}
case SHORT: {
field.setShort(obj, readShort());
break;
}
}
} catch (IllegalAccessException e) {
final InvalidObjectException ioe = new InvalidObjectException("Unable to set a field");
ioe.initCause(e);
throw ioe;
}
} catch (IOException e) {
TraceInformation.addFieldInformation(e, serializableField.getName());
throw e;
} catch (ClassNotFoundException e) {
TraceInformation.addFieldInformation(e, serializableField.getName());
throw e;
} catch (RuntimeException e) {
TraceInformation.addFieldInformation(e, serializableField.getName());
throw e;
}
}
}
void addValidation(final ObjectInputValidation validation, final int prio) {
final Validator validator = new Validator(prio, validatorSeq++, validation);
final SortedSet<Validator> validators = this.validators;
(validators == null ? this.validators = new TreeSet<Validator>() : validators).add(validator);
}
public String readUTF() throws IOException {
final int len = readInt();
return UTFUtils.readUTFBytes(this, len);
}
}
| true | true | Object doReadObject(int leadByte, final boolean unshared) throws IOException, ClassNotFoundException {
depth ++;
try {
for (;;) switch (leadByte) {
case ID_NULL: {
return null;
}
case ID_REPEAT_OBJECT_FAR: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a backreference as unshared");
}
final int index = readInt();
try {
final Object obj = instanceCache.get(index);
if (obj != null) return obj;
} catch (IndexOutOfBoundsException e) {
}
throw new InvalidObjectException("Attempt to read a backreference with an invalid ID (absolute " + index + ")");
}
case ID_REPEAT_OBJECT_NEAR: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a backreference as unshared");
}
final int index = readByte() | 0xffffff00;
try {
final Object obj = instanceCache.get(index + instanceCache.size());
if (obj != null) return obj;
} catch (IndexOutOfBoundsException e) {
}
throw new InvalidObjectException("Attempt to read a backreference with an invalid ID (relative near " + index + ")");
}
case ID_REPEAT_OBJECT_NEARISH: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a backreference as unshared");
}
final int index = readShort() | 0xffff0000;
try {
final Object obj = instanceCache.get(index + instanceCache.size());
if (obj != null) return obj;
} catch (IndexOutOfBoundsException e) {
}
throw new InvalidObjectException("Attempt to read a backreference with an invalid ID (relative nearish " + index + ")");
}
case ID_NEW_OBJECT:
case ID_NEW_OBJECT_UNSHARED: {
if (unshared != (leadByte == ID_NEW_OBJECT_UNSHARED)) {
throw sharedMismatch();
}
return doReadNewObject(readUnsignedByte(), unshared);
}
// v2 string types
case ID_STRING_EMPTY: {
return "";
}
case ID_STRING_SMALL: {
// ignore unshared setting
int length = readUnsignedByte();
final String s = UTFUtils.readUTFBytes(this, length == 0 ? 0x100 : length);
instanceCache.add(s);
return s;
}
case ID_STRING_MEDIUM: {
// ignore unshared setting
int length = readUnsignedShort();
final String s = UTFUtils.readUTFBytes(this, length == 0 ? 0x10000 : length);
instanceCache.add(s);
return s;
}
case ID_STRING_LARGE: {
// ignore unshared setting
int length = readInt();
if (length <= 0) {
throw new StreamCorruptedException("Invalid length value for string in stream (" + length + ")");
}
final String s = UTFUtils.readUTFBytes(this, length);
instanceCache.add(s);
return s;
}
case ID_ARRAY_EMPTY:
case ID_ARRAY_EMPTY_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_EMPTY_UNSHARED)) {
throw sharedMismatch();
}
final ArrayList<Object> instanceCache = this.instanceCache;
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Array.newInstance(doReadClassDescriptor(readUnsignedByte()).getType(), 0);
instanceCache.set(idx, obj);
final Object resolvedObject = objectResolver.readResolve(obj);
if (unshared) {
instanceCache.set(idx, null);
} else if (obj != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return obj;
}
case ID_ARRAY_SMALL:
case ID_ARRAY_SMALL_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_SMALL_UNSHARED)) {
throw sharedMismatch();
}
final int len = readUnsignedByte();
return doReadArray(len == 0 ? 0x100 : len, unshared);
}
case ID_ARRAY_MEDIUM:
case ID_ARRAY_MEDIUM_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_MEDIUM_UNSHARED)) {
throw sharedMismatch();
}
final int len = readUnsignedShort();
return doReadArray(len == 0 ? 0x10000 : len, unshared);
}
case ID_ARRAY_LARGE:
case ID_ARRAY_LARGE_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_LARGE_UNSHARED)) {
throw sharedMismatch();
}
final int len = readInt();
if (len <= 0) {
throw new StreamCorruptedException("Invalid length value for array in stream (" + len + ")");
}
return doReadArray(len, unshared);
}
case ID_PREDEFINED_OBJECT: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a predefined object as unshared");
}
if (version == 1) {
final BlockUnmarshaller blockUnmarshaller = getBlockUnmarshaller();
final Object obj = objectTable.readObject(blockUnmarshaller);
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
return obj;
} else {
// v2 does not require a block for this
return objectTable.readObject(this);
}
}
case ID_BOOLEAN_OBJECT_TRUE: {
return objectResolver.readResolve(Boolean.TRUE);
}
case ID_BOOLEAN_OBJECT_FALSE: {
return objectResolver.readResolve(Boolean.FALSE);
}
case ID_BYTE_OBJECT: {
return objectResolver.readResolve(Byte.valueOf(readByte()));
}
case ID_SHORT_OBJECT: {
return objectResolver.readResolve(Short.valueOf(readShort()));
}
case ID_INTEGER_OBJECT: {
return objectResolver.readResolve(Integer.valueOf(readInt()));
}
case ID_LONG_OBJECT: {
return objectResolver.readResolve(Long.valueOf(readLong()));
}
case ID_FLOAT_OBJECT: {
return objectResolver.readResolve(Float.valueOf(readFloat()));
}
case ID_DOUBLE_OBJECT: {
return objectResolver.readResolve(Double.valueOf(readDouble()));
}
case ID_CHARACTER_OBJECT: {
return objectResolver.readResolve(Character.valueOf(readChar()));
}
case ID_PRIM_BYTE: {
return byte.class;
}
case ID_PRIM_BOOLEAN: {
return boolean.class;
}
case ID_PRIM_CHAR: {
return char.class;
}
case ID_PRIM_DOUBLE: {
return double.class;
}
case ID_PRIM_FLOAT: {
return float.class;
}
case ID_PRIM_INT: {
return int.class;
}
case ID_PRIM_LONG: {
return long.class;
}
case ID_PRIM_SHORT: {
return short.class;
}
case ID_VOID: {
return void.class;
}
case ID_BYTE_CLASS: {
return Byte.class;
}
case ID_BOOLEAN_CLASS: {
return Boolean.class;
}
case ID_CHARACTER_CLASS: {
return Character.class;
}
case ID_DOUBLE_CLASS: {
return Double.class;
}
case ID_FLOAT_CLASS: {
return Float.class;
}
case ID_INTEGER_CLASS: {
return Integer.class;
}
case ID_LONG_CLASS: {
return Long.class;
}
case ID_SHORT_CLASS: {
return Short.class;
}
case ID_VOID_CLASS: {
return Void.class;
}
case ID_OBJECT_CLASS: {
return Object.class;
}
case ID_CLASS_CLASS: {
return Class.class;
}
case ID_STRING_CLASS: {
return String.class;
}
case ID_ENUM_CLASS: {
return Enum.class;
}
case ID_BYTE_ARRAY_CLASS: {
return byte[].class;
}
case ID_BOOLEAN_ARRAY_CLASS: {
return boolean[].class;
}
case ID_CHAR_ARRAY_CLASS: {
return char[].class;
}
case ID_DOUBLE_ARRAY_CLASS: {
return double[].class;
}
case ID_FLOAT_ARRAY_CLASS: {
return float[].class;
}
case ID_INT_ARRAY_CLASS: {
return int[].class;
}
case ID_LONG_ARRAY_CLASS: {
return long[].class;
}
case ID_SHORT_ARRAY_CLASS: {
return short[].class;
}
case ID_CC_ARRAY_LIST: {
return ArrayList.class;
}
case ID_CC_HASH_MAP: {
return HashMap.class;
}
case ID_CC_HASH_SET: {
return HashSet.class;
}
case ID_CC_HASHTABLE: {
return Hashtable.class;
}
case ID_CC_IDENTITY_HASH_MAP: {
return HashMap.class;
}
case ID_CC_LINKED_HASH_MAP: {
return LinkedHashMap.class;
}
case ID_CC_LINKED_HASH_SET: {
return LinkedHashSet.class;
}
case ID_CC_LINKED_LIST: {
return LinkedList.class;
}
case ID_CC_TREE_MAP: {
return TreeMap.class;
}
case ID_CC_TREE_SET: {
return TreeSet.class;
}
case ID_ABSTRACT_COLLECTION: {
return AbstractCollection.class;
}
case ID_ABSTRACT_LIST: {
return AbstractList.class;
}
case ID_ABSTRACT_QUEUE: {
return AbstractQueue.class;
}
case ID_ABSTRACT_SEQUENTIAL_LIST: {
return AbstractSequentialList.class;
}
case ID_ABSTRACT_SET: {
return AbstractSet.class;
}
case ID_SINGLETON_LIST_OBJECT: {
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Collections.singletonList(doReadNestedObject(false, "Collections#singletonList()"));
final Object resolvedObject = objectResolver.readResolve(obj);
if (! unshared) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_SINGLETON_SET_OBJECT: {
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Collections.singleton(doReadNestedObject(false, "Collections#singleton()"));
final Object resolvedObject = objectResolver.readResolve(obj);
if (! unshared) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_SINGLETON_MAP_OBJECT: {
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Collections.singletonMap(doReadNestedObject(false, "Collections#singletonMap() [key]"), doReadNestedObject(false, "Collections#singletonMap() [value]"));
final Object resolvedObject = objectResolver.readResolve(obj);
if (! unshared) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_EMPTY_LIST_OBJECT: {
return Collections.emptyList();
}
case ID_EMPTY_SET_OBJECT: {
return Collections.emptySet();
}
case ID_EMPTY_MAP_OBJECT: {
return Collections.emptyMap();
}
case ID_COLLECTION_EMPTY:
case ID_COLLECTION_EMPTY_UNSHARED:
case ID_COLLECTION_SMALL:
case ID_COLLECTION_SMALL_UNSHARED:
case ID_COLLECTION_MEDIUM:
case ID_COLLECTION_MEDIUM_UNSHARED:
case ID_COLLECTION_LARGE:
case ID_COLLECTION_LARGE_UNSHARED:
{
final int len;
switch (leadByte) {
case ID_COLLECTION_EMPTY:
case ID_COLLECTION_EMPTY_UNSHARED: {
len = 0;
break;
}
case ID_COLLECTION_SMALL:
case ID_COLLECTION_SMALL_UNSHARED: {
int b = readUnsignedByte();
len = b == 0 ? 0x100 : b;
break;
}
case ID_COLLECTION_MEDIUM:
case ID_COLLECTION_MEDIUM_UNSHARED: {
int b = readUnsignedShort();
len = b == 0 ? 0x10000 : b;
break;
}
case ID_COLLECTION_LARGE:
case ID_COLLECTION_LARGE_UNSHARED: {
len = readInt();
break;
}
default: {
throw new IllegalStateException();
}
}
final int id = readUnsignedByte();
switch (id) {
case ID_CC_ARRAY_LIST: {
return readCollectionData(unshared, len, new ArrayList(len));
}
case ID_CC_HASH_SET: {
return readCollectionData(unshared, len, new HashSet(len));
}
case ID_CC_LINKED_HASH_SET: {
return readCollectionData(unshared, len, new LinkedHashSet(len));
}
case ID_CC_LINKED_LIST: {
return readCollectionData(unshared, len, new LinkedList());
}
case ID_CC_TREE_SET: {
return readCollectionData(unshared, len, new TreeSet((Comparator)doReadNestedObject(false, "java.util.TreeSet comparator")));
}
case ID_CC_ENUM_SET_PROXY: {
final ClassDescriptor nestedDescriptor = doReadClassDescriptor(readUnsignedByte());
final Class<? extends Enum> elementType = nestedDescriptor.getType().asSubclass(Enum.class);
return readCollectionData(unshared, len, EnumSet.noneOf(elementType));
}
case ID_CC_VECTOR: {
return readCollectionData(unshared, len, new Vector(len));
}
case ID_CC_STACK: {
return readCollectionData(unshared, len, new Stack());
}
case ID_CC_HASH_MAP: {
return readMapData(unshared, len, new HashMap(len));
}
case ID_CC_HASHTABLE: {
return readMapData(unshared, len, new Hashtable(len));
}
case ID_CC_IDENTITY_HASH_MAP: {
return readMapData(unshared, len, new IdentityHashMap(len));
}
case ID_CC_LINKED_HASH_MAP: {
return readMapData(unshared, len, new LinkedHashMap(len));
}
case ID_CC_TREE_MAP: {
return readMapData(unshared, len, new TreeMap((Comparator)doReadNestedObject(false, "java.util.TreeMap comparator")));
}
case ID_CC_ENUM_MAP: {
final ClassDescriptor nestedDescriptor = doReadClassDescriptor(readUnsignedByte());
final Class<? extends Enum> elementType = nestedDescriptor.getType().asSubclass(Enum.class);
return readMapData(unshared, len, new EnumMap(elementType));
}
default: {
throw new StreamCorruptedException("Unexpected byte found when reading a collection type: " + leadByte);
}
}
}
case ID_CLEAR_CLASS_CACHE: {
if (depth > 1) {
throw new StreamCorruptedException("ID_CLEAR_CLASS_CACHE token in the middle of stream processing");
}
classCache.clear();
instanceCache.clear();
leadByte = readUnsignedByte();
continue;
}
case ID_CLEAR_INSTANCE_CACHE: {
if (depth > 1) {
throw new StreamCorruptedException("ID_CLEAR_INSTANCE_CACHE token in the middle of stream processing");
}
instanceCache.clear();
continue;
}
default: {
throw new StreamCorruptedException("Unexpected byte found when reading an object: " + leadByte);
}
}
} finally {
depth --;
}
}
| Object doReadObject(int leadByte, final boolean unshared) throws IOException, ClassNotFoundException {
depth ++;
try {
for (;;) switch (leadByte) {
case ID_NULL: {
return null;
}
case ID_REPEAT_OBJECT_FAR: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a backreference as unshared");
}
final int index = readInt();
try {
final Object obj = instanceCache.get(index);
if (obj != null) return obj;
} catch (IndexOutOfBoundsException e) {
}
throw new InvalidObjectException("Attempt to read a backreference with an invalid ID (absolute " + index + ")");
}
case ID_REPEAT_OBJECT_NEAR: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a backreference as unshared");
}
final int index = readByte() | 0xffffff00;
try {
final Object obj = instanceCache.get(index + instanceCache.size());
if (obj != null) return obj;
} catch (IndexOutOfBoundsException e) {
}
throw new InvalidObjectException("Attempt to read a backreference with an invalid ID (relative near " + index + ")");
}
case ID_REPEAT_OBJECT_NEARISH: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a backreference as unshared");
}
final int index = readShort() | 0xffff0000;
try {
final Object obj = instanceCache.get(index + instanceCache.size());
if (obj != null) return obj;
} catch (IndexOutOfBoundsException e) {
}
throw new InvalidObjectException("Attempt to read a backreference with an invalid ID (relative nearish " + index + ")");
}
case ID_NEW_OBJECT:
case ID_NEW_OBJECT_UNSHARED: {
if (unshared != (leadByte == ID_NEW_OBJECT_UNSHARED)) {
throw sharedMismatch();
}
return doReadNewObject(readUnsignedByte(), unshared);
}
// v2 string types
case ID_STRING_EMPTY: {
return "";
}
case ID_STRING_SMALL: {
// ignore unshared setting
int length = readUnsignedByte();
final String s = UTFUtils.readUTFBytes(this, length == 0 ? 0x100 : length);
instanceCache.add(s);
return s;
}
case ID_STRING_MEDIUM: {
// ignore unshared setting
int length = readUnsignedShort();
final String s = UTFUtils.readUTFBytes(this, length == 0 ? 0x10000 : length);
instanceCache.add(s);
return s;
}
case ID_STRING_LARGE: {
// ignore unshared setting
int length = readInt();
if (length <= 0) {
throw new StreamCorruptedException("Invalid length value for string in stream (" + length + ")");
}
final String s = UTFUtils.readUTFBytes(this, length);
instanceCache.add(s);
return s;
}
case ID_ARRAY_EMPTY:
case ID_ARRAY_EMPTY_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_EMPTY_UNSHARED)) {
throw sharedMismatch();
}
final ArrayList<Object> instanceCache = this.instanceCache;
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Array.newInstance(doReadClassDescriptor(readUnsignedByte()).getType(), 0);
instanceCache.set(idx, obj);
final Object resolvedObject = objectResolver.readResolve(obj);
if (unshared) {
instanceCache.set(idx, null);
} else if (obj != resolvedObject) {
instanceCache.set(idx, resolvedObject);
}
return obj;
}
case ID_ARRAY_SMALL:
case ID_ARRAY_SMALL_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_SMALL_UNSHARED)) {
throw sharedMismatch();
}
final int len = readUnsignedByte();
return doReadArray(len == 0 ? 0x100 : len, unshared);
}
case ID_ARRAY_MEDIUM:
case ID_ARRAY_MEDIUM_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_MEDIUM_UNSHARED)) {
throw sharedMismatch();
}
final int len = readUnsignedShort();
return doReadArray(len == 0 ? 0x10000 : len, unshared);
}
case ID_ARRAY_LARGE:
case ID_ARRAY_LARGE_UNSHARED: {
if (unshared != (leadByte == ID_ARRAY_LARGE_UNSHARED)) {
throw sharedMismatch();
}
final int len = readInt();
if (len <= 0) {
throw new StreamCorruptedException("Invalid length value for array in stream (" + len + ")");
}
return doReadArray(len, unshared);
}
case ID_PREDEFINED_OBJECT: {
if (unshared) {
throw new InvalidObjectException("Attempt to read a predefined object as unshared");
}
if (version == 1) {
final BlockUnmarshaller blockUnmarshaller = getBlockUnmarshaller();
final Object obj = objectTable.readObject(blockUnmarshaller);
blockUnmarshaller.readToEndBlockData();
blockUnmarshaller.unblock();
return obj;
} else {
// v2 does not require a block for this
return objectTable.readObject(this);
}
}
case ID_BOOLEAN_OBJECT_TRUE: {
return objectResolver.readResolve(Boolean.TRUE);
}
case ID_BOOLEAN_OBJECT_FALSE: {
return objectResolver.readResolve(Boolean.FALSE);
}
case ID_BYTE_OBJECT: {
return objectResolver.readResolve(Byte.valueOf(readByte()));
}
case ID_SHORT_OBJECT: {
return objectResolver.readResolve(Short.valueOf(readShort()));
}
case ID_INTEGER_OBJECT: {
return objectResolver.readResolve(Integer.valueOf(readInt()));
}
case ID_LONG_OBJECT: {
return objectResolver.readResolve(Long.valueOf(readLong()));
}
case ID_FLOAT_OBJECT: {
return objectResolver.readResolve(Float.valueOf(readFloat()));
}
case ID_DOUBLE_OBJECT: {
return objectResolver.readResolve(Double.valueOf(readDouble()));
}
case ID_CHARACTER_OBJECT: {
return objectResolver.readResolve(Character.valueOf(readChar()));
}
case ID_PRIM_BYTE: {
return byte.class;
}
case ID_PRIM_BOOLEAN: {
return boolean.class;
}
case ID_PRIM_CHAR: {
return char.class;
}
case ID_PRIM_DOUBLE: {
return double.class;
}
case ID_PRIM_FLOAT: {
return float.class;
}
case ID_PRIM_INT: {
return int.class;
}
case ID_PRIM_LONG: {
return long.class;
}
case ID_PRIM_SHORT: {
return short.class;
}
case ID_VOID: {
return void.class;
}
case ID_BYTE_CLASS: {
return Byte.class;
}
case ID_BOOLEAN_CLASS: {
return Boolean.class;
}
case ID_CHARACTER_CLASS: {
return Character.class;
}
case ID_DOUBLE_CLASS: {
return Double.class;
}
case ID_FLOAT_CLASS: {
return Float.class;
}
case ID_INTEGER_CLASS: {
return Integer.class;
}
case ID_LONG_CLASS: {
return Long.class;
}
case ID_SHORT_CLASS: {
return Short.class;
}
case ID_VOID_CLASS: {
return Void.class;
}
case ID_OBJECT_CLASS: {
return Object.class;
}
case ID_CLASS_CLASS: {
return Class.class;
}
case ID_STRING_CLASS: {
return String.class;
}
case ID_ENUM_CLASS: {
return Enum.class;
}
case ID_BYTE_ARRAY_CLASS: {
return byte[].class;
}
case ID_BOOLEAN_ARRAY_CLASS: {
return boolean[].class;
}
case ID_CHAR_ARRAY_CLASS: {
return char[].class;
}
case ID_DOUBLE_ARRAY_CLASS: {
return double[].class;
}
case ID_FLOAT_ARRAY_CLASS: {
return float[].class;
}
case ID_INT_ARRAY_CLASS: {
return int[].class;
}
case ID_LONG_ARRAY_CLASS: {
return long[].class;
}
case ID_SHORT_ARRAY_CLASS: {
return short[].class;
}
case ID_CC_ARRAY_LIST: {
return ArrayList.class;
}
case ID_CC_HASH_MAP: {
return HashMap.class;
}
case ID_CC_HASH_SET: {
return HashSet.class;
}
case ID_CC_HASHTABLE: {
return Hashtable.class;
}
case ID_CC_IDENTITY_HASH_MAP: {
return IdentityHashMap.class;
}
case ID_CC_LINKED_HASH_MAP: {
return LinkedHashMap.class;
}
case ID_CC_LINKED_HASH_SET: {
return LinkedHashSet.class;
}
case ID_CC_LINKED_LIST: {
return LinkedList.class;
}
case ID_CC_TREE_MAP: {
return TreeMap.class;
}
case ID_CC_TREE_SET: {
return TreeSet.class;
}
case ID_ABSTRACT_COLLECTION: {
return AbstractCollection.class;
}
case ID_ABSTRACT_LIST: {
return AbstractList.class;
}
case ID_ABSTRACT_QUEUE: {
return AbstractQueue.class;
}
case ID_ABSTRACT_SEQUENTIAL_LIST: {
return AbstractSequentialList.class;
}
case ID_ABSTRACT_SET: {
return AbstractSet.class;
}
case ID_SINGLETON_LIST_OBJECT: {
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Collections.singletonList(doReadNestedObject(false, "Collections#singletonList()"));
final Object resolvedObject = objectResolver.readResolve(obj);
if (! unshared) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_SINGLETON_SET_OBJECT: {
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Collections.singleton(doReadNestedObject(false, "Collections#singleton()"));
final Object resolvedObject = objectResolver.readResolve(obj);
if (! unshared) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_SINGLETON_MAP_OBJECT: {
final int idx = instanceCache.size();
instanceCache.add(null);
final Object obj = Collections.singletonMap(doReadNestedObject(false, "Collections#singletonMap() [key]"), doReadNestedObject(false, "Collections#singletonMap() [value]"));
final Object resolvedObject = objectResolver.readResolve(obj);
if (! unshared) {
instanceCache.set(idx, resolvedObject);
}
return resolvedObject;
}
case ID_EMPTY_LIST_OBJECT: {
return Collections.emptyList();
}
case ID_EMPTY_SET_OBJECT: {
return Collections.emptySet();
}
case ID_EMPTY_MAP_OBJECT: {
return Collections.emptyMap();
}
case ID_COLLECTION_EMPTY:
case ID_COLLECTION_EMPTY_UNSHARED:
case ID_COLLECTION_SMALL:
case ID_COLLECTION_SMALL_UNSHARED:
case ID_COLLECTION_MEDIUM:
case ID_COLLECTION_MEDIUM_UNSHARED:
case ID_COLLECTION_LARGE:
case ID_COLLECTION_LARGE_UNSHARED:
{
final int len;
switch (leadByte) {
case ID_COLLECTION_EMPTY:
case ID_COLLECTION_EMPTY_UNSHARED: {
len = 0;
break;
}
case ID_COLLECTION_SMALL:
case ID_COLLECTION_SMALL_UNSHARED: {
int b = readUnsignedByte();
len = b == 0 ? 0x100 : b;
break;
}
case ID_COLLECTION_MEDIUM:
case ID_COLLECTION_MEDIUM_UNSHARED: {
int b = readUnsignedShort();
len = b == 0 ? 0x10000 : b;
break;
}
case ID_COLLECTION_LARGE:
case ID_COLLECTION_LARGE_UNSHARED: {
len = readInt();
break;
}
default: {
throw new IllegalStateException();
}
}
final int id = readUnsignedByte();
switch (id) {
case ID_CC_ARRAY_LIST: {
return readCollectionData(unshared, len, new ArrayList(len));
}
case ID_CC_HASH_SET: {
return readCollectionData(unshared, len, new HashSet(len));
}
case ID_CC_LINKED_HASH_SET: {
return readCollectionData(unshared, len, new LinkedHashSet(len));
}
case ID_CC_LINKED_LIST: {
return readCollectionData(unshared, len, new LinkedList());
}
case ID_CC_TREE_SET: {
return readCollectionData(unshared, len, new TreeSet((Comparator)doReadNestedObject(false, "java.util.TreeSet comparator")));
}
case ID_CC_ENUM_SET_PROXY: {
final ClassDescriptor nestedDescriptor = doReadClassDescriptor(readUnsignedByte());
final Class<? extends Enum> elementType = nestedDescriptor.getType().asSubclass(Enum.class);
return readCollectionData(unshared, len, EnumSet.noneOf(elementType));
}
case ID_CC_VECTOR: {
return readCollectionData(unshared, len, new Vector(len));
}
case ID_CC_STACK: {
return readCollectionData(unshared, len, new Stack());
}
case ID_CC_HASH_MAP: {
return readMapData(unshared, len, new HashMap(len));
}
case ID_CC_HASHTABLE: {
return readMapData(unshared, len, new Hashtable(len));
}
case ID_CC_IDENTITY_HASH_MAP: {
return readMapData(unshared, len, new IdentityHashMap(len));
}
case ID_CC_LINKED_HASH_MAP: {
return readMapData(unshared, len, new LinkedHashMap(len));
}
case ID_CC_TREE_MAP: {
return readMapData(unshared, len, new TreeMap((Comparator)doReadNestedObject(false, "java.util.TreeMap comparator")));
}
case ID_CC_ENUM_MAP: {
final ClassDescriptor nestedDescriptor = doReadClassDescriptor(readUnsignedByte());
final Class<? extends Enum> elementType = nestedDescriptor.getType().asSubclass(Enum.class);
return readMapData(unshared, len, new EnumMap(elementType));
}
default: {
throw new StreamCorruptedException("Unexpected byte found when reading a collection type: " + leadByte);
}
}
}
case ID_CLEAR_CLASS_CACHE: {
if (depth > 1) {
throw new StreamCorruptedException("ID_CLEAR_CLASS_CACHE token in the middle of stream processing");
}
classCache.clear();
instanceCache.clear();
leadByte = readUnsignedByte();
continue;
}
case ID_CLEAR_INSTANCE_CACHE: {
if (depth > 1) {
throw new StreamCorruptedException("ID_CLEAR_INSTANCE_CACHE token in the middle of stream processing");
}
instanceCache.clear();
continue;
}
default: {
throw new StreamCorruptedException("Unexpected byte found when reading an object: " + leadByte);
}
}
} finally {
depth --;
}
}
|
diff --git a/src/org/apache/xerces/dom/DeferredAttrNSImpl.java b/src/org/apache/xerces/dom/DeferredAttrNSImpl.java
index 619482cb..8fcfde19 100644
--- a/src/org/apache/xerces/dom/DeferredAttrNSImpl.java
+++ b/src/org/apache/xerces/dom/DeferredAttrNSImpl.java
@@ -1,182 +1,182 @@
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 1999, 2000 The Apache Software Foundation. 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 the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xerces" and "Apache Software Foundation" 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 "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* 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 THE APACHE SOFTWARE FOUNDATION 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.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 1999, International
* Business Machines, Inc., http://www.apache.org. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/*
* WARNING: because java doesn't support multi-inheritance some code is
* duplicated. If you're changing this file you probably want to change
* DeferredAttrImpl.java at the same time.
*/
/* $Id$ */
package org.apache.xerces.dom;
import org.w3c.dom.*;
import org.apache.xerces.utils.StringPool;
/**
* DeferredAttrNSImpl is to AttrNSImpl, what DeferredAttrImpl is to
* AttrImpl.
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
* @see DeferredAttrImpl
*/
public final class DeferredAttrNSImpl
extends AttrNSImpl
implements DeferredNode {
//
// Constants
//
/** Serialization version. */
static final long serialVersionUID = 6074924934945957154L;
//
// Data
//
/** Node index. */
protected transient int fNodeIndex;
//
// Constructors
//
/**
* This is the deferred constructor. Only the fNodeIndex is given here.
* All other data, can be requested from the ownerDocument via the index.
*/
DeferredAttrNSImpl(DeferredDocumentImpl ownerDocument, int nodeIndex) {
super(ownerDocument, null);
fNodeIndex = nodeIndex;
needsSyncData(true);
needsSyncChildren(true);
} // <init>(DeferredDocumentImpl,int)
//
// DeferredNode methods
//
/** Returns the node index. */
public int getNodeIndex() {
return fNodeIndex;
}
//
// Protected methods
//
/** Synchronizes the data (name and value) for fast nodes. */
protected void synchronizeData() {
// no need to sync in the future
needsSyncData(false);
// fluff data
DeferredDocumentImpl ownerDocument =
(DeferredDocumentImpl) ownerDocument();
int attrQName = ownerDocument.getNodeName(fNodeIndex);
StringPool pool = ownerDocument.getStringPool();
name = pool.toString(attrQName);
// extract prefix and local part from QName
int index = name.indexOf(':');
String prefix;
if (index < 0) {
prefix = null;
localName = name;
}
else {
prefix = name.substring(0, index);
localName = name.substring(index + 1);
}
isSpecified(ownerDocument.getNodeValue(fNodeIndex) == 1);
//namespaceURI = pool.toString(ownerDocument.getNodeURI(attrQName));
namespaceURI = pool.toString(ownerDocument.getNodeURI(fNodeIndex));
// DOM Level 2 wants all namespace declaration attributes
// to be bound to "http://www.w3.org/2000/xmlns/"
// So as long as the XML parser doesn't do it, it needs to
// done here.
- if (namespaceURI == null && namespaceURI.length() == 0) {
+ if (namespaceURI == null || namespaceURI.length() == 0) {
if (prefix != null) {
if (prefix.equals("xmlns")) {
namespaceURI = "http://www.w3.org/2000/xmlns/";
}
} else if (name.equals("xmlns")) {
namespaceURI = "http://www.w3.org/2000/xmlns/";
}
}
} // synchronizeData()
/**
* Synchronizes the node's children with the internal structure.
* Fluffing the children at once solves a lot of work to keep
* the two structures in sync. The problem gets worse when
* editing the tree -- this makes it a lot easier.
*/
protected void synchronizeChildren() {
synchronizeChildren(fNodeIndex);
} // synchronizeChildren()
} // class DeferredAttrImpl
| true | true | protected void synchronizeData() {
// no need to sync in the future
needsSyncData(false);
// fluff data
DeferredDocumentImpl ownerDocument =
(DeferredDocumentImpl) ownerDocument();
int attrQName = ownerDocument.getNodeName(fNodeIndex);
StringPool pool = ownerDocument.getStringPool();
name = pool.toString(attrQName);
// extract prefix and local part from QName
int index = name.indexOf(':');
String prefix;
if (index < 0) {
prefix = null;
localName = name;
}
else {
prefix = name.substring(0, index);
localName = name.substring(index + 1);
}
isSpecified(ownerDocument.getNodeValue(fNodeIndex) == 1);
//namespaceURI = pool.toString(ownerDocument.getNodeURI(attrQName));
namespaceURI = pool.toString(ownerDocument.getNodeURI(fNodeIndex));
// DOM Level 2 wants all namespace declaration attributes
// to be bound to "http://www.w3.org/2000/xmlns/"
// So as long as the XML parser doesn't do it, it needs to
// done here.
if (namespaceURI == null && namespaceURI.length() == 0) {
if (prefix != null) {
if (prefix.equals("xmlns")) {
namespaceURI = "http://www.w3.org/2000/xmlns/";
}
} else if (name.equals("xmlns")) {
namespaceURI = "http://www.w3.org/2000/xmlns/";
}
}
} // synchronizeData()
| protected void synchronizeData() {
// no need to sync in the future
needsSyncData(false);
// fluff data
DeferredDocumentImpl ownerDocument =
(DeferredDocumentImpl) ownerDocument();
int attrQName = ownerDocument.getNodeName(fNodeIndex);
StringPool pool = ownerDocument.getStringPool();
name = pool.toString(attrQName);
// extract prefix and local part from QName
int index = name.indexOf(':');
String prefix;
if (index < 0) {
prefix = null;
localName = name;
}
else {
prefix = name.substring(0, index);
localName = name.substring(index + 1);
}
isSpecified(ownerDocument.getNodeValue(fNodeIndex) == 1);
//namespaceURI = pool.toString(ownerDocument.getNodeURI(attrQName));
namespaceURI = pool.toString(ownerDocument.getNodeURI(fNodeIndex));
// DOM Level 2 wants all namespace declaration attributes
// to be bound to "http://www.w3.org/2000/xmlns/"
// So as long as the XML parser doesn't do it, it needs to
// done here.
if (namespaceURI == null || namespaceURI.length() == 0) {
if (prefix != null) {
if (prefix.equals("xmlns")) {
namespaceURI = "http://www.w3.org/2000/xmlns/";
}
} else if (name.equals("xmlns")) {
namespaceURI = "http://www.w3.org/2000/xmlns/";
}
}
} // synchronizeData()
|
diff --git a/client/src/net/sourceforge/guacamole/GuacamoleClient.java b/client/src/net/sourceforge/guacamole/GuacamoleClient.java
index 37ced87..9086e0f 100644
--- a/client/src/net/sourceforge/guacamole/GuacamoleClient.java
+++ b/client/src/net/sourceforge/guacamole/GuacamoleClient.java
@@ -1,135 +1,135 @@
package net.sourceforge.guacamole;
/*
* Guacamole - Clientless Remote Desktop
* Copyright (C) 2010 Michael Jumper
*
* 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 Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
import java.io.InputStream;
import java.io.BufferedInputStream;
import java.io.Reader;
import java.io.InputStreamReader;
import net.sourceforge.guacamole.instruction.Instruction;
import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.event.KeyEvent;
import net.sourceforge.guacamole.event.PointerEvent;
public class GuacamoleClient extends Client {
private Socket sock;
private Reader input;
public GuacamoleClient(String hostname, int port) throws GuacamoleException {
try {
sock = new Socket(InetAddress.getByName(hostname), port);
input = new InputStreamReader(sock.getInputStream());
}
catch (IOException e) {
throw new GuacamoleException(e);
}
}
public void send(KeyEvent event) throws GuacamoleException {
// STUB
}
public void send(PointerEvent event) throws GuacamoleException {
// STUB
}
public void setClipboard(String clipboard) throws GuacamoleException {
// STUB
}
public void disconnect() throws GuacamoleException {
try {
sock.close();
}
catch (IOException e) {
throw new GuacamoleException(e);
}
}
private int usedLength = 0;
private char[] buffer = new char[20000];
public Instruction nextInstruction(boolean blocking) throws GuacamoleException {
try {
// While we're blocking, or input is available
- while (blocking || input.ready()) {
+ do {
// If past threshold, resize buffer before reading
if (usedLength > buffer.length/2) {
- char[] newbuffer = new char[buffer.length*2];
- System.arraycopy(newbuffer, 0, buffer, 0, usedLength);
- buffer = newbuffer;
+ char[] biggerBuffer = new char[buffer.length*2];
+ System.arraycopy(buffer, 0, biggerBuffer, 0, usedLength);
+ buffer = biggerBuffer;
}
// Attempt to fill buffer
int numRead = input.read(buffer, usedLength, buffer.length - usedLength);
if (numRead == -1)
return null;
int prevLength = usedLength;
usedLength += numRead;
for (int i=usedLength-1; i>=prevLength; i--) {
char readChar = buffer[i];
// If end of instruction, return it.
if (readChar == ';') {
// Get instruction
final String instruction = new String(buffer, 0, i+1);
// Reset buffer
usedLength -= i+1;
System.arraycopy(buffer, i+1, buffer, 0, usedLength);
// Return instruction string wrapped in Instruction class
return new Instruction() {
public String toString() {
return instruction;
}
};
}
}
- } // End read loop
+ } while (input.ready()); // End read loop
}
catch (IOException e) {
throw new GuacamoleException(e);
}
return null;
}
}
| false | true | public Instruction nextInstruction(boolean blocking) throws GuacamoleException {
try {
// While we're blocking, or input is available
while (blocking || input.ready()) {
// If past threshold, resize buffer before reading
if (usedLength > buffer.length/2) {
char[] newbuffer = new char[buffer.length*2];
System.arraycopy(newbuffer, 0, buffer, 0, usedLength);
buffer = newbuffer;
}
// Attempt to fill buffer
int numRead = input.read(buffer, usedLength, buffer.length - usedLength);
if (numRead == -1)
return null;
int prevLength = usedLength;
usedLength += numRead;
for (int i=usedLength-1; i>=prevLength; i--) {
char readChar = buffer[i];
// If end of instruction, return it.
if (readChar == ';') {
// Get instruction
final String instruction = new String(buffer, 0, i+1);
// Reset buffer
usedLength -= i+1;
System.arraycopy(buffer, i+1, buffer, 0, usedLength);
// Return instruction string wrapped in Instruction class
return new Instruction() {
public String toString() {
return instruction;
}
};
}
}
} // End read loop
}
catch (IOException e) {
throw new GuacamoleException(e);
}
return null;
}
| public Instruction nextInstruction(boolean blocking) throws GuacamoleException {
try {
// While we're blocking, or input is available
do {
// If past threshold, resize buffer before reading
if (usedLength > buffer.length/2) {
char[] biggerBuffer = new char[buffer.length*2];
System.arraycopy(buffer, 0, biggerBuffer, 0, usedLength);
buffer = biggerBuffer;
}
// Attempt to fill buffer
int numRead = input.read(buffer, usedLength, buffer.length - usedLength);
if (numRead == -1)
return null;
int prevLength = usedLength;
usedLength += numRead;
for (int i=usedLength-1; i>=prevLength; i--) {
char readChar = buffer[i];
// If end of instruction, return it.
if (readChar == ';') {
// Get instruction
final String instruction = new String(buffer, 0, i+1);
// Reset buffer
usedLength -= i+1;
System.arraycopy(buffer, i+1, buffer, 0, usedLength);
// Return instruction string wrapped in Instruction class
return new Instruction() {
public String toString() {
return instruction;
}
};
}
}
} while (input.ready()); // End read loop
}
catch (IOException e) {
throw new GuacamoleException(e);
}
return null;
}
|
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index d0c50fc9..4a6db210 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -1,689 +1,690 @@
/*
**
** Copyright 2007, 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.packageinstaller;
import android.app.Activity;
import android.app.ActivityManagerNative;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageUserState;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageParser;
import android.content.pm.VerificationParams;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.AppSecurityPermissions;
import android.widget.Button;
import android.widget.ScrollView;
import android.widget.TabHost;
import android.widget.TabWidget;
import android.widget.TextView;
import java.io.File;
import java.util.ArrayList;
/*
* This activity is launched when a new application is installed via side loading
* The package is first parsed and the user is notified of parse errors via a dialog.
* If the package is successfully parsed, the user is notified to turn on the install unknown
* applications setting. A memory check is made at this point and the user is notified of out
* of memory conditions if any. If the package is already existing on the device,
* a confirmation dialog (to replace the existing package) is presented to the user.
* Based on the user response the package is then installed by launching InstallAppConfirm
* sub activity. All state transitions are handled in this activity
*/
public class PackageInstallerActivity extends Activity implements OnCancelListener, OnClickListener {
private static final String TAG = "PackageInstaller";
private Uri mPackageURI;
private Uri mOriginatingURI;
private Uri mReferrerURI;
private int mOriginatingUid = VerificationParams.NO_UID;
private boolean localLOGV = false;
PackageManager mPm;
PackageInfo mPkgInfo;
ApplicationInfo mSourceInfo;
// ApplicationInfo object primarily used for already existing applications
private ApplicationInfo mAppInfo = null;
// View for install progress
View mInstallConfirm;
// Buttons to indicate user acceptance
private Button mOk;
private Button mCancel;
CaffeinatedScrollView mScrollView = null;
private boolean mOkCanInstall = false;
static final String PREFS_ALLOWED_SOURCES = "allowed_sources";
// Dialog identifiers used in showDialog
private static final int DLG_BASE = 0;
private static final int DLG_UNKNOWN_APPS = DLG_BASE + 1;
private static final int DLG_PACKAGE_ERROR = DLG_BASE + 2;
private static final int DLG_OUT_OF_SPACE = DLG_BASE + 3;
private static final int DLG_INSTALL_ERROR = DLG_BASE + 4;
private static final int DLG_ALLOW_SOURCE = DLG_BASE + 5;
/**
* This is a helper class that implements the management of tabs and all
* details of connecting a ViewPager with associated TabHost. It relies on a
* trick. Normally a tab host has a simple API for supplying a View or
* Intent that each tab will show. This is not sufficient for switching
* between pages. So instead we make the content part of the tab host
* 0dp high (it is not shown) and the TabsAdapter supplies its own dummy
* view to show as the tab content. It listens to changes in tabs, and takes
* care of switch to the correct paged in the ViewPager whenever the selected
* tab changes.
*/
public static class TabsAdapter extends PagerAdapter
implements TabHost.OnTabChangeListener, ViewPager.OnPageChangeListener {
private final Context mContext;
private final TabHost mTabHost;
private final ViewPager mViewPager;
private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
private final Rect mTempRect = new Rect();
static final class TabInfo {
private final String tag;
private final View view;
TabInfo(String _tag, View _view) {
tag = _tag;
view = _view;
}
}
static class DummyTabFactory implements TabHost.TabContentFactory {
private final Context mContext;
public DummyTabFactory(Context context) {
mContext = context;
}
@Override
public View createTabContent(String tag) {
View v = new View(mContext);
v.setMinimumWidth(0);
v.setMinimumHeight(0);
return v;
}
}
public TabsAdapter(Activity activity, TabHost tabHost, ViewPager pager) {
mContext = activity;
mTabHost = tabHost;
mViewPager = pager;
mTabHost.setOnTabChangedListener(this);
mViewPager.setAdapter(this);
mViewPager.setOnPageChangeListener(this);
}
public void addTab(TabHost.TabSpec tabSpec, View view) {
tabSpec.setContent(new DummyTabFactory(mContext));
String tag = tabSpec.getTag();
TabInfo info = new TabInfo(tag, view);
mTabs.add(info);
mTabHost.addTab(tabSpec);
notifyDataSetChanged();
}
@Override
public int getCount() {
return mTabs.size();
}
@Override
public Object instantiateItem(ViewGroup container, int position) {
View view = mTabs.get(position).view;
container.addView(view);
return view;
}
@Override
public void destroyItem(ViewGroup container, int position, Object object) {
container.removeView((View)object);
}
@Override
public boolean isViewFromObject(View view, Object object) {
return view == object;
}
@Override
public void onTabChanged(String tabId) {
int position = mTabHost.getCurrentTab();
mViewPager.setCurrentItem(position);
}
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
}
@Override
public void onPageSelected(int position) {
// Unfortunately when TabHost changes the current tab, it kindly
// also takes care of putting focus on it when not in touch mode.
// The jerk.
// This hack tries to prevent this from pulling focus out of our
// ViewPager.
TabWidget widget = mTabHost.getTabWidget();
int oldFocusability = widget.getDescendantFocusability();
widget.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
mTabHost.setCurrentTab(position);
widget.setDescendantFocusability(oldFocusability);
// Scroll the current tab into visibility if needed.
View tab = widget.getChildTabViewAt(position);
mTempRect.set(tab.getLeft(), tab.getTop(), tab.getRight(), tab.getBottom());
widget.requestRectangleOnScreen(mTempRect, false);
// Make sure the scrollbars are visible for a moment after selection
final View contentView = mTabs.get(position).view;
if (contentView instanceof CaffeinatedScrollView) {
((CaffeinatedScrollView) contentView).awakenScrollBars();
}
}
@Override
public void onPageScrollStateChanged(int state) {
}
}
private void startInstallConfirm() {
TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost);
tabHost.setup();
ViewPager viewPager = (ViewPager)findViewById(R.id.pager);
TabsAdapter adapter = new TabsAdapter(this, tabHost, viewPager);
boolean permVisible = false;
mScrollView = null;
mOkCanInstall = false;
int msg = 0;
if (mPkgInfo != null) {
AppSecurityPermissions perms = new AppSecurityPermissions(this, mPkgInfo);
final int NP = perms.getPermissionCount(AppSecurityPermissions.WHICH_PERSONAL);
final int ND = perms.getPermissionCount(AppSecurityPermissions.WHICH_DEVICE);
if (mAppInfo != null) {
msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
? R.string.install_confirm_question_update_system
: R.string.install_confirm_question_update;
mScrollView = new CaffeinatedScrollView(this);
mScrollView.setFillViewport(true);
if (perms.getPermissionCount(AppSecurityPermissions.WHICH_NEW) > 0) {
permVisible = true;
mScrollView.addView(perms.getPermissionsView(
AppSecurityPermissions.WHICH_NEW));
} else {
LayoutInflater inflater = (LayoutInflater)getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
TextView label = (TextView)inflater.inflate(R.layout.label, null);
label.setText(R.string.no_new_perms);
mScrollView.addView(label);
}
adapter.addTab(tabHost.newTabSpec("new").setIndicator(
getText(R.string.newPerms)), mScrollView);
} else {
findViewById(R.id.tabscontainer).setVisibility(View.GONE);
findViewById(R.id.divider).setVisibility(View.VISIBLE);
}
if (NP > 0 || ND > 0) {
permVisible = true;
LayoutInflater inflater = (LayoutInflater)getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
View root = inflater.inflate(R.layout.permissions_list, null);
if (mScrollView == null) {
mScrollView = (CaffeinatedScrollView)root.findViewById(R.id.scrollview);
}
if (NP > 0) {
((ViewGroup)root.findViewById(R.id.privacylist)).addView(
perms.getPermissionsView(AppSecurityPermissions.WHICH_PERSONAL));
} else {
root.findViewById(R.id.privacylist).setVisibility(View.GONE);
}
if (ND > 0) {
((ViewGroup)root.findViewById(R.id.devicelist)).addView(
perms.getPermissionsView(AppSecurityPermissions.WHICH_DEVICE));
} else {
root.findViewById(R.id.devicelist).setVisibility(View.GONE);
}
adapter.addTab(tabHost.newTabSpec("all").setIndicator(
getText(R.string.allPerms)), root);
}
}
if (!permVisible) {
- if (msg == 0) {
- if (mAppInfo != null) {
- // This is an update to an application, but there are no
- // permissions at all.
- msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
- ? R.string.install_confirm_question_update_system_no_perms
- : R.string.install_confirm_question_update_no_perms;
- } else {
- // This is a new application with no permissions.
- msg = R.string.install_confirm_question_no_perms;
- }
+ if (mAppInfo != null) {
+ // This is an update to an application, but there are no
+ // permissions at all.
+ msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
+ ? R.string.install_confirm_question_update_system_no_perms
+ : R.string.install_confirm_question_update_no_perms;
+ } else {
+ // This is a new application with no permissions.
+ msg = R.string.install_confirm_question_no_perms;
}
tabHost.setVisibility(View.GONE);
+ findViewById(R.id.filler).setVisibility(View.VISIBLE);
+ findViewById(R.id.divider).setVisibility(View.GONE);
+ mScrollView = null;
}
if (msg != 0) {
((TextView)findViewById(R.id.install_confirm_question)).setText(msg);
}
mInstallConfirm.setVisibility(View.VISIBLE);
mOk = (Button)findViewById(R.id.ok_button);
mCancel = (Button)findViewById(R.id.cancel_button);
mOk.setOnClickListener(this);
mCancel.setOnClickListener(this);
if (mScrollView == null) {
// There is nothing to scroll view, so the ok button is immediately
// set to install.
mOk.setText(R.string.install);
mOkCanInstall = true;
} else {
mScrollView.setFullScrollAction(new Runnable() {
@Override
public void run() {
mOk.setText(R.string.install);
mOkCanInstall = true;
}
});
}
}
private void showDialogInner(int id) {
// TODO better fix for this? Remove dialog so that it gets created again
removeDialog(id);
showDialog(id);
}
@Override
public Dialog onCreateDialog(int id, Bundle bundle) {
switch (id) {
case DLG_UNKNOWN_APPS:
return new AlertDialog.Builder(this)
.setTitle(R.string.unknown_apps_dlg_title)
.setMessage(R.string.unknown_apps_dlg_text)
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
Log.i(TAG, "Finishing off activity so that user can navigate to settings manually");
finish();
}})
.setPositiveButton(R.string.settings, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
Log.i(TAG, "Launching settings");
launchSettingsAppAndFinish();
}
})
.setOnCancelListener(this)
.create();
case DLG_PACKAGE_ERROR :
return new AlertDialog.Builder(this)
.setTitle(R.string.Parse_error_dlg_title)
.setMessage(R.string.Parse_error_dlg_text)
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
finish();
}
})
.setOnCancelListener(this)
.create();
case DLG_OUT_OF_SPACE:
// Guaranteed not to be null. will default to package name if not set by app
CharSequence appTitle = mPm.getApplicationLabel(mPkgInfo.applicationInfo);
String dlgText = getString(R.string.out_of_space_dlg_text,
appTitle.toString());
return new AlertDialog.Builder(this)
.setTitle(R.string.out_of_space_dlg_title)
.setMessage(dlgText)
.setPositiveButton(R.string.manage_applications, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
//launch manage applications
Intent intent = new Intent("android.intent.action.MANAGE_PACKAGE_STORAGE");
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
finish();
}
})
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
Log.i(TAG, "Canceling installation");
finish();
}
})
.setOnCancelListener(this)
.create();
case DLG_INSTALL_ERROR :
// Guaranteed not to be null. will default to package name if not set by app
CharSequence appTitle1 = mPm.getApplicationLabel(mPkgInfo.applicationInfo);
String dlgText1 = getString(R.string.install_failed_msg,
appTitle1.toString());
return new AlertDialog.Builder(this)
.setTitle(R.string.install_failed)
.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
finish();
}
})
.setMessage(dlgText1)
.setOnCancelListener(this)
.create();
case DLG_ALLOW_SOURCE:
CharSequence appTitle2 = mPm.getApplicationLabel(mSourceInfo);
String dlgText2 = getString(R.string.allow_source_dlg_text,
appTitle2.toString());
return new AlertDialog.Builder(this)
.setTitle(R.string.allow_source_dlg_title)
.setMessage(dlgText2)
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
setResult(RESULT_CANCELED);
finish();
}})
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
SharedPreferences prefs = getSharedPreferences(PREFS_ALLOWED_SOURCES,
Context.MODE_PRIVATE);
prefs.edit().putBoolean(mSourceInfo.packageName, true).apply();
startInstallConfirm();
}
})
.setOnCancelListener(this)
.create();
}
return null;
}
private void launchSettingsAppAndFinish() {
// Create an intent to launch SettingsTwo activity
Intent launchSettingsIntent = new Intent(Settings.ACTION_SECURITY_SETTINGS);
launchSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(launchSettingsIntent);
finish();
}
private boolean isInstallingUnknownAppsAllowed() {
return Settings.Global.getInt(getContentResolver(),
Settings.Global.INSTALL_NON_MARKET_APPS, 0) > 0;
}
private void initiateInstall() {
String pkgName = mPkgInfo.packageName;
// Check if there is already a package on the device with this name
// but it has been renamed to something else.
String[] oldName = mPm.canonicalToCurrentPackageNames(new String[] { pkgName });
if (oldName != null && oldName.length > 0 && oldName[0] != null) {
pkgName = oldName[0];
mPkgInfo.packageName = pkgName;
mPkgInfo.applicationInfo.packageName = pkgName;
}
// Check if package is already installed. display confirmation dialog if replacing pkg
try {
// This is a little convoluted because we want to get all uninstalled
// apps, but this may include apps with just data, and if it is just
// data we still want to count it as "installed".
mAppInfo = mPm.getApplicationInfo(pkgName,
PackageManager.GET_UNINSTALLED_PACKAGES);
if ((mAppInfo.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
mAppInfo = null;
}
} catch (NameNotFoundException e) {
mAppInfo = null;
}
startInstallConfirm();
}
void setPmResult(int pmResult) {
Intent result = new Intent();
result.putExtra(Intent.EXTRA_INSTALL_RESULT, pmResult);
setResult(pmResult == PackageManager.INSTALL_SUCCEEDED
? RESULT_OK : RESULT_FIRST_USER, result);
}
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
// get intent information
final Intent intent = getIntent();
mPackageURI = intent.getData();
mOriginatingURI = intent.getParcelableExtra(Intent.EXTRA_ORIGINATING_URI);
mReferrerURI = intent.getParcelableExtra(Intent.EXTRA_REFERRER);
mPm = getPackageManager();
final String scheme = mPackageURI.getScheme();
if (scheme != null && !"file".equals(scheme) && !"package".equals(scheme)) {
Log.w(TAG, "Unsupported scheme " + scheme);
setPmResult(PackageManager.INSTALL_FAILED_INVALID_URI);
return;
}
final PackageUtil.AppSnippet as;
if ("package".equals(mPackageURI.getScheme())) {
try {
mPkgInfo = mPm.getPackageInfo(mPackageURI.getSchemeSpecificPart(),
PackageManager.GET_PERMISSIONS | PackageManager.GET_UNINSTALLED_PACKAGES);
} catch (NameNotFoundException e) {
}
if (mPkgInfo == null) {
Log.w(TAG, "Requested package " + mPackageURI.getScheme()
+ " not available. Discontinuing installation");
showDialogInner(DLG_PACKAGE_ERROR);
setPmResult(PackageManager.INSTALL_FAILED_INVALID_APK);
return;
}
as = new PackageUtil.AppSnippet(mPm.getApplicationLabel(mPkgInfo.applicationInfo),
mPm.getApplicationIcon(mPkgInfo.applicationInfo));
} else {
final File sourceFile = new File(mPackageURI.getPath());
PackageParser.Package parsed = PackageUtil.getPackageInfo(sourceFile);
// Check for parse errors
if (parsed == null) {
Log.w(TAG, "Parse error when parsing manifest. Discontinuing installation");
showDialogInner(DLG_PACKAGE_ERROR);
setPmResult(PackageManager.INSTALL_FAILED_INVALID_APK);
return;
}
mPkgInfo = PackageParser.generatePackageInfo(parsed, null,
PackageManager.GET_PERMISSIONS, 0, 0, null,
new PackageUserState());
as = PackageUtil.getAppSnippet(this, mPkgInfo.applicationInfo, sourceFile);
}
//set view
setContentView(R.layout.install_start);
mInstallConfirm = findViewById(R.id.install_confirm_panel);
mInstallConfirm.setVisibility(View.INVISIBLE);
PackageUtil.initSnippetForNewApp(this, as, R.id.app_snippet);
mOriginatingUid = getOriginatingUid(intent);
// Deal with install source.
String callerPackage = getCallingPackage();
if (callerPackage != null && intent.getBooleanExtra(
Intent.EXTRA_NOT_UNKNOWN_SOURCE, false)) {
try {
mSourceInfo = mPm.getApplicationInfo(callerPackage, 0);
if (mSourceInfo != null) {
if ((mSourceInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0) {
// System apps don't need to be approved.
initiateInstall();
return;
}
/* for now this is disabled, since the user would need to
* have enabled the global "unknown sources" setting in the
* first place in order to get here.
SharedPreferences prefs = getSharedPreferences(PREFS_ALLOWED_SOURCES,
Context.MODE_PRIVATE);
if (prefs.getBoolean(mSourceInfo.packageName, false)) {
// User has already allowed this one.
initiateInstall();
return;
}
//ask user to enable setting first
showDialogInner(DLG_ALLOW_SOURCE);
return;
*/
}
} catch (NameNotFoundException e) {
}
}
// Check unknown sources.
if (!isInstallingUnknownAppsAllowed()) {
//ask user to enable setting first
showDialogInner(DLG_UNKNOWN_APPS);
return;
}
initiateInstall();
}
/** Get the ApplicationInfo for the calling package, if available */
private ApplicationInfo getSourceInfo() {
String callingPackage = getCallingPackage();
if (callingPackage != null) {
try {
return mPm.getApplicationInfo(callingPackage, 0);
} catch (NameNotFoundException ex) {
// ignore
}
}
return null;
}
/** Get the originating uid if possible, or VerificationParams.NO_UID if not available */
private int getOriginatingUid(Intent intent) {
// The originating uid from the intent. We only trust/use this if it comes from a
// system application
int uidFromIntent = intent.getIntExtra(Intent.EXTRA_ORIGINATING_UID,
VerificationParams.NO_UID);
// Get the source info from the calling package, if available. This will be the
// definitive calling package, but it only works if the intent was started using
// startActivityForResult,
ApplicationInfo sourceInfo = getSourceInfo();
if (sourceInfo != null) {
if (uidFromIntent != VerificationParams.NO_UID &&
(mSourceInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
return uidFromIntent;
}
// We either didn't get a uid in the intent, or we don't trust it. Use the
// uid of the calling package instead.
return sourceInfo.uid;
}
// We couldn't get the specific calling package. Let's get the uid instead
int callingUid;
try {
callingUid = ActivityManagerNative.getDefault()
.getLaunchedFromUid(getActivityToken());
} catch (android.os.RemoteException ex) {
Log.w(TAG, "Could not determine the launching uid.");
// nothing else we can do
return VerificationParams.NO_UID;
}
// If we got a uid from the intent, we need to verify that the caller is a
// system package before we use it
if (uidFromIntent != VerificationParams.NO_UID) {
String[] callingPackages = mPm.getPackagesForUid(callingUid);
if (callingPackages != null) {
for (String packageName: callingPackages) {
try {
ApplicationInfo applicationInfo =
mPm.getApplicationInfo(packageName, 0);
if ((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
return uidFromIntent;
}
} catch (NameNotFoundException ex) {
// ignore it, and try the next package
}
}
}
}
// We either didn't get a uid from the intent, or we don't trust it. Use the
// calling uid instead.
return callingUid;
}
// Generic handling when pressing back key
public void onCancel(DialogInterface dialog) {
finish();
}
public void onClick(View v) {
if(v == mOk) {
if (mOkCanInstall || mScrollView == null) {
// Start subactivity to actually install the application
Intent newIntent = new Intent();
newIntent.putExtra(PackageUtil.INTENT_ATTR_APPLICATION_INFO,
mPkgInfo.applicationInfo);
newIntent.setData(mPackageURI);
newIntent.setClass(this, InstallAppProgress.class);
String installerPackageName = getIntent().getStringExtra(
Intent.EXTRA_INSTALLER_PACKAGE_NAME);
if (mOriginatingURI != null) {
newIntent.putExtra(Intent.EXTRA_ORIGINATING_URI, mOriginatingURI);
}
if (mReferrerURI != null) {
newIntent.putExtra(Intent.EXTRA_REFERRER, mReferrerURI);
}
if (mOriginatingUid != VerificationParams.NO_UID) {
newIntent.putExtra(Intent.EXTRA_ORIGINATING_UID, mOriginatingUid);
}
if (installerPackageName != null) {
newIntent.putExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME,
installerPackageName);
}
if (getIntent().getBooleanExtra(Intent.EXTRA_RETURN_RESULT, false)) {
newIntent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
}
if(localLOGV) Log.i(TAG, "downloaded app uri="+mPackageURI);
startActivity(newIntent);
finish();
} else {
mScrollView.pageScroll(View.FOCUS_DOWN);
}
} else if(v == mCancel) {
// Cancel and finish
setResult(RESULT_CANCELED);
finish();
}
}
}
| false | true | private void startInstallConfirm() {
TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost);
tabHost.setup();
ViewPager viewPager = (ViewPager)findViewById(R.id.pager);
TabsAdapter adapter = new TabsAdapter(this, tabHost, viewPager);
boolean permVisible = false;
mScrollView = null;
mOkCanInstall = false;
int msg = 0;
if (mPkgInfo != null) {
AppSecurityPermissions perms = new AppSecurityPermissions(this, mPkgInfo);
final int NP = perms.getPermissionCount(AppSecurityPermissions.WHICH_PERSONAL);
final int ND = perms.getPermissionCount(AppSecurityPermissions.WHICH_DEVICE);
if (mAppInfo != null) {
msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
? R.string.install_confirm_question_update_system
: R.string.install_confirm_question_update;
mScrollView = new CaffeinatedScrollView(this);
mScrollView.setFillViewport(true);
if (perms.getPermissionCount(AppSecurityPermissions.WHICH_NEW) > 0) {
permVisible = true;
mScrollView.addView(perms.getPermissionsView(
AppSecurityPermissions.WHICH_NEW));
} else {
LayoutInflater inflater = (LayoutInflater)getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
TextView label = (TextView)inflater.inflate(R.layout.label, null);
label.setText(R.string.no_new_perms);
mScrollView.addView(label);
}
adapter.addTab(tabHost.newTabSpec("new").setIndicator(
getText(R.string.newPerms)), mScrollView);
} else {
findViewById(R.id.tabscontainer).setVisibility(View.GONE);
findViewById(R.id.divider).setVisibility(View.VISIBLE);
}
if (NP > 0 || ND > 0) {
permVisible = true;
LayoutInflater inflater = (LayoutInflater)getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
View root = inflater.inflate(R.layout.permissions_list, null);
if (mScrollView == null) {
mScrollView = (CaffeinatedScrollView)root.findViewById(R.id.scrollview);
}
if (NP > 0) {
((ViewGroup)root.findViewById(R.id.privacylist)).addView(
perms.getPermissionsView(AppSecurityPermissions.WHICH_PERSONAL));
} else {
root.findViewById(R.id.privacylist).setVisibility(View.GONE);
}
if (ND > 0) {
((ViewGroup)root.findViewById(R.id.devicelist)).addView(
perms.getPermissionsView(AppSecurityPermissions.WHICH_DEVICE));
} else {
root.findViewById(R.id.devicelist).setVisibility(View.GONE);
}
adapter.addTab(tabHost.newTabSpec("all").setIndicator(
getText(R.string.allPerms)), root);
}
}
if (!permVisible) {
if (msg == 0) {
if (mAppInfo != null) {
// This is an update to an application, but there are no
// permissions at all.
msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
? R.string.install_confirm_question_update_system_no_perms
: R.string.install_confirm_question_update_no_perms;
} else {
// This is a new application with no permissions.
msg = R.string.install_confirm_question_no_perms;
}
}
tabHost.setVisibility(View.GONE);
}
if (msg != 0) {
((TextView)findViewById(R.id.install_confirm_question)).setText(msg);
}
mInstallConfirm.setVisibility(View.VISIBLE);
mOk = (Button)findViewById(R.id.ok_button);
mCancel = (Button)findViewById(R.id.cancel_button);
mOk.setOnClickListener(this);
mCancel.setOnClickListener(this);
if (mScrollView == null) {
// There is nothing to scroll view, so the ok button is immediately
// set to install.
mOk.setText(R.string.install);
mOkCanInstall = true;
} else {
mScrollView.setFullScrollAction(new Runnable() {
@Override
public void run() {
mOk.setText(R.string.install);
mOkCanInstall = true;
}
});
}
}
| private void startInstallConfirm() {
TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost);
tabHost.setup();
ViewPager viewPager = (ViewPager)findViewById(R.id.pager);
TabsAdapter adapter = new TabsAdapter(this, tabHost, viewPager);
boolean permVisible = false;
mScrollView = null;
mOkCanInstall = false;
int msg = 0;
if (mPkgInfo != null) {
AppSecurityPermissions perms = new AppSecurityPermissions(this, mPkgInfo);
final int NP = perms.getPermissionCount(AppSecurityPermissions.WHICH_PERSONAL);
final int ND = perms.getPermissionCount(AppSecurityPermissions.WHICH_DEVICE);
if (mAppInfo != null) {
msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
? R.string.install_confirm_question_update_system
: R.string.install_confirm_question_update;
mScrollView = new CaffeinatedScrollView(this);
mScrollView.setFillViewport(true);
if (perms.getPermissionCount(AppSecurityPermissions.WHICH_NEW) > 0) {
permVisible = true;
mScrollView.addView(perms.getPermissionsView(
AppSecurityPermissions.WHICH_NEW));
} else {
LayoutInflater inflater = (LayoutInflater)getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
TextView label = (TextView)inflater.inflate(R.layout.label, null);
label.setText(R.string.no_new_perms);
mScrollView.addView(label);
}
adapter.addTab(tabHost.newTabSpec("new").setIndicator(
getText(R.string.newPerms)), mScrollView);
} else {
findViewById(R.id.tabscontainer).setVisibility(View.GONE);
findViewById(R.id.divider).setVisibility(View.VISIBLE);
}
if (NP > 0 || ND > 0) {
permVisible = true;
LayoutInflater inflater = (LayoutInflater)getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
View root = inflater.inflate(R.layout.permissions_list, null);
if (mScrollView == null) {
mScrollView = (CaffeinatedScrollView)root.findViewById(R.id.scrollview);
}
if (NP > 0) {
((ViewGroup)root.findViewById(R.id.privacylist)).addView(
perms.getPermissionsView(AppSecurityPermissions.WHICH_PERSONAL));
} else {
root.findViewById(R.id.privacylist).setVisibility(View.GONE);
}
if (ND > 0) {
((ViewGroup)root.findViewById(R.id.devicelist)).addView(
perms.getPermissionsView(AppSecurityPermissions.WHICH_DEVICE));
} else {
root.findViewById(R.id.devicelist).setVisibility(View.GONE);
}
adapter.addTab(tabHost.newTabSpec("all").setIndicator(
getText(R.string.allPerms)), root);
}
}
if (!permVisible) {
if (mAppInfo != null) {
// This is an update to an application, but there are no
// permissions at all.
msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
? R.string.install_confirm_question_update_system_no_perms
: R.string.install_confirm_question_update_no_perms;
} else {
// This is a new application with no permissions.
msg = R.string.install_confirm_question_no_perms;
}
tabHost.setVisibility(View.GONE);
findViewById(R.id.filler).setVisibility(View.VISIBLE);
findViewById(R.id.divider).setVisibility(View.GONE);
mScrollView = null;
}
if (msg != 0) {
((TextView)findViewById(R.id.install_confirm_question)).setText(msg);
}
mInstallConfirm.setVisibility(View.VISIBLE);
mOk = (Button)findViewById(R.id.ok_button);
mCancel = (Button)findViewById(R.id.cancel_button);
mOk.setOnClickListener(this);
mCancel.setOnClickListener(this);
if (mScrollView == null) {
// There is nothing to scroll view, so the ok button is immediately
// set to install.
mOk.setText(R.string.install);
mOkCanInstall = true;
} else {
mScrollView.setFullScrollAction(new Runnable() {
@Override
public void run() {
mOk.setText(R.string.install);
mOkCanInstall = true;
}
});
}
}
|
diff --git a/src/gdp/racetrack/Main.java b/src/gdp/racetrack/Main.java
index c57f769..dedbe53 100644
--- a/src/gdp/racetrack/Main.java
+++ b/src/gdp/racetrack/Main.java
@@ -1,247 +1,247 @@
package gdp.racetrack;
import gdp.racetrack.Lists.ImplementationList;
import gdp.racetrack.gui.MainFrame;
import gdp.racetrack.util.ClassList.ClassDescription;
import java.awt.Color;
import java.awt.Font;
import java.awt.GridLayout;
import javax.swing.JFrame;
import javax.swing.JTextArea;
public class Main {
/**
* @param args
*/
public static void main(String[] args) {
boolean debugwindow = false;
int i;
for (i = 0; i < args.length; ++i) {
if (args[i].equals("-d")) debugwindow = true;
- break;
+ else break;
}
if (debugwindow) Log.addDebugWindow();
if (args.length == i+1 && args[i].equals("test")) {
test();
}
else if (args.length == i+1 && args[i].equals("mapgen")) {
MapGenerator.main(new String[0]);
}
else if (args.length == i+1 && args[i].equals("listai")) {
list("AI", Lists.ai);
}
else if (args.length == i+1 && args[i].equals("listrules")) {
list("Turn Rules", Lists.turnRule);
list("Victory Rules", Lists.victoryRule);
list("Environment Collision Rules", Lists.envCollisionRule);
list("Player Collision Rules", Lists.playerCollisionRule);
}
else if (args.length == i+1 && args[i].equals("newgui")) {
new MainFrame();
}
else if (args.length == i) {
new Z_Menu();
} else {
System.err.println("Usage: java gdp.racetrack.Main [-d] [test|mapgen|listai|listrules|newgui]");
System.err.println(" or java -jar <jarfile> [-d] [test|mapgen|listai|listrules|newgui]");
}
}
private static void list(String listName, ImplementationList<?> list) {
System.out.println(listName);
for (int i=0; i < listName.length(); ++i) System.out.print('=');
System.out.println();
for (ClassDescription desc : list.getList()) {
System.out.println("Name: "+desc.name);
System.out.println("class: "+desc.clazz.getName());
System.out.println(desc.description);
System.out.println("--- ---");
}
System.out.println();
}
private static void test() {
System.out.println("The system will run a test. Please wait");
System.out.println("create map ...");
final Map map = new MapGenerator().generateMap((int) (Math.random()-0.5)*2*Integer.MAX_VALUE, 3, Difficulty.NORMAL);
System.out.println("create game rules ...");
PlayerCollisionRule playerCollisionRule =
Lists.playerCollisionRule.createInstance(0);
EnvironmentCollisionRule envCollisionRule =
Lists.envCollisionRule.createInstance(0);
TurnRule turnRule =
Lists.turnRule.createInstance(0);
VictoryRule victoryRule =
Lists.victoryRule.createInstance(0);
final RuleSet ruleSet = new RuleSet(envCollisionRule, playerCollisionRule, turnRule, victoryRule);
System.out.println("create game ...");
final Game game = new Game(map, ruleSet, null);
System.out.println("create an AI ...");
final AI ai = Lists.ai.createInstance(0, game);
System.out.println("create 3 bots of the created AI ...");
game.addPlayer(ai, Difficulty.EASY, Difficulty.NORMAL, Difficulty.HARD);
System.out.println("create display window ...");
SimpleTestFrame frame = new SimpleTestFrame(game);
game.registerListener(frame);
System.out.println("run the game ...");
game.run();
System.out.println("FINISHED.");
}
private static class SimpleTestFrame implements EventListener {
private final Game game;
private final JFrame window;
private final JTextArea textArea;
private SimpleTestFrame(final Game game) {
this.game = game;
window = new JFrame();
window.setLayout(new GridLayout(1, 1));
textArea = new JTextArea();
textArea.setSize(window.getSize());
window.getContentPane().add(textArea);
textArea.setForeground(Color.GRAY);
textArea.setFont(new Font(Font.MONOSPACED, Font.BOLD, 12));
window.setSize(800, 600);
window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
window.setVisible(true);
}
@Override
public void onGameStart(boolean firstTime) {
render();
}
@Override
public void onGamePause() {
render();
textArea.append("Game is paused");
}
@Override
public void onGameFinished() {
render();
textArea.append("Game is finshed");
}
@Override
public void onPlayerChooseStart(Player player) {}
@Override
public void onPlayerTurn(Player player, Point startPoint,
Point endPoint, Point destinationPoint) {
render();
}
private void render() {
Map map = game.getMap();
char[][] mapRender = new char[map.getSize().x][map.getSize().y];
for (int x = 0; x < map.getSize().x; ++x) {
for (int y = 0; y < map.getSize().y; ++y) {
PointType type = map.getPointType(new Point(x,y));
switch (type) {
case TRACK:
mapRender[x][y] = ' ';
break;
case START: case FINISH:
mapRender[x][y] = ' ';
break;
case NONE:
mapRender[x][y] = '#';
break;
default:
assert 0==1 : "this should not be possible";
}
}
}
for (Player p : game.getPlayers()) {
Point point = p.getPosition();
mapRender[point.getX()][point.getY()] = (""+p.getNumber()).charAt(0);
}
StringBuilder builder = new StringBuilder();
for (int y = map.getSize().y-1; y >= 0; --y) {
for (int x = 0; x < map.getSize().x; ++x) {
builder.append(mapRender[x][y]);
}
builder.append('\n');
}
textArea.setText(builder.toString());
}
}
/*
private static class TestFrame extends javax.swing.JFrame implements EventListener {
private static final long serialVersionUID = 1L;
private final Game game;
TestFrame(final Game game) {
this.game = game;
Vec2D size = game.getMap().getSize();
setSize(size.x*Map.GRIDSIZE, size.y*Map.GRIDSIZE);
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setVisible(true);
repaint();
}
@Override
public void paintComponents(java.awt.Graphics g) {
g.drawImage(game.getMap().getImage(), 6, 6, this.getSize().width, this.getSize().height, null);
g.drawLine(0, 0, 256, 256);
for (Player player : game.getPlayers()) {
for (IrrevocableTurn turn : player.getTurnHistory()) {
g.drawLine(turn.getStartPosition().getX(), turn.getStartPosition().getY(),
turn.getEndPosition().getX(), turn.getEndPosition().getY());
}
}
}
@Override
public void onGameStart(boolean firstTime) { }
@Override
public void onGamePause() { }
@Override
public void onGameFinished() {
// TODO Auto-generated method stub
}
@Override
public void onPlayerChooseStart(Player player) { }
@Override
public void onPlayerTurn(Player player, Point startPoint,
Point endPoint, Point destinationPoint) {
this.repaint();
}
}
*/
private Main() { }
}
| true | true | public static void main(String[] args) {
boolean debugwindow = false;
int i;
for (i = 0; i < args.length; ++i) {
if (args[i].equals("-d")) debugwindow = true;
break;
}
if (debugwindow) Log.addDebugWindow();
if (args.length == i+1 && args[i].equals("test")) {
test();
}
else if (args.length == i+1 && args[i].equals("mapgen")) {
MapGenerator.main(new String[0]);
}
else if (args.length == i+1 && args[i].equals("listai")) {
list("AI", Lists.ai);
}
else if (args.length == i+1 && args[i].equals("listrules")) {
list("Turn Rules", Lists.turnRule);
list("Victory Rules", Lists.victoryRule);
list("Environment Collision Rules", Lists.envCollisionRule);
list("Player Collision Rules", Lists.playerCollisionRule);
}
else if (args.length == i+1 && args[i].equals("newgui")) {
new MainFrame();
}
else if (args.length == i) {
new Z_Menu();
} else {
System.err.println("Usage: java gdp.racetrack.Main [-d] [test|mapgen|listai|listrules|newgui]");
System.err.println(" or java -jar <jarfile> [-d] [test|mapgen|listai|listrules|newgui]");
}
}
| public static void main(String[] args) {
boolean debugwindow = false;
int i;
for (i = 0; i < args.length; ++i) {
if (args[i].equals("-d")) debugwindow = true;
else break;
}
if (debugwindow) Log.addDebugWindow();
if (args.length == i+1 && args[i].equals("test")) {
test();
}
else if (args.length == i+1 && args[i].equals("mapgen")) {
MapGenerator.main(new String[0]);
}
else if (args.length == i+1 && args[i].equals("listai")) {
list("AI", Lists.ai);
}
else if (args.length == i+1 && args[i].equals("listrules")) {
list("Turn Rules", Lists.turnRule);
list("Victory Rules", Lists.victoryRule);
list("Environment Collision Rules", Lists.envCollisionRule);
list("Player Collision Rules", Lists.playerCollisionRule);
}
else if (args.length == i+1 && args[i].equals("newgui")) {
new MainFrame();
}
else if (args.length == i) {
new Z_Menu();
} else {
System.err.println("Usage: java gdp.racetrack.Main [-d] [test|mapgen|listai|listrules|newgui]");
System.err.println(" or java -jar <jarfile> [-d] [test|mapgen|listai|listrules|newgui]");
}
}
|
diff --git a/ContactManagerImpl.java b/ContactManagerImpl.java
index f3b8361..2594b12 100644
--- a/ContactManagerImpl.java
+++ b/ContactManagerImpl.java
@@ -1,655 +1,655 @@
/**
*The purpose of this assignment it writing a program to keep track of contacts and
*meetings. The application will keep track of contacts, past and future meetings, etc.
*When the application is closed, all data must be stored in a text file called
*”contacts.txt”. This file must be read at startup to recover all data introduced in a
*former session.
*/
import java.util.*;
import java.io.*;
public class ContactManagerImpl {
private IllegalArgumentException illegalArgEx = new IllegalArgumentException();
private NullPointerException nullPointerEx = new NullPointerException();
private IllegalStateException illegalStateEx = new IllegalStateException();
private Set<Contact> contactList = new HashSet<Contact>(); //contacts added to this via addContact()
private Set<Contact> attendeeList = new HashSet<Contact>(); //contacts attending a specific meeting; may be removed to be replaced with more temporary set in main method
private Set<Meeting> pastMeetings = new HashSet<Meeting>();//list of past meetings
private Set<Meeting> futureMeetings = new HashSet<Meeting>();
private Set<Meeting> allMeetings = new HashSet<Meeting>();//may not be required
public int addFutureMeeting(Set<Contact> contacts, Calendar date) {
boolean isEmpty = false; //these booleans facilitate display of pertinent error message
boolean falseContact = false;
boolean falseDate = false;
Contact element = null;//to keep track of contacts being iterated
String unknownContacts = "The following contacts do not exist in your contact list: ";//for multiple unknowns
Meeting futureMeeting = null;
try {
if (contacts.isEmpty()) {
isEmpty = true;
}
Iterator<Contact> iterator = contacts.iterator();//check that contacts are known/existent against central contact list
while (iterator.hasNext()) {
element = iterator.next();
if (!contactList.contains(element)) {
falseContact = true;
unknownContacts = unknownContacts + "\n" + element.getName();
}
}
Calendar now = Calendar.getInstance(); //what about scheduling a meeting for today?
if (date.before(now)) {
falseDate = true;
}
if (isEmpty || falseContact || falseDate) {
throw illegalArgEx;
}
}
catch (IllegalArgumentException illegalArgEx) {
if (isEmpty == true) {
System.out.println("Error: No contacts have been specified.");
}
if (falseContact == true) {
System.out.println("Error: " + unknownContacts);
//Need to consider the users options after exception is thrown - retry the creation of meeting/allow reentry of contacts
}
if (falseDate == true) {
System.out.println("Error: Invalid date. Please ensure the date and time are in the future.");
}
}
futureMeeting = new FutureMeetingImpl(contacts, date);
futureMeetings.add(futureMeeting);
int meetingID = futureMeeting.getId();
return meetingID;
}
/**
* Returns the PAST meeting with the requested ID, or null if it there is none.
*
* @param id the ID for the meeting
* @return the meeting with the requested ID, or null if it there is none.
* @throws IllegalArgumentException if there is a meeting with that ID happening in the future
*/
public PastMeeting getPastMeeting(int id) {
try {
Iterator<Meeting> iteratorFM = futureMeetings.iterator();
Meeting meeting = null;
while (iteratorFM.hasNext()) {
meeting = iteratorFM.next();
if (meeting.getId() == id) {
throw illegalArgEx;
}
}
}
catch (IllegalArgumentException ex) {
System.out.print("Error: The meeting with this ID has not taken place yet!");
}
Iterator<Meeting> iteratorPM = pastMeetings.iterator();
Meeting meeting = null;
while (iteratorPM.hasNext()) {
meeting = iteratorPM.next();
if (meeting.getId() == id) {
PastMeeting pastMeeting = (PastMeeting) meeting;
return pastMeeting;
}
}
return null;
}
/**
* Returns the FUTURE meeting with the requested ID, or null if there is none.
*
* @param id the ID for the meeting
* @return the meeting with the requested ID, or null if it there is none.
* @throws IllegalArgumentException if there is a meeting with that ID happening in the past
*/
public FutureMeeting getFutureMeeting(int id) {
try {
Iterator<Meeting> iteratorPM = pastMeetings.iterator();
Meeting meeting = null;
while (iteratorPM.hasNext()) {
meeting = iteratorPM.next();
if (meeting.getId() == id) {
throw illegalArgEx;
}
}
}
catch (IllegalArgumentException ex) {
System.out.print("Error: The meeting with this ID has already taken place!");
}
Iterator<Meeting> iteratorFM = pastMeetings.iterator();
Meeting meeting = null;
while (iteratorFM.hasNext()) {
meeting = iteratorFM.next();
if (meeting.getId() == id) {
FutureMeeting futureMeeting = (FutureMeeting) meeting;
return futureMeeting;
}
}
return null;
}
public Meeting getMeeting(int id) {
Iterator<Meeting> iterator = allMeetings.iterator();//rather than allMeetings, check through past/future sets
Meeting meeting = null;
while (iterator.hasNext()) {
meeting = iterator.next();
if (meeting.getId() == id) {
return meeting;
}
}
return null;
}
/**
* Returns the list of future meetings scheduled with this contact.
*
* If there are none, the returned list will be empty. Otherwise,
* the list will be chronologically sorted and will not contain any
* duplicates.
*
* @param contact one of the user’s contacts
* @return the list of future meeting(s) scheduled with this contact (may be empty)
* @throws IllegalArgumentException if the contact does not exist
*/
public List<Meeting> getFutureMeetingList(Contact contact) {
List<Meeting> list = new ArrayList<Meeting>();//list to contain meetings attended by specified contact
try {
if (!contactList.contains(contact)) {//may need to use id to identify -> iterator required
throw illegalArgEx;
}
Iterator<Meeting> iterator = futureMeetings.iterator();
Meeting meeting = null;
while (iterator.hasNext()) { //goes through all future meetings
meeting = iterator.next();
Iterator<Contact> conIterator = meeting.getContacts().iterator();
Contact item = null;
while (conIterator.hasNext()) { //goes through contacts associated with a meeting
item = conIterator.next();
if (item.getId() == contact.getId()) {
list.add(meeting);
}
}
}
list = sort(list);//elimination of duplicates? With sets, there shouldn't be any...
return list;
}
catch (IllegalArgumentException ex) {
System.out.println("Error: The specified contact doesn't exist!");
}
return list; //may be empty
}
/**
* Sorts a list into chronological order
*/
private List<Meeting> sort(List<Meeting> list) {
Meeting tempMeeting1 = null;
Meeting tempMeeting2 = null;
boolean sorted = true;
for (int j = 0; j < list.size() - 1; j++) {
tempMeeting1 = list.get(j);
tempMeeting2 = list.get(j + 1);
if (tempMeeting1.getDate().after(tempMeeting2.getDate())) {
//swaps elements over if first element has later date than second
list.set(j, tempMeeting2); //replaced add with set to avoid list growing when rearranging elements
list.set(j + 1, tempMeeting1);
}
}
for (int i = 0; i < list.size() - 1; i++) { //loop that checks whether list is sorted
if (list.get(i).getDate().after(list.get(i + 1).getDate())) {
sorted = false;
}
}
if (!sorted) {
list = sort(list);//recursively calls this method until the list is sorted
}
return list;
}
/**
* Returns the list of meetings that are scheduled for, or that took
* place on, the specified date
*
* If there are none, the returned list will be empty. Otherwise,
* the list will be chronologically sorted and will not contain any
* duplicates.
*
* @param date the date
* @return the list of meetings
*/
List<Meeting> getFutureMeetingList(Calendar date) {
List<Meeting> meetingList = new ArrayList<Meeting>();
//go through future meetings and past meetings, unless all meetings are also added to allMeetings?
Iterator<Meeting> iteratorPM = pastMeetings.iterator();
Meeting pastMeeting = null;
while (iteratorPM.hasNext()) {
pastMeeting = iteratorPM.next();
if (pastMeeting.getDate().equals(date)) {
//or futureMeeting.getDate().get(Calendar.YEAR) == date.get(Calendar.YEAR) etc
meetingList.add(pastMeeting);
}
}
Iterator<Meeting> iteratorFM = futureMeetings.iterator();
Meeting futureMeeting = null;
while (iteratorFM.hasNext()) {
futureMeeting = iteratorFM.next();
if (futureMeeting.getDate().equals(date)) {
meetingList.add(futureMeeting);
}
}
meetingList = sort(meetingList);
return meetingList;
}
/**
* Returns the list of past meetings in which this contact has participated.
*
* If there are none, the returned list will be empty. Otherwise,
* the list will be chronologically sorted and will not contain any
* duplicates.
*
* @param contact one of the user’s contacts
* @return the list of future meeting(s) scheduled with this contact (maybe empty).
* @throws IllegalArgumentException if the contact does not exist
*/
List<PastMeeting> getPastMeetingList(Contact contact) {
List<Meeting> meetingList = new ArrayList<Meeting>();
List<PastMeeting> pastMeetingList = new ArrayList<PastMeeting>();
try {
if (!contactList.contains(contact)) {
throw illegalArgEx;
}
Iterator<Meeting> iterator = pastMeetings.iterator();
Meeting meeting = null;
while (iterator.hasNext()) {
meeting = iterator.next();
if (meeting.getContacts().contains(contact)) {
meetingList.add(meeting);
}
}
meetingList = sort(meetingList);
for (int i = 0; i < meetingList.size(); i++) {//convert List<Meeting> to List<PastMeeting>
Meeting m = meetingList.get(i);
PastMeeting pm = (PastMeeting) m;
pastMeetingList.add(pm);
}
return pastMeetingList;
}
catch (IllegalArgumentException ex) {
System.out.println("Error: The specified contact doesn't exist.");
}
return null;
}
/**
* Create a new record for a meeting that took place in the past.
*
* @param contacts a list of participants
* @param date the date on which the meeting took place
* @param text messages to be added about the meeting.
* @throws IllegalArgumentException if the list of contacts is
* empty, or any of the contacts does not exist
* @throws NullPointerException if any of the arguments is null
*/
//what about an exception for a date that's in the future?
void addNewPastMeeting(Set<Contact> contacts, Calendar date, String text) {
boolean emptyContacts = false;//to allow simultaneous error correction for user
boolean nullContacts = false;
boolean nullDate = false;
boolean nullText = false;
boolean falseContact = false;
String unknownContacts = "The following contacts are not on your contact list: ";
try {
if (contacts.isEmpty()) {
emptyContacts = true;
}
Iterator<Contact> iterator = contacts.iterator();
Contact contact = null;
while (iterator.hasNext()) {
contact = iterator.next();
if (!contactList.contains(contact)) {
falseContact = true;
unknownContacts = unknownContacts + "\n" + contact.getName();
}
}
if (contacts == null) {
nullContacts = true;
}
if (date == null) {
nullDate = true;
}
if (text == null) {
nullText = true;
}
if (emptyContacts || falseContact) {
throw illegalArgEx;
}
if (nullContacts || nullDate || nullText) {
throw nullPointerEx;
}
Meeting pastMeeting = new PastMeetingImpl(contacts, date, text);
pastMeetings.add(pastMeeting);
}
catch (IllegalArgumentException ex) {
if (emptyContacts) {
System.out.println("Error: No contacts specified!");
}
if (falseContact) {
System.out.println("Error: " + unknownContacts);
}
}
catch (NullPointerException nex) {
if (nullText) {
System.out.println("Error: No meeting notes specified!");
}
if (nullContacts) {
System.out.println("Error: No contacts specified!");
}
if (nullDate) {
System.out.println("Error: No date specified!");
}
}
}
/**
* Add notes to a meeting.
*
* This method is used when a future meeting takes place, and is
* then converted to a past meeting (with notes).
*
* It can be also used to add notes to a past meeting at a later date.
*
* @param id the ID of the meeting
* @param text messages to be added about the meeting.
* @throws IllegalArgumentException if the meeting does not exist
* @throws IllegalStateException if the meeting is set for a date in the future
* @throws NullPointerException if the notes are null
*/
void addMeetingNotes(int id, String text) {//as this is also used to add notes to an existing past meeting, must check if
//meeting is in pastMeetings set first - if it is, then take the route of adding notes to existing meeting, otherwise check
//future meetings: if ID not found at this point, it doesn't exist. No exceptions should be thrown if meeting is not found
//in pastMeetings - only if it's not found in futureMeetings.
Iterator<Meeting> pmIterator = pastMeetings.iterator();
Meeting pMeeting = null;
boolean pastMeetingFound = false;//to determine whether program should proceed to look through futureMeetings if no matching meeting
//is found in pastMeetings.
while (pmIterator.hasNext()) {
pMeeting = pmIterator.next();
if (pMeeting.getId() == id) {
PastMeetingImpl pmi = (PastMeetingImpl) pMeeting;
pmi.addNotes(text);
pastMeetingFound = true;
System.out.println("Notes for meeting ID No. " + id + " updated successfully.");
}
break;
}
if (!pastMeetingFound) {
boolean containsMeeting = false;
boolean futureDate = false;
Calendar now = Calendar.getInstance();
Meeting meeting = null;//to allow the meeting matching the id to be used throughout the method
try {
Iterator<Meeting> iterator = futureMeetings.iterator();
while (iterator.hasNext()) {
meeting = iterator.next();
if (meeting.getId() == id) {
containsMeeting = true;
}
break;
}
System.out.println("Meeting ID: " + meeting.getId());
//is being updated.
if (meeting.getDate().after(now)) {
futureDate = true;
}
if (text == null) {
throw nullPointerEx;
}
if (!containsMeeting) {
throw illegalArgEx;
}
if (futureDate) {
throw illegalStateEx;
}
Meeting pastMeeting = new PastMeetingImpl(meeting.getContacts(), meeting.getDate(), text, meeting.getId());
pastMeetings.add(pastMeeting);
futureMeetings.remove(meeting);
}
catch (IllegalArgumentException aEx) {
System.out.println("Error: No meeting with that ID exists!");
}
catch (IllegalStateException sEx) {
System.out.println("Error: The meeting with this ID has not taken place yet!");
}
catch (NullPointerException pEx) {
System.out.println("Error: No notes have been specified!");
}
}
}
/**
* Create a new contact with the specified name and notes.
*
* @param name the name of the contact.
* @param notes notes to be added about the contact.
* @throws NullPointerException if the name or the notes are null
*/
void addNewContact(String name, String notes) {
try {
if (name == null || notes == null) {
throw nullPointerEx;
}
Contact contact = new ContactImpl(name);
contact.addNotes(notes);
contactList.add(contact);
}
catch (NullPointerException nex) {
System.out.println("Error: Please ensure that BOTH the NAME and NOTES fields are filled in.");
}
}
/**
* Returns a list containing the contacts that correspond to the IDs
*
* @param ids an arbitrary number of contact IDs
* @return a list containing the contacts that correspond to the IDs.
* @throws IllegalArgumentException if any of the IDs does not correspond to a real contact
*/
Set<Contact> getContacts(int... ids) {
Set<Contact> idMatches = new HashSet<Contact>();
int id = 0;
boolean found;
try {
for (int i = 0; i < ids.length; i++) {//boolean needs to be reset to false here for each iteration
//otherwise it will stay true after one id is matched!
found = false;
id = ids[i];
Contact contact = null;
Iterator<Contact> iterator = contactList.iterator();
while (iterator.hasNext()) {
contact = iterator.next();
if (contact.getId() == id) {
idMatches.add(contact);
found = true;
}
}
if (found == false) {
throw illegalArgEx;
}
}
return idMatches;
}
catch (IllegalArgumentException ex) {
System.out.println("Error: ID " + id + " not found!");
}
return null;
}
public static void main(String[] args) {
ContactManagerImpl cm = new ContactManagerImpl();
cm.launch();
}
private void launch() {
Contact tseng = new ContactImpl("Tseng");
Contact reno = new ContactImpl("Reno");
Contact rude = new ContactImpl("Rude");
Contact elena = new ContactImpl("Elena");
Contact r2d2 = new ContactImpl("R2D2");
contactList.add(tseng);
contactList.add(reno);
contactList.add(rude);
contactList.add(elena);
contactList.add(r2d2);
attendeeList.add(tseng);
attendeeList.add(rude);
attendeeList.add(elena);
attendeeList.add(r2d2);
Calendar cal = new GregorianCalendar(2013, 0, 2);
/**
addNewPastMeeting(attendeeList, cal, "First Test Notes");
addMeetingNotes(1, "Test notes");
PastMeeting pm = getPastMeeting(1);
System.out.println("ID: " + pm.getId() + " " + pm.getNotes());
Meeting testMeeting = new FutureMeetingImpl(attendeeList, cal);
futureMeetings.add(testMeeting);
addMeetingNotes(1, "Notes for the meeting that took place today.");
PastMeeting pm = getPastMeeting(1);
System.out.println(pm);
System.out.println("ID: " + pm.getId() + " " + pm.getNotes());
*/
- Set<Contact> contactsTestSet = getContacts(1, 10);
+ Set<Contact> contactsTestSet = getContacts(1, 2, 10);
/**
Calendar cal2 = new GregorianCalendar(2013, 6, 5);
Calendar cal3 = new GregorianCalendar(2013, 6, 5);
Calendar cal4 = new GregorianCalendar(2013, 1, 12);
//Meeting testMeet = new FutureMeetingImpl(attendeeList, cal);
//this.addFutureMeeting(attendeeList, cal);
//this.addFutureMeeting(attendeeList, cal2);
//this.addFutureMeeting(attendeeList, cal3);
//attendeeList.remove(tseng);
//this.addFutureMeeting(attendeeList, cal4);
Calendar calPrint = new GregorianCalendar();
/**
List<Meeting> testList = getFutureMeetingList(tseng);
for (int i = 0; i < testList.size(); i++) {
System.out.println("Meeting ID: " + testList.get(i).getId());
calPrint = testList.get(i).getDate();
System.out.println(calPrint.get(Calendar.DAY_OF_MONTH) + "." + calPrint.get(Calendar.MONTH) + "." + calPrint.get(Calendar.YEAR));
}
testList = getFutureMeetingList(cal2);
for (int i = 0; i < testList.size(); i++) {
System.out.println("Meeting ID: " + testList.get(i).getId() + " taking place on: ");
calPrint = testList.get(i).getDate();
System.out.println(calPrint.get(Calendar.DAY_OF_MONTH) + "." + calPrint.get(Calendar.MONTH) + "." + calPrint.get(Calendar.YEAR));
}
addNewPastMeeting(attendeeList, cal, "Test");
List<PastMeeting> testList = getPastMeetingList(r2d2);
for (int i = 0; i < testList.size(); i++) {
System.out.println("Meeting ID: " + testList.get(i).getId());
calPrint = testList.get(i).getDate();
System.out.println(calPrint.get(Calendar.DAY_OF_MONTH) + "." + calPrint.get(Calendar.MONTH) + "." + calPrint.get(Calendar.YEAR));
}
*/
}
}
// Meeting meeting = new FutureMeeting(params);
//ask user for dates in specific format, which can then be converted to create a new Calendar
//make sure that if wrong format is entered, you throw an exception.
//Don't forget to ensure class implements ContactManager when finished
/**
* Returns the list of meetings that are scheduled for, or that took
* place on, the specified date
*
* If there are none, the returned list will be empty. Otherwise,
* the list will be chronologically sorted and will not contain any
* duplicates.
*
* @param date the date
* @return the list of meetings
*/
//List<Meeting> getFutureMeetingList(Calendar date);
//should this be renamed, as it fetches any meeting, not just future ones?
//if returned list is empty, write empty? in main: if list.isEmpty(), print <empty> for
//user clarity
//when users specify a date, should they also include a time?
//how does before/after affect dates which are the same?
//contains -- may have to do this in more detail with an iterator, as the naming of
//Contact variables may not allow for contactList.contains(contact); new contacts will probably
//be just called contact each time they are created, with their name and id the only things to
//identify them by.
//initialise notes variable as null in launch so that if user enters nothing, relevant
//method is still found
//for-each loops for clarity
| true | true | private void launch() {
Contact tseng = new ContactImpl("Tseng");
Contact reno = new ContactImpl("Reno");
Contact rude = new ContactImpl("Rude");
Contact elena = new ContactImpl("Elena");
Contact r2d2 = new ContactImpl("R2D2");
contactList.add(tseng);
contactList.add(reno);
contactList.add(rude);
contactList.add(elena);
contactList.add(r2d2);
attendeeList.add(tseng);
attendeeList.add(rude);
attendeeList.add(elena);
attendeeList.add(r2d2);
Calendar cal = new GregorianCalendar(2013, 0, 2);
/**
addNewPastMeeting(attendeeList, cal, "First Test Notes");
addMeetingNotes(1, "Test notes");
PastMeeting pm = getPastMeeting(1);
System.out.println("ID: " + pm.getId() + " " + pm.getNotes());
Meeting testMeeting = new FutureMeetingImpl(attendeeList, cal);
futureMeetings.add(testMeeting);
addMeetingNotes(1, "Notes for the meeting that took place today.");
PastMeeting pm = getPastMeeting(1);
System.out.println(pm);
System.out.println("ID: " + pm.getId() + " " + pm.getNotes());
*/
Set<Contact> contactsTestSet = getContacts(1, 10);
/**
Calendar cal2 = new GregorianCalendar(2013, 6, 5);
Calendar cal3 = new GregorianCalendar(2013, 6, 5);
Calendar cal4 = new GregorianCalendar(2013, 1, 12);
//Meeting testMeet = new FutureMeetingImpl(attendeeList, cal);
//this.addFutureMeeting(attendeeList, cal);
//this.addFutureMeeting(attendeeList, cal2);
//this.addFutureMeeting(attendeeList, cal3);
//attendeeList.remove(tseng);
//this.addFutureMeeting(attendeeList, cal4);
Calendar calPrint = new GregorianCalendar();
/**
List<Meeting> testList = getFutureMeetingList(tseng);
for (int i = 0; i < testList.size(); i++) {
System.out.println("Meeting ID: " + testList.get(i).getId());
calPrint = testList.get(i).getDate();
System.out.println(calPrint.get(Calendar.DAY_OF_MONTH) + "." + calPrint.get(Calendar.MONTH) + "." + calPrint.get(Calendar.YEAR));
}
testList = getFutureMeetingList(cal2);
for (int i = 0; i < testList.size(); i++) {
System.out.println("Meeting ID: " + testList.get(i).getId() + " taking place on: ");
calPrint = testList.get(i).getDate();
System.out.println(calPrint.get(Calendar.DAY_OF_MONTH) + "." + calPrint.get(Calendar.MONTH) + "." + calPrint.get(Calendar.YEAR));
}
addNewPastMeeting(attendeeList, cal, "Test");
List<PastMeeting> testList = getPastMeetingList(r2d2);
for (int i = 0; i < testList.size(); i++) {
System.out.println("Meeting ID: " + testList.get(i).getId());
calPrint = testList.get(i).getDate();
System.out.println(calPrint.get(Calendar.DAY_OF_MONTH) + "." + calPrint.get(Calendar.MONTH) + "." + calPrint.get(Calendar.YEAR));
}
*/
}
| private void launch() {
Contact tseng = new ContactImpl("Tseng");
Contact reno = new ContactImpl("Reno");
Contact rude = new ContactImpl("Rude");
Contact elena = new ContactImpl("Elena");
Contact r2d2 = new ContactImpl("R2D2");
contactList.add(tseng);
contactList.add(reno);
contactList.add(rude);
contactList.add(elena);
contactList.add(r2d2);
attendeeList.add(tseng);
attendeeList.add(rude);
attendeeList.add(elena);
attendeeList.add(r2d2);
Calendar cal = new GregorianCalendar(2013, 0, 2);
/**
addNewPastMeeting(attendeeList, cal, "First Test Notes");
addMeetingNotes(1, "Test notes");
PastMeeting pm = getPastMeeting(1);
System.out.println("ID: " + pm.getId() + " " + pm.getNotes());
Meeting testMeeting = new FutureMeetingImpl(attendeeList, cal);
futureMeetings.add(testMeeting);
addMeetingNotes(1, "Notes for the meeting that took place today.");
PastMeeting pm = getPastMeeting(1);
System.out.println(pm);
System.out.println("ID: " + pm.getId() + " " + pm.getNotes());
*/
Set<Contact> contactsTestSet = getContacts(1, 2, 10);
/**
Calendar cal2 = new GregorianCalendar(2013, 6, 5);
Calendar cal3 = new GregorianCalendar(2013, 6, 5);
Calendar cal4 = new GregorianCalendar(2013, 1, 12);
//Meeting testMeet = new FutureMeetingImpl(attendeeList, cal);
//this.addFutureMeeting(attendeeList, cal);
//this.addFutureMeeting(attendeeList, cal2);
//this.addFutureMeeting(attendeeList, cal3);
//attendeeList.remove(tseng);
//this.addFutureMeeting(attendeeList, cal4);
Calendar calPrint = new GregorianCalendar();
/**
List<Meeting> testList = getFutureMeetingList(tseng);
for (int i = 0; i < testList.size(); i++) {
System.out.println("Meeting ID: " + testList.get(i).getId());
calPrint = testList.get(i).getDate();
System.out.println(calPrint.get(Calendar.DAY_OF_MONTH) + "." + calPrint.get(Calendar.MONTH) + "." + calPrint.get(Calendar.YEAR));
}
testList = getFutureMeetingList(cal2);
for (int i = 0; i < testList.size(); i++) {
System.out.println("Meeting ID: " + testList.get(i).getId() + " taking place on: ");
calPrint = testList.get(i).getDate();
System.out.println(calPrint.get(Calendar.DAY_OF_MONTH) + "." + calPrint.get(Calendar.MONTH) + "." + calPrint.get(Calendar.YEAR));
}
addNewPastMeeting(attendeeList, cal, "Test");
List<PastMeeting> testList = getPastMeetingList(r2d2);
for (int i = 0; i < testList.size(); i++) {
System.out.println("Meeting ID: " + testList.get(i).getId());
calPrint = testList.get(i).getDate();
System.out.println(calPrint.get(Calendar.DAY_OF_MONTH) + "." + calPrint.get(Calendar.MONTH) + "." + calPrint.get(Calendar.YEAR));
}
*/
}
|
diff --git a/src/main/java/org/jbei/ice/server/ModelToInfoFactory.java b/src/main/java/org/jbei/ice/server/ModelToInfoFactory.java
index 9f013b104..e7de1a568 100755
--- a/src/main/java/org/jbei/ice/server/ModelToInfoFactory.java
+++ b/src/main/java/org/jbei/ice/server/ModelToInfoFactory.java
@@ -1,513 +1,514 @@
package org.jbei.ice.server;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.jbei.ice.client.entry.display.model.SampleStorage;
import org.jbei.ice.controllers.ControllerFactory;
import org.jbei.ice.controllers.common.ControllerException;
import org.jbei.ice.lib.account.AccountController;
import org.jbei.ice.lib.account.model.Account;
import org.jbei.ice.lib.entry.attachment.Attachment;
import org.jbei.ice.lib.entry.attachment.AttachmentController;
import org.jbei.ice.lib.entry.model.ArabidopsisSeed;
import org.jbei.ice.lib.entry.model.Entry;
import org.jbei.ice.lib.entry.model.EntryFundingSource;
import org.jbei.ice.lib.entry.model.Link;
import org.jbei.ice.lib.entry.model.Parameter;
import org.jbei.ice.lib.entry.model.Plasmid;
import org.jbei.ice.lib.entry.model.Strain;
import org.jbei.ice.lib.entry.sample.SampleController;
import org.jbei.ice.lib.entry.sample.model.Sample;
import org.jbei.ice.lib.entry.sequence.SequenceController;
import org.jbei.ice.lib.logging.Logger;
import org.jbei.ice.lib.models.Storage;
import org.jbei.ice.lib.models.TraceSequence;
import org.jbei.ice.lib.shared.dto.PartSample;
import org.jbei.ice.lib.shared.dto.StorageInfo;
import org.jbei.ice.lib.shared.dto.entry.ArabidopsisSeedData;
import org.jbei.ice.lib.shared.dto.entry.ArabidopsisSeedData.Generation;
import org.jbei.ice.lib.shared.dto.entry.ArabidopsisSeedData.PlantType;
import org.jbei.ice.lib.shared.dto.entry.AttachmentInfo;
import org.jbei.ice.lib.shared.dto.entry.CustomField;
import org.jbei.ice.lib.shared.dto.entry.EntryType;
import org.jbei.ice.lib.shared.dto.entry.PartData;
import org.jbei.ice.lib.shared.dto.entry.PlasmidData;
import org.jbei.ice.lib.shared.dto.entry.SequenceAnalysisInfo;
import org.jbei.ice.lib.shared.dto.entry.StrainData;
import org.jbei.ice.lib.shared.dto.entry.Visibility;
import org.jbei.ice.lib.shared.dto.user.User;
/**
* Factory for converting {@link Entry}s to their corresponding {@link org.jbei.ice.lib.shared.dto.entry.PartData}
* data transfer objects
*
* @author Hector Plahar
*/
public class ModelToInfoFactory {
public static PartData getInfo(Entry entry) {
PartData info;
EntryType type = EntryType.nameToType(entry.getRecordType());
if (type == null)
return null;
switch (type) {
case PLASMID:
info = plasmidInfo(entry);
break;
case STRAIN:
info = strainInfo(entry);
break;
case ARABIDOPSIS:
info = seedInfo(entry);
break;
case PART:
info = partInfo(entry);
break;
default:
Logger.error("Do not know how to handle entry type " + type);
return null;
}
return info;
}
public static ArrayList<SampleStorage> getSamples(Map<Sample, LinkedList<Storage>> samples) {
ArrayList<SampleStorage> samplesList = new ArrayList<>();
if (samples == null)
return samplesList;
for (Map.Entry<Sample, LinkedList<Storage>> sample : samples.entrySet()) {
PartSample key = getSampleInfo(sample.getKey());
Storage storage = sample.getKey().getStorage();
if (storage != null) {
key.setLocationId(String.valueOf(storage.getId()));
key.setLocation(storage.getIndex());
}
SampleStorage sampleStorage = new SampleStorage(key, getStorageListInfo(sample.getValue()));
samplesList.add(sampleStorage);
}
return samplesList;
}
private static PartSample getSampleInfo(Sample sample) {
PartSample part = new PartSample();
if (sample == null)
return part;
part.setSampleId(Long.toString(sample.getId()));
part.setCreationTime(sample.getCreationTime());
part.setLabel(sample.getLabel());
part.setNotes(sample.getNotes());
part.setDepositor(sample.getDepositor());
Storage storage = sample.getStorage(); // specific storage to this sample. e.g. Tube
if (storage != null) {
part.setLocationId(String.valueOf(storage.getId()));
part.setLocation(storage.getIndex());
}
return part;
}
private static LinkedList<StorageInfo> getStorageListInfo(LinkedList<Storage> storageList) {
LinkedList<StorageInfo> info = new LinkedList<>();
if (storageList == null)
return info;
for (Storage storage : storageList) {
info.add(getStorageInfo(storage));
}
return info;
}
public static ArrayList<AttachmentInfo> getAttachments(List<Attachment> attachments) {
ArrayList<AttachmentInfo> infos = new ArrayList<>();
if (attachments == null)
return infos;
for (Attachment attachment : attachments) {
AttachmentInfo info = new AttachmentInfo();
info.setDescription(attachment.getDescription());
info.setFilename(attachment.getFileName());
info.setId(attachment.getId());
info.setFileId(attachment.getFileId());
infos.add(info);
}
return infos;
}
public static StorageInfo getStorageInfo(Storage storage) {
StorageInfo info = new StorageInfo();
if (storage == null)
return info;
info.setDisplay(storage.getIndex());
info.setId(storage.getId());
info.setType(storage.getStorageType().name());
return info;
}
public static ArrayList<SequenceAnalysisInfo> getSequenceAnalysis(List<TraceSequence> sequences) {
ArrayList<SequenceAnalysisInfo> infos = new ArrayList<>();
if (sequences == null)
return infos;
AccountController accountController = ControllerFactory.getAccountController();
for (TraceSequence sequence : sequences) {
SequenceAnalysisInfo info = new SequenceAnalysisInfo();
info.setCreated(sequence.getCreationTime());
info.setName(sequence.getFilename());
User user = new User();
try {
Account account = accountController.getByEmail(sequence.getDepositor());
if (account != null) {
user.setFirstName(account.getFirstName());
user.setLastName(account.getLastName());
user.setId(account.getId());
}
} catch (ControllerException e) {
Logger.warn(e.getMessage());
}
info.setDepositor(user);
infos.add(info);
info.setFileId(sequence.getFileId());
}
return infos;
}
private static PartData partInfo(Entry entry) {
PartData info = new PartData();
return getCommon(info, entry);
}
private static ArabidopsisSeedData seedInfo(Entry entry) {
ArabidopsisSeedData data = new ArabidopsisSeedData();
data = (ArabidopsisSeedData) getCommon(data, entry);
// seed specific
ArabidopsisSeed seed = (ArabidopsisSeed) entry;
if (seed.getPlantType() != null && seed.getPlantType() != ArabidopsisSeed.PlantType.NULL) {
PlantType type = PlantType.valueOf(seed.getPlantType().name());
data.setPlantType(type);
}
if (seed.getGeneration() != null && seed.getGeneration() != ArabidopsisSeed.Generation.NULL) {
Generation generation = Generation.valueOf(seed.getGeneration().name());
data.setGeneration(generation);
}
data.setHomozygosity(seed.getHomozygosity());
data.setEcotype(seed.getEcotype());
data.setParents(seed.getParents());
data.setHarvestDate(seed.getHarvestDate());
boolean isSent = !(seed.isSentToABRC() == null || !seed.isSentToABRC());
data.setSentToAbrc(isSent);
return data;
}
private static StrainData strainInfo(Entry entry) {
StrainData data = new StrainData();
data = (StrainData) getCommon(data, entry);
// strain specific
Strain strain = (Strain) entry;
data.setGenotypePhenotype(strain.getGenotypePhenotype());
data.setHost(strain.getHost());
return data;
}
private static PlasmidData plasmidInfo(Entry entry) {
PlasmidData data = new PlasmidData();
data = (PlasmidData) getCommon(data, entry);
Plasmid plasmid = (Plasmid) entry;
// plasmid specific fields
data.setBackbone(plasmid.getBackbone());
data.setCircular(plasmid.getCircular());
data.setOriginOfReplication(plasmid.getOriginOfReplication());
data.setPromoters(plasmid.getPromoters());
data.setReplicatesIn(plasmid.getReplicatesIn());
return data;
}
private static PartData getCommon(PartData info, Entry entry) {
info.setId(entry.getId());
info.setRecordId(entry.getRecordId());
info.setPartId(entry.getPartNumber());
info.setName(entry.getName());
info.setOwner(entry.getOwner());
info.setOwnerEmail(entry.getOwnerEmail());
info.setCreator(entry.getCreator());
info.setCreatorEmail(entry.getCreatorEmail());
AccountController accountController = ControllerFactory.getAccountController();
try {
long ownerId = accountController.getAccountId(entry.getOwnerEmail());
info.setOwnerId(ownerId);
if (entry.getCreatorEmail() != null && !entry.getCreatorEmail().isEmpty()) {
long creatorId = accountController.getAccountId(entry.getCreatorEmail());
info.setCreatorId(creatorId);
}
} catch (ControllerException ce) {
Logger.warn(ce.getMessage());
}
info.setAlias(entry.getAlias());
info.setKeywords(entry.getKeywords());
info.setStatus(entry.getStatus());
info.setShortDescription(entry.getShortDescription());
info.setCreationTime(entry.getCreationTime().getTime());
info.setModificationTime(entry.getModificationTime().getTime());
info.setBioSafetyLevel(entry.getBioSafetyLevel());
info.setLongDescription(entry.getLongDescription());
info.setIntellectualProperty(entry.getIntellectualProperty());
info.setSelectionMarkers(entry.getSelectionMarkersAsString());
// funding sources
if (!entry.getEntryFundingSources().isEmpty()) {
Iterator iterator = entry.getEntryFundingSources().iterator();
EntryFundingSource source = (EntryFundingSource) iterator.next();
info.setPrincipalInvestigator(source.getFundingSource().getPrincipalInvestigator());
info.setFundingSource(source.getFundingSource().getFundingSource());
while (iterator.hasNext()) {
- String pi = ((EntryFundingSource) iterator.next()).getFundingSource().getPrincipalInvestigator();
- String fs = ((EntryFundingSource) iterator.next()).getFundingSource().getFundingSource();
+ EntryFundingSource next = (EntryFundingSource) iterator.next();
+ String pi = next.getFundingSource().getPrincipalInvestigator();
+ String fs = next.getFundingSource().getFundingSource();
if (pi != null && !pi.trim().isEmpty()) {
info.setPrincipalInvestigator(info.getPrincipalInvestigator() + ", " + pi);
}
if (fs != null && !fs.trim().isEmpty()) {
info.setFundingSource(info.getFundingSource() + ", " + fs);
}
}
}
// linked entries
for (Entry linkedEntry : entry.getLinkedEntries()) {
PartData data = new PartData();
EntryType linkedType = EntryType.nameToType(linkedEntry.getRecordType());
data.setType(linkedType);
data.setId(linkedEntry.getId());
data.setPartId(linkedEntry.getPartNumber());
data.setName(linkedEntry.getName());
info.getLinkedParts().add(data);
}
info.setLinks(entry.getLinksAsString());
ArrayList<CustomField> params = new ArrayList<>();
if (entry.getParameters() != null) {
for (Parameter parameter : entry.getParameters()) {
CustomField paramInfo = new CustomField();
paramInfo.setName(parameter.getKey());
paramInfo.setValue(parameter.getValue());
params.add(paramInfo);
}
}
info.setCustomFields(params);
// get visibility
info.setVisibility(Visibility.valueToEnum(entry.getVisibility()));
info.setLongDescription(entry.getLongDescription());
info.setShortDescription(entry.getShortDescription());
String links = "";
StringBuilder linkStr = new StringBuilder();
if (entry.getLinks() != null) {
for (Link link : entry.getLinks()) {
if (link.getLink() != null && !link.getLink().isEmpty()) {
linkStr.append(link.getLink()).append(", ");
} else if (link.getUrl() != null && !link.getUrl().isEmpty())
linkStr.append(link.getUrl()).append(", ");
}
links = linkStr.toString();
if (!links.isEmpty())
links = links.substring(0, links.length() - 1);
}
info.setLinks(links);
info.setReferences(entry.getReferences());
return info;
}
private static void getTipViewCommon(PartData view, Entry entry) {
view.setId(entry.getId());
view.setRecordId(entry.getRecordId());
view.setPartId(entry.getPartNumber());
view.setName(entry.getName());
view.setAlias(entry.getAlias());
view.setCreator(entry.getCreator());
view.setCreatorEmail(entry.getCreatorEmail());
view.setStatus(entry.getStatus());
view.setOwner(entry.getOwner());
view.setOwnerEmail(entry.getOwnerEmail());
view.setSelectionMarkers(entry.getSelectionMarkersAsString());
AccountController accountController = ControllerFactory.getAccountController();
try {
Account account1;
if ((account1 = accountController.getByEmail(entry.getOwnerEmail())) != null)
view.setOwnerId(account1.getId());
if ((account1 = accountController.getByEmail(entry.getCreatorEmail())) != null)
view.setCreatorId(account1.getId());
} catch (ControllerException ce) {
Logger.warn(ce.getMessage());
}
view.setKeywords(entry.getKeywords());
view.setShortDescription(entry.getShortDescription());
view.setCreationTime(entry.getCreationTime().getTime());
view.setModificationTime(entry.getModificationTime().getTime());
view.setBioSafetyLevel(entry.getBioSafetyLevel());
if (!entry.getEntryFundingSources().isEmpty()) {
EntryFundingSource source = entry.getEntryFundingSources().iterator().next();
view.setFundingSource(source.getFundingSource().getFundingSource());
view.setPrincipalInvestigator(source.getFundingSource().getPrincipalInvestigator());
}
for (Entry linkedEntry : entry.getLinkedEntries()) {
PartData data = new PartData();
EntryType linkedType = EntryType.nameToType(linkedEntry.getRecordType());
data.setType(linkedType);
data.setId(linkedEntry.getId());
data.setPartId(linkedEntry.getPartNumber());
data.setName(linkedEntry.getName());
view.getLinkedParts().add(data);
}
}
public static PartData createTableViewData(Entry entry, boolean includeOwnerInfo) {
if (entry == null)
return null;
EntryType type = EntryType.nameToType(entry.getRecordType());
PartData view = new PartData();
view.setType(type);
view.setId(entry.getId());
view.setRecordId(entry.getRecordId());
view.setPartId(entry.getPartNumber());
view.setName(entry.getName());
view.setShortDescription(entry.getShortDescription());
view.setCreationTime(entry.getCreationTime().getTime());
view.setStatus(entry.getStatus());
if (includeOwnerInfo) {
view.setOwner(entry.getOwner());
view.setOwnerEmail(entry.getOwnerEmail());
AccountController accountController = ControllerFactory.getAccountController();
try {
Account account1;
if ((account1 = accountController.getByEmail(entry.getOwnerEmail())) != null)
view.setOwnerId(account1.getId());
if ((account1 = accountController.getByEmail(entry.getCreatorEmail())) != null)
view.setCreatorId(account1.getId());
} catch (ControllerException ce) {
Logger.warn(ce.getMessage());
}
}
// attachments
boolean hasAttachment = false;
try {
AttachmentController attachmentController = ControllerFactory.getAttachmentController();
hasAttachment = attachmentController.hasAttachment(entry);
} catch (ControllerException e) {
Logger.error(e);
}
view.setHasAttachment(hasAttachment);
// has sample
try {
SampleController sampleController = ControllerFactory.getSampleController();
view.setHasSample(sampleController.hasSample(entry));
} catch (ControllerException e) {
Logger.error(e);
}
// has sequence
try {
SequenceController sequenceController = ControllerFactory.getSequenceController();
view.setHasSequence(sequenceController.hasSequence(entry.getId()));
view.setHasOriginalSequence(sequenceController.hasOriginalSequence(entry.getId()));
} catch (ControllerException e) {
Logger.error(e);
}
return view;
}
public static PartData createTipView(Entry entry) {
EntryType type = EntryType.nameToType(entry.getRecordType());
switch (type) {
case STRAIN: {
StrainData view = new StrainData();
// common
getTipViewCommon(view, entry);
// strain specific
Strain strain = (Strain) entry;
view.setHost(strain.getHost());
view.setGenotypePhenotype(strain.getGenotypePhenotype());
return view;
}
case ARABIDOPSIS: {
ArabidopsisSeedData view = new ArabidopsisSeedData();
getTipViewCommon(view, entry);
ArabidopsisSeed seed = (ArabidopsisSeed) entry;
PlantType plantType = PlantType.valueOf(seed.getPlantType().toString());
view.setPlantType(plantType);
Generation generation = Generation.valueOf(seed.getGeneration().toString());
view.setGeneration(generation);
view.setHomozygosity(seed.getHomozygosity());
view.setEcotype(seed.getEcotype());
view.setParents(seed.getParents());
view.setHarvestDate(seed.getHarvestDate());
return view;
}
case PART: {
PartData view = new PartData();
getTipViewCommon(view, entry);
return view;
}
case PLASMID: {
PlasmidData view = new PlasmidData();
getTipViewCommon(view, entry);
Plasmid plasmid = (Plasmid) entry;
view.setBackbone(plasmid.getBackbone());
view.setOriginOfReplication(plasmid.getOriginOfReplication());
view.setPromoters(plasmid.getPromoters());
view.setReplicatesIn(plasmid.getReplicatesIn());
return view;
}
default:
return null;
}
}
}
| true | true | private static PartData getCommon(PartData info, Entry entry) {
info.setId(entry.getId());
info.setRecordId(entry.getRecordId());
info.setPartId(entry.getPartNumber());
info.setName(entry.getName());
info.setOwner(entry.getOwner());
info.setOwnerEmail(entry.getOwnerEmail());
info.setCreator(entry.getCreator());
info.setCreatorEmail(entry.getCreatorEmail());
AccountController accountController = ControllerFactory.getAccountController();
try {
long ownerId = accountController.getAccountId(entry.getOwnerEmail());
info.setOwnerId(ownerId);
if (entry.getCreatorEmail() != null && !entry.getCreatorEmail().isEmpty()) {
long creatorId = accountController.getAccountId(entry.getCreatorEmail());
info.setCreatorId(creatorId);
}
} catch (ControllerException ce) {
Logger.warn(ce.getMessage());
}
info.setAlias(entry.getAlias());
info.setKeywords(entry.getKeywords());
info.setStatus(entry.getStatus());
info.setShortDescription(entry.getShortDescription());
info.setCreationTime(entry.getCreationTime().getTime());
info.setModificationTime(entry.getModificationTime().getTime());
info.setBioSafetyLevel(entry.getBioSafetyLevel());
info.setLongDescription(entry.getLongDescription());
info.setIntellectualProperty(entry.getIntellectualProperty());
info.setSelectionMarkers(entry.getSelectionMarkersAsString());
// funding sources
if (!entry.getEntryFundingSources().isEmpty()) {
Iterator iterator = entry.getEntryFundingSources().iterator();
EntryFundingSource source = (EntryFundingSource) iterator.next();
info.setPrincipalInvestigator(source.getFundingSource().getPrincipalInvestigator());
info.setFundingSource(source.getFundingSource().getFundingSource());
while (iterator.hasNext()) {
String pi = ((EntryFundingSource) iterator.next()).getFundingSource().getPrincipalInvestigator();
String fs = ((EntryFundingSource) iterator.next()).getFundingSource().getFundingSource();
if (pi != null && !pi.trim().isEmpty()) {
info.setPrincipalInvestigator(info.getPrincipalInvestigator() + ", " + pi);
}
if (fs != null && !fs.trim().isEmpty()) {
info.setFundingSource(info.getFundingSource() + ", " + fs);
}
}
}
// linked entries
for (Entry linkedEntry : entry.getLinkedEntries()) {
PartData data = new PartData();
EntryType linkedType = EntryType.nameToType(linkedEntry.getRecordType());
data.setType(linkedType);
data.setId(linkedEntry.getId());
data.setPartId(linkedEntry.getPartNumber());
data.setName(linkedEntry.getName());
info.getLinkedParts().add(data);
}
info.setLinks(entry.getLinksAsString());
ArrayList<CustomField> params = new ArrayList<>();
if (entry.getParameters() != null) {
for (Parameter parameter : entry.getParameters()) {
CustomField paramInfo = new CustomField();
paramInfo.setName(parameter.getKey());
paramInfo.setValue(parameter.getValue());
params.add(paramInfo);
}
}
info.setCustomFields(params);
// get visibility
info.setVisibility(Visibility.valueToEnum(entry.getVisibility()));
info.setLongDescription(entry.getLongDescription());
info.setShortDescription(entry.getShortDescription());
String links = "";
StringBuilder linkStr = new StringBuilder();
if (entry.getLinks() != null) {
for (Link link : entry.getLinks()) {
if (link.getLink() != null && !link.getLink().isEmpty()) {
linkStr.append(link.getLink()).append(", ");
} else if (link.getUrl() != null && !link.getUrl().isEmpty())
linkStr.append(link.getUrl()).append(", ");
}
links = linkStr.toString();
if (!links.isEmpty())
links = links.substring(0, links.length() - 1);
}
info.setLinks(links);
info.setReferences(entry.getReferences());
return info;
}
| private static PartData getCommon(PartData info, Entry entry) {
info.setId(entry.getId());
info.setRecordId(entry.getRecordId());
info.setPartId(entry.getPartNumber());
info.setName(entry.getName());
info.setOwner(entry.getOwner());
info.setOwnerEmail(entry.getOwnerEmail());
info.setCreator(entry.getCreator());
info.setCreatorEmail(entry.getCreatorEmail());
AccountController accountController = ControllerFactory.getAccountController();
try {
long ownerId = accountController.getAccountId(entry.getOwnerEmail());
info.setOwnerId(ownerId);
if (entry.getCreatorEmail() != null && !entry.getCreatorEmail().isEmpty()) {
long creatorId = accountController.getAccountId(entry.getCreatorEmail());
info.setCreatorId(creatorId);
}
} catch (ControllerException ce) {
Logger.warn(ce.getMessage());
}
info.setAlias(entry.getAlias());
info.setKeywords(entry.getKeywords());
info.setStatus(entry.getStatus());
info.setShortDescription(entry.getShortDescription());
info.setCreationTime(entry.getCreationTime().getTime());
info.setModificationTime(entry.getModificationTime().getTime());
info.setBioSafetyLevel(entry.getBioSafetyLevel());
info.setLongDescription(entry.getLongDescription());
info.setIntellectualProperty(entry.getIntellectualProperty());
info.setSelectionMarkers(entry.getSelectionMarkersAsString());
// funding sources
if (!entry.getEntryFundingSources().isEmpty()) {
Iterator iterator = entry.getEntryFundingSources().iterator();
EntryFundingSource source = (EntryFundingSource) iterator.next();
info.setPrincipalInvestigator(source.getFundingSource().getPrincipalInvestigator());
info.setFundingSource(source.getFundingSource().getFundingSource());
while (iterator.hasNext()) {
EntryFundingSource next = (EntryFundingSource) iterator.next();
String pi = next.getFundingSource().getPrincipalInvestigator();
String fs = next.getFundingSource().getFundingSource();
if (pi != null && !pi.trim().isEmpty()) {
info.setPrincipalInvestigator(info.getPrincipalInvestigator() + ", " + pi);
}
if (fs != null && !fs.trim().isEmpty()) {
info.setFundingSource(info.getFundingSource() + ", " + fs);
}
}
}
// linked entries
for (Entry linkedEntry : entry.getLinkedEntries()) {
PartData data = new PartData();
EntryType linkedType = EntryType.nameToType(linkedEntry.getRecordType());
data.setType(linkedType);
data.setId(linkedEntry.getId());
data.setPartId(linkedEntry.getPartNumber());
data.setName(linkedEntry.getName());
info.getLinkedParts().add(data);
}
info.setLinks(entry.getLinksAsString());
ArrayList<CustomField> params = new ArrayList<>();
if (entry.getParameters() != null) {
for (Parameter parameter : entry.getParameters()) {
CustomField paramInfo = new CustomField();
paramInfo.setName(parameter.getKey());
paramInfo.setValue(parameter.getValue());
params.add(paramInfo);
}
}
info.setCustomFields(params);
// get visibility
info.setVisibility(Visibility.valueToEnum(entry.getVisibility()));
info.setLongDescription(entry.getLongDescription());
info.setShortDescription(entry.getShortDescription());
String links = "";
StringBuilder linkStr = new StringBuilder();
if (entry.getLinks() != null) {
for (Link link : entry.getLinks()) {
if (link.getLink() != null && !link.getLink().isEmpty()) {
linkStr.append(link.getLink()).append(", ");
} else if (link.getUrl() != null && !link.getUrl().isEmpty())
linkStr.append(link.getUrl()).append(", ");
}
links = linkStr.toString();
if (!links.isEmpty())
links = links.substring(0, links.length() - 1);
}
info.setLinks(links);
info.setReferences(entry.getReferences());
return info;
}
|
diff --git a/src/test/java/at/ikt/ckan/rest/PackageMetaRestletResourceSophisticatedTest.java b/src/test/java/at/ikt/ckan/rest/PackageMetaRestletResourceSophisticatedTest.java
index b9efbd9..f6ca31b 100644
--- a/src/test/java/at/ikt/ckan/rest/PackageMetaRestletResourceSophisticatedTest.java
+++ b/src/test/java/at/ikt/ckan/rest/PackageMetaRestletResourceSophisticatedTest.java
@@ -1,67 +1,67 @@
package at.ikt.ckan.rest;
import static junit.framework.Assert.*;
import org.junit.Before;
import org.junit.Test;
import at.ikt.ckan.entities.PackageMeta;
public class PackageMetaRestletResourceSophisticatedTest {
private RestletResourceFactory resourceFactory;
@Before
public void setUp() throws Exception {
resourceFactory = new RestletResourceFactory("clap://class/",
".ckan.json");
}
@Test
public void testWithFileSophisticatedFile() {
PackageMetaRestletResource packageMetaResource = resourceFactory
.createPackageMetaResource("hauptwohsitzbevolkerung-geschlecht-und-familienstand");
PackageMeta packageMeta = packageMetaResource.get();
System.out.println(packageMeta);
assertEquals("hauptwohsitzbevolkerung-geschlecht-und-familienstand",
packageMeta.getName());
assertEquals("7e9bd962-afea-4e54-9640-73c2c749845b",
packageMeta.getId());
assertEquals("1.0", packageMeta.getVersion());
assertEquals("active", packageMeta.getState());
assertEquals(
- "Hauptwohnsitzbev�lkerung - Geschlecht und Familienstand ",
+ "Hauptwohnsitzbevölkerung - Geschlecht und Familienstand ",
packageMeta.getTitle());
assertEquals("Open Commons Region Linz", packageMeta.getMaintainer());
assertEquals("Magistrat der Landeshauptstadt Linz, Stadtforschung",
packageMeta.getAuthor());
assertNotNull(packageMeta.getNotes());
assertNotNull(packageMeta.getNotesRendered());
assertEquals(
"<p>Tabelle mit Altersgruppen.\n"
+ "</p>\n"
- + "<p>1) zum Familienstand \"ledig\" wurden auch Personen mit unbekanntem Familienstand gez�hlt\n"
+ + "<p>1) zum Familienstand \"ledig\" wurden auch Personen mit unbekanntem Familienstand gezählt\n"
+ " 2) derzeit keine \"hinterbliebene eingetragene PartnerInnen\".\n"
+ "</p>", packageMeta.getNotesRendered());
assertEquals(
"http://ckan.data.linz.gv.at/package/hauptwohsitzbevolkerung-geschlecht-und-familienstand",
packageMeta.getCkanUrl());
assertEquals(
"http://data.linz.gv.at/resource/population/hauptwohnsitzbevoelkerung_alter_familienstand/2JSCH.PDF",
packageMeta.getDownloadUrl());
assertEquals(
"http://www.linz.at/zahlen/040_Bevoelkerung/040_Hauptwohnsitzbevoelkerung/010_Bevoelkerungspyramiden/",
packageMeta.getUrl());
assertEquals("OKD Compliant::Creative Commons Attribution",
packageMeta.getLicense());
assertEquals("cc-by", packageMeta.getLicenseId());
}
}
| false | true | public void testWithFileSophisticatedFile() {
PackageMetaRestletResource packageMetaResource = resourceFactory
.createPackageMetaResource("hauptwohsitzbevolkerung-geschlecht-und-familienstand");
PackageMeta packageMeta = packageMetaResource.get();
System.out.println(packageMeta);
assertEquals("hauptwohsitzbevolkerung-geschlecht-und-familienstand",
packageMeta.getName());
assertEquals("7e9bd962-afea-4e54-9640-73c2c749845b",
packageMeta.getId());
assertEquals("1.0", packageMeta.getVersion());
assertEquals("active", packageMeta.getState());
assertEquals(
"Hauptwohnsitzbev�lkerung - Geschlecht und Familienstand ",
packageMeta.getTitle());
assertEquals("Open Commons Region Linz", packageMeta.getMaintainer());
assertEquals("Magistrat der Landeshauptstadt Linz, Stadtforschung",
packageMeta.getAuthor());
assertNotNull(packageMeta.getNotes());
assertNotNull(packageMeta.getNotesRendered());
assertEquals(
"<p>Tabelle mit Altersgruppen.\n"
+ "</p>\n"
+ "<p>1) zum Familienstand \"ledig\" wurden auch Personen mit unbekanntem Familienstand gez�hlt\n"
+ " 2) derzeit keine \"hinterbliebene eingetragene PartnerInnen\".\n"
+ "</p>", packageMeta.getNotesRendered());
assertEquals(
"http://ckan.data.linz.gv.at/package/hauptwohsitzbevolkerung-geschlecht-und-familienstand",
packageMeta.getCkanUrl());
assertEquals(
"http://data.linz.gv.at/resource/population/hauptwohnsitzbevoelkerung_alter_familienstand/2JSCH.PDF",
packageMeta.getDownloadUrl());
assertEquals(
"http://www.linz.at/zahlen/040_Bevoelkerung/040_Hauptwohnsitzbevoelkerung/010_Bevoelkerungspyramiden/",
packageMeta.getUrl());
assertEquals("OKD Compliant::Creative Commons Attribution",
packageMeta.getLicense());
assertEquals("cc-by", packageMeta.getLicenseId());
}
| public void testWithFileSophisticatedFile() {
PackageMetaRestletResource packageMetaResource = resourceFactory
.createPackageMetaResource("hauptwohsitzbevolkerung-geschlecht-und-familienstand");
PackageMeta packageMeta = packageMetaResource.get();
System.out.println(packageMeta);
assertEquals("hauptwohsitzbevolkerung-geschlecht-und-familienstand",
packageMeta.getName());
assertEquals("7e9bd962-afea-4e54-9640-73c2c749845b",
packageMeta.getId());
assertEquals("1.0", packageMeta.getVersion());
assertEquals("active", packageMeta.getState());
assertEquals(
"Hauptwohnsitzbevölkerung - Geschlecht und Familienstand ",
packageMeta.getTitle());
assertEquals("Open Commons Region Linz", packageMeta.getMaintainer());
assertEquals("Magistrat der Landeshauptstadt Linz, Stadtforschung",
packageMeta.getAuthor());
assertNotNull(packageMeta.getNotes());
assertNotNull(packageMeta.getNotesRendered());
assertEquals(
"<p>Tabelle mit Altersgruppen.\n"
+ "</p>\n"
+ "<p>1) zum Familienstand \"ledig\" wurden auch Personen mit unbekanntem Familienstand gezählt\n"
+ " 2) derzeit keine \"hinterbliebene eingetragene PartnerInnen\".\n"
+ "</p>", packageMeta.getNotesRendered());
assertEquals(
"http://ckan.data.linz.gv.at/package/hauptwohsitzbevolkerung-geschlecht-und-familienstand",
packageMeta.getCkanUrl());
assertEquals(
"http://data.linz.gv.at/resource/population/hauptwohnsitzbevoelkerung_alter_familienstand/2JSCH.PDF",
packageMeta.getDownloadUrl());
assertEquals(
"http://www.linz.at/zahlen/040_Bevoelkerung/040_Hauptwohnsitzbevoelkerung/010_Bevoelkerungspyramiden/",
packageMeta.getUrl());
assertEquals("OKD Compliant::Creative Commons Attribution",
packageMeta.getLicense());
assertEquals("cc-by", packageMeta.getLicenseId());
}
|
diff --git a/java/src/eu/semaine/components/mary/SemaineMary.java b/java/src/eu/semaine/components/mary/SemaineMary.java
index b703acc5..e0594b8b 100644
--- a/java/src/eu/semaine/components/mary/SemaineMary.java
+++ b/java/src/eu/semaine/components/mary/SemaineMary.java
@@ -1,281 +1,281 @@
/**
* Copyright (C) 2008 DFKI GmbH. All rights reserved.
* Use is subject to license terms -- see license.txt.
*/
package eu.semaine.components.mary;
import java.io.ByteArrayOutputStream;
import java.io.FileReader;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Locale;
import javax.jms.JMSException;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioSystem;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import marytts.Version;
import marytts.datatypes.MaryDataType;
import marytts.datatypes.MaryXML;
import marytts.datatypes.MaryDataType.Traits;
import marytts.modules.MaryModule;
import marytts.modules.ModuleRegistry;
import marytts.modules.Synthesis;
import marytts.modules.synthesis.Voice;
import marytts.server.EnvironmentChecks;
import marytts.server.Mary;
import marytts.server.MaryProperties;
import marytts.server.Request;
import java.lang.reflect.Method;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Category;
import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.WriterAppender;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.bootstrap.DOMImplementationRegistry;
import org.w3c.dom.ls.DOMImplementationLS;
import org.w3c.dom.ls.LSOutput;
import org.w3c.dom.ls.LSSerializer;
import org.xml.sax.InputSource;
import eu.semaine.components.Component;
import eu.semaine.datatypes.xml.BML;
import eu.semaine.exceptions.MessageFormatException;
import eu.semaine.exceptions.SystemConfigurationException;
import eu.semaine.jms.message.SEMAINEMessage;
import eu.semaine.jms.message.SEMAINEXMLMessage;
import eu.semaine.jms.receiver.BMLReceiver;
import eu.semaine.jms.receiver.FMLReceiver;
import eu.semaine.jms.sender.BMLSender;
import eu.semaine.jms.sender.BytesSender;
import eu.semaine.jms.sender.FMLSender;
import eu.semaine.util.XMLTool;
/**
* Speech preprocessor : To find pitch accent and boundaries
* Speech BML realiser : Audio synthesis and phone timings
*
* @author Sathish Chandra Pammi
*
*/
public class SemaineMary extends Component
{
private FMLReceiver fmlReceiver;
private BMLReceiver bmlReceiver;
private BMLReceiver bmlPlanReceiver;
private FMLSender fmlbmlSender;
private BMLSender bmlSender;
private BytesSender audioSender;
private static TransformerFactory tFactory = null;
private static Templates stylesheet = null;
private Transformer transformer;
/**
* @param componentName
* @throws JMSException
*/
public SemaineMary() throws JMSException
{
super("SemaineMary");
fmlReceiver = new FMLReceiver("semaine.data.action.selected.function");
receivers.add(fmlReceiver); // to set up properly
bmlReceiver = new BMLReceiver("semaine.data.action.selected.behaviour");
receivers.add(bmlReceiver);
bmlPlanReceiver = new BMLReceiver("semaine.data.synthesis.plan");
receivers.add(bmlPlanReceiver);
fmlbmlSender = new FMLSender("semaine.data.action.selected.speechpreprocessed", getName());
senders.add(fmlbmlSender); // so it can be started etc
bmlSender = new BMLSender("semaine.data.synthesis.plan.speechtimings", getName());
senders.add(bmlSender);
audioSender = new BytesSender("semaine.data.lowlevel.audio","AUDIO",getName());
senders.add(audioSender); // so it can be started etc
}
protected void customStartIO() throws JMSException{
try {
long startTime = System.currentTimeMillis();
Mary.addJarsToClasspath();
// Read properties:
// (Will throw exceptions if problems are found)
MaryProperties.readProperties();
System.err.print("MARY server " + Version.specificationVersion() + " starting...");
Mary.startup();
//startup();
Runtime.getRuntime().addShutdownHook(new Thread() {
public void run() {
Mary.shutdown();
}
});
System.err.println(" started in " + (System.currentTimeMillis()-startTime)/1000. + " s");
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
@Override
public void react(SEMAINEMessage m) throws JMSException
{
if (!(m instanceof SEMAINEXMLMessage)) {
throw new MessageFormatException("expected XML message, got "+m.getClass().getSimpleName());
}
if(m.getTopicName().equals("semaine.data.action.selected.function")){
speechPreProcessor(m);
}
if(m.getTopicName().equals("semaine.data.synthesis.plan")){
speechBMLRealiser(m);
}
if(m.getTopicName().equals("semaine.data.action.selected.behaviour")){
SEMAINEXMLMessage xm = (SEMAINEXMLMessage)m;
fmlbmlSender.sendXML(xm.getDocument(), xm.getUsertime(), xm.getEventType());
}
}
// Speech Preprocessor
private void speechPreProcessor(SEMAINEMessage m) throws JMSException{
SEMAINEXMLMessage xm = (SEMAINEXMLMessage)m;
ByteArrayOutputStream ssmlos = new ByteArrayOutputStream();
Request request = new Request(MaryDataType.SSML,MaryDataType.INTONATION,Locale.US,Voice.getDefaultVoice(Locale.ENGLISH),null,null,1,null);
Document inputDoc = xm.getDocument();
String inputText = xm.getText();
try{
//DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
//factory.setNamespaceAware(true);
//DocumentBuilder builder = factory.newDocumentBuilder();
//inputDoc = builder.parse(new InputSource(new FileReader("dataformat1.xml")));
//inputText = XMLTool.document2String(inputDoc);
if (tFactory == null) {
tFactory = TransformerFactory.newInstance();
}
if (stylesheet == null) {
StreamSource stylesheetStream =
new StreamSource( SemaineMary.class.getResourceAsStream(
"FML2SSML.xsl"));
stylesheet = tFactory.newTemplates(stylesheetStream);
}
transformer = stylesheet.newTransformer();
transformer.transform(new DOMSource(inputDoc), new StreamResult(ssmlos));
Reader reader = new StringReader(ssmlos.toString());
ByteArrayOutputStream intonationOS = new ByteArrayOutputStream();
request.readInputData(reader);
request.process();
request.writeOutputData(intonationOS);
String finalData = XMLTool.mergeTwoXMLFiles(inputText, intonationOS.toString(), SemaineMary.class.getResourceAsStream("FML-Intonation-Merge.xsl"), "semaine.mary.intonation");
//System.out.println("PreProcessor: "+finalData);
fmlbmlSender.sendTextMessage(finalData, xm.getUsertime(), xm.getEventType());
} catch (TransformerConfigurationException e2) {
// TODO Auto-generated catch block
e2.printStackTrace();
} catch (TransformerException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
private void speechBMLRealiser(SEMAINEMessage m) throws JMSException{
SEMAINEXMLMessage xm = (SEMAINEXMLMessage)m;
Document input = xm.getDocument();
String inputText = xm.getText();
ByteArrayOutputStream ssmlos = new ByteArrayOutputStream();
try {
//DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
//factory.setNamespaceAware(true);
//DocumentBuilder builder = factory.newDocumentBuilder();
//input = builder.parse(new InputSource(new FileReader("dataformat3.xml")));
// Extracting SSML content from BML
if (tFactory == null) {
tFactory = TransformerFactory.newInstance();
}
if (stylesheet == null) {
StreamSource stylesheetStream =
- new StreamSource( SpeechBMLRealiser.class.getResourceAsStream("BML2SSML.xsl"));
+ new StreamSource( SemaineMary.class.getResourceAsStream("BML2SSML.xsl"));
stylesheet = tFactory.newTemplates(stylesheetStream);
}
transformer = stylesheet.newTransformer();
transformer.transform(new DOMSource(input), new StreamResult(ssmlos));
//String inputText = XMLTool.document2String(input);
// SSML to Realised Acoustics using MARY
Voice voice = Voice.getDefaultVoice(Locale.ENGLISH);
AudioFormat af = voice.dbAudioFormat();
AudioFileFormat aff = new AudioFileFormat(AudioFileFormat.Type.WAVE,
af, AudioSystem.NOT_SPECIFIED);
Request request = new Request(MaryDataType.get("SSML"),MaryDataType.get("REALISED_ACOUSTPARAMS"),Locale.US,voice,"","",1,aff);
Reader reader = new StringReader(ssmlos.toString());
ByteArrayOutputStream realisedOS = new ByteArrayOutputStream();
request.readInputData(reader);
request.process();
request.writeOutputData(realisedOS);
//Merge realised acoustics into output format
- String finalData = XMLTool.mergeTwoXMLFiles(inputText, realisedOS.toString(), SpeechBMLRealiser.class.getResourceAsStream("BML-RealisedSpeech-Merge.xsl"), "semaine.mary.realised.acoustics");
+ String finalData = XMLTool.mergeTwoXMLFiles(inputText, realisedOS.toString(), SemaineMary.class.getResourceAsStream("BML-RealisedSpeech-Merge.xsl"), "semaine.mary.realised.acoustics");
bmlSender.sendTextMessage(finalData, xm.getUsertime(), xm.getEventType());
//System.out.println("BML Realiser: "+finalData);
// SSML to AUDIO using MARY
request = new Request(MaryDataType.SSML, MaryDataType.AUDIO, Locale.US,
voice, "", "", 1, aff);
reader = new StringReader(ssmlos.toString());
ByteArrayOutputStream audioos = new ByteArrayOutputStream();
request.readInputData(reader);
request.process();
request.writeOutputData(audioos);
audioSender.sendBytesMessage(audioos.toByteArray(), xm.getUsertime());
} catch (TransformerConfigurationException e2) {
// TODO Auto-generated catch block
e2.printStackTrace();
} catch (TransformerException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
| false | true | private void speechBMLRealiser(SEMAINEMessage m) throws JMSException{
SEMAINEXMLMessage xm = (SEMAINEXMLMessage)m;
Document input = xm.getDocument();
String inputText = xm.getText();
ByteArrayOutputStream ssmlos = new ByteArrayOutputStream();
try {
//DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
//factory.setNamespaceAware(true);
//DocumentBuilder builder = factory.newDocumentBuilder();
//input = builder.parse(new InputSource(new FileReader("dataformat3.xml")));
// Extracting SSML content from BML
if (tFactory == null) {
tFactory = TransformerFactory.newInstance();
}
if (stylesheet == null) {
StreamSource stylesheetStream =
new StreamSource( SpeechBMLRealiser.class.getResourceAsStream("BML2SSML.xsl"));
stylesheet = tFactory.newTemplates(stylesheetStream);
}
transformer = stylesheet.newTransformer();
transformer.transform(new DOMSource(input), new StreamResult(ssmlos));
//String inputText = XMLTool.document2String(input);
// SSML to Realised Acoustics using MARY
Voice voice = Voice.getDefaultVoice(Locale.ENGLISH);
AudioFormat af = voice.dbAudioFormat();
AudioFileFormat aff = new AudioFileFormat(AudioFileFormat.Type.WAVE,
af, AudioSystem.NOT_SPECIFIED);
Request request = new Request(MaryDataType.get("SSML"),MaryDataType.get("REALISED_ACOUSTPARAMS"),Locale.US,voice,"","",1,aff);
Reader reader = new StringReader(ssmlos.toString());
ByteArrayOutputStream realisedOS = new ByteArrayOutputStream();
request.readInputData(reader);
request.process();
request.writeOutputData(realisedOS);
//Merge realised acoustics into output format
String finalData = XMLTool.mergeTwoXMLFiles(inputText, realisedOS.toString(), SpeechBMLRealiser.class.getResourceAsStream("BML-RealisedSpeech-Merge.xsl"), "semaine.mary.realised.acoustics");
bmlSender.sendTextMessage(finalData, xm.getUsertime(), xm.getEventType());
//System.out.println("BML Realiser: "+finalData);
// SSML to AUDIO using MARY
request = new Request(MaryDataType.SSML, MaryDataType.AUDIO, Locale.US,
voice, "", "", 1, aff);
reader = new StringReader(ssmlos.toString());
ByteArrayOutputStream audioos = new ByteArrayOutputStream();
request.readInputData(reader);
request.process();
request.writeOutputData(audioos);
audioSender.sendBytesMessage(audioos.toByteArray(), xm.getUsertime());
} catch (TransformerConfigurationException e2) {
// TODO Auto-generated catch block
e2.printStackTrace();
} catch (TransformerException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
| private void speechBMLRealiser(SEMAINEMessage m) throws JMSException{
SEMAINEXMLMessage xm = (SEMAINEXMLMessage)m;
Document input = xm.getDocument();
String inputText = xm.getText();
ByteArrayOutputStream ssmlos = new ByteArrayOutputStream();
try {
//DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
//factory.setNamespaceAware(true);
//DocumentBuilder builder = factory.newDocumentBuilder();
//input = builder.parse(new InputSource(new FileReader("dataformat3.xml")));
// Extracting SSML content from BML
if (tFactory == null) {
tFactory = TransformerFactory.newInstance();
}
if (stylesheet == null) {
StreamSource stylesheetStream =
new StreamSource( SemaineMary.class.getResourceAsStream("BML2SSML.xsl"));
stylesheet = tFactory.newTemplates(stylesheetStream);
}
transformer = stylesheet.newTransformer();
transformer.transform(new DOMSource(input), new StreamResult(ssmlos));
//String inputText = XMLTool.document2String(input);
// SSML to Realised Acoustics using MARY
Voice voice = Voice.getDefaultVoice(Locale.ENGLISH);
AudioFormat af = voice.dbAudioFormat();
AudioFileFormat aff = new AudioFileFormat(AudioFileFormat.Type.WAVE,
af, AudioSystem.NOT_SPECIFIED);
Request request = new Request(MaryDataType.get("SSML"),MaryDataType.get("REALISED_ACOUSTPARAMS"),Locale.US,voice,"","",1,aff);
Reader reader = new StringReader(ssmlos.toString());
ByteArrayOutputStream realisedOS = new ByteArrayOutputStream();
request.readInputData(reader);
request.process();
request.writeOutputData(realisedOS);
//Merge realised acoustics into output format
String finalData = XMLTool.mergeTwoXMLFiles(inputText, realisedOS.toString(), SemaineMary.class.getResourceAsStream("BML-RealisedSpeech-Merge.xsl"), "semaine.mary.realised.acoustics");
bmlSender.sendTextMessage(finalData, xm.getUsertime(), xm.getEventType());
//System.out.println("BML Realiser: "+finalData);
// SSML to AUDIO using MARY
request = new Request(MaryDataType.SSML, MaryDataType.AUDIO, Locale.US,
voice, "", "", 1, aff);
reader = new StringReader(ssmlos.toString());
ByteArrayOutputStream audioos = new ByteArrayOutputStream();
request.readInputData(reader);
request.process();
request.writeOutputData(audioos);
audioSender.sendBytesMessage(audioos.toByteArray(), xm.getUsertime());
} catch (TransformerConfigurationException e2) {
// TODO Auto-generated catch block
e2.printStackTrace();
} catch (TransformerException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
|
diff --git a/h2/src/test/org/h2/test/unit/TestExit.java b/h2/src/test/org/h2/test/unit/TestExit.java
index 33cb4cf60..433361299 100644
--- a/h2/src/test/org/h2/test/unit/TestExit.java
+++ b/h2/src/test/org/h2/test/unit/TestExit.java
@@ -1,141 +1,141 @@
/*
* Copyright 2004-2009 H2 Group. Multiple-Licensed under the H2 License,
* Version 1.0, and under the Eclipse Public License, Version 1.0
* (http://h2database.com/html/license.html).
* Initial Developer: H2 Group
*/
package org.h2.test.unit;
import java.io.File;
import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import org.h2.api.DatabaseEventListener;
import org.h2.test.TestBase;
/**
* Tests the flag db_close_on_exit.
* A new process is started.
*/
public class TestExit extends TestBase implements DatabaseEventListener {
public static Connection conn;
static final int OPEN_WITH_CLOSE_ON_EXIT = 1, OPEN_WITHOUT_CLOSE_ON_EXIT = 2;
public void test() throws Exception {
if (config.codeCoverage || config.networked) {
return;
}
deleteDb("exit");
String selfDestruct = SelfDestructor.getPropertyString(60);
String[] procDef = new String[] { "java", selfDestruct,
- "-cp", "bin" + File.pathSeparator + ".",
+ "-cp", getClassPath(),
getClass().getName(), "" + OPEN_WITH_CLOSE_ON_EXIT };
Process proc = Runtime.getRuntime().exec(procDef);
while (true) {
int ch = proc.getErrorStream().read();
if (ch < 0) {
break;
}
System.out.print((char) ch);
}
while (true) {
int ch = proc.getInputStream().read();
if (ch < 0) {
break;
}
System.out.print((char) ch);
}
proc.waitFor();
Thread.sleep(100);
if (!getClosedFile().exists()) {
fail("did not close database");
}
procDef = new String[] { "java",
"-cp", getClassPath(), getClass().getName(),
"" + OPEN_WITHOUT_CLOSE_ON_EXIT };
proc = Runtime.getRuntime().exec(procDef);
proc.waitFor();
Thread.sleep(100);
if (getClosedFile().exists()) {
fail("closed database");
}
deleteDb("exit");
}
/**
* This method is called when executing this application from the command
* line.
*
* @param args the command line parameters
*/
public static void main(String[] args) throws SQLException {
SelfDestructor.startCountdown(60);
if (args.length == 0) {
System.exit(1);
}
int action = Integer.parseInt(args[0]);
TestExit app = new TestExit();
app.execute(action);
}
private void execute(int action) throws SQLException {
org.h2.Driver.load();
String url = "";
switch (action) {
case OPEN_WITH_CLOSE_ON_EXIT:
url = "jdbc:h2:" + baseDir + "/exit;database_event_listener='" + getClass().getName()
+ "';db_close_on_exit=true";
break;
case OPEN_WITHOUT_CLOSE_ON_EXIT:
url = "jdbc:h2:" + baseDir + "/exit;database_event_listener='" + getClass().getName()
+ "';db_close_on_exit=false";
break;
default:
}
conn = open(url);
Connection conn2 = open(url);
conn2.close();
}
private static Connection open(String url) throws SQLException {
getClosedFile().delete();
return DriverManager.getConnection(url, "sa", "");
}
public void diskSpaceIsLow(long stillAvailable) {
// nothing to do
}
public void exceptionThrown(SQLException e, String sql) {
// nothing to do
}
public void closingDatabase() {
try {
getClosedFile().createNewFile();
} catch (IOException e) {
TestBase.logError("error", e);
}
}
private static File getClosedFile() {
return new File(baseDir + "/closed.txt");
}
public void setProgress(int state, String name, int x, int max) {
// nothing to do
}
public void init(String url) {
// nothing to do
}
public void opened() {
// nothing to do
}
}
| true | true | public void test() throws Exception {
if (config.codeCoverage || config.networked) {
return;
}
deleteDb("exit");
String selfDestruct = SelfDestructor.getPropertyString(60);
String[] procDef = new String[] { "java", selfDestruct,
"-cp", "bin" + File.pathSeparator + ".",
getClass().getName(), "" + OPEN_WITH_CLOSE_ON_EXIT };
Process proc = Runtime.getRuntime().exec(procDef);
while (true) {
int ch = proc.getErrorStream().read();
if (ch < 0) {
break;
}
System.out.print((char) ch);
}
while (true) {
int ch = proc.getInputStream().read();
if (ch < 0) {
break;
}
System.out.print((char) ch);
}
proc.waitFor();
Thread.sleep(100);
if (!getClosedFile().exists()) {
fail("did not close database");
}
procDef = new String[] { "java",
"-cp", getClassPath(), getClass().getName(),
"" + OPEN_WITHOUT_CLOSE_ON_EXIT };
proc = Runtime.getRuntime().exec(procDef);
proc.waitFor();
Thread.sleep(100);
if (getClosedFile().exists()) {
fail("closed database");
}
deleteDb("exit");
}
| public void test() throws Exception {
if (config.codeCoverage || config.networked) {
return;
}
deleteDb("exit");
String selfDestruct = SelfDestructor.getPropertyString(60);
String[] procDef = new String[] { "java", selfDestruct,
"-cp", getClassPath(),
getClass().getName(), "" + OPEN_WITH_CLOSE_ON_EXIT };
Process proc = Runtime.getRuntime().exec(procDef);
while (true) {
int ch = proc.getErrorStream().read();
if (ch < 0) {
break;
}
System.out.print((char) ch);
}
while (true) {
int ch = proc.getInputStream().read();
if (ch < 0) {
break;
}
System.out.print((char) ch);
}
proc.waitFor();
Thread.sleep(100);
if (!getClosedFile().exists()) {
fail("did not close database");
}
procDef = new String[] { "java",
"-cp", getClassPath(), getClass().getName(),
"" + OPEN_WITHOUT_CLOSE_ON_EXIT };
proc = Runtime.getRuntime().exec(procDef);
proc.waitFor();
Thread.sleep(100);
if (getClosedFile().exists()) {
fail("closed database");
}
deleteDb("exit");
}
|
diff --git a/CadeBuildOrders/src/com/yarakyo/cadebuildorders/RunElement.java b/CadeBuildOrders/src/com/yarakyo/cadebuildorders/RunElement.java
index 875bf39..7b44f97 100644
--- a/CadeBuildOrders/src/com/yarakyo/cadebuildorders/RunElement.java
+++ b/CadeBuildOrders/src/com/yarakyo/cadebuildorders/RunElement.java
@@ -1,155 +1,155 @@
package com.yarakyo.cadebuildorders;
import android.app.ProgressDialog;
import android.content.Context;
import android.graphics.LightingColorFilter;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Message;
import android.util.TypedValue;
import android.view.ViewGroup.LayoutParams;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
public class RunElement extends RunBuild {
Action action;
TextView textViewRunActionDescription;
TextView textViewRunActionTime;
ProgressBar progressBar;
Context context;
int totalTime;
boolean expired;
LinearLayout elementContainerLayout;
LinearLayout ElementLeftLayout;
LinearLayout ElementRightLayout;
ImageView runElementImage;
// Getters
public TextView getTextViewRunActionDescription()
{
return this.textViewRunActionDescription;
}
public TextView getTextViewRunActionTime()
{
return this.textViewRunActionTime;
}
public ProgressBar getProgressbar() {
return this.progressBar;
}
public LinearLayout getElementcontainerLayout() {
return this.elementContainerLayout;
}
public LinearLayout getElementLeftLayout() {
return this.ElementLeftLayout;
}
public LinearLayout getElementRightLayout() {
return this.ElementRightLayout;
}
public ImageView getImageView()
{
return this.runElementImage;
}
public Action getAction(){
return this.action;
}
// Setters
public void setProgressBar(ProgressBar progressBar) {
this.progressBar = progressBar;
}
public void setProgressBarTime(int currentTime) {
this.progressBar.setProgress(currentTime);
}
public void setContainerLayout(LinearLayout elementContainerLayout,
LinearLayout ElementLeftLayout, LinearLayout ElementRightLayout) {
this.ElementLeftLayout = ElementLeftLayout;
this.ElementRightLayout = ElementRightLayout;
this.elementContainerLayout = elementContainerLayout;
}
public void setImageView(ImageView runElementImage) {
this.runElementImage = runElementImage;
}
// Methods
private void changeProgressBarColourToRed() {
Drawable drawable = this.progressBar.getProgressDrawable();
drawable.setColorFilter(new LightingColorFilter(0xFFff0000, 0xFFff0000));
}
public boolean testTimeExpired(int currentTime) {
if (currentTime > this.totalTime) {
changeProgressBarColourToRed();
return true;
} else {
return false;
}
}
public boolean testForRemovalTime(int currentTime) {
if (currentTime > this.totalTime + 5) {
return true;
} else {
return false;
}
}
RunElement(Action action, Context context) {
this.context = context;
this.action = action;
// Initialise all UI Variables
textViewRunActionDescription = new TextView(context);
textViewRunActionDescription.setText(action.getActionDescription());
textViewRunActionDescription.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20f);
textViewRunActionTime = new TextView(context);
- textViewRunActionTime.setText(action.getActionID()+ "m " + action.getSeconds() + "s.");
+ textViewRunActionTime.setText(action.getMinutes()+ "m " + action.getSeconds() + "s.");
textViewRunActionTime.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20f);
progressBar = new ProgressBar(context, null,
android.R.attr.progressBarStyleHorizontal);
progressBar.setIndeterminate(false);
progressBar.setVisibility(ProgressBar.VISIBLE);
progressBar.setProgress(0);
int totalTime = 0;
totalTime += action.getMinutes() * 60;
totalTime += action.getSeconds();
this.totalTime = totalTime;
progressBar.setMax(totalTime);
}
public void resetProgressBar() {
int savedTime = progressBar.getMax();
progressBar = new ProgressBar(context, null,
android.R.attr.progressBarStyleHorizontal);
progressBar.setIndeterminate(false);
progressBar.setVisibility(ProgressBar.VISIBLE);
progressBar.setProgress(0);
progressBar.setMax(savedTime);
LayoutParams layout = new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT);
progressBar.setLayoutParams(layout);
this.expired = false;
}
}
| true | true | RunElement(Action action, Context context) {
this.context = context;
this.action = action;
// Initialise all UI Variables
textViewRunActionDescription = new TextView(context);
textViewRunActionDescription.setText(action.getActionDescription());
textViewRunActionDescription.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20f);
textViewRunActionTime = new TextView(context);
textViewRunActionTime.setText(action.getActionID()+ "m " + action.getSeconds() + "s.");
textViewRunActionTime.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20f);
progressBar = new ProgressBar(context, null,
android.R.attr.progressBarStyleHorizontal);
progressBar.setIndeterminate(false);
progressBar.setVisibility(ProgressBar.VISIBLE);
progressBar.setProgress(0);
int totalTime = 0;
totalTime += action.getMinutes() * 60;
totalTime += action.getSeconds();
this.totalTime = totalTime;
progressBar.setMax(totalTime);
}
| RunElement(Action action, Context context) {
this.context = context;
this.action = action;
// Initialise all UI Variables
textViewRunActionDescription = new TextView(context);
textViewRunActionDescription.setText(action.getActionDescription());
textViewRunActionDescription.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20f);
textViewRunActionTime = new TextView(context);
textViewRunActionTime.setText(action.getMinutes()+ "m " + action.getSeconds() + "s.");
textViewRunActionTime.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20f);
progressBar = new ProgressBar(context, null,
android.R.attr.progressBarStyleHorizontal);
progressBar.setIndeterminate(false);
progressBar.setVisibility(ProgressBar.VISIBLE);
progressBar.setProgress(0);
int totalTime = 0;
totalTime += action.getMinutes() * 60;
totalTime += action.getSeconds();
this.totalTime = totalTime;
progressBar.setMax(totalTime);
}
|
diff --git a/src/com/github/marco9999/directtalk/MessageWindow.java b/src/com/github/marco9999/directtalk/MessageWindow.java
index e206067..eaaf9d5 100644
--- a/src/com/github/marco9999/directtalk/MessageWindow.java
+++ b/src/com/github/marco9999/directtalk/MessageWindow.java
@@ -1,58 +1,58 @@
package com.github.marco9999.directtalk;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.widget.TextView;
public class MessageWindow extends Activity
{
@Override
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_message_window);
Intent menuintent = getIntent();
String hoststring = null;
String portstring = null;
Bundle ConnectInfo = menuintent.getExtras();
if (ConnectInfo != null)
{
hoststring = ConnectInfo
.getString("com.github.marco9999.hoststring");
portstring = ConnectInfo
.getString("com.github.marco9999.portstring");
}
else
{
Log.e("DirectTalk", "Error: intent extra's empty!");
}
- if (hoststring == null && portstring == null)
+ if (hoststring.isEmpty() || portstring.isEmpty())
{
Log.e("DirectTalk", "Error: Host or port empty!");
}
TextView host = (TextView) findViewById(R.id.message_window_host);
TextView port = (TextView) findViewById(R.id.message_window_port);
host.setText(hoststring);
port.setText(portstring);
MessageHandlerWorker connection = new MessageHandlerWorker(hoststring, portstring);
connection.start();
}
@Override
public boolean onCreateOptionsMenu(Menu menu)
{
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.message_window, menu);
return true;
}
}
| true | true | protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_message_window);
Intent menuintent = getIntent();
String hoststring = null;
String portstring = null;
Bundle ConnectInfo = menuintent.getExtras();
if (ConnectInfo != null)
{
hoststring = ConnectInfo
.getString("com.github.marco9999.hoststring");
portstring = ConnectInfo
.getString("com.github.marco9999.portstring");
}
else
{
Log.e("DirectTalk", "Error: intent extra's empty!");
}
if (hoststring == null && portstring == null)
{
Log.e("DirectTalk", "Error: Host or port empty!");
}
TextView host = (TextView) findViewById(R.id.message_window_host);
TextView port = (TextView) findViewById(R.id.message_window_port);
host.setText(hoststring);
port.setText(portstring);
MessageHandlerWorker connection = new MessageHandlerWorker(hoststring, portstring);
connection.start();
}
| protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_message_window);
Intent menuintent = getIntent();
String hoststring = null;
String portstring = null;
Bundle ConnectInfo = menuintent.getExtras();
if (ConnectInfo != null)
{
hoststring = ConnectInfo
.getString("com.github.marco9999.hoststring");
portstring = ConnectInfo
.getString("com.github.marco9999.portstring");
}
else
{
Log.e("DirectTalk", "Error: intent extra's empty!");
}
if (hoststring.isEmpty() || portstring.isEmpty())
{
Log.e("DirectTalk", "Error: Host or port empty!");
}
TextView host = (TextView) findViewById(R.id.message_window_host);
TextView port = (TextView) findViewById(R.id.message_window_port);
host.setText(hoststring);
port.setText(portstring);
MessageHandlerWorker connection = new MessageHandlerWorker(hoststring, portstring);
connection.start();
}
|
diff --git a/gora-core/src/main/java/org/gora/compiler/GoraCompiler.java b/gora-core/src/main/java/org/gora/compiler/GoraCompiler.java
index ae6fa0f..a29c16b 100644
--- a/gora-core/src/main/java/org/gora/compiler/GoraCompiler.java
+++ b/gora-core/src/main/java/org/gora/compiler/GoraCompiler.java
@@ -1,433 +1,433 @@
package org.gora.compiler;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.avro.Protocol;
import org.apache.avro.Schema;
import org.apache.avro.Protocol.Message;
import org.apache.avro.Schema.Field;
import org.apache.avro.specific.SpecificData;
/** Generate specific Java interfaces and classes for protocols and schemas. */
public class GoraCompiler {
private File dest;
private Writer out;
private Set<Schema> queue = new HashSet<Schema>();
private GoraCompiler(File dest) {
this.dest = dest; // root directory for output
}
/** Generates Java interface and classes for a protocol.
* @param src the source Avro protocol file
* @param dest the directory to place generated files in
*/
public static void compileProtocol(File src, File dest) throws IOException {
GoraCompiler compiler = new GoraCompiler(dest);
Protocol protocol = Protocol.parse(src);
for (Schema s : protocol.getTypes()) // enqueue types
compiler.enqueue(s);
compiler.compileInterface(protocol); // generate interface
compiler.compile(); // generate classes for types
}
/** Generates Java classes for a schema. */
public static void compileSchema(File src, File dest) throws IOException {
GoraCompiler compiler = new GoraCompiler(dest);
compiler.enqueue(Schema.parse(src)); // enqueue types
compiler.compile(); // generate classes for types
}
private static String camelCasify(String s) {
return s.substring(0, 1).toUpperCase() + s.substring(1);
}
/** Recognizes camel case */
private static String toUpperCase(String s) {
StringBuilder builder = new StringBuilder();
for(int i=0; i<s.length(); i++) {
if(i > 0) {
if(Character.isUpperCase(s.charAt(i))
&& Character.isLowerCase(s.charAt(i-1))
&& Character.isLetter(s.charAt(i))) {
builder.append("_");
}
}
builder.append(Character.toUpperCase(s.charAt(i)));
}
return builder.toString();
}
/** Recursively enqueue schemas that need a class generated. */
private void enqueue(Schema schema) throws IOException {
if (queue.contains(schema)) return;
switch (schema.getType()) {
case RECORD:
queue.add(schema);
for (Field field : schema.getFields())
enqueue(field.schema());
break;
case MAP:
enqueue(schema.getValueType());
break;
case ARRAY:
enqueue(schema.getElementType());
break;
case UNION:
for (Schema s : schema.getTypes())
enqueue(s);
break;
case ENUM:
case FIXED:
queue.add(schema);
break;
case STRING: case BYTES:
case INT: case LONG:
case FLOAT: case DOUBLE:
case BOOLEAN: case NULL:
break;
default: throw new RuntimeException("Unknown type: "+schema);
}
}
/** Generate java classes for enqueued schemas. */
private void compile() throws IOException {
for (Schema schema : queue)
compile(schema);
}
private void compileInterface(Protocol protocol) throws IOException {
startFile(protocol.getName(), protocol.getNamespace());
try {
line(0, "public interface "+protocol.getName()+" {");
out.append("\n");
for (Map.Entry<String,Message> e : protocol.getMessages().entrySet()) {
String name = e.getKey();
Message message = e.getValue();
Schema request = message.getRequest();
Schema response = message.getResponse();
line(1, unbox(response)+" "+name+"("+params(request)+")");
line(2,"throws AvroRemoteException"+errors(message.getErrors())+";");
}
line(0, "}");
} finally {
out.close();
}
}
private void startFile(String name, String space) throws IOException {
File dir = new File(dest, space.replace('.', File.separatorChar));
if (!dir.exists())
if (!dir.mkdirs())
throw new IOException("Unable to create " + dir);
name = cap(name) + ".java";
out = new OutputStreamWriter(new FileOutputStream(new File(dir, name)));
header(space);
}
private void header(String namespace) throws IOException {
if(namespace != null) {
line(0, "package "+namespace+";\n");
}
line(0, "import java.nio.ByteBuffer;");
line(0, "import java.util.Map;");
line(0, "import java.util.HashMap;");
line(0, "import org.apache.avro.Protocol;");
line(0, "import org.apache.avro.Schema;");
line(0, "import org.apache.avro.AvroRuntimeException;");
line(0, "import org.apache.avro.Protocol;");
line(0, "import org.apache.avro.util.Utf8;");
line(0, "import org.apache.avro.ipc.AvroRemoteException;");
line(0, "import org.apache.avro.generic.GenericArray;");
line(0, "import org.apache.avro.specific.SpecificExceptionBase;");
line(0, "import org.apache.avro.specific.SpecificRecordBase;");
line(0, "import org.apache.avro.specific.SpecificRecord;");
line(0, "import org.apache.avro.specific.SpecificFixed;");
line(0, "import org.gora.persistency.StateManager;");
line(0, "import org.gora.persistency.impl.PersistentBase;");
line(0, "import org.gora.persistency.impl.StateManagerImpl;");
line(0, "import org.gora.persistency.StatefulHashMap;");
line(0, "import org.gora.persistency.ListGenericArray;");
for (Schema s : queue)
if (namespace == null
? (s.getNamespace() != null)
: !namespace.equals(s.getNamespace()))
line(0, "import "+SpecificData.get().getClassName(s)+";");
line(0, "");
line(0, "@SuppressWarnings(\"all\")");
}
private String params(Schema request) throws IOException {
StringBuilder b = new StringBuilder();
int count = 0;
for (Field field : request.getFields()) {
b.append(unbox(field.schema()));
b.append(" ");
b.append(field.name());
if (++count < request.getFields().size())
b.append(", ");
}
return b.toString();
}
private String errors(Schema errs) throws IOException {
StringBuilder b = new StringBuilder();
for (Schema error : errs.getTypes().subList(1, errs.getTypes().size())) {
b.append(", ");
b.append(error.getName());
}
return b.toString();
}
private void compile(Schema schema) throws IOException {
startFile(schema.getName(), schema.getNamespace());
try {
switch (schema.getType()) {
case RECORD:
String type = type(schema);
line(0, "public class "+ type
+" extends PersistentBase {");
// schema definition
line(1, "public static final Schema _SCHEMA = Schema.parse(\""
+esc(schema)+"\");");
//field information
line(1, "public static enum Field {");
int i=0;
for (Field field : schema.getFields()) {
line(2,toUpperCase(field.name())+"("+(i++)+ ",\"" + field.name() + "\"),");
}
line(2, ";");
line(2, "private int index;");
line(2, "private String name;");
line(2, "Field(int index, String name) {this.index=index;this.name=name;}");
line(2, "public int getIndex() {return index;}");
line(2, "public String getName() {return name;}");
line(2, "public String toString() {return name;}");
line(1, "};");
StringBuilder builder = new StringBuilder(
"public static final String[] _ALL_FIELDS = {");
for (Field field : schema.getFields()) {
builder.append("\"").append(field.name()).append("\",");
}
builder.append("};");
line(1, builder.toString());
line(1, "static {");
line(2, "PersistentBase.registerFields("+type+".class, _ALL_FIELDS);");
line(1, "}");
// field declations
for (Field field : schema.getFields()) {
line(1,"private "+unbox(field.schema())+" "+field.name()+";");
}
//constructors
line(1, "public " + type + "() {");
line(2, "this(new StateManagerImpl());");
line(1, "}");
line(1, "public " + type + "(StateManager stateManager) {");
line(2, "super(stateManager);");
for (Field field : schema.getFields()) {
Schema fieldSchema = field.schema();
switch (fieldSchema.getType()) {
case ARRAY:
String valueType = type(fieldSchema.getElementType());
line(2, field.name()+" = new ListGenericArray<"+valueType+">(getSchema()" +
- ".getField("+field.name()+").schema());");
+ ".getField(\""+field.name()+"\").schema());");
break;
case MAP:
valueType = type(fieldSchema.getValueType());
line(2, field.name()+" = new StatefulHashMap<Utf8,"+valueType+">();");
}
}
line(1, "}");
//newInstance(StateManager)
line(1, "public " + type + " newInstance(StateManager stateManager) {");
line(2, "return new " + type + "(stateManager);" );
line(1, "}");
// schema method
line(1, "public Schema getSchema() { return _SCHEMA; }");
// get method
line(1, "public Object get(int _field) {");
line(2, "switch (_field) {");
i = 0;
for (Field field : schema.getFields()) {
line(2, "case "+(i++)+": return "+field.name()+";");
}
line(2, "default: throw new AvroRuntimeException(\"Bad index\");");
line(2, "}");
line(1, "}");
// put method
line(1, "@SuppressWarnings(value=\"unchecked\")");
line(1, "public void put(int _field, Object _value) {");
line(2, "getStateManager().setDirty(this, _field);");
line(2, "switch (_field) {");
i = 0;
for (Field field : schema.getFields()) {
line(2, "case "+i+":"+field.name()+" = ("+
type(field.schema())+")_value; break;");
i++;
}
line(2, "default: throw new AvroRuntimeException(\"Bad index\");");
line(2, "}");
line(1, "}");
// java bean style getters and setters
i = 0;
for (Field field : schema.getFields()) {
String camelKey = camelCasify(field.name());
Schema fieldSchema = field.schema();
switch (fieldSchema.getType()) {
case INT:case LONG:case FLOAT:case DOUBLE:
case BOOLEAN:case BYTES:case STRING: case ENUM: case RECORD:
String unboxed = unbox(fieldSchema);
line(1, "public "+unboxed+" get" +camelKey+"() {");
line(2, "return ("+type(field.schema())+") get("+i+");");
line(1, "}");
line(1, "public void set"+camelKey+"("+unboxed+" value) {");
line(2, "put("+i+", value);");
line(1, "}");
break;
case ARRAY:
unboxed = unbox(fieldSchema.getElementType());
line(1, "public GenericArray<"+unboxed+"> get"+camelKey+"() {");
line(2, "return (GenericArray<"+unboxed+">) get("+i+");");
line(1, "}");
line(1, "public void addTo"+camelKey+"("+unboxed+" element) {");
line(2, "getStateManager().setDirty(this, "+i+");");
line(2, field.name()+".add(element);");
line(1, "}");
break;
case MAP:
String valueType = type(fieldSchema.getValueType());
unboxed = unbox(fieldSchema.getValueType());
line(1, "public Map<Utf8, "+unboxed+"> get"+camelKey+"() {");
line(2, "return (Map<Utf8, "+unboxed+">) get("+i+");");
line(1, "}");
line(1, "public "+unboxed+" getFrom"+camelKey+"(Utf8 key) {");
line(2, "if ("+field.name()+" == null) { return null; }");
line(2, "return "+field.name()+".get(key);");
line(1, "}");
line(1, "public void putTo"+camelKey+"(Utf8 key, "+unboxed+" value) {");
line(2, "getStateManager().setDirty(this, "+i+");");
line(2, field.name()+".put(key, value);");
line(1, "}");
line(1, "public "+unboxed+" removeFrom"+camelKey+"(Utf8 key) {");
line(2, "if ("+field.name()+" == null) { return null; }");
line(2, "getStateManager().setDirty(this, "+i+");");
line(2, "return "+field.name()+".remove(key);");
line(1, "}");
}
i++;
}
line(0, "}");
break;
case ENUM:
line(0, "public enum "+type(schema)+" { ");
StringBuilder b = new StringBuilder();
int count = 0;
for (String symbol : schema.getEnumSymbols()) {
b.append(symbol);
if (++count < schema.getEnumSymbols().size())
b.append(", ");
}
line(1, b.toString());
line(0, "}");
break;
case FIXED:
line(0, "@FixedSize("+schema.getFixedSize()+")");
line(0, "public class "+type(schema)+" extends SpecificFixed {}");
break;
case MAP: case ARRAY: case UNION: case STRING: case BYTES:
case INT: case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case NULL:
break;
default: throw new RuntimeException("Unknown type: "+schema);
}
} finally {
out.close();
}
}
private static final Schema NULL_SCHEMA = Schema.create(Schema.Type.NULL);
public static String type(Schema schema) {
switch (schema.getType()) {
case RECORD:
case ENUM:
case FIXED:
return schema.getName();
case ARRAY:
return "GenericArray<"+type(schema.getElementType())+">";
case MAP:
return "Map<Utf8,"+type(schema.getValueType())+">";
case UNION:
List<Schema> types = schema.getTypes(); // elide unions with null
if ((types.size() == 2) && types.contains(NULL_SCHEMA))
return type(types.get(types.get(0).equals(NULL_SCHEMA) ? 1 : 0));
return "Object";
case STRING: return "Utf8";
case BYTES: return "ByteBuffer";
case INT: return "Integer";
case LONG: return "Long";
case FLOAT: return "Float";
case DOUBLE: return "Double";
case BOOLEAN: return "Boolean";
case NULL: return "Void";
default: throw new RuntimeException("Unknown type: "+schema);
}
}
public static String unbox(Schema schema) {
switch (schema.getType()) {
case INT: return "int";
case LONG: return "long";
case FLOAT: return "float";
case DOUBLE: return "double";
case BOOLEAN: return "boolean";
default: return type(schema);
}
}
private void line(int indent, String text) throws IOException {
for (int i = 0; i < indent; i ++) {
out.append(" ");
}
out.append(text);
out.append("\n");
}
static String cap(String name) {
return name.substring(0,1).toUpperCase()+name.substring(1,name.length());
}
private static String esc(Object o) {
return o.toString().replace("\"", "\\\"");
}
public static void main(String[] args) throws Exception {
if (args.length < 2) {
System.err.println("Usage: SpecificCompiler <schema file> <output dir>");
System.exit(1);
}
compileSchema(new File(args[0]), new File(args[1]));
}
}
| true | true | private void compile(Schema schema) throws IOException {
startFile(schema.getName(), schema.getNamespace());
try {
switch (schema.getType()) {
case RECORD:
String type = type(schema);
line(0, "public class "+ type
+" extends PersistentBase {");
// schema definition
line(1, "public static final Schema _SCHEMA = Schema.parse(\""
+esc(schema)+"\");");
//field information
line(1, "public static enum Field {");
int i=0;
for (Field field : schema.getFields()) {
line(2,toUpperCase(field.name())+"("+(i++)+ ",\"" + field.name() + "\"),");
}
line(2, ";");
line(2, "private int index;");
line(2, "private String name;");
line(2, "Field(int index, String name) {this.index=index;this.name=name;}");
line(2, "public int getIndex() {return index;}");
line(2, "public String getName() {return name;}");
line(2, "public String toString() {return name;}");
line(1, "};");
StringBuilder builder = new StringBuilder(
"public static final String[] _ALL_FIELDS = {");
for (Field field : schema.getFields()) {
builder.append("\"").append(field.name()).append("\",");
}
builder.append("};");
line(1, builder.toString());
line(1, "static {");
line(2, "PersistentBase.registerFields("+type+".class, _ALL_FIELDS);");
line(1, "}");
// field declations
for (Field field : schema.getFields()) {
line(1,"private "+unbox(field.schema())+" "+field.name()+";");
}
//constructors
line(1, "public " + type + "() {");
line(2, "this(new StateManagerImpl());");
line(1, "}");
line(1, "public " + type + "(StateManager stateManager) {");
line(2, "super(stateManager);");
for (Field field : schema.getFields()) {
Schema fieldSchema = field.schema();
switch (fieldSchema.getType()) {
case ARRAY:
String valueType = type(fieldSchema.getElementType());
line(2, field.name()+" = new ListGenericArray<"+valueType+">(getSchema()" +
".getField("+field.name()+").schema());");
break;
case MAP:
valueType = type(fieldSchema.getValueType());
line(2, field.name()+" = new StatefulHashMap<Utf8,"+valueType+">();");
}
}
line(1, "}");
//newInstance(StateManager)
line(1, "public " + type + " newInstance(StateManager stateManager) {");
line(2, "return new " + type + "(stateManager);" );
line(1, "}");
// schema method
line(1, "public Schema getSchema() { return _SCHEMA; }");
// get method
line(1, "public Object get(int _field) {");
line(2, "switch (_field) {");
i = 0;
for (Field field : schema.getFields()) {
line(2, "case "+(i++)+": return "+field.name()+";");
}
line(2, "default: throw new AvroRuntimeException(\"Bad index\");");
line(2, "}");
line(1, "}");
// put method
line(1, "@SuppressWarnings(value=\"unchecked\")");
line(1, "public void put(int _field, Object _value) {");
line(2, "getStateManager().setDirty(this, _field);");
line(2, "switch (_field) {");
i = 0;
for (Field field : schema.getFields()) {
line(2, "case "+i+":"+field.name()+" = ("+
type(field.schema())+")_value; break;");
i++;
}
line(2, "default: throw new AvroRuntimeException(\"Bad index\");");
line(2, "}");
line(1, "}");
// java bean style getters and setters
i = 0;
for (Field field : schema.getFields()) {
String camelKey = camelCasify(field.name());
Schema fieldSchema = field.schema();
switch (fieldSchema.getType()) {
case INT:case LONG:case FLOAT:case DOUBLE:
case BOOLEAN:case BYTES:case STRING: case ENUM: case RECORD:
String unboxed = unbox(fieldSchema);
line(1, "public "+unboxed+" get" +camelKey+"() {");
line(2, "return ("+type(field.schema())+") get("+i+");");
line(1, "}");
line(1, "public void set"+camelKey+"("+unboxed+" value) {");
line(2, "put("+i+", value);");
line(1, "}");
break;
case ARRAY:
unboxed = unbox(fieldSchema.getElementType());
line(1, "public GenericArray<"+unboxed+"> get"+camelKey+"() {");
line(2, "return (GenericArray<"+unboxed+">) get("+i+");");
line(1, "}");
line(1, "public void addTo"+camelKey+"("+unboxed+" element) {");
line(2, "getStateManager().setDirty(this, "+i+");");
line(2, field.name()+".add(element);");
line(1, "}");
break;
case MAP:
String valueType = type(fieldSchema.getValueType());
unboxed = unbox(fieldSchema.getValueType());
line(1, "public Map<Utf8, "+unboxed+"> get"+camelKey+"() {");
line(2, "return (Map<Utf8, "+unboxed+">) get("+i+");");
line(1, "}");
line(1, "public "+unboxed+" getFrom"+camelKey+"(Utf8 key) {");
line(2, "if ("+field.name()+" == null) { return null; }");
line(2, "return "+field.name()+".get(key);");
line(1, "}");
line(1, "public void putTo"+camelKey+"(Utf8 key, "+unboxed+" value) {");
line(2, "getStateManager().setDirty(this, "+i+");");
line(2, field.name()+".put(key, value);");
line(1, "}");
line(1, "public "+unboxed+" removeFrom"+camelKey+"(Utf8 key) {");
line(2, "if ("+field.name()+" == null) { return null; }");
line(2, "getStateManager().setDirty(this, "+i+");");
line(2, "return "+field.name()+".remove(key);");
line(1, "}");
}
i++;
}
line(0, "}");
break;
case ENUM:
line(0, "public enum "+type(schema)+" { ");
StringBuilder b = new StringBuilder();
int count = 0;
for (String symbol : schema.getEnumSymbols()) {
b.append(symbol);
if (++count < schema.getEnumSymbols().size())
b.append(", ");
}
line(1, b.toString());
line(0, "}");
break;
case FIXED:
line(0, "@FixedSize("+schema.getFixedSize()+")");
line(0, "public class "+type(schema)+" extends SpecificFixed {}");
break;
case MAP: case ARRAY: case UNION: case STRING: case BYTES:
case INT: case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case NULL:
break;
default: throw new RuntimeException("Unknown type: "+schema);
}
} finally {
out.close();
}
}
| private void compile(Schema schema) throws IOException {
startFile(schema.getName(), schema.getNamespace());
try {
switch (schema.getType()) {
case RECORD:
String type = type(schema);
line(0, "public class "+ type
+" extends PersistentBase {");
// schema definition
line(1, "public static final Schema _SCHEMA = Schema.parse(\""
+esc(schema)+"\");");
//field information
line(1, "public static enum Field {");
int i=0;
for (Field field : schema.getFields()) {
line(2,toUpperCase(field.name())+"("+(i++)+ ",\"" + field.name() + "\"),");
}
line(2, ";");
line(2, "private int index;");
line(2, "private String name;");
line(2, "Field(int index, String name) {this.index=index;this.name=name;}");
line(2, "public int getIndex() {return index;}");
line(2, "public String getName() {return name;}");
line(2, "public String toString() {return name;}");
line(1, "};");
StringBuilder builder = new StringBuilder(
"public static final String[] _ALL_FIELDS = {");
for (Field field : schema.getFields()) {
builder.append("\"").append(field.name()).append("\",");
}
builder.append("};");
line(1, builder.toString());
line(1, "static {");
line(2, "PersistentBase.registerFields("+type+".class, _ALL_FIELDS);");
line(1, "}");
// field declations
for (Field field : schema.getFields()) {
line(1,"private "+unbox(field.schema())+" "+field.name()+";");
}
//constructors
line(1, "public " + type + "() {");
line(2, "this(new StateManagerImpl());");
line(1, "}");
line(1, "public " + type + "(StateManager stateManager) {");
line(2, "super(stateManager);");
for (Field field : schema.getFields()) {
Schema fieldSchema = field.schema();
switch (fieldSchema.getType()) {
case ARRAY:
String valueType = type(fieldSchema.getElementType());
line(2, field.name()+" = new ListGenericArray<"+valueType+">(getSchema()" +
".getField(\""+field.name()+"\").schema());");
break;
case MAP:
valueType = type(fieldSchema.getValueType());
line(2, field.name()+" = new StatefulHashMap<Utf8,"+valueType+">();");
}
}
line(1, "}");
//newInstance(StateManager)
line(1, "public " + type + " newInstance(StateManager stateManager) {");
line(2, "return new " + type + "(stateManager);" );
line(1, "}");
// schema method
line(1, "public Schema getSchema() { return _SCHEMA; }");
// get method
line(1, "public Object get(int _field) {");
line(2, "switch (_field) {");
i = 0;
for (Field field : schema.getFields()) {
line(2, "case "+(i++)+": return "+field.name()+";");
}
line(2, "default: throw new AvroRuntimeException(\"Bad index\");");
line(2, "}");
line(1, "}");
// put method
line(1, "@SuppressWarnings(value=\"unchecked\")");
line(1, "public void put(int _field, Object _value) {");
line(2, "getStateManager().setDirty(this, _field);");
line(2, "switch (_field) {");
i = 0;
for (Field field : schema.getFields()) {
line(2, "case "+i+":"+field.name()+" = ("+
type(field.schema())+")_value; break;");
i++;
}
line(2, "default: throw new AvroRuntimeException(\"Bad index\");");
line(2, "}");
line(1, "}");
// java bean style getters and setters
i = 0;
for (Field field : schema.getFields()) {
String camelKey = camelCasify(field.name());
Schema fieldSchema = field.schema();
switch (fieldSchema.getType()) {
case INT:case LONG:case FLOAT:case DOUBLE:
case BOOLEAN:case BYTES:case STRING: case ENUM: case RECORD:
String unboxed = unbox(fieldSchema);
line(1, "public "+unboxed+" get" +camelKey+"() {");
line(2, "return ("+type(field.schema())+") get("+i+");");
line(1, "}");
line(1, "public void set"+camelKey+"("+unboxed+" value) {");
line(2, "put("+i+", value);");
line(1, "}");
break;
case ARRAY:
unboxed = unbox(fieldSchema.getElementType());
line(1, "public GenericArray<"+unboxed+"> get"+camelKey+"() {");
line(2, "return (GenericArray<"+unboxed+">) get("+i+");");
line(1, "}");
line(1, "public void addTo"+camelKey+"("+unboxed+" element) {");
line(2, "getStateManager().setDirty(this, "+i+");");
line(2, field.name()+".add(element);");
line(1, "}");
break;
case MAP:
String valueType = type(fieldSchema.getValueType());
unboxed = unbox(fieldSchema.getValueType());
line(1, "public Map<Utf8, "+unboxed+"> get"+camelKey+"() {");
line(2, "return (Map<Utf8, "+unboxed+">) get("+i+");");
line(1, "}");
line(1, "public "+unboxed+" getFrom"+camelKey+"(Utf8 key) {");
line(2, "if ("+field.name()+" == null) { return null; }");
line(2, "return "+field.name()+".get(key);");
line(1, "}");
line(1, "public void putTo"+camelKey+"(Utf8 key, "+unboxed+" value) {");
line(2, "getStateManager().setDirty(this, "+i+");");
line(2, field.name()+".put(key, value);");
line(1, "}");
line(1, "public "+unboxed+" removeFrom"+camelKey+"(Utf8 key) {");
line(2, "if ("+field.name()+" == null) { return null; }");
line(2, "getStateManager().setDirty(this, "+i+");");
line(2, "return "+field.name()+".remove(key);");
line(1, "}");
}
i++;
}
line(0, "}");
break;
case ENUM:
line(0, "public enum "+type(schema)+" { ");
StringBuilder b = new StringBuilder();
int count = 0;
for (String symbol : schema.getEnumSymbols()) {
b.append(symbol);
if (++count < schema.getEnumSymbols().size())
b.append(", ");
}
line(1, b.toString());
line(0, "}");
break;
case FIXED:
line(0, "@FixedSize("+schema.getFixedSize()+")");
line(0, "public class "+type(schema)+" extends SpecificFixed {}");
break;
case MAP: case ARRAY: case UNION: case STRING: case BYTES:
case INT: case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case NULL:
break;
default: throw new RuntimeException("Unknown type: "+schema);
}
} finally {
out.close();
}
}
|
diff --git a/main/src/jp/ac/osaka_u/ist/sel/metricstool/main/ast/databuilder/statement/LocalVariableDeclarationStatementBuilder.java b/main/src/jp/ac/osaka_u/ist/sel/metricstool/main/ast/databuilder/statement/LocalVariableDeclarationStatementBuilder.java
index 86f1cae9..523e4910 100644
--- a/main/src/jp/ac/osaka_u/ist/sel/metricstool/main/ast/databuilder/statement/LocalVariableDeclarationStatementBuilder.java
+++ b/main/src/jp/ac/osaka_u/ist/sel/metricstool/main/ast/databuilder/statement/LocalVariableDeclarationStatementBuilder.java
@@ -1,74 +1,77 @@
package jp.ac.osaka_u.ist.sel.metricstool.main.ast.databuilder.statement;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.databuilder.BuildDataManager;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.databuilder.CompoundDataBuilder;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.databuilder.LocalVariableBuilder;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.statemanager.LocalVariableStateManager;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.statemanager.StateChangeEvent;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.statemanager.StateChangeEvent.StateChangeEventType;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.statemanager.VariableDefinitionStateManager.VARIABLE_STATE;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.visitor.AstVisitEvent;
import jp.ac.osaka_u.ist.sel.metricstool.main.data.target.ExpressionInfo;
import jp.ac.osaka_u.ist.sel.metricstool.main.data.target.LocalSpaceInfo;
import jp.ac.osaka_u.ist.sel.metricstool.main.data.target.unresolved.UnresolvedExpressionInfo;
import jp.ac.osaka_u.ist.sel.metricstool.main.data.target.unresolved.UnresolvedLocalSpaceInfo;
import jp.ac.osaka_u.ist.sel.metricstool.main.data.target.unresolved.UnresolvedLocalVariableUsageInfo;
import jp.ac.osaka_u.ist.sel.metricstool.main.data.target.unresolved.UnresolvedVariableDeclarationStatementInfo;
public class LocalVariableDeclarationStatementBuilder extends
CompoundDataBuilder<UnresolvedVariableDeclarationStatementInfo> {
public LocalVariableDeclarationStatementBuilder(final LocalVariableBuilder variableBuilder,
final BuildDataManager buildDataManager) {
if (null == variableBuilder) {
throw new IllegalArgumentException("variableBuilder is null.");
}
this.variableBuilder = variableBuilder;
this.buildDataManager = buildDataManager;
this.addStateManager(new LocalVariableStateManager());
}
@Override
public void stateChanged(StateChangeEvent<AstVisitEvent> event) {
final StateChangeEventType eventType = event.getType();
if (eventType.equals(VARIABLE_STATE.EXIT_VARIABLE_DEF)) {
final AstVisitEvent trigger = event.getTrigger();
final UnresolvedVariableDeclarationStatementInfo builtDeclarationStatement = this
.buildVariableDeclarationStatement(this.variableBuilder
.getLastDeclarationUsage(), this.variableBuilder
.getLastBuiltExpression(), trigger.getStartLine(), trigger
.getStartColumn(), trigger.getEndLine(), trigger.getEndColumn());
this.registBuiltData(builtDeclarationStatement);
}
}
private UnresolvedVariableDeclarationStatementInfo buildVariableDeclarationStatement(
final UnresolvedLocalVariableUsageInfo declarationUsage,
final UnresolvedExpressionInfo<? extends ExpressionInfo> initializerExpression,
final int fromLine, final int fromColumn, final int toLine, final int toColumn) {
final UnresolvedVariableDeclarationStatementInfo declarationStatement = new UnresolvedVariableDeclarationStatementInfo(
declarationUsage, initializerExpression);
+ // FIXME: this is temporal patch. fix ANTLR grammar file
+ final int correctToLine = declarationUsage.getToLine();
+ final int correctToColumn = declarationUsage.getToColumn();
declarationStatement.setFromLine(fromLine);
declarationStatement.setFromColumn(fromColumn);
- declarationStatement.setToLine(toLine);
- declarationStatement.setToColumn(toColumn);
+ declarationStatement.setToLine(correctToLine);
+ declarationStatement.setToColumn(correctToColumn);
final UnresolvedLocalSpaceInfo<? extends LocalSpaceInfo> currentLocal = this.buildDataManager
.getCurrentLocalSpace();
if (null != currentLocal) {
currentLocal.addStatement(declarationStatement);
}
return declarationStatement;
}
private final LocalVariableBuilder variableBuilder;
private final BuildDataManager buildDataManager;
}
| false | true | private UnresolvedVariableDeclarationStatementInfo buildVariableDeclarationStatement(
final UnresolvedLocalVariableUsageInfo declarationUsage,
final UnresolvedExpressionInfo<? extends ExpressionInfo> initializerExpression,
final int fromLine, final int fromColumn, final int toLine, final int toColumn) {
final UnresolvedVariableDeclarationStatementInfo declarationStatement = new UnresolvedVariableDeclarationStatementInfo(
declarationUsage, initializerExpression);
declarationStatement.setFromLine(fromLine);
declarationStatement.setFromColumn(fromColumn);
declarationStatement.setToLine(toLine);
declarationStatement.setToColumn(toColumn);
final UnresolvedLocalSpaceInfo<? extends LocalSpaceInfo> currentLocal = this.buildDataManager
.getCurrentLocalSpace();
if (null != currentLocal) {
currentLocal.addStatement(declarationStatement);
}
return declarationStatement;
}
| private UnresolvedVariableDeclarationStatementInfo buildVariableDeclarationStatement(
final UnresolvedLocalVariableUsageInfo declarationUsage,
final UnresolvedExpressionInfo<? extends ExpressionInfo> initializerExpression,
final int fromLine, final int fromColumn, final int toLine, final int toColumn) {
final UnresolvedVariableDeclarationStatementInfo declarationStatement = new UnresolvedVariableDeclarationStatementInfo(
declarationUsage, initializerExpression);
// FIXME: this is temporal patch. fix ANTLR grammar file
final int correctToLine = declarationUsage.getToLine();
final int correctToColumn = declarationUsage.getToColumn();
declarationStatement.setFromLine(fromLine);
declarationStatement.setFromColumn(fromColumn);
declarationStatement.setToLine(correctToLine);
declarationStatement.setToColumn(correctToColumn);
final UnresolvedLocalSpaceInfo<? extends LocalSpaceInfo> currentLocal = this.buildDataManager
.getCurrentLocalSpace();
if (null != currentLocal) {
currentLocal.addStatement(declarationStatement);
}
return declarationStatement;
}
|
diff --git a/src/gameEngine/GameEngineInterface.java b/src/gameEngine/GameEngineInterface.java
index ab25aa1..016b954 100644
--- a/src/gameEngine/GameEngineInterface.java
+++ b/src/gameEngine/GameEngineInterface.java
@@ -1,126 +1,126 @@
package gameEngine;
import java.util.Scanner;
import table.*;
import participant.Player;
import participant.Spectator;
import gui.MainInterface;
import storage.BlackjackStorage;
/**
* the GameEngine Interface displays the command line menu for the blackjack game
* @author Gabriel
*
*/
public class GameEngineInterface {
GameEngine gameEngine;
int menuChoice=-1;
final int PLAYROUND = 1;
final int ADDPLAYER = 2;
final int ADDSPECTATOR = 3;
final int SAVEGAME = 4;
final int LOADGAME = 5;
final int EXIT = 6;
/**
* Creates a new gameEngine object and calls its menu method
* @param ge The GameEngine which is to be displayed
*/
public GameEngineInterface(GameEngine ge) {
gameEngine = ge;
gameMenu();
}
/**
* GameMenu displays the different options that players have when playing blackjack.
* These include playing, adding players or spectators, and saving or loading games
*/
public void gameMenu() {
Scanner keyboard = new Scanner(System.in);
while (menuChoice != EXIT) {
System.out.println("-----Blackjack-----");
System.out.println("1. Play a round");
System.out.println("2. Add Player");
System.out.println("3. Add Spectator");
System.out.println("4. Save Game");
System.out.println("5. Load Game");
System.out.println("6. Exit");
menuChoice = keyboard.nextInt();
keyboard.nextLine();
if (menuChoice == PLAYROUND) {
gameEngine.gameStart();
}
if (menuChoice == ADDPLAYER) {
addPlayer();
}
if (menuChoice == ADDSPECTATOR) {
addSpectator();
}
if (menuChoice == SAVEGAME) {
- System.out.println("Choose a save slot number (1-9) :");
+ System.out.println("Input any number to save game :");
int saveNumber = keyboard.nextInt();
keyboard.nextLine();
try {
gameEngine.getTable().saveGame(gameEngine.getDeck(), saveNumber);
System.out.println("Save successful.");
} catch (Exception e) {
System.out.println("Save unsuccessful.");
}
}
if (menuChoice == LOADGAME) {
System.out.println("Choose a save slot number to load(1-9) :");
int saveNumber = keyboard.nextInt();
keyboard.nextLine();
try {
for (String username : BlackjackStorage.loadPlayerNames(saveNumber)) {
if (!username.equals(gameEngine.getTable().getTableOwner().getUsername())) {
addPlayer(username);
}
}
System.out.println("Load successful");
} catch (Exception e) {
System.out.println(e);
System.out.println("Could not load game");
}
}
}
}
/**
* AddPlayer validates a player's username and password from command line interface, and adds it
* to the gameEngine if the password is correct.
*/
public void addPlayer() {
Player newPlayer = MainInterface.login();
gameEngine.addPlayer(newPlayer);
}
/**
* addPlayer validate's a player's password from command line interface
* and adds the player to the gameEngine if the password is correct
* @param username The username to be added to the game (typically comes from loading player names (loadPlayerNames())
*/
public void addPlayer(String username) {
Scanner keyboard = new Scanner(System.in);
System.out.println("Please enter " + username + "'s password: ");
String password = keyboard.nextLine();
try {
Player playerToAdd = new Player(username, password);
gameEngine.addPlayer(playerToAdd);
} catch (Exception e) {
System.out.println("Could not add " + username);
}
}
/**
* Add spectators prompts a spectator to login with username and password,
* but does nothing for a single-screen, command-line based interface
*/
public void addSpectator() {
Player newPlayer = MainInterface.login();
System.out.println(newPlayer.getUsername() + " is now a Spectator");
}
}
| true | true | public void gameMenu() {
Scanner keyboard = new Scanner(System.in);
while (menuChoice != EXIT) {
System.out.println("-----Blackjack-----");
System.out.println("1. Play a round");
System.out.println("2. Add Player");
System.out.println("3. Add Spectator");
System.out.println("4. Save Game");
System.out.println("5. Load Game");
System.out.println("6. Exit");
menuChoice = keyboard.nextInt();
keyboard.nextLine();
if (menuChoice == PLAYROUND) {
gameEngine.gameStart();
}
if (menuChoice == ADDPLAYER) {
addPlayer();
}
if (menuChoice == ADDSPECTATOR) {
addSpectator();
}
if (menuChoice == SAVEGAME) {
System.out.println("Choose a save slot number (1-9) :");
int saveNumber = keyboard.nextInt();
keyboard.nextLine();
try {
gameEngine.getTable().saveGame(gameEngine.getDeck(), saveNumber);
System.out.println("Save successful.");
} catch (Exception e) {
System.out.println("Save unsuccessful.");
}
}
if (menuChoice == LOADGAME) {
System.out.println("Choose a save slot number to load(1-9) :");
int saveNumber = keyboard.nextInt();
keyboard.nextLine();
try {
for (String username : BlackjackStorage.loadPlayerNames(saveNumber)) {
if (!username.equals(gameEngine.getTable().getTableOwner().getUsername())) {
addPlayer(username);
}
}
System.out.println("Load successful");
} catch (Exception e) {
System.out.println(e);
System.out.println("Could not load game");
}
}
}
}
| public void gameMenu() {
Scanner keyboard = new Scanner(System.in);
while (menuChoice != EXIT) {
System.out.println("-----Blackjack-----");
System.out.println("1. Play a round");
System.out.println("2. Add Player");
System.out.println("3. Add Spectator");
System.out.println("4. Save Game");
System.out.println("5. Load Game");
System.out.println("6. Exit");
menuChoice = keyboard.nextInt();
keyboard.nextLine();
if (menuChoice == PLAYROUND) {
gameEngine.gameStart();
}
if (menuChoice == ADDPLAYER) {
addPlayer();
}
if (menuChoice == ADDSPECTATOR) {
addSpectator();
}
if (menuChoice == SAVEGAME) {
System.out.println("Input any number to save game :");
int saveNumber = keyboard.nextInt();
keyboard.nextLine();
try {
gameEngine.getTable().saveGame(gameEngine.getDeck(), saveNumber);
System.out.println("Save successful.");
} catch (Exception e) {
System.out.println("Save unsuccessful.");
}
}
if (menuChoice == LOADGAME) {
System.out.println("Choose a save slot number to load(1-9) :");
int saveNumber = keyboard.nextInt();
keyboard.nextLine();
try {
for (String username : BlackjackStorage.loadPlayerNames(saveNumber)) {
if (!username.equals(gameEngine.getTable().getTableOwner().getUsername())) {
addPlayer(username);
}
}
System.out.println("Load successful");
} catch (Exception e) {
System.out.println(e);
System.out.println("Could not load game");
}
}
}
}
|
diff --git a/src/main/java/org/bloodtorrent/resources/SuccessStoryResource.java b/src/main/java/org/bloodtorrent/resources/SuccessStoryResource.java
index e77d527..a53acad 100644
--- a/src/main/java/org/bloodtorrent/resources/SuccessStoryResource.java
+++ b/src/main/java/org/bloodtorrent/resources/SuccessStoryResource.java
@@ -1,26 +1,27 @@
package org.bloodtorrent.resources;
import org.bloodtorrent.IllegalDataException;
import org.bloodtorrent.repository.SuccessStoryRepository;
/**
* Created with IntelliJ IDEA.
* User: sds
* Date: 13. 3. 22
* Time: 오전 11:40
* To change this template use File | Settings | File Templates.
*/
public class SuccessStoryResource {
private final SuccessStoryRepository repository;
public SuccessStoryResource(SuccessStoryRepository repository) {
this.repository = repository;
}
public Integer numberOfStories() throws IllegalDataException {
int size = repository.list().size();
- if(size > 3)
+ if(size > 3) {
throw new IllegalDataException("At most 3 Success Stories should be shown.");
+ }
return size;
}
}
| false | true | public Integer numberOfStories() throws IllegalDataException {
int size = repository.list().size();
if(size > 3)
throw new IllegalDataException("At most 3 Success Stories should be shown.");
return size;
}
| public Integer numberOfStories() throws IllegalDataException {
int size = repository.list().size();
if(size > 3) {
throw new IllegalDataException("At most 3 Success Stories should be shown.");
}
return size;
}
|
diff --git a/main/src/jp/ac/osaka_u/ist/sel/metricstool/main/ast/statemanager/innerblock/SimpleBlockStateManager.java b/main/src/jp/ac/osaka_u/ist/sel/metricstool/main/ast/statemanager/innerblock/SimpleBlockStateManager.java
index 41579989..ec5a9e17 100644
--- a/main/src/jp/ac/osaka_u/ist/sel/metricstool/main/ast/statemanager/innerblock/SimpleBlockStateManager.java
+++ b/main/src/jp/ac/osaka_u/ist/sel/metricstool/main/ast/statemanager/innerblock/SimpleBlockStateManager.java
@@ -1,17 +1,17 @@
package jp.ac.osaka_u.ist.sel.metricstool.main.ast.statemanager.innerblock;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.token.AstToken;
import jp.ac.osaka_u.ist.sel.metricstool.main.ast.visitor.AstVisitEvent;
public class SimpleBlockStateManager extends InnerBlockStateManager {
@Override
protected boolean isDefinitionEvent(final AstVisitEvent event) {
AstToken parentToken = event.getParentToken();
return event.getToken().isBlock() && !parentToken.isBlockDefinition()
- && !parentToken.isSynchronized();
+ && !parentToken.isSynchronized() && !parentToken.isInstantiation();
}
}
| true | true | protected boolean isDefinitionEvent(final AstVisitEvent event) {
AstToken parentToken = event.getParentToken();
return event.getToken().isBlock() && !parentToken.isBlockDefinition()
&& !parentToken.isSynchronized();
}
| protected boolean isDefinitionEvent(final AstVisitEvent event) {
AstToken parentToken = event.getParentToken();
return event.getToken().isBlock() && !parentToken.isBlockDefinition()
&& !parentToken.isSynchronized() && !parentToken.isInstantiation();
}
|
diff --git a/modules/weblounge-contentrepository/src/main/java/ch/entwine/weblounge/contentrepository/impl/index/SearchIndex.java b/modules/weblounge-contentrepository/src/main/java/ch/entwine/weblounge/contentrepository/impl/index/SearchIndex.java
index 0be774646..386de359b 100644
--- a/modules/weblounge-contentrepository/src/main/java/ch/entwine/weblounge/contentrepository/impl/index/SearchIndex.java
+++ b/modules/weblounge-contentrepository/src/main/java/ch/entwine/weblounge/contentrepository/impl/index/SearchIndex.java
@@ -1,835 +1,835 @@
/*
* Weblounge: Web Content Management System
* Copyright (c) 2003 - 2011 The Weblounge Team
* http://entwinemedia.com/weblounge
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package ch.entwine.weblounge.contentrepository.impl.index;
import static ch.entwine.weblounge.contentrepository.impl.index.IndexSchema.ALTERNATE_VERSION;
import static ch.entwine.weblounge.contentrepository.impl.index.IndexSchema.VERSION;
import ch.entwine.weblounge.common.content.Resource;
import ch.entwine.weblounge.common.content.ResourceMetadata;
import ch.entwine.weblounge.common.content.ResourceSearchResultItem;
import ch.entwine.weblounge.common.content.ResourceURI;
import ch.entwine.weblounge.common.content.SearchQuery;
import ch.entwine.weblounge.common.content.SearchResult;
import ch.entwine.weblounge.common.content.SearchResultItem;
import ch.entwine.weblounge.common.impl.content.ResourceMetadataImpl;
import ch.entwine.weblounge.common.impl.content.SearchQueryImpl;
import ch.entwine.weblounge.common.impl.content.SearchResultImpl;
import ch.entwine.weblounge.common.repository.ContentRepositoryException;
import ch.entwine.weblounge.common.repository.ResourceSerializer;
import ch.entwine.weblounge.common.repository.ResourceSerializerService;
import ch.entwine.weblounge.common.site.Site;
import ch.entwine.weblounge.common.url.PathUtils;
import ch.entwine.weblounge.contentrepository.VersionedContentRepositoryIndex;
import ch.entwine.weblounge.contentrepository.impl.index.elasticsearch.ElasticSearchDocument;
import ch.entwine.weblounge.contentrepository.impl.index.elasticsearch.ElasticSearchSearchQuery;
import ch.entwine.weblounge.contentrepository.impl.index.elasticsearch.ElasticSearchUtils;
import ch.entwine.weblounge.contentrepository.impl.index.elasticsearch.SuggestRequest;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
import org.elasticsearch.action.admin.indices.exists.IndicesExistsRequest;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
import org.elasticsearch.action.bulk.BulkItemResponse;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.action.delete.DeleteRequestBuilder;
import org.elasticsearch.action.delete.DeleteResponse;
import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.node.Node;
import org.elasticsearch.node.NodeBuilder;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHitField;
import org.elasticsearch.search.sort.SortOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* A search index implementation based on ElasticSearch.
*/
public class SearchIndex implements VersionedContentRepositoryIndex {
/** Logging facility */
private static final Logger logger = LoggerFactory.getLogger(SearchIndex.class);
/** Identifier of the root entry */
public static final String ROOT_ID = "root";
/** Type of the document containing the index version information */
private static final String VERSION_TYPE = "version";
/** The local elastic search node */
private Node elasticSearch = null;
/** Client for talking to elastic search */
private Client nodeClient = null;
/** True if this is a read only index */
protected boolean isReadOnly = false;
/** The solr root */
protected File indexRoot = null;
/** The site */
protected Site site = null;
/** The version number */
protected int indexVersion = -1;
/** The resource serializer */
protected ResourceSerializerService resourceSerializer = null;
/**
* Creates a search index.
*
* @param site
* the site
* @param indexRoot
* the elastic search root directory
* @param serializer
* the resource serializer
* @param readOnly
* <code>true</code> to indicate a read only index
* @throws IOException
* if either loading or creating the index fails
*/
public SearchIndex(Site site, File indexRoot,
ResourceSerializerService serializer, boolean readOnly)
throws IOException {
this.site = site;
this.indexRoot = indexRoot;
this.resourceSerializer = serializer;
this.isReadOnly = readOnly;
try {
init(site, indexRoot);
} catch (Throwable t) {
throw new IOException("Error creating elastic search index", t);
}
}
/**
* Shuts down the elastic search index node.
*
* @throws IOException
* if stopping the index fails
*/
public void close() throws IOException {
try {
if (nodeClient != null)
nodeClient.close();
if (elasticSearch != null) {
elasticSearch.stop();
elasticSearch.close();
}
} catch (Throwable t) {
throw new IOException("Error stopping the elastic search node", t);
}
}
/**
* {@inheritDoc}
*
* @see ch.entwine.weblounge.contentrepository.VersionedContentRepositoryIndex#getIndexVersion()
*/
public int getIndexVersion() {
return indexVersion;
}
/**
* Makes a request and returns the result set.
*
* @param query
* the search query
* @return the result set
* @throws ContentRepositoryException
* if executing the search operation fails
*/
public SearchResult getByQuery(SearchQuery query)
throws ContentRepositoryException {
logger.debug("Searching index using query '{}'", query);
// See if the index version exists and check if it matches.
String indexName = query.getSite().getIdentifier();
SearchRequestBuilder requestBuilder = new SearchRequestBuilder(nodeClient);
requestBuilder.setIndices(indexName);
requestBuilder.setSearchType(SearchType.QUERY_THEN_FETCH);
requestBuilder.setPreference("_local");
// Create the actual search query
QueryBuilder queryBuilder = new ElasticSearchSearchQuery(query);
requestBuilder.setQuery(queryBuilder);
- logger.debug("Searching for {}", queryBuilder.toString());
+ logger.debug("Searching for {}", requestBuilder.toString());
// Make sure all fields are being returned
requestBuilder.addField("*");
// Restrict the scope to the given type
if (query.getTypes().length > 0) {
requestBuilder.setTypes(query.getTypes());
} else {
requestBuilder.setTypes("file", "image", "movie", "page");
}
// Pagination
if (query.getOffset() >= 0)
requestBuilder.setFrom(query.getOffset());
if (query.getLimit() >= 0)
requestBuilder.setSize(query.getLimit());
// Order by publishing date
if (!SearchQuery.Order.None.equals(query.getPublishingDateSortOrder())) {
switch (query.getPublishingDateSortOrder()) {
case Ascending:
requestBuilder.addSort(IndexSchema.PUBLISHED_FROM, SortOrder.ASC);
break;
case Descending:
requestBuilder.addSort(IndexSchema.PUBLISHED_FROM, SortOrder.DESC);
break;
case None:
default:
break;
}
}
// Order by modification date
else if (!SearchQuery.Order.None.equals(query.getModificationDateSortOrder())) {
switch (query.getModificationDateSortOrder()) {
case Ascending:
requestBuilder.addSort(IndexSchema.MODIFIED, SortOrder.ASC);
break;
case Descending:
requestBuilder.addSort(IndexSchema.MODIFIED, SortOrder.DESC);
break;
case None:
default:
break;
}
}
// Order by creation date
else if (!SearchQuery.Order.None.equals(query.getCreationDateSortOrder())) {
switch (query.getCreationDateSortOrder()) {
case Ascending:
requestBuilder.addSort(IndexSchema.CREATED, SortOrder.ASC);
break;
case Descending:
requestBuilder.addSort(IndexSchema.CREATED, SortOrder.DESC);
break;
case None:
default:
break;
}
}
// Order by score
// TODO: Order by score
// else {
// requestBuilder.addSort(IndexSchema.SCORE, SortOrder.DESC);
// }
try {
// Execute the query and try to get hold of a query response
SearchResponse response = null;
try {
response = nodeClient.search(requestBuilder.request()).actionGet();
} catch (Throwable t) {
throw new ContentRepositoryException(t);
}
// Create and configure the query result
long hits = response.getHits().getTotalHits();
long size = response.getHits().getHits().length;
SearchResultImpl result = new SearchResultImpl(query, hits, size);
result.setSearchTime(response.getTookInMillis());
// Walk through response and create new items with title, creator, etc:
for (SearchHit doc : response.getHits()) {
// Get the resource serializer
String type = doc.getType();
ResourceSerializer<?, ?> serializer = resourceSerializer.getSerializerByType(type);
if (serializer == null) {
logger.warn("Skipping search result due to missing serializer of type {}", type);
continue;
}
// Wrap the search result metadata
List<ResourceMetadata<?>> metadata = new ArrayList<ResourceMetadata<?>>(doc.getFields().size());
for (SearchHitField field : doc.getFields().values()) {
String name = field.getName();
ResourceMetadata<Object> m = new ResourceMetadataImpl<Object>(name);
// TODO: Add values with more care (localized, correct type etc.)
if (field.getValues().size() > 1) {
for (Object v : field.getValues()) {
m.addValue(v);
}
} else {
m.addValue(field.getValue());
}
metadata.add(m);
}
// Get the score for this item
float score = doc.getScore();
// Have the serializer in charge create a type-specific search result
// item
try {
SearchResultItem item = serializer.toSearchResultItem(query.getSite(), score, metadata);
result.addResultItem(item);
} catch (Throwable t) {
logger.warn("Error during search result serialization: '{}'. Skipping this search result.", t.getMessage());
continue;
}
}
return result;
} catch (Throwable t) {
throw new ContentRepositoryException("Error querying index", t);
}
}
/**
* Clears the search index.
*
* @throws IOException
* if clearing the index fails
*/
public void clear() throws IOException {
try {
DeleteIndexResponse delete = nodeClient.admin().indices().delete(new DeleteIndexRequest()).actionGet();
if (!delete.acknowledged())
logger.error("Indices could not be deleted");
createIndices();
} catch (Throwable t) {
throw new IOException("Cannot clear index", t);
}
}
/**
* Removes the entry with the given <code>id</code> from the database.
*
* @param resourceId
* identifier of the resource or resource
* @throws ContentRepositoryException
* if removing the resource from solr fails
*/
public boolean delete(ResourceURI uri) throws ContentRepositoryException {
logger.debug("Removing element with id '{}' from searching index", uri.getIdentifier());
String index = uri.getSite().getIdentifier();
String type = uri.getType();
String id = uri.getIdentifier();
DeleteRequestBuilder deleteRequest = nodeClient.prepareDelete(index, type, id);
deleteRequest.setRefresh(true);
DeleteResponse delete = deleteRequest.execute().actionGet();
if (delete.notFound()) {
logger.trace("Document {} to delete was not found", uri);
}
// Adjust the version information
updateVersions(uri);
return true;
}
/**
* Posts the resource to the search index.
*
* @param resource
* the resource to add to the index
* @throws ContentRepositoryException
* if posting the new resource to solr fails
*/
public boolean add(Resource<?> resource) throws ContentRepositoryException {
logger.debug("Adding resource {} to search index", resource);
addToIndex(resource);
return true;
}
/**
* Posts the updated resource to the search index.
*
* @param resource
* the resource to update
* @throws ContentRepositoryException
* if posting the updated resource to solr fails
*/
public boolean update(Resource<?> resource) throws ContentRepositoryException {
logger.debug("Updating resource {} in search index", resource);
addToIndex(resource);
return true;
}
/**
* Adds the given resource to the search index.
*
* @param resource
* the resource
* @throws ContentRepositoryException
* if updating fails
*/
private void addToIndex(Resource<?> resource)
throws ContentRepositoryException {
// Have the serializer create an input document
ResourceURI uri = resource.getURI();
String resourceType = uri.getType();
ResourceSerializer<?, ?> serializer = resourceSerializer.getSerializerByType(resourceType);
if (serializer == null)
throw new ContentRepositoryException("Unable to create an input document for " + resource + ": no serializer found");
// Add the resource to the index
List<ResourceMetadata<?>> resourceMetadata = serializer.toMetadata(resource);
ElasticSearchDocument doc = new ElasticSearchDocument(uri, resourceMetadata);
try {
update(doc);
} catch (Throwable t) {
throw new ContentRepositoryException("Cannot write resource " + resource + " to index", t);
}
// Adjust the version information
updateVersions(uri);
}
/**
* Aligns the information on alternate resource versions in the search index,
* which is needed to support querying by preferred version.
*
* @param uri
* uri of the resource to update
* @throws ContentRepositoryException
* if updating fails
*/
private void updateVersions(ResourceURI uri)
throws ContentRepositoryException {
String resourceType = uri.getType();
ResourceSerializer<?, ?> serializer = resourceSerializer.getSerializerByType(resourceType);
if (serializer == null)
throw new ContentRepositoryException("Unable to create an input document for " + uri + ": no serializer found");
// List all versions of the resource
List<Resource<?>> resources = new ArrayList<Resource<?>>();
Site site = uri.getSite();
String id = uri.getIdentifier();
SearchQuery q = new SearchQueryImpl(site).withIdentifier(id);
for (SearchResultItem existingResource : getByQuery(q).getItems()) {
List<ResourceMetadata<?>> resourceMetadata = ((ResourceSearchResultItem) existingResource).getMetadata();
resources.add(serializer.toResource(site, resourceMetadata));
}
if (resources.size() == 0)
return;
// Add the alternate version information to each resource's metadata and
// write it back to the search index (including the new one)
List<ElasticSearchDocument> documents = new ArrayList<ElasticSearchDocument>();
for (Resource<?> r : resources) {
List<ResourceMetadata<?>> resourceMetadata = serializer.toMetadata(r);
ResourceMetadataImpl<Long> alternateVersions = new ResourceMetadataImpl<Long>(ALTERNATE_VERSION);
alternateVersions.setAddToFulltext(false);
// Look for alternate versions
long currentVersion = r.getURI().getVersion();
for (Resource<?> v : resources) {
long version = v.getURI().getVersion();
if (version != currentVersion) {
alternateVersions.addValue(version);
}
}
// If alternate versions were found, add them
if (alternateVersions.getValues().size() > 0) {
resourceMetadata.add(alternateVersions);
}
// Write the resource to the index
documents.add(new ElasticSearchDocument(r.getURI(), resourceMetadata));
}
// Now update all documents at once
try {
update(documents.toArray(new ElasticSearchDocument[documents.size()]));
} catch (Throwable t) {
throw new ContentRepositoryException("Cannot update versions of resource " + uri + " in index", t);
}
}
/**
* Posts the input document to the search index.
*
* @param site
* the site that these documents belong to
* @param documents
* the input documents
* @return the query response
* @throws ContentRepositoryException
* if posting to the index fails
*/
protected BulkResponse update(ElasticSearchDocument... documents)
throws ContentRepositoryException {
BulkRequestBuilder bulkRequest = nodeClient.prepareBulk();
for (ElasticSearchDocument doc : documents) {
String index = doc.getSite().getIdentifier();
String type = doc.getType();
String id = doc.getIdentifier();
bulkRequest.add(nodeClient.prepareIndex(index, type, id).setSource(doc));
}
// Make sure the operations are searchable immediately
bulkRequest.setRefresh(true);
try {
BulkResponse bulkResponse = bulkRequest.execute().actionGet();
// Check for errors
if (bulkResponse.hasFailures()) {
for (BulkItemResponse item : bulkResponse.items()) {
if (item.isFailed()) {
logger.warn("Error updating {}: {}", item, item.failureMessage());
throw new ContentRepositoryException(item.getFailureMessage());
}
}
}
return bulkResponse;
} catch (Throwable t) {
throw new ContentRepositoryException("Cannot update documents in index", t);
}
}
/**
* Move the resource identified by <code>uri</code> to the new location.
*
* @param uri
* the resource uri
* @param path
* the new path
* @return
*/
public boolean move(ResourceURI uri, String path)
throws ContentRepositoryException {
logger.debug("Updating path {} in search index to ", uri.getPath(), path);
SearchQuery q = new SearchQueryImpl(uri.getSite()).withVersion(uri.getVersion()).withIdentifier(uri.getIdentifier());
SearchResultItem[] searchResult = getByQuery(q).getItems();
if (searchResult.length != 1) {
logger.warn("Resource to be moved not found: {}", uri);
return false;
}
// Have the serializer create an input document
String resourceType = uri.getType();
ResourceSerializer<?, ?> serializer = resourceSerializer.getSerializerByType(resourceType);
if (serializer == null) {
logger.error("Unable to create an input document for {}: no serializer found", uri);
return false;
}
// Prepare the search metadata as a map, keep a reference to the path
List<ResourceMetadata<?>> metadata = ((ResourceSearchResultItem) searchResult[0]).getMetadata();
Map<String, ResourceMetadata<?>> metadataMap = new HashMap<String, ResourceMetadata<?>>();
for (ResourceMetadata<?> m : metadata) {
metadataMap.put(m.getName(), m);
}
// Add the updated metadata, keep the rest
Resource<?> resource = serializer.toResource(uri.getSite(), metadata);
resource.setPath(path);
for (ResourceMetadata<?> m : serializer.toMetadata(resource)) {
metadataMap.put(m.getName(), m);
}
metadata = new ArrayList<ResourceMetadata<?>>(metadataMap.values());
// Read the current resource and post the updated data to the search
// index
try {
update(new ElasticSearchDocument(resource.getURI(), metadata));
return true;
} catch (Throwable t) {
throw new ContentRepositoryException("Cannot update resource " + uri + " in index", t);
}
}
/**
* Returns the suggestions as returned from the selected dictionary based on
* <code>seed</code>.
*
* @param dictionary
* the dictionary
* @param seed
* the seed used for suggestions
* @param onlyMorePopular
* whether to return only more popular results
* @param count
* the maximum number of suggestions
* @param collate
* whether to provide a query collated with the first matching
* suggestion
*/
public List<String> suggest(String dictionary, String seed,
boolean onlyMorePopular, int count, boolean collate)
throws ContentRepositoryException {
if (StringUtils.isBlank(seed))
throw new IllegalArgumentException("Seed must not be blank");
if (StringUtils.isBlank(dictionary))
throw new IllegalArgumentException("Dictionary must not be blank");
SuggestRequest request = null;
// TODO: Implement
// SuggestRequest request = new SuggestRequest(solrServer, dictionary,
// onlyMorePopular, count, collate);
try {
return request.getSuggestions(seed);
} catch (Throwable t) {
throw new ContentRepositoryException(t);
}
}
/**
* Tries to load solr from the specified directory. If that directory is not
* there, or in the case where either one of solr configuration or data
* directory is missing, a preceding call to <code>initSolr()</code> is made.
*
* @param indexRoot
* the solr root directory
* @throws Exception
* if loading or creating solr fails
*/
private void init(Site site, File indexRoot) throws Exception {
logger.debug("Setting up elastic search index at {}", indexRoot);
// Prepare the configuration of the elastic search node
Settings settings = loadSettings();
// Configure and start the elastic search node
NodeBuilder nodeBuilder = NodeBuilder.nodeBuilder().settings(settings);
elasticSearch = nodeBuilder.build();
elasticSearch.start();
// Create indices and type definitions
createIndices();
}
/**
* Prepares elastic search to take Weblounge data.
*
* @throws ContentRepositoryException
* if index and type creation fails
* @throws IOException
* if loading of the type definitions fails
*/
private void createIndices() throws ContentRepositoryException, IOException {
// Create the client
nodeClient = elasticSearch.client();
// Make sure the site index exists
if (!indexExists(site.getIdentifier())) {
CreateIndexRequestBuilder siteIdxRequest = nodeClient.admin().indices().prepareCreate(site.getIdentifier());
logger.info("Creating site index for '{}'", site.getIdentifier());
CreateIndexResponse siteidxResponse = siteIdxRequest.execute().actionGet();
if (!siteidxResponse.acknowledged()) {
throw new ContentRepositoryException("Unable to create site index for '" + site.getIdentifier() + "'");
}
}
// Store the correct mapping
// TODO: Use resource serializers
for (String type : new String[] {
"version",
"page",
"file",
"image",
"movie" }) {
PutMappingRequest siteMappingRequest = new PutMappingRequest(site.getIdentifier());
siteMappingRequest.source(loadMapping(type));
siteMappingRequest.type(type);
PutMappingResponse siteMappingResponse = nodeClient.admin().indices().putMapping(siteMappingRequest).actionGet();
if (!siteMappingResponse.acknowledged()) {
throw new ContentRepositoryException("Unable to install '" + type + "' mapping for index '" + site.getIdentifier() + "'");
}
}
// See if the index version exists and check if it matches. The request will
// fail if there is no version index
boolean versionIndexExists = false;
GetRequestBuilder getRequestBuilder = nodeClient.prepareGet(site.getIdentifier(), VERSION_TYPE, ROOT_ID);
try {
GetResponse response = getRequestBuilder.execute().actionGet();
if (response.field(VERSION) != null) {
indexVersion = Integer.parseInt((String) response.field(VERSION).getValue());
versionIndexExists = true;
logger.debug("Search index version is {}", indexVersion);
}
} catch (ElasticSearchException e) {
logger.debug("Version index has not been created");
}
// The index does not exist, let's create it
if (!versionIndexExists) {
indexVersion = VersionedContentRepositoryIndex.INDEX_VERSION;
logger.debug("Creating version index for site '{}'", site.getIdentifier());
IndexRequestBuilder requestBuilder = nodeClient.prepareIndex(site.getIdentifier(), VERSION_TYPE, ROOT_ID);
logger.debug("Index version of site '{}' is {}", site.getIdentifier(), indexVersion);
requestBuilder = requestBuilder.setSource(VERSION, Integer.toString(indexVersion));
requestBuilder.execute().actionGet();
}
}
/**
* Loads the settings for the elastic search configuration. An initial attempt
* is made to get the configuration from
* <code>${weblounge.home}/etc/index/settings.yml</code>.
*
* @return the elastic search settings
* @throws IOException
* if the index cannot be created in case it is not there already
*/
private Settings loadSettings() throws IOException {
Settings settings = null;
// Try to determine the default index location
String webloungeHome = System.getProperty("weblounge.home");
if (StringUtils.isBlank(webloungeHome)) {
logger.warn("Unable to locate elasticsearch settings, weblounge.home not specified");
webloungeHome = new File(System.getProperty("java.io.tmpdir")).getAbsolutePath();
}
// Check if a local configuration file is present
File configFile = new File(PathUtils.concat(webloungeHome, "/etc/index/settings.yml"));
if (!configFile.isFile()) {
logger.warn("Configuring elastic search node from the bundle resources");
ElasticSearchUtils.createIndexConfigurationAt(new File(webloungeHome));
}
// Finally, try and load the index settings
FileInputStream fis = null;
try {
fis = new FileInputStream(configFile);
settings = ImmutableSettings.settingsBuilder().loadFromStream(configFile.getName(), fis).build();
} catch (FileNotFoundException e) {
throw new IOException("Unable to load elasticsearch settings from " + configFile.getAbsolutePath());
} finally {
IOUtils.closeQuietly(fis);
}
return settings;
}
/**
* Loads the mapping configuration. An initial attempt is made to get the
* configuration from
* <code>${weblounge.home}/etc/index/<index name>-mapping.json</code>.
* If this file can't be found, the default mapping loaded from the classpath.
*
* @param idxName
* name of the index
* @return the string containing the configuration
* @throws IOException
* if reading the index mapping fails
*/
private String loadMapping(String idxName) throws IOException {
String mapping = null;
// First, check if a local configuration file is present
String webloungeHome = System.getProperty("weblounge.home");
if (StringUtils.isNotBlank(webloungeHome)) {
File configFile = new File(PathUtils.concat(webloungeHome, "/etc/index/", idxName + "-mapping.json"));
if (configFile.isFile()) {
FileInputStream fis = null;
try {
fis = new FileInputStream(configFile);
mapping = IOUtils.toString(fis);
} catch (IOException e) {
logger.warn("Unable to load index mapping from {}: {}", configFile.getAbsolutePath(), e.getMessage());
} finally {
IOUtils.closeQuietly(fis);
}
}
} else {
logger.warn("Unable to locate elasticsearch settings, weblounge.home not specified");
}
// If no local settings were found, read them from the bundle resources
if (mapping == null) {
InputStream is = null;
String resourcePath = PathUtils.concat("/elasticsearch/", idxName + "-mapping.json");
try {
is = this.getClass().getResourceAsStream(resourcePath);
if (is != null) {
logger.debug("Reading elastic search index mapping '{}' from the bundle resource", idxName);
mapping = IOUtils.toString(is);
}
} finally {
IOUtils.closeQuietly(is);
}
}
return mapping;
}
/**
* Returns <code>true</code> if the given index exists.
*
* @param indexName
* the index name
* @return <code>true</code> if the index exists
*/
private boolean indexExists(String indexName) {
IndicesExistsRequest indexExistsRequest = new IndicesExistsRequest(indexName);
return nodeClient.admin().indices().exists(indexExistsRequest).actionGet().exists();
}
}
| true | true | public SearchResult getByQuery(SearchQuery query)
throws ContentRepositoryException {
logger.debug("Searching index using query '{}'", query);
// See if the index version exists and check if it matches.
String indexName = query.getSite().getIdentifier();
SearchRequestBuilder requestBuilder = new SearchRequestBuilder(nodeClient);
requestBuilder.setIndices(indexName);
requestBuilder.setSearchType(SearchType.QUERY_THEN_FETCH);
requestBuilder.setPreference("_local");
// Create the actual search query
QueryBuilder queryBuilder = new ElasticSearchSearchQuery(query);
requestBuilder.setQuery(queryBuilder);
logger.debug("Searching for {}", queryBuilder.toString());
// Make sure all fields are being returned
requestBuilder.addField("*");
// Restrict the scope to the given type
if (query.getTypes().length > 0) {
requestBuilder.setTypes(query.getTypes());
} else {
requestBuilder.setTypes("file", "image", "movie", "page");
}
// Pagination
if (query.getOffset() >= 0)
requestBuilder.setFrom(query.getOffset());
if (query.getLimit() >= 0)
requestBuilder.setSize(query.getLimit());
// Order by publishing date
if (!SearchQuery.Order.None.equals(query.getPublishingDateSortOrder())) {
switch (query.getPublishingDateSortOrder()) {
case Ascending:
requestBuilder.addSort(IndexSchema.PUBLISHED_FROM, SortOrder.ASC);
break;
case Descending:
requestBuilder.addSort(IndexSchema.PUBLISHED_FROM, SortOrder.DESC);
break;
case None:
default:
break;
}
}
// Order by modification date
else if (!SearchQuery.Order.None.equals(query.getModificationDateSortOrder())) {
switch (query.getModificationDateSortOrder()) {
case Ascending:
requestBuilder.addSort(IndexSchema.MODIFIED, SortOrder.ASC);
break;
case Descending:
requestBuilder.addSort(IndexSchema.MODIFIED, SortOrder.DESC);
break;
case None:
default:
break;
}
}
// Order by creation date
else if (!SearchQuery.Order.None.equals(query.getCreationDateSortOrder())) {
switch (query.getCreationDateSortOrder()) {
case Ascending:
requestBuilder.addSort(IndexSchema.CREATED, SortOrder.ASC);
break;
case Descending:
requestBuilder.addSort(IndexSchema.CREATED, SortOrder.DESC);
break;
case None:
default:
break;
}
}
// Order by score
// TODO: Order by score
// else {
// requestBuilder.addSort(IndexSchema.SCORE, SortOrder.DESC);
// }
try {
// Execute the query and try to get hold of a query response
SearchResponse response = null;
try {
response = nodeClient.search(requestBuilder.request()).actionGet();
} catch (Throwable t) {
throw new ContentRepositoryException(t);
}
// Create and configure the query result
long hits = response.getHits().getTotalHits();
long size = response.getHits().getHits().length;
SearchResultImpl result = new SearchResultImpl(query, hits, size);
result.setSearchTime(response.getTookInMillis());
// Walk through response and create new items with title, creator, etc:
for (SearchHit doc : response.getHits()) {
// Get the resource serializer
String type = doc.getType();
ResourceSerializer<?, ?> serializer = resourceSerializer.getSerializerByType(type);
if (serializer == null) {
logger.warn("Skipping search result due to missing serializer of type {}", type);
continue;
}
// Wrap the search result metadata
List<ResourceMetadata<?>> metadata = new ArrayList<ResourceMetadata<?>>(doc.getFields().size());
for (SearchHitField field : doc.getFields().values()) {
String name = field.getName();
ResourceMetadata<Object> m = new ResourceMetadataImpl<Object>(name);
// TODO: Add values with more care (localized, correct type etc.)
if (field.getValues().size() > 1) {
for (Object v : field.getValues()) {
m.addValue(v);
}
} else {
m.addValue(field.getValue());
}
metadata.add(m);
}
// Get the score for this item
float score = doc.getScore();
// Have the serializer in charge create a type-specific search result
// item
try {
SearchResultItem item = serializer.toSearchResultItem(query.getSite(), score, metadata);
result.addResultItem(item);
} catch (Throwable t) {
logger.warn("Error during search result serialization: '{}'. Skipping this search result.", t.getMessage());
continue;
}
}
return result;
} catch (Throwable t) {
throw new ContentRepositoryException("Error querying index", t);
}
}
| public SearchResult getByQuery(SearchQuery query)
throws ContentRepositoryException {
logger.debug("Searching index using query '{}'", query);
// See if the index version exists and check if it matches.
String indexName = query.getSite().getIdentifier();
SearchRequestBuilder requestBuilder = new SearchRequestBuilder(nodeClient);
requestBuilder.setIndices(indexName);
requestBuilder.setSearchType(SearchType.QUERY_THEN_FETCH);
requestBuilder.setPreference("_local");
// Create the actual search query
QueryBuilder queryBuilder = new ElasticSearchSearchQuery(query);
requestBuilder.setQuery(queryBuilder);
logger.debug("Searching for {}", requestBuilder.toString());
// Make sure all fields are being returned
requestBuilder.addField("*");
// Restrict the scope to the given type
if (query.getTypes().length > 0) {
requestBuilder.setTypes(query.getTypes());
} else {
requestBuilder.setTypes("file", "image", "movie", "page");
}
// Pagination
if (query.getOffset() >= 0)
requestBuilder.setFrom(query.getOffset());
if (query.getLimit() >= 0)
requestBuilder.setSize(query.getLimit());
// Order by publishing date
if (!SearchQuery.Order.None.equals(query.getPublishingDateSortOrder())) {
switch (query.getPublishingDateSortOrder()) {
case Ascending:
requestBuilder.addSort(IndexSchema.PUBLISHED_FROM, SortOrder.ASC);
break;
case Descending:
requestBuilder.addSort(IndexSchema.PUBLISHED_FROM, SortOrder.DESC);
break;
case None:
default:
break;
}
}
// Order by modification date
else if (!SearchQuery.Order.None.equals(query.getModificationDateSortOrder())) {
switch (query.getModificationDateSortOrder()) {
case Ascending:
requestBuilder.addSort(IndexSchema.MODIFIED, SortOrder.ASC);
break;
case Descending:
requestBuilder.addSort(IndexSchema.MODIFIED, SortOrder.DESC);
break;
case None:
default:
break;
}
}
// Order by creation date
else if (!SearchQuery.Order.None.equals(query.getCreationDateSortOrder())) {
switch (query.getCreationDateSortOrder()) {
case Ascending:
requestBuilder.addSort(IndexSchema.CREATED, SortOrder.ASC);
break;
case Descending:
requestBuilder.addSort(IndexSchema.CREATED, SortOrder.DESC);
break;
case None:
default:
break;
}
}
// Order by score
// TODO: Order by score
// else {
// requestBuilder.addSort(IndexSchema.SCORE, SortOrder.DESC);
// }
try {
// Execute the query and try to get hold of a query response
SearchResponse response = null;
try {
response = nodeClient.search(requestBuilder.request()).actionGet();
} catch (Throwable t) {
throw new ContentRepositoryException(t);
}
// Create and configure the query result
long hits = response.getHits().getTotalHits();
long size = response.getHits().getHits().length;
SearchResultImpl result = new SearchResultImpl(query, hits, size);
result.setSearchTime(response.getTookInMillis());
// Walk through response and create new items with title, creator, etc:
for (SearchHit doc : response.getHits()) {
// Get the resource serializer
String type = doc.getType();
ResourceSerializer<?, ?> serializer = resourceSerializer.getSerializerByType(type);
if (serializer == null) {
logger.warn("Skipping search result due to missing serializer of type {}", type);
continue;
}
// Wrap the search result metadata
List<ResourceMetadata<?>> metadata = new ArrayList<ResourceMetadata<?>>(doc.getFields().size());
for (SearchHitField field : doc.getFields().values()) {
String name = field.getName();
ResourceMetadata<Object> m = new ResourceMetadataImpl<Object>(name);
// TODO: Add values with more care (localized, correct type etc.)
if (field.getValues().size() > 1) {
for (Object v : field.getValues()) {
m.addValue(v);
}
} else {
m.addValue(field.getValue());
}
metadata.add(m);
}
// Get the score for this item
float score = doc.getScore();
// Have the serializer in charge create a type-specific search result
// item
try {
SearchResultItem item = serializer.toSearchResultItem(query.getSite(), score, metadata);
result.addResultItem(item);
} catch (Throwable t) {
logger.warn("Error during search result serialization: '{}'. Skipping this search result.", t.getMessage());
continue;
}
}
return result;
} catch (Throwable t) {
throw new ContentRepositoryException("Error querying index", t);
}
}
|
diff --git a/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java b/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
index a0b78975c..56b2bcca8 100644
--- a/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
+++ b/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
@@ -1,1330 +1,1330 @@
/*
* IronJacamar, a Java EE Connector Architecture implementation
* Copyright 2012, Red Hat Inc, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software 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 software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.jca.common.annotations;
import org.jboss.jca.common.CommonBundle;
import org.jboss.jca.common.CommonLogger;
import org.jboss.jca.common.api.metadata.common.TransactionSupportEnum;
import org.jboss.jca.common.api.metadata.ra.AdminObject;
import org.jboss.jca.common.api.metadata.ra.AuthenticationMechanism;
import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.common.api.metadata.ra.ConnectionDefinition;
import org.jboss.jca.common.api.metadata.ra.Connector;
import org.jboss.jca.common.api.metadata.ra.Connector.Version;
import org.jboss.jca.common.api.metadata.ra.CredentialInterfaceEnum;
import org.jboss.jca.common.api.metadata.ra.Icon;
import org.jboss.jca.common.api.metadata.ra.InboundResourceAdapter;
import org.jboss.jca.common.api.metadata.ra.LicenseType;
import org.jboss.jca.common.api.metadata.ra.LocalizedXsdString;
import org.jboss.jca.common.api.metadata.ra.MessageListener;
import org.jboss.jca.common.api.metadata.ra.OutboundResourceAdapter;
import org.jboss.jca.common.api.metadata.ra.RequiredConfigProperty;
import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516;
import org.jboss.jca.common.api.metadata.ra.SecurityPermission;
import org.jboss.jca.common.api.metadata.ra.XsdString;
import org.jboss.jca.common.api.metadata.ra.ra16.Activationspec16;
import org.jboss.jca.common.api.metadata.ra.ra16.ConfigProperty16;
import org.jboss.jca.common.api.metadata.ra.ra16.Connector16;
import org.jboss.jca.common.api.validator.ValidateException;
import org.jboss.jca.common.metadata.ra.common.AdminObjectImpl;
import org.jboss.jca.common.metadata.ra.common.AuthenticationMechanismImpl;
import org.jboss.jca.common.metadata.ra.common.ConnectionDefinitionImpl;
import org.jboss.jca.common.metadata.ra.common.InboundResourceAdapterImpl;
import org.jboss.jca.common.metadata.ra.common.MessageAdapterImpl;
import org.jboss.jca.common.metadata.ra.common.MessageListenerImpl;
import org.jboss.jca.common.metadata.ra.common.OutboundResourceAdapterImpl;
import org.jboss.jca.common.metadata.ra.common.ResourceAdapter1516Impl;
import org.jboss.jca.common.metadata.ra.common.SecurityPermissionImpl;
import org.jboss.jca.common.metadata.ra.ra16.Activationspec16Impl;
import org.jboss.jca.common.metadata.ra.ra16.ConfigProperty16Impl;
import org.jboss.jca.common.metadata.ra.ra16.Connector16Impl;
import org.jboss.jca.common.spi.annotations.repository.Annotation;
import org.jboss.jca.common.spi.annotations.repository.AnnotationRepository;
import java.io.Externalizable;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
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 javax.resource.spi.Activation;
import javax.resource.spi.AdministeredObject;
import javax.resource.spi.ConnectionDefinitions;
import javax.resource.spi.TransactionSupport;
import javax.resource.spi.work.WorkContext;
import org.jboss.logging.Logger;
import org.jboss.logging.Messages;
/**
* The annotation processor for JCA 1.6
* @author <a href="mailto:[email protected]">Jesper Pedersen</a>
* @author <a href="mailto:[email protected]">Jeff Zhang</a>
*/
public class Annotations
{
private static CommonBundle bundle = Messages.getBundle(CommonBundle.class);
private static CommonLogger log = Logger.getMessageLogger(CommonLogger.class, Annotations.class.getName());
private static boolean trace = log.isTraceEnabled();
private enum Metadatas
{
RA, ACTIVATION_SPEC, MANAGED_CONN_FACTORY, ADMIN_OBJECT, PLAIN;
};
/**
* Constructor
*/
public Annotations()
{
}
/**
* Scan for annotations in the URLs specified
* @param connector The connector adapter metadata
* @param annotationRepository annotationRepository to use
* @param classLoader The class loader used to generate the repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
public Connector merge(Connector connector, AnnotationRepository annotationRepository, ClassLoader classLoader)
throws Exception
{
// Process annotations
if (connector == null || connector.getVersion() == Version.V_16)
{
boolean isMetadataComplete = false;
if (connector != null && connector instanceof Connector16)
{
isMetadataComplete = ((Connector16) connector).isMetadataComplete();
}
if (connector == null || !isMetadataComplete)
{
if (connector == null)
{
Connector annotationsConnector = process(annotationRepository, null, classLoader);
connector = annotationsConnector;
}
else
{
Connector annotationsConnector = process(annotationRepository,
((ResourceAdapter1516) connector.getResourceadapter()).getResourceadapterClass(),
classLoader);
connector = connector.merge(annotationsConnector);
}
}
}
return connector;
}
/**
* Process annotations
* @param annotationRepository The annotation repository
* @param xmlResourceAdapterClass resource adpater class name as define in xml
* @param classLoader The class loader used to generate the repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
public Connector process(AnnotationRepository annotationRepository, String xmlResourceAdapterClass,
ClassLoader classLoader)
throws Exception
{
if (annotationRepository == null)
throw new ValidateException(bundle.annotationRepositoryNull());
/* Process
-------
javax.resource.spi.Activation
javax.resource.spi.AdministeredObject
javax.resource.spi.AuthenticationMechanism
javax.resource.spi.ConfigProperty
javax.resource.spi.ConnectionDefinition
javax.resource.spi.ConnectionDefinitions
javax.resource.spi.Connector
javax.resource.spi.SecurityPermission
*/
// @ConfigProperty
Map<Metadatas, ArrayList<ConfigProperty16>> configPropertiesMap =
processConfigProperty(annotationRepository, classLoader);
// @ConnectionDefinitions
ArrayList<ConnectionDefinition> connectionDefinitions =
processConnectionDefinitions(annotationRepository, classLoader,
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.MANAGED_CONN_FACTORY),
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.PLAIN));
// @ConnectionDefinition (outside of @ConnectionDefinitions)
if (connectionDefinitions == null)
{
connectionDefinitions = new ArrayList<ConnectionDefinition>(1);
}
ArrayList<ConnectionDefinition> definitions =
processConnectionDefinition(annotationRepository, classLoader,
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.MANAGED_CONN_FACTORY),
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.PLAIN));
if (definitions != null)
connectionDefinitions.addAll(definitions);
connectionDefinitions.trimToSize();
// @Activation
InboundResourceAdapter inboundRA =
processActivation(annotationRepository, classLoader,
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.ACTIVATION_SPEC),
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.PLAIN));
// @AdministeredObject
ArrayList<AdminObject> adminObjs =
processAdministeredObject(annotationRepository, classLoader,
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.ADMIN_OBJECT),
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.PLAIN));
// @Connector
Connector conn = processConnector(annotationRepository, classLoader, xmlResourceAdapterClass,
connectionDefinitions, configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.RA),
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.PLAIN),
inboundRA, adminObjs);
return conn;
}
/**
* Process: @Connector
* @param annotationRepository The annotation repository
* @param classLoader The class loader
* @param xmlResourceAdapterClass resource adpater class name as define in xml
* @param connectionDefinitions
* @param configProperties
* @param plainConfigProperties
* @param inboundResourceadapter
* @param adminObjs
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private Connector processConnector(AnnotationRepository annotationRepository, ClassLoader classLoader,
String xmlResourceAdapterClass,
ArrayList<ConnectionDefinition> connectionDefinitions,
ArrayList<ConfigProperty16> configProperties,
ArrayList<ConfigProperty16> plainConfigProperties,
InboundResourceAdapter inboundResourceadapter,
ArrayList<AdminObject> adminObjs)
throws Exception
{
Connector connector = null;
Collection<Annotation> values = annotationRepository.getAnnotation(javax.resource.spi.Connector.class);
if (values != null)
{
if (values.size() == 1)
{
Annotation annotation = values.iterator().next();
String raClass = annotation.getClassName();
javax.resource.spi.Connector connectorAnnotation = (javax.resource.spi.Connector)annotation.getAnnotation();
if (trace)
log.trace("Processing: " + connectorAnnotation + " for " + raClass);
connector = attachConnector(raClass, classLoader, connectorAnnotation, connectionDefinitions,
configProperties, plainConfigProperties, inboundResourceadapter, adminObjs);
}
else if (values.size() == 0)
{
// JBJCA-240
if (xmlResourceAdapterClass == null || xmlResourceAdapterClass.equals(""))
{
log.noConnector();
throw new ValidateException(bundle.noConnectorDefined());
}
}
else
{
// JBJCA-240
if (xmlResourceAdapterClass == null || xmlResourceAdapterClass.equals(""))
{
log.moreThanOneConnector();
throw new ValidateException(bundle.moreThanOneConnectorDefined());
}
}
}
else
{
connector = attachConnector(xmlResourceAdapterClass, classLoader, null, connectionDefinitions, null, null,
inboundResourceadapter, adminObjs);
}
return connector;
}
/**
* Attach @Connector
* @param raClass The class name for the resource adapter
* @param classLoader The class loader
* @param conAnnotation The connector
* @param connectionDefinitions connectionDefinitions
* @param configProperties configProperties
* @param plainConfigProperties plainConfigProperties
* @param inboundResourceadapter inboundResourceadapter
* @param adminObjs
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private Connector attachConnector(String raClass, ClassLoader classLoader,
javax.resource.spi.Connector conAnnotation,
ArrayList<ConnectionDefinition> connectionDefinitions,
ArrayList<ConfigProperty16> configProperties,
ArrayList<ConfigProperty16> plainConfigProperties,
InboundResourceAdapter inboundResourceadapter,
ArrayList<AdminObject> adminObjs)
throws Exception
{
// Vendor name
XsdString vendorName = null;
if (conAnnotation != null)
vendorName = new XsdString(conAnnotation.vendorName(), null);
// Description
ArrayList<LocalizedXsdString> descriptions = null;
if (conAnnotation != null && conAnnotation.description() != null && conAnnotation.description().length != 0)
{
descriptions = new ArrayList<LocalizedXsdString>(conAnnotation.description().length);
for (String descriptionAnnoptation : conAnnotation.description())
{
descriptions.add(new LocalizedXsdString(descriptionAnnoptation, null));
}
}
// Display name
ArrayList<LocalizedXsdString> displayNames = null;
- if (conAnnotation != null && conAnnotation.description() != null && conAnnotation.displayName().length != 0)
+ if (conAnnotation != null && conAnnotation.displayName() != null && conAnnotation.displayName().length != 0)
{
displayNames = new ArrayList<LocalizedXsdString>(conAnnotation.displayName().length);
for (String displayNameAnnotation : conAnnotation.displayName())
{
displayNames.add(new LocalizedXsdString(displayNameAnnotation, null));
}
}
// EIS type
XsdString eisType = null;
if (conAnnotation != null)
eisType = new XsdString(conAnnotation.eisType(), null);
// License description
// License required
ArrayList<LocalizedXsdString> licenseDescriptions = null;
if (conAnnotation != null && conAnnotation.licenseDescription() != null &&
conAnnotation.licenseDescription().length != 0)
{
licenseDescriptions = new ArrayList<LocalizedXsdString>(conAnnotation.licenseDescription().length);
for (String licenseDescriptionAnnotation : conAnnotation.licenseDescription())
{
licenseDescriptions.add(new LocalizedXsdString(licenseDescriptionAnnotation, null));
}
}
LicenseType license = null;
if (conAnnotation != null)
license = new LicenseType(licenseDescriptions, conAnnotation.licenseRequired(), null);
// RequiredWorkContext
ArrayList<String> requiredWorkContexts = null;
Class<? extends WorkContext>[] requiredWorkContextAnnotations = null;
if (conAnnotation != null)
requiredWorkContextAnnotations = conAnnotation.requiredWorkContexts();
if (requiredWorkContextAnnotations != null)
{
requiredWorkContexts = new ArrayList<String>(requiredWorkContextAnnotations.length);
for (Class<? extends WorkContext> requiredWorkContext : requiredWorkContextAnnotations)
{
if (!requiredWorkContexts.contains(requiredWorkContext.getName()))
{
if (trace)
log.trace("RequiredWorkContext=" + requiredWorkContext.getName());
requiredWorkContexts.add(requiredWorkContext.getName());
}
}
}
// Large icon
// Small icon
ArrayList<Icon> icons = null;
if (conAnnotation != null && ((conAnnotation.smallIcon() != null && conAnnotation.smallIcon().length != 0) ||
(conAnnotation.largeIcon() != null && conAnnotation.largeIcon().length != 0)))
{
icons = new ArrayList<Icon>(
(conAnnotation.smallIcon() == null ? 0 : conAnnotation.smallIcon().length) +
(conAnnotation.largeIcon() == null ? 0 : conAnnotation.largeIcon().length));
if (conAnnotation.smallIcon() != null && conAnnotation.smallIcon().length > 0)
{
for (String smallIconAnnotation : conAnnotation.smallIcon())
{
if (smallIconAnnotation != null && !smallIconAnnotation.trim().equals(""))
icons.add(new Icon(new XsdString(smallIconAnnotation, null), null, null));
}
}
if (conAnnotation.largeIcon() != null && conAnnotation.largeIcon().length > 0)
{
for (String largeIconAnnotation : conAnnotation.largeIcon())
{
if (largeIconAnnotation != null && !largeIconAnnotation.trim().equals(""))
icons.add(new Icon(null, new XsdString(largeIconAnnotation, null), null));
}
}
}
// Transaction support
TransactionSupport.TransactionSupportLevel transactionSupportAnnotation = null;
TransactionSupportEnum transactionSupport = null;
if (conAnnotation != null)
transactionSupportAnnotation = conAnnotation.transactionSupport();
if (transactionSupportAnnotation != null)
transactionSupport = TransactionSupportEnum.valueOf(transactionSupportAnnotation.name());
// Reauthentication support
boolean reauthenticationSupport = false;
if (conAnnotation != null)
reauthenticationSupport = conAnnotation.reauthenticationSupport();
// AuthenticationMechanism
ArrayList<AuthenticationMechanism> authenticationMechanisms = null;
if (conAnnotation != null)
authenticationMechanisms = processAuthenticationMechanism(conAnnotation.authMechanisms());
OutboundResourceAdapter outboundResourceadapter = new OutboundResourceAdapterImpl(connectionDefinitions,
transactionSupport,
authenticationMechanisms,
reauthenticationSupport, null);
// Security permission
ArrayList<SecurityPermission> securityPermissions = null;
if (conAnnotation != null)
securityPermissions = processSecurityPermissions(conAnnotation.securityPermissions());
ArrayList<ConfigProperty> validProperties = new ArrayList<ConfigProperty>();
if (configProperties != null)
{
validProperties.addAll(configProperties);
}
if (plainConfigProperties != null && raClass != null)
{
Set<String> raClasses = getClasses(raClass, classLoader);
for (ConfigProperty configProperty16 : plainConfigProperties)
{
if (raClasses.contains(((ConfigProperty16Impl) configProperty16).getAttachedClassName()))
{
if (trace)
log.tracef("Attaching: %s (%s)", configProperty16, raClass);
validProperties.add(configProperty16);
}
}
}
validProperties.trimToSize();
ResourceAdapter1516Impl resourceAdapter = new ResourceAdapter1516Impl(raClass, validProperties,
outboundResourceadapter,
inboundResourceadapter, adminObjs,
securityPermissions, null);
XsdString resourceadapterVersion = null;
if (conAnnotation != null && conAnnotation.version() != null && !conAnnotation.version().trim().equals(""))
resourceadapterVersion = new XsdString(conAnnotation.version(), null);
return new Connector16Impl("", vendorName, eisType, resourceadapterVersion, license, resourceAdapter,
requiredWorkContexts, false, descriptions, displayNames, icons, null);
}
private ArrayList<SecurityPermission> processSecurityPermissions(
javax.resource.spi.SecurityPermission[] securityPermissionAnotations)
{
ArrayList<SecurityPermission> securityPermissions = null;
if (securityPermissionAnotations != null)
{
if (securityPermissionAnotations.length != 0)
{
securityPermissions = new ArrayList<SecurityPermission>(securityPermissionAnotations.length);
for (javax.resource.spi.SecurityPermission securityPermission : securityPermissionAnotations)
{
ArrayList<LocalizedXsdString> desc = null;
if (securityPermission.description() != null && securityPermission.description().length > 0)
{
desc = new ArrayList<LocalizedXsdString>(securityPermission.description().length);
for (String d : securityPermission.description())
{
if (d != null && !d.trim().equals(""))
desc.add(new LocalizedXsdString(d, null));
}
}
SecurityPermission spmd = new SecurityPermissionImpl(desc,
new XsdString(securityPermission.permissionSpec(),
null), null);
securityPermissions.add(spmd);
}
securityPermissions.trimToSize();
}
}
return securityPermissions;
}
private ArrayList<AuthenticationMechanism> processAuthenticationMechanism(
javax.resource.spi.AuthenticationMechanism[] authMechanismAnnotations)
{
ArrayList<AuthenticationMechanism> authenticationMechanisms = null;
if (authMechanismAnnotations != null)
{
authenticationMechanisms = new ArrayList<AuthenticationMechanism>(authMechanismAnnotations.length);
for (javax.resource.spi.AuthenticationMechanism authMechanismAnnotation : authMechanismAnnotations)
{
ArrayList<LocalizedXsdString> descriptions = null;
if (authMechanismAnnotation.description() != null && authMechanismAnnotation.description().length != 0)
{
descriptions = new ArrayList<LocalizedXsdString>(authMechanismAnnotation.description().length);
for (String descriptionAnnoptation : authMechanismAnnotation.description())
{
descriptions.add(new LocalizedXsdString(descriptionAnnoptation, null));
}
}
XsdString authenticationMechanismType = new XsdString(authMechanismAnnotation
.authMechanism(), null);
authenticationMechanisms.add(new AuthenticationMechanismImpl(descriptions, authenticationMechanismType,
CredentialInterfaceEnum
.valueOf(authMechanismAnnotation
.credentialInterface()
.name()), null));
}
}
return authenticationMechanisms;
}
/**
* Process: @ConnectionDefinitions
* @param annotationRepository The annotation repository
* @param classLoader The class loader
* @param configProperties Config properties
* @param plainConfigProperties Plain config properties
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private ArrayList<ConnectionDefinition> processConnectionDefinitions(AnnotationRepository annotationRepository,
ClassLoader classLoader,
ArrayList<? extends ConfigProperty> configProperties,
ArrayList<? extends ConfigProperty> plainConfigProperties)
throws Exception
{
Collection<Annotation> values = annotationRepository.getAnnotation(ConnectionDefinitions.class);
if (values != null)
{
if (values.size() == 1)
{
Annotation annotation = values.iterator().next();
ConnectionDefinitions connectionDefinitionsAnnotation = (ConnectionDefinitions) annotation
.getAnnotation();
if (trace)
log.trace("Processing: " + connectionDefinitionsAnnotation);
return attachConnectionDefinitions(connectionDefinitionsAnnotation, annotation.getClassName(),
classLoader,
configProperties, plainConfigProperties);
}
else
throw new ValidateException(bundle.moreThanOneConnectionDefinitionsDefined());
}
return null;
}
/**
* Attach @ConnectionDefinitions
* @param cds The connection definitions
* @param mcf The managed connection factory
* @param classLoader The class loader
* @param configProperty The config properties
* @param plainConfigProperty The lain config properties
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private ArrayList<ConnectionDefinition> attachConnectionDefinitions(ConnectionDefinitions cds, String mcf,
ClassLoader classLoader,
ArrayList<? extends ConfigProperty> configProperty,
ArrayList<? extends ConfigProperty> plainConfigProperty)
throws Exception
{
ArrayList<ConnectionDefinition> connectionDefinitions = null;
if (cds.value() != null)
{
connectionDefinitions = new ArrayList<ConnectionDefinition>(cds.value().length);
for (javax.resource.spi.ConnectionDefinition cd : cds.value())
{
connectionDefinitions.add(attachConnectionDefinition(mcf, cd, classLoader,
configProperty, plainConfigProperty));
}
}
return connectionDefinitions;
}
/**
* Process: @ConnectionDefinition
* @param annotationRepository The annotation repository
* @param classLoader The class loader
* @param configProperty The config properties
* @param plainConfigProperty The plain config properties
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private ArrayList<ConnectionDefinition> processConnectionDefinition(AnnotationRepository annotationRepository,
ClassLoader classLoader,
ArrayList<? extends ConfigProperty> configProperty,
ArrayList<? extends ConfigProperty> plainConfigProperty)
throws Exception
{
ArrayList<ConnectionDefinition> connectionDefinitions = null;
Collection<Annotation> values = annotationRepository
.getAnnotation(javax.resource.spi.ConnectionDefinition.class);
if (values != null)
{
connectionDefinitions = new ArrayList<ConnectionDefinition>(values.size());
for (Annotation annotation : values)
{
ConnectionDefinition cd = attachConnectionDefinition(annotation, classLoader,
configProperty, plainConfigProperty);
if (trace)
log.tracef("Adding connection definition: %s", cd);
connectionDefinitions.add(cd);
}
}
return connectionDefinitions;
}
/**
* Attach @ConnectionDefinition
* @param annotation The annotation
* @param classLoader The class loader
* @param configProperty The config properties
* @param plainConfigProperty The plain config properties
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private ConnectionDefinition attachConnectionDefinition(Annotation annotation,
ClassLoader classLoader,
ArrayList<? extends ConfigProperty> configProperty,
ArrayList<? extends ConfigProperty> plainConfigProperty)
throws Exception
{
javax.resource.spi.ConnectionDefinition cd =
(javax.resource.spi.ConnectionDefinition) annotation.getAnnotation();
if (trace)
log.trace("Processing: " + annotation);
return attachConnectionDefinition(annotation.getClassName(), cd, classLoader,
configProperty, plainConfigProperty);
}
/**
* Attach @ConnectionDefinition
* @param mcf The managed connection factory
* @param cd The connection definition
* @param classLoader The class loader
* @param configProperties The config properties
* @param plainConfigProperties The plain config properties
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private ConnectionDefinition attachConnectionDefinition(String mcf, javax.resource.spi.ConnectionDefinition cd,
ClassLoader classLoader,
ArrayList<? extends ConfigProperty> configProperties,
ArrayList<? extends ConfigProperty> plainConfigProperties)
throws Exception
{
if (trace)
log.trace("Processing: " + cd);
ArrayList<ConfigProperty> validProperties = new ArrayList<ConfigProperty>();
if (configProperties != null)
{
for (ConfigProperty configProperty16 : configProperties)
{
if (mcf.equals(((ConfigProperty16Impl) configProperty16).getAttachedClassName()))
{
if (trace)
log.tracef("Attaching: %s (%s)", configProperty16, mcf);
validProperties.add(configProperty16);
}
}
}
if (plainConfigProperties != null)
{
Set<String> mcfClasses = getClasses(mcf, classLoader);
for (ConfigProperty configProperty16 : plainConfigProperties)
{
if (mcfClasses.contains(((ConfigProperty16Impl) configProperty16).getAttachedClassName()))
{
if (trace)
log.tracef("Attaching: %s (%s)", configProperty16, mcf);
validProperties.add(configProperty16);
}
}
}
validProperties.trimToSize();
XsdString connectionfactoryInterface = new XsdString(cd.connectionFactory().getName(), null);
XsdString managedconnectionfactoryClass = new XsdString(mcf, null);
XsdString connectionImplClass = new XsdString(cd.connectionImpl().getName(), null);
XsdString connectionfactoryImplClass = new XsdString(cd.connectionFactoryImpl().getName(), null);
XsdString connectionInterface = new XsdString(cd.connection().getName(), null);
return new ConnectionDefinitionImpl(managedconnectionfactoryClass, validProperties,
connectionfactoryInterface,
connectionfactoryImplClass, connectionInterface, connectionImplClass, null);
}
/**
* Process: @ConfigProperty
* @param annotationRepository The annotation repository
* @param classLoader The class loader to use
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private Map<Metadatas, ArrayList<ConfigProperty16>> processConfigProperty(AnnotationRepository annotationRepository,
ClassLoader classLoader)
throws Exception
{
Map<Metadatas, ArrayList<ConfigProperty16>> valueMap = null;
Collection<Annotation> values = annotationRepository.getAnnotation(javax.resource.spi.ConfigProperty.class);
if (values != null)
{
valueMap = new HashMap<Annotations.Metadatas, ArrayList<ConfigProperty16>>();
for (Annotation annotation : values)
{
javax.resource.spi.ConfigProperty configPropertyAnnotation = (javax.resource.spi.ConfigProperty) annotation
.getAnnotation();
if (trace)
log.trace("Processing: " + configPropertyAnnotation);
XsdString configPropertyValue = XsdString.NULL_XSDSTRING;
if (configPropertyAnnotation.defaultValue() != null && !configPropertyAnnotation.defaultValue().equals(""))
configPropertyValue = new XsdString(configPropertyAnnotation.defaultValue(), null);
XsdString configPropertyName = new XsdString(getConfigPropertyName(annotation), null);
XsdString configPropertyType =
new XsdString(getConfigPropertyType(annotation, configPropertyAnnotation.type(), classLoader), null);
Boolean configPropertySupportsDynamicUpdates = configPropertyAnnotation.supportsDynamicUpdates();
Boolean configPropertyConfidential = configPropertyAnnotation.confidential();
// Description
ArrayList<LocalizedXsdString> descriptions = null;
if (configPropertyAnnotation.description() != null && configPropertyAnnotation.description().length != 0)
{
descriptions = new ArrayList<LocalizedXsdString>(configPropertyAnnotation.description().length);
for (String descriptionAnnoptation : configPropertyAnnotation.description())
{
descriptions.add(new LocalizedXsdString(descriptionAnnoptation, null));
}
}
Boolean configPropertyIgnore = configPropertyAnnotation.ignore();
String attachedClassName = annotation.getClassName();
Class attachedClass = Class.forName(attachedClassName, true, classLoader);
if (hasInterface(attachedClass, "javax.resource.spi.ResourceAdapter"))
{
ConfigProperty16 cfgMeta = new ConfigProperty16Impl(descriptions, configPropertyName,
configPropertyType,
configPropertyValue, configPropertyIgnore,
configPropertySupportsDynamicUpdates,
configPropertyConfidential, null);
if (valueMap.get(Metadatas.RA) == null)
{
valueMap.put(Metadatas.RA, new ArrayList<ConfigProperty16>());
}
valueMap.get(Metadatas.RA).add(cfgMeta);
}
else
{
ConfigProperty16 cfgMeta = new ConfigProperty16Impl(descriptions, configPropertyName,
configPropertyType,
configPropertyValue, configPropertyIgnore,
configPropertySupportsDynamicUpdates,
configPropertyConfidential, null,
attachedClassName);
if (hasInterface(attachedClass, "javax.resource.spi.ManagedConnectionFactory"))
{
if (valueMap.get(Metadatas.MANAGED_CONN_FACTORY) == null)
{
valueMap.put(Metadatas.MANAGED_CONN_FACTORY, new ArrayList<ConfigProperty16>());
}
valueMap.get(Metadatas.MANAGED_CONN_FACTORY).add(cfgMeta);
}
else if (hasInterface(attachedClass, "javax.resource.spi.ActivationSpec"))
{
if (hasNotNull(annotationRepository, annotation))
{
((ConfigProperty16Impl)cfgMeta).setMandatory(true);
}
if (valueMap.get(Metadatas.ACTIVATION_SPEC) == null)
{
valueMap.put(Metadatas.ACTIVATION_SPEC, new ArrayList<ConfigProperty16>());
}
valueMap.get(Metadatas.ACTIVATION_SPEC).add(cfgMeta);
}
else if (hasAnnotation(attachedClass, AdministeredObject.class, annotationRepository))
{
if (valueMap.get(Metadatas.ADMIN_OBJECT) == null)
{
valueMap.put(Metadatas.ADMIN_OBJECT, new ArrayList<ConfigProperty16>());
}
valueMap.get(Metadatas.ADMIN_OBJECT).add(cfgMeta);
}
else
{
if (hasNotNull(annotationRepository, annotation))
{
((ConfigProperty16Impl)cfgMeta).setMandatory(true);
}
if (valueMap.get(Metadatas.PLAIN) == null)
{
valueMap.put(Metadatas.PLAIN, new ArrayList<ConfigProperty16>());
}
valueMap.get(Metadatas.PLAIN).add(cfgMeta);
}
}
}
if (valueMap.get(Metadatas.RA) != null)
valueMap.get(Metadatas.RA).trimToSize();
if (valueMap.get(Metadatas.MANAGED_CONN_FACTORY) != null)
valueMap.get(Metadatas.MANAGED_CONN_FACTORY).trimToSize();
if (valueMap.get(Metadatas.ACTIVATION_SPEC) != null)
valueMap.get(Metadatas.ACTIVATION_SPEC).trimToSize();
if (valueMap.get(Metadatas.ADMIN_OBJECT) != null)
valueMap.get(Metadatas.ADMIN_OBJECT).trimToSize();
if (valueMap.get(Metadatas.PLAIN) != null)
valueMap.get(Metadatas.PLAIN).trimToSize();
return valueMap;
}
return valueMap;
}
/**
* hasInterface
*
* @param c
* @param targetClassName
* @return
*/
private boolean hasInterface(Class c, String targetClassName)
{
for (Class face : c.getInterfaces())
{
if (face.getName().equals(targetClassName))
{
return true;
}
else
{
for (Class face2 : face.getInterfaces())
{
if (face2.getName().equals(targetClassName))
{
return true;
}
else if (hasInterface(face2, targetClassName))
{
return true;
}
}
}
}
if (null != c.getSuperclass())
{
return hasInterface(c.getSuperclass(), targetClassName);
}
return false;
}
/**
* hasAnnotation, if class c contains annotation targetClass
*
* @param c
* @param targetClass
* @param annotationRepository
* @return
*/
private boolean hasAnnotation(Class c, Class targetClass, AnnotationRepository annotationRepository)
{
Collection<Annotation> values = annotationRepository.getAnnotation(targetClass);
if (values == null)
return false;
for (Annotation annotation : values)
{
if (annotation.getClassName() != null && annotation.getClassName().equals(c.getName()))
return true;
}
return false;
}
/**
* Process: @AdministeredObject
* @param md The metadata
* @param annotationRepository The annotation repository
* @param classLoader the classloadedr used to load annotated class
* @param configProperties The config properties
* @param plainConfigProperties The plain config properties
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private ArrayList<AdminObject> processAdministeredObject(AnnotationRepository annotationRepository,
ClassLoader classLoader, ArrayList<ConfigProperty16> configProperties,
ArrayList<ConfigProperty16> plainConfigProperties)
throws Exception
{
ArrayList<AdminObject> adminObjs = null;
Collection<Annotation> values = annotationRepository.getAnnotation(AdministeredObject.class);
if (values != null)
{
adminObjs = new ArrayList<AdminObject>(values.size());
for (Annotation annotation : values)
{
AdministeredObject a = (AdministeredObject) annotation.getAnnotation();
if (trace)
log.trace("Processing: " + a);
String aoName = null;
String aoClassName = annotation.getClassName();
Class<?> aClass = Class.forName(aoClassName, true, classLoader);
List<Class<?>> declaredInterfaces = null;
if (aClass.getInterfaces() != null && aClass.getInterfaces().length != 0)
{
declaredInterfaces = Arrays.asList(aClass.getInterfaces());
}
else
{
declaredInterfaces = Collections.emptyList();
}
if (a.adminObjectInterfaces() != null && a.adminObjectInterfaces().length > 0)
{
for (Class<?> annotatedInterface : a.adminObjectInterfaces())
{
if (declaredInterfaces.contains(annotatedInterface) &&
!annotatedInterface.equals(Serializable.class) &&
!annotatedInterface.equals(Externalizable.class))
{
aoName = annotatedInterface.getName();
break;
}
}
}
ArrayList<ConfigProperty> validProperties = new ArrayList<ConfigProperty>();
if (configProperties != null)
{
for (ConfigProperty configProperty16 : configProperties)
{
if (aoClassName.equals(((ConfigProperty16Impl) configProperty16).getAttachedClassName()))
{
if (trace)
log.tracef("Attaching: %s (%s)", configProperty16, aoClassName);
validProperties.add(configProperty16);
}
}
}
if (plainConfigProperties != null)
{
Set<String> aoClasses = getClasses(aoClassName, classLoader);
for (ConfigProperty configProperty16 : plainConfigProperties)
{
if (aoClasses.contains(((ConfigProperty16Impl) configProperty16).getAttachedClassName()))
{
if (trace)
log.tracef("Attaching: %s (%s)", configProperty16, aoClassName);
validProperties.add(configProperty16);
}
}
}
validProperties.trimToSize();
XsdString adminobjectInterface = new XsdString(aoName, null);
XsdString adminobjectClass = new XsdString(aoClassName, null);
adminObjs.add(new AdminObjectImpl(adminobjectInterface, adminobjectClass, validProperties, null));
}
}
return adminObjs;
}
/**
* Process: @Activation
* @param annotationRepository The annotation repository
* @param classLoader The class loader
* @param configProperties The config properties
* @param plainConfigProperties The plain config properties
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private InboundResourceAdapter processActivation(AnnotationRepository annotationRepository, ClassLoader classLoader,
ArrayList<ConfigProperty16> configProperties,
ArrayList<ConfigProperty16> plainConfigProperties)
throws Exception
{
ArrayList<MessageListener> listeners = new ArrayList<MessageListener>();
Collection<Annotation> values = annotationRepository.getAnnotation(Activation.class);
if (values != null)
{
for (Annotation annotation : values)
{
listeners.addAll(attachActivation(annotation, classLoader, configProperties, plainConfigProperties));
}
listeners.trimToSize();
}
return new InboundResourceAdapterImpl(new MessageAdapterImpl(listeners, null), null);
}
/**
* Attach @Activation
* @param annotation The activation annotation
* @param classLoader The class loader
* @param configProperties The config properties
* @param plainConfigProperties The plain config properties
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private ArrayList<MessageListener> attachActivation(Annotation annotation, ClassLoader classLoader,
ArrayList<ConfigProperty16> configProperties,
ArrayList<ConfigProperty16> plainConfigProperties)
throws Exception
{
ArrayList<ConfigProperty> validProperties = new ArrayList<ConfigProperty>();
ArrayList<RequiredConfigProperty> requiredConfigProperties = null;
if (configProperties != null)
{
for (ConfigProperty configProperty16 : configProperties)
{
if (annotation.getClassName().equals(((ConfigProperty16Impl) configProperty16).getAttachedClassName()))
{
validProperties.add(configProperty16);
if (configProperty16.isMandatory())
{
if (requiredConfigProperties == null)
requiredConfigProperties = new ArrayList<RequiredConfigProperty>(1);
requiredConfigProperties.add(new RequiredConfigProperty(null,
configProperty16.getConfigPropertyName(),
null));
}
}
}
}
if (plainConfigProperties != null)
{
Set<String> asClasses = getClasses(annotation.getClassName(), classLoader);
for (ConfigProperty configProperty16 : plainConfigProperties)
{
if (asClasses.contains(((ConfigProperty16Impl) configProperty16).getAttachedClassName()))
{
validProperties.add(configProperty16);
if (configProperty16.isMandatory())
{
if (requiredConfigProperties == null)
requiredConfigProperties = new ArrayList<RequiredConfigProperty>(1);
requiredConfigProperties.add(new RequiredConfigProperty(null,
configProperty16.getConfigPropertyName(),
null));
}
}
}
}
validProperties.trimToSize();
Activation activation = (Activation) annotation.getAnnotation();
ArrayList<MessageListener> messageListeners = null;
if (trace)
log.trace("Processing: " + activation);
if (activation.messageListeners() != null)
{
messageListeners = new ArrayList<MessageListener>(activation.messageListeners().length);
for (Class asClass : activation.messageListeners())
{
Activationspec16 asMeta = new Activationspec16Impl(new XsdString(annotation.getClassName(), null),
requiredConfigProperties,
validProperties,
null);
MessageListener mlMeta = new MessageListenerImpl(new XsdString(asClass.getName(), null), asMeta, null);
messageListeners.add(mlMeta);
}
}
return messageListeners;
}
/**
* Get the config-property-name for an annotation
* @param annotation The annotation
* @return The name
* @exception ClassNotFoundException Thrown if a class cannot be found
* @exception NoSuchFieldException Thrown if a field cannot be found
* @exception NoSuchMethodException Thrown if a method cannot be found
*/
private String getConfigPropertyName(Annotation annotation)
throws ClassNotFoundException, NoSuchFieldException, NoSuchMethodException
{
if (annotation.isOnField())
{
return annotation.getMemberName();
}
else if (annotation.isOnMethod())
{
String name = annotation.getMemberName();
if (name.startsWith("set"))
{
name = name.substring(3);
}
else if (name.startsWith("get"))
{
name = name.substring(3);
}
else if (name.startsWith("is"))
{
name = name.substring(2);
}
if (name.length() > 1)
{
return Character.toLowerCase(name.charAt(0)) + name.substring(1);
}
else
{
return Character.toString(Character.toLowerCase(name.charAt(0)));
}
}
throw new IllegalArgumentException(bundle.unknownAnnotation(annotation));
}
/**
* Get the config-property-type for an annotation
* @param annotation The annotation
* @param type An optional declared type
* @param classLoader The class loader to use
* @return The fully qualified classname
* @exception ClassNotFoundException Thrown if a class cannot be found
* @exception ValidateException Thrown if a ConfigProperty type isn't correct
*/
@SuppressWarnings("unchecked")
private String getConfigPropertyType(Annotation annotation,
Class<?> type,
ClassLoader classLoader)
throws ClassNotFoundException, ValidateException
{
if (annotation.isOnField())
{
Class clz = Class.forName(annotation.getClassName(), true, classLoader);
while (!Object.class.equals(clz))
{
try
{
Field field = clz.getDeclaredField(annotation.getMemberName());
if (type == null || type.equals(Object.class) || type.equals(field.getType()))
{
return field.getType().getName();
}
else
{
throw new ValidateException(bundle.wrongAnnotationType(annotation));
}
}
catch (NoSuchFieldException nsfe)
{
clz = clz.getSuperclass();
}
}
}
else if (annotation.isOnMethod())
{
Class clz = Class.forName(annotation.getClassName(), true, classLoader);
Class[] parameters = null;
if (annotation.getParameterTypes() != null)
{
parameters = new Class[annotation.getParameterTypes().size()];
for (int i = 0; i < annotation.getParameterTypes().size(); i++)
{
String parameter = annotation.getParameterTypes().get(i);
parameters[i] = Class.forName(parameter, true, classLoader);
}
}
while (!Object.class.equals(clz))
{
try
{
Method method = clz.getDeclaredMethod(annotation.getMemberName(), parameters);
if (void.class.equals(method.getReturnType()))
{
if (parameters != null && parameters.length > 0)
{
if (type == null || type.equals(Object.class) || type.equals(parameters[0]))
{
return parameters[0].getName();
}
else
{
throw new ValidateException(bundle.wrongAnnotationType(annotation));
}
}
}
else
{
if (type == null || type.equals(Object.class) || type.equals(method.getReturnType()))
{
return method.getReturnType().getName();
}
else
{
throw new ValidateException(bundle.wrongAnnotationType(annotation));
}
}
}
catch (NoSuchMethodException nsme)
{
clz = clz.getSuperclass();
}
}
}
throw new IllegalArgumentException(bundle.unknownAnnotation(annotation));
}
/**
* Get the class names for a class and all of its super classes
* @param name The name of the class
* @param cl The class loader
* @return The set of class names
*/
private Set<String> getClasses(String name, ClassLoader cl)
{
Set<String> result = new HashSet<String>();
try
{
Class<?> clz = Class.forName(name, true, cl);
while (!Object.class.equals(clz))
{
result.add(clz.getName());
clz = clz.getSuperclass();
}
}
catch (Throwable t)
{
log.debugf("Couldn't load: %s", name);
}
return result;
}
/**
* Has a NotNull annotation attached
* @param annotationRepository The annotation repository
* @param annotation The annotation being checked
* @return True of the method/field contains the NotNull annotation; otherwise false
*/
private boolean hasNotNull(AnnotationRepository annotationRepository, Annotation annotation)
{
Collection<Annotation> values = annotationRepository.getAnnotation(javax.validation.constraints.NotNull.class);
if (values == null || values.size() == 0)
return false;
for (Annotation notNullAnnotation : values)
{
if (notNullAnnotation.getClassName().equals(annotation.getClassName()) &&
notNullAnnotation.getMemberName().equals(annotation.getMemberName()))
return true;
}
return false;
}
}
| true | true | private Connector attachConnector(String raClass, ClassLoader classLoader,
javax.resource.spi.Connector conAnnotation,
ArrayList<ConnectionDefinition> connectionDefinitions,
ArrayList<ConfigProperty16> configProperties,
ArrayList<ConfigProperty16> plainConfigProperties,
InboundResourceAdapter inboundResourceadapter,
ArrayList<AdminObject> adminObjs)
throws Exception
{
// Vendor name
XsdString vendorName = null;
if (conAnnotation != null)
vendorName = new XsdString(conAnnotation.vendorName(), null);
// Description
ArrayList<LocalizedXsdString> descriptions = null;
if (conAnnotation != null && conAnnotation.description() != null && conAnnotation.description().length != 0)
{
descriptions = new ArrayList<LocalizedXsdString>(conAnnotation.description().length);
for (String descriptionAnnoptation : conAnnotation.description())
{
descriptions.add(new LocalizedXsdString(descriptionAnnoptation, null));
}
}
// Display name
ArrayList<LocalizedXsdString> displayNames = null;
if (conAnnotation != null && conAnnotation.description() != null && conAnnotation.displayName().length != 0)
{
displayNames = new ArrayList<LocalizedXsdString>(conAnnotation.displayName().length);
for (String displayNameAnnotation : conAnnotation.displayName())
{
displayNames.add(new LocalizedXsdString(displayNameAnnotation, null));
}
}
// EIS type
XsdString eisType = null;
if (conAnnotation != null)
eisType = new XsdString(conAnnotation.eisType(), null);
// License description
// License required
ArrayList<LocalizedXsdString> licenseDescriptions = null;
if (conAnnotation != null && conAnnotation.licenseDescription() != null &&
conAnnotation.licenseDescription().length != 0)
{
licenseDescriptions = new ArrayList<LocalizedXsdString>(conAnnotation.licenseDescription().length);
for (String licenseDescriptionAnnotation : conAnnotation.licenseDescription())
{
licenseDescriptions.add(new LocalizedXsdString(licenseDescriptionAnnotation, null));
}
}
LicenseType license = null;
if (conAnnotation != null)
license = new LicenseType(licenseDescriptions, conAnnotation.licenseRequired(), null);
// RequiredWorkContext
ArrayList<String> requiredWorkContexts = null;
Class<? extends WorkContext>[] requiredWorkContextAnnotations = null;
if (conAnnotation != null)
requiredWorkContextAnnotations = conAnnotation.requiredWorkContexts();
if (requiredWorkContextAnnotations != null)
{
requiredWorkContexts = new ArrayList<String>(requiredWorkContextAnnotations.length);
for (Class<? extends WorkContext> requiredWorkContext : requiredWorkContextAnnotations)
{
if (!requiredWorkContexts.contains(requiredWorkContext.getName()))
{
if (trace)
log.trace("RequiredWorkContext=" + requiredWorkContext.getName());
requiredWorkContexts.add(requiredWorkContext.getName());
}
}
}
// Large icon
// Small icon
ArrayList<Icon> icons = null;
if (conAnnotation != null && ((conAnnotation.smallIcon() != null && conAnnotation.smallIcon().length != 0) ||
(conAnnotation.largeIcon() != null && conAnnotation.largeIcon().length != 0)))
{
icons = new ArrayList<Icon>(
(conAnnotation.smallIcon() == null ? 0 : conAnnotation.smallIcon().length) +
(conAnnotation.largeIcon() == null ? 0 : conAnnotation.largeIcon().length));
if (conAnnotation.smallIcon() != null && conAnnotation.smallIcon().length > 0)
{
for (String smallIconAnnotation : conAnnotation.smallIcon())
{
if (smallIconAnnotation != null && !smallIconAnnotation.trim().equals(""))
icons.add(new Icon(new XsdString(smallIconAnnotation, null), null, null));
}
}
if (conAnnotation.largeIcon() != null && conAnnotation.largeIcon().length > 0)
{
for (String largeIconAnnotation : conAnnotation.largeIcon())
{
if (largeIconAnnotation != null && !largeIconAnnotation.trim().equals(""))
icons.add(new Icon(null, new XsdString(largeIconAnnotation, null), null));
}
}
}
// Transaction support
TransactionSupport.TransactionSupportLevel transactionSupportAnnotation = null;
TransactionSupportEnum transactionSupport = null;
if (conAnnotation != null)
transactionSupportAnnotation = conAnnotation.transactionSupport();
if (transactionSupportAnnotation != null)
transactionSupport = TransactionSupportEnum.valueOf(transactionSupportAnnotation.name());
// Reauthentication support
boolean reauthenticationSupport = false;
if (conAnnotation != null)
reauthenticationSupport = conAnnotation.reauthenticationSupport();
// AuthenticationMechanism
ArrayList<AuthenticationMechanism> authenticationMechanisms = null;
if (conAnnotation != null)
authenticationMechanisms = processAuthenticationMechanism(conAnnotation.authMechanisms());
OutboundResourceAdapter outboundResourceadapter = new OutboundResourceAdapterImpl(connectionDefinitions,
transactionSupport,
authenticationMechanisms,
reauthenticationSupport, null);
// Security permission
ArrayList<SecurityPermission> securityPermissions = null;
if (conAnnotation != null)
securityPermissions = processSecurityPermissions(conAnnotation.securityPermissions());
ArrayList<ConfigProperty> validProperties = new ArrayList<ConfigProperty>();
if (configProperties != null)
{
validProperties.addAll(configProperties);
}
if (plainConfigProperties != null && raClass != null)
{
Set<String> raClasses = getClasses(raClass, classLoader);
for (ConfigProperty configProperty16 : plainConfigProperties)
{
if (raClasses.contains(((ConfigProperty16Impl) configProperty16).getAttachedClassName()))
{
if (trace)
log.tracef("Attaching: %s (%s)", configProperty16, raClass);
validProperties.add(configProperty16);
}
}
}
validProperties.trimToSize();
ResourceAdapter1516Impl resourceAdapter = new ResourceAdapter1516Impl(raClass, validProperties,
outboundResourceadapter,
inboundResourceadapter, adminObjs,
securityPermissions, null);
XsdString resourceadapterVersion = null;
if (conAnnotation != null && conAnnotation.version() != null && !conAnnotation.version().trim().equals(""))
resourceadapterVersion = new XsdString(conAnnotation.version(), null);
return new Connector16Impl("", vendorName, eisType, resourceadapterVersion, license, resourceAdapter,
requiredWorkContexts, false, descriptions, displayNames, icons, null);
}
| private Connector attachConnector(String raClass, ClassLoader classLoader,
javax.resource.spi.Connector conAnnotation,
ArrayList<ConnectionDefinition> connectionDefinitions,
ArrayList<ConfigProperty16> configProperties,
ArrayList<ConfigProperty16> plainConfigProperties,
InboundResourceAdapter inboundResourceadapter,
ArrayList<AdminObject> adminObjs)
throws Exception
{
// Vendor name
XsdString vendorName = null;
if (conAnnotation != null)
vendorName = new XsdString(conAnnotation.vendorName(), null);
// Description
ArrayList<LocalizedXsdString> descriptions = null;
if (conAnnotation != null && conAnnotation.description() != null && conAnnotation.description().length != 0)
{
descriptions = new ArrayList<LocalizedXsdString>(conAnnotation.description().length);
for (String descriptionAnnoptation : conAnnotation.description())
{
descriptions.add(new LocalizedXsdString(descriptionAnnoptation, null));
}
}
// Display name
ArrayList<LocalizedXsdString> displayNames = null;
if (conAnnotation != null && conAnnotation.displayName() != null && conAnnotation.displayName().length != 0)
{
displayNames = new ArrayList<LocalizedXsdString>(conAnnotation.displayName().length);
for (String displayNameAnnotation : conAnnotation.displayName())
{
displayNames.add(new LocalizedXsdString(displayNameAnnotation, null));
}
}
// EIS type
XsdString eisType = null;
if (conAnnotation != null)
eisType = new XsdString(conAnnotation.eisType(), null);
// License description
// License required
ArrayList<LocalizedXsdString> licenseDescriptions = null;
if (conAnnotation != null && conAnnotation.licenseDescription() != null &&
conAnnotation.licenseDescription().length != 0)
{
licenseDescriptions = new ArrayList<LocalizedXsdString>(conAnnotation.licenseDescription().length);
for (String licenseDescriptionAnnotation : conAnnotation.licenseDescription())
{
licenseDescriptions.add(new LocalizedXsdString(licenseDescriptionAnnotation, null));
}
}
LicenseType license = null;
if (conAnnotation != null)
license = new LicenseType(licenseDescriptions, conAnnotation.licenseRequired(), null);
// RequiredWorkContext
ArrayList<String> requiredWorkContexts = null;
Class<? extends WorkContext>[] requiredWorkContextAnnotations = null;
if (conAnnotation != null)
requiredWorkContextAnnotations = conAnnotation.requiredWorkContexts();
if (requiredWorkContextAnnotations != null)
{
requiredWorkContexts = new ArrayList<String>(requiredWorkContextAnnotations.length);
for (Class<? extends WorkContext> requiredWorkContext : requiredWorkContextAnnotations)
{
if (!requiredWorkContexts.contains(requiredWorkContext.getName()))
{
if (trace)
log.trace("RequiredWorkContext=" + requiredWorkContext.getName());
requiredWorkContexts.add(requiredWorkContext.getName());
}
}
}
// Large icon
// Small icon
ArrayList<Icon> icons = null;
if (conAnnotation != null && ((conAnnotation.smallIcon() != null && conAnnotation.smallIcon().length != 0) ||
(conAnnotation.largeIcon() != null && conAnnotation.largeIcon().length != 0)))
{
icons = new ArrayList<Icon>(
(conAnnotation.smallIcon() == null ? 0 : conAnnotation.smallIcon().length) +
(conAnnotation.largeIcon() == null ? 0 : conAnnotation.largeIcon().length));
if (conAnnotation.smallIcon() != null && conAnnotation.smallIcon().length > 0)
{
for (String smallIconAnnotation : conAnnotation.smallIcon())
{
if (smallIconAnnotation != null && !smallIconAnnotation.trim().equals(""))
icons.add(new Icon(new XsdString(smallIconAnnotation, null), null, null));
}
}
if (conAnnotation.largeIcon() != null && conAnnotation.largeIcon().length > 0)
{
for (String largeIconAnnotation : conAnnotation.largeIcon())
{
if (largeIconAnnotation != null && !largeIconAnnotation.trim().equals(""))
icons.add(new Icon(null, new XsdString(largeIconAnnotation, null), null));
}
}
}
// Transaction support
TransactionSupport.TransactionSupportLevel transactionSupportAnnotation = null;
TransactionSupportEnum transactionSupport = null;
if (conAnnotation != null)
transactionSupportAnnotation = conAnnotation.transactionSupport();
if (transactionSupportAnnotation != null)
transactionSupport = TransactionSupportEnum.valueOf(transactionSupportAnnotation.name());
// Reauthentication support
boolean reauthenticationSupport = false;
if (conAnnotation != null)
reauthenticationSupport = conAnnotation.reauthenticationSupport();
// AuthenticationMechanism
ArrayList<AuthenticationMechanism> authenticationMechanisms = null;
if (conAnnotation != null)
authenticationMechanisms = processAuthenticationMechanism(conAnnotation.authMechanisms());
OutboundResourceAdapter outboundResourceadapter = new OutboundResourceAdapterImpl(connectionDefinitions,
transactionSupport,
authenticationMechanisms,
reauthenticationSupport, null);
// Security permission
ArrayList<SecurityPermission> securityPermissions = null;
if (conAnnotation != null)
securityPermissions = processSecurityPermissions(conAnnotation.securityPermissions());
ArrayList<ConfigProperty> validProperties = new ArrayList<ConfigProperty>();
if (configProperties != null)
{
validProperties.addAll(configProperties);
}
if (plainConfigProperties != null && raClass != null)
{
Set<String> raClasses = getClasses(raClass, classLoader);
for (ConfigProperty configProperty16 : plainConfigProperties)
{
if (raClasses.contains(((ConfigProperty16Impl) configProperty16).getAttachedClassName()))
{
if (trace)
log.tracef("Attaching: %s (%s)", configProperty16, raClass);
validProperties.add(configProperty16);
}
}
}
validProperties.trimToSize();
ResourceAdapter1516Impl resourceAdapter = new ResourceAdapter1516Impl(raClass, validProperties,
outboundResourceadapter,
inboundResourceadapter, adminObjs,
securityPermissions, null);
XsdString resourceadapterVersion = null;
if (conAnnotation != null && conAnnotation.version() != null && !conAnnotation.version().trim().equals(""))
resourceadapterVersion = new XsdString(conAnnotation.version(), null);
return new Connector16Impl("", vendorName, eisType, resourceadapterVersion, license, resourceAdapter,
requiredWorkContexts, false, descriptions, displayNames, icons, null);
}
|
diff --git a/ds/mods/CCLights2/CCLights2.java b/ds/mods/CCLights2/CCLights2.java
index 9a7eb46..dfa9cef 100644
--- a/ds/mods/CCLights2/CCLights2.java
+++ b/ds/mods/CCLights2/CCLights2.java
@@ -1,92 +1,92 @@
package ds.mods.CCLights2;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import ds.mods.CCLights2.block.BlockBigMonitor;
import ds.mods.CCLights2.block.BlockGPU;
import ds.mods.CCLights2.block.BlockMonitor;
import ds.mods.CCLights2.block.tileentity.TileEntityBigMonitor;
import ds.mods.CCLights2.block.tileentity.TileEntityGPU;
import ds.mods.CCLights2.block.tileentity.TileEntityMonitor;
import ds.mods.CCLights2.item.ItemRAM;
import ds.mods.CCLights2.item.ItemTablet;
@Mod(modid="CCLights2",name="CCLights2",version="0.1")
@NetworkMod(clientSideRequired=true,serverSideRequired=true,channels={"GPUDrawlist","GPUEvent","GPUDownload","GPUMouse","GPUKey","GPUTile"}, packetHandler = PacketHandler.class)
public class CCLights2 {
@Instance("CCLights2")
public static CCLights2 instance;
@SidedProxy(serverSide = "ds.mods.CCLights2.CommonProxy", clientSide = "ds.mods.CCLights2.client.ClientProxy")
public static CommonProxy proxy;
public static Block gpu;
public static Block monitor;
public static Block monitorBig;
public static Item ram;
public static Item tablet;
@Init
public void load(FMLInitializationEvent event)
{
NetworkRegistry.instance().registerGuiHandler(this, new GuiHandler());
gpu = new BlockGPU(542, Material.iron);
//gpu.setTextureFile("/ds/mods/CCLights2/texture/terrain.png");
//gpu.blockIndexInTexture = 0;
GameRegistry.registerBlock(gpu, "CCLGPU");
GameRegistry.registerTileEntity(TileEntityGPU.class, "GPU");
GameRegistry.addRecipe(new ItemStack(gpu,1),new Object[]{
"III",
"RGR",
"GGG",'I',Item.ingotIron,'R',Item.redstone,'G',Item.ingotGold});
monitor = new BlockMonitor(543, Material.iron);
//monitor.setTextureFile("/ds/mods/CCLights2/texture/terrain.png");
//monitor.blockIndexInTexture = 1;
GameRegistry.registerBlock(monitor, "CCLMonitor");
GameRegistry.registerTileEntity(TileEntityMonitor.class, "CCLMonitorTE");
GameRegistry.addRecipe(new ItemStack(monitor,2),new Object[]{
"III",
"RLR",
"GGG",'I',Item.ingotIron,'R',Item.redstone,'G',Item.ingotGold,'L',Block.thinGlass});
monitorBig = new BlockBigMonitor(545, Material.iron);
GameRegistry.registerBlock(monitorBig, "CCLBigMonitor");
GameRegistry.registerTileEntity(TileEntityBigMonitor.class, "CCLBigMonitorTE");
GameRegistry.addRecipe(new ItemStack(monitorBig,16),new Object[]{
"LLL",
"LGL",
- "LLL",'G',gpu,'L',Block.thinGlass});
+ "LLL",'G',monitor,'L',Block.thinGlass});
ram = new ItemRAM(4097-256);
GameRegistry.registerItem(ram, "CCLRAM");
LanguageRegistry.addName(ram, "RAM");
GameRegistry.addRecipe(new ItemStack(ram,8),new Object[]{
"III",
"R R",
"GGG",'I',Item.ingotIron,'R',Block.blockRedstone,'G',Item.ingotGold,'L',Block.thinGlass});
tablet = new ItemTablet(4098);
GameRegistry.registerItem(tablet, "CCLTab");
LanguageRegistry.addName(tablet, "Tablet");
GameRegistry.addRecipe(new ItemStack(tablet,2),new Object[]{
"GIG",
"RMR",
"GIG",'I',Item.ingotIron,'R',Item.redstone,'G',Item.ingotGold,'M',monitorBig});
proxy.registerRenderInfo();
MinecraftForge.EVENT_BUS.register(new Events());
}
}
| true | true | public void load(FMLInitializationEvent event)
{
NetworkRegistry.instance().registerGuiHandler(this, new GuiHandler());
gpu = new BlockGPU(542, Material.iron);
//gpu.setTextureFile("/ds/mods/CCLights2/texture/terrain.png");
//gpu.blockIndexInTexture = 0;
GameRegistry.registerBlock(gpu, "CCLGPU");
GameRegistry.registerTileEntity(TileEntityGPU.class, "GPU");
GameRegistry.addRecipe(new ItemStack(gpu,1),new Object[]{
"III",
"RGR",
"GGG",'I',Item.ingotIron,'R',Item.redstone,'G',Item.ingotGold});
monitor = new BlockMonitor(543, Material.iron);
//monitor.setTextureFile("/ds/mods/CCLights2/texture/terrain.png");
//monitor.blockIndexInTexture = 1;
GameRegistry.registerBlock(monitor, "CCLMonitor");
GameRegistry.registerTileEntity(TileEntityMonitor.class, "CCLMonitorTE");
GameRegistry.addRecipe(new ItemStack(monitor,2),new Object[]{
"III",
"RLR",
"GGG",'I',Item.ingotIron,'R',Item.redstone,'G',Item.ingotGold,'L',Block.thinGlass});
monitorBig = new BlockBigMonitor(545, Material.iron);
GameRegistry.registerBlock(monitorBig, "CCLBigMonitor");
GameRegistry.registerTileEntity(TileEntityBigMonitor.class, "CCLBigMonitorTE");
GameRegistry.addRecipe(new ItemStack(monitorBig,16),new Object[]{
"LLL",
"LGL",
"LLL",'G',gpu,'L',Block.thinGlass});
ram = new ItemRAM(4097-256);
GameRegistry.registerItem(ram, "CCLRAM");
LanguageRegistry.addName(ram, "RAM");
GameRegistry.addRecipe(new ItemStack(ram,8),new Object[]{
"III",
"R R",
"GGG",'I',Item.ingotIron,'R',Block.blockRedstone,'G',Item.ingotGold,'L',Block.thinGlass});
tablet = new ItemTablet(4098);
GameRegistry.registerItem(tablet, "CCLTab");
LanguageRegistry.addName(tablet, "Tablet");
GameRegistry.addRecipe(new ItemStack(tablet,2),new Object[]{
"GIG",
"RMR",
"GIG",'I',Item.ingotIron,'R',Item.redstone,'G',Item.ingotGold,'M',monitorBig});
proxy.registerRenderInfo();
MinecraftForge.EVENT_BUS.register(new Events());
}
| public void load(FMLInitializationEvent event)
{
NetworkRegistry.instance().registerGuiHandler(this, new GuiHandler());
gpu = new BlockGPU(542, Material.iron);
//gpu.setTextureFile("/ds/mods/CCLights2/texture/terrain.png");
//gpu.blockIndexInTexture = 0;
GameRegistry.registerBlock(gpu, "CCLGPU");
GameRegistry.registerTileEntity(TileEntityGPU.class, "GPU");
GameRegistry.addRecipe(new ItemStack(gpu,1),new Object[]{
"III",
"RGR",
"GGG",'I',Item.ingotIron,'R',Item.redstone,'G',Item.ingotGold});
monitor = new BlockMonitor(543, Material.iron);
//monitor.setTextureFile("/ds/mods/CCLights2/texture/terrain.png");
//monitor.blockIndexInTexture = 1;
GameRegistry.registerBlock(monitor, "CCLMonitor");
GameRegistry.registerTileEntity(TileEntityMonitor.class, "CCLMonitorTE");
GameRegistry.addRecipe(new ItemStack(monitor,2),new Object[]{
"III",
"RLR",
"GGG",'I',Item.ingotIron,'R',Item.redstone,'G',Item.ingotGold,'L',Block.thinGlass});
monitorBig = new BlockBigMonitor(545, Material.iron);
GameRegistry.registerBlock(monitorBig, "CCLBigMonitor");
GameRegistry.registerTileEntity(TileEntityBigMonitor.class, "CCLBigMonitorTE");
GameRegistry.addRecipe(new ItemStack(monitorBig,16),new Object[]{
"LLL",
"LGL",
"LLL",'G',monitor,'L',Block.thinGlass});
ram = new ItemRAM(4097-256);
GameRegistry.registerItem(ram, "CCLRAM");
LanguageRegistry.addName(ram, "RAM");
GameRegistry.addRecipe(new ItemStack(ram,8),new Object[]{
"III",
"R R",
"GGG",'I',Item.ingotIron,'R',Block.blockRedstone,'G',Item.ingotGold,'L',Block.thinGlass});
tablet = new ItemTablet(4098);
GameRegistry.registerItem(tablet, "CCLTab");
LanguageRegistry.addName(tablet, "Tablet");
GameRegistry.addRecipe(new ItemStack(tablet,2),new Object[]{
"GIG",
"RMR",
"GIG",'I',Item.ingotIron,'R',Item.redstone,'G',Item.ingotGold,'M',monitorBig});
proxy.registerRenderInfo();
MinecraftForge.EVENT_BUS.register(new Events());
}
|
diff --git a/java/src/Align.java b/java/src/Align.java
index 5f14a7b..17692a9 100644
--- a/java/src/Align.java
+++ b/java/src/Align.java
@@ -1,921 +1,921 @@
/*
* LICENSE to be determined
*/
package srma;
import java.util.*;
import net.sf.samtools.*;
import net.sf.picard.reference.*;
import srma.*;
public class Align {
private static final int CORRECT_BASE_QUALITY_PENALTY = 20; // TODO: should be a parameter to SRMA
private static final List<String> saveTags =
Arrays.asList("RG", "LB", "PU", "PG", "CS", "CQ");
public static void align(Graph graph, SAMRecord rec, Node recNode,
ReferenceSequence sequence,
SAMProgramRecord programRecord,
int offset,
AlleleCoverageCutoffs alleleCoverageCutoffs,
boolean correctBases,
boolean useSequenceQualities,
int MAXIMUM_TOTAL_COVERAGE,
int MAX_HEAP_SIZE)
throws Exception
{
int i;
AlignHeapNode curAlignHeapNode = null;
AlignHeapNode nextAlignHeapNode = null;
AlignHeapNode bestAlignHeapNode=null;
AlignHeap heap=null;
String read=null; // could be cs
String readBases = null; // always nt
String qualities=null; // could be cq
SRMAUtil.Space space=SRMAUtil.Space.NTSPACE;
ListIterator<NodeRecord> iter=null;
AlignHeapNodeComparator comp=null;
int alignmentStart = -1;
int numStartNodesAdded = 0;
boolean strand = rec.getReadNegativeStrandFlag(); // false -> forward, true -> reverse
String softClipStartBases = null;
String softClipStartQualities = null;
String softClipEndBases = null;
String softClipEndQualities = null;
// Debugging stuff
String readName = rec.getReadName();
assert SRMAUtil.Space.COLORSPACE != space;
// Get space
read = (String)rec.getAttribute("CS");
if(null == read) {
// Use base space
space = SRMAUtil.Space.NTSPACE;
}
else {
// assumes CS and CQ are always in sequencing order
space = SRMAUtil.Space.COLORSPACE;
}
// Get read and qualities
if(space == SRMAUtil.Space.NTSPACE) {
byte tmpRead[] = rec.getReadString().getBytes();
byte tmpQualities[] = rec.getBaseQualityString().getBytes();
// Reverse once
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
SAMRecordUtil.reverseArray(tmpQualities);
}
read = new String(tmpRead);
readBases = new String(tmpRead);
qualities = new String(tmpQualities);
// Reverse again
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
SAMRecordUtil.reverseArray(tmpQualities);
}
}
else {
byte tmpRead[] = rec.getReadString().getBytes();
// Reverse once
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
}
readBases = new String(tmpRead);
// Reverse again
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
}
read = SRMAUtil.normalizeColorSpaceRead(read);
qualities = (String)rec.getAttribute("CQ");
// Some aligners include a quality value for the adapter. A quality value
// IMHO should not be given for an unobserved (assumed) peice of data. Trim
// the first quality in this case
if(qualities.length() == 1 + read.length()) { // trim the first quality
qualities = qualities.substring(1);
}
}
// Reverse back
if(readBases.length() <= 0) {
throw new Exception("Error. The current alignment has no bases.");
}
if(read.length() <= 0) {
throw new Exception("Error. The current alignment has no bases.");
}
if(qualities.length() <= 0) {
throw new Exception("Error. The current alignment has no qualities.");
}
if(readBases.length() != read.length()) {
if(space == SRMAUtil.Space.COLORSPACE) {
- throw new Exception("Error. The current alignment's read bases length does not match the length of the colors in the CS tag.");
+ throw new Exception("Error. The current alignment's read bases length does not match the length of the colors in the CS tag [" + rec.getReadName() + "].");
}
else {
throw new Exception("Error. Internal error: readBases.length() != read.length()");
}
}
// Deal with soft-clipping
// - save the soft clipped sequence for latter
{
List<CigarElement> cigarElements = null;
cigarElements = rec.getCigar().getCigarElements();
CigarElement e1 = cigarElements.get(0); // first
CigarElement e2 = cigarElements.get(cigarElements.size()-1); // last
// Soft-clipped
if(CigarOperator.S == e1.getOperator()) {
if(space == SRMAUtil.Space.COLORSPACE) {
throw new Exception("Error. Soft clipping with color-space data not currently supported.");
}
int l = e1.getLength();
if(strand) { // reverse
softClipStartBases = readBases.substring(readBases.length() - l);
softClipStartQualities = qualities.substring(qualities.length() - l);
readBases = readBases.substring(0, readBases.length() - l);
read = read.substring(0, read.length() - l);
qualities = qualities.substring(0, qualities.length() - l);
}
else {
softClipStartBases = readBases.substring(0, l-1);
softClipStartQualities = qualities.substring(0, l-1);
readBases = readBases.substring(l);
read = read.substring(l);
qualities = qualities.substring(l);
}
}
if(CigarOperator.S == e2.getOperator()) {
if(space == SRMAUtil.Space.COLORSPACE) {
throw new Exception("Error. Soft clipping with color-space data not currently supported.");
}
int l = e2.getLength();
if(strand) { // reverse
softClipEndBases = readBases.substring(0, l-1);
softClipEndQualities = qualities.substring(0, l-1);
readBases = readBases.substring(l);
read = read.substring(l);
qualities = qualities.substring(l);
}
else {
softClipEndBases = readBases.substring(readBases.length() - l);
softClipEndQualities = qualities.substring(qualities.length() - l);
readBases = readBases.substring(0, readBases.length() - l);
read = read.substring(0, read.length() - l);
qualities = qualities.substring(0, qualities.length() - l);
}
}
}
// Remove mate pair information
Align.removeMateInfo(rec);
comp = new AlignHeapNodeComparator((strand) ? AlignHeap.HeapType.MAXHEAP : AlignHeap.HeapType.MINHEAP);
// Bound by original alignment if possible
bestAlignHeapNode = Align.boundWithOriginalAlignment(rec,
graph,
recNode,
comp,
strand,
read,
qualities,
readBases,
space,
sequence,
alleleCoverageCutoffs,
useSequenceQualities,
MAXIMUM_TOTAL_COVERAGE,
MAX_HEAP_SIZE);
/*
System.err.println("readName="+rec.getReadName());
if(null != bestAlignHeapNode) {
System.err.println("\nFOUND BEST:" + rec.toString());
}
else {
System.err.println("\nNOT FOUND (BEST): " + rec.toString());
}
Align.updateSAM(rec, programRecord, bestAlignHeapNode, space, read, qualities, softClipStartBases, softClipStartQualities, softClipEndBases, softClipEndQualities, strand, correctBases);
return;
*/
heap = new AlignHeap((strand) ? AlignHeap.HeapType.MAXHEAP : AlignHeap.HeapType.MINHEAP);
// Add start nodes
if(strand) { // reverse
alignmentStart = rec.getAlignmentEnd();
for(i=alignmentStart+offset;alignmentStart-offset<=i;i--) {
int position = graph.getPriorityQueueIndexAtPositionOrBefore(i);
PriorityQueue<Node> startNodeQueue = graph.getPriorityQueue(position);
if(0 != position && null != startNodeQueue) {
Iterator<Node> startNodeQueueIter = startNodeQueue.iterator();
while(startNodeQueueIter.hasNext()) {
Node startNode = startNodeQueueIter.next();
int f = passFilters(graph,
startNode,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(null,
startNode,
startNode.coverage,
read.charAt(0),
qualities.charAt(0),
useSequenceQualities,
space));
}
else if(f < 0) {
return;
}
if(startNode.position < i) {
i = startNode.position;
}
numStartNodesAdded++;
}
}
}
}
else {
alignmentStart = rec.getAlignmentStart();
for(i=alignmentStart-offset;i<=alignmentStart+offset;i++) {
int position = graph.getPriorityQueueIndexAtPositionOrGreater(i);
PriorityQueue<Node> startNodeQueue = graph.getPriorityQueue(position);
if(0 != position && null != startNodeQueue) {
Iterator<Node> startNodeQueueIter = startNodeQueue.iterator();
while(startNodeQueueIter.hasNext()) {
Node startNode = startNodeQueueIter.next();
int f = passFilters(graph,
startNode,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(null,
startNode,
startNode.coverage,
read.charAt(0),
qualities.charAt(0),
useSequenceQualities,
space));
}
else if(f < 0) {
return;
}
if(i < startNode.position) {
i = startNode.position;
}
numStartNodesAdded++;
}
}
}
}
if(numStartNodesAdded == 0) {
throw new Exception("Did not add any start nodes!");
}
// Get first node off the heap
curAlignHeapNode = heap.poll();
while(null != curAlignHeapNode) {
if(MAX_HEAP_SIZE <= heap.size()) {
// too many to consider
return;
}
//System.err.println("strand:" + strand + "\tsize:" + heap.size() + "\talignmentStart:" + alignmentStart + "\toffset:" + offset + "\treadOffset:" + curAlignHeapNode.readOffset);
//System.err.print("size:" + heap.size() + ":" + curAlignHeapNode.readOffset + ":" + curAlignHeapNode.score + ":" + curAlignHeapNode.alleleCoverageSum + ":" + curAlignHeapNode.startPosition + "\t");
//curAlignHeapNode.node.print(System.err);
//System.err.print("\rposition:" + curAlignHeapNode.node.position + "\treadOffset:" + curAlignHeapNode.readOffset);
// Remove all non-insertions with the same contig/pos/read-offset/type/base and lower score
nextAlignHeapNode = heap.peek();
while(Node.INSERTION != curAlignHeapNode.node.type
&& null != nextAlignHeapNode
&& 0 == comp.compare(curAlignHeapNode, nextAlignHeapNode))
{
if(curAlignHeapNode.score < nextAlignHeapNode.score ||
(curAlignHeapNode.score == nextAlignHeapNode.score &&
curAlignHeapNode.alleleCoverageSum < nextAlignHeapNode.alleleCoverageSum)) {
// Update current node
curAlignHeapNode = heap.poll();
}
else {
// Ignore next node
heap.poll();
}
nextAlignHeapNode = heap.peek();
}
nextAlignHeapNode=null;
// Check if the alignment is complete
if(curAlignHeapNode.readOffset == read.length() - 1) {
// All read bases examined, store if has the best alignment.
//System.err.print(curAlignHeapNode.alleleCoverageSum + ":" + curAlignHeapNode.score + ":");
//System.err.print(curAlignHeapNode.startPosition + ":");
//curAlignHeapNode.node.print(System.err);
if(null == bestAlignHeapNode
|| bestAlignHeapNode.score < curAlignHeapNode.score
|| (bestAlignHeapNode.score == curAlignHeapNode.score
&& bestAlignHeapNode.alleleCoverageSum < curAlignHeapNode.alleleCoverageSum))
{
bestAlignHeapNode = curAlignHeapNode;
}
}
else if(null != bestAlignHeapNode && curAlignHeapNode.score < bestAlignHeapNode.score) {
// ignore, under the assumption that scores can only become more negative.
}
else {
if(strand) { // reverse
// Go to all the "prev" nodes
iter = curAlignHeapNode.node.prev.listIterator();
}
else { // forward
// Go to all "next" nodes
iter = curAlignHeapNode.node.next.listIterator();
}
while(iter.hasNext()) {
NodeRecord next = iter.next();
int f = passFilters(graph,
next.node,
next.coverage,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(curAlignHeapNode,
next.node,
next.coverage,
read.charAt(curAlignHeapNode.readOffset+1),
qualities.charAt(curAlignHeapNode.readOffset+1),
useSequenceQualities,
space));
}
else if(f < 0) {
return;
}
}
iter=null;
}
// Get next node
curAlignHeapNode = heap.poll();
}
// Recover alignment
Align.updateSAM(rec, sequence, programRecord, bestAlignHeapNode, space, read, qualities, softClipStartBases, softClipStartQualities, softClipEndBases, softClipEndQualities, strand, correctBases);
}
private static void removeMateInfo(SAMRecord rec)
{
if(rec.getReadPairedFlag()) {
// Remove all information of its mate
// flag
rec.setProperPairFlag(false); // not paired any more
rec.setMateUnmappedFlag(false);
rec.setMateNegativeStrandFlag(false);
// entries
rec.setMateReferenceIndex(SAMRecord.NO_ALIGNMENT_REFERENCE_INDEX);
rec.setMateAlignmentStart(0);
rec.setInferredInsertSize(0);
// TODO: remove tags and values that are mate pair inclined.
}
}
private static AlignHeapNode boundWithOriginalAlignment(SAMRecord rec,
Graph graph,
Node recNode,
AlignHeapNodeComparator comp,
boolean strand,
String read, // could be cs
String qualities, // could be cq
String readBases, // always nt
SRMAUtil.Space space,
ReferenceSequence sequence,
AlleleCoverageCutoffs alleleCoverageCutoffs,
boolean useSequenceQualities,
int MAXIMUM_TOTAL_COVERAGE,
int MAX_HEAP_SIZE)
throws Exception
{
AlignHeapNode curAlignHeapNode = null;
AlignHeapNode nextAlignHeapNode = null;
AlignHeapNode bestAlignHeapNode = null;
ListIterator<NodeRecord> iter=null;
AlignHeap heap = null;
// Cannot bound
if(0 != passFilters(graph,
recNode,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE)) {
return null;
}
// Initialize heap
if(strand) { // reverse
heap = new AlignHeap(AlignHeap.HeapType.MAXHEAP);
}
else { // forward
heap = new AlignHeap(AlignHeap.HeapType.MINHEAP);
}
// Add start nodes
heap.add(new AlignHeapNode(null,
recNode,
recNode.coverage,
read.charAt(0),
qualities.charAt(0),
useSequenceQualities,
space));
curAlignHeapNode = heap.poll();
while(null != curAlignHeapNode) {
if(MAX_HEAP_SIZE <= heap.size()) {
// too many to consider
return null;
}
// Remove all non-insertions with the same contig/pos/read-offset/type/base and lower score
nextAlignHeapNode = heap.peek();
while(Node.INSERTION != curAlignHeapNode.node.type
&& null != nextAlignHeapNode
&& 0 == comp.compare(curAlignHeapNode, nextAlignHeapNode))
{
if(curAlignHeapNode.score < nextAlignHeapNode.score ||
(curAlignHeapNode.score == nextAlignHeapNode.score &&
curAlignHeapNode.alleleCoverageSum < nextAlignHeapNode.alleleCoverageSum))
{
// Update current node
curAlignHeapNode = heap.poll();
}
else {
// Ignore next node
heap.poll();
}
nextAlignHeapNode = heap.peek();
}
nextAlignHeapNode=null;
if(curAlignHeapNode.readOffset == readBases.length() - 1) { // found, keep beset
if(null == bestAlignHeapNode
|| bestAlignHeapNode.score < curAlignHeapNode.score
|| (bestAlignHeapNode.score == curAlignHeapNode.score
&& bestAlignHeapNode.alleleCoverageSum < curAlignHeapNode.alleleCoverageSum))
{
bestAlignHeapNode = curAlignHeapNode;
}
}
else {
if(strand) { // reverse
// Go to all the "prev" nodes
iter = curAlignHeapNode.node.prev.listIterator();
}
else { // forward
// Go to all "next" nodes
iter = curAlignHeapNode.node.next.listIterator();
}
// Get the expected next position in the alignment
while(iter.hasNext()) {
NodeRecord next = iter.next();
// Base should match alignment
if(next.node.base == readBases.charAt(curAlignHeapNode.readOffset+1)) {
int f = passFilters(graph,
next.node,
next.coverage,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(curAlignHeapNode,
next.node,
next.coverage,
read.charAt(curAlignHeapNode.readOffset+1),
qualities.charAt(curAlignHeapNode.readOffset+1),
useSequenceQualities,
space));
}
else if(f < 0) {
return null;
}
}
}
iter=null;
}
// Get next
curAlignHeapNode = heap.poll();
}
return bestAlignHeapNode;
}
private static byte getColorQuality(byte e1, byte e2, byte q1, byte q2)
{
int val;
if(e1 == (byte)Alignment.GAP && e2 == (byte)Alignment.GAP) {
val = q1 + q2 + 10;
}
else if(e1 == (byte)Alignment.GAP) {
val = q1 - q2;
}
else if(e2 == (byte)Alignment.GAP) {
val = q2 - q1;
}
else {
val = 1;
}
if(val <= 0) {
val = 1;
}
else if(63 < val) {
val = 63;
}
return (byte)val;
}
private static void updateSAM(SAMRecord rec,
ReferenceSequence sequence,
SAMProgramRecord programRecord, AlignHeapNode bestAlignHeapNode, SRMAUtil.Space space, String read, String qualities, String softClipStartBases, String softClipStartQualities, String softClipEndBases, String softClipEndQualities, boolean strand, boolean correctBases)
throws Exception
{
AlignHeapNode curAlignHeapNode=null;
AlignHeapNode prevAlignHeapNode=null;
int alignmentStart = 0;
int readIndex=-1;
byte readBases[] = null;
byte baseQualities[] = null;
byte colorErrors[] = null;
int i;
int numEdits = 0;
List<String> optFieldTags = new LinkedList<String>();
List<Object> optFieldValues = new LinkedList<Object>();
Object attr;
// Debugging stuff
String readName = rec.getReadName();
if(null == bestAlignHeapNode) {
// Do not modify the alignment
return;
}
// To generate a new CIGAR
List<CigarElement> cigarElements=null;
CigarOperator prevCigarOperator=null, curCigarOperator=null;
int prevCigarOperatorLength=0;
// TODO
// setInferredInsertSize (invalidates paired end reads)
// setMappingQuality (?)
// setFlag
// update base qualities for color space reads
// clear attributes, but save some
Align.clearAttributes(rec, optFieldTags, optFieldValues);
readBases = new byte[read.length()];
baseQualities = new byte[qualities.length()];
for(i=0;i<qualities.length();i++) {
// Must subtract 33 for PHRED scaling
baseQualities[i] = (byte)(qualities.charAt(i) - 33);
}
if(strand) {
readIndex=0;
}
else {
readIndex = read.length()-1;
}
cigarElements = new LinkedList<CigarElement>();
if(strand) { // reverse strand is the current position
alignmentStart=bestAlignHeapNode.node.position;
}
else {
alignmentStart=bestAlignHeapNode.startPosition;
}
assert null != bestAlignHeapNode;
curAlignHeapNode = bestAlignHeapNode;
while(null != curAlignHeapNode) {
// Get the current cigar operator
if(null != prevAlignHeapNode && CigarOperator.DELETION != prevCigarOperator && 1 < Math.abs(curAlignHeapNode.node.position - prevAlignHeapNode.node.position)) {
curCigarOperator = CigarOperator.DELETION;
}
else {
switch(curAlignHeapNode.node.type) {
case Node.MISMATCH: // Fall through
case Node.MATCH:
curCigarOperator = CigarOperator.MATCH_OR_MISMATCH;
break;
case Node.INSERTION:
//System.out.println("INS");
curCigarOperator = CigarOperator.INSERTION;
break;
default:
throw new Exception("Unknown node type");
}
if(space == SRMAUtil.Space.COLORSPACE || correctBases) {
readBases[readIndex] = (byte)curAlignHeapNode.node.base;
if(strand) {
readIndex++;
}
else {
readIndex--;
}
// count the number of mismatches
switch(curAlignHeapNode.node.type) {
case Node.MISMATCH:
case Node.INSERTION:
numEdits++;
break;
default:
break;
}
}
else {
// count the number of mismatches
switch(curAlignHeapNode.node.type) {
case Node.MATCH:
if(read.charAt(curAlignHeapNode.readOffset) != curAlignHeapNode.node.base) {
numEdits++;
}
break;
case Node.MISMATCH: // Fall through
if(read.charAt(curAlignHeapNode.readOffset) != sequence.getBases()[curAlignHeapNode.node.position-1]) {
numEdits++;
}
break;
case Node.INSERTION:
numEdits++;
break;
default:
break;
}
}
}
if(prevCigarOperator != curCigarOperator) {
// different cigar operator
// add the previous cigar operator
if(null != prevCigarOperator) {
if(strand) { // reverse
// append
cigarElements.add(new CigarElement(prevCigarOperatorLength, prevCigarOperator));
}
else {
// prepend
cigarElements.add(0, new CigarElement(prevCigarOperatorLength, prevCigarOperator));
}
}
// update prevCigarOperator
prevCigarOperator = curCigarOperator;
if(curCigarOperator == CigarOperator.DELETION) {
// length of deletion
prevCigarOperatorLength = Math.abs(curAlignHeapNode.node.position - prevAlignHeapNode.node.position) - 1;
numEdits += prevCigarOperatorLength; // deletions
}
else {
prevCigarOperatorLength=1;
}
}
else {
// same cigar operator
prevCigarOperatorLength++;
}
// Update
if(CigarOperator.DELETION != curCigarOperator) {
prevAlignHeapNode = curAlignHeapNode;
curAlignHeapNode = curAlignHeapNode.prev;
}
}
if(0 < prevCigarOperatorLength) {
if(null == prevCigarOperator || CigarOperator.DELETION == prevCigarOperator) {
throw new Exception("Ended with a null cigar operator or a deletion cigar operator");
}
if(strand) { // reverse
// append
cigarElements.add(new CigarElement(prevCigarOperatorLength, prevCigarOperator));
}
else {
// prepend
cigarElements.add(0, new CigarElement(prevCigarOperatorLength, prevCigarOperator));
}
}
if(space == SRMAUtil.Space.COLORSPACE) { // color space, read bases already inferred
// Get color error string
colorErrors = new byte[read.length()];
char prevBase = SRMAUtil.COLORSPACE_ADAPTOR;
if(strand) { // reverse
for(i=0;i<read.length();i++) {
char nextBase = SRMAUtil.colorSpaceNextBase(prevBase, read.charAt(i));
if(nextBase == SRMAUtil.getCompliment((char)readBases[read.length()-i-1])) {
colorErrors[i] = (byte)Alignment.GAP;
}
else {
colorErrors[i] = (byte)read.charAt(i);
}
if(0 < i) {
// qualities are assumed to be always in the same direction as the color errors
baseQualities[read.length()-i] = getColorQuality(colorErrors[i-1],
colorErrors[i],
(byte)(qualities.charAt(i-1) - 33),
(byte)(qualities.charAt(i) - 33));
}
prevBase = SRMAUtil.getCompliment((char)readBases[read.length()-i-1]);
}
// last color
baseQualities[0] = (byte)(qualities.charAt(read.length()-1)-33);
}
else {
for(i=0;i<read.length();i++) {
char nextBase = SRMAUtil.colorSpaceNextBase(prevBase, read.charAt(i));
if(nextBase == readBases[i]) {
colorErrors[i] = (byte)Alignment.GAP;
}
else {
colorErrors[i] = (byte)read.charAt(i);
}
if(0 < i) {
baseQualities[i-1] = getColorQuality(colorErrors[i-1],
colorErrors[i],
(byte)(qualities.charAt(i-1) - 33),
(byte)(qualities.charAt(i) - 33));
}
prevBase = (char)readBases[i];
}
// last color
baseQualities[read.length()-1] = (byte)(qualities.charAt(read.length()-1)-33);
}
}
else if(correctBases) { // bases were corrected
if(strand) {
for(i=0;i<read.length();i++) {
if(readBases[i] == (byte)read.charAt(read.length() - i - 1)) {
baseQualities[i] = (byte)(qualities.charAt(read.length() - i - 1) - 33);
}
else {
// TODO: how much to down-weight ?
baseQualities[i] = (byte)(SRMAUtil.QUAL2CHAR(SRMAUtil.CHAR2QUAL(qualities.charAt(read.length() - i - 1)) - CORRECT_BASE_QUALITY_PENALTY) - 33);
if(baseQualities[i] <= 0) {
baseQualities[i]=1;
}
}
}
}
else {
for(i=0;i<read.length();i++) {
if(readBases[i] == (byte)read.charAt(i)) {
baseQualities[i] = (byte)(qualities.charAt(i) - 33);
}
else {
// TODO: how much to down-weight ?
baseQualities[i] = (byte)(SRMAUtil.QUAL2CHAR(SRMAUtil.CHAR2QUAL(qualities.charAt(i)) - CORRECT_BASE_QUALITY_PENALTY) - 33);
if(baseQualities[i] <= 0) {
baseQualities[i]=1;
}
}
}
}
rec.setAttribute("XO", read);
rec.setAttribute("XQ", qualities);
}
else { // bases not corrected
readBases = new byte[read.length()];
baseQualities = new byte[qualities.length()]; // qualities.length() == read.length()
if(strand) { // reverse
for(i=0;i<read.length();i++) {
readBases[i] = (byte)read.charAt(read.length() - i - 1);
baseQualities[i] = (byte)(qualities.charAt(read.length() - i -1) - 33);
}
}
else {
for(i=0;i<read.length();i++) {
readBases[i] = (byte)read.charAt(i);
baseQualities[i] = (byte)(qualities.charAt(i) - 33);
}
}
}
// Add in soft-clipping
if(null != softClipStartBases) { // prepend
cigarElements.add(0, new CigarElement(softClipStartBases.length(), CigarOperator.S));
byte tmpBases[] = new byte[readBases.length + softClipStartBases.length()];
System.arraycopy(readBases, 0, tmpBases, softClipStartBases.length(), readBases.length);
readBases = tmpBases;
for(i=0;i<softClipStartBases.length();i++) {
readBases[i] = (byte)softClipStartBases.charAt(i);
}
byte tmpQualities[] = new byte[baseQualities.length + softClipStartQualities.length()];
System.arraycopy(baseQualities, 0, tmpQualities, softClipStartQualities.length(), baseQualities.length);
baseQualities = tmpQualities;
for(i=0;i<softClipStartQualities.length();i++) {
baseQualities[i] = (byte)softClipStartQualities.charAt(i);
}
}
if(null != softClipEndBases) { // append
cigarElements.add(new CigarElement(softClipEndBases.length(), CigarOperator.S));
byte tmpBases[] = new byte[readBases.length + softClipEndBases.length()];
System.arraycopy(readBases, 0, tmpBases, 0, readBases.length);
for(i=0;i<softClipEndBases.length();i++) {
tmpBases[i+readBases.length] = (byte)softClipEndBases.charAt(i);
}
readBases = tmpBases;
byte tmpQualities[] = new byte[baseQualities.length + softClipEndQualities.length()];
System.arraycopy(baseQualities, 0, tmpQualities, 0, baseQualities.length);
for(i=0;i<softClipEndQualities.length();i++) {
tmpQualities[i+baseQualities.length] = (byte)softClipEndQualities.charAt(i);
}
baseQualities = tmpQualities;
}
// Update SAM record
rec.setCigar(new Cigar(cigarElements));
rec.setAlignmentStart(alignmentStart);
rec.setReadBases(readBases);
rec.setBaseQualities(baseQualities);
// Reset saved attributes
Align.resetAttributes(rec, optFieldTags, optFieldValues);
// Set new attributes
if(space == SRMAUtil.Space.COLORSPACE) {
// set the XE attribute for colorError string
rec.setAttribute("XE", new String(colorErrors));
}
rec.setAttribute("AS", bestAlignHeapNode.score);
rec.setAttribute("XC", bestAlignHeapNode.alleleCoverageSum);
rec.setAttribute("PG", programRecord.getId());
rec.setAttribute("NM", numEdits);
}
/*
* -1 if the alignment process should be aborted
* 0 if the alignment should continue
* 1 if the alignment should not be considered any further
* */
private static int passFilters(Graph graph,
Node node,
int toNodeCoverage,
AlleleCoverageCutoffs alleleCoverageCutoffs,
int MAXIMUM_TOTAL_COVERAGE)
{
int totalCoverage = graph.getCoverage(node.position);
if(MAXIMUM_TOTAL_COVERAGE < totalCoverage) {
return -1;
}
else if(alleleCoverageCutoffs.getQ(totalCoverage) <= toNodeCoverage) {
return 0;
}
else {
return 1;
}
}
private static int passFilters(Graph graph,
Node node,
AlleleCoverageCutoffs alleleCoverageCutoffs,
int MAXIMUM_TOTAL_COVERAGE)
{
return passFilters(graph, node, node.coverage, alleleCoverageCutoffs, MAXIMUM_TOTAL_COVERAGE);
}
private static void clearAttributes(SAMRecord rec, List<String> optFieldTags, List<Object> optFieldValues)
{
ListIterator<String> iter = saveTags.listIterator();
while(iter.hasNext()) {
String tag = iter.next();
Object attr = rec.getAttribute(tag);
if(null != attr) {
optFieldTags.add(tag);
optFieldValues.add(attr);
}
}
rec.clearAttributes();
}
private static void resetAttributes(SAMRecord rec, List<String> optFieldTags, List<Object> optFieldValues)
{
ListIterator<String> iterTags = optFieldTags.listIterator();
ListIterator<Object> iterValues = optFieldValues.listIterator();
while(iterTags.hasNext()) {
rec.setAttribute(iterTags.next(), iterValues.next());
}
}
}
| true | true | public static void align(Graph graph, SAMRecord rec, Node recNode,
ReferenceSequence sequence,
SAMProgramRecord programRecord,
int offset,
AlleleCoverageCutoffs alleleCoverageCutoffs,
boolean correctBases,
boolean useSequenceQualities,
int MAXIMUM_TOTAL_COVERAGE,
int MAX_HEAP_SIZE)
throws Exception
{
int i;
AlignHeapNode curAlignHeapNode = null;
AlignHeapNode nextAlignHeapNode = null;
AlignHeapNode bestAlignHeapNode=null;
AlignHeap heap=null;
String read=null; // could be cs
String readBases = null; // always nt
String qualities=null; // could be cq
SRMAUtil.Space space=SRMAUtil.Space.NTSPACE;
ListIterator<NodeRecord> iter=null;
AlignHeapNodeComparator comp=null;
int alignmentStart = -1;
int numStartNodesAdded = 0;
boolean strand = rec.getReadNegativeStrandFlag(); // false -> forward, true -> reverse
String softClipStartBases = null;
String softClipStartQualities = null;
String softClipEndBases = null;
String softClipEndQualities = null;
// Debugging stuff
String readName = rec.getReadName();
assert SRMAUtil.Space.COLORSPACE != space;
// Get space
read = (String)rec.getAttribute("CS");
if(null == read) {
// Use base space
space = SRMAUtil.Space.NTSPACE;
}
else {
// assumes CS and CQ are always in sequencing order
space = SRMAUtil.Space.COLORSPACE;
}
// Get read and qualities
if(space == SRMAUtil.Space.NTSPACE) {
byte tmpRead[] = rec.getReadString().getBytes();
byte tmpQualities[] = rec.getBaseQualityString().getBytes();
// Reverse once
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
SAMRecordUtil.reverseArray(tmpQualities);
}
read = new String(tmpRead);
readBases = new String(tmpRead);
qualities = new String(tmpQualities);
// Reverse again
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
SAMRecordUtil.reverseArray(tmpQualities);
}
}
else {
byte tmpRead[] = rec.getReadString().getBytes();
// Reverse once
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
}
readBases = new String(tmpRead);
// Reverse again
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
}
read = SRMAUtil.normalizeColorSpaceRead(read);
qualities = (String)rec.getAttribute("CQ");
// Some aligners include a quality value for the adapter. A quality value
// IMHO should not be given for an unobserved (assumed) peice of data. Trim
// the first quality in this case
if(qualities.length() == 1 + read.length()) { // trim the first quality
qualities = qualities.substring(1);
}
}
// Reverse back
if(readBases.length() <= 0) {
throw new Exception("Error. The current alignment has no bases.");
}
if(read.length() <= 0) {
throw new Exception("Error. The current alignment has no bases.");
}
if(qualities.length() <= 0) {
throw new Exception("Error. The current alignment has no qualities.");
}
if(readBases.length() != read.length()) {
if(space == SRMAUtil.Space.COLORSPACE) {
throw new Exception("Error. The current alignment's read bases length does not match the length of the colors in the CS tag.");
}
else {
throw new Exception("Error. Internal error: readBases.length() != read.length()");
}
}
// Deal with soft-clipping
// - save the soft clipped sequence for latter
{
List<CigarElement> cigarElements = null;
cigarElements = rec.getCigar().getCigarElements();
CigarElement e1 = cigarElements.get(0); // first
CigarElement e2 = cigarElements.get(cigarElements.size()-1); // last
// Soft-clipped
if(CigarOperator.S == e1.getOperator()) {
if(space == SRMAUtil.Space.COLORSPACE) {
throw new Exception("Error. Soft clipping with color-space data not currently supported.");
}
int l = e1.getLength();
if(strand) { // reverse
softClipStartBases = readBases.substring(readBases.length() - l);
softClipStartQualities = qualities.substring(qualities.length() - l);
readBases = readBases.substring(0, readBases.length() - l);
read = read.substring(0, read.length() - l);
qualities = qualities.substring(0, qualities.length() - l);
}
else {
softClipStartBases = readBases.substring(0, l-1);
softClipStartQualities = qualities.substring(0, l-1);
readBases = readBases.substring(l);
read = read.substring(l);
qualities = qualities.substring(l);
}
}
if(CigarOperator.S == e2.getOperator()) {
if(space == SRMAUtil.Space.COLORSPACE) {
throw new Exception("Error. Soft clipping with color-space data not currently supported.");
}
int l = e2.getLength();
if(strand) { // reverse
softClipEndBases = readBases.substring(0, l-1);
softClipEndQualities = qualities.substring(0, l-1);
readBases = readBases.substring(l);
read = read.substring(l);
qualities = qualities.substring(l);
}
else {
softClipEndBases = readBases.substring(readBases.length() - l);
softClipEndQualities = qualities.substring(qualities.length() - l);
readBases = readBases.substring(0, readBases.length() - l);
read = read.substring(0, read.length() - l);
qualities = qualities.substring(0, qualities.length() - l);
}
}
}
// Remove mate pair information
Align.removeMateInfo(rec);
comp = new AlignHeapNodeComparator((strand) ? AlignHeap.HeapType.MAXHEAP : AlignHeap.HeapType.MINHEAP);
// Bound by original alignment if possible
bestAlignHeapNode = Align.boundWithOriginalAlignment(rec,
graph,
recNode,
comp,
strand,
read,
qualities,
readBases,
space,
sequence,
alleleCoverageCutoffs,
useSequenceQualities,
MAXIMUM_TOTAL_COVERAGE,
MAX_HEAP_SIZE);
/*
System.err.println("readName="+rec.getReadName());
if(null != bestAlignHeapNode) {
System.err.println("\nFOUND BEST:" + rec.toString());
}
else {
System.err.println("\nNOT FOUND (BEST): " + rec.toString());
}
Align.updateSAM(rec, programRecord, bestAlignHeapNode, space, read, qualities, softClipStartBases, softClipStartQualities, softClipEndBases, softClipEndQualities, strand, correctBases);
return;
*/
heap = new AlignHeap((strand) ? AlignHeap.HeapType.MAXHEAP : AlignHeap.HeapType.MINHEAP);
// Add start nodes
if(strand) { // reverse
alignmentStart = rec.getAlignmentEnd();
for(i=alignmentStart+offset;alignmentStart-offset<=i;i--) {
int position = graph.getPriorityQueueIndexAtPositionOrBefore(i);
PriorityQueue<Node> startNodeQueue = graph.getPriorityQueue(position);
if(0 != position && null != startNodeQueue) {
Iterator<Node> startNodeQueueIter = startNodeQueue.iterator();
while(startNodeQueueIter.hasNext()) {
Node startNode = startNodeQueueIter.next();
int f = passFilters(graph,
startNode,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(null,
startNode,
startNode.coverage,
read.charAt(0),
qualities.charAt(0),
useSequenceQualities,
space));
}
else if(f < 0) {
return;
}
if(startNode.position < i) {
i = startNode.position;
}
numStartNodesAdded++;
}
}
}
}
else {
alignmentStart = rec.getAlignmentStart();
for(i=alignmentStart-offset;i<=alignmentStart+offset;i++) {
int position = graph.getPriorityQueueIndexAtPositionOrGreater(i);
PriorityQueue<Node> startNodeQueue = graph.getPriorityQueue(position);
if(0 != position && null != startNodeQueue) {
Iterator<Node> startNodeQueueIter = startNodeQueue.iterator();
while(startNodeQueueIter.hasNext()) {
Node startNode = startNodeQueueIter.next();
int f = passFilters(graph,
startNode,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(null,
startNode,
startNode.coverage,
read.charAt(0),
qualities.charAt(0),
useSequenceQualities,
space));
}
else if(f < 0) {
return;
}
if(i < startNode.position) {
i = startNode.position;
}
numStartNodesAdded++;
}
}
}
}
if(numStartNodesAdded == 0) {
throw new Exception("Did not add any start nodes!");
}
// Get first node off the heap
curAlignHeapNode = heap.poll();
while(null != curAlignHeapNode) {
if(MAX_HEAP_SIZE <= heap.size()) {
// too many to consider
return;
}
//System.err.println("strand:" + strand + "\tsize:" + heap.size() + "\talignmentStart:" + alignmentStart + "\toffset:" + offset + "\treadOffset:" + curAlignHeapNode.readOffset);
//System.err.print("size:" + heap.size() + ":" + curAlignHeapNode.readOffset + ":" + curAlignHeapNode.score + ":" + curAlignHeapNode.alleleCoverageSum + ":" + curAlignHeapNode.startPosition + "\t");
//curAlignHeapNode.node.print(System.err);
//System.err.print("\rposition:" + curAlignHeapNode.node.position + "\treadOffset:" + curAlignHeapNode.readOffset);
// Remove all non-insertions with the same contig/pos/read-offset/type/base and lower score
nextAlignHeapNode = heap.peek();
while(Node.INSERTION != curAlignHeapNode.node.type
&& null != nextAlignHeapNode
&& 0 == comp.compare(curAlignHeapNode, nextAlignHeapNode))
{
if(curAlignHeapNode.score < nextAlignHeapNode.score ||
(curAlignHeapNode.score == nextAlignHeapNode.score &&
curAlignHeapNode.alleleCoverageSum < nextAlignHeapNode.alleleCoverageSum)) {
// Update current node
curAlignHeapNode = heap.poll();
}
else {
// Ignore next node
heap.poll();
}
nextAlignHeapNode = heap.peek();
}
nextAlignHeapNode=null;
// Check if the alignment is complete
if(curAlignHeapNode.readOffset == read.length() - 1) {
// All read bases examined, store if has the best alignment.
//System.err.print(curAlignHeapNode.alleleCoverageSum + ":" + curAlignHeapNode.score + ":");
//System.err.print(curAlignHeapNode.startPosition + ":");
//curAlignHeapNode.node.print(System.err);
if(null == bestAlignHeapNode
|| bestAlignHeapNode.score < curAlignHeapNode.score
|| (bestAlignHeapNode.score == curAlignHeapNode.score
&& bestAlignHeapNode.alleleCoverageSum < curAlignHeapNode.alleleCoverageSum))
{
bestAlignHeapNode = curAlignHeapNode;
}
}
else if(null != bestAlignHeapNode && curAlignHeapNode.score < bestAlignHeapNode.score) {
// ignore, under the assumption that scores can only become more negative.
}
else {
if(strand) { // reverse
// Go to all the "prev" nodes
iter = curAlignHeapNode.node.prev.listIterator();
}
else { // forward
// Go to all "next" nodes
iter = curAlignHeapNode.node.next.listIterator();
}
while(iter.hasNext()) {
NodeRecord next = iter.next();
int f = passFilters(graph,
next.node,
next.coverage,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(curAlignHeapNode,
next.node,
next.coverage,
read.charAt(curAlignHeapNode.readOffset+1),
qualities.charAt(curAlignHeapNode.readOffset+1),
useSequenceQualities,
space));
}
else if(f < 0) {
return;
}
}
iter=null;
}
// Get next node
curAlignHeapNode = heap.poll();
}
// Recover alignment
Align.updateSAM(rec, sequence, programRecord, bestAlignHeapNode, space, read, qualities, softClipStartBases, softClipStartQualities, softClipEndBases, softClipEndQualities, strand, correctBases);
}
| public static void align(Graph graph, SAMRecord rec, Node recNode,
ReferenceSequence sequence,
SAMProgramRecord programRecord,
int offset,
AlleleCoverageCutoffs alleleCoverageCutoffs,
boolean correctBases,
boolean useSequenceQualities,
int MAXIMUM_TOTAL_COVERAGE,
int MAX_HEAP_SIZE)
throws Exception
{
int i;
AlignHeapNode curAlignHeapNode = null;
AlignHeapNode nextAlignHeapNode = null;
AlignHeapNode bestAlignHeapNode=null;
AlignHeap heap=null;
String read=null; // could be cs
String readBases = null; // always nt
String qualities=null; // could be cq
SRMAUtil.Space space=SRMAUtil.Space.NTSPACE;
ListIterator<NodeRecord> iter=null;
AlignHeapNodeComparator comp=null;
int alignmentStart = -1;
int numStartNodesAdded = 0;
boolean strand = rec.getReadNegativeStrandFlag(); // false -> forward, true -> reverse
String softClipStartBases = null;
String softClipStartQualities = null;
String softClipEndBases = null;
String softClipEndQualities = null;
// Debugging stuff
String readName = rec.getReadName();
assert SRMAUtil.Space.COLORSPACE != space;
// Get space
read = (String)rec.getAttribute("CS");
if(null == read) {
// Use base space
space = SRMAUtil.Space.NTSPACE;
}
else {
// assumes CS and CQ are always in sequencing order
space = SRMAUtil.Space.COLORSPACE;
}
// Get read and qualities
if(space == SRMAUtil.Space.NTSPACE) {
byte tmpRead[] = rec.getReadString().getBytes();
byte tmpQualities[] = rec.getBaseQualityString().getBytes();
// Reverse once
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
SAMRecordUtil.reverseArray(tmpQualities);
}
read = new String(tmpRead);
readBases = new String(tmpRead);
qualities = new String(tmpQualities);
// Reverse again
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
SAMRecordUtil.reverseArray(tmpQualities);
}
}
else {
byte tmpRead[] = rec.getReadString().getBytes();
// Reverse once
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
}
readBases = new String(tmpRead);
// Reverse again
if(strand) { // reverse
SAMRecordUtil.reverseArray(tmpRead);
}
read = SRMAUtil.normalizeColorSpaceRead(read);
qualities = (String)rec.getAttribute("CQ");
// Some aligners include a quality value for the adapter. A quality value
// IMHO should not be given for an unobserved (assumed) peice of data. Trim
// the first quality in this case
if(qualities.length() == 1 + read.length()) { // trim the first quality
qualities = qualities.substring(1);
}
}
// Reverse back
if(readBases.length() <= 0) {
throw new Exception("Error. The current alignment has no bases.");
}
if(read.length() <= 0) {
throw new Exception("Error. The current alignment has no bases.");
}
if(qualities.length() <= 0) {
throw new Exception("Error. The current alignment has no qualities.");
}
if(readBases.length() != read.length()) {
if(space == SRMAUtil.Space.COLORSPACE) {
throw new Exception("Error. The current alignment's read bases length does not match the length of the colors in the CS tag [" + rec.getReadName() + "].");
}
else {
throw new Exception("Error. Internal error: readBases.length() != read.length()");
}
}
// Deal with soft-clipping
// - save the soft clipped sequence for latter
{
List<CigarElement> cigarElements = null;
cigarElements = rec.getCigar().getCigarElements();
CigarElement e1 = cigarElements.get(0); // first
CigarElement e2 = cigarElements.get(cigarElements.size()-1); // last
// Soft-clipped
if(CigarOperator.S == e1.getOperator()) {
if(space == SRMAUtil.Space.COLORSPACE) {
throw new Exception("Error. Soft clipping with color-space data not currently supported.");
}
int l = e1.getLength();
if(strand) { // reverse
softClipStartBases = readBases.substring(readBases.length() - l);
softClipStartQualities = qualities.substring(qualities.length() - l);
readBases = readBases.substring(0, readBases.length() - l);
read = read.substring(0, read.length() - l);
qualities = qualities.substring(0, qualities.length() - l);
}
else {
softClipStartBases = readBases.substring(0, l-1);
softClipStartQualities = qualities.substring(0, l-1);
readBases = readBases.substring(l);
read = read.substring(l);
qualities = qualities.substring(l);
}
}
if(CigarOperator.S == e2.getOperator()) {
if(space == SRMAUtil.Space.COLORSPACE) {
throw new Exception("Error. Soft clipping with color-space data not currently supported.");
}
int l = e2.getLength();
if(strand) { // reverse
softClipEndBases = readBases.substring(0, l-1);
softClipEndQualities = qualities.substring(0, l-1);
readBases = readBases.substring(l);
read = read.substring(l);
qualities = qualities.substring(l);
}
else {
softClipEndBases = readBases.substring(readBases.length() - l);
softClipEndQualities = qualities.substring(qualities.length() - l);
readBases = readBases.substring(0, readBases.length() - l);
read = read.substring(0, read.length() - l);
qualities = qualities.substring(0, qualities.length() - l);
}
}
}
// Remove mate pair information
Align.removeMateInfo(rec);
comp = new AlignHeapNodeComparator((strand) ? AlignHeap.HeapType.MAXHEAP : AlignHeap.HeapType.MINHEAP);
// Bound by original alignment if possible
bestAlignHeapNode = Align.boundWithOriginalAlignment(rec,
graph,
recNode,
comp,
strand,
read,
qualities,
readBases,
space,
sequence,
alleleCoverageCutoffs,
useSequenceQualities,
MAXIMUM_TOTAL_COVERAGE,
MAX_HEAP_SIZE);
/*
System.err.println("readName="+rec.getReadName());
if(null != bestAlignHeapNode) {
System.err.println("\nFOUND BEST:" + rec.toString());
}
else {
System.err.println("\nNOT FOUND (BEST): " + rec.toString());
}
Align.updateSAM(rec, programRecord, bestAlignHeapNode, space, read, qualities, softClipStartBases, softClipStartQualities, softClipEndBases, softClipEndQualities, strand, correctBases);
return;
*/
heap = new AlignHeap((strand) ? AlignHeap.HeapType.MAXHEAP : AlignHeap.HeapType.MINHEAP);
// Add start nodes
if(strand) { // reverse
alignmentStart = rec.getAlignmentEnd();
for(i=alignmentStart+offset;alignmentStart-offset<=i;i--) {
int position = graph.getPriorityQueueIndexAtPositionOrBefore(i);
PriorityQueue<Node> startNodeQueue = graph.getPriorityQueue(position);
if(0 != position && null != startNodeQueue) {
Iterator<Node> startNodeQueueIter = startNodeQueue.iterator();
while(startNodeQueueIter.hasNext()) {
Node startNode = startNodeQueueIter.next();
int f = passFilters(graph,
startNode,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(null,
startNode,
startNode.coverage,
read.charAt(0),
qualities.charAt(0),
useSequenceQualities,
space));
}
else if(f < 0) {
return;
}
if(startNode.position < i) {
i = startNode.position;
}
numStartNodesAdded++;
}
}
}
}
else {
alignmentStart = rec.getAlignmentStart();
for(i=alignmentStart-offset;i<=alignmentStart+offset;i++) {
int position = graph.getPriorityQueueIndexAtPositionOrGreater(i);
PriorityQueue<Node> startNodeQueue = graph.getPriorityQueue(position);
if(0 != position && null != startNodeQueue) {
Iterator<Node> startNodeQueueIter = startNodeQueue.iterator();
while(startNodeQueueIter.hasNext()) {
Node startNode = startNodeQueueIter.next();
int f = passFilters(graph,
startNode,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(null,
startNode,
startNode.coverage,
read.charAt(0),
qualities.charAt(0),
useSequenceQualities,
space));
}
else if(f < 0) {
return;
}
if(i < startNode.position) {
i = startNode.position;
}
numStartNodesAdded++;
}
}
}
}
if(numStartNodesAdded == 0) {
throw new Exception("Did not add any start nodes!");
}
// Get first node off the heap
curAlignHeapNode = heap.poll();
while(null != curAlignHeapNode) {
if(MAX_HEAP_SIZE <= heap.size()) {
// too many to consider
return;
}
//System.err.println("strand:" + strand + "\tsize:" + heap.size() + "\talignmentStart:" + alignmentStart + "\toffset:" + offset + "\treadOffset:" + curAlignHeapNode.readOffset);
//System.err.print("size:" + heap.size() + ":" + curAlignHeapNode.readOffset + ":" + curAlignHeapNode.score + ":" + curAlignHeapNode.alleleCoverageSum + ":" + curAlignHeapNode.startPosition + "\t");
//curAlignHeapNode.node.print(System.err);
//System.err.print("\rposition:" + curAlignHeapNode.node.position + "\treadOffset:" + curAlignHeapNode.readOffset);
// Remove all non-insertions with the same contig/pos/read-offset/type/base and lower score
nextAlignHeapNode = heap.peek();
while(Node.INSERTION != curAlignHeapNode.node.type
&& null != nextAlignHeapNode
&& 0 == comp.compare(curAlignHeapNode, nextAlignHeapNode))
{
if(curAlignHeapNode.score < nextAlignHeapNode.score ||
(curAlignHeapNode.score == nextAlignHeapNode.score &&
curAlignHeapNode.alleleCoverageSum < nextAlignHeapNode.alleleCoverageSum)) {
// Update current node
curAlignHeapNode = heap.poll();
}
else {
// Ignore next node
heap.poll();
}
nextAlignHeapNode = heap.peek();
}
nextAlignHeapNode=null;
// Check if the alignment is complete
if(curAlignHeapNode.readOffset == read.length() - 1) {
// All read bases examined, store if has the best alignment.
//System.err.print(curAlignHeapNode.alleleCoverageSum + ":" + curAlignHeapNode.score + ":");
//System.err.print(curAlignHeapNode.startPosition + ":");
//curAlignHeapNode.node.print(System.err);
if(null == bestAlignHeapNode
|| bestAlignHeapNode.score < curAlignHeapNode.score
|| (bestAlignHeapNode.score == curAlignHeapNode.score
&& bestAlignHeapNode.alleleCoverageSum < curAlignHeapNode.alleleCoverageSum))
{
bestAlignHeapNode = curAlignHeapNode;
}
}
else if(null != bestAlignHeapNode && curAlignHeapNode.score < bestAlignHeapNode.score) {
// ignore, under the assumption that scores can only become more negative.
}
else {
if(strand) { // reverse
// Go to all the "prev" nodes
iter = curAlignHeapNode.node.prev.listIterator();
}
else { // forward
// Go to all "next" nodes
iter = curAlignHeapNode.node.next.listIterator();
}
while(iter.hasNext()) {
NodeRecord next = iter.next();
int f = passFilters(graph,
next.node,
next.coverage,
alleleCoverageCutoffs,
MAXIMUM_TOTAL_COVERAGE);
if(0 == f) {
heap.add(new AlignHeapNode(curAlignHeapNode,
next.node,
next.coverage,
read.charAt(curAlignHeapNode.readOffset+1),
qualities.charAt(curAlignHeapNode.readOffset+1),
useSequenceQualities,
space));
}
else if(f < 0) {
return;
}
}
iter=null;
}
// Get next node
curAlignHeapNode = heap.poll();
}
// Recover alignment
Align.updateSAM(rec, sequence, programRecord, bestAlignHeapNode, space, read, qualities, softClipStartBases, softClipStartQualities, softClipEndBases, softClipEndQualities, strand, correctBases);
}
|
diff --git a/htroot/Blacklist_p.java b/htroot/Blacklist_p.java
index 34bb67887..afb7a597f 100644
--- a/htroot/Blacklist_p.java
+++ b/htroot/Blacklist_p.java
@@ -1,596 +1,601 @@
// Blacklist_p.java
// -----------------------
// part of YaCy
// (C) by Michael Peter Christen; [email protected]
// first published on http://www.anomic.de
// Frankfurt, Germany, 2004
//
// This File is contributed by Alexander Schier
//
// $LastChangedDate$
// $LastChangedRevision$
// $LastChangedBy$
//
// 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
// You must compile this file with
// javac -classpath .:../classes Blacklist_p.java
// if the shell's current path is HTROOT
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import de.anomic.data.listManager;
import de.anomic.http.httpRequestHeader;
import de.anomic.index.indexAbstractReferenceBlacklist;
import de.anomic.index.indexReferenceBlacklist;
import de.anomic.kelondro.util.Log;
import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch;
import de.anomic.yacy.yacyURL;
public class Blacklist_p {
private final static String EDIT = "edit_";
private final static String DISABLED = "disabled_";
private final static String BLACKLIST = "blackLists_";
private final static String BLACKLIST_MOVE = "blackListsMove_";
private final static String BLACKLIST_SHARED = "BlackLists.Shared";
private final static String BLACKLIST_FILENAME_FILTER = "^.*\\.black$";
public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch<?> env) {
// initialize the list manager
listManager.switchboard = (plasmaSwitchboard) env;
listManager.listsPath = new File(listManager.switchboard.getRootPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
// getting the list of supported blacklist types
final String supportedBlacklistTypesStr = indexAbstractReferenceBlacklist.BLACKLIST_TYPES_STRING;
final String[] supportedBlacklistTypes = supportedBlacklistTypesStr.split(",");
// loading all blacklist files located in the directory
List<String> dirlist = listManager.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER);
String blacklistToUse = null;
final serverObjects prop = new serverObjects();
prop.putHTML("blacklistEngine", plasmaSwitchboard.urlBlacklist.getEngineInfo());
// do all post operations
if (post != null) {
final String action = post.get("action", "");
if(post.containsKey("testList")) {
prop.put("testlist", "1");
String urlstring = post.get("testurl", "");
if(!urlstring.startsWith("http://")) urlstring = "http://"+urlstring;
yacyURL testurl = null;
try {
testurl = new yacyURL(urlstring, null);
} catch (final MalformedURLException e) { testurl = null; }
if(testurl != null) {
prop.putHTML("testlist_url",testurl.toString());
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_CRAWLER, testurl))
prop.put("testlist_listedincrawler", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_DHT, testurl))
prop.put("testlist_listedindht", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_NEWS, testurl))
prop.put("testlist_listedinnews", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_PROXY, testurl))
prop.put("testlist_listedinproxy", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_SEARCH, testurl))
prop.put("testlist_listedinsearch", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_SURFTIPS, testurl))
prop.put("testlist_listedinsurftips", "1");
}
else prop.put("testlist_url","not valid");
}
if (post.containsKey("selectList")) {
blacklistToUse = post.get("selectedListName");
if (blacklistToUse != null && blacklistToUse.length() == 0) blacklistToUse = null;
}
if (post.containsKey("createNewList")) {
/* ===========================================================
* Creation of a new blacklist
* =========================================================== */
blacklistToUse = post.get("newListName");
if (blacklistToUse.trim().length() == 0) {
prop.put("LOCATION","");
return prop;
}
// Check if blacklist name only consists of "legal" characters.
// This is mainly done to prevent files from being written to other directories
// than the LISTS directory.
if (!blacklistToUse.matches("^[\\p{L}\\d\\+\\-_]+[\\p{L}\\d\\+\\-_.]*(\\.black){0,1}$")) {
prop.put("error", 1);
prop.putHTML("error_name", blacklistToUse);
blacklistToUse = null;
} else {
if (!blacklistToUse.endsWith(".black")) blacklistToUse += ".black";
if (!dirlist.contains(blacklistToUse)) {
try {
final File newFile = new File(listManager.listsPath, blacklistToUse);
newFile.createNewFile();
// share the newly created blacklist
listManager.updateListSet(BLACKLIST_SHARED, blacklistToUse);
// activate it for all known blacklist types
for (int blTypes = 0; blTypes < supportedBlacklistTypes.length; blTypes++) {
listManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklistToUse);
}
} catch (final IOException e) {/* */}
} else {
prop.put("error", 2);
prop.putHTML("error_name", blacklistToUse);
blacklistToUse = null;
}
// reload Blacklists
dirlist = listManager.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER);
}
} else if (post.containsKey("deleteList")) {
/* ===========================================================
* Delete a blacklist
* =========================================================== */
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
prop.put("LOCATION","");
return prop;
}
final File BlackListFile = new File(listManager.listsPath, blacklistToUse);
if(!BlackListFile.delete()) {
Log.logWarning("Blacklist", "file "+ BlackListFile +" could not be deleted!");
}
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
listManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
}
// remove it from the shared list
listManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse);
blacklistToUse = null;
// reload Blacklists
dirlist = listManager.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER);
} else if (post.containsKey("activateList")) {
/* ===========================================================
* Activate/Deactivate a blacklist
* =========================================================== */
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
prop.put("LOCATION", "");
return prop;
}
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (post.containsKey("activateList4" + supportedBlacklistTypes[blTypes])) {
listManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
} else {
listManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
}
}
listManager.reloadBlacklists();
} else if (post.containsKey("shareList")) {
/* ===========================================================
* Share a blacklist
* =========================================================== */
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
prop.put("LOCATION", "");
return prop;
}
if (listManager.listSetContains(BLACKLIST_SHARED, blacklistToUse)) {
// Remove from shared BlackLists
listManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse);
} else { // inactive list -> enable
listManager.updateListSet(BLACKLIST_SHARED, blacklistToUse);
}
} else if (action.equals("deleteBlacklistEntry")) {
/* ===========================================================
* Delete an entry from a blacklist
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
String temp = null;
final String[] selectedBlacklistEntries = post.getAll("selectedEntry.*");
if (selectedBlacklistEntries.length > 0) {
for (int i = 0; i < selectedBlacklistEntries.length; i++) {
temp = deleteBlacklistEntry(blacklistToUse,
selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
}
}
} else if (post.containsKey("addBlacklistEntry")) {
/* ===========================================================
* Add new entry to blacklist
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
final String temp = addBlacklistEntry(post.get("currentBlacklist"),
post.get("newEntry"), header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
} else if (action.equals("moveBlacklistEntry")) {
/* ===========================================================
* Move an entry from one blacklist to another
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
String targetBlacklist = post.get("targetBlacklist");
String temp = null;
final String[] selectedBlacklistEntries = post.getAll("selectedEntry.*");
if (selectedBlacklistEntries != null &&
selectedBlacklistEntries.length > 0 &&
targetBlacklist != null &&
blacklistToUse != null &&
!targetBlacklist.equals(blacklistToUse)) {
for (int i = 0; i < selectedBlacklistEntries.length; i++) {
temp = addBlacklistEntry(targetBlacklist,
selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
temp = deleteBlacklistEntry(blacklistToUse,
selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
}
}
} else if (action.equals("editBlacklistEntry")) {
/* ===========================================================
* Edit entry of a blacklist
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
final String[] editedBlacklistEntries = post.getAll("editedBlacklistEntry.*");
// if edited entry has been posted, save changes
if (editedBlacklistEntries.length > 0) {
final String[] selectedBlacklistEntries = post.getAll("selectedBlacklistEntry.*");
if (selectedBlacklistEntries.length != editedBlacklistEntries.length) {
prop.put("LOCATION", "");
return prop;
}
String temp = null;
for (int i = 0; i < selectedBlacklistEntries.length; i++) {
if (!selectedBlacklistEntries[i].equals(editedBlacklistEntries[i])) {
temp = deleteBlacklistEntry(blacklistToUse, selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
temp = addBlacklistEntry(blacklistToUse, editedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
}
}
prop.putHTML(DISABLED + EDIT + "currentBlacklist", blacklistToUse);
// else return entry to be edited
} else {
final String[] selectedEntries = post.getAll("selectedEntry.*");
if (selectedEntries != null && selectedEntries.length > 0 && blacklistToUse != null) {
for (int i = 0; i < selectedEntries.length; i++) {
prop.putHTML(DISABLED + EDIT + "editList_" + i + "_item", selectedEntries[i]);
prop.put(DISABLED + EDIT + "editList_" + i + "_count", i);
}
prop.putHTML(DISABLED + EDIT + "currentBlacklist", blacklistToUse);
prop.put(DISABLED + "edit", "1");
prop.put(DISABLED + EDIT + "editList", selectedEntries.length);
}
}
} else if (action.equals("selectRange")) {
blacklistToUse = post.get("currentBlacklist");
}
}
// if we have not chosen a blacklist until yet we use the first file
if (blacklistToUse == null && dirlist != null && dirlist.size() > 0) {
blacklistToUse = dirlist.get(0);
}
// Read the blacklist items from file
if (blacklistToUse != null) {
int entryCount = 0;
final List<String> list = listManager.getListArray(new File(listManager.listsPath, blacklistToUse));
// sort them
final String[] sortedlist = new String[list.size()];
Arrays.sort(list.toArray(sortedlist));
// display them
boolean dark = true;
int offset = 0;
int size = 50;
int to = sortedlist.length;
if (post != null) {
offset = post.getInt("offset", 0);
size = post.getInt("size", 50);
to = offset + size;
}
if (offset > sortedlist.length || offset < 0) {
offset = 0;
}
if (to > sortedlist.length || size < 1) {
to = sortedlist.length;
}
for (int j = offset; j < to; ++j){
final String nextEntry = sortedlist[j];
if (nextEntry.length() == 0) continue;
if (nextEntry.startsWith("#")) continue;
prop.put(DISABLED + EDIT + "Itemlist_" + entryCount + "_dark", dark ? "1" : "0");
dark = !dark;
prop.putHTML(DISABLED + EDIT + "Itemlist_" + entryCount + "_item", nextEntry);
prop.put(DISABLED + EDIT + "Itemlist_" + entryCount + "_count", entryCount);
entryCount++;
}
prop.put(DISABLED + EDIT + "Itemlist", entryCount);
// create selection of sublist
entryCount = 0;
int end = -1;
int start = -1;
if (sortedlist.length > 0) {
while (end < sortedlist.length) {
- start = entryCount * size;
- end = (entryCount + 1) * size;
+ if (size > 0) {
+ start = entryCount * size;
+ end = (entryCount + 1) * size;
+ } else {
+ start = 0;
+ end = sortedlist.length;
+ }
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_value", start);
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_fvalue", start + 1);
if (end > sortedlist.length) {
end = sortedlist.length;
}
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_tvalue", end);
if (start == offset) {
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_selected", 1);
}
entryCount++;
}
} else {
prop.put(DISABLED + EDIT + "subListOffset_0_value", 0);
prop.put(DISABLED + EDIT + "subListOffset_0_fvalue", 0);
prop.put(DISABLED + EDIT + "subListOffset_0_tvalue", 0);
entryCount++;
}
prop.put(DISABLED + EDIT + "subListOffset", entryCount);
// create selection of list size
int[] sizes = {10,25,50,100,250,-1};
for (int i = 0; i < sizes.length; i++) {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_value", sizes[i]);
if (sizes[i] == -1) {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_text", "all");
} else {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_text", sizes[i]);
}
if (sizes[i] == size) {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_selected", 1);
}
}
prop.put(DISABLED + EDIT + "subListSize", sizes.length);
}
// List BlackLists
int blacklistCount = 0;
int blacklistMoveCount = 0;
if (dirlist != null) {
for (String element : dirlist) {
prop.putXML(DISABLED + BLACKLIST + blacklistCount + "_name", element);
prop.put(DISABLED + BLACKLIST + blacklistCount + "_selected", "0");
if (element.equals(blacklistToUse)) { //current List
prop.put(DISABLED + BLACKLIST + blacklistCount + "_selected", "1");
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
prop.putXML(DISABLED + "currentActiveFor_" + blTypes + "_blTypeName",supportedBlacklistTypes[blTypes]);
prop.put(DISABLED + "currentActiveFor_" + blTypes + "_checked",
listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element) ? "0" : "1");
}
prop.put(DISABLED + "currentActiveFor", supportedBlacklistTypes.length);
} else {
prop.putXML(DISABLED + EDIT + BLACKLIST_MOVE + blacklistMoveCount + "_name", element);
blacklistMoveCount++;
}
if (listManager.listSetContains(BLACKLIST_SHARED, element)) {
prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "1");
} else {
prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "0");
}
int activeCount = 0;
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element)) {
prop.putHTML(DISABLED + BLACKLIST + blacklistCount + "_active_" + activeCount + "_blTypeName", supportedBlacklistTypes[blTypes]);
activeCount++;
}
}
prop.put(DISABLED + BLACKLIST + blacklistCount + "_active", activeCount);
blacklistCount++;
}
}
prop.put(DISABLED + "blackLists", blacklistCount);
prop.put(DISABLED + EDIT + "blackListsMove", blacklistMoveCount);
prop.putXML(DISABLED + "currentBlacklist", (blacklistToUse==null) ? "" : blacklistToUse);
prop.putXML(DISABLED + EDIT + "currentBlacklist", (blacklistToUse==null) ? "" : blacklistToUse);
prop.put("disabled", (blacklistToUse == null) ? "1" : "0");
return prop;
}
/**
* This method adds a new entry to the chosen blacklist.
* @param blacklistToUse the name of the blacklist the entry is to be added to
* @param newEntry the entry that is to be added
* @param header
* @param supportedBlacklistTypes
* @return null if no error occured, else a String to put into LOCATION
*/
private static String addBlacklistEntry(final String blacklistToUse, String newEntry,
final httpRequestHeader header, final String[] supportedBlacklistTypes) {
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
return "";
}
if (newEntry == null || newEntry.trim().length() == 0) {
return header.get("PATH") + "?selectList=&selectedListName=" + blacklistToUse;
}
// TODO: ignore empty entries
if (newEntry.startsWith("http://") ){
newEntry = newEntry.substring(7);
}
int pos = newEntry.indexOf("/");
if (pos < 0) {
// add default empty path pattern
pos = newEntry.length();
newEntry = newEntry + "/.*";
}
// append the line to the file
PrintWriter pw = null;
try {
pw = new PrintWriter(new FileWriter(new File(listManager.listsPath, blacklistToUse), true));
pw.println(newEntry);
pw.close();
} catch (final IOException e) {
e.printStackTrace();
} finally {
if (pw != null) try { pw.close(); } catch (final Exception e){ Log.logWarning("Blacklist", "could not close stream to "+ blacklistToUse +"! "+ e.getMessage());}
}
// add to blacklist
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse)) {
plasmaSwitchboard.urlBlacklist.add(supportedBlacklistTypes[blTypes],newEntry.substring(0, pos), newEntry.substring(pos + 1));
}
}
return null;
}
/**
* This method deletes a blacklist entry.
* @param blacklistToUse the name of the blacklist the entry is to be deleted from
* @param oldEntry the entry that is to be deleted
* @param header
* @param supportedBlacklistTypes
* @return null if no error occured, else a String to put into LOCATION
*/
private static String deleteBlacklistEntry(final String blacklistToUse, String oldEntry,
final httpRequestHeader header, final String[] supportedBlacklistTypes) {
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
return "";
}
if (oldEntry == null || oldEntry.trim().length() == 0) {
return header.get("PATH") + "?selectList=&selectedListName=" + blacklistToUse;
}
// load blacklist data from file
final ArrayList<String> list = listManager.getListArray(new File(listManager.listsPath, blacklistToUse));
// delete the old entry from file
if (list != null) {
for (int i=0; i < list.size(); i++) {
if ((list.get(i)).equals(oldEntry)) {
list.remove(i);
break;
}
}
listManager.writeList(new File(listManager.listsPath, blacklistToUse), list.toArray(new String[list.size()]));
}
// remove the entry from the running blacklist engine
int pos = oldEntry.indexOf("/");
if (pos < 0) {
// add default empty path pattern
pos = oldEntry.length();
oldEntry = oldEntry + "/.*";
}
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse)) {
plasmaSwitchboard.urlBlacklist.remove(supportedBlacklistTypes[blTypes],oldEntry.substring(0, pos), oldEntry.substring(pos + 1));
}
}
return null;
}
}
| true | true | public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch<?> env) {
// initialize the list manager
listManager.switchboard = (plasmaSwitchboard) env;
listManager.listsPath = new File(listManager.switchboard.getRootPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
// getting the list of supported blacklist types
final String supportedBlacklistTypesStr = indexAbstractReferenceBlacklist.BLACKLIST_TYPES_STRING;
final String[] supportedBlacklistTypes = supportedBlacklistTypesStr.split(",");
// loading all blacklist files located in the directory
List<String> dirlist = listManager.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER);
String blacklistToUse = null;
final serverObjects prop = new serverObjects();
prop.putHTML("blacklistEngine", plasmaSwitchboard.urlBlacklist.getEngineInfo());
// do all post operations
if (post != null) {
final String action = post.get("action", "");
if(post.containsKey("testList")) {
prop.put("testlist", "1");
String urlstring = post.get("testurl", "");
if(!urlstring.startsWith("http://")) urlstring = "http://"+urlstring;
yacyURL testurl = null;
try {
testurl = new yacyURL(urlstring, null);
} catch (final MalformedURLException e) { testurl = null; }
if(testurl != null) {
prop.putHTML("testlist_url",testurl.toString());
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_CRAWLER, testurl))
prop.put("testlist_listedincrawler", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_DHT, testurl))
prop.put("testlist_listedindht", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_NEWS, testurl))
prop.put("testlist_listedinnews", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_PROXY, testurl))
prop.put("testlist_listedinproxy", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_SEARCH, testurl))
prop.put("testlist_listedinsearch", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_SURFTIPS, testurl))
prop.put("testlist_listedinsurftips", "1");
}
else prop.put("testlist_url","not valid");
}
if (post.containsKey("selectList")) {
blacklistToUse = post.get("selectedListName");
if (blacklistToUse != null && blacklistToUse.length() == 0) blacklistToUse = null;
}
if (post.containsKey("createNewList")) {
/* ===========================================================
* Creation of a new blacklist
* =========================================================== */
blacklistToUse = post.get("newListName");
if (blacklistToUse.trim().length() == 0) {
prop.put("LOCATION","");
return prop;
}
// Check if blacklist name only consists of "legal" characters.
// This is mainly done to prevent files from being written to other directories
// than the LISTS directory.
if (!blacklistToUse.matches("^[\\p{L}\\d\\+\\-_]+[\\p{L}\\d\\+\\-_.]*(\\.black){0,1}$")) {
prop.put("error", 1);
prop.putHTML("error_name", blacklistToUse);
blacklistToUse = null;
} else {
if (!blacklistToUse.endsWith(".black")) blacklistToUse += ".black";
if (!dirlist.contains(blacklistToUse)) {
try {
final File newFile = new File(listManager.listsPath, blacklistToUse);
newFile.createNewFile();
// share the newly created blacklist
listManager.updateListSet(BLACKLIST_SHARED, blacklistToUse);
// activate it for all known blacklist types
for (int blTypes = 0; blTypes < supportedBlacklistTypes.length; blTypes++) {
listManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklistToUse);
}
} catch (final IOException e) {/* */}
} else {
prop.put("error", 2);
prop.putHTML("error_name", blacklistToUse);
blacklistToUse = null;
}
// reload Blacklists
dirlist = listManager.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER);
}
} else if (post.containsKey("deleteList")) {
/* ===========================================================
* Delete a blacklist
* =========================================================== */
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
prop.put("LOCATION","");
return prop;
}
final File BlackListFile = new File(listManager.listsPath, blacklistToUse);
if(!BlackListFile.delete()) {
Log.logWarning("Blacklist", "file "+ BlackListFile +" could not be deleted!");
}
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
listManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
}
// remove it from the shared list
listManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse);
blacklistToUse = null;
// reload Blacklists
dirlist = listManager.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER);
} else if (post.containsKey("activateList")) {
/* ===========================================================
* Activate/Deactivate a blacklist
* =========================================================== */
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
prop.put("LOCATION", "");
return prop;
}
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (post.containsKey("activateList4" + supportedBlacklistTypes[blTypes])) {
listManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
} else {
listManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
}
}
listManager.reloadBlacklists();
} else if (post.containsKey("shareList")) {
/* ===========================================================
* Share a blacklist
* =========================================================== */
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
prop.put("LOCATION", "");
return prop;
}
if (listManager.listSetContains(BLACKLIST_SHARED, blacklistToUse)) {
// Remove from shared BlackLists
listManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse);
} else { // inactive list -> enable
listManager.updateListSet(BLACKLIST_SHARED, blacklistToUse);
}
} else if (action.equals("deleteBlacklistEntry")) {
/* ===========================================================
* Delete an entry from a blacklist
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
String temp = null;
final String[] selectedBlacklistEntries = post.getAll("selectedEntry.*");
if (selectedBlacklistEntries.length > 0) {
for (int i = 0; i < selectedBlacklistEntries.length; i++) {
temp = deleteBlacklistEntry(blacklistToUse,
selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
}
}
} else if (post.containsKey("addBlacklistEntry")) {
/* ===========================================================
* Add new entry to blacklist
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
final String temp = addBlacklistEntry(post.get("currentBlacklist"),
post.get("newEntry"), header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
} else if (action.equals("moveBlacklistEntry")) {
/* ===========================================================
* Move an entry from one blacklist to another
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
String targetBlacklist = post.get("targetBlacklist");
String temp = null;
final String[] selectedBlacklistEntries = post.getAll("selectedEntry.*");
if (selectedBlacklistEntries != null &&
selectedBlacklistEntries.length > 0 &&
targetBlacklist != null &&
blacklistToUse != null &&
!targetBlacklist.equals(blacklistToUse)) {
for (int i = 0; i < selectedBlacklistEntries.length; i++) {
temp = addBlacklistEntry(targetBlacklist,
selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
temp = deleteBlacklistEntry(blacklistToUse,
selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
}
}
} else if (action.equals("editBlacklistEntry")) {
/* ===========================================================
* Edit entry of a blacklist
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
final String[] editedBlacklistEntries = post.getAll("editedBlacklistEntry.*");
// if edited entry has been posted, save changes
if (editedBlacklistEntries.length > 0) {
final String[] selectedBlacklistEntries = post.getAll("selectedBlacklistEntry.*");
if (selectedBlacklistEntries.length != editedBlacklistEntries.length) {
prop.put("LOCATION", "");
return prop;
}
String temp = null;
for (int i = 0; i < selectedBlacklistEntries.length; i++) {
if (!selectedBlacklistEntries[i].equals(editedBlacklistEntries[i])) {
temp = deleteBlacklistEntry(blacklistToUse, selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
temp = addBlacklistEntry(blacklistToUse, editedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
}
}
prop.putHTML(DISABLED + EDIT + "currentBlacklist", blacklistToUse);
// else return entry to be edited
} else {
final String[] selectedEntries = post.getAll("selectedEntry.*");
if (selectedEntries != null && selectedEntries.length > 0 && blacklistToUse != null) {
for (int i = 0; i < selectedEntries.length; i++) {
prop.putHTML(DISABLED + EDIT + "editList_" + i + "_item", selectedEntries[i]);
prop.put(DISABLED + EDIT + "editList_" + i + "_count", i);
}
prop.putHTML(DISABLED + EDIT + "currentBlacklist", blacklistToUse);
prop.put(DISABLED + "edit", "1");
prop.put(DISABLED + EDIT + "editList", selectedEntries.length);
}
}
} else if (action.equals("selectRange")) {
blacklistToUse = post.get("currentBlacklist");
}
}
// if we have not chosen a blacklist until yet we use the first file
if (blacklistToUse == null && dirlist != null && dirlist.size() > 0) {
blacklistToUse = dirlist.get(0);
}
// Read the blacklist items from file
if (blacklistToUse != null) {
int entryCount = 0;
final List<String> list = listManager.getListArray(new File(listManager.listsPath, blacklistToUse));
// sort them
final String[] sortedlist = new String[list.size()];
Arrays.sort(list.toArray(sortedlist));
// display them
boolean dark = true;
int offset = 0;
int size = 50;
int to = sortedlist.length;
if (post != null) {
offset = post.getInt("offset", 0);
size = post.getInt("size", 50);
to = offset + size;
}
if (offset > sortedlist.length || offset < 0) {
offset = 0;
}
if (to > sortedlist.length || size < 1) {
to = sortedlist.length;
}
for (int j = offset; j < to; ++j){
final String nextEntry = sortedlist[j];
if (nextEntry.length() == 0) continue;
if (nextEntry.startsWith("#")) continue;
prop.put(DISABLED + EDIT + "Itemlist_" + entryCount + "_dark", dark ? "1" : "0");
dark = !dark;
prop.putHTML(DISABLED + EDIT + "Itemlist_" + entryCount + "_item", nextEntry);
prop.put(DISABLED + EDIT + "Itemlist_" + entryCount + "_count", entryCount);
entryCount++;
}
prop.put(DISABLED + EDIT + "Itemlist", entryCount);
// create selection of sublist
entryCount = 0;
int end = -1;
int start = -1;
if (sortedlist.length > 0) {
while (end < sortedlist.length) {
start = entryCount * size;
end = (entryCount + 1) * size;
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_value", start);
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_fvalue", start + 1);
if (end > sortedlist.length) {
end = sortedlist.length;
}
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_tvalue", end);
if (start == offset) {
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_selected", 1);
}
entryCount++;
}
} else {
prop.put(DISABLED + EDIT + "subListOffset_0_value", 0);
prop.put(DISABLED + EDIT + "subListOffset_0_fvalue", 0);
prop.put(DISABLED + EDIT + "subListOffset_0_tvalue", 0);
entryCount++;
}
prop.put(DISABLED + EDIT + "subListOffset", entryCount);
// create selection of list size
int[] sizes = {10,25,50,100,250,-1};
for (int i = 0; i < sizes.length; i++) {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_value", sizes[i]);
if (sizes[i] == -1) {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_text", "all");
} else {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_text", sizes[i]);
}
if (sizes[i] == size) {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_selected", 1);
}
}
prop.put(DISABLED + EDIT + "subListSize", sizes.length);
}
// List BlackLists
int blacklistCount = 0;
int blacklistMoveCount = 0;
if (dirlist != null) {
for (String element : dirlist) {
prop.putXML(DISABLED + BLACKLIST + blacklistCount + "_name", element);
prop.put(DISABLED + BLACKLIST + blacklistCount + "_selected", "0");
if (element.equals(blacklistToUse)) { //current List
prop.put(DISABLED + BLACKLIST + blacklistCount + "_selected", "1");
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
prop.putXML(DISABLED + "currentActiveFor_" + blTypes + "_blTypeName",supportedBlacklistTypes[blTypes]);
prop.put(DISABLED + "currentActiveFor_" + blTypes + "_checked",
listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element) ? "0" : "1");
}
prop.put(DISABLED + "currentActiveFor", supportedBlacklistTypes.length);
} else {
prop.putXML(DISABLED + EDIT + BLACKLIST_MOVE + blacklistMoveCount + "_name", element);
blacklistMoveCount++;
}
if (listManager.listSetContains(BLACKLIST_SHARED, element)) {
prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "1");
} else {
prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "0");
}
int activeCount = 0;
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element)) {
prop.putHTML(DISABLED + BLACKLIST + blacklistCount + "_active_" + activeCount + "_blTypeName", supportedBlacklistTypes[blTypes]);
activeCount++;
}
}
prop.put(DISABLED + BLACKLIST + blacklistCount + "_active", activeCount);
blacklistCount++;
}
}
prop.put(DISABLED + "blackLists", blacklistCount);
prop.put(DISABLED + EDIT + "blackListsMove", blacklistMoveCount);
prop.putXML(DISABLED + "currentBlacklist", (blacklistToUse==null) ? "" : blacklistToUse);
prop.putXML(DISABLED + EDIT + "currentBlacklist", (blacklistToUse==null) ? "" : blacklistToUse);
prop.put("disabled", (blacklistToUse == null) ? "1" : "0");
return prop;
}
| public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch<?> env) {
// initialize the list manager
listManager.switchboard = (plasmaSwitchboard) env;
listManager.listsPath = new File(listManager.switchboard.getRootPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
// getting the list of supported blacklist types
final String supportedBlacklistTypesStr = indexAbstractReferenceBlacklist.BLACKLIST_TYPES_STRING;
final String[] supportedBlacklistTypes = supportedBlacklistTypesStr.split(",");
// loading all blacklist files located in the directory
List<String> dirlist = listManager.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER);
String blacklistToUse = null;
final serverObjects prop = new serverObjects();
prop.putHTML("blacklistEngine", plasmaSwitchboard.urlBlacklist.getEngineInfo());
// do all post operations
if (post != null) {
final String action = post.get("action", "");
if(post.containsKey("testList")) {
prop.put("testlist", "1");
String urlstring = post.get("testurl", "");
if(!urlstring.startsWith("http://")) urlstring = "http://"+urlstring;
yacyURL testurl = null;
try {
testurl = new yacyURL(urlstring, null);
} catch (final MalformedURLException e) { testurl = null; }
if(testurl != null) {
prop.putHTML("testlist_url",testurl.toString());
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_CRAWLER, testurl))
prop.put("testlist_listedincrawler", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_DHT, testurl))
prop.put("testlist_listedindht", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_NEWS, testurl))
prop.put("testlist_listedinnews", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_PROXY, testurl))
prop.put("testlist_listedinproxy", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_SEARCH, testurl))
prop.put("testlist_listedinsearch", "1");
if(plasmaSwitchboard.urlBlacklist.isListed(indexReferenceBlacklist.BLACKLIST_SURFTIPS, testurl))
prop.put("testlist_listedinsurftips", "1");
}
else prop.put("testlist_url","not valid");
}
if (post.containsKey("selectList")) {
blacklistToUse = post.get("selectedListName");
if (blacklistToUse != null && blacklistToUse.length() == 0) blacklistToUse = null;
}
if (post.containsKey("createNewList")) {
/* ===========================================================
* Creation of a new blacklist
* =========================================================== */
blacklistToUse = post.get("newListName");
if (blacklistToUse.trim().length() == 0) {
prop.put("LOCATION","");
return prop;
}
// Check if blacklist name only consists of "legal" characters.
// This is mainly done to prevent files from being written to other directories
// than the LISTS directory.
if (!blacklistToUse.matches("^[\\p{L}\\d\\+\\-_]+[\\p{L}\\d\\+\\-_.]*(\\.black){0,1}$")) {
prop.put("error", 1);
prop.putHTML("error_name", blacklistToUse);
blacklistToUse = null;
} else {
if (!blacklistToUse.endsWith(".black")) blacklistToUse += ".black";
if (!dirlist.contains(blacklistToUse)) {
try {
final File newFile = new File(listManager.listsPath, blacklistToUse);
newFile.createNewFile();
// share the newly created blacklist
listManager.updateListSet(BLACKLIST_SHARED, blacklistToUse);
// activate it for all known blacklist types
for (int blTypes = 0; blTypes < supportedBlacklistTypes.length; blTypes++) {
listManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists", blacklistToUse);
}
} catch (final IOException e) {/* */}
} else {
prop.put("error", 2);
prop.putHTML("error_name", blacklistToUse);
blacklistToUse = null;
}
// reload Blacklists
dirlist = listManager.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER);
}
} else if (post.containsKey("deleteList")) {
/* ===========================================================
* Delete a blacklist
* =========================================================== */
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
prop.put("LOCATION","");
return prop;
}
final File BlackListFile = new File(listManager.listsPath, blacklistToUse);
if(!BlackListFile.delete()) {
Log.logWarning("Blacklist", "file "+ BlackListFile +" could not be deleted!");
}
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
listManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
}
// remove it from the shared list
listManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse);
blacklistToUse = null;
// reload Blacklists
dirlist = listManager.getDirListing(listManager.listsPath, BLACKLIST_FILENAME_FILTER);
} else if (post.containsKey("activateList")) {
/* ===========================================================
* Activate/Deactivate a blacklist
* =========================================================== */
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
prop.put("LOCATION", "");
return prop;
}
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (post.containsKey("activateList4" + supportedBlacklistTypes[blTypes])) {
listManager.updateListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
} else {
listManager.removeFromListSet(supportedBlacklistTypes[blTypes] + ".BlackLists",blacklistToUse);
}
}
listManager.reloadBlacklists();
} else if (post.containsKey("shareList")) {
/* ===========================================================
* Share a blacklist
* =========================================================== */
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.trim().length() == 0) {
prop.put("LOCATION", "");
return prop;
}
if (listManager.listSetContains(BLACKLIST_SHARED, blacklistToUse)) {
// Remove from shared BlackLists
listManager.removeFromListSet(BLACKLIST_SHARED, blacklistToUse);
} else { // inactive list -> enable
listManager.updateListSet(BLACKLIST_SHARED, blacklistToUse);
}
} else if (action.equals("deleteBlacklistEntry")) {
/* ===========================================================
* Delete an entry from a blacklist
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
String temp = null;
final String[] selectedBlacklistEntries = post.getAll("selectedEntry.*");
if (selectedBlacklistEntries.length > 0) {
for (int i = 0; i < selectedBlacklistEntries.length; i++) {
temp = deleteBlacklistEntry(blacklistToUse,
selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
}
}
} else if (post.containsKey("addBlacklistEntry")) {
/* ===========================================================
* Add new entry to blacklist
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
final String temp = addBlacklistEntry(post.get("currentBlacklist"),
post.get("newEntry"), header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
} else if (action.equals("moveBlacklistEntry")) {
/* ===========================================================
* Move an entry from one blacklist to another
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
String targetBlacklist = post.get("targetBlacklist");
String temp = null;
final String[] selectedBlacklistEntries = post.getAll("selectedEntry.*");
if (selectedBlacklistEntries != null &&
selectedBlacklistEntries.length > 0 &&
targetBlacklist != null &&
blacklistToUse != null &&
!targetBlacklist.equals(blacklistToUse)) {
for (int i = 0; i < selectedBlacklistEntries.length; i++) {
temp = addBlacklistEntry(targetBlacklist,
selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
temp = deleteBlacklistEntry(blacklistToUse,
selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
}
}
} else if (action.equals("editBlacklistEntry")) {
/* ===========================================================
* Edit entry of a blacklist
* =========================================================== */
blacklistToUse = post.get("currentBlacklist");
final String[] editedBlacklistEntries = post.getAll("editedBlacklistEntry.*");
// if edited entry has been posted, save changes
if (editedBlacklistEntries.length > 0) {
final String[] selectedBlacklistEntries = post.getAll("selectedBlacklistEntry.*");
if (selectedBlacklistEntries.length != editedBlacklistEntries.length) {
prop.put("LOCATION", "");
return prop;
}
String temp = null;
for (int i = 0; i < selectedBlacklistEntries.length; i++) {
if (!selectedBlacklistEntries[i].equals(editedBlacklistEntries[i])) {
temp = deleteBlacklistEntry(blacklistToUse, selectedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
temp = addBlacklistEntry(blacklistToUse, editedBlacklistEntries[i], header, supportedBlacklistTypes);
if (temp != null) {
prop.put("LOCATION", temp);
return prop;
}
}
}
prop.putHTML(DISABLED + EDIT + "currentBlacklist", blacklistToUse);
// else return entry to be edited
} else {
final String[] selectedEntries = post.getAll("selectedEntry.*");
if (selectedEntries != null && selectedEntries.length > 0 && blacklistToUse != null) {
for (int i = 0; i < selectedEntries.length; i++) {
prop.putHTML(DISABLED + EDIT + "editList_" + i + "_item", selectedEntries[i]);
prop.put(DISABLED + EDIT + "editList_" + i + "_count", i);
}
prop.putHTML(DISABLED + EDIT + "currentBlacklist", blacklistToUse);
prop.put(DISABLED + "edit", "1");
prop.put(DISABLED + EDIT + "editList", selectedEntries.length);
}
}
} else if (action.equals("selectRange")) {
blacklistToUse = post.get("currentBlacklist");
}
}
// if we have not chosen a blacklist until yet we use the first file
if (blacklistToUse == null && dirlist != null && dirlist.size() > 0) {
blacklistToUse = dirlist.get(0);
}
// Read the blacklist items from file
if (blacklistToUse != null) {
int entryCount = 0;
final List<String> list = listManager.getListArray(new File(listManager.listsPath, blacklistToUse));
// sort them
final String[] sortedlist = new String[list.size()];
Arrays.sort(list.toArray(sortedlist));
// display them
boolean dark = true;
int offset = 0;
int size = 50;
int to = sortedlist.length;
if (post != null) {
offset = post.getInt("offset", 0);
size = post.getInt("size", 50);
to = offset + size;
}
if (offset > sortedlist.length || offset < 0) {
offset = 0;
}
if (to > sortedlist.length || size < 1) {
to = sortedlist.length;
}
for (int j = offset; j < to; ++j){
final String nextEntry = sortedlist[j];
if (nextEntry.length() == 0) continue;
if (nextEntry.startsWith("#")) continue;
prop.put(DISABLED + EDIT + "Itemlist_" + entryCount + "_dark", dark ? "1" : "0");
dark = !dark;
prop.putHTML(DISABLED + EDIT + "Itemlist_" + entryCount + "_item", nextEntry);
prop.put(DISABLED + EDIT + "Itemlist_" + entryCount + "_count", entryCount);
entryCount++;
}
prop.put(DISABLED + EDIT + "Itemlist", entryCount);
// create selection of sublist
entryCount = 0;
int end = -1;
int start = -1;
if (sortedlist.length > 0) {
while (end < sortedlist.length) {
if (size > 0) {
start = entryCount * size;
end = (entryCount + 1) * size;
} else {
start = 0;
end = sortedlist.length;
}
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_value", start);
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_fvalue", start + 1);
if (end > sortedlist.length) {
end = sortedlist.length;
}
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_tvalue", end);
if (start == offset) {
prop.put(DISABLED + EDIT + "subListOffset_" + entryCount + "_selected", 1);
}
entryCount++;
}
} else {
prop.put(DISABLED + EDIT + "subListOffset_0_value", 0);
prop.put(DISABLED + EDIT + "subListOffset_0_fvalue", 0);
prop.put(DISABLED + EDIT + "subListOffset_0_tvalue", 0);
entryCount++;
}
prop.put(DISABLED + EDIT + "subListOffset", entryCount);
// create selection of list size
int[] sizes = {10,25,50,100,250,-1};
for (int i = 0; i < sizes.length; i++) {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_value", sizes[i]);
if (sizes[i] == -1) {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_text", "all");
} else {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_text", sizes[i]);
}
if (sizes[i] == size) {
prop.put(DISABLED + EDIT + "subListSize_" + i + "_selected", 1);
}
}
prop.put(DISABLED + EDIT + "subListSize", sizes.length);
}
// List BlackLists
int blacklistCount = 0;
int blacklistMoveCount = 0;
if (dirlist != null) {
for (String element : dirlist) {
prop.putXML(DISABLED + BLACKLIST + blacklistCount + "_name", element);
prop.put(DISABLED + BLACKLIST + blacklistCount + "_selected", "0");
if (element.equals(blacklistToUse)) { //current List
prop.put(DISABLED + BLACKLIST + blacklistCount + "_selected", "1");
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
prop.putXML(DISABLED + "currentActiveFor_" + blTypes + "_blTypeName",supportedBlacklistTypes[blTypes]);
prop.put(DISABLED + "currentActiveFor_" + blTypes + "_checked",
listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element) ? "0" : "1");
}
prop.put(DISABLED + "currentActiveFor", supportedBlacklistTypes.length);
} else {
prop.putXML(DISABLED + EDIT + BLACKLIST_MOVE + blacklistMoveCount + "_name", element);
blacklistMoveCount++;
}
if (listManager.listSetContains(BLACKLIST_SHARED, element)) {
prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "1");
} else {
prop.put(DISABLED + BLACKLIST + blacklistCount + "_shared", "0");
}
int activeCount = 0;
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
if (listManager.listSetContains(supportedBlacklistTypes[blTypes] + ".BlackLists", element)) {
prop.putHTML(DISABLED + BLACKLIST + blacklistCount + "_active_" + activeCount + "_blTypeName", supportedBlacklistTypes[blTypes]);
activeCount++;
}
}
prop.put(DISABLED + BLACKLIST + blacklistCount + "_active", activeCount);
blacklistCount++;
}
}
prop.put(DISABLED + "blackLists", blacklistCount);
prop.put(DISABLED + EDIT + "blackListsMove", blacklistMoveCount);
prop.putXML(DISABLED + "currentBlacklist", (blacklistToUse==null) ? "" : blacklistToUse);
prop.putXML(DISABLED + EDIT + "currentBlacklist", (blacklistToUse==null) ? "" : blacklistToUse);
prop.put("disabled", (blacklistToUse == null) ? "1" : "0");
return prop;
}
|
diff --git a/vlc-android/src/org/videolan/vlc/AudioService.java b/vlc-android/src/org/videolan/vlc/AudioService.java
index 2746ba91..18afb62e 100644
--- a/vlc-android/src/org/videolan/vlc/AudioService.java
+++ b/vlc-android/src/org/videolan/vlc/AudioService.java
@@ -1,1158 +1,1160 @@
/*****************************************************************************
* AudioService.java
*****************************************************************************
* Copyright © 2011-2012 VLC authors and VideoLAN
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
package org.videolan.vlc;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Stack;
import org.videolan.libvlc.EventHandler;
import org.videolan.libvlc.LibVLC;
import org.videolan.libvlc.LibVlcException;
import org.videolan.vlc.gui.MainActivity;
import org.videolan.vlc.gui.audio.AudioPlayerActivity;
import org.videolan.vlc.gui.audio.AudioUtil;
import org.videolan.vlc.gui.video.VideoPlayerActivity;
import org.videolan.vlc.interfaces.IAudioService;
import org.videolan.vlc.interfaces.IAudioServiceCallback;
import android.annotation.TargetApi;
import android.app.Notification;
import android.app.PendingIntent;
import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.media.AudioManager;
import android.media.AudioManager.OnAudioFocusChangeListener;
import android.media.MediaMetadataRetriever;
import android.media.RemoteControlClient;
import android.media.RemoteControlClient.MetadataEditor;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
import android.os.PowerManager;
import android.os.RemoteException;
import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat;
import android.telephony.TelephonyManager;
import android.util.Log;
import android.widget.RemoteViews;
import android.widget.Toast;
public class AudioService extends Service {
private static final String TAG = "VLC/AudioService";
private static final int SHOW_PROGRESS = 0;
private static final int SHOW_TOAST = 1;
public static final String START_FROM_NOTIFICATION = "from_notification";
public static final String ACTION_REMOTE_GENERIC = "org.videolan.vlc.remote.";
public static final String ACTION_REMOTE_BACKWARD = "org.videolan.vlc.remote.Backward";
public static final String ACTION_REMOTE_PLAY = "org.videolan.vlc.remote.Play";
public static final String ACTION_REMOTE_PLAYPAUSE = "org.videolan.vlc.remote.PlayPause";
public static final String ACTION_REMOTE_PAUSE = "org.videolan.vlc.remote.Pause";
public static final String ACTION_REMOTE_STOP = "org.videolan.vlc.remote.Stop";
public static final String ACTION_REMOTE_FORWARD = "org.videolan.vlc.remote.Forward";
public static final String ACTION_REMOTE_LAST_PLAYLIST = "org.videolan.vlc.remote.LastPlaylist";
public static final String ACTION_WIDGET_UPDATE = "org.videolan.vlc.widget.UPDATE";
public static final String ACTION_WIDGET_UPDATE_POSITION = "org.videolan.vlc.widget.UPDATE_POSITION";
public static final String WIDGET_PACKAGE = "org.videolan.vlc";
public static final String WIDGET_CLASS = "org.videolan.vlc.widget.VLCAppWidgetProvider";
private LibVLC mLibVLC;
private ArrayList<Media> mMediaList;
private Stack<Media> mPrevious;
private Media mCurrentMedia;
private HashMap<IAudioServiceCallback, Integer> mCallback;
private EventHandler mEventHandler;
private boolean mShuffling = false;
private RepeatType mRepeating = RepeatType.None;
private boolean mDetectHeadset = true;
private OnAudioFocusChangeListener audioFocusListener;
private ComponentName mRemoteControlClientReceiverComponent;
private PowerManager.WakeLock mWakeLock;
/**
* RemoteControlClient is for lock screen playback control.
*/
private RemoteControlClient mRemoteControlClient = null;
private RemoteControlClientReceiver mRemoteControlClientReceiver = null;
/**
* Distinguish between the "fake" (Java-backed) playlist versus the "real"
* (LibVLC/LibVLCcore) backed playlist.
*
* True if being backed by LibVLC, false if "virtually" backed by Java.
*/
private boolean mLibVLCPlaylistActive = false;
/**
* Last widget position update timestamp
*/
private long mWidgetPositionTimestamp = Calendar.getInstance().getTimeInMillis();
@Override
public void onCreate() {
super.onCreate();
// Get libVLC instance
try {
mLibVLC = Util.getLibVlcInstance();
} catch (LibVlcException e) {
e.printStackTrace();
}
mCallback = new HashMap<IAudioServiceCallback, Integer>();
mMediaList = new ArrayList<Media>();
mPrevious = new Stack<Media>();
mEventHandler = EventHandler.getInstance();
mRemoteControlClientReceiverComponent = new ComponentName(getPackageName(),
RemoteControlClientReceiver.class.getName());
// Make sure the audio player will acquire a wake-lock while playing. If we don't do
// that, the CPU might go to sleep while the song is playing, causing playback to stop.
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
IntentFilter filter = new IntentFilter();
filter.setPriority(Integer.MAX_VALUE);
filter.addAction(ACTION_REMOTE_BACKWARD);
filter.addAction(ACTION_REMOTE_PLAYPAUSE);
filter.addAction(ACTION_REMOTE_PLAY);
filter.addAction(ACTION_REMOTE_PAUSE);
filter.addAction(ACTION_REMOTE_STOP);
filter.addAction(ACTION_REMOTE_FORWARD);
filter.addAction(ACTION_REMOTE_LAST_PLAYLIST);
filter.addAction(Intent.ACTION_HEADSET_PLUG);
filter.addAction(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
filter.addAction(VLCApplication.SLEEP_INTENT);
registerReceiver(serviceReceiver, filter);
final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
boolean stealRemoteControl = pref.getBoolean("enable_steal_remote_control", false);
if(!Util.isFroyoOrLater() || stealRemoteControl) {
/* Backward compatibility for API 7 */
filter = new IntentFilter();
if (stealRemoteControl)
filter.setPriority(Integer.MAX_VALUE);
filter.addAction(Intent.ACTION_MEDIA_BUTTON);
mRemoteControlClientReceiver = new RemoteControlClientReceiver();
registerReceiver(mRemoteControlClientReceiver, filter);
}
AudioUtil.prepareCacheFolder(this);
}
/**
* Set up the remote control and tell the system we want to be the default receiver for the MEDIA buttons
* @see http://android-developers.blogspot.fr/2010/06/allowing-applications-to-play-nicer.html
*/
@TargetApi(14)
public void setUpRemoteControlClient() {
Context context = VLCApplication.getAppContext();
AudioManager audioManager = (AudioManager)context.getSystemService(AUDIO_SERVICE);
if(Util.isICSOrLater()) {
audioManager.registerMediaButtonEventReceiver(mRemoteControlClientReceiverComponent);
if (mRemoteControlClient == null) {
Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
mediaButtonIntent.setComponent(mRemoteControlClientReceiverComponent);
PendingIntent mediaPendingIntent = PendingIntent.getBroadcast(context, 0, mediaButtonIntent, 0);
// create and register the remote control client
mRemoteControlClient = new RemoteControlClient(mediaPendingIntent);
audioManager.registerRemoteControlClient(mRemoteControlClient);
}
mRemoteControlClient.setTransportControlFlags(
RemoteControlClient.FLAG_KEY_MEDIA_PLAY |
RemoteControlClient.FLAG_KEY_MEDIA_PAUSE |
RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS |
RemoteControlClient.FLAG_KEY_MEDIA_NEXT |
RemoteControlClient.FLAG_KEY_MEDIA_STOP);
} else if (Util.isFroyoOrLater()) {
audioManager.registerMediaButtonEventReceiver(mRemoteControlClientReceiverComponent);
}
}
/**
* A function to control the Remote Control Client. It is needed for
* compatibility with devices below Ice Cream Sandwich (4.0).
*
* @param p Playback state
*/
@TargetApi(14)
private void setRemoteControlClientPlaybackState(int p) {
if(!Util.isICSOrLater())
return;
if (mRemoteControlClient != null)
mRemoteControlClient.setPlaybackState(p);
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
updateWidget(this);
return super.onStartCommand(intent, flags, startId);
}
@Override
public void onDestroy() {
super.onDestroy();
stop();
if (mWakeLock.isHeld())
mWakeLock.release();
unregisterReceiver(serviceReceiver);
if (mRemoteControlClientReceiver != null) {
unregisterReceiver(mRemoteControlClientReceiver);
mRemoteControlClientReceiver = null;
}
}
@Override
public IBinder onBind(Intent intent) {
return mInterface;
}
@TargetApi(8)
private void changeAudioFocus(boolean gain) {
if(!Util.isFroyoOrLater()) // NOP if not supported
return;
audioFocusListener = new OnAudioFocusChangeListener() {
@Override
public void onAudioFocusChange(int focusChange) {
if(focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK ||
focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT) {
/*
* Lower the volume to 36% to "duck" when an alert or something
* needs to be played.
*/
LibVLC.getExistingInstance().setVolume(36);
} else {
LibVLC.getExistingInstance().setVolume(100);
}
}
};
AudioManager am = (AudioManager)getSystemService(AUDIO_SERVICE);
if(gain)
am.requestAudioFocus(audioFocusListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
else
am.abandonAudioFocus(audioFocusListener);
}
private final BroadcastReceiver serviceReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
int state = intent.getIntExtra("state", 0);
if( mLibVLC == null ) {
Log.w(TAG, "Intent received, but VLC is not loaded, skipping.");
return;
}
// skip all headsets events if there is a call
TelephonyManager telManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
if (telManager != null && telManager.getCallState() != TelephonyManager.CALL_STATE_IDLE)
return;
/*
* Launch the activity if needed
*/
if (action.startsWith(ACTION_REMOTE_GENERIC) && !mLibVLC.isPlaying() && mCurrentMedia == null) {
Intent iVlc = new Intent(context, MainActivity.class);
iVlc.putExtra(START_FROM_NOTIFICATION, true);
iVlc.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
context.startActivity(iVlc);
}
/*
* Remote / headset control events
*/
if (action.equalsIgnoreCase(ACTION_REMOTE_PLAYPAUSE)) {
if (mLibVLC.isPlaying() && mCurrentMedia != null)
pause();
else if (!mLibVLC.isPlaying() && mCurrentMedia != null)
play();
} else if (action.equalsIgnoreCase(ACTION_REMOTE_PLAY)) {
if (!mLibVLC.isPlaying() && mCurrentMedia != null)
play();
} else if (action.equalsIgnoreCase(ACTION_REMOTE_PAUSE)) {
if (mLibVLC.isPlaying() && mCurrentMedia != null)
pause();
} else if (action.equalsIgnoreCase(ACTION_REMOTE_BACKWARD)) {
previous();
} else if (action.equalsIgnoreCase(ACTION_REMOTE_STOP)) {
stop();
} else if (action.equalsIgnoreCase(ACTION_REMOTE_FORWARD)) {
next();
} else if (action.equalsIgnoreCase(ACTION_REMOTE_LAST_PLAYLIST)) {
loadLastPlaylist();
}
/*
* headset plug events
*/
if (mDetectHeadset) {
if (action.equalsIgnoreCase(AudioManager.ACTION_AUDIO_BECOMING_NOISY)) {
Log.i(TAG, "Headset Removed.");
if (mLibVLC.isPlaying() && mCurrentMedia != null)
pause();
}
else if (action.equalsIgnoreCase(Intent.ACTION_HEADSET_PLUG) && state != 0) {
Log.i(TAG, "Headset Inserted.");
if (!mLibVLC.isPlaying() && mCurrentMedia != null)
play();
}
}
/*
* Sleep
*/
if (action.equalsIgnoreCase(VLCApplication.SLEEP_INTENT)) {
stop();
}
}
};
/**
* Handle libvlc asynchronous events
*/
private final Handler mVlcEventHandler = new AudioServiceEventHandler(this);
private static class AudioServiceEventHandler extends WeakHandler<AudioService> {
public AudioServiceEventHandler(AudioService fragment) {
super(fragment);
}
@Override
public void handleMessage(Message msg) {
AudioService service = getOwner();
if(service == null) return;
switch (msg.getData().getInt("event")) {
case EventHandler.MediaPlayerPlaying:
Log.i(TAG, "MediaPlayerPlaying");
if (service.mCurrentMedia == null)
return;
String location = service.mCurrentMedia.getLocation();
long length = service.mLibVLC.getLength();
MediaDatabase dbManager = MediaDatabase
.getInstance(VLCApplication.getAppContext());
Media m = dbManager.getMedia(VLCApplication.getAppContext(),
location);
/**
* 1) There is a media to update
* 2) It has a length of 0
* (dynamic track loading - most notably the OGG container)
* 3) We were able to get a length even after parsing
* (don't want to replace a 0 with a 0)
*/
if(m != null && m.getLength() == 0 && length > 0) {
Log.d(TAG, "Updating audio file length");
dbManager.updateMedia(location,
MediaDatabase.mediaColumn.MEDIA_LENGTH, length);
}
service.changeAudioFocus(true);
service.setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_PLAYING);
if (!service.mWakeLock.isHeld())
service.mWakeLock.acquire();
break;
case EventHandler.MediaPlayerPaused:
Log.i(TAG, "MediaPlayerPaused");
service.executeUpdate();
service.showNotification();
service.setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED);
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
case EventHandler.MediaPlayerStopped:
Log.i(TAG, "MediaPlayerStopped");
service.executeUpdate();
service.setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
case EventHandler.MediaPlayerEndReached:
Log.i(TAG, "MediaPlayerEndReached");
service.executeUpdate();
service.next();
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
case EventHandler.MediaPlayerVout:
if(msg.getData().getInt("data") > 0) {
service.handleVout();
}
break;
case EventHandler.MediaPlayerPositionChanged:
float pos = msg.getData().getFloat("data");
service.updateWidgetPosition(service, pos);
break;
case EventHandler.MediaPlayerEncounteredError:
- service.showToast(VLCApplication.getAppContext().getString(R.string.invalid_location,
- service.mCurrentMedia.getLocation()), Toast.LENGTH_SHORT);
+ if (service.mCurrentMedia != null) {
+ service.showToast(service.getString(R.string.invalid_location,
+ service.mCurrentMedia.getLocation()), Toast.LENGTH_SHORT);
+ }
service.executeUpdate();
service.next();
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
default:
Log.e(TAG, "Event not handled");
break;
}
}
};
private void handleVout() {
Log.i(TAG, "Obtained video track");
mMediaList.clear();
hideNotification();
// Don't crash if user stopped the media
if(mCurrentMedia == null) return;
// Switch to the video player & don't lose the currently playing stream
VideoPlayerActivity.start(VLCApplication.getAppContext(), mCurrentMedia.getLocation(), mCurrentMedia.getTitle(), true);
}
private void executeUpdate() {
executeUpdate(true);
}
private void executeUpdate(Boolean updateWidget) {
for (IAudioServiceCallback callback : mCallback.keySet()) {
try {
callback.update();
} catch (RemoteException e) {
e.printStackTrace();
}
}
if (updateWidget)
updateWidget(this);
}
private final Handler mHandler = new AudioServiceHandler(this);
private static class AudioServiceHandler extends WeakHandler<AudioService> {
public AudioServiceHandler(AudioService fragment) {
super(fragment);
}
@Override
public void handleMessage(Message msg) {
AudioService service = getOwner();
if(service == null) return;
switch (msg.what) {
case SHOW_PROGRESS:
if (service.mCallback.size() > 0) {
removeMessages(SHOW_PROGRESS);
service.executeUpdate(false);
sendEmptyMessageDelayed(SHOW_PROGRESS, 1000);
}
break;
case SHOW_TOAST:
final Bundle bundle = msg.getData();
final String text = bundle.getString("text");
final int duration = bundle.getInt("duration");
Toast.makeText(VLCApplication.getAppContext(), text, duration).show();
break;
}
}
};
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void showNotification() {
try {
Bitmap cover = AudioUtil.getCover(this, mCurrentMedia, 64);
String title = mCurrentMedia.getTitle();
String artist = mCurrentMedia.getArtist();
String album = mCurrentMedia.getAlbum();
Notification notification;
// add notification to status bar
NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
.setSmallIcon(R.drawable.ic_stat_vlc)
.setTicker(title + " - " + artist)
.setAutoCancel(false)
.setOngoing(true);
Intent notificationIntent = new Intent(this, AudioPlayerActivity.class);
notificationIntent.setAction(Intent.ACTION_MAIN);
notificationIntent.addCategory(Intent.CATEGORY_LAUNCHER);
notificationIntent.putExtra(START_FROM_NOTIFICATION, true);
PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
if (Util.isJellyBeanOrLater()) {
Intent iBackward = new Intent(ACTION_REMOTE_BACKWARD);
Intent iPlay = new Intent(ACTION_REMOTE_PLAYPAUSE);
Intent iForward = new Intent(ACTION_REMOTE_FORWARD);
Intent iStop = new Intent(ACTION_REMOTE_STOP);
PendingIntent piBackward = PendingIntent.getBroadcast(this, 0, iBackward, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piPlay = PendingIntent.getBroadcast(this, 0, iPlay, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piForward = PendingIntent.getBroadcast(this, 0, iForward, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piStop = PendingIntent.getBroadcast(this, 0, iStop, PendingIntent.FLAG_UPDATE_CURRENT);
RemoteViews view = new RemoteViews(getPackageName(), R.layout.notification);
if (cover != null)
view.setImageViewBitmap(R.id.cover, cover);
view.setTextViewText(R.id.songName, title);
view.setTextViewText(R.id.artist, artist);
view.setImageViewResource(R.id.play_pause, mLibVLC.isPlaying() ? R.drawable.ic_pause : R.drawable.ic_play);
view.setOnClickPendingIntent(R.id.play_pause, piPlay);
view.setOnClickPendingIntent(R.id.forward, piForward);
view.setOnClickPendingIntent(R.id.stop, piStop);
view.setOnClickPendingIntent(R.id.content, pendingIntent);
RemoteViews view_expanded = new RemoteViews(getPackageName(), R.layout.notification_expanded);
if (cover != null)
view_expanded.setImageViewBitmap(R.id.cover, cover);
view_expanded.setTextViewText(R.id.songName, title);
view_expanded.setTextViewText(R.id.artist, artist);
view_expanded.setTextViewText(R.id.album, album);
view_expanded.setImageViewResource(R.id.play_pause, mLibVLC.isPlaying() ? R.drawable.ic_pause : R.drawable.ic_play);
view_expanded.setOnClickPendingIntent(R.id.backward, piBackward);
view_expanded.setOnClickPendingIntent(R.id.play_pause, piPlay);
view_expanded.setOnClickPendingIntent(R.id.forward, piForward);
view_expanded.setOnClickPendingIntent(R.id.stop, piStop);
view_expanded.setOnClickPendingIntent(R.id.content, pendingIntent);
notification = builder.build();
notification.contentView = view;
notification.bigContentView = view_expanded;
}
else {
builder.setLargeIcon(cover)
.setContentTitle(title)
.setContentText(Util.isJellyBeanOrLater() ? artist : mCurrentMedia.getSubtitle())
.setContentInfo(album)
.setContentIntent(pendingIntent);
notification = builder.build();
}
startForeground(3, notification);
}
catch (NoSuchMethodError e){
// Compat library is wrong on 3.2
// http://code.google.com/p/android/issues/detail?id=36359
// http://code.google.com/p/android/issues/detail?id=36502
}
}
private void hideNotification() {
stopForeground(true);
}
private void pause() {
setUpRemoteControlClient();
mHandler.removeMessages(SHOW_PROGRESS);
// hideNotification(); <-- see event handler
mLibVLC.pause();
}
private void play() {
if (mCurrentMedia != null) {
setUpRemoteControlClient();
mLibVLC.play();
mHandler.sendEmptyMessage(SHOW_PROGRESS);
showNotification();
updateWidget(this);
}
}
private void stop() {
mLibVLC.stop();
mEventHandler.removeHandler(mVlcEventHandler);
setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
mCurrentMedia = null;
mMediaList.clear();
mPrevious.clear();
mHandler.removeMessages(SHOW_PROGRESS);
hideNotification();
executeUpdate();
changeAudioFocus(false);
}
private void next() {
int index = mMediaList.indexOf(mCurrentMedia);
mPrevious.push(mCurrentMedia);
if (mRepeating == RepeatType.Once && index < mMediaList.size())
mCurrentMedia = mMediaList.get(index);
else if (mShuffling && mPrevious.size() < mMediaList.size()) {
while (mPrevious.contains(mCurrentMedia = mMediaList
.get((int) (Math.random() * mMediaList.size()))))
;
} else if (!mShuffling && index < mMediaList.size() - 1) {
mCurrentMedia = mMediaList.get(index + 1);
} else {
if (mRepeating == RepeatType.All && mMediaList.size() > 0)
mCurrentMedia = mMediaList.get(0);
else {
stop();
return;
}
}
if(mLibVLCPlaylistActive) {
if(mRepeating == RepeatType.None)
mLibVLC.next();
else if(mRepeating == RepeatType.Once)
mLibVLC.playIndex(index);
else
mLibVLC.playIndex(mMediaList.indexOf(mCurrentMedia));
} else {
mLibVLC.readMedia(mCurrentMedia.getLocation(), true);
}
mHandler.sendEmptyMessage(SHOW_PROGRESS);
setUpRemoteControlClient();
showNotification();
updateWidget(this);
updateRemoteControlClientMetadata();
saveCurrentMedia();
}
@TargetApi(14)
private void updateRemoteControlClientMetadata() {
if(!Util.isICSOrLater()) // NOP check
return;
if (mRemoteControlClient != null) {
MetadataEditor editor = mRemoteControlClient.editMetadata(true);
editor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, mCurrentMedia.getAlbum());
editor.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, mCurrentMedia.getArtist());
editor.putString(MediaMetadataRetriever.METADATA_KEY_GENRE, mCurrentMedia.getGenre());
editor.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, mCurrentMedia.getTitle());
editor.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, mCurrentMedia.getLength());
editor.putBitmap(MetadataEditor.BITMAP_KEY_ARTWORK, getCover());
editor.apply();
}
}
private void previous() {
int index = mMediaList.indexOf(mCurrentMedia);
if (mPrevious.size() > 0)
mCurrentMedia = mPrevious.pop();
else if (index > 0)
mCurrentMedia = mMediaList.get(index - 1);
else
return;
if(mLibVLCPlaylistActive) {
if(mRepeating == RepeatType.None)
mLibVLC.previous();
else if(mRepeating == RepeatType.Once)
mLibVLC.playIndex(index);
else
mLibVLC.playIndex(mMediaList.indexOf(mCurrentMedia));
} else {
mLibVLC.readMedia(mCurrentMedia.getLocation(), true);
}
mHandler.sendEmptyMessage(SHOW_PROGRESS);
setUpRemoteControlClient();
showNotification();
updateWidget(this);
updateRemoteControlClientMetadata();
saveCurrentMedia();
}
private void shuffle() {
if (mShuffling)
mPrevious.clear();
mShuffling = !mShuffling;
saveCurrentMedia();
}
private void setRepeatType(int t) {
mRepeating = RepeatType.values()[t];
}
private Bitmap getCover() {
return AudioUtil.getCover(this, mCurrentMedia, 512);
}
private final IAudioService.Stub mInterface = new IAudioService.Stub() {
@Override
public String getCurrentMediaLocation() throws RemoteException {
return mCurrentMedia.getLocation();
}
@Override
public void pause() throws RemoteException {
AudioService.this.pause();
}
@Override
public void play() throws RemoteException {
AudioService.this.play();
}
@Override
public void stop() throws RemoteException {
AudioService.this.stop();
}
@Override
public boolean isPlaying() throws RemoteException {
return mLibVLC.isPlaying();
}
@Override
public boolean isShuffling() {
return mShuffling;
}
@Override
public int getRepeatType() {
return mRepeating.ordinal();
}
@Override
public boolean hasMedia() throws RemoteException {
return mMediaList.size() != 0;
}
@Override
public String getAlbum() throws RemoteException {
if (mCurrentMedia != null)
return mCurrentMedia.getAlbum();
else
return null;
}
@Override
public String getArtist() throws RemoteException {
if (mCurrentMedia != null)
return mCurrentMedia.getArtist();
else
return null;
}
@Override
public String getTitle() throws RemoteException {
if (mCurrentMedia != null)
return mCurrentMedia.getTitle();
else
return null;
}
@Override
public Bitmap getCover() {
if (mCurrentMedia != null) {
return AudioService.this.getCover();
}
return null;
}
@Override
public synchronized void addAudioCallback(IAudioServiceCallback cb)
throws RemoteException {
Integer count = mCallback.get(cb);
if (count == null)
count = 0;
mCallback.put(cb, count + 1);
mHandler.sendEmptyMessage(SHOW_PROGRESS);
}
@Override
public synchronized void removeAudioCallback(IAudioServiceCallback cb)
throws RemoteException {
Integer count = mCallback.get(cb);
if (count == null)
count = 0;
if (count > 1)
mCallback.put(cb, count - 1);
else
mCallback.remove(cb);
}
@Override
public int getTime() throws RemoteException {
return (int) mLibVLC.getTime();
}
@Override
public int getLength() throws RemoteException {
return (int) mLibVLC.getLength();
}
@Override
public void load(List<String> mediaPathList, int position, boolean libvlcBacked, boolean noVideo)
throws RemoteException {
mLibVLCPlaylistActive = libvlcBacked;
Log.v(TAG, "Loading position " + ((Integer)position).toString() + " in " + mediaPathList.toString());
mEventHandler.addHandler(mVlcEventHandler);
mMediaList.clear();
mPrevious.clear();
if(mLibVLCPlaylistActive) {
for(int i = 0; i < mediaPathList.size(); i++)
mMediaList.add(new Media(mediaPathList.get(i), i));
} else {
MediaDatabase db = MediaDatabase.getInstance(AudioService.this);
for (int i = 0; i < mediaPathList.size(); i++) {
String path = mediaPathList.get(i);
Media media = db.getMedia(AudioService.this, path);
if(media == null) {
if (!validatePath(path)) {
showToast(getResources().getString(R.string.invalid_location, path), Toast.LENGTH_SHORT);
continue;
}
Log.v(TAG, "Creating on-the-fly Media object for " + path);
media = new Media(path, false);
}
mMediaList.add(media);
}
}
if (mMediaList.size() > position) {
mCurrentMedia = mMediaList.get(position);
}
if (mCurrentMedia != null) {
if(mLibVLCPlaylistActive) {
mLibVLC.playIndex(position);
} else {
mLibVLC.readMedia(mCurrentMedia.getLocation(), noVideo);
}
setUpRemoteControlClient();
showNotification();
updateWidget(AudioService.this);
updateRemoteControlClientMetadata();
}
AudioService.this.saveMediaList();
AudioService.this.saveCurrentMedia();
}
@Override
public void showWithoutParse(String URI) throws RemoteException {
Log.v(TAG, "Showing playing URI " + URI);
// Show an URI without interrupting/losing the current stream
if(!mLibVLC.isPlaying())
return;
mEventHandler.addHandler(mVlcEventHandler);
mMediaList.clear();
mPrevious.clear();
// Prevent re-parsing the media, which would mean losing the connection
mCurrentMedia = new Media(
getApplicationContext(),
URI,
0,
0,
Media.TYPE_AUDIO,
null,
URI,
VLCApplication.getAppContext().getString(R.string.unknown_artist),
VLCApplication.getAppContext().getString(R.string.unknown_genre),
VLCApplication.getAppContext().getString(R.string.unknown_album),
0,
0,
"",
-1,
-1);
mMediaList.add(mCurrentMedia);
// Notify everyone
mHandler.sendEmptyMessage(SHOW_PROGRESS);
showNotification();
executeUpdate();
}
@Override
public void append(List<String> mediaPathList) throws RemoteException {
if (mMediaList.size() == 0) {
load(mediaPathList, 0, false, false);
return;
}
if(mLibVLCPlaylistActive) {
return;
}
MediaDatabase db = MediaDatabase.getInstance(AudioService.this);
for (int i = 0; i < mediaPathList.size(); i++) {
String path = mediaPathList.get(i);
Media media = db.getMedia(AudioService.this, path);
if(media == null) {
if (!validatePath(path)) {
showToast(getResources().getString(R.string.invalid_location, path), Toast.LENGTH_SHORT);
continue;
}
Log.v(TAG, "Creating on-the-fly Media object for " + path);
media = new Media(path, false);
}
mMediaList.add(media);
}
AudioService.this.saveMediaList();
}
@Override
public List<String> getItems() {
ArrayList<String> medias = new ArrayList<String>();
for (int i = 0; i < mMediaList.size(); i++) {
Media item = mMediaList.get(i);
medias.add(item.getLocation());
}
return medias;
}
@Override
public String getItem() {
return mCurrentMedia != null
? mCurrentMedia.getLocation()
: null;
}
@Override
public void next() throws RemoteException {
AudioService.this.next();
}
@Override
public void previous() throws RemoteException {
AudioService.this.previous();
}
@Override
public void shuffle() throws RemoteException {
AudioService.this.shuffle();
}
@Override
public void setRepeatType(int t) throws RemoteException {
AudioService.this.setRepeatType(t);
}
@Override
public void setTime(long time) throws RemoteException {
mLibVLC.setTime(time);
}
@Override
public boolean hasNext() throws RemoteException {
if (mRepeating == RepeatType.Once)
return false;
int index = mMediaList.indexOf(mCurrentMedia);
if (mShuffling && mPrevious.size() < mMediaList.size() - 1 ||
!mShuffling && index < mMediaList.size() - 1)
return true;
else
return false;
}
@Override
public boolean hasPrevious() throws RemoteException {
if (mRepeating == RepeatType.Once)
return false;
int index = mMediaList.indexOf(mCurrentMedia);
if (mPrevious.size() > 0 || index > 0)
return true;
else
return false;
}
@Override
public void detectHeadset(boolean enable) throws RemoteException {
mDetectHeadset = enable;
}
@Override
public float getRate() throws RemoteException {
return mLibVLC.getRate();
}
};
private void updateWidget(Context context)
{
Log.d(TAG, "Updating widget");
Intent i = new Intent();
i.setClassName(WIDGET_PACKAGE, WIDGET_CLASS);
i.setAction(ACTION_WIDGET_UPDATE);
if (mCurrentMedia != null) {
i.putExtra("title", mCurrentMedia.getTitle());
i.putExtra("artist", mCurrentMedia.getArtist());
}
else {
i.putExtra("title", "VLC mini player");
i.putExtra("artist", "");
}
i.putExtra("isplaying", mLibVLC.isPlaying());
Bitmap cover = mCurrentMedia != null ? AudioUtil.getCover(this, mCurrentMedia, 64) : null;
i.putExtra("cover", cover);
sendBroadcast(i);
}
private void updateWidgetPosition(Context context, float pos)
{
// no more than one widget update for each 1/50 of the song
long timestamp = Calendar.getInstance().getTimeInMillis();
if (mCurrentMedia == null ||
timestamp - mWidgetPositionTimestamp < mCurrentMedia.getLength() / 50)
return;
mWidgetPositionTimestamp = timestamp;
Intent i = new Intent();
i.setClassName(WIDGET_PACKAGE, WIDGET_CLASS);
i.setAction(ACTION_WIDGET_UPDATE_POSITION);
i.putExtra("position", pos);
sendBroadcast(i);
}
private synchronized void loadLastPlaylist() {
if (!Util.hasExternalStorage())
return;
String line;
FileInputStream input;
BufferedReader br;
int rowCount = 0;
int position = 0;
String currentMedia;
List<String> mediaPathList = new ArrayList<String>();
try {
// read CurrentMedia
input = new FileInputStream(AudioUtil.CACHE_DIR + "/" + "CurrentMedia.txt");
br = new BufferedReader(new InputStreamReader(input));
currentMedia = br.readLine();
mShuffling = "1".equals(br.readLine());
br.close();
input.close();
// read MediaList
input = new FileInputStream(AudioUtil.CACHE_DIR + "/" + "MediaList.txt");
br = new BufferedReader(new InputStreamReader(input));
while ((line = br.readLine()) != null) {
mediaPathList.add(line);
if (line.equals(currentMedia))
position = rowCount;
rowCount++;
}
br.close();
input.close();
// load playlist
mInterface.load(mediaPathList, position, false, false);
} catch (IOException e) {
e.printStackTrace();
} catch (RemoteException e) {
e.printStackTrace();
}
}
private synchronized void saveCurrentMedia() {
if (!Util.hasExternalStorage())
return;
FileOutputStream output;
BufferedWriter bw;
try {
output = new FileOutputStream(AudioUtil.CACHE_DIR + "/" + "CurrentMedia.txt");
bw = new BufferedWriter(new OutputStreamWriter(output));
bw.write(mCurrentMedia != null ? mCurrentMedia.getLocation() : "");
bw.write('\n');
bw.write(mShuffling ? "1" : "0");
bw.write('\n');
bw.close();
output.close();
} catch (IOException e) {
e.printStackTrace();
}
}
private synchronized void saveMediaList() {
if (!Util.hasExternalStorage())
return;
FileOutputStream output;
BufferedWriter bw;
try {
output = new FileOutputStream(AudioUtil.CACHE_DIR + "/" + "MediaList.txt");
bw = new BufferedWriter(new OutputStreamWriter(output));
for (int i = 0; i < mMediaList.size(); i++) {
Media item = mMediaList.get(i);
bw.write(item.getLocation());
bw.write('\n');
}
bw.close();
output.close();
} catch (IOException e) {
e.printStackTrace();
}
}
private boolean validatePath(String path)
{
/* Check if the MRL contains a scheme */
if (!path.matches("\\w+://.+"))
path = "file://".concat(path);
if (path.toLowerCase(Locale.ENGLISH).startsWith("file://")) {
/* Ensure the file exists */
File f = new File(path);
if (!f.isFile())
return false;
}
return true;
}
private void showToast(String text, int duration) {
Message msg = new Message();
Bundle bundle = new Bundle();
bundle.putString("text", text);
bundle.putInt("duration", duration);
msg.setData(bundle);
msg.what = SHOW_TOAST;
mHandler.sendMessage(msg);
}
}
| true | true | public void handleMessage(Message msg) {
AudioService service = getOwner();
if(service == null) return;
switch (msg.getData().getInt("event")) {
case EventHandler.MediaPlayerPlaying:
Log.i(TAG, "MediaPlayerPlaying");
if (service.mCurrentMedia == null)
return;
String location = service.mCurrentMedia.getLocation();
long length = service.mLibVLC.getLength();
MediaDatabase dbManager = MediaDatabase
.getInstance(VLCApplication.getAppContext());
Media m = dbManager.getMedia(VLCApplication.getAppContext(),
location);
/**
* 1) There is a media to update
* 2) It has a length of 0
* (dynamic track loading - most notably the OGG container)
* 3) We were able to get a length even after parsing
* (don't want to replace a 0 with a 0)
*/
if(m != null && m.getLength() == 0 && length > 0) {
Log.d(TAG, "Updating audio file length");
dbManager.updateMedia(location,
MediaDatabase.mediaColumn.MEDIA_LENGTH, length);
}
service.changeAudioFocus(true);
service.setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_PLAYING);
if (!service.mWakeLock.isHeld())
service.mWakeLock.acquire();
break;
case EventHandler.MediaPlayerPaused:
Log.i(TAG, "MediaPlayerPaused");
service.executeUpdate();
service.showNotification();
service.setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED);
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
case EventHandler.MediaPlayerStopped:
Log.i(TAG, "MediaPlayerStopped");
service.executeUpdate();
service.setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
case EventHandler.MediaPlayerEndReached:
Log.i(TAG, "MediaPlayerEndReached");
service.executeUpdate();
service.next();
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
case EventHandler.MediaPlayerVout:
if(msg.getData().getInt("data") > 0) {
service.handleVout();
}
break;
case EventHandler.MediaPlayerPositionChanged:
float pos = msg.getData().getFloat("data");
service.updateWidgetPosition(service, pos);
break;
case EventHandler.MediaPlayerEncounteredError:
service.showToast(VLCApplication.getAppContext().getString(R.string.invalid_location,
service.mCurrentMedia.getLocation()), Toast.LENGTH_SHORT);
service.executeUpdate();
service.next();
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
default:
Log.e(TAG, "Event not handled");
break;
}
}
| public void handleMessage(Message msg) {
AudioService service = getOwner();
if(service == null) return;
switch (msg.getData().getInt("event")) {
case EventHandler.MediaPlayerPlaying:
Log.i(TAG, "MediaPlayerPlaying");
if (service.mCurrentMedia == null)
return;
String location = service.mCurrentMedia.getLocation();
long length = service.mLibVLC.getLength();
MediaDatabase dbManager = MediaDatabase
.getInstance(VLCApplication.getAppContext());
Media m = dbManager.getMedia(VLCApplication.getAppContext(),
location);
/**
* 1) There is a media to update
* 2) It has a length of 0
* (dynamic track loading - most notably the OGG container)
* 3) We were able to get a length even after parsing
* (don't want to replace a 0 with a 0)
*/
if(m != null && m.getLength() == 0 && length > 0) {
Log.d(TAG, "Updating audio file length");
dbManager.updateMedia(location,
MediaDatabase.mediaColumn.MEDIA_LENGTH, length);
}
service.changeAudioFocus(true);
service.setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_PLAYING);
if (!service.mWakeLock.isHeld())
service.mWakeLock.acquire();
break;
case EventHandler.MediaPlayerPaused:
Log.i(TAG, "MediaPlayerPaused");
service.executeUpdate();
service.showNotification();
service.setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED);
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
case EventHandler.MediaPlayerStopped:
Log.i(TAG, "MediaPlayerStopped");
service.executeUpdate();
service.setRemoteControlClientPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
case EventHandler.MediaPlayerEndReached:
Log.i(TAG, "MediaPlayerEndReached");
service.executeUpdate();
service.next();
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
case EventHandler.MediaPlayerVout:
if(msg.getData().getInt("data") > 0) {
service.handleVout();
}
break;
case EventHandler.MediaPlayerPositionChanged:
float pos = msg.getData().getFloat("data");
service.updateWidgetPosition(service, pos);
break;
case EventHandler.MediaPlayerEncounteredError:
if (service.mCurrentMedia != null) {
service.showToast(service.getString(R.string.invalid_location,
service.mCurrentMedia.getLocation()), Toast.LENGTH_SHORT);
}
service.executeUpdate();
service.next();
if (service.mWakeLock.isHeld())
service.mWakeLock.release();
break;
default:
Log.e(TAG, "Event not handled");
break;
}
}
|
diff --git a/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java b/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
index cf3874d8b..02896f766 100644
--- a/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
+++ b/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
@@ -1,182 +1,182 @@
/*
* Copyright 2006 Wyona
*/
package org.wyona.yanel.impl.resources.navigation;
import javax.xml.transform.Transformer;
import org.wyona.yanel.core.navigation.Node;
import org.wyona.yanel.core.navigation.Sitetree;
import org.wyona.yanel.impl.resources.BasicXMLResource;
import org.apache.log4j.Logger;
/**
*
*/
public class DataRepoSitetreeResource extends BasicXMLResource {
private static Logger log = Logger.getLogger(DataRepoSitetreeResource.class);
/**
*
*/
public DataRepoSitetreeResource() {
}
/**
*
*/
public long getSize() throws Exception {
return -1;
}
/**
*
*/
public boolean exists() throws Exception {
return true;
}
/**
*
*/
public java.io.InputStream getContentXML(String viewId) throws Exception {
StringBuffer sb = new StringBuffer("<?xml version=\"1.0\"?>");
sb.append(getSitetreeAsXML());
//sb.append(getSitetreeAsXML(getPath().toString()));
return new java.io.StringBufferInputStream(sb.toString());
}
/**
* Get sitetree as XML
*/
private String getSitetreeAsXML() throws Exception {
String name4pathParameter = "path";
if (getResourceConfigProperty("name4path-parameter") != null) {
name4pathParameter = getResourceConfigProperty("name4path-parameter");
}
StringBuffer sb = new StringBuffer("<sitetree>");
if (getEnvironment().getRequest().getParameter(name4pathParameter) != null) {
sb.append(getNodeAsXML(request.getParameter(name4pathParameter)));
} else {
sb.append(getNodeAsXML("/"));
}
// TODO: Sitetree generated out of RDF resources and statements
/*
com.hp.hpl.jena.rdf.model.Resource rootResource = getRealm().getSitetreeRootResource();
sb.append(getNodeAsXML(rootResource));
*/
sb.append("</sitetree>");
return sb.toString();
}
/**
* Get node as XML
*/
private String getNodeAsXML(String path) {
boolean showAllSubnodes = true;
try {
if (getResourceConfigProperty("show-all-subnodes") != null) {
showAllSubnodes = Boolean.valueOf(getResourceConfigProperty("show-all-subnodes")).booleanValue();
}
} catch (Exception e) {
log.info("could not get property show-all-subnodes. falling back to show-all-subnodes=true.");
}
String showAllSubnodesParameter = getParameterAsString("show-all-subnodes");
if (showAllSubnodesParameter != null && Boolean.valueOf(showAllSubnodesParameter).booleanValue()) {
showAllSubnodes = true;
}
//private String getNodeAsXML(com.hp.hpl.jena.rdf.model.Resource resource) {
- //log.error("DEBUG: Path: " + path);
+ //log.debug("Path: " + path);
Sitetree sitetree = getRealm().getRepoNavigation();
Node node = sitetree.getNode(getRealm(), path);
StringBuilder sb = new StringBuilder("");
// TODO: Check for statements "parentOf" for this resource
/*
Statement[] st = resource.getStatements("parentOf");
if (st.length > 0) {
for (int i = 0; i < st.length; i++) {
Resource child = st.getObject();
URL url = getReal().getURLBuilder(child);
}
} else {
// Is not a collection, there are no children
}
*/
if (node != null) {
if (node.isCollection()) {
if (showAllSubnodes) {
sb.append("<collection path=\"" + path + "\" name=\"" + node.getName() + "\">");
// TODO: There seems to be a problem re special characters
sb.append("<label><![CDATA[" + node.getName() + "]]></label>");
//sb.append("<label><![CDATA[" + node.getLabel() + "]]></label>");
}
Node[] children = node.getChildren();
for (int i = 0; i < children.length; i++) {
String childPath = path + "/" + children[i].getName();
if (path.equals("/")) {
childPath = path + children[i].getName();
}
//log.debug("Child path: " + childPath);
if (children[i].isCollection()) {
if (!showAllSubnodes) {
sb.append("<collection path=\"" + childPath + "\" name=\"" + children[i].getName() + "\">");
// TODO: ...
sb.append("<label><![CDATA[" +children[i].getName() + "]]></label>");
//sb.append("<label><![CDATA[" + children[i].getLabel() + "]]></label>");
sb.append("</collection>");
} else {
sb.append(getNodeAsXML(childPath));
}
//sb.append(getNodeAsXML(children[i].getPath()));
} else if (children[i].isResource()) {
sb.append("<resource path=\"" + childPath + "\" name=\"" + children[i].getName() + "\">");
//sb.append("<resource path=\"" + children[i].getPath() + "\" name=\"" + children[i].getName() + "\">");
// TODO ...
sb.append("<label><![CDATA[" + children[i].getName() + "]]></label>");
//sb.append("<label><![CDATA[" + children[i].getLabel() + "]]></label>");
sb.append("</resource>");
} else {
sb.append("<neither-resource-nor-collection path=\"" + childPath + "\" name=\"" + children[i].getName() + "\"/>");
//sb.append("<neither-resource-nor-collection path=\"" + children[i].getPath() + "\" name=\"" + children[i].getName() + "\"/>");
}
}
if (showAllSubnodes) {
sb.append("</collection>");
}
} else {
sb.append("<resource path=\"" + path + "\" name=\"" + node.getName() + "\">");
// TODO ...
sb.append("<label><![CDATA[" + node.getName() + "]]></label>");
//sb.append("<label><![CDATA[" + node.getLabel() + "]]></label>");
sb.append("</resource>");
}
} else {
String errorMessage = "node is null for path: " + path;
sb.append("<exception>" + errorMessage + "</exception>");
log.error(errorMessage);
}
return sb.toString();
}
protected void passTransformerParameters(Transformer transformer) throws Exception {
super.passTransformerParameters(transformer);
try {
String resourceConfigPropertyDomain = getResourceConfigProperty("domain");
if (resourceConfigPropertyDomain != null) {
transformer.setParameter("domain", resourceConfigPropertyDomain);
}
} catch (Exception e) {
log.error("could not get property domain. domain will not be availabel within transformer chain. " + e.getMessage(), e);
}
}
}
| true | true | private String getNodeAsXML(String path) {
boolean showAllSubnodes = true;
try {
if (getResourceConfigProperty("show-all-subnodes") != null) {
showAllSubnodes = Boolean.valueOf(getResourceConfigProperty("show-all-subnodes")).booleanValue();
}
} catch (Exception e) {
log.info("could not get property show-all-subnodes. falling back to show-all-subnodes=true.");
}
String showAllSubnodesParameter = getParameterAsString("show-all-subnodes");
if (showAllSubnodesParameter != null && Boolean.valueOf(showAllSubnodesParameter).booleanValue()) {
showAllSubnodes = true;
}
//private String getNodeAsXML(com.hp.hpl.jena.rdf.model.Resource resource) {
//log.error("DEBUG: Path: " + path);
Sitetree sitetree = getRealm().getRepoNavigation();
Node node = sitetree.getNode(getRealm(), path);
StringBuilder sb = new StringBuilder("");
// TODO: Check for statements "parentOf" for this resource
/*
Statement[] st = resource.getStatements("parentOf");
if (st.length > 0) {
for (int i = 0; i < st.length; i++) {
Resource child = st.getObject();
URL url = getReal().getURLBuilder(child);
}
} else {
// Is not a collection, there are no children
}
*/
if (node != null) {
if (node.isCollection()) {
if (showAllSubnodes) {
sb.append("<collection path=\"" + path + "\" name=\"" + node.getName() + "\">");
// TODO: There seems to be a problem re special characters
sb.append("<label><![CDATA[" + node.getName() + "]]></label>");
//sb.append("<label><![CDATA[" + node.getLabel() + "]]></label>");
}
Node[] children = node.getChildren();
for (int i = 0; i < children.length; i++) {
String childPath = path + "/" + children[i].getName();
if (path.equals("/")) {
childPath = path + children[i].getName();
}
//log.debug("Child path: " + childPath);
if (children[i].isCollection()) {
if (!showAllSubnodes) {
sb.append("<collection path=\"" + childPath + "\" name=\"" + children[i].getName() + "\">");
// TODO: ...
sb.append("<label><![CDATA[" +children[i].getName() + "]]></label>");
//sb.append("<label><![CDATA[" + children[i].getLabel() + "]]></label>");
sb.append("</collection>");
} else {
sb.append(getNodeAsXML(childPath));
}
//sb.append(getNodeAsXML(children[i].getPath()));
} else if (children[i].isResource()) {
sb.append("<resource path=\"" + childPath + "\" name=\"" + children[i].getName() + "\">");
//sb.append("<resource path=\"" + children[i].getPath() + "\" name=\"" + children[i].getName() + "\">");
// TODO ...
sb.append("<label><![CDATA[" + children[i].getName() + "]]></label>");
//sb.append("<label><![CDATA[" + children[i].getLabel() + "]]></label>");
sb.append("</resource>");
} else {
sb.append("<neither-resource-nor-collection path=\"" + childPath + "\" name=\"" + children[i].getName() + "\"/>");
//sb.append("<neither-resource-nor-collection path=\"" + children[i].getPath() + "\" name=\"" + children[i].getName() + "\"/>");
}
}
if (showAllSubnodes) {
sb.append("</collection>");
}
} else {
sb.append("<resource path=\"" + path + "\" name=\"" + node.getName() + "\">");
// TODO ...
sb.append("<label><![CDATA[" + node.getName() + "]]></label>");
//sb.append("<label><![CDATA[" + node.getLabel() + "]]></label>");
sb.append("</resource>");
}
} else {
String errorMessage = "node is null for path: " + path;
sb.append("<exception>" + errorMessage + "</exception>");
log.error(errorMessage);
}
return sb.toString();
}
| private String getNodeAsXML(String path) {
boolean showAllSubnodes = true;
try {
if (getResourceConfigProperty("show-all-subnodes") != null) {
showAllSubnodes = Boolean.valueOf(getResourceConfigProperty("show-all-subnodes")).booleanValue();
}
} catch (Exception e) {
log.info("could not get property show-all-subnodes. falling back to show-all-subnodes=true.");
}
String showAllSubnodesParameter = getParameterAsString("show-all-subnodes");
if (showAllSubnodesParameter != null && Boolean.valueOf(showAllSubnodesParameter).booleanValue()) {
showAllSubnodes = true;
}
//private String getNodeAsXML(com.hp.hpl.jena.rdf.model.Resource resource) {
//log.debug("Path: " + path);
Sitetree sitetree = getRealm().getRepoNavigation();
Node node = sitetree.getNode(getRealm(), path);
StringBuilder sb = new StringBuilder("");
// TODO: Check for statements "parentOf" for this resource
/*
Statement[] st = resource.getStatements("parentOf");
if (st.length > 0) {
for (int i = 0; i < st.length; i++) {
Resource child = st.getObject();
URL url = getReal().getURLBuilder(child);
}
} else {
// Is not a collection, there are no children
}
*/
if (node != null) {
if (node.isCollection()) {
if (showAllSubnodes) {
sb.append("<collection path=\"" + path + "\" name=\"" + node.getName() + "\">");
// TODO: There seems to be a problem re special characters
sb.append("<label><![CDATA[" + node.getName() + "]]></label>");
//sb.append("<label><![CDATA[" + node.getLabel() + "]]></label>");
}
Node[] children = node.getChildren();
for (int i = 0; i < children.length; i++) {
String childPath = path + "/" + children[i].getName();
if (path.equals("/")) {
childPath = path + children[i].getName();
}
//log.debug("Child path: " + childPath);
if (children[i].isCollection()) {
if (!showAllSubnodes) {
sb.append("<collection path=\"" + childPath + "\" name=\"" + children[i].getName() + "\">");
// TODO: ...
sb.append("<label><![CDATA[" +children[i].getName() + "]]></label>");
//sb.append("<label><![CDATA[" + children[i].getLabel() + "]]></label>");
sb.append("</collection>");
} else {
sb.append(getNodeAsXML(childPath));
}
//sb.append(getNodeAsXML(children[i].getPath()));
} else if (children[i].isResource()) {
sb.append("<resource path=\"" + childPath + "\" name=\"" + children[i].getName() + "\">");
//sb.append("<resource path=\"" + children[i].getPath() + "\" name=\"" + children[i].getName() + "\">");
// TODO ...
sb.append("<label><![CDATA[" + children[i].getName() + "]]></label>");
//sb.append("<label><![CDATA[" + children[i].getLabel() + "]]></label>");
sb.append("</resource>");
} else {
sb.append("<neither-resource-nor-collection path=\"" + childPath + "\" name=\"" + children[i].getName() + "\"/>");
//sb.append("<neither-resource-nor-collection path=\"" + children[i].getPath() + "\" name=\"" + children[i].getName() + "\"/>");
}
}
if (showAllSubnodes) {
sb.append("</collection>");
}
} else {
sb.append("<resource path=\"" + path + "\" name=\"" + node.getName() + "\">");
// TODO ...
sb.append("<label><![CDATA[" + node.getName() + "]]></label>");
//sb.append("<label><![CDATA[" + node.getLabel() + "]]></label>");
sb.append("</resource>");
}
} else {
String errorMessage = "node is null for path: " + path;
sb.append("<exception>" + errorMessage + "</exception>");
log.error(errorMessage);
}
return sb.toString();
}
|
diff --git a/geobatch/modules/src/test/java/it/geosolutions/geobatch/destination/TargetTest.java b/geobatch/modules/src/test/java/it/geosolutions/geobatch/destination/TargetTest.java
index 52e7b46..4479b0e 100644
--- a/geobatch/modules/src/test/java/it/geosolutions/geobatch/destination/TargetTest.java
+++ b/geobatch/modules/src/test/java/it/geosolutions/geobatch/destination/TargetTest.java
@@ -1,58 +1,58 @@
/*
* GeoTools - The Open Source Java GIS Toolkit
* http://geotools.org
*
* (C) 2002-2011, Open Source Geospatial Foundation (OSGeo)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License.
*
* 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
* Lesser General Public License for more details.
*/
package it.geosolutions.geobatch.destination;
import it.geosolutions.geobatch.actions.ds2ds.dao.FeatureConfiguration;
import it.geosolutions.geobatch.catalog.Identifiable;
import it.geosolutions.geobatch.flow.event.ProgressListenerForwarder;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import junit.framework.TestCase;
import org.junit.Test;
/**
* @author "Mauro Bartolomeoli - [email protected]"
*
*/
public class TargetTest extends TestCase {
@Test
public void testImportTarget() throws IOException {
String input = "D:\\Develop\\GEOBATCH_CONFIG\\temp\\importBersagliVettoriali\\20130321-140630-066\\0_Ds2dsGeneratorService\\output.xml";
FeatureConfiguration cfg = FeatureConfiguration.fromXML(new FileInputStream(input));
VectorTarget target = new VectorTarget(cfg.getTypeName(), new ProgressListenerForwarder(new Identifiable() {
@Override
public void setId(String arg0) {
// TODO Auto-generated method stub
}
@Override
public String getId() {
return "id";
}
}));
- target.importTarget(cfg.getDataStore(), null);
+ //target.importTarget(cfg.getDataStore(), null);
}
}
| true | true | public void testImportTarget() throws IOException {
String input = "D:\\Develop\\GEOBATCH_CONFIG\\temp\\importBersagliVettoriali\\20130321-140630-066\\0_Ds2dsGeneratorService\\output.xml";
FeatureConfiguration cfg = FeatureConfiguration.fromXML(new FileInputStream(input));
VectorTarget target = new VectorTarget(cfg.getTypeName(), new ProgressListenerForwarder(new Identifiable() {
@Override
public void setId(String arg0) {
// TODO Auto-generated method stub
}
@Override
public String getId() {
return "id";
}
}));
target.importTarget(cfg.getDataStore(), null);
}
| public void testImportTarget() throws IOException {
String input = "D:\\Develop\\GEOBATCH_CONFIG\\temp\\importBersagliVettoriali\\20130321-140630-066\\0_Ds2dsGeneratorService\\output.xml";
FeatureConfiguration cfg = FeatureConfiguration.fromXML(new FileInputStream(input));
VectorTarget target = new VectorTarget(cfg.getTypeName(), new ProgressListenerForwarder(new Identifiable() {
@Override
public void setId(String arg0) {
// TODO Auto-generated method stub
}
@Override
public String getId() {
return "id";
}
}));
//target.importTarget(cfg.getDataStore(), null);
}
|
diff --git a/src/main/org/jboss/jms/util/XMLUtil.java b/src/main/org/jboss/jms/util/XMLUtil.java
index b6a98c0a6..de0df203f 100644
--- a/src/main/org/jboss/jms/util/XMLUtil.java
+++ b/src/main/org/jboss/jms/util/XMLUtil.java
@@ -1,310 +1,310 @@
/**
* JBoss, Home of Professional Open Source
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.jms.util;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.jboss.logging.Logger;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
import java.io.StringReader;
import java.io.Reader;
import java.io.InputStreamReader;
import java.net.URL;
import java.lang.reflect.Method;
import java.util.List;
import java.util.ArrayList;
/**
* @author <a href="mailto:[email protected]">Ovidiu Feodorov</a>
* @version <tt>$Revision$</tt>
* $Id$
*/
public class XMLUtil
{
// Constants -----------------------------------------------------
private static final Logger log = Logger.getLogger(XMLUtil.class);
// Static --------------------------------------------------------
public static Element stringToElement(String s) throws Exception
{
return readerToElement(new StringReader(s));
}
public static Element urlToElement(URL url) throws Exception
{
return readerToElement(new InputStreamReader(url.openStream()));
}
public static Element readerToElement(Reader r) throws Exception
{
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder parser = factory.newDocumentBuilder();
Document doc = parser.parse(new InputSource(r));
return doc.getDocumentElement();
}
public static String elementToString(Node n) throws XMLException
{
String name = n.getNodeName();
if (name.startsWith("#"))
{
return "";
}
StringBuffer sb = new StringBuffer();
sb.append('<').append(name);
NamedNodeMap attrs = n.getAttributes();
if (attrs != null)
{
for(int i = 0; i < attrs.getLength(); i++)
{
Node attr = attrs.item(i);
sb.append(' ').append(attr.getNodeName() + "=\"" + attr.getNodeValue() + "\"");
}
}
String textContent = null;
NodeList children = n.getChildNodes();
if (children.getLength() == 0)
{
if ((textContent = XMLUtil.getTextContent(n)) != null && !"".equals(textContent))
{
sb.append(textContent).append("</").append(name).append('>');;
}
else
{
sb.append("/>").append('\n');
}
}
else
{
sb.append('>').append('\n');
boolean hasValidChildren = false;
for(int i = 0; i < children.getLength(); i++)
{
String childToString = elementToString(children.item(i));
if (!"".equals(childToString))
{
sb.append(childToString);
hasValidChildren = true;
}
}
if (!hasValidChildren && ((textContent = XMLUtil.getTextContent(n)) != null))
{
sb.append(textContent);
}
sb.append("</").append(name).append('>');
}
return sb.toString();
}
private static final Object[] EMPTY_ARRAY = new Object[0];
/**
* This metod is here because Node.getTextContent() is not available in JDK 1.4 and I would like
* to have an uniform access to this functionality.
*
* Note: if the content is another element or set of elements, it returns a string representation
* of the hierarchy.
*/
public static String getTextContent(Node n) throws XMLException
{
if (n.hasChildNodes())
{
StringBuffer sb = new StringBuffer();
NodeList nl = n.getChildNodes();
for(int i = 0; i < nl.getLength(); i++)
{
sb.append(XMLUtil.elementToString(nl.item(i)));
if (i < nl.getLength() - 1)
{
sb.append('\n');
}
}
String s = sb.toString();
if (s.length() != 0)
{
return s;
}
}
Method[] methods = Node.class.getMethods();
for(int i = 0; i < methods.length; i++)
{
if("getTextContent".equals(methods[i].getName()))
{
Method getTextContext = methods[i];
try
{
return (String)getTextContext.invoke(n, EMPTY_ARRAY);
}
catch(Exception e)
{
log.error("Failed to invoke getTextContent() on node " + n, e);
return null;
}
}
}
// JDK 1.4
String s = n.toString();
int i = s.indexOf('>');
int i2 = s.indexOf("</");
if (i == -1 || i2 == -1)
{
log.error("Invalid string expression: " + s);
return null;
}
return s.substring(i + 1, i2);
}
public static void assertEquivalent(Node node, Node node2)
{
if (node == null)
{
throw new XMLRuntimeException("the first node to be compared is null");
}
if (node2 == null)
{
throw new XMLRuntimeException("the second node to be compared is null");
}
if (!node.getNodeName().equals(node2.getNodeName()))
{
throw new XMLRuntimeException("nodes have different node names");
}
boolean hasAttributes = node.hasAttributes();
if (hasAttributes != node2.hasAttributes())
{
throw new XMLRuntimeException("one node has attributes and the other doesn't");
}
if (hasAttributes)
{
NamedNodeMap attrs = node.getAttributes();
int length = attrs.getLength();
NamedNodeMap attrs2 = node2.getAttributes();
int length2 = attrs2.getLength();
if (length != length2)
{
throw new XMLRuntimeException("nodes hava a different number of attributes");
}
outer: for(int i = 0; i < length; i++)
{
Node n = attrs.item(i);
String name = n.getNodeName();
String value = n.getNodeValue();
for(int j = 0; j < length; j++)
{
- Node n2 = attrs2.item(i);
+ Node n2 = attrs2.item(j);
String name2 = n2.getNodeName();
String value2 = n2.getNodeValue();
if (name.equals(name2) && value.equals(value2))
{
continue outer;
}
}
throw new XMLRuntimeException("attribute " + name + "=" + value + " doesn't match");
}
}
boolean hasChildren = node.hasChildNodes();
if (hasChildren != node2.hasChildNodes())
{
throw new XMLRuntimeException("one node has children and the other doesn't");
}
if (hasChildren)
{
NodeList nl = node.getChildNodes();
NodeList nl2 = node2.getChildNodes();
short[] toFilter = new short[] {Node.TEXT_NODE, Node.ATTRIBUTE_NODE, Node.COMMENT_NODE};
List nodes = filter(nl, toFilter);
List nodes2 = filter(nl2, toFilter);
int length = nodes.size();
if (length != nodes2.size())
{
throw new XMLRuntimeException("nodes hava a different number of children");
}
for(int i = 0; i < length; i++)
{
Node n = (Node)nodes.get(i);
Node n2 = (Node)nodes2.get(i);
assertEquivalent(n, n2);
}
}
}
// Attributes ----------------------------------------------------
// Constructors --------------------------------------------------
// Public --------------------------------------------------------
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
// Private -------------------------------------------------------
private static List filter(NodeList nl, short[] typesToFilter)
{
List nodes = new ArrayList();
outer: for(int i = 0; i < nl.getLength(); i++)
{
Node n = nl.item(i);
short type = n.getNodeType();
for(int j = 0; j < typesToFilter.length; j++)
{
if (typesToFilter[j] == type)
{
continue outer;
}
}
nodes.add(n);
}
return nodes;
}
// Inner classes -------------------------------------------------
}
| true | true | public static void assertEquivalent(Node node, Node node2)
{
if (node == null)
{
throw new XMLRuntimeException("the first node to be compared is null");
}
if (node2 == null)
{
throw new XMLRuntimeException("the second node to be compared is null");
}
if (!node.getNodeName().equals(node2.getNodeName()))
{
throw new XMLRuntimeException("nodes have different node names");
}
boolean hasAttributes = node.hasAttributes();
if (hasAttributes != node2.hasAttributes())
{
throw new XMLRuntimeException("one node has attributes and the other doesn't");
}
if (hasAttributes)
{
NamedNodeMap attrs = node.getAttributes();
int length = attrs.getLength();
NamedNodeMap attrs2 = node2.getAttributes();
int length2 = attrs2.getLength();
if (length != length2)
{
throw new XMLRuntimeException("nodes hava a different number of attributes");
}
outer: for(int i = 0; i < length; i++)
{
Node n = attrs.item(i);
String name = n.getNodeName();
String value = n.getNodeValue();
for(int j = 0; j < length; j++)
{
Node n2 = attrs2.item(i);
String name2 = n2.getNodeName();
String value2 = n2.getNodeValue();
if (name.equals(name2) && value.equals(value2))
{
continue outer;
}
}
throw new XMLRuntimeException("attribute " + name + "=" + value + " doesn't match");
}
}
boolean hasChildren = node.hasChildNodes();
if (hasChildren != node2.hasChildNodes())
{
throw new XMLRuntimeException("one node has children and the other doesn't");
}
if (hasChildren)
{
NodeList nl = node.getChildNodes();
NodeList nl2 = node2.getChildNodes();
short[] toFilter = new short[] {Node.TEXT_NODE, Node.ATTRIBUTE_NODE, Node.COMMENT_NODE};
List nodes = filter(nl, toFilter);
List nodes2 = filter(nl2, toFilter);
int length = nodes.size();
if (length != nodes2.size())
{
throw new XMLRuntimeException("nodes hava a different number of children");
}
for(int i = 0; i < length; i++)
{
Node n = (Node)nodes.get(i);
Node n2 = (Node)nodes2.get(i);
assertEquivalent(n, n2);
}
}
}
| public static void assertEquivalent(Node node, Node node2)
{
if (node == null)
{
throw new XMLRuntimeException("the first node to be compared is null");
}
if (node2 == null)
{
throw new XMLRuntimeException("the second node to be compared is null");
}
if (!node.getNodeName().equals(node2.getNodeName()))
{
throw new XMLRuntimeException("nodes have different node names");
}
boolean hasAttributes = node.hasAttributes();
if (hasAttributes != node2.hasAttributes())
{
throw new XMLRuntimeException("one node has attributes and the other doesn't");
}
if (hasAttributes)
{
NamedNodeMap attrs = node.getAttributes();
int length = attrs.getLength();
NamedNodeMap attrs2 = node2.getAttributes();
int length2 = attrs2.getLength();
if (length != length2)
{
throw new XMLRuntimeException("nodes hava a different number of attributes");
}
outer: for(int i = 0; i < length; i++)
{
Node n = attrs.item(i);
String name = n.getNodeName();
String value = n.getNodeValue();
for(int j = 0; j < length; j++)
{
Node n2 = attrs2.item(j);
String name2 = n2.getNodeName();
String value2 = n2.getNodeValue();
if (name.equals(name2) && value.equals(value2))
{
continue outer;
}
}
throw new XMLRuntimeException("attribute " + name + "=" + value + " doesn't match");
}
}
boolean hasChildren = node.hasChildNodes();
if (hasChildren != node2.hasChildNodes())
{
throw new XMLRuntimeException("one node has children and the other doesn't");
}
if (hasChildren)
{
NodeList nl = node.getChildNodes();
NodeList nl2 = node2.getChildNodes();
short[] toFilter = new short[] {Node.TEXT_NODE, Node.ATTRIBUTE_NODE, Node.COMMENT_NODE};
List nodes = filter(nl, toFilter);
List nodes2 = filter(nl2, toFilter);
int length = nodes.size();
if (length != nodes2.size())
{
throw new XMLRuntimeException("nodes hava a different number of children");
}
for(int i = 0; i < length; i++)
{
Node n = (Node)nodes.get(i);
Node n2 = (Node)nodes2.get(i);
assertEquivalent(n, n2);
}
}
}
|
diff --git a/waterken/syntax/src/org/waterken/syntax/Syntax.java b/waterken/syntax/src/org/waterken/syntax/Syntax.java
index 869c291b..d466a50a 100644
--- a/waterken/syntax/src/org/waterken/syntax/Syntax.java
+++ b/waterken/syntax/src/org/waterken/syntax/Syntax.java
@@ -1,98 +1,98 @@
// Copyright 2008 Waterken Inc. under the terms of the MIT X license
// found at http://www.opensource.org/licenses/mit-license.html
package org.waterken.syntax;
import java.io.Serializable;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
import org.joe_e.Powerless;
import org.joe_e.Struct;
import org.joe_e.reflect.Reflection;
import org.ref_send.Record;
import org.ref_send.deserializer;
import org.ref_send.name;
/**
* A serialization syntax.
*/
public class
Syntax extends Struct implements Powerless, Record, Serializable {
static private final long serialVersionUID = 1L;
/**
* file extension
*/
public final String ext;
/**
* serializer
*/
public final Serializer serializer;
/**
* deserializer
*/
public final Deserializer deserializer;
/**
* Constructs an instance.
* @param ext {@link #ext}
* @param serializer {@link #serializer}
* @param deserializer {@link #deserializer}
*/
public @deserializer
Syntax(@name("ext") final String ext,
@name("serializer") final Serializer serializer,
@name("deserializer") final Deserializer deserializer) {
this.ext = ext;
this.serializer = serializer;
this.deserializer = deserializer;
}
/**
* Finds a corresponding {@link deserializer}.
* @param type type to construct
* @return constructor, or <code>null</code> if none
*/
static public Constructor<?>
deserializer(final Class<?> type) {
for (Class<?> i = type; null != i; i = i.getSuperclass()) {
// Check for an explicit deserializer constructor.
for (final Constructor<?> c : Reflection.constructors(i)) {
if (c.isAnnotationPresent(deserializer.class)) { return c; }
}
// Check for a default constructor of a pass-by-copy type.
if (Throwable.class.isAssignableFrom(i) ||
- Record.class.isAssignableFrom(i)) {
+ Record.class.isAssignableFrom(i)) {
try {
return Reflection.constructor(i);
} catch (final NoSuchMethodException e) {
if (Record.class.isAssignableFrom(i)) {
throw new MissingDeserializer(Reflection.getName(i));
}
}
}
// Look for one in the superclass.
}
return null;
}
/**
* Gets the default value of a specified type.
* @param required required type
* @return default value
*/
static public Object
defaultValue(final Type required) {
return boolean.class == required ? Boolean.FALSE :
char.class == required ? Character.valueOf('\0') :
byte.class == required ? Byte.valueOf((byte)0) :
short.class == required ? Short.valueOf((short)0) :
int.class == required ? Integer.valueOf(0) :
long.class == required ? Long.valueOf(0) :
float.class == required ? Float.valueOf(0.0f) :
double.class == required ? Double.valueOf(0.0) :
(Object)null;
}
}
| true | true | static public Constructor<?>
deserializer(final Class<?> type) {
for (Class<?> i = type; null != i; i = i.getSuperclass()) {
// Check for an explicit deserializer constructor.
for (final Constructor<?> c : Reflection.constructors(i)) {
if (c.isAnnotationPresent(deserializer.class)) { return c; }
}
// Check for a default constructor of a pass-by-copy type.
if (Throwable.class.isAssignableFrom(i) ||
Record.class.isAssignableFrom(i)) {
try {
return Reflection.constructor(i);
} catch (final NoSuchMethodException e) {
if (Record.class.isAssignableFrom(i)) {
throw new MissingDeserializer(Reflection.getName(i));
}
}
}
// Look for one in the superclass.
}
return null;
}
| static public Constructor<?>
deserializer(final Class<?> type) {
for (Class<?> i = type; null != i; i = i.getSuperclass()) {
// Check for an explicit deserializer constructor.
for (final Constructor<?> c : Reflection.constructors(i)) {
if (c.isAnnotationPresent(deserializer.class)) { return c; }
}
// Check for a default constructor of a pass-by-copy type.
if (Throwable.class.isAssignableFrom(i) ||
Record.class.isAssignableFrom(i)) {
try {
return Reflection.constructor(i);
} catch (final NoSuchMethodException e) {
if (Record.class.isAssignableFrom(i)) {
throw new MissingDeserializer(Reflection.getName(i));
}
}
}
// Look for one in the superclass.
}
return null;
}
|
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
index 0de8662d2..b8230eff3 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
@@ -1,116 +1,116 @@
/**
* 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.solr.client.solrj.response;
import junit.framework.Assert;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.common.util.DateUtil;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrResourceLoader;
import org.junit.Test;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
/**
* Simple test for Date facet support in QueryResponse
*
* @since solr 1.3
*/
public class QueryResponseTest extends LuceneTestCase {
@Test
public void testDateFacets() throws Exception {
XMLResponseParser parser = new XMLResponseParser();
InputStream is = new SolrResourceLoader(null, null).openResource("solrj/sampleDateFacetResponse.xml");
assertNotNull(is);
Reader in = new InputStreamReader(is, "UTF-8");
NamedList<Object> response = parser.processResponse(in);
in.close();
QueryResponse qr = new QueryResponse(response, null);
Assert.assertNotNull(qr);
Assert.assertNotNull(qr.getFacetDates());
for (FacetField f : qr.getFacetDates()) {
Assert.assertNotNull(f);
// TODO - test values?
// System.out.println(f.toString());
// System.out.println("GAP: " + f.getGap());
// System.out.println("END: " + f.getEnd());
}
}
@Test
public void testRangeFacets() throws Exception {
XMLResponseParser parser = new XMLResponseParser();
- InputStream is = new SolrResourceLoader(null, null).openResource("sampleDateFacetResponse.xml");
+ InputStream is = new SolrResourceLoader(null, null).openResource("solrj/sampleDateFacetResponse.xml");
assertNotNull(is);
Reader in = new InputStreamReader(is, "UTF-8");
NamedList<Object> response = parser.processResponse(in);
in.close();
QueryResponse qr = new QueryResponse(response, null);
Assert.assertNotNull(qr);
int counter = 0;
RangeFacet.Numeric price = null;
RangeFacet.Date manufacturedateDt = null;
for (RangeFacet r : qr.getFacetRanges()){
assertNotNull(r);
if ("price".equals(r.getName())) {
price = (RangeFacet.Numeric) r;
} else if ("manufacturedate_dt".equals(r.getName())) {
manufacturedateDt = (RangeFacet.Date) r;
}
counter++;
}
assertEquals(2, counter);
assertNotNull(price);
assertNotNull(manufacturedateDt);
assertEquals(0.0F, price.getStart());
assertEquals(5.0F, price.getEnd());
assertEquals(1.0F, price.getGap());
assertEquals("0.0", price.getCounts().get(0).getValue());
assertEquals(3, price.getCounts().get(0).getCount());
assertEquals("1.0", price.getCounts().get(1).getValue());
assertEquals(0, price.getCounts().get(1).getCount());
assertEquals("2.0", price.getCounts().get(2).getValue());
assertEquals(0, price.getCounts().get(2).getCount());
assertEquals("3.0", price.getCounts().get(3).getValue());
assertEquals(0, price.getCounts().get(3).getCount());
assertEquals("4.0", price.getCounts().get(4).getValue());
assertEquals(0, price.getCounts().get(4).getCount());
assertEquals(DateUtil.parseDate("2005-02-13T15:26:37Z"), manufacturedateDt.getStart());
assertEquals(DateUtil.parseDate("2008-02-13T15:26:37Z"), manufacturedateDt.getEnd());
assertEquals("+1YEAR", manufacturedateDt.getGap());
assertEquals("2005-02-13T15:26:37Z", manufacturedateDt.getCounts().get(0).getValue());
assertEquals(4, manufacturedateDt.getCounts().get(0).getCount());
assertEquals("2006-02-13T15:26:37Z", manufacturedateDt.getCounts().get(1).getValue());
assertEquals(7, manufacturedateDt.getCounts().get(1).getCount());
assertEquals("2007-02-13T15:26:37Z", manufacturedateDt.getCounts().get(2).getValue());
assertEquals(0, manufacturedateDt.getCounts().get(2).getCount());
}
}
| true | true | public void testRangeFacets() throws Exception {
XMLResponseParser parser = new XMLResponseParser();
InputStream is = new SolrResourceLoader(null, null).openResource("sampleDateFacetResponse.xml");
assertNotNull(is);
Reader in = new InputStreamReader(is, "UTF-8");
NamedList<Object> response = parser.processResponse(in);
in.close();
QueryResponse qr = new QueryResponse(response, null);
Assert.assertNotNull(qr);
int counter = 0;
RangeFacet.Numeric price = null;
RangeFacet.Date manufacturedateDt = null;
for (RangeFacet r : qr.getFacetRanges()){
assertNotNull(r);
if ("price".equals(r.getName())) {
price = (RangeFacet.Numeric) r;
} else if ("manufacturedate_dt".equals(r.getName())) {
manufacturedateDt = (RangeFacet.Date) r;
}
counter++;
}
assertEquals(2, counter);
assertNotNull(price);
assertNotNull(manufacturedateDt);
assertEquals(0.0F, price.getStart());
assertEquals(5.0F, price.getEnd());
assertEquals(1.0F, price.getGap());
assertEquals("0.0", price.getCounts().get(0).getValue());
assertEquals(3, price.getCounts().get(0).getCount());
assertEquals("1.0", price.getCounts().get(1).getValue());
assertEquals(0, price.getCounts().get(1).getCount());
assertEquals("2.0", price.getCounts().get(2).getValue());
assertEquals(0, price.getCounts().get(2).getCount());
assertEquals("3.0", price.getCounts().get(3).getValue());
assertEquals(0, price.getCounts().get(3).getCount());
assertEquals("4.0", price.getCounts().get(4).getValue());
assertEquals(0, price.getCounts().get(4).getCount());
assertEquals(DateUtil.parseDate("2005-02-13T15:26:37Z"), manufacturedateDt.getStart());
assertEquals(DateUtil.parseDate("2008-02-13T15:26:37Z"), manufacturedateDt.getEnd());
assertEquals("+1YEAR", manufacturedateDt.getGap());
assertEquals("2005-02-13T15:26:37Z", manufacturedateDt.getCounts().get(0).getValue());
assertEquals(4, manufacturedateDt.getCounts().get(0).getCount());
assertEquals("2006-02-13T15:26:37Z", manufacturedateDt.getCounts().get(1).getValue());
assertEquals(7, manufacturedateDt.getCounts().get(1).getCount());
assertEquals("2007-02-13T15:26:37Z", manufacturedateDt.getCounts().get(2).getValue());
assertEquals(0, manufacturedateDt.getCounts().get(2).getCount());
}
| public void testRangeFacets() throws Exception {
XMLResponseParser parser = new XMLResponseParser();
InputStream is = new SolrResourceLoader(null, null).openResource("solrj/sampleDateFacetResponse.xml");
assertNotNull(is);
Reader in = new InputStreamReader(is, "UTF-8");
NamedList<Object> response = parser.processResponse(in);
in.close();
QueryResponse qr = new QueryResponse(response, null);
Assert.assertNotNull(qr);
int counter = 0;
RangeFacet.Numeric price = null;
RangeFacet.Date manufacturedateDt = null;
for (RangeFacet r : qr.getFacetRanges()){
assertNotNull(r);
if ("price".equals(r.getName())) {
price = (RangeFacet.Numeric) r;
} else if ("manufacturedate_dt".equals(r.getName())) {
manufacturedateDt = (RangeFacet.Date) r;
}
counter++;
}
assertEquals(2, counter);
assertNotNull(price);
assertNotNull(manufacturedateDt);
assertEquals(0.0F, price.getStart());
assertEquals(5.0F, price.getEnd());
assertEquals(1.0F, price.getGap());
assertEquals("0.0", price.getCounts().get(0).getValue());
assertEquals(3, price.getCounts().get(0).getCount());
assertEquals("1.0", price.getCounts().get(1).getValue());
assertEquals(0, price.getCounts().get(1).getCount());
assertEquals("2.0", price.getCounts().get(2).getValue());
assertEquals(0, price.getCounts().get(2).getCount());
assertEquals("3.0", price.getCounts().get(3).getValue());
assertEquals(0, price.getCounts().get(3).getCount());
assertEquals("4.0", price.getCounts().get(4).getValue());
assertEquals(0, price.getCounts().get(4).getCount());
assertEquals(DateUtil.parseDate("2005-02-13T15:26:37Z"), manufacturedateDt.getStart());
assertEquals(DateUtil.parseDate("2008-02-13T15:26:37Z"), manufacturedateDt.getEnd());
assertEquals("+1YEAR", manufacturedateDt.getGap());
assertEquals("2005-02-13T15:26:37Z", manufacturedateDt.getCounts().get(0).getValue());
assertEquals(4, manufacturedateDt.getCounts().get(0).getCount());
assertEquals("2006-02-13T15:26:37Z", manufacturedateDt.getCounts().get(1).getValue());
assertEquals(7, manufacturedateDt.getCounts().get(1).getCount());
assertEquals("2007-02-13T15:26:37Z", manufacturedateDt.getCounts().get(2).getValue());
assertEquals(0, manufacturedateDt.getCounts().get(2).getCount());
}
|
diff --git a/src/main/java/pixlepix/minechem/common/recipe/DecomposerRecipeHandler.java b/src/main/java/pixlepix/minechem/common/recipe/DecomposerRecipeHandler.java
index 1687430..add707d 100644
--- a/src/main/java/pixlepix/minechem/common/recipe/DecomposerRecipeHandler.java
+++ b/src/main/java/pixlepix/minechem/common/recipe/DecomposerRecipeHandler.java
@@ -1,133 +1,133 @@
package pixlepix.minechem.common.recipe;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import pixlepix.minechem.api.core.Chemical;
import pixlepix.minechem.api.recipe.DecomposerRecipe;
import pixlepix.minechem.api.util.Util;
import pixlepix.minechem.common.utils.MinechemHelper;
import java.util.ArrayList;
import java.util.Random;
public class DecomposerRecipeHandler {
public static DecomposerRecipeHandler instance = new DecomposerRecipeHandler();
private DecomposerRecipeHandler() {
}
public DecomposerRecipe getRecipe(ItemStack input) {
return this.getRecipe(input, 0);
}
public DecomposerRecipe getRecipe(ItemStack input, int level) {
for (DecomposerRecipe recipe : DecomposerRecipe.recipes) {
if (Util.stacksAreSameKind(input, recipe.getInput()))
return recipe;
}
if (level < 5) {
ArrayList<Chemical> output = new ArrayList<Chemical>();
int foundRecipies = 0;
for (Object recipe : CraftingManager.getInstance().getRecipeList()) {
if (recipe instanceof IRecipe) {
if (((IRecipe) recipe).getRecipeOutput() != null && ((IRecipe) recipe).getRecipeOutput().isItemEqual(input)) {
ItemStack[] components = null;
if (recipe instanceof ShapelessOreRecipe && ((ShapelessOreRecipe) recipe).getInput().size() > 0) {
ArrayList<ItemStack> inputs = new ArrayList<ItemStack>();
for (Object o : ((ShapelessOreRecipe) recipe).getInput()) {
if (o instanceof ItemStack) {
inputs.add((ItemStack) o);
}
}
components = inputs.toArray(new ItemStack[inputs.size()]);
}
if (recipe instanceof ShapedOreRecipe) {
ArrayList<ItemStack> inputs = new ArrayList<ItemStack>();
for (Object o : ((ShapedOreRecipe) recipe).getInput()) {
if (o instanceof ItemStack) {
inputs.add((ItemStack) o);
} else if (o instanceof String) {
inputs.add(OreDictionary.getOres((String) o).get(0));
- } else if (o instanceof ArrayList) {
+ } else if (o instanceof ArrayList && !((ArrayList) o).isEmpty()) {
inputs.add((ItemStack) ((ArrayList) o).get(0));
}
}
components = inputs.toArray(new ItemStack[inputs.size()]);
}
if (recipe instanceof ShapelessRecipes && ((ShapelessRecipes) recipe).recipeItems.toArray() instanceof ItemStack[]) {
components = (ItemStack[]) ((ShapelessRecipes) recipe).recipeItems.toArray();
}
if (recipe instanceof ShapedRecipes && ((ShapedRecipes) recipe).recipeItems instanceof ItemStack[]) {
components = ((ShapedRecipes) recipe).recipeItems;
}
if (components != null) {
ArrayList<Chemical> sum = new ArrayList<Chemical>();
for (ItemStack item : components) {
if (item != null) {
DecomposerRecipe decompRecipe = this.getRecipe(item, level + 1);
if (decompRecipe != null) {
sum.addAll(decompRecipe.getOutputRaw());
}
}
}
if (!sum.isEmpty()) {
Random rand = new Random();
if (sum.containsAll(output)) {
output = sum;
} else if (!output.containsAll(sum) && (foundRecipies < 1 || rand.nextInt(foundRecipies) == 0)) {
output = sum;
foundRecipies += 1;
}
}
}
}
}
}
if (!output.isEmpty()) {
return new DecomposerRecipe(input, output.toArray(new Chemical[output.size()]));
}
}
return null;
}
public ArrayList<ItemStack> getRecipeOutputForInput(ItemStack input) {
DecomposerRecipe recipe = getRecipe(input);
if (recipe != null) {
ArrayList<ItemStack> stacks = MinechemHelper.convertChemicalsIntoItemStacks(recipe.getOutput());
return stacks;
}
return null;
}
public ArrayList<ItemStack> getRecipeOutputForFluidInput(FluidStack input) {
DecomposerFluidRecipe fluidRecipe = null;
for (DecomposerRecipe recipe : DecomposerRecipe.recipes) {
if (recipe instanceof DecomposerFluidRecipe && input.isFluidEqual(((DecomposerFluidRecipe) recipe).inputFluid)) {
fluidRecipe = (DecomposerFluidRecipe) recipe;
}
}
if (fluidRecipe != null) {
ArrayList<ItemStack> stacks = MinechemHelper.convertChemicalsIntoItemStacks(fluidRecipe.getOutput());
return stacks;
}
return null;
}
}
| true | true | public DecomposerRecipe getRecipe(ItemStack input, int level) {
for (DecomposerRecipe recipe : DecomposerRecipe.recipes) {
if (Util.stacksAreSameKind(input, recipe.getInput()))
return recipe;
}
if (level < 5) {
ArrayList<Chemical> output = new ArrayList<Chemical>();
int foundRecipies = 0;
for (Object recipe : CraftingManager.getInstance().getRecipeList()) {
if (recipe instanceof IRecipe) {
if (((IRecipe) recipe).getRecipeOutput() != null && ((IRecipe) recipe).getRecipeOutput().isItemEqual(input)) {
ItemStack[] components = null;
if (recipe instanceof ShapelessOreRecipe && ((ShapelessOreRecipe) recipe).getInput().size() > 0) {
ArrayList<ItemStack> inputs = new ArrayList<ItemStack>();
for (Object o : ((ShapelessOreRecipe) recipe).getInput()) {
if (o instanceof ItemStack) {
inputs.add((ItemStack) o);
}
}
components = inputs.toArray(new ItemStack[inputs.size()]);
}
if (recipe instanceof ShapedOreRecipe) {
ArrayList<ItemStack> inputs = new ArrayList<ItemStack>();
for (Object o : ((ShapedOreRecipe) recipe).getInput()) {
if (o instanceof ItemStack) {
inputs.add((ItemStack) o);
} else if (o instanceof String) {
inputs.add(OreDictionary.getOres((String) o).get(0));
} else if (o instanceof ArrayList) {
inputs.add((ItemStack) ((ArrayList) o).get(0));
}
}
components = inputs.toArray(new ItemStack[inputs.size()]);
}
if (recipe instanceof ShapelessRecipes && ((ShapelessRecipes) recipe).recipeItems.toArray() instanceof ItemStack[]) {
components = (ItemStack[]) ((ShapelessRecipes) recipe).recipeItems.toArray();
}
if (recipe instanceof ShapedRecipes && ((ShapedRecipes) recipe).recipeItems instanceof ItemStack[]) {
components = ((ShapedRecipes) recipe).recipeItems;
}
if (components != null) {
ArrayList<Chemical> sum = new ArrayList<Chemical>();
for (ItemStack item : components) {
if (item != null) {
DecomposerRecipe decompRecipe = this.getRecipe(item, level + 1);
if (decompRecipe != null) {
sum.addAll(decompRecipe.getOutputRaw());
}
}
}
if (!sum.isEmpty()) {
Random rand = new Random();
if (sum.containsAll(output)) {
output = sum;
} else if (!output.containsAll(sum) && (foundRecipies < 1 || rand.nextInt(foundRecipies) == 0)) {
output = sum;
foundRecipies += 1;
}
}
}
}
}
}
if (!output.isEmpty()) {
return new DecomposerRecipe(input, output.toArray(new Chemical[output.size()]));
}
}
return null;
}
| public DecomposerRecipe getRecipe(ItemStack input, int level) {
for (DecomposerRecipe recipe : DecomposerRecipe.recipes) {
if (Util.stacksAreSameKind(input, recipe.getInput()))
return recipe;
}
if (level < 5) {
ArrayList<Chemical> output = new ArrayList<Chemical>();
int foundRecipies = 0;
for (Object recipe : CraftingManager.getInstance().getRecipeList()) {
if (recipe instanceof IRecipe) {
if (((IRecipe) recipe).getRecipeOutput() != null && ((IRecipe) recipe).getRecipeOutput().isItemEqual(input)) {
ItemStack[] components = null;
if (recipe instanceof ShapelessOreRecipe && ((ShapelessOreRecipe) recipe).getInput().size() > 0) {
ArrayList<ItemStack> inputs = new ArrayList<ItemStack>();
for (Object o : ((ShapelessOreRecipe) recipe).getInput()) {
if (o instanceof ItemStack) {
inputs.add((ItemStack) o);
}
}
components = inputs.toArray(new ItemStack[inputs.size()]);
}
if (recipe instanceof ShapedOreRecipe) {
ArrayList<ItemStack> inputs = new ArrayList<ItemStack>();
for (Object o : ((ShapedOreRecipe) recipe).getInput()) {
if (o instanceof ItemStack) {
inputs.add((ItemStack) o);
} else if (o instanceof String) {
inputs.add(OreDictionary.getOres((String) o).get(0));
} else if (o instanceof ArrayList && !((ArrayList) o).isEmpty()) {
inputs.add((ItemStack) ((ArrayList) o).get(0));
}
}
components = inputs.toArray(new ItemStack[inputs.size()]);
}
if (recipe instanceof ShapelessRecipes && ((ShapelessRecipes) recipe).recipeItems.toArray() instanceof ItemStack[]) {
components = (ItemStack[]) ((ShapelessRecipes) recipe).recipeItems.toArray();
}
if (recipe instanceof ShapedRecipes && ((ShapedRecipes) recipe).recipeItems instanceof ItemStack[]) {
components = ((ShapedRecipes) recipe).recipeItems;
}
if (components != null) {
ArrayList<Chemical> sum = new ArrayList<Chemical>();
for (ItemStack item : components) {
if (item != null) {
DecomposerRecipe decompRecipe = this.getRecipe(item, level + 1);
if (decompRecipe != null) {
sum.addAll(decompRecipe.getOutputRaw());
}
}
}
if (!sum.isEmpty()) {
Random rand = new Random();
if (sum.containsAll(output)) {
output = sum;
} else if (!output.containsAll(sum) && (foundRecipies < 1 || rand.nextInt(foundRecipies) == 0)) {
output = sum;
foundRecipies += 1;
}
}
}
}
}
}
if (!output.isEmpty()) {
return new DecomposerRecipe(input, output.toArray(new Chemical[output.size()]));
}
}
return null;
}
|
diff --git a/src/dev/mCraft/Coinz/GUI/KeyPadListener.java b/src/dev/mCraft/Coinz/GUI/KeyPadListener.java
index 16056a7..adbce45 100644
--- a/src/dev/mCraft/Coinz/GUI/KeyPadListener.java
+++ b/src/dev/mCraft/Coinz/GUI/KeyPadListener.java
@@ -1,157 +1,157 @@
package dev.mCraft.Coinz.GUI;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.inventory.Inventory;
import org.getspout.spoutapi.SpoutManager;
import org.getspout.spoutapi.event.screen.ButtonClickEvent;
import org.getspout.spoutapi.gui.Button;
import org.getspout.spoutapi.gui.GenericTextField;
import org.getspout.spoutapi.inventory.InventoryBuilder;
import org.getspout.spoutapi.player.SpoutPlayer;
import dev.mCraft.Coinz.Coinz;
import dev.mCraft.Coinz.GUI.VaultInv.KeypadPopup;
import dev.mCraft.Coinz.Serializer.PersistPasswords;
import dev.mCraft.Coinz.Serializer.PersistVault;
public class KeyPadListener implements Listener {
private Coinz plugin = Coinz.instance;
private KeypadPopup hook;
private PersistPasswords persistPass;
private PersistVault persist;
private Button button;
private GenericTextField pass;
private InventoryBuilder builder;
private Location loc;
public KeyPadListener() {
Bukkit.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler(priority = EventPriority.NORMAL)
public void onButtonClick(ButtonClickEvent event) {
hook = KeypadPopup.hook;
persistPass = PersistPasswords.hook;
if (hook == null) {
return;
}
button = event.getButton();
SpoutPlayer player = event.getPlayer();
Block block = player.getTargetBlock(null, 6);
loc = block.getLocation();
if (button.getText() != null && button.getPlugin() == plugin) {
pass = hook.pass;
if (button.getId() == hook.b0.getId()) {
pass.setText(pass.getText() + 0);
}
if (button.getId() == hook.b1.getId()) {
pass.setText(pass.getText() + 1);
}
if (button.getId() == hook.b2.getId()) {
pass.setText(pass.getText() + 2);
}
if (button.getId() == hook.b3.getId()) {
pass.setText(pass.getText() + 3);
}
if (button.getId() == hook.b4.getId()) {
pass.setText(pass.getText() + 4);
}
if (button.getId() == hook.b5.getId()) {
pass.setText(pass.getText() + 5);
}
if (button.getId() == hook.b6.getId()) {
pass.setText(pass.getText() + 6);
}
if (button.getId() == hook.b7.getId()) {
pass.setText(pass.getText() + 7);
}
if (button.getId() == hook.b8.getId()) {
pass.setText(pass.getText() + 8);
}
if (button.getId() == hook.b9.getId()) {
pass.setText(pass.getText() + 9);
}
if (button.getId() == hook.pound.getId()) {
pass.setText(pass.getText() + "#");
}
if (button.getId() == hook.star.getId()) {
pass.setText(pass.getText() + "*");
}
if (button.getId() == hook.corr.getId()) {
if (pass.getText() != null) {
String text = pass.getText();
int length = text.length();
if (length >= 2) {
String newtext = text.substring(0, length-1);
pass.setText(newtext);
}
if (length == 1) {
pass.setText("");
}
}
}
if (button.getId() == hook.enter.getId()) {
String pass = hook.pass.getText();
String loadPass = null;
if (persistPass != null && loc != null) {
if (!persistPass.doesPasswordFileExist(loc)) {
try {
persistPass.save(loc, pass);
}
catch (Exception e) {
e.printStackTrace();
}
player.closeActiveWindow();
}
else {
try {
loadPass = persistPass.load(loc);
}
catch (Exception e) {
e.printStackTrace();
}
if (pass.equalsIgnoreCase(loadPass)) {
- player.closeActiveWindow();
+ player.getMainScreen().removeWidget(hook);
persist = PersistVault.hook;
builder = SpoutManager.getInventoryBuilder();
Inventory Vault = builder.construct(9, "Vault");
Inventory temp = Vault;
try {
temp = persist.load(loc, temp);
}
catch (Exception e) {
e.printStackTrace();
}
Vault = temp;
player.openInventoryWindow(Vault, loc);
}
}
}
}
if (button.getId() == hook.cancel.getId()) {
player.closeActiveWindow();
}
}
}
}
| true | true | public void onButtonClick(ButtonClickEvent event) {
hook = KeypadPopup.hook;
persistPass = PersistPasswords.hook;
if (hook == null) {
return;
}
button = event.getButton();
SpoutPlayer player = event.getPlayer();
Block block = player.getTargetBlock(null, 6);
loc = block.getLocation();
if (button.getText() != null && button.getPlugin() == plugin) {
pass = hook.pass;
if (button.getId() == hook.b0.getId()) {
pass.setText(pass.getText() + 0);
}
if (button.getId() == hook.b1.getId()) {
pass.setText(pass.getText() + 1);
}
if (button.getId() == hook.b2.getId()) {
pass.setText(pass.getText() + 2);
}
if (button.getId() == hook.b3.getId()) {
pass.setText(pass.getText() + 3);
}
if (button.getId() == hook.b4.getId()) {
pass.setText(pass.getText() + 4);
}
if (button.getId() == hook.b5.getId()) {
pass.setText(pass.getText() + 5);
}
if (button.getId() == hook.b6.getId()) {
pass.setText(pass.getText() + 6);
}
if (button.getId() == hook.b7.getId()) {
pass.setText(pass.getText() + 7);
}
if (button.getId() == hook.b8.getId()) {
pass.setText(pass.getText() + 8);
}
if (button.getId() == hook.b9.getId()) {
pass.setText(pass.getText() + 9);
}
if (button.getId() == hook.pound.getId()) {
pass.setText(pass.getText() + "#");
}
if (button.getId() == hook.star.getId()) {
pass.setText(pass.getText() + "*");
}
if (button.getId() == hook.corr.getId()) {
if (pass.getText() != null) {
String text = pass.getText();
int length = text.length();
if (length >= 2) {
String newtext = text.substring(0, length-1);
pass.setText(newtext);
}
if (length == 1) {
pass.setText("");
}
}
}
if (button.getId() == hook.enter.getId()) {
String pass = hook.pass.getText();
String loadPass = null;
if (persistPass != null && loc != null) {
if (!persistPass.doesPasswordFileExist(loc)) {
try {
persistPass.save(loc, pass);
}
catch (Exception e) {
e.printStackTrace();
}
player.closeActiveWindow();
}
else {
try {
loadPass = persistPass.load(loc);
}
catch (Exception e) {
e.printStackTrace();
}
if (pass.equalsIgnoreCase(loadPass)) {
player.closeActiveWindow();
persist = PersistVault.hook;
builder = SpoutManager.getInventoryBuilder();
Inventory Vault = builder.construct(9, "Vault");
Inventory temp = Vault;
try {
temp = persist.load(loc, temp);
}
catch (Exception e) {
e.printStackTrace();
}
Vault = temp;
player.openInventoryWindow(Vault, loc);
}
}
}
}
if (button.getId() == hook.cancel.getId()) {
player.closeActiveWindow();
}
}
}
| public void onButtonClick(ButtonClickEvent event) {
hook = KeypadPopup.hook;
persistPass = PersistPasswords.hook;
if (hook == null) {
return;
}
button = event.getButton();
SpoutPlayer player = event.getPlayer();
Block block = player.getTargetBlock(null, 6);
loc = block.getLocation();
if (button.getText() != null && button.getPlugin() == plugin) {
pass = hook.pass;
if (button.getId() == hook.b0.getId()) {
pass.setText(pass.getText() + 0);
}
if (button.getId() == hook.b1.getId()) {
pass.setText(pass.getText() + 1);
}
if (button.getId() == hook.b2.getId()) {
pass.setText(pass.getText() + 2);
}
if (button.getId() == hook.b3.getId()) {
pass.setText(pass.getText() + 3);
}
if (button.getId() == hook.b4.getId()) {
pass.setText(pass.getText() + 4);
}
if (button.getId() == hook.b5.getId()) {
pass.setText(pass.getText() + 5);
}
if (button.getId() == hook.b6.getId()) {
pass.setText(pass.getText() + 6);
}
if (button.getId() == hook.b7.getId()) {
pass.setText(pass.getText() + 7);
}
if (button.getId() == hook.b8.getId()) {
pass.setText(pass.getText() + 8);
}
if (button.getId() == hook.b9.getId()) {
pass.setText(pass.getText() + 9);
}
if (button.getId() == hook.pound.getId()) {
pass.setText(pass.getText() + "#");
}
if (button.getId() == hook.star.getId()) {
pass.setText(pass.getText() + "*");
}
if (button.getId() == hook.corr.getId()) {
if (pass.getText() != null) {
String text = pass.getText();
int length = text.length();
if (length >= 2) {
String newtext = text.substring(0, length-1);
pass.setText(newtext);
}
if (length == 1) {
pass.setText("");
}
}
}
if (button.getId() == hook.enter.getId()) {
String pass = hook.pass.getText();
String loadPass = null;
if (persistPass != null && loc != null) {
if (!persistPass.doesPasswordFileExist(loc)) {
try {
persistPass.save(loc, pass);
}
catch (Exception e) {
e.printStackTrace();
}
player.closeActiveWindow();
}
else {
try {
loadPass = persistPass.load(loc);
}
catch (Exception e) {
e.printStackTrace();
}
if (pass.equalsIgnoreCase(loadPass)) {
player.getMainScreen().removeWidget(hook);
persist = PersistVault.hook;
builder = SpoutManager.getInventoryBuilder();
Inventory Vault = builder.construct(9, "Vault");
Inventory temp = Vault;
try {
temp = persist.load(loc, temp);
}
catch (Exception e) {
e.printStackTrace();
}
Vault = temp;
player.openInventoryWindow(Vault, loc);
}
}
}
}
if (button.getId() == hook.cancel.getId()) {
player.closeActiveWindow();
}
}
}
|
diff --git a/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java
index dad48295db8..502a0005ecc 100644
--- a/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java
@@ -1,92 +1,92 @@
/*
* Licensed to ElasticSearch and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. ElasticSearch 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.elasticsearch.index.mapper.core;
import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.mapper.DocumentMapper;
import org.elasticsearch.index.mapper.MapperTestUtils;
import org.elasticsearch.test.ElasticsearchTestCase;
import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import static org.elasticsearch.index.mapper.DocumentMapper.MergeFlags.mergeFlags;
import static org.hamcrest.Matchers.equalTo;
/**
* Test for {@link TokenCountFieldMapper}.
*/
public class TokenCountFieldMapperTests extends ElasticsearchTestCase {
@Test
public void testMerge() throws IOException {
String stage1Mapping = XContentFactory.jsonBuilder().startObject()
.startObject("person")
.startObject("properties")
.startObject("tc")
.field("type", "token_count")
- .field("tokenizer", "keyword")
+ .field("analyzer", "keyword")
.endObject()
.endObject()
.endObject().endObject().string();
DocumentMapper stage1 = MapperTestUtils.newParser().parse(stage1Mapping);
String stage2Mapping = XContentFactory.jsonBuilder().startObject()
.startObject("person")
.startObject("properties")
.startObject("tc")
.field("type", "token_count")
- .field("tokenizer", "standard")
+ .field("analyzer", "standard")
.endObject()
.endObject()
.endObject().endObject().string();
DocumentMapper stage2 = MapperTestUtils.newParser().parse(stage2Mapping);
DocumentMapper.MergeResult mergeResult = stage1.merge(stage2, mergeFlags().simulate(true));
assertThat(mergeResult.hasConflicts(), equalTo(false));
// Just simulated so merge hasn't happened yet
assertThat(((TokenCountFieldMapper) stage1.mappers().smartName("tc").mapper()).analyzer(), equalTo("keyword"));
mergeResult = stage1.merge(stage2, mergeFlags().simulate(false));
assertThat(mergeResult.hasConflicts(), equalTo(false));
// Just simulated so merge hasn't happened yet
assertThat(((TokenCountFieldMapper) stage1.mappers().smartName("tc").mapper()).analyzer(), equalTo("standard"));
}
@Test
public void testCountPositions() throws IOException {
// We're looking to make sure that we:
Token t1 = new Token(); // Don't count tokens without an increment
t1.setPositionIncrement(0);
Token t2 = new Token();
t2.setPositionIncrement(1); // Count normal tokens with one increment
Token t3 = new Token();
t2.setPositionIncrement(2); // Count funny tokens with more than one increment
int finalTokenIncrement = 4; // Count the final token increment on the rare token streams that have them
Token[] tokens = new Token[] {t1, t2, t3};
Collections.shuffle(Arrays.asList(tokens), getRandom());
TokenStream tokenStream = new CannedTokenStream(finalTokenIncrement, 0, tokens);
assertThat(TokenCountFieldMapper.countPositions(tokenStream), equalTo(7));
}
}
| false | true | public void testMerge() throws IOException {
String stage1Mapping = XContentFactory.jsonBuilder().startObject()
.startObject("person")
.startObject("properties")
.startObject("tc")
.field("type", "token_count")
.field("tokenizer", "keyword")
.endObject()
.endObject()
.endObject().endObject().string();
DocumentMapper stage1 = MapperTestUtils.newParser().parse(stage1Mapping);
String stage2Mapping = XContentFactory.jsonBuilder().startObject()
.startObject("person")
.startObject("properties")
.startObject("tc")
.field("type", "token_count")
.field("tokenizer", "standard")
.endObject()
.endObject()
.endObject().endObject().string();
DocumentMapper stage2 = MapperTestUtils.newParser().parse(stage2Mapping);
DocumentMapper.MergeResult mergeResult = stage1.merge(stage2, mergeFlags().simulate(true));
assertThat(mergeResult.hasConflicts(), equalTo(false));
// Just simulated so merge hasn't happened yet
assertThat(((TokenCountFieldMapper) stage1.mappers().smartName("tc").mapper()).analyzer(), equalTo("keyword"));
mergeResult = stage1.merge(stage2, mergeFlags().simulate(false));
assertThat(mergeResult.hasConflicts(), equalTo(false));
// Just simulated so merge hasn't happened yet
assertThat(((TokenCountFieldMapper) stage1.mappers().smartName("tc").mapper()).analyzer(), equalTo("standard"));
}
| public void testMerge() throws IOException {
String stage1Mapping = XContentFactory.jsonBuilder().startObject()
.startObject("person")
.startObject("properties")
.startObject("tc")
.field("type", "token_count")
.field("analyzer", "keyword")
.endObject()
.endObject()
.endObject().endObject().string();
DocumentMapper stage1 = MapperTestUtils.newParser().parse(stage1Mapping);
String stage2Mapping = XContentFactory.jsonBuilder().startObject()
.startObject("person")
.startObject("properties")
.startObject("tc")
.field("type", "token_count")
.field("analyzer", "standard")
.endObject()
.endObject()
.endObject().endObject().string();
DocumentMapper stage2 = MapperTestUtils.newParser().parse(stage2Mapping);
DocumentMapper.MergeResult mergeResult = stage1.merge(stage2, mergeFlags().simulate(true));
assertThat(mergeResult.hasConflicts(), equalTo(false));
// Just simulated so merge hasn't happened yet
assertThat(((TokenCountFieldMapper) stage1.mappers().smartName("tc").mapper()).analyzer(), equalTo("keyword"));
mergeResult = stage1.merge(stage2, mergeFlags().simulate(false));
assertThat(mergeResult.hasConflicts(), equalTo(false));
// Just simulated so merge hasn't happened yet
assertThat(((TokenCountFieldMapper) stage1.mappers().smartName("tc").mapper()).analyzer(), equalTo("standard"));
}
|
diff --git a/src/com/btmura/android/reddit/app/MessageActivity.java b/src/com/btmura/android/reddit/app/MessageActivity.java
index e81a3809..c74e4857 100644
--- a/src/com/btmura/android/reddit/app/MessageActivity.java
+++ b/src/com/btmura/android/reddit/app/MessageActivity.java
@@ -1,217 +1,216 @@
/*
* Copyright (C) 2012 Brian Muramatsu
*
* 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.btmura.android.reddit.app;
import android.app.ActionBar;
import android.app.ActionBar.OnNavigationListener;
import android.content.Loader;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import com.btmura.android.reddit.R;
import com.btmura.android.reddit.accounts.AccountPreferences;
import com.btmura.android.reddit.content.AccountLoader;
import com.btmura.android.reddit.content.AccountLoader.AccountResult;
import com.btmura.android.reddit.util.Array;
import com.btmura.android.reddit.util.Objects;
import com.btmura.android.reddit.widget.AccountFilterAdapter;
import com.btmura.android.reddit.widget.FilterAdapter;
public class MessageActivity extends AbstractBrowserActivity implements OnNavigationListener {
/** Required string extra that is the user's name. */
public static final String EXTRA_USER = "user";
/** Optional int specifying the filter to start using. */
public static final String EXTRA_FILTER = "filter";
private static final String STATE_USER = EXTRA_USER;
private static final String STATE_FILTER = EXTRA_FILTER;
/** Requested user we should initially view from the intent. */
private String requestedUser;
/** Requested filter we should initially use from the intent. */
private int requestedFilter;
private AccountFilterAdapter adapter;
private SharedPreferences prefs;
@Override
protected void setContentView() {
setContentView(R.layout.message);
}
@Override
protected boolean skipSetup() {
return false;
}
@Override
protected void setupViews() {
}
@Override
protected void setupActionBar(Bundle savedInstanceState) {
if (savedInstanceState == null) {
requestedUser = getIntent().getStringExtra(EXTRA_USER);
requestedFilter = getIntent().getIntExtra(EXTRA_FILTER, -1);
} else {
requestedUser = savedInstanceState.getString(STATE_USER);
requestedFilter = savedInstanceState.getInt(EXTRA_FILTER);
}
adapter = new AccountFilterAdapter(this);
bar.setListNavigationCallbacks(adapter, this);
bar.setDisplayHomeAsUpEnabled(true);
bar.setDisplayShowTitleEnabled(false);
bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
}
@Override
public Loader<AccountResult> onCreateLoader(int id, Bundle args) {
return new AccountLoader(this, false);
}
@Override
public void onLoadFinished(Loader<AccountResult> loader, AccountResult result) {
if (Array.isEmpty(result.accountNames)) {
finish();
return;
}
prefs = result.prefs;
adapter.addMessageFilters(this);
adapter.setAccountNames(result.accountNames);
String accountName;
if (!TextUtils.isEmpty(requestedUser)) {
accountName = requestedUser;
} else {
accountName = result.getLastAccount();
}
adapter.setAccountName(accountName);
int filter;
if (requestedFilter != -1) {
filter = requestedFilter;
} else {
- filter = AccountPreferences.getLastSelfProfileFilter(prefs,
- FilterAdapter.PROFILE_OVERVIEW);
+ filter = AccountPreferences.getLastMessageFilter(prefs, FilterAdapter.MESSAGE_INBOX);
}
adapter.setFilter(filter);
int index = adapter.findAccountName(accountName);
// If the selected navigation index is the same, then the action bar
// won't fire onNavigationItemSelected. Resetting the adapter and then
// calling setSelectedNavigationItem again seems to unjam it.
if (bar.getSelectedNavigationIndex() == index) {
bar.setListNavigationCallbacks(adapter, this);
}
bar.setSelectedNavigationItem(index);
}
public boolean onNavigationItemSelected(int itemPosition, long itemId) {
adapter.updateState(itemPosition);
String accountName = adapter.getAccountName();
if (!TextUtils.isEmpty(requestedUser)) {
requestedUser = null;
}
int filter = adapter.getFilter();
if (requestedFilter != -1) {
requestedFilter = -1;
} else {
AccountPreferences.setLastMessageFilter(prefs, filter);
}
ThingListFragment frag = getThingListFragment();
if (frag == null || !Objects.equals(frag.getAccountName(), accountName)
|| frag.getFilter() != filter) {
setMessageThingListNavigation(accountName);
}
return true;
}
@Override
public void onLoaderReset(Loader<AccountResult> loader) {
}
@Override
public String getAccountName() {
return adapter.getAccountName();
}
@Override
protected int getFilter() {
return adapter.getFilter();
}
@Override
protected boolean hasSubredditList() {
return false;
}
@Override
protected void refreshActionBar(String subreddit, Bundle thingBundle) {
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
getMenuInflater().inflate(R.menu.message_menu, menu);
return true;
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
boolean showThingless = isSinglePane || !hasThing();
menu.setGroupVisible(R.id.thingless, showThingless);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_new_message:
handleNewMessage();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
private void handleNewMessage() {
MenuHelper.startComposeActivity(this, ComposeActivity.MESSAGE_TYPE_SET,
null, null, null, null, null, false);
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString(STATE_USER, adapter.getAccountName());
outState.putInt(STATE_FILTER, adapter.getFilter());
}
}
| true | true | public void onLoadFinished(Loader<AccountResult> loader, AccountResult result) {
if (Array.isEmpty(result.accountNames)) {
finish();
return;
}
prefs = result.prefs;
adapter.addMessageFilters(this);
adapter.setAccountNames(result.accountNames);
String accountName;
if (!TextUtils.isEmpty(requestedUser)) {
accountName = requestedUser;
} else {
accountName = result.getLastAccount();
}
adapter.setAccountName(accountName);
int filter;
if (requestedFilter != -1) {
filter = requestedFilter;
} else {
filter = AccountPreferences.getLastSelfProfileFilter(prefs,
FilterAdapter.PROFILE_OVERVIEW);
}
adapter.setFilter(filter);
int index = adapter.findAccountName(accountName);
// If the selected navigation index is the same, then the action bar
// won't fire onNavigationItemSelected. Resetting the adapter and then
// calling setSelectedNavigationItem again seems to unjam it.
if (bar.getSelectedNavigationIndex() == index) {
bar.setListNavigationCallbacks(adapter, this);
}
bar.setSelectedNavigationItem(index);
}
| public void onLoadFinished(Loader<AccountResult> loader, AccountResult result) {
if (Array.isEmpty(result.accountNames)) {
finish();
return;
}
prefs = result.prefs;
adapter.addMessageFilters(this);
adapter.setAccountNames(result.accountNames);
String accountName;
if (!TextUtils.isEmpty(requestedUser)) {
accountName = requestedUser;
} else {
accountName = result.getLastAccount();
}
adapter.setAccountName(accountName);
int filter;
if (requestedFilter != -1) {
filter = requestedFilter;
} else {
filter = AccountPreferences.getLastMessageFilter(prefs, FilterAdapter.MESSAGE_INBOX);
}
adapter.setFilter(filter);
int index = adapter.findAccountName(accountName);
// If the selected navigation index is the same, then the action bar
// won't fire onNavigationItemSelected. Resetting the adapter and then
// calling setSelectedNavigationItem again seems to unjam it.
if (bar.getSelectedNavigationIndex() == index) {
bar.setListNavigationCallbacks(adapter, this);
}
bar.setSelectedNavigationItem(index);
}
|
diff --git a/edu/cmu/sphinx/research/parallel/ParallelAcousticScorer.java b/edu/cmu/sphinx/research/parallel/ParallelAcousticScorer.java
index 217c5b0b..91223708 100644
--- a/edu/cmu/sphinx/research/parallel/ParallelAcousticScorer.java
+++ b/edu/cmu/sphinx/research/parallel/ParallelAcousticScorer.java
@@ -1,173 +1,173 @@
/*
* Copyright 1999-2002 Carnegie Mellon University.
* Portions Copyright 2002 Sun Microsystems, Inc.
* Portions Copyright 2002 Mitsubishi Electronic Research Laboratories.
* All Rights Reserved. Use is subject to license terms.
*
* See the file "license.terms" for information on usage and
* redistribution of this file, and for a DISCLAIMER OF ALL
* WARRANTIES.
*
*/
package edu.cmu.sphinx.research.parallel;
import edu.cmu.sphinx.frontend.Data;
import edu.cmu.sphinx.frontend.DataEndSignal;
import edu.cmu.sphinx.frontend.DataStartSignal;
import edu.cmu.sphinx.frontend.DataProcessingException;
import edu.cmu.sphinx.frontend.FrontEnd;
import edu.cmu.sphinx.frontend.Signal;
import edu.cmu.sphinx.decoder.scorer.AcousticScorer;
import edu.cmu.sphinx.decoder.scorer.Scoreable;
import edu.cmu.sphinx.decoder.search.Token;
import edu.cmu.sphinx.util.props.Configurable;
import edu.cmu.sphinx.util.props.PropertyException;
import edu.cmu.sphinx.util.props.PropertySheet;
import edu.cmu.sphinx.util.props.PropertyType;
import edu.cmu.sphinx.util.props.Registry;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.io.IOException;
/**
* A parallel acoustic scorer that is capable of scoring multiple
* feature streams.
*/
public class ParallelAcousticScorer implements AcousticScorer {
private String name;
/* (non-Javadoc)
* @see edu.cmu.sphinx.util.props.Configurable#register(java.lang.String, edu.cmu.sphinx.util.props.Registry)
*/
public void register(String name, Registry registry)
throws PropertyException {
this.name = name;
}
/* (non-Javadoc)
* @see edu.cmu.sphinx.util.props.Configurable#newProperties(edu.cmu.sphinx.util.props.PropertySheet)
*/
public void newProperties(PropertySheet ps) throws PropertyException {
}
/**
* Scores the given set of Tokens. All Tokens in the given
* list are assumed to belong to the same acoustic model.
*
* @param scoreableList a list containing StateToken objects to
* be scored
*
* @return the best scoring scorable, or null if there are
* no more frames to score
*/
public Scoreable calculateScores(List scoreableList) {
assert scoreableList.size() > 0;
try {
FrontEnd frontEnd = getFrontEnd(scoreableList);
Data data = frontEnd.getData();
if (data == null) {
return null;
}
if (data instanceof DataStartSignal) {
data = frontEnd.getData();
if (data == null) {
return null;
}
}
if (data instanceof DataEndSignal) {
return null;
}
if (data instanceof Signal) {
throw new Error("trying to score non-content feature");
}
float logMaxScore = -Float.MAX_VALUE;
Scoreable bestScoreable = null;
for (Iterator i = scoreableList.iterator(); i.hasNext(); ) {
Scoreable scoreable = (Scoreable) i.next();
- float logScore = scoreable.calculateScore(data, false);
+ float logScore = scoreable.calculateScore(data, false, 1.0f);
if (logScore > logMaxScore) {
logMaxScore = logScore;
bestScoreable = scoreable;
}
}
return bestScoreable;
} catch (DataProcessingException dpe) {
dpe.printStackTrace();
return null;
}
}
/**
* Returns the acoustic model name of the Tokens in the given
* list .
*
* @return the acoustic model name of the Tokens
*/
private FrontEnd getFrontEnd(List activeList) {
if (activeList.size() > 0) {
Iterator i = activeList.iterator();
if (i.hasNext()) {
ParallelToken token = (ParallelToken) i.next();
return token.getFeatureStream().getFrontEnd();
}
}
return null;
}
/*
* (non-Javadoc)
*
* @see edu.cmu.sphinx.util.props.Configurable#getName()
*/
public String getName() {
return name;
}
/**
* Allocates resources for this scorer
*
*/
public void allocate() throws IOException {}
/**
* Deallocates resouces for this scorer
*
*/
public void deallocate() {}
/**
* starts the scorer
*/
public void startRecognition() {}
/**
* stops the scorer
*/
public void stopRecognition() {}
}
| true | true | public Scoreable calculateScores(List scoreableList) {
assert scoreableList.size() > 0;
try {
FrontEnd frontEnd = getFrontEnd(scoreableList);
Data data = frontEnd.getData();
if (data == null) {
return null;
}
if (data instanceof DataStartSignal) {
data = frontEnd.getData();
if (data == null) {
return null;
}
}
if (data instanceof DataEndSignal) {
return null;
}
if (data instanceof Signal) {
throw new Error("trying to score non-content feature");
}
float logMaxScore = -Float.MAX_VALUE;
Scoreable bestScoreable = null;
for (Iterator i = scoreableList.iterator(); i.hasNext(); ) {
Scoreable scoreable = (Scoreable) i.next();
float logScore = scoreable.calculateScore(data, false);
if (logScore > logMaxScore) {
logMaxScore = logScore;
bestScoreable = scoreable;
}
}
return bestScoreable;
} catch (DataProcessingException dpe) {
dpe.printStackTrace();
return null;
}
}
| public Scoreable calculateScores(List scoreableList) {
assert scoreableList.size() > 0;
try {
FrontEnd frontEnd = getFrontEnd(scoreableList);
Data data = frontEnd.getData();
if (data == null) {
return null;
}
if (data instanceof DataStartSignal) {
data = frontEnd.getData();
if (data == null) {
return null;
}
}
if (data instanceof DataEndSignal) {
return null;
}
if (data instanceof Signal) {
throw new Error("trying to score non-content feature");
}
float logMaxScore = -Float.MAX_VALUE;
Scoreable bestScoreable = null;
for (Iterator i = scoreableList.iterator(); i.hasNext(); ) {
Scoreable scoreable = (Scoreable) i.next();
float logScore = scoreable.calculateScore(data, false, 1.0f);
if (logScore > logMaxScore) {
logMaxScore = logScore;
bestScoreable = scoreable;
}
}
return bestScoreable;
} catch (DataProcessingException dpe) {
dpe.printStackTrace();
return null;
}
}
|
diff --git a/src/com/dateengine/controllers/MessageServlet.java b/src/com/dateengine/controllers/MessageServlet.java
index ebd5230..6e49dd9 100644
--- a/src/com/dateengine/controllers/MessageServlet.java
+++ b/src/com/dateengine/controllers/MessageServlet.java
@@ -1,120 +1,120 @@
package com.dateengine.controllers;
import com.dateengine.models.Profile;
import com.dateengine.models.Message;
import com.dateengine.PMF;
import com.google.appengine.api.users.User;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
import javax.servlet.RequestDispatcher;
import javax.jdo.PersistenceManager;
import javax.jdo.JDOObjectNotFoundException;
import javax.jdo.JDOFatalUserException;
import javax.jdo.Query;
import java.io.IOException;
import java.util.List;
public class MessageServlet extends HttpServlet {
private static final String NEW_MESSAGE_TEMPLATE = "/WEB-INF/templates/messages/new_message.jsp";
private static final String INBOX_TEMPLATE = "/WEB-INF/templates/messages/inbox.jsp";
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String action = request.getPathInfo().toString();
if (action.equals("/send")) {
doSendMessage(request, response);
} else {
// Some default handler
}
}
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String action = request.getPathInfo().toString();
if (action.equals("/new")) {
doNewMessage(request, response);
} else if (action.equals("/inbox")) {
doInbox(request, response);
} else {
// Some default handler
}
}
private void doNewMessage(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String recipientId = request.getParameter("key");
// TODO: Extract this to a DAO
PersistenceManager pm = PMF.get().getPersistenceManager();
Profile recipient;
try {
recipient = pm.getObjectById(Profile.class, recipientId);
request.setAttribute("recipient", recipient);
RequestDispatcher dispatcher = request.getRequestDispatcher(NEW_MESSAGE_TEMPLATE);
dispatcher.forward(request, response);
} catch (JDOObjectNotFoundException e) {
// Render a 404 or some page that says profile not found
response.sendError(404, "Profile not found");
} catch (JDOFatalUserException e) { // This means we have a bad key
response.sendError(404, "Profile not found");
} finally {
pm.close();
}
}
@SuppressWarnings("unchecked")
private void doInbox(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
// IMPLEMENT ME
User currentUser = (User) request.getAttribute("user");
Profile recipient = Profile.findForUser(currentUser);
PersistenceManager pm = PMF.get().getPersistenceManager();
Query query = pm.newQuery(Message.class);
List<Message> messages;
try {
messages = (List<Message>) query.execute();
request.setAttribute("messages", messages);
} finally {
query.closeAll();
}
RequestDispatcher dispatcher = request.getRequestDispatcher(INBOX_TEMPLATE);
dispatcher.forward(request, response);
}
// TODO: Force the User to make a profile before allowing this
private void doSendMessage(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String recipientId = request.getParameter("message.recipientKey");
Profile recipient;
User currentUser = (User) request.getAttribute("user");
Profile sender = Profile.findForUser(currentUser);
PersistenceManager pm = PMF.get().getPersistenceManager();
try {
recipient = pm.getObjectById(Profile.class, recipientId);
Message message = new Message();
message.setBody(request.getParameter("message.body"));
message.setRecipient(recipient);
message.setSender(sender);
pm.makePersistent(message);
} finally {
pm.close();
}
- response.sendRedirect("/messages/list");
+ response.sendRedirect("/messages/inbox");
}
}
| true | true | private void doSendMessage(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String recipientId = request.getParameter("message.recipientKey");
Profile recipient;
User currentUser = (User) request.getAttribute("user");
Profile sender = Profile.findForUser(currentUser);
PersistenceManager pm = PMF.get().getPersistenceManager();
try {
recipient = pm.getObjectById(Profile.class, recipientId);
Message message = new Message();
message.setBody(request.getParameter("message.body"));
message.setRecipient(recipient);
message.setSender(sender);
pm.makePersistent(message);
} finally {
pm.close();
}
response.sendRedirect("/messages/list");
}
| private void doSendMessage(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String recipientId = request.getParameter("message.recipientKey");
Profile recipient;
User currentUser = (User) request.getAttribute("user");
Profile sender = Profile.findForUser(currentUser);
PersistenceManager pm = PMF.get().getPersistenceManager();
try {
recipient = pm.getObjectById(Profile.class, recipientId);
Message message = new Message();
message.setBody(request.getParameter("message.body"));
message.setRecipient(recipient);
message.setSender(sender);
pm.makePersistent(message);
} finally {
pm.close();
}
response.sendRedirect("/messages/inbox");
}
|
diff --git a/opentripplanner-routing/src/main/java/org/opentripplanner/routing/algorithm/AStar.java b/opentripplanner-routing/src/main/java/org/opentripplanner/routing/algorithm/AStar.java
index e21e7ea..1f1646c 100644
--- a/opentripplanner-routing/src/main/java/org/opentripplanner/routing/algorithm/AStar.java
+++ b/opentripplanner-routing/src/main/java/org/opentripplanner/routing/algorithm/AStar.java
@@ -1,348 +1,348 @@
/* This program is free software: you can redistribute it and/or
modify it under the terms of the GNU Lesser 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.opentripplanner.routing.algorithm;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.opentripplanner.routing.core.Edge;
import org.opentripplanner.routing.core.Graph;
import org.opentripplanner.routing.core.State;
import org.opentripplanner.routing.core.TraverseOptions;
import org.opentripplanner.routing.core.TraverseResult;
import org.opentripplanner.routing.core.Vertex;
import org.opentripplanner.routing.location.StreetLocation;
import org.opentripplanner.routing.pqueue.FibHeap;
import org.opentripplanner.routing.spt.SPTVertex;
import org.opentripplanner.routing.spt.ShortestPathTree;
/**
*
* NullExtraEdges is used to speed up checks for extra edges in the (common) case
* where there are none. Extra edges come from StreetLocationFinder, where
* they represent the edges between a location on a street segment and the
* corners at the ends of that segment.
*/
class NullExtraEdges implements Map<Vertex, Edge> {
@Override
public void clear() {
}
@Override
public boolean containsKey(Object arg0) {
return false;
}
@Override
public boolean containsValue(Object arg0) {
return false;
}
@Override
public Set<java.util.Map.Entry<Vertex, Edge>> entrySet() {
return null;
}
@Override
public Edge get(Object arg0) {
return null;
}
@Override
public boolean isEmpty() {
return false;
}
@Override
public Set<Vertex> keySet() {
return null;
}
@Override
public Edge put(Vertex arg0, Edge arg1) {
return null;
}
@Override
public void putAll(Map<? extends Vertex, ? extends Edge> arg0) {
}
@Override
public Edge remove(Object arg0) {
return null;
}
@Override
public int size() {
return 0;
}
@Override
public Collection<Edge> values() {
return null;
}
}
/**
* Find the shortest path between graph vertices using A*.
*/
public class AStar {
static final double MAX_SPEED = 10.0;
/**
* Plots a path on graph from origin to target, departing at the time
* given in state and with the options options.
*
* @param graph
* @param origin
* @param target
* @param init
* @param options
* @return the shortest path, or null if none is found
*/
public static ShortestPathTree getShortestPathTree(Graph gg, String from_label,
String to_label, State init, TraverseOptions options) {
// Goal Variables
String origin_label = from_label;
String target_label = to_label;
// Get origin vertex to make sure it exists
Vertex origin = gg.getVertex(origin_label);
Vertex target = gg.getVertex(target_label);
return getShortestPathTree(gg, origin, target, init, options);
}
public static ShortestPathTree getShortestPathTreeBack(Graph gg, String from_label,
String to_label, State init, TraverseOptions options) {
// Goal Variables
String origin_label = from_label;
String target_label = to_label;
// Get origin vertex to make sure it exists
Vertex origin = gg.getVertex(origin_label);
Vertex target = gg.getVertex(target_label);
return getShortestPathTreeBack(gg, origin, target, init, options);
}
/**
* Plots a path on graph from origin to target, arriving at the time
* given in state and with the options options.
*
* @param graph
* @param origin
* @param target
* @param init
* @param options
* @return the shortest path, or null if none is found
*/
public static ShortestPathTree getShortestPathTreeBack(Graph graph, Vertex origin, Vertex target,
State init, TraverseOptions options) {
if (origin == null || target == null) {
return null;
}
/* Run backwards from the target to the origin */
Vertex tmp = origin;
origin = target;
target = tmp;
/* generate extra edges for StreetLocations */
Map<Vertex, Edge> extraEdges;
if (target instanceof StreetLocation) {
extraEdges = new HashMap<Vertex, Edge>();
Iterable<Edge> outgoing = target.getOutgoing();
for (Edge edge : outgoing) {
extraEdges.put(edge.getToVertex(), edge);
}
} else {
extraEdges = new NullExtraEdges();
}
// Return Tree
ShortestPathTree spt = new ShortestPathTree();
double distance = origin.distance(target) / MAX_SPEED;
SPTVertex spt_origin = spt.addVertex(origin, init, 0, options);
// Priority Queue
FibHeap pq = new FibHeap(graph.getVertices().size() + extraEdges.size());
pq.insert(spt_origin, spt_origin.weightSum + distance);
// Iteration Variables
SPTVertex spt_u, spt_v;
while (!pq.empty()) { // Until the priority queue is empty:
spt_u = (SPTVertex) pq.extract_min(); // get the lowest-weightSum Vertex 'u',
if (spt_u.mirror == target)
break;
Iterable<Edge> incoming = spt_u.mirror.getIncoming();
if (extraEdges.containsKey(spt_u.mirror)) {
List<Edge> newIncoming = new ArrayList<Edge>();
- for (Edge edge : spt_u.mirror.getOutgoing()) {
+ for (Edge edge : spt_u.mirror.getIncoming()) {
newIncoming.add(edge);
}
newIncoming.add(extraEdges.get(spt_u.mirror));
incoming = newIncoming;
}
for (Edge edge : incoming) {
TraverseResult wr = edge.traverseBack(spt_u.state, options);
// When an edge leads nowhere (as indicated by returning NULL), the iteration is
// over.
if (wr == null) {
continue;
}
if (wr.weight < 0) {
throw new NegativeWeightException(String.valueOf(wr.weight) + " on edge " + edge);
}
Vertex fromv = edge.getFromVertex();
distance = fromv.distance(target) / MAX_SPEED;
double new_w = spt_u.weightSum + wr.weight;
double old_w;
spt_v = spt.getVertex(fromv);
// if this is the first time edge.tov has been visited
if (spt_v == null) {
old_w = Integer.MAX_VALUE;
spt_v = spt.addVertex(fromv, wr.state, new_w, options);
} else {
old_w = spt_v.weightSum + distance;
}
// If the new way of getting there is better,
if (new_w + distance < old_w) {
// Set the State of v in the SPT to the current winner
spt_v.state = wr.state;
spt_v.weightSum = new_w;
if (old_w == Integer.MAX_VALUE) {
pq.insert(spt_v, new_w + distance);
} else {
pq.insert_or_dec_key(spt_v, new_w + distance);
}
spt_v.setParent(spt_u, edge);
}
}
}
return spt;
}
public static ShortestPathTree getShortestPathTree(Graph graph, Vertex origin, Vertex target,
State init, TraverseOptions options) {
if (origin == null || target == null) {
return null;
}
/* generate extra edges for StreetLocations */
Map<Vertex, Edge> extraEdges;
if (target instanceof StreetLocation) {
extraEdges = new HashMap<Vertex, Edge>();
Iterable<Edge> incoming = target.getIncoming();
for (Edge edge : incoming) {
extraEdges.put(edge.getFromVertex(), edge);
}
} else {
extraEdges = new NullExtraEdges();
}
// Return Tree
ShortestPathTree spt = new ShortestPathTree();
double distance = origin.distance(target) / MAX_SPEED;
SPTVertex spt_origin = spt.addVertex(origin, init, 0, options);
// Priority Queue
FibHeap pq = new FibHeap(graph.getVertices().size() + extraEdges.size());
pq.insert(spt_origin, spt_origin.weightSum + distance);
// Iteration Variables
SPTVertex spt_u, spt_v;
while (!pq.empty()) { // Until the priority queue is empty:
spt_u = (SPTVertex) pq.extract_min(); // get the lowest-weightSum Vertex 'u',
if (spt_u.mirror == target)
break;
Iterable<Edge> outgoing = spt_u.mirror.getOutgoing();
if (extraEdges.containsKey(spt_u.mirror)) {
List<Edge> newOutgoing = new ArrayList<Edge>();
for (Edge edge : spt_u.mirror.getOutgoing())
newOutgoing.add(edge);
newOutgoing.add(extraEdges.get(spt_u.mirror));
outgoing = newOutgoing;
}
for (Edge edge : outgoing) {
TraverseResult wr = edge.traverse(spt_u.state, options);
// When an edge leads nowhere (as indicated by returning NULL), the iteration is
// over.
if (wr == null) {
continue;
}
if (wr.weight < 0) {
throw new NegativeWeightException(String.valueOf(wr.weight));
}
Vertex tov = edge.getToVertex();
distance = tov.distance(target) / MAX_SPEED;
double new_w = spt_u.weightSum + wr.weight;
double old_w;
spt_v = spt.getVertex(tov);
// if this is the first time edge.tov has been visited
if (spt_v == null) {
old_w = Double.MAX_VALUE;
spt_v = spt.addVertex(tov, wr.state, new_w, options);
} else {
old_w = spt_v.weightSum + distance;
}
// If the new way of getting there is better,
if (new_w + distance < old_w) {
// Set the State of v in the SPT to the current winner
spt_v.state = wr.state;
spt_v.weightSum = new_w;
if (old_w == Integer.MAX_VALUE) {
pq.insert(spt_v, new_w + distance);
} else {
pq.insert_or_dec_key(spt_v, new_w + distance);
}
spt_v.setParent(spt_u, edge);
}
}
}
return spt;
}
}
| true | true | public static ShortestPathTree getShortestPathTreeBack(Graph graph, Vertex origin, Vertex target,
State init, TraverseOptions options) {
if (origin == null || target == null) {
return null;
}
/* Run backwards from the target to the origin */
Vertex tmp = origin;
origin = target;
target = tmp;
/* generate extra edges for StreetLocations */
Map<Vertex, Edge> extraEdges;
if (target instanceof StreetLocation) {
extraEdges = new HashMap<Vertex, Edge>();
Iterable<Edge> outgoing = target.getOutgoing();
for (Edge edge : outgoing) {
extraEdges.put(edge.getToVertex(), edge);
}
} else {
extraEdges = new NullExtraEdges();
}
// Return Tree
ShortestPathTree spt = new ShortestPathTree();
double distance = origin.distance(target) / MAX_SPEED;
SPTVertex spt_origin = spt.addVertex(origin, init, 0, options);
// Priority Queue
FibHeap pq = new FibHeap(graph.getVertices().size() + extraEdges.size());
pq.insert(spt_origin, spt_origin.weightSum + distance);
// Iteration Variables
SPTVertex spt_u, spt_v;
while (!pq.empty()) { // Until the priority queue is empty:
spt_u = (SPTVertex) pq.extract_min(); // get the lowest-weightSum Vertex 'u',
if (spt_u.mirror == target)
break;
Iterable<Edge> incoming = spt_u.mirror.getIncoming();
if (extraEdges.containsKey(spt_u.mirror)) {
List<Edge> newIncoming = new ArrayList<Edge>();
for (Edge edge : spt_u.mirror.getOutgoing()) {
newIncoming.add(edge);
}
newIncoming.add(extraEdges.get(spt_u.mirror));
incoming = newIncoming;
}
for (Edge edge : incoming) {
TraverseResult wr = edge.traverseBack(spt_u.state, options);
// When an edge leads nowhere (as indicated by returning NULL), the iteration is
// over.
if (wr == null) {
continue;
}
if (wr.weight < 0) {
throw new NegativeWeightException(String.valueOf(wr.weight) + " on edge " + edge);
}
Vertex fromv = edge.getFromVertex();
distance = fromv.distance(target) / MAX_SPEED;
double new_w = spt_u.weightSum + wr.weight;
double old_w;
spt_v = spt.getVertex(fromv);
// if this is the first time edge.tov has been visited
if (spt_v == null) {
old_w = Integer.MAX_VALUE;
spt_v = spt.addVertex(fromv, wr.state, new_w, options);
} else {
old_w = spt_v.weightSum + distance;
}
// If the new way of getting there is better,
if (new_w + distance < old_w) {
// Set the State of v in the SPT to the current winner
spt_v.state = wr.state;
spt_v.weightSum = new_w;
if (old_w == Integer.MAX_VALUE) {
pq.insert(spt_v, new_w + distance);
} else {
pq.insert_or_dec_key(spt_v, new_w + distance);
}
spt_v.setParent(spt_u, edge);
}
}
}
return spt;
}
| public static ShortestPathTree getShortestPathTreeBack(Graph graph, Vertex origin, Vertex target,
State init, TraverseOptions options) {
if (origin == null || target == null) {
return null;
}
/* Run backwards from the target to the origin */
Vertex tmp = origin;
origin = target;
target = tmp;
/* generate extra edges for StreetLocations */
Map<Vertex, Edge> extraEdges;
if (target instanceof StreetLocation) {
extraEdges = new HashMap<Vertex, Edge>();
Iterable<Edge> outgoing = target.getOutgoing();
for (Edge edge : outgoing) {
extraEdges.put(edge.getToVertex(), edge);
}
} else {
extraEdges = new NullExtraEdges();
}
// Return Tree
ShortestPathTree spt = new ShortestPathTree();
double distance = origin.distance(target) / MAX_SPEED;
SPTVertex spt_origin = spt.addVertex(origin, init, 0, options);
// Priority Queue
FibHeap pq = new FibHeap(graph.getVertices().size() + extraEdges.size());
pq.insert(spt_origin, spt_origin.weightSum + distance);
// Iteration Variables
SPTVertex spt_u, spt_v;
while (!pq.empty()) { // Until the priority queue is empty:
spt_u = (SPTVertex) pq.extract_min(); // get the lowest-weightSum Vertex 'u',
if (spt_u.mirror == target)
break;
Iterable<Edge> incoming = spt_u.mirror.getIncoming();
if (extraEdges.containsKey(spt_u.mirror)) {
List<Edge> newIncoming = new ArrayList<Edge>();
for (Edge edge : spt_u.mirror.getIncoming()) {
newIncoming.add(edge);
}
newIncoming.add(extraEdges.get(spt_u.mirror));
incoming = newIncoming;
}
for (Edge edge : incoming) {
TraverseResult wr = edge.traverseBack(spt_u.state, options);
// When an edge leads nowhere (as indicated by returning NULL), the iteration is
// over.
if (wr == null) {
continue;
}
if (wr.weight < 0) {
throw new NegativeWeightException(String.valueOf(wr.weight) + " on edge " + edge);
}
Vertex fromv = edge.getFromVertex();
distance = fromv.distance(target) / MAX_SPEED;
double new_w = spt_u.weightSum + wr.weight;
double old_w;
spt_v = spt.getVertex(fromv);
// if this is the first time edge.tov has been visited
if (spt_v == null) {
old_w = Integer.MAX_VALUE;
spt_v = spt.addVertex(fromv, wr.state, new_w, options);
} else {
old_w = spt_v.weightSum + distance;
}
// If the new way of getting there is better,
if (new_w + distance < old_w) {
// Set the State of v in the SPT to the current winner
spt_v.state = wr.state;
spt_v.weightSum = new_w;
if (old_w == Integer.MAX_VALUE) {
pq.insert(spt_v, new_w + distance);
} else {
pq.insert_or_dec_key(spt_v, new_w + distance);
}
spt_v.setParent(spt_u, edge);
}
}
}
return spt;
}
|
diff --git a/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java b/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java
index e9dae6a..189ce62 100644
--- a/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java
+++ b/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java
@@ -1,75 +1,77 @@
package org.jboss.tools.bpel.runtimes.ui.view.server;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants;
import org.jboss.tools.bpel.runtimes.module.JBTBPELPublisher;
public class BPELModuleContentProvider implements ITreeContentProvider {
public BPELModuleContentProvider() {
}
public Object[] getChildren(Object parentElement) {
if( parentElement instanceof ModuleServer ) {
IServer s = ((ModuleServer)parentElement).server;
IModule[] module = ((ModuleServer)parentElement).module;
IModule mod = module.length > 0 ? module[module.length-1] : null;
String typeId = mod.getModuleType().getId();
- if( mod != null && typeId.equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE)) {
+ // https://jira.jboss.org/browse/JBIDE-7486
+ // if project was closed or deleted, mod.getProject() is null - ignore
+ if( mod != null && mod.getProject() != null && typeId.equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE)) {
// we have a bpel module deployed to a server. List the children
String[] versions = JBTBPELPublisher.getDeployedPathsFromDescriptor(s, mod.getProject());
return wrap((ModuleServer)parentElement, versions);
}
}
return new Object[]{};
}
protected BPELVersionDeployment[] wrap(ModuleServer ms, String[] vals) {
BPELVersionDeployment[] versions = new BPELVersionDeployment[vals.length];
for( int i = 0; i < vals.length; i++ ) {
versions[i] = new BPELVersionDeployment(ms, vals[i]);
}
return versions;
}
public static class BPELVersionDeployment {
private String path;
private ModuleServer ms;
public BPELVersionDeployment(ModuleServer ms, String path) {
this.path = path;
this.ms = ms;
}
public String getPath() { return path; }
public ModuleServer getModuleServer() { return ms; }
public IProject getProject() {
if( ms.module != null && ms.module.length > 0 )
return ms.module[ms.module.length-1].getProject();
return null;
}
}
public Object getParent(Object element) {
// TODO Auto-generated method stub
return null;
}
public boolean hasChildren(Object element) {
return getChildren(element).length > 0;
}
public Object[] getElements(Object inputElement) {
return getChildren(inputElement);
}
public void dispose() {
}
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
// TODO Auto-generated method stub
}
}
| true | true | public Object[] getChildren(Object parentElement) {
if( parentElement instanceof ModuleServer ) {
IServer s = ((ModuleServer)parentElement).server;
IModule[] module = ((ModuleServer)parentElement).module;
IModule mod = module.length > 0 ? module[module.length-1] : null;
String typeId = mod.getModuleType().getId();
if( mod != null && typeId.equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE)) {
// we have a bpel module deployed to a server. List the children
String[] versions = JBTBPELPublisher.getDeployedPathsFromDescriptor(s, mod.getProject());
return wrap((ModuleServer)parentElement, versions);
}
}
return new Object[]{};
}
| public Object[] getChildren(Object parentElement) {
if( parentElement instanceof ModuleServer ) {
IServer s = ((ModuleServer)parentElement).server;
IModule[] module = ((ModuleServer)parentElement).module;
IModule mod = module.length > 0 ? module[module.length-1] : null;
String typeId = mod.getModuleType().getId();
// https://jira.jboss.org/browse/JBIDE-7486
// if project was closed or deleted, mod.getProject() is null - ignore
if( mod != null && mod.getProject() != null && typeId.equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE)) {
// we have a bpel module deployed to a server. List the children
String[] versions = JBTBPELPublisher.getDeployedPathsFromDescriptor(s, mod.getProject());
return wrap((ModuleServer)parentElement, versions);
}
}
return new Object[]{};
}
|
diff --git a/QuizWebsite/src/servlets/QuizResultServlet.java b/QuizWebsite/src/servlets/QuizResultServlet.java
index 5398f6e..584f73b 100644
--- a/QuizWebsite/src/servlets/QuizResultServlet.java
+++ b/QuizWebsite/src/servlets/QuizResultServlet.java
@@ -1,69 +1,69 @@
package servlets;
import java.io.IOException;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import database.DataBaseObject;
import quiz.QuizConstants;
import quiz.QuizResult;
/**
* Servlet implementation class QuizResultServlet
*/
@WebServlet("/QuizResultServlet")
public class QuizResultServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
/**
* @see HttpServlet#HttpServlet()
*/
public QuizResultServlet() {
super();
// TODO Auto-generated constructor stub
}
/**
* @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
*/
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
Connection conn = (Connection) getServletContext().getAttribute("database");
int resultID = Integer.parseInt(request.getParameter("id"));
try {
Statement stmt = conn.createStatement();
- String query = "SELECT * FROM Quiz_Result WHERE id='" + resultID +";";
+ String query = "SELECT * FROM Quiz_Result WHERE id='" + resultID +"';";
ResultSet rs = stmt.executeQuery(query);
if (rs.next()) {
String[] attrs = DataBaseObject.getRow(rs, QuizConstants.QUIZ_RESULT_N_COLS);
QuizResult quiz = new QuizResult(attrs, conn);
request.setAttribute("result", quiz);
}
RequestDispatcher dispatch = request.getRequestDispatcher("quiz_result.jsp");
dispatch.forward(request, response);
} catch (SQLException e) {
e.printStackTrace();
}
}
/**
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
*/
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
// TODO Auto-generated method stub
}
}
| true | true | protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
Connection conn = (Connection) getServletContext().getAttribute("database");
int resultID = Integer.parseInt(request.getParameter("id"));
try {
Statement stmt = conn.createStatement();
String query = "SELECT * FROM Quiz_Result WHERE id='" + resultID +";";
ResultSet rs = stmt.executeQuery(query);
if (rs.next()) {
String[] attrs = DataBaseObject.getRow(rs, QuizConstants.QUIZ_RESULT_N_COLS);
QuizResult quiz = new QuizResult(attrs, conn);
request.setAttribute("result", quiz);
}
RequestDispatcher dispatch = request.getRequestDispatcher("quiz_result.jsp");
dispatch.forward(request, response);
} catch (SQLException e) {
e.printStackTrace();
}
}
| protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
Connection conn = (Connection) getServletContext().getAttribute("database");
int resultID = Integer.parseInt(request.getParameter("id"));
try {
Statement stmt = conn.createStatement();
String query = "SELECT * FROM Quiz_Result WHERE id='" + resultID +"';";
ResultSet rs = stmt.executeQuery(query);
if (rs.next()) {
String[] attrs = DataBaseObject.getRow(rs, QuizConstants.QUIZ_RESULT_N_COLS);
QuizResult quiz = new QuizResult(attrs, conn);
request.setAttribute("result", quiz);
}
RequestDispatcher dispatch = request.getRequestDispatcher("quiz_result.jsp");
dispatch.forward(request, response);
} catch (SQLException e) {
e.printStackTrace();
}
}
|
diff --git a/PaintroidTest/src/org/catrobat/paintroid/test/junit/tools/MoveZoomTest.java b/PaintroidTest/src/org/catrobat/paintroid/test/junit/tools/MoveZoomTest.java
index abcef8dd..ab322c7d 100644
--- a/PaintroidTest/src/org/catrobat/paintroid/test/junit/tools/MoveZoomTest.java
+++ b/PaintroidTest/src/org/catrobat/paintroid/test/junit/tools/MoveZoomTest.java
@@ -1,75 +1,75 @@
/**
* Paintroid: An image manipulation application for Android.
* Copyright (C) 2010-2013 The Catrobat Team
* (<http://developer.catrobat.org/credits>)
*
* 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 Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.catrobat.paintroid.test.junit.tools;
import org.catrobat.paintroid.PaintroidApplication;
import org.catrobat.paintroid.R;
import org.catrobat.paintroid.test.utils.PrivateAccess;
import org.catrobat.paintroid.tools.ToolType;
import org.catrobat.paintroid.tools.implementation.MoveZoomTool;
import org.catrobat.paintroid.ui.Perspective;
import org.catrobat.paintroid.ui.Statusbar.ToolButtonIDs;
import org.junit.Before;
import org.junit.Test;
import android.graphics.PointF;
public class MoveZoomTest extends BaseToolTest {
@Override
@Before
protected void setUp() throws Exception {
mToolToTest = new MoveZoomTool(getActivity(), ToolType.MOVE);
super.setUp();
}
public void testMove() throws SecurityException, IllegalArgumentException, NoSuchFieldException,
IllegalAccessException {
float screenWidth = getActivity().getWindowManager().getDefaultDisplay().getWidth();
float screenHeight = getActivity().getWindowManager().getDefaultDisplay().getHeight();
- int offset = 50;
+ float offset = 50.0f;
PointF fromPoint = new PointF(screenWidth / 2, screenHeight / 2);
PointF toPoint = new PointF(fromPoint.x + offset, fromPoint.y + offset);
float translationXBefore = (Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationX");
float translationYBefore = (Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationY");
mToolToTest.handleDown(fromPoint);
mToolToTest.handleMove(toPoint);
- float translationXAfter = (Float) PrivateAccess.getMemberValue(Perspective.class,
- PaintroidApplication.perspective, "mSurfaceTranslationX");
- float translationYAfter = (Float) PrivateAccess.getMemberValue(Perspective.class,
- PaintroidApplication.perspective, "mSurfaceTranslationY");
+ float translationXAfter = Math.round((Float) PrivateAccess.getMemberValue(Perspective.class,
+ PaintroidApplication.perspective, "mSurfaceTranslationX"));
+ float translationYAfter = Math.round((Float) PrivateAccess.getMemberValue(Perspective.class,
+ PaintroidApplication.perspective, "mSurfaceTranslationY"));
assertEquals("translation of X should be the offset", translationXAfter - offset, translationXBefore);
assertEquals("translation of Y should be the offset", translationYAfter - offset, translationYBefore);
}
@Test
public void testShouldReturnCorrectResourceForCurrentToolButton() {
int resource = mToolToTest.getAttributeButtonResource(ToolButtonIDs.BUTTON_ID_TOOL);
assertEquals("Move tool icon should be displayed", R.drawable.icon_menu_move, resource);
}
}
| false | true | public void testMove() throws SecurityException, IllegalArgumentException, NoSuchFieldException,
IllegalAccessException {
float screenWidth = getActivity().getWindowManager().getDefaultDisplay().getWidth();
float screenHeight = getActivity().getWindowManager().getDefaultDisplay().getHeight();
int offset = 50;
PointF fromPoint = new PointF(screenWidth / 2, screenHeight / 2);
PointF toPoint = new PointF(fromPoint.x + offset, fromPoint.y + offset);
float translationXBefore = (Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationX");
float translationYBefore = (Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationY");
mToolToTest.handleDown(fromPoint);
mToolToTest.handleMove(toPoint);
float translationXAfter = (Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationX");
float translationYAfter = (Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationY");
assertEquals("translation of X should be the offset", translationXAfter - offset, translationXBefore);
assertEquals("translation of Y should be the offset", translationYAfter - offset, translationYBefore);
}
| public void testMove() throws SecurityException, IllegalArgumentException, NoSuchFieldException,
IllegalAccessException {
float screenWidth = getActivity().getWindowManager().getDefaultDisplay().getWidth();
float screenHeight = getActivity().getWindowManager().getDefaultDisplay().getHeight();
float offset = 50.0f;
PointF fromPoint = new PointF(screenWidth / 2, screenHeight / 2);
PointF toPoint = new PointF(fromPoint.x + offset, fromPoint.y + offset);
float translationXBefore = (Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationX");
float translationYBefore = (Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationY");
mToolToTest.handleDown(fromPoint);
mToolToTest.handleMove(toPoint);
float translationXAfter = Math.round((Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationX"));
float translationYAfter = Math.round((Float) PrivateAccess.getMemberValue(Perspective.class,
PaintroidApplication.perspective, "mSurfaceTranslationY"));
assertEquals("translation of X should be the offset", translationXAfter - offset, translationXBefore);
assertEquals("translation of Y should be the offset", translationYAfter - offset, translationYBefore);
}
|
diff --git a/backend/src/com/mymed/model/data/interaction/MInteractionBean.java b/backend/src/com/mymed/model/data/interaction/MInteractionBean.java
index 4e8c40439..b8a1e252f 100644
--- a/backend/src/com/mymed/model/data/interaction/MInteractionBean.java
+++ b/backend/src/com/mymed/model/data/interaction/MInteractionBean.java
@@ -1,281 +1,281 @@
package com.mymed.model.data.interaction;
import com.mymed.model.data.AbstractMBean;
/**
*
* @author lvanni
*
*/
public class MInteractionBean extends AbstractMBean {
/**
* Used for the calculation of the hash code
*/
private static final int PRIME = 31;
/** INTERACTION_ID */
private String id;
/** APPLICATION_ID */
private String application;
/** USER_ID */
private String producer;
/** USER_ID */
private String consumer;
private long start;
private long end;
private double feedback = -1;
private int snooze;
/** INTERACTION_LIST_ID */
private String complexInteraction;
/**
* Copy constructor.
* <p>
* Provide a clone of the passed MInteractionBean
*
* @param toClone
* the interaction bean to clone
*/
protected MInteractionBean(final MInteractionBean toClone) {
super();
id = toClone.getId();
application = toClone.getApplication();
producer = toClone.getProducer();
consumer = toClone.getConsumer();
start = toClone.getStart();
end = toClone.getEnd();
feedback = toClone.getFeedback();
snooze = toClone.getSnooze();
complexInteraction = toClone.getComplexInteraction();
}
/**
* Create a new empty MInteractionBean
*/
public MInteractionBean() {
// Empty constructor, needed because of the copy constructor
super();
}
@Override
public MInteractionBean clone() {
return new MInteractionBean(this);
}
@Override
public String toString() {
return "Interaction:\n" + super.toString();
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
int result = 1;
result = PRIME * result + (application == null ? 0 : application.hashCode());
result = PRIME * result + (complexInteraction == null ? 0 : complexInteraction.hashCode());
result = PRIME * result + (consumer == null ? 0 : consumer.hashCode());
long temp;
temp = Double.doubleToLongBits(feedback);
result = PRIME * result + (int) (temp ^ temp >>> 32);
result = PRIME * result + (id == null ? 0 : id.hashCode());
result = PRIME * result + (producer == null ? 0 : producer.hashCode());
return result;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(final Object obj) {
boolean equal = false;
if (this == obj) {
equal = true;
} else if (obj instanceof MInteractionBean) {
final MInteractionBean comparable = (MInteractionBean) obj;
equal = true;
if (application == null && comparable.getApplication() != null) {
equal &= false;
- } else {
+ } else if (application != null && comparable.getApplication() != null) {
equal &= application.equals(comparable.getApplication());
}
if (complexInteraction == null && comparable.getComplexInteraction() != null) {
equal &= false;
- } else {
+ } else if (complexInteraction != null && comparable.getComplexInteraction() != null) {
equal &= complexInteraction.equals(comparable.getComplexInteraction());
}
if (consumer == null && comparable.getConsumer() != null) {
equal &= false;
- } else {
+ } else if (consumer != null && comparable.getConsumer() != null) {
equal &= consumer.equals(comparable.getConsumer());
}
equal &= feedback == comparable.getFeedback();
if (id == null && comparable.getId() != null) {
equal &= false;
- } else {
+ } else if (id != null && comparable.getId() != null) {
equal &= id.equals(comparable.getId());
}
if (producer == null && comparable.getProducer() != null) {
equal &= false;
- } else {
+ } else if (producer != null && comparable.getProducer() != null) {
equal &= producer.equals(comparable.getProducer());
}
}
return equal;
}
/* --------------------------------------------------------- */
/* GETTER AND SETTER */
/* --------------------------------------------------------- */
/**
* @return the feedback associated with this interaction
*/
public double getFeedback() {
return feedback;
}
/**
* @param feedback
* the feedback to set for this interaction
*/
public void setFeedback(final double feedback) {
this.feedback = feedback;
}
/**
* @return the start date of the interaction
*/
public long getStart() {
return start;
}
/**
* @param start
* the start date of the interaction
*/
public void setStart(final long start) {
this.start = start;
}
/**
* @return the id that identifies the interaction
*/
public String getId() {
return id;
}
/**
* @param id
* the id to set for this interaction
*/
public void setId(final String id) {
this.id = id;
}
/**
* @return the application used for the interaction
*/
public String getApplication() {
return application;
}
/**
* @param application
* the application used for the interaction
*/
public void setApplication(final String application) {
this.application = application;
}
/**
* @return the producer who provided the interaction
*/
public String getProducer() {
return producer;
}
/**
* @param producer
* the producer who provides the interaction
*/
public void setProducer(final String producer) {
this.producer = producer;
}
/**
* @return the consumer who used the interaction
*/
public String getConsumer() {
return consumer;
}
/**
* @param consumer
* the consumer who uses the interaction
*/
public void setConsumer(final String consumer) {
this.consumer = consumer;
}
/**
* @return the end date of the interaction
*/
public long getEnd() {
return end;
}
/**
* @param end
* the end date of the interaction
*/
public void setEnd(final long end) {
this.end = end;
}
/**
* @return the reminder of the interaction
*/
public int getSnooze() {
return snooze;
}
/**
* @param snooze
* the reminder for the interaction
*/
public void setSnooze(final int snooze) {
this.snooze = snooze;
}
/**
* @return the complexInteraction
*/
public String getComplexInteraction() {
return complexInteraction;
}
/**
* @param complexInteraction
* the complexInteraction to set
*/
public void setComplexInteraction(final String complexInteraction) {
this.complexInteraction = complexInteraction;
}
}
| false | true | public boolean equals(final Object obj) {
boolean equal = false;
if (this == obj) {
equal = true;
} else if (obj instanceof MInteractionBean) {
final MInteractionBean comparable = (MInteractionBean) obj;
equal = true;
if (application == null && comparable.getApplication() != null) {
equal &= false;
} else {
equal &= application.equals(comparable.getApplication());
}
if (complexInteraction == null && comparable.getComplexInteraction() != null) {
equal &= false;
} else {
equal &= complexInteraction.equals(comparable.getComplexInteraction());
}
if (consumer == null && comparable.getConsumer() != null) {
equal &= false;
} else {
equal &= consumer.equals(comparable.getConsumer());
}
equal &= feedback == comparable.getFeedback();
if (id == null && comparable.getId() != null) {
equal &= false;
} else {
equal &= id.equals(comparable.getId());
}
if (producer == null && comparable.getProducer() != null) {
equal &= false;
} else {
equal &= producer.equals(comparable.getProducer());
}
}
return equal;
}
| public boolean equals(final Object obj) {
boolean equal = false;
if (this == obj) {
equal = true;
} else if (obj instanceof MInteractionBean) {
final MInteractionBean comparable = (MInteractionBean) obj;
equal = true;
if (application == null && comparable.getApplication() != null) {
equal &= false;
} else if (application != null && comparable.getApplication() != null) {
equal &= application.equals(comparable.getApplication());
}
if (complexInteraction == null && comparable.getComplexInteraction() != null) {
equal &= false;
} else if (complexInteraction != null && comparable.getComplexInteraction() != null) {
equal &= complexInteraction.equals(comparable.getComplexInteraction());
}
if (consumer == null && comparable.getConsumer() != null) {
equal &= false;
} else if (consumer != null && comparable.getConsumer() != null) {
equal &= consumer.equals(comparable.getConsumer());
}
equal &= feedback == comparable.getFeedback();
if (id == null && comparable.getId() != null) {
equal &= false;
} else if (id != null && comparable.getId() != null) {
equal &= id.equals(comparable.getId());
}
if (producer == null && comparable.getProducer() != null) {
equal &= false;
} else if (producer != null && comparable.getProducer() != null) {
equal &= producer.equals(comparable.getProducer());
}
}
return equal;
}
|
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/toggles/BluetoothToggle.java b/packages/SystemUI/src/com/android/systemui/statusbar/toggles/BluetoothToggle.java
index 9c1b8be5..bd125a62 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/toggles/BluetoothToggle.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/toggles/BluetoothToggle.java
@@ -1,103 +1,103 @@
package com.android.systemui.statusbar.toggles;
import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.view.View;
import com.android.systemui.R;
public class BluetoothToggle extends StatefulToggle {
public void init(Context c, int style) {
super.init(c, style);
BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
if (bt == null) {
return;
}
boolean enabled = bt.isEnabled();
- setIcon(enabled ? R.drawable.ic_qs_bluetooth_on : R.drawable.ic_qs_bluetooth_off);
+ setIcon(enabled ? R.drawable.ic_qs_bluetooth_not_connected : R.drawable.ic_qs_bluetooth_off);
setLabel(enabled ? R.string.quick_settings_bluetooth_label
: R.string.quick_settings_bluetooth_off_label);
updateCurrentState(enabled ? State.ENABLED : State.DISABLED);
registerBroadcastReceiver(new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
int state = intent.getIntExtra(
BluetoothAdapter.EXTRA_STATE,
BluetoothAdapter.STATE_OFF);
String label = null;
int iconId = 0;
State newState = getState();
switch (state) {
case BluetoothAdapter.STATE_CONNECTED:
iconId = R.drawable.ic_qs_bluetooth_on;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.ENABLED;
break;
case BluetoothAdapter.STATE_ON:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.ENABLED;
break;
case BluetoothAdapter.STATE_CONNECTING:
case BluetoothAdapter.STATE_TURNING_ON:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.ENABLING;
break;
case BluetoothAdapter.STATE_DISCONNECTED:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.DISABLED;
break;
case BluetoothAdapter.STATE_DISCONNECTING:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.DISABLING;
break;
case BluetoothAdapter.STATE_OFF:
iconId = R.drawable.ic_qs_bluetooth_off;
label = mContext.getString(R.string.quick_settings_bluetooth_off_label);
newState = State.DISABLED;
break;
case BluetoothAdapter.STATE_TURNING_OFF:
iconId = R.drawable.ic_qs_bluetooth_off;
label = mContext.getString(R.string.quick_settings_bluetooth_off_label);
newState = State.DISABLING;
break;
}
if (label != null && iconId > 0) {
setInfo(label, iconId);
scheduleViewUpdate();
updateCurrentState(newState);
}
}
}, new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
}
@Override
public boolean onLongClick(View v) {
Intent intent = new Intent(android.provider.Settings.ACTION_BLUETOOTH_SETTINGS);
startActivity(intent);
return super.onLongClick(v);
}
@Override
protected void doEnable() {
BluetoothAdapter.getDefaultAdapter().enable();
}
@Override
protected void doDisable() {
BluetoothAdapter.getDefaultAdapter().disable();
}
}
| true | true | public void init(Context c, int style) {
super.init(c, style);
BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
if (bt == null) {
return;
}
boolean enabled = bt.isEnabled();
setIcon(enabled ? R.drawable.ic_qs_bluetooth_on : R.drawable.ic_qs_bluetooth_off);
setLabel(enabled ? R.string.quick_settings_bluetooth_label
: R.string.quick_settings_bluetooth_off_label);
updateCurrentState(enabled ? State.ENABLED : State.DISABLED);
registerBroadcastReceiver(new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
int state = intent.getIntExtra(
BluetoothAdapter.EXTRA_STATE,
BluetoothAdapter.STATE_OFF);
String label = null;
int iconId = 0;
State newState = getState();
switch (state) {
case BluetoothAdapter.STATE_CONNECTED:
iconId = R.drawable.ic_qs_bluetooth_on;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.ENABLED;
break;
case BluetoothAdapter.STATE_ON:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.ENABLED;
break;
case BluetoothAdapter.STATE_CONNECTING:
case BluetoothAdapter.STATE_TURNING_ON:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.ENABLING;
break;
case BluetoothAdapter.STATE_DISCONNECTED:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.DISABLED;
break;
case BluetoothAdapter.STATE_DISCONNECTING:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.DISABLING;
break;
case BluetoothAdapter.STATE_OFF:
iconId = R.drawable.ic_qs_bluetooth_off;
label = mContext.getString(R.string.quick_settings_bluetooth_off_label);
newState = State.DISABLED;
break;
case BluetoothAdapter.STATE_TURNING_OFF:
iconId = R.drawable.ic_qs_bluetooth_off;
label = mContext.getString(R.string.quick_settings_bluetooth_off_label);
newState = State.DISABLING;
break;
}
if (label != null && iconId > 0) {
setInfo(label, iconId);
scheduleViewUpdate();
updateCurrentState(newState);
}
}
}, new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
}
| public void init(Context c, int style) {
super.init(c, style);
BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
if (bt == null) {
return;
}
boolean enabled = bt.isEnabled();
setIcon(enabled ? R.drawable.ic_qs_bluetooth_not_connected : R.drawable.ic_qs_bluetooth_off);
setLabel(enabled ? R.string.quick_settings_bluetooth_label
: R.string.quick_settings_bluetooth_off_label);
updateCurrentState(enabled ? State.ENABLED : State.DISABLED);
registerBroadcastReceiver(new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
int state = intent.getIntExtra(
BluetoothAdapter.EXTRA_STATE,
BluetoothAdapter.STATE_OFF);
String label = null;
int iconId = 0;
State newState = getState();
switch (state) {
case BluetoothAdapter.STATE_CONNECTED:
iconId = R.drawable.ic_qs_bluetooth_on;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.ENABLED;
break;
case BluetoothAdapter.STATE_ON:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.ENABLED;
break;
case BluetoothAdapter.STATE_CONNECTING:
case BluetoothAdapter.STATE_TURNING_ON:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.ENABLING;
break;
case BluetoothAdapter.STATE_DISCONNECTED:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.DISABLED;
break;
case BluetoothAdapter.STATE_DISCONNECTING:
iconId = R.drawable.ic_qs_bluetooth_not_connected;
label = mContext.getString(R.string.quick_settings_bluetooth_label);
newState = State.DISABLING;
break;
case BluetoothAdapter.STATE_OFF:
iconId = R.drawable.ic_qs_bluetooth_off;
label = mContext.getString(R.string.quick_settings_bluetooth_off_label);
newState = State.DISABLED;
break;
case BluetoothAdapter.STATE_TURNING_OFF:
iconId = R.drawable.ic_qs_bluetooth_off;
label = mContext.getString(R.string.quick_settings_bluetooth_off_label);
newState = State.DISABLING;
break;
}
if (label != null && iconId > 0) {
setInfo(label, iconId);
scheduleViewUpdate();
updateCurrentState(newState);
}
}
}, new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
}
|
diff --git a/src/freemail/SlotManager.java b/src/freemail/SlotManager.java
index 1eaae96..5290c9d 100644
--- a/src/freemail/SlotManager.java
+++ b/src/freemail/SlotManager.java
@@ -1,173 +1,182 @@
/*
* SlotManager.java
* This file is part of Freemail, copyright (C) 2006 Dave Baker
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
*/
package freemail;
import java.util.Vector;
import java.util.Enumeration;
/** Manages sequences of slots which are polled for messages, keeping track of which
* ones still need to be checked, which ones are used and which have expired.
*/
public abstract class SlotManager {
// how long we should keep checking a slot for which a successive slot has
// had a message retrieved on
private static final long SLOT_LIFETIME = 7 * 24 * 60 * 60 * 1000;
private static final int DEFAULT_POLL_AHEAD = 3;
// 'slots' contains all unused slots, in order for which there is a
// higher slot that is used. If there are no such slots, it contains the
// first free slot
private Vector slots;
private int nextSlotNum;
private final SlotSaveCallback cb;
private final Object userdata;
private int pollAhead;
protected SlotManager(SlotSaveCallback cb, Object userdata, String slotlist) {
this.slots = new Vector();
this.cb = cb;
this.userdata = userdata;
this.nextSlotNum = 0;
this.pollAhead = DEFAULT_POLL_AHEAD;
String parts[] = slotlist.split(",");
int i;
for (i = 0; i < parts.length; i++) {
String[] parts2 = parts[i].split("=", 2);
Slot s = new Slot();
s.slot = parts2[0];
if (parts2.length > 1)
s.time_added = Long.parseLong(parts2[1]);
else
s.time_added = -1;
this.slots.add(s);
}
}
/** Set the number of slots to poll after the last free one
*/
public void setPollAhead(int pa) {
this.pollAhead = pa;
}
/** Mark the last given slot as used
*/
public synchronized void slotUsed() {
if (this.nextSlotNum <= this.slots.size()) {
// it's one in the list. delete it and move the next
// pointer down to point to the same one
// (If nextSlotNum is 0, this should rightfully throw
// an ArrayIndexOutOfBoundsException
this.nextSlotNum--;
Slot s = (Slot)this.slots.remove(this.nextSlotNum);
// additionally, if it was the last one, we need to push
// the next slot onto the end
if (this.nextSlotNum == this.slots.size()) {
s.slot = this.incSlot(s.slot);
// time added is -1 since no subsequent slots
// have been used
s.time_added = -1;
this.slots.add(s);
}
} else {
// add all the slots before the used one that aren't already
// in the list
+ // note that this also modifies the previously last slot with a timestamp
int i;
Slot s = (Slot)this.slots.lastElement();
+ s.time_added = System.currentTimeMillis();
+ Slot s_new = new Slot();
+ s_new.slot = s.slot;
int slots_start_size = this.slots.size();
for (i = slots_start_size; i < this.nextSlotNum - 1; i++) {
- s.slot = this.incSlot(s.slot);
- s.time_added = System.currentTimeMillis();
- this.slots.add(s);
+ s_new.slot = this.incSlot(s_new.slot);
+ // copy slot to a new object, otherwise we have an identical copy of the last slot n times
+ Slot s_copy=new Slot();
+ s_copy.slot = s_new.slot;
+ s_copy.time_added = System.currentTimeMillis();
+ this.slots.add(s_copy);
}
// increment to get the used slot...
- s.slot = this.incSlot(s.slot);
+ s_new.slot = this.incSlot(s_new.slot);
// and again to get the one that nextSlotNum is pointing at
- s.slot = this.incSlot(s.slot);
- // ...and add that
- s.time_added = System.currentTimeMillis();
- this.slots.add(s);
+ s_new.slot = this.incSlot(s_new.slot);
+ // ...and add that one without time limit
+ s_new.time_added = -1;
+ this.slots.add(s_new);
+ // decrease nextSlotNum since we just have removed one slot
+ this.nextSlotNum--;
}
this.saveSlots();
}
private void saveSlots() {
StringBuffer buf = new StringBuffer();
Enumeration e = this.slots.elements();
boolean first = true;
while (e.hasMoreElements()) {
if (!first) buf.append(",");
first = false;
Slot s = (Slot)e.nextElement();
buf.append(s.slot);
if (s.time_added > 0)
buf.append("=").append(Long.toString(s.time_added));
}
this.cb.saveSlots(buf.toString(), this.userdata);
}
/** Method provided by subclasses to return the next slot given any slot
*/
protected abstract String incSlot(String slot);
public synchronized String getNextSlot() {
String retval = null;
boolean tryAgain = true;
while (tryAgain) {
tryAgain = false;
if (this.nextSlotNum >= this.slots.size() + this.pollAhead) {
// you've reached the end
retval = null;
} else if (this.nextSlotNum >= this.slots.size()) {
// we're into the unused slots. make one up.
Slot s = (Slot)this.slots.lastElement();
int i;
retval = s.slot;
for (i = this.slots.size(); i <= this.nextSlotNum; i++) {
retval = this.incSlot(retval);
}
} else {
// we're looking at an unused slot
Slot s = (Slot) this.slots.get(this.nextSlotNum);
// is this one too old?
if (s.time_added > 0 && s.time_added < System.currentTimeMillis() - SLOT_LIFETIME && this.nextSlotNum != this.slots.size() - 1) {
// this slot is too old. Forget it.
this.slots.remove(this.nextSlotNum);
tryAgain = true;
} else {
retval = s.slot;
}
}
}
this.nextSlotNum++;
return retval;
}
private class Slot {
String slot;
long time_added;
}
}
| false | true | public synchronized void slotUsed() {
if (this.nextSlotNum <= this.slots.size()) {
// it's one in the list. delete it and move the next
// pointer down to point to the same one
// (If nextSlotNum is 0, this should rightfully throw
// an ArrayIndexOutOfBoundsException
this.nextSlotNum--;
Slot s = (Slot)this.slots.remove(this.nextSlotNum);
// additionally, if it was the last one, we need to push
// the next slot onto the end
if (this.nextSlotNum == this.slots.size()) {
s.slot = this.incSlot(s.slot);
// time added is -1 since no subsequent slots
// have been used
s.time_added = -1;
this.slots.add(s);
}
} else {
// add all the slots before the used one that aren't already
// in the list
int i;
Slot s = (Slot)this.slots.lastElement();
int slots_start_size = this.slots.size();
for (i = slots_start_size; i < this.nextSlotNum - 1; i++) {
s.slot = this.incSlot(s.slot);
s.time_added = System.currentTimeMillis();
this.slots.add(s);
}
// increment to get the used slot...
s.slot = this.incSlot(s.slot);
// and again to get the one that nextSlotNum is pointing at
s.slot = this.incSlot(s.slot);
// ...and add that
s.time_added = System.currentTimeMillis();
this.slots.add(s);
}
this.saveSlots();
}
| public synchronized void slotUsed() {
if (this.nextSlotNum <= this.slots.size()) {
// it's one in the list. delete it and move the next
// pointer down to point to the same one
// (If nextSlotNum is 0, this should rightfully throw
// an ArrayIndexOutOfBoundsException
this.nextSlotNum--;
Slot s = (Slot)this.slots.remove(this.nextSlotNum);
// additionally, if it was the last one, we need to push
// the next slot onto the end
if (this.nextSlotNum == this.slots.size()) {
s.slot = this.incSlot(s.slot);
// time added is -1 since no subsequent slots
// have been used
s.time_added = -1;
this.slots.add(s);
}
} else {
// add all the slots before the used one that aren't already
// in the list
// note that this also modifies the previously last slot with a timestamp
int i;
Slot s = (Slot)this.slots.lastElement();
s.time_added = System.currentTimeMillis();
Slot s_new = new Slot();
s_new.slot = s.slot;
int slots_start_size = this.slots.size();
for (i = slots_start_size; i < this.nextSlotNum - 1; i++) {
s_new.slot = this.incSlot(s_new.slot);
// copy slot to a new object, otherwise we have an identical copy of the last slot n times
Slot s_copy=new Slot();
s_copy.slot = s_new.slot;
s_copy.time_added = System.currentTimeMillis();
this.slots.add(s_copy);
}
// increment to get the used slot...
s_new.slot = this.incSlot(s_new.slot);
// and again to get the one that nextSlotNum is pointing at
s_new.slot = this.incSlot(s_new.slot);
// ...and add that one without time limit
s_new.time_added = -1;
this.slots.add(s_new);
// decrease nextSlotNum since we just have removed one slot
this.nextSlotNum--;
}
this.saveSlots();
}
|
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesVariablesRetriever.java b/src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesVariablesRetriever.java
index 32c27e7..449229c 100644
--- a/src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesVariablesRetriever.java
+++ b/src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesVariablesRetriever.java
@@ -1,53 +1,53 @@
package org.jenkinsci.plugins.envinject.service;
import hudson.Util;
import hudson.remoting.Callable;
import org.jenkinsci.plugins.envinject.EnvInjectInfo;
import org.jenkinsci.plugins.envinject.EnvInjectLogger;
import java.util.HashMap;
import java.util.Map;
/**
* @author Gregory Boissinot
*/
public class PropertiesVariablesRetriever implements Callable<Map<String, String>, Throwable> {
private EnvInjectInfo info;
private Map<String, String> currentEnvVars;
private EnvInjectLogger logger;
public PropertiesVariablesRetriever(EnvInjectInfo info, Map<String, String> currentEnvVars, EnvInjectLogger logger) {
this.info = info;
this.currentEnvVars = currentEnvVars;
this.logger = logger;
}
public Map<String, String> call() throws Throwable {
Map<String, String> result = new HashMap<String, String>();
PropertiesFileService propertiesFileService = new PropertiesFileService();
//Add the properties file
if (info.getPropertiesFilePath() != null) {
String scriptFilePath = Util.replaceMacro(info.getPropertiesFilePath(), currentEnvVars);
- scriptFilePath = scriptFilePath.replace("\\", " / ");
+ scriptFilePath = scriptFilePath.replace("\\", "/");
logger.info(String.format("Injecting as environment variables the properties file path '%s'", scriptFilePath));
result.putAll(propertiesFileService.getVarsFromPropertiesFilePath(scriptFilePath));
}
//Add the properties content
if (info.getPropertiesContent() != null) {
String content = Util.replaceMacro(info.getPropertiesContent(), currentEnvVars);
logger.info(String.format("Injecting as environment variables the properties content \n '%s' \n", content));
result.putAll(propertiesFileService.getVarsFromPropertiesContent(content));
}
return result;
}
}
| true | true | public Map<String, String> call() throws Throwable {
Map<String, String> result = new HashMap<String, String>();
PropertiesFileService propertiesFileService = new PropertiesFileService();
//Add the properties file
if (info.getPropertiesFilePath() != null) {
String scriptFilePath = Util.replaceMacro(info.getPropertiesFilePath(), currentEnvVars);
scriptFilePath = scriptFilePath.replace("\\", " / ");
logger.info(String.format("Injecting as environment variables the properties file path '%s'", scriptFilePath));
result.putAll(propertiesFileService.getVarsFromPropertiesFilePath(scriptFilePath));
}
//Add the properties content
if (info.getPropertiesContent() != null) {
String content = Util.replaceMacro(info.getPropertiesContent(), currentEnvVars);
logger.info(String.format("Injecting as environment variables the properties content \n '%s' \n", content));
result.putAll(propertiesFileService.getVarsFromPropertiesContent(content));
}
return result;
}
| public Map<String, String> call() throws Throwable {
Map<String, String> result = new HashMap<String, String>();
PropertiesFileService propertiesFileService = new PropertiesFileService();
//Add the properties file
if (info.getPropertiesFilePath() != null) {
String scriptFilePath = Util.replaceMacro(info.getPropertiesFilePath(), currentEnvVars);
scriptFilePath = scriptFilePath.replace("\\", "/");
logger.info(String.format("Injecting as environment variables the properties file path '%s'", scriptFilePath));
result.putAll(propertiesFileService.getVarsFromPropertiesFilePath(scriptFilePath));
}
//Add the properties content
if (info.getPropertiesContent() != null) {
String content = Util.replaceMacro(info.getPropertiesContent(), currentEnvVars);
logger.info(String.format("Injecting as environment variables the properties content \n '%s' \n", content));
result.putAll(propertiesFileService.getVarsFromPropertiesContent(content));
}
return result;
}
|
diff --git a/src/net/analogyc/wordiary/models/DBAdapter.java b/src/net/analogyc/wordiary/models/DBAdapter.java
index 3d5866a..dd271fd 100644
--- a/src/net/analogyc/wordiary/models/DBAdapter.java
+++ b/src/net/analogyc/wordiary/models/DBAdapter.java
@@ -1,234 +1,236 @@
package net.analogyc.wordiary.models;
import java.sql.Date;
import java.text.SimpleDateFormat;
import java.util.Locale;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
public class DBAdapter {
private DataBaseHelper dbHelper;
private SQLiteDatabase database;
/**
* Constructor
* <p/>
* You must call open() on this object to use other methods
*/
public DBAdapter(Context contex) {
dbHelper = new DataBaseHelper(contex);
}
/**
* Returns an open, writable database, or creates a new instance
*/
private SQLiteDatabase getConnection() {
if (database == null) {
database = dbHelper.getWritableDatabase();
}
return database;
}
/**
* Close databaseHelper
*/
public void close() {
if (database != null) {
database.close();
database = null;
}
}
/**
* Get all the entries in the db
*
* @return Cursor that contains all entries ordered by date
*/
public Cursor getAllEntries() {
String query = "SELECT * FROM " + Entry.TABLE_NAME + " ORDER BY " + Entry.COLUMN_NAME_CREATED + " DESC";
return getConnection().rawQuery(query, null);
}
/**
* Get all the entries in the db
*
* @return Cursor that contains all entries ordered by date
*/
public Cursor getAllEntriesWithImage() {
String query = "SELECT " + Day.TABLE_NAME + "." + Day.COLUMN_NAME_FILENAME + ", " +
Entry.TABLE_NAME + "." + Entry.COLUMN_NAME_MESSAGE + ", " +
Entry.TABLE_NAME + "." + Entry._ID + ", " +
Entry.TABLE_NAME + "." + Entry.COLUMN_NAME_CREATED +
" FROM " + Entry.TABLE_NAME + " LEFT OUTER JOIN " + Day.TABLE_NAME +
" ON " + Entry.TABLE_NAME + "." + Entry.COLUMN_NAME_DAY_ID +
" = " +
Day.TABLE_NAME + "." + Day._ID +
" ORDER BY " + Entry.TABLE_NAME + "." + Entry.COLUMN_NAME_CREATED + " DESC";
return getConnection().rawQuery(query, null);
}
/**
* Get the selected entry
*
* @param id entry's id
* @return a Cursor that contains the selected entry, or null
*/
public Cursor getEntryById(int id) {
String query = "SELECT * FROM " + Entry.TABLE_NAME + " WHERE " + Entry._ID + " = " + id;
return getConnection().rawQuery(query, null);
}
/**
* Get the selected entry
*
* @param id entry's id
* @return a Cursor that contains the selected entry, or null
*/
public Cursor getEntryByDay(int id) {
String query = "SELECT * FROM " + Entry.TABLE_NAME +
" WHERE " + Entry.COLUMN_NAME_DAY_ID + " = " + id +
" ORDER BY "+ Entry._ID+" DESC";
Log.w(null,query);
return getConnection().rawQuery(query, null);
}
/**
* Add a new entry
*
* @param text the message of the entry
* @param mood the correspondent mood
*/
public void addEntry(String text, int mood) {
//create the current timestamp
Date now = new Date(System.currentTimeMillis());
String DATE_FORMAT = "yyyyMMddHHmmss";
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT, Locale.ITALY);
String query =
"SELECT * " +
"FROM " + Day.TABLE_NAME +
" WHERE " + Day.COLUMN_NAME_CREATED + " LIKE '" + sdf.format(now).substring(0, 8) + "%'";
Cursor c = getConnection().rawQuery(query, null);
int photo;
if (c.moveToFirst()) {
photo = c.getInt(0);
} else {
addPhoto("");
query =
"SELECT * " +
"FROM " + Day.TABLE_NAME +
" WHERE " + Day.COLUMN_NAME_CREATED + " LIKE '" + sdf.format(now).substring(0, 8) + "%'";
- photo = getConnection().rawQuery(query, null).getInt(0);
+ c = getConnection().rawQuery(query, null);
+ c.moveToFirst();
+ photo = c.getInt(0);
}
c.close();
//insert the entry
query = "INSERT INTO " + Entry.TABLE_NAME + " ( " +
Entry.COLUMN_NAME_MESSAGE + " , " +
Entry.COLUMN_NAME_MOOD + " , " +
Entry.COLUMN_NAME_DAY_ID + " , " +
Entry.COLUMN_NAME_CREATED +
") VALUES ( ?,?,?,? )";
getConnection().execSQL(query, new Object[]{text, mood, photo, sdf.format(now)});
}
/**
* Delete a entry
*
* @param id the message id
*/
public void deleteEntry(int id) {
//delete the entry
String query = "DELETE FROM " + Entry.TABLE_NAME + " WHERE " + Entry._ID + " = " + id;
getConnection().execSQL(query);
}
/**
* Add a new photo
*
* @param filename the path of the photo
*/
public void addPhoto(String filename) {
//create the current timestamp
Date now = new Date(System.currentTimeMillis());
String DATE_FORMAT = "yyyyMMddHHmmss";
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT, Locale.ITALY);
String date = sdf.format(now);
//get the id of the day
String query =
"SELECT * " +
" FROM " + Day.TABLE_NAME +
" WHERE " + Day.COLUMN_NAME_CREATED + " LIKE '" + date.substring(0, 8) + "%'";
Cursor c = getConnection().rawQuery(query, null);
if(c.getCount() > 0) {
c.moveToFirst();
query = "UPDATE " + Day.TABLE_NAME + " " +
"SET " + Day.COLUMN_NAME_FILENAME + " = ?" +
"WHERE " + Day._ID + " = ?";
getConnection().execSQL(query, new Object[] {filename, c.getInt(0)});
} else {
//insert the entry
query = "INSERT INTO " + Day.TABLE_NAME + " ( " +
Day.COLUMN_NAME_FILENAME + " , " +
Day.COLUMN_NAME_CREATED +
") VALUES (?, ?)";
getConnection().execSQL(query, new Object[] {filename, date});
}
}
/**
* Get a photo by inserting the
*
* @param day Day in format yyyyMMdd
* @return The database row, one or none
*/
public Cursor getPhotoByDay(String day) {
String query =
"SELECT * " +
"FROM " + Day.TABLE_NAME + " " +
"WHERE " + Day.COLUMN_NAME_CREATED + " LIKE '" + day + "%'";
return getConnection().rawQuery(query, null);
}
/**
* Get all the days ordered by date (DESC)
*
* @return Cursor containing the days
*/
public Cursor getAllDays() {
String query = "SELECT * FROM " + Day.TABLE_NAME + " ORDER BY " + Day._ID + " DESC";
return getConnection().rawQuery(query, null);
}
/**
* Get the selected entry
*
* @param id entry's id
* @return a Cursor that contains the selected entry, or null
*/
public Cursor getDayById(int id) {
String query = "SELECT * FROM " + Day.TABLE_NAME + " WHERE " + Day._ID + " = " + id;
return getConnection().rawQuery(query, null);
}
public void updateMood(int entryId, String moodId) {
String query = "UPDATE " + Entry.TABLE_NAME +
" SET "+ Entry.COLUMN_NAME_MOOD +" = ? WHERE " + Entry._ID + " = ?";
getConnection().execSQL(query, new Object[]{moodId,entryId});
}
}
| true | true | public void addEntry(String text, int mood) {
//create the current timestamp
Date now = new Date(System.currentTimeMillis());
String DATE_FORMAT = "yyyyMMddHHmmss";
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT, Locale.ITALY);
String query =
"SELECT * " +
"FROM " + Day.TABLE_NAME +
" WHERE " + Day.COLUMN_NAME_CREATED + " LIKE '" + sdf.format(now).substring(0, 8) + "%'";
Cursor c = getConnection().rawQuery(query, null);
int photo;
if (c.moveToFirst()) {
photo = c.getInt(0);
} else {
addPhoto("");
query =
"SELECT * " +
"FROM " + Day.TABLE_NAME +
" WHERE " + Day.COLUMN_NAME_CREATED + " LIKE '" + sdf.format(now).substring(0, 8) + "%'";
photo = getConnection().rawQuery(query, null).getInt(0);
}
c.close();
//insert the entry
query = "INSERT INTO " + Entry.TABLE_NAME + " ( " +
Entry.COLUMN_NAME_MESSAGE + " , " +
Entry.COLUMN_NAME_MOOD + " , " +
Entry.COLUMN_NAME_DAY_ID + " , " +
Entry.COLUMN_NAME_CREATED +
") VALUES ( ?,?,?,? )";
getConnection().execSQL(query, new Object[]{text, mood, photo, sdf.format(now)});
}
| public void addEntry(String text, int mood) {
//create the current timestamp
Date now = new Date(System.currentTimeMillis());
String DATE_FORMAT = "yyyyMMddHHmmss";
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT, Locale.ITALY);
String query =
"SELECT * " +
"FROM " + Day.TABLE_NAME +
" WHERE " + Day.COLUMN_NAME_CREATED + " LIKE '" + sdf.format(now).substring(0, 8) + "%'";
Cursor c = getConnection().rawQuery(query, null);
int photo;
if (c.moveToFirst()) {
photo = c.getInt(0);
} else {
addPhoto("");
query =
"SELECT * " +
"FROM " + Day.TABLE_NAME +
" WHERE " + Day.COLUMN_NAME_CREATED + " LIKE '" + sdf.format(now).substring(0, 8) + "%'";
c = getConnection().rawQuery(query, null);
c.moveToFirst();
photo = c.getInt(0);
}
c.close();
//insert the entry
query = "INSERT INTO " + Entry.TABLE_NAME + " ( " +
Entry.COLUMN_NAME_MESSAGE + " , " +
Entry.COLUMN_NAME_MOOD + " , " +
Entry.COLUMN_NAME_DAY_ID + " , " +
Entry.COLUMN_NAME_CREATED +
") VALUES ( ?,?,?,? )";
getConnection().execSQL(query, new Object[]{text, mood, photo, sdf.format(now)});
}
|
Subsets and Splits