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/ecologylab/generic/ConfParser.java b/ecologylab/generic/ConfParser.java
index 0cfbe007..737ffbb6 100644
--- a/ecologylab/generic/ConfParser.java
+++ b/ecologylab/generic/ConfParser.java
@@ -1,65 +1,66 @@
package ecologylab.generic;
import java.io.File;
import java.io.FileNotFoundException;
import java.util.HashMap;
import java.util.NoSuchElementException;
import java.util.Scanner;
public class ConfParser
{
private File confFile;
private HashMap<String, String> confMap;
public ConfParser(File confFile)
{
this.confFile = confFile;
}
public void setConfFile(File confFile)
{
this.confFile = confFile;
}
public HashMap<String, String> parse() throws FileNotFoundException
{
confMap = new HashMap<String, String>();
if (!confFile.exists() || !confFile.canRead())
{
+ System.err.println("Failed to parse conf file: " + confFile);
throw new FileNotFoundException();
}
//go line by line and add to the hash map if it's not a comment;
Scanner scanner = new Scanner(confFile);
scanner.useDelimiter("=|\\n");
while (scanner.hasNextLine())
{
//ignore comments
if (scanner.findInLine("#") != null)
{
scanner.nextLine();
continue;
}
try
{
String key = scanner.next().trim();
String value = scanner.next().trim();
System.out.println(key + ": " + value);
confMap.put(key, value);
} catch (NoSuchElementException e)
{
break;
}
}
return confMap;
}
}
| true | true | public HashMap<String, String> parse() throws FileNotFoundException
{
confMap = new HashMap<String, String>();
if (!confFile.exists() || !confFile.canRead())
{
throw new FileNotFoundException();
}
//go line by line and add to the hash map if it's not a comment;
Scanner scanner = new Scanner(confFile);
scanner.useDelimiter("=|\\n");
while (scanner.hasNextLine())
{
//ignore comments
if (scanner.findInLine("#") != null)
{
scanner.nextLine();
continue;
}
try
{
String key = scanner.next().trim();
String value = scanner.next().trim();
System.out.println(key + ": " + value);
confMap.put(key, value);
} catch (NoSuchElementException e)
{
break;
}
}
return confMap;
}
| public HashMap<String, String> parse() throws FileNotFoundException
{
confMap = new HashMap<String, String>();
if (!confFile.exists() || !confFile.canRead())
{
System.err.println("Failed to parse conf file: " + confFile);
throw new FileNotFoundException();
}
//go line by line and add to the hash map if it's not a comment;
Scanner scanner = new Scanner(confFile);
scanner.useDelimiter("=|\\n");
while (scanner.hasNextLine())
{
//ignore comments
if (scanner.findInLine("#") != null)
{
scanner.nextLine();
continue;
}
try
{
String key = scanner.next().trim();
String value = scanner.next().trim();
System.out.println(key + ": " + value);
confMap.put(key, value);
} catch (NoSuchElementException e)
{
break;
}
}
return confMap;
}
|
diff --git a/src/com/thomasbiddle/puppywood/WebcamActivity.java b/src/com/thomasbiddle/puppywood/WebcamActivity.java
index b59762e..557e1b7 100644
--- a/src/com/thomasbiddle/puppywood/WebcamActivity.java
+++ b/src/com/thomasbiddle/puppywood/WebcamActivity.java
@@ -1,91 +1,91 @@
package com.thomasbiddle.puppywood;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Spinner;
import android.widget.Toast;
public class WebcamActivity extends Activity {
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.webcam);
}
public void startBeechmontCamera(View v) {
Spinner sp = (Spinner) findViewById(R.id.beechmontWebcamSpinner);
String currentWebcam = sp.getSelectedItem().toString();
Toast t = Toast.makeText(getApplicationContext(), currentWebcam, Toast.LENGTH_SHORT);
t.show();
Intent intent = new Intent();
// Can't have just an uninstantiated class, setting it to base to begin will re-set it
// base on the selection below.
Class cameraClass = com.thomasbiddle.puppywood.cameras.CameraBase.class;
// WTF Java - You didn't implement switch conditionals by string until JDK7?!
// Using If/ElseIf for backwards compatibility.
if (currentWebcam.equalsIgnoreCase("Camera 1")) {
cameraClass = com.thomasbiddle.puppywood.cameras.BeechmontCamera1.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 2")) {
cameraClass = com.thomasbiddle.puppywood.cameras.BeechmontCamera2.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 3")) {
cameraClass = com.thomasbiddle.puppywood.cameras.BeechmontCamera3.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 4")) {
cameraClass = com.thomasbiddle.puppywood.cameras.BeechmontCamera4.class;
}
intent.setClass(this, cameraClass);
startActivity(intent);
}
public void goToCamera(View v) {
Spinner sp = (Spinner) findViewById(R.id.Spinner_Webcam);
String currentWebcam = sp.getSelectedItem().toString();
Toast t = Toast.makeText(getApplicationContext(), currentWebcam, Toast.LENGTH_SHORT);
t.show();
Intent intent = new Intent();
// Can't have just an uninstantiated class, setting it to base to begin will re-set it
// base on the selection below.
Class cameraClass = com.thomasbiddle.puppywood.cameras.CameraBase.class;
// WTF Java - You didn't implement switch conditionals by string until JDK7?!
// Using If/ElseIf for backwards compatibility.
if (currentWebcam.equalsIgnoreCase("Quad Camera 1")) {
cameraClass = com.thomasbiddle.puppywood.cameras.CameraQuad1.class;
}
else if(currentWebcam.equalsIgnoreCase("Quad Camera 2")) {
cameraClass = com.thomasbiddle.puppywood.cameras.CameraQuad2.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 1")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera1.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 2")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera2.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 3")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera3.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 4")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera4.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 5")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera5.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 6")) {
- cameraClass = com.thomasbiddle.puppywood.cameras.Camera1.class;
+ cameraClass = com.thomasbiddle.puppywood.cameras.Camera6.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 7")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera7.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 8")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera8.class;
}
intent.setClass(this, cameraClass);
startActivity(intent);
}
}
| true | true | public void goToCamera(View v) {
Spinner sp = (Spinner) findViewById(R.id.Spinner_Webcam);
String currentWebcam = sp.getSelectedItem().toString();
Toast t = Toast.makeText(getApplicationContext(), currentWebcam, Toast.LENGTH_SHORT);
t.show();
Intent intent = new Intent();
// Can't have just an uninstantiated class, setting it to base to begin will re-set it
// base on the selection below.
Class cameraClass = com.thomasbiddle.puppywood.cameras.CameraBase.class;
// WTF Java - You didn't implement switch conditionals by string until JDK7?!
// Using If/ElseIf for backwards compatibility.
if (currentWebcam.equalsIgnoreCase("Quad Camera 1")) {
cameraClass = com.thomasbiddle.puppywood.cameras.CameraQuad1.class;
}
else if(currentWebcam.equalsIgnoreCase("Quad Camera 2")) {
cameraClass = com.thomasbiddle.puppywood.cameras.CameraQuad2.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 1")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera1.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 2")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera2.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 3")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera3.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 4")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera4.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 5")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera5.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 6")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera1.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 7")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera7.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 8")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera8.class;
}
intent.setClass(this, cameraClass);
startActivity(intent);
}
| public void goToCamera(View v) {
Spinner sp = (Spinner) findViewById(R.id.Spinner_Webcam);
String currentWebcam = sp.getSelectedItem().toString();
Toast t = Toast.makeText(getApplicationContext(), currentWebcam, Toast.LENGTH_SHORT);
t.show();
Intent intent = new Intent();
// Can't have just an uninstantiated class, setting it to base to begin will re-set it
// base on the selection below.
Class cameraClass = com.thomasbiddle.puppywood.cameras.CameraBase.class;
// WTF Java - You didn't implement switch conditionals by string until JDK7?!
// Using If/ElseIf for backwards compatibility.
if (currentWebcam.equalsIgnoreCase("Quad Camera 1")) {
cameraClass = com.thomasbiddle.puppywood.cameras.CameraQuad1.class;
}
else if(currentWebcam.equalsIgnoreCase("Quad Camera 2")) {
cameraClass = com.thomasbiddle.puppywood.cameras.CameraQuad2.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 1")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera1.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 2")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera2.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 3")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera3.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 4")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera4.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 5")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera5.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 6")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera6.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 7")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera7.class;
}
else if(currentWebcam.equalsIgnoreCase("Camera 8")) {
cameraClass = com.thomasbiddle.puppywood.cameras.Camera8.class;
}
intent.setClass(this, cameraClass);
startActivity(intent);
}
|
diff --git a/org.jcryptool.core/src/org/jcryptool/core/preferences/pages/GeneralPage.java b/org.jcryptool.core/src/org/jcryptool/core/preferences/pages/GeneralPage.java
index 3eb09a96..c66059fd 100644
--- a/org.jcryptool.core/src/org/jcryptool/core/preferences/pages/GeneralPage.java
+++ b/org.jcryptool.core/src/org/jcryptool/core/preferences/pages/GeneralPage.java
@@ -1,222 +1,222 @@
// -----BEGIN DISCLAIMER-----
/*******************************************************************************
* Copyright (c) 2008 JCrypTool Team and 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://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
// -----END DISCLAIMER-----
package org.jcryptool.core.preferences.pages;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.net.URL;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.PlatformUI;
import org.jcryptool.core.CorePlugin;
import org.jcryptool.core.logging.utils.LogUtil;
/**
* <p>
* General preference page. On this page the language can be changed between English and German. If the language is
* changed the application needs to be restarted.
* </p>
*
* <p>
* <b>This feature has no effect, if you start the application directly from an Eclipse IDE.</b>
* </p>
*
* @author Dominik Schadow
* @version 0.9.0
*/
public class GeneralPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
private Combo listLanguage;
private String[] nl;
private String[] nlText;
private String currentLanguage = Platform.getNL();
public GeneralPage() {
super(GRID);
setPreferenceStore(CorePlugin.getDefault().getPreferenceStore());
setDescription(Messages.General_0);
IExtensionPoint p = Platform.getExtensionRegistry().getExtensionPoint("org.jcryptool.core.platformLanguage"); //$NON-NLS-1$
IExtension[] ext = p.getExtensions();
nl = new String[ext.length];
nlText = new String[ext.length];
for (int i = 0; i < ext.length; i++) {
IConfigurationElement element = (IConfigurationElement) ext[i].getConfigurationElements()[0];
nl[i] = element.getAttribute("languageCode"); //$NON-NLS-1$
nlText[i] = element.getAttribute("languageDescription"); //$NON-NLS-1$
}
}
@Override
public void createControl(Composite parent) {
super.createControl(parent);
PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), "org.jcryptool.core.generalPreferences"); //$NON-NLS-1$
}
@Override
protected Control createContents(Composite parent) {
GridData gridData = new GridData();
gridData.horizontalAlignment = GridData.FILL;
gridData.grabExcessHorizontalSpace = true;
Group gLanguage = new Group(parent, SWT.NONE);
gLanguage.setText(Messages.SelectLanguage);
gLanguage.setLayoutData(gridData);
gLanguage.setLayout(new GridLayout());
listLanguage = new Combo(gLanguage, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY);
for (int i = 0; i < nl.length; i++) {
listLanguage.add(nlText[i]);
if (nl[i].equals(currentLanguage)) {
listLanguage.select(i);
}
}
return super.createContents(parent);
}
@Override
public boolean performOk() {
try {
if (!nl[listLanguage.getSelectionIndex()].equals(currentLanguage)) {
setLanguage(nl[listLanguage.getSelectionIndex()]);
restartApp();
}
} catch (Exception ex) {
LogUtil.logError("It is not possible to change the language.", ex); //$NON-NLS-1$
setErrorMessage(Messages.MessageError);
}
return super.performOk();
}
@Override
protected void performDefaults() {
for (int i = 0; i < nl.length; i++) {
if (nl[i].equals(currentLanguage)) {
listLanguage.select(i);
}
}
setErrorMessage(null);
super.performDefaults();
}
public void init(IWorkbench workbench) {
}
/**
* Sets the language in the <b>JCrypTool.ini</b>. This file is located in a different folder on Mac OS X.
*
* @param language
* @throws Exception
*/
private void setLanguage(String language) throws Exception {
String path = Platform.getInstallLocation().getURL().toExternalForm();
String fileNameOrg = Platform.getProduct().getName() + ".ini"; //$NON-NLS-1$
String fileNameBak = fileNameOrg + ".bak"; //$NON-NLS-1$
if ("macosx".equalsIgnoreCase(Platform.getOS())) { //$NON-NLS-1$
path += "JCrypTool.app/Contents/MacOS/"; //$NON-NLS-1$
}
File fileOrg = new File(new URL(path + fileNameOrg).getFile());
File fileBak = new File(new URL(path + fileNameBak).getFile());
if (fileBak.exists()) {
fileBak.delete();
}
fileOrg.renameTo(fileBak);
BufferedReader in = new BufferedReader(new FileReader(fileBak));
BufferedWriter out = new BufferedWriter(new FileWriter(fileOrg));
try {
String line = in.readLine();
- if (line.equals("-nl")) { //$NON-NLS-1$
+ if (line != null && line.equals("-nl")) { //$NON-NLS-1$
out.write(line);
out.newLine();
line = in.readLine();
out.write(language);
out.newLine();
for (int i = 0; i < nl.length; i++) {
if (line.equals(nl[i]))
line = in.readLine();
}
} else {
out.write("-nl"); //$NON-NLS-1$
out.newLine();
out.write(language);
out.newLine();
}
while (line != null) {
if (line.equals("-nl")) { //$NON-NLS-1$
line = in.readLine();
for (int i = 0; i < nl.length; i++) {
if (line.equals(nl[i]))
line = in.readLine();
}
} else {
out.write(line);
out.newLine();
}
line = in.readLine();
}
out.flush();
} catch (IOException ieo) {
throw (ieo);
} finally {
try {
in.close();
out.close();
} catch (IOException ioe) {
LogUtil.logError(ioe);
}
}
}
private void restartApp() {
MessageBox mbox = new MessageBox(Display.getDefault().getActiveShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO);
mbox.setText(Messages.MessageTitleRestart);
mbox.setMessage(Messages.MessageRestart);
if (mbox.open() == SWT.YES) {
LogUtil.logInfo(Messages.MessageLogRestart);
PlatformUI.getWorkbench().restart();
}
}
@Override
protected void createFieldEditors() {
}
}
| true | true | private void setLanguage(String language) throws Exception {
String path = Platform.getInstallLocation().getURL().toExternalForm();
String fileNameOrg = Platform.getProduct().getName() + ".ini"; //$NON-NLS-1$
String fileNameBak = fileNameOrg + ".bak"; //$NON-NLS-1$
if ("macosx".equalsIgnoreCase(Platform.getOS())) { //$NON-NLS-1$
path += "JCrypTool.app/Contents/MacOS/"; //$NON-NLS-1$
}
File fileOrg = new File(new URL(path + fileNameOrg).getFile());
File fileBak = new File(new URL(path + fileNameBak).getFile());
if (fileBak.exists()) {
fileBak.delete();
}
fileOrg.renameTo(fileBak);
BufferedReader in = new BufferedReader(new FileReader(fileBak));
BufferedWriter out = new BufferedWriter(new FileWriter(fileOrg));
try {
String line = in.readLine();
if (line.equals("-nl")) { //$NON-NLS-1$
out.write(line);
out.newLine();
line = in.readLine();
out.write(language);
out.newLine();
for (int i = 0; i < nl.length; i++) {
if (line.equals(nl[i]))
line = in.readLine();
}
} else {
out.write("-nl"); //$NON-NLS-1$
out.newLine();
out.write(language);
out.newLine();
}
while (line != null) {
if (line.equals("-nl")) { //$NON-NLS-1$
line = in.readLine();
for (int i = 0; i < nl.length; i++) {
if (line.equals(nl[i]))
line = in.readLine();
}
} else {
out.write(line);
out.newLine();
}
line = in.readLine();
}
out.flush();
} catch (IOException ieo) {
throw (ieo);
} finally {
try {
in.close();
out.close();
} catch (IOException ioe) {
LogUtil.logError(ioe);
}
}
}
| private void setLanguage(String language) throws Exception {
String path = Platform.getInstallLocation().getURL().toExternalForm();
String fileNameOrg = Platform.getProduct().getName() + ".ini"; //$NON-NLS-1$
String fileNameBak = fileNameOrg + ".bak"; //$NON-NLS-1$
if ("macosx".equalsIgnoreCase(Platform.getOS())) { //$NON-NLS-1$
path += "JCrypTool.app/Contents/MacOS/"; //$NON-NLS-1$
}
File fileOrg = new File(new URL(path + fileNameOrg).getFile());
File fileBak = new File(new URL(path + fileNameBak).getFile());
if (fileBak.exists()) {
fileBak.delete();
}
fileOrg.renameTo(fileBak);
BufferedReader in = new BufferedReader(new FileReader(fileBak));
BufferedWriter out = new BufferedWriter(new FileWriter(fileOrg));
try {
String line = in.readLine();
if (line != null && line.equals("-nl")) { //$NON-NLS-1$
out.write(line);
out.newLine();
line = in.readLine();
out.write(language);
out.newLine();
for (int i = 0; i < nl.length; i++) {
if (line.equals(nl[i]))
line = in.readLine();
}
} else {
out.write("-nl"); //$NON-NLS-1$
out.newLine();
out.write(language);
out.newLine();
}
while (line != null) {
if (line.equals("-nl")) { //$NON-NLS-1$
line = in.readLine();
for (int i = 0; i < nl.length; i++) {
if (line.equals(nl[i]))
line = in.readLine();
}
} else {
out.write(line);
out.newLine();
}
line = in.readLine();
}
out.flush();
} catch (IOException ieo) {
throw (ieo);
} finally {
try {
in.close();
out.close();
} catch (IOException ioe) {
LogUtil.logError(ioe);
}
}
}
|
diff --git a/src/test/java/com/wikia/webdriver/TestCases/ArticleCRUDTests/ArticleCRUDTestsAnonymous.java b/src/test/java/com/wikia/webdriver/TestCases/ArticleCRUDTests/ArticleCRUDTestsAnonymous.java
index e20c5b1..10d618a 100644
--- a/src/test/java/com/wikia/webdriver/TestCases/ArticleCRUDTests/ArticleCRUDTestsAnonymous.java
+++ b/src/test/java/com/wikia/webdriver/TestCases/ArticleCRUDTests/ArticleCRUDTestsAnonymous.java
@@ -1,162 +1,162 @@
package com.wikia.webdriver.TestCases.ArticleCRUDTests;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import com.wikia.webdriver.Common.Core.CommonFunctions;
import com.wikia.webdriver.Common.Core.Global;
import com.wikia.webdriver.Common.Properties.Properties;
import com.wikia.webdriver.Common.Templates.TestTemplate;
import com.wikia.webdriver.PageObjects.PageObject.WikiBasePageObject;
import com.wikia.webdriver.PageObjects.PageObject.WikiPage.WikiArticleEditMode;
import com.wikia.webdriver.PageObjects.PageObject.WikiPage.WikiArticlePageObject;
public class ArticleCRUDTestsAnonymous extends TestTemplate{
private String pageName;
private String articleText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
private String articleTextEdit = "Brand new content";
private String commentText = "Lorem ipsum dolor sit amet, comment";
private String replyText = "Brand new reply";
/*
* TestCase001
* Open random wiki page as anonymous user
* Click edit drop-down
* Verify available edit options for anonymous user (history item)
*/
@Test(groups={"ArticleCRUDAnon_001", "ArticleCRUDAnonymous"})
public void ArticleCRUDAnon_001_VerifyEditDropDown()
{
CommonFunctions.logOut(driver);
WikiBasePageObject wiki = new WikiBasePageObject(driver, Global.DOMAIN);
wiki.openWikiPage();
wiki.openRandomArticle();
wiki.clickEditDropDown();
wiki.verifyEditDropDownAnonymous();
}
/*
* TestCase002
* Create article as admin user with following names:
* normal: QAarticle
* non-latin: 這是文章的名字在中國
* long: QAVeryLongArticleNameQAVeryLongArticleNameQAVeryLongArticleNameQAVeryLongArticleNameQAVeryLongArticleNameQAVeryLongArticleName
* with slash: QA/article
* with underscore: QA_article
* made from digits:123123123123
* Delete article
*/
@Test(dataProvider="getArticleName", groups={"ArticleCRUDAnon_002", "ArticleCRUDAnonymous"})
public void ArticleCRUDAnon_002_CreateArticle(String articleName)
{
CommonFunctions.logOut(driver);
WikiBasePageObject wiki = new WikiBasePageObject(driver, Global.DOMAIN);
pageName = articleName+wiki.getTimeStamp();
wiki.openWikiPage();
WikiArticleEditMode edit = wiki.createNewArticle(pageName, 1);
edit.deleteArticleContent();
// edit.clickOnVisualButton();
edit.typeInContent(articleText);
WikiArticlePageObject article = edit.clickOnPublishButton();
article.verifyPageTitle(pageName);
article.verifyArticleText(articleText);
}
/*
* TestCase005
* Create article as admin user
* Edit article
* Delete article
*/
@Test(groups={"ArticleCRUDAnon_003", "ArticleCRUDAnonymous"})
public void ArticleCRUDAnon_003_CreateEditArticle()
{
CommonFunctions.logOut(driver);
WikiBasePageObject wiki = new WikiBasePageObject(driver, Global.DOMAIN);
pageName = "QAarticle"+wiki.getTimeStamp();
wiki.openWikiPage();
WikiArticleEditMode edit = wiki.createNewArticle(pageName, 1);
edit.deleteArticleContent();
// edit.clickOnVisualButton();
edit.typeInContent(articleText);
WikiArticlePageObject article = edit.clickOnPublishButton();
article.verifyPageTitle(pageName);
article.verifyArticleText(articleText);
edit = article.clickEditButton(pageName);
edit.deleteArticleContent();
- edit.clickOnVisualButton();
+// edit.clickOnVisualButton();
edit.typeInContent(articleTextEdit);
article = edit.clickOnPublishButton();
article.verifyPageTitle(pageName);
article.verifyArticleText(articleTextEdit);
}
/*
* TestCase006
* Add article as admin
* Add comment
* Delete comment
* Delete article
*/
@Test(groups={"ArticleCRUDAnon_004", "ArticleCRUDAnonymous"})
public void ArticleCRUDAnon_004_CreateArticleComment()
{
CommonFunctions.logOut(driver);
WikiBasePageObject wiki = new WikiBasePageObject(driver, Global.DOMAIN);
pageName = "QAarticle"+wiki.getTimeStamp();
wiki.openWikiPage();
WikiArticleEditMode edit = wiki.createNewArticle(pageName, 1);
edit.deleteArticleContent();
// edit.clickOnVisualButton();
edit.typeInContent(articleText);
WikiArticlePageObject article = edit.clickOnPublishButton();
article.verifyPageTitle(pageName);
article.triggerCommentArea();
article.writeOnCommentArea(commentText);
article.clickSubmitButton();
article.verifyComment(commentText, "A Wikia contributor");
}
/*
* TestCase006
* Add article as admin
* Add comment
* Delete comment
* Delete article
*/
@Test(groups={"ArticleCRUDAnon_005", "ArticleCRUDAnonymous"})
public void ArticleCRUDAnon_005_CreateArticleCommentReply()
{
CommonFunctions.logOut(driver);
WikiBasePageObject wiki = new WikiBasePageObject(driver, Global.DOMAIN);
pageName = "QAarticle"+wiki.getTimeStamp();
wiki.openWikiPage();
WikiArticleEditMode edit = wiki.createNewArticle(pageName, 1);
edit.deleteArticleContent();
// edit.clickOnVisualButton();
edit.typeInContent(articleText);
WikiArticlePageObject article = edit.clickOnPublishButton();
article.verifyPageTitle(pageName);
article.triggerCommentArea();
article.writeOnCommentArea(commentText);
article.clickSubmitButton();
article.verifyComment(commentText, "A Wikia contributor");
article.replyComment(commentText, replyText);
}
@DataProvider
private static final Object[][] getArticleName()
{
return new Object[][]
{
{"QAarticle"},
{"QAVeryLongArticleNameQAVeryLongArticleNameQAVeryLongArticleNameQAVeryLongArticleNameQAVeryLongArticleNameQAVeryLongArticleName"},
{"QA/article"},
{"QA_article"},
{"123123123123"}
};
}
}
| true | true | public void ArticleCRUDAnon_003_CreateEditArticle()
{
CommonFunctions.logOut(driver);
WikiBasePageObject wiki = new WikiBasePageObject(driver, Global.DOMAIN);
pageName = "QAarticle"+wiki.getTimeStamp();
wiki.openWikiPage();
WikiArticleEditMode edit = wiki.createNewArticle(pageName, 1);
edit.deleteArticleContent();
// edit.clickOnVisualButton();
edit.typeInContent(articleText);
WikiArticlePageObject article = edit.clickOnPublishButton();
article.verifyPageTitle(pageName);
article.verifyArticleText(articleText);
edit = article.clickEditButton(pageName);
edit.deleteArticleContent();
edit.clickOnVisualButton();
edit.typeInContent(articleTextEdit);
article = edit.clickOnPublishButton();
article.verifyPageTitle(pageName);
article.verifyArticleText(articleTextEdit);
}
| public void ArticleCRUDAnon_003_CreateEditArticle()
{
CommonFunctions.logOut(driver);
WikiBasePageObject wiki = new WikiBasePageObject(driver, Global.DOMAIN);
pageName = "QAarticle"+wiki.getTimeStamp();
wiki.openWikiPage();
WikiArticleEditMode edit = wiki.createNewArticle(pageName, 1);
edit.deleteArticleContent();
// edit.clickOnVisualButton();
edit.typeInContent(articleText);
WikiArticlePageObject article = edit.clickOnPublishButton();
article.verifyPageTitle(pageName);
article.verifyArticleText(articleText);
edit = article.clickEditButton(pageName);
edit.deleteArticleContent();
// edit.clickOnVisualButton();
edit.typeInContent(articleTextEdit);
article = edit.clickOnPublishButton();
article.verifyPageTitle(pageName);
article.verifyArticleText(articleTextEdit);
}
|
diff --git a/src/main/java/de/cismet/commons/gui/equalizer/EqualizerPanel.java b/src/main/java/de/cismet/commons/gui/equalizer/EqualizerPanel.java
index 6bff117..f700a69 100644
--- a/src/main/java/de/cismet/commons/gui/equalizer/EqualizerPanel.java
+++ b/src/main/java/de/cismet/commons/gui/equalizer/EqualizerPanel.java
@@ -1,1003 +1,1003 @@
/***************************************************
*
* cismet GmbH, Saarbruecken, Germany
*
* ... and it just works.
*
****************************************************/
package de.cismet.commons.gui.equalizer;
import org.openide.util.WeakListeners;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.Paint;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.Stroke;
import java.awt.font.FontRenderContext;
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D.Double;
import java.awt.geom.Rectangle2D;
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.Comparator;
import java.util.TreeMap;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSlider;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
import javax.swing.plaf.SliderUI;
import javax.swing.plaf.basic.BasicSliderUI;
/**
* This component is a view to an {@link EqualizerModel}. It displays the different categories of the model using
* sliders which can be used to adjust the value of the respective category. Optionally, the range of the model can be
* visualised right next to the slider group and a spline graph can be drawn to connect all the slider knobs of the
* categories to visually indicate their togetherness.
*
* @author [email protected]
* @version 1.0
*/
public class EqualizerPanel extends javax.swing.JPanel {
//~ Static fields/initializers ---------------------------------------------
/** The default paint used for the spline, a pastel greenish tone. */
public static final Paint DEFAULT_PAINT;
/** The default stroke used for the spline, a dashed line, 3 pixels wide. */
public static final Stroke DEFAULT_STROKE;
private static final String PROP_MODEL_INDEX;
static {
// cannot use single integer because java only supports 31-bit integers (32nd bit is for sign indication)
DEFAULT_PAINT = new Color(Integer.decode("0x17"), // NOI18N
Integer.decode("0xA8"), // NOI18N
Integer.decode("0x14"), // NOI18N
Integer.decode("0xDD")); // NOI18N
DEFAULT_STROKE = new BasicStroke(3, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10, new float[] { 7, 3 }, 0);
PROP_MODEL_INDEX = "__prop_model_index__"; // NOI18N
}
//~ Instance fields --------------------------------------------------------
private final EqualizerModelListener equalizerModelL;
private final ChangeListener sliderChangeL;
private EqualizerModel model;
private TreeMap<Integer, JSlider> sliderMap;
private boolean updateInProgress;
private Paint splinePaint;
private Stroke splineStroke;
private boolean rangeAxisPainted;
private boolean splinePainted;
private boolean updateSplineWhileAdjusting;
private boolean updateModelWhileAdjusting;
private JLabel lblRangeAxis;
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel pnlEqualizer;
// End of variables declaration//GEN-END:variables
//~ Constructors -----------------------------------------------------------
/**
* Creates a new EqualizerPanel object using:
*
* <ul>
* <li>a single category model</li>
* <li>splinePaint=<code>DEFAULT_PAINT</code></li>
* <li>splineStroke=<code>DEFAULT_STROKE</code></li>
* <li>splinePainted=<code>true</code></li>
* <li>rangeAxisName= <code>null</code></li>
* <li>rangeAxisPainted= <code>true</code></li>
* <li>updateModelWhileAdjusting= <code>false</code></li>
* <li>updateSplineWhileAdjusting= <code>true</code></li>
* </ul>
*
* @throws IllegalArgumentException DOCUMENT ME!
*
* @see EqualizerPanel(de.cismet.commons.gui.equalizer.EqualizerModel, java.awt.Paint, java.awt.Stroke, boolean,
* java.lang.String, boolean, boolean, boolean)
*/
public EqualizerPanel() {
this(
new EqualizerModel() {
private final EventListenerList list = new EventListenerList();
private final int[] value = new int[1];
@Override
public Range getRange() {
return new Range(0, 10);
}
@Override
public String getEqualizerCategory(final int index) {
return "EQ1"; // NOI18N
}
@Override
public int getEqualizerCategoryCount() {
return 1;
}
@Override
public int getValueAt(final int index) {
return value[index];
}
@Override
public void setValueAt(final int index, final int value) {
if ((value < 0) || (value > 10)) {
throw new IllegalArgumentException("value out of range: " + value); // NOI18N
}
final int oldValue = this.value[index];
this.value[index] = value;
for (final Object o : list.getListeners(EqualizerModelListener.class)) {
((EqualizerModelListener)o).equalizerChanged(
new EqualizerModelEvent(this, index, oldValue, value));
}
}
@Override
public void addEqualizerModelListener(final EqualizerModelListener eml) {
list.add(EqualizerModelListener.class, eml);
}
@Override
public void removeEqualizerModelListener(final EqualizerModelListener eml) {
list.remove(EqualizerModelListener.class, eml);
}
},
DEFAULT_PAINT,
DEFAULT_STROKE,
true,
null,
true,
false,
true);
}
/**
* Creates a new EqualizerPanel object from the provided <code>EqualizerModel</code> using:
*
* <ul>
* <li>splinePaint=<code>DEFAULT_PAINT</code></li>
* <li>splineStroke=<code>DEFAULT_STROKE</code></li>
* <li>splinePainted=<code>true</code></li>
* <li>rangeAxisName= <code>null</code></li>
* <li>rangeAxisPainted= <code>true</code></li>
* <li>updateModelWhileAdjusting= <code>false</code></li>
* <li>updateSplineWhileAdjusting= <code>true</code></li>
* </ul>
*
* @param model the underlying <code>EqualizerModel</code>
*
* @see EqualizerPanel(de.cismet.commons.gui.equalizer.EqualizerModel, java.awt.Paint, java.awt.Stroke, boolean,
* java.lang.String, boolean, boolean, boolean)
*/
public EqualizerPanel(final EqualizerModel model) {
this(model, DEFAULT_PAINT, DEFAULT_STROKE, true, null, true, false, true);
}
/**
* Creates a new EqualizerPanel object.
*
* @param model the underlying <code>EqualizerModel</code>
* @param splinePaint the paint for the spline
* @param splineStroke the stroke for the spline
* @param splinePainted if the spline is painted at all
* @param rangeAxisName the name of the range axis
* @param rangeAxisPainted if the range axis is painted at all
* @param updateModelWhileAdjusting if updates are sent to the model while the user is adjusting the value
* @param updateSplineWhileAdjusting if the spline is updated while the user is adjusting the value
*/
public EqualizerPanel(final EqualizerModel model,
final Paint splinePaint,
final Stroke splineStroke,
final boolean splinePainted,
final String rangeAxisName,
final boolean rangeAxisPainted,
final boolean updateModelWhileAdjusting,
final boolean updateSplineWhileAdjusting) {
this.equalizerModelL = new EqualizerModelL();
this.sliderChangeL = new SliderChangeL();
this.updateInProgress = false;
initComponents();
// we don't use the setter since there is nothing to check and we don't want to createComponents twice
this.updateModelWhileAdjusting = updateModelWhileAdjusting;
this.updateSplineWhileAdjusting = updateSplineWhileAdjusting;
this.splinePainted = splinePainted;
this.rangeAxisPainted = rangeAxisPainted;
this.lblRangeAxis = new JLabel(rangeAxisName);
this.lblRangeAxis.setOpaque(false);
setModel(model);
setSplinePaint(splinePaint);
setSplineStroke(splineStroke);
}
//~ Methods ----------------------------------------------------------------
/**
* Getter for the current <code>EqualizerModel.</code>
*
* @return the current <code>EqualizerModel</code>
*/
public EqualizerModel getModel() {
return model;
}
/**
* Sets a new <code>EqualizerModel.</code>
*
* @param model the new model
*
* @throws IllegalArgumentException if the model is <code>null</code>
*/
public final void setModel(final EqualizerModel model) {
if (model == null) {
throw new IllegalArgumentException("model must not be null"); // NOI18N
}
if (this.model != model) {
this.model = model;
this.model.addEqualizerModelListener(WeakListeners.create(
EqualizerModelListener.class,
equalizerModelL,
this.model));
recreateComponents();
}
}
/**
* Indicates if the spline is painted or not.
*
* @return if the spline is painted or not
*/
public boolean isSplinePainted() {
return splinePainted;
}
/**
* Sets if the spline is painted or not.
*
* @param splinePainted if the spline is painted or not
*/
public void setSplinePainted(final boolean splinePainted) {
this.splinePainted = splinePainted;
repaint();
}
/**
* Getter for the current spline paint.
*
* @return the current spline paint
*/
public Paint getSplinePaint() {
return splinePaint;
}
/**
* Sets the new spline paint.
*
* @param splinePaint the new spline paint
*
* @throws IllegalArgumentException if the spline paint is <code>null</code>
*/
public final void setSplinePaint(final Paint splinePaint) {
if (splinePaint == null) {
throw new IllegalArgumentException("splinePaint must not be null"); // NOI18N
}
this.splinePaint = splinePaint;
repaint();
}
/**
* Getter for the current spline stroke.
*
* @return the current spline stroke
*/
public Stroke getSplineStroke() {
return splineStroke;
}
/**
* Sets the new spline stroke.
*
* @param splineStroke the new spline stroke
*
* @throws IllegalArgumentException if the spline stroke is <code>null</code>
*/
public final void setSplineStroke(final Stroke splineStroke) {
if (splineStroke == null) {
throw new IllegalArgumentException("splineStroke must not be null"); // NOI18N
}
this.splineStroke = splineStroke;
repaint();
}
/**
* Indicates if the range axis is painted or not.
*
* @return if the range axis is painted or not.
*/
public boolean isRangeAxisPainted() {
return rangeAxisPainted;
}
/**
* Sets if the range axis is painted or not.
*
* @param rangeAxisPainted paint the range axis of not
*/
public final void setRangeAxisPainted(final boolean rangeAxisPainted) {
if (this.rangeAxisPainted != rangeAxisPainted) {
this.rangeAxisPainted = rangeAxisPainted;
recreateComponents();
}
}
/**
* Getter for the current range axis name.
*
* @return the current range axis name
*/
public String getRangeAxisName() {
return lblRangeAxis.getText();
}
/**
* Sets the new range axis name.
*
* @param rangeAxisName the new range axis name
*/
public final void setRangeAxisName(final String rangeAxisName) {
this.lblRangeAxis.setText(rangeAxisName);
}
/**
* Whether or not the model is updated while the user is adjusting a slider value.
*
* @return whether or not the model is updated while the user is adjusting a slider value
*
* @see JSlider#getValueIsAdjusting()
*/
public boolean isUpdateModelWhileAdjusting() {
return updateModelWhileAdjusting;
}
/**
* Through this setter one can control if user interaction with a slider will constantly update the model while the
* user is still choosing the new slider value.
*
* @param updateModelWhileAdjusting whether or not update the model while adjusting
*
* @see JSlider#getValueIsAdjusting()
*/
public void setUpdateModelWhileAdjusting(final boolean updateModelWhileAdjusting) {
this.updateModelWhileAdjusting = updateModelWhileAdjusting;
}
/**
* Whether or not the spline curve will reflect the user's adjusting activity.
*
* @return whether or not the spline curve will reflect the user's adjusting activity
*/
public boolean isUpdateSplineWhileAdjusting() {
return updateSplineWhileAdjusting;
}
/**
* Through this setter one can control if the user interaction with a slider will constantly update the spline curve
* while the user is still choosing the new slider value.
*
* @param updateSplineWhileAdjusting whether or not update the spline curve while adjusting
*/
public void setUpdateSplineWhileAdjusting(final boolean updateSplineWhileAdjusting) {
this.updateSplineWhileAdjusting = updateSplineWhileAdjusting;
}
/**
* DOCUMENT ME!
*/
private void recreateComponents() {
createComponents();
invalidate();
validate();
// strangely the spline is not correctly painted after these steps and calling repaint directly does not help
// only if the repaint is invoked later than the commands above it renders correctly
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
repaint();
}
});
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private JPanel createRangeComponent() {
final JPanel panel = new JPanel(new GridBagLayout());
panel.setOpaque(false);
// TODO: support for rotating the label text
final JPanel rangePanel = new RangePanel();
final GridBagConstraints rangeConstraints = new GridBagConstraints(
0,
0,
1,
1,
0,
1,
GridBagConstraints.SOUTH,
GridBagConstraints.VERTICAL,
new Insets(5, 5, 5, 5),
0,
0);
final GridBagConstraints labelConstraints = new GridBagConstraints(
0,
1,
1,
1,
0,
0,
GridBagConstraints.NORTH,
GridBagConstraints.HORIZONTAL,
new Insets(5, 5, 5, 5),
0,
0);
panel.add(rangePanel, rangeConstraints);
panel.add(lblRangeAxis, labelConstraints);
return panel;
}
/**
* DOCUMENT ME!
*/
private void createComponents() {
sliderMap = new TreeMap<Integer, JSlider>(new Comparator<Integer>() {
@Override
public int compare(final Integer o1, final Integer o2) {
return o1.compareTo(o2);
}
});
pnlEqualizer.removeAll();
final GridBagConstraints baseConstraints = new GridBagConstraints(
0,
0,
1,
1,
0,
1,
GridBagConstraints.SOUTH,
GridBagConstraints.VERTICAL,
new Insets(5, 5, 5, 5),
0,
0);
if (rangeAxisPainted) {
final JPanel scaleComp = createRangeComponent();
final GridBagConstraints constraints = (GridBagConstraints)baseConstraints.clone();
pnlEqualizer.add(scaleComp, constraints);
}
for (int i = 0; i < model.getEqualizerCategoryCount(); ++i) {
final JPanel sliderComp = createSliderComponent(i);
final GridBagConstraints constraints = (GridBagConstraints)baseConstraints.clone();
// we start to add it at index one in case of scale is available
constraints.gridx = i + 1;
pnlEqualizer.add(sliderComp, constraints);
}
pnlEqualizer.repaint();
}
/**
* DOCUMENT ME!
*
* @param index category DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private JPanel createSliderComponent(final int index) {
final JPanel panel = new JPanel(new GridBagLayout());
panel.setOpaque(false);
final JLabel label = new JLabel(model.getEqualizerCategory(index));
label.setOpaque(false);
// TODO: support for rotating the label text
final JSlider slider = new JSlider(JSlider.VERTICAL);
slider.setOpaque(false);
slider.setMinimum(model.getRange().getMin());
slider.setMaximum(model.getRange().getMax());
slider.setValue(model.getValueAt(index));
slider.putClientProperty(PROP_MODEL_INDEX, index);
slider.addChangeListener(WeakListeners.change(sliderChangeL, slider));
sliderMap.put(index, slider);
final GridBagConstraints sliderConstraints = new GridBagConstraints(
0,
0,
1,
1,
0,
1,
GridBagConstraints.SOUTH,
GridBagConstraints.VERTICAL,
new Insets(5, 5, 5, 5),
0,
0);
final GridBagConstraints labelConstraints = new GridBagConstraints(
0,
1,
1,
1,
0,
0,
GridBagConstraints.NORTH,
GridBagConstraints.HORIZONTAL,
new Insets(5, 5, 5, 5),
0,
0);
panel.add(slider, sliderConstraints);
panel.add(label, labelConstraints);
return panel;
}
/**
* 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() {
final java.awt.GridBagConstraints gridBagConstraints;
pnlEqualizer = new SplinePanel();
setLayout(new java.awt.GridBagLayout());
pnlEqualizer.setOpaque(false);
pnlEqualizer.setLayout(new java.awt.GridBagLayout());
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.weighty = 1.0;
add(pnlEqualizer, gridBagConstraints);
} // </editor-fold>//GEN-END:initComponents
//~ Inner Classes ----------------------------------------------------------
/**
* DOCUMENT ME!
*
* @version $Revision$, $Date$
*/
private final class SplinePanel extends JPanel {
//~ Instance fields ----------------------------------------------------
// the fallback is used if the retrieval of the slider knob position has failed only once
private boolean useSliderKnobPositionFallback;
private Double[] currentPoints;
//~ Constructors -------------------------------------------------------
/**
* Creates a new SplinePanel object.
*/
public SplinePanel() {
this.setOpaque(false);
this.useSliderKnobPositionFallback = false;
this.currentPoints = null;
}
//~ Methods ------------------------------------------------------------
@Override
protected void paintComponent(final Graphics g) {
super.paintComponent(g);
- if (!splinePainted) {
+ if (!splinePainted || model.getEqualizerCategoryCount() < 2) {
// nothing to do, bail out
return;
}
final Collection<JSlider> sliders = sliderMap.values();
Double[] p = new Double[sliders.size()];
int i = 0;
boolean isAdjusting = false;
for (final JSlider s : sliderMap.values()) {
if (!updateSplineWhileAdjusting && s.getValueIsAdjusting()) {
isAdjusting = true;
break;
}
final Point handle = new Point();
// hack to get position of the knob
final SliderUI sui = s.getUI();
if (!useSliderKnobPositionFallback && (sui instanceof BasicSliderUI)) {
final BasicSliderUI bui = (BasicSliderUI)sui;
Field field = null;
Boolean accessible = null;
try {
field = BasicSliderUI.class.getDeclaredField("thumbRect"); // NOI18N
accessible = field.isAccessible();
field.setAccessible(true);
final Rectangle r = (Rectangle)field.get(bui);
final Point loc = r.getLocation();
handle.x = loc.x + (r.width / 2);
handle.y = loc.y + (r.height / 2);
} catch (final Exception e) {
useSliderKnobPositionFallback = true;
} finally {
if ((field != null) && (accessible != null)) {
field.setAccessible(accessible);
}
}
} else {
useSliderKnobPositionFallback = true;
}
if (useSliderKnobPositionFallback) {
// calculate position using slider value which is most likely inaccurate for y location
final int min = s.getMinimum();
final int max = s.getMaximum();
final int val = s.getValue();
final Dimension sliderSize = s.getSize();
handle.x = sliderSize.width / 2;
// slider percentage from upper bound (reversed)
final double sliderPercentage = 1 - (val / (double)(max - min));
// assume offset because of shape of knob and internal insets
final double offset = 13 * (1 - (2 * sliderPercentage));
handle.y = (int)((sliderSize.height * sliderPercentage) + offset);
}
final Point rel = SwingUtilities.convertPoint(s, handle, this);
p[i] = new Double(rel.x, rel.y);
i++;
}
if (isAdjusting) {
p = currentPoints;
}
final Double[] p1 = new Double[p.length - 1];
final Double[] p2 = new Double[p.length - 1];
calculateControlPoints(p, p1, p2);
final Graphics2D g2 = (Graphics2D)g.create();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
final GeneralPath path = new GeneralPath();
path.moveTo(p[0].x, p[0].y);
for (i = 0; i < p1.length; ++i) {
path.curveTo(p1[i].x, p1[i].y, p2[i].x, p2[i].y, p[i + 1].x, p[i + 1].y);
}
g2.setPaint(splinePaint);
g2.setStroke(splineStroke);
g2.draw(path);
g2.dispose();
currentPoints = p;
}
/**
* Algorithm from
* {@link http://www.codeproject.com/Articles/31859/Draw-a-Smooth-Curve-through-a-Set-of-2D-Points-wit}.
*
* @param p DOCUMENT ME!
* @param p1 DOCUMENT ME!
* @param p2 DOCUMENT ME!
*
* @throws IllegalArgumentException DOCUMENT ME!
* @throws IllegalStateException DOCUMENT ME!
*/
private void calculateControlPoints(final Double[] p, final Double[] p1, final Double[] p2) {
if (p == null) {
throw new IllegalArgumentException("points must not be null"); // NOI18N
} else if (p1 == null) {
throw new IllegalArgumentException("p1 must not be null"); // NOI18N
} else if (p2 == null) {
throw new IllegalArgumentException("p2 must not be null"); // NOI18N
}
final int n = p.length - 1;
if (n == 0) {
throw new IllegalStateException(
"at least two points must be available to calculate control points for"); // NOI18N
} else if (p1.length != n) {
throw new IllegalStateException("p1 must have length of " + n + ", but is " + p1.length); // NOI18N
} else if (p2.length != n) {
throw new IllegalStateException("p2 must have length of " + n + ", but is " + p1.length); // NOI18N
}
// straight line
if (n == 1) {
p1[0].x = ((2 * p[0].x) + p[1].x) / 3;
p1[0].y = ((2 * p[0].y) + p[1].y) / 3;
p2[0].x = (2 * p1[0].x) - p[0].x;
p2[0].y = (2 * p1[0].y) - p[0].y;
} else {
final double[] rhs = new double[n];
// x vals
rhs[0] = p[0].x + (2 * p[1].x);
for (int i = 1; i < (n - 1); ++i) {
rhs[i] = (4 * p[i].x) + (2 * p[i + 1].x);
}
rhs[n - 1] = ((8 * p[n - 1].x) + p[n].x) / 2.0;
final double[] x1 = getFirstControlPoints(rhs);
// y vals
rhs[0] = p[0].y + (2 * p[1].y);
for (int i = 1; i < (n - 1); ++i) {
rhs[i] = (4 * p[i].y) + (2 * p[i + 1].y);
}
rhs[n - 1] = ((8 * p[n - 1].y) + p[n].y) / 2.0;
final double[] y1 = getFirstControlPoints(rhs);
for (int i = 0; i < n; ++i) {
p1[i] = new Double(x1[i], y1[i]);
final double x2;
final double y2;
if (i < (n - 1)) {
x2 = (2 * p[i + 1].x) - x1[i + 1];
y2 = (2 * p[i + 1].y) - y1[i + 1];
} else {
x2 = (p[n].x + x1[n - 1]) / 2.0;
y2 = (p[n].y + y1[n - 1]) / 2.0;
}
p2[i] = new Double(x2, y2);
}
}
}
/**
* DOCUMENT ME!
*
* @param rhs DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private double[] getFirstControlPoints(final double[] rhs) {
final int n = rhs.length;
final double[] x = new double[n];
final double[] tmp = new double[n];
double b = 2.0;
x[0] = rhs[0] / b;
for (int i = 1; i < n; ++i) {
tmp[i] = 1 / b;
b = ((i < (n - 1)) ? 4.0 : 3.5) - tmp[i];
x[i] = (rhs[i] - x[i - 1]) / b;
}
for (int i = 1; i < n; ++i) {
x[n - i - 1] -= tmp[n - i] * x[n - i];
}
return x;
}
}
/**
* DOCUMENT ME!
*
* @version $Revision$, $Date$
*/
private final class RangePanel extends JPanel {
//~ Static fields/initializers -----------------------------------------
private static final int INSETS_WIDTH = 5;
private static final int STROKE_WIDTH = 3;
private static final int MAJOR_TICK_WIDTH = 10;
private static final int MINOR_TICK_WIDTH = 7;
private static final int TEXT_GAP_WIDTH = 8;
//~ Instance fields ----------------------------------------------------
private boolean useSliderTrackRectangleFallback;
//~ Constructors -------------------------------------------------------
/**
* Creates a new ScalePanel object.
*/
public RangePanel() {
this.setOpaque(false);
this.useSliderTrackRectangleFallback = false;
final Font font = this.getFont().deriveFont(10f);
final FontRenderContext frc = new FontRenderContext(font.getTransform(), true, true);
final Rectangle2D maxBounds = font.getStringBounds(String.valueOf(model.getRange().getMax()), frc);
final Rectangle2D minBounds = font.getStringBounds(String.valueOf(model.getRange().getMin()), frc);
final int minX1 = INSETS_WIDTH + (int)maxBounds.getWidth() + TEXT_GAP_WIDTH + MAJOR_TICK_WIDTH
+ INSETS_WIDTH;
final int minX2 = INSETS_WIDTH + (int)minBounds.getWidth() + TEXT_GAP_WIDTH + MAJOR_TICK_WIDTH
+ INSETS_WIDTH;
final int minX = Math.max(minX1, minX2);
final int minY = INSETS_WIDTH + (int)maxBounds.getHeight() + TEXT_GAP_WIDTH + (int)minBounds.getHeight()
+ INSETS_WIDTH;
this.setMinimumSize(new Dimension(minX, minY));
this.setPreferredSize(new Dimension(minX, minY));
this.setFont(font);
}
//~ Methods ------------------------------------------------------------
@Override
protected void paintComponent(final Graphics g) {
super.paintComponent(g);
final JSlider slider = sliderMap.values().iterator().next();
final SliderUI sui = slider.getUI();
final Dimension size = getSize();
int upperY = 0;
int lowerY = 0;
if (!useSliderTrackRectangleFallback && (sui instanceof BasicSliderUI)) {
final BasicSliderUI bui = (BasicSliderUI)sui;
Field field = null;
Boolean accessible = null;
try {
field = BasicSliderUI.class.getDeclaredField("trackRect"); // NOI18N
accessible = field.isAccessible();
field.setAccessible(true);
final Rectangle r = (Rectangle)field.get(bui);
upperY = r.getLocation().y;
lowerY = upperY + (int)r.getHeight();
} catch (final Exception e) {
useSliderTrackRectangleFallback = true;
} finally {
if ((field != null) && (accessible != null)) {
field.setAccessible(accessible);
}
}
} else {
useSliderTrackRectangleFallback = true;
}
if (useSliderTrackRectangleFallback) {
// assume offset because of internal insets
upperY = 13;
lowerY = size.height - 13;
}
final int midY = ((lowerY - upperY) / 2) + upperY;
final int rangeLineX = size.width - INSETS_WIDTH - STROKE_WIDTH;
final int majorTickX = rangeLineX - MAJOR_TICK_WIDTH;
final int minorTickX = rangeLineX - MINOR_TICK_WIDTH;
// baseline of text on the lower boundary of the tick line
final int upperRangeY = upperY + STROKE_WIDTH;
final int lowerRangeY = lowerY + STROKE_WIDTH;
final int midRangeY = midY + STROKE_WIDTH;
final int rangeMin = model.getRange().getMin();
final int rangeMax = model.getRange().getMax();
final int rangeMid = (rangeMax + rangeMin) / 2;
// TODO: nicer rendering
final Graphics2D g2 = (Graphics2D)g.create();
g2.setStroke(new BasicStroke(STROKE_WIDTH, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER));
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2.drawLine(rangeLineX, upperY, rangeLineX, lowerY);
g2.drawLine(majorTickX, upperY, rangeLineX, upperY);
g2.drawLine(majorTickX, lowerY, rangeLineX, lowerY);
g2.drawLine(minorTickX, midY, rangeLineX, midY);
g2.drawString(String.valueOf(rangeMax), INSETS_WIDTH, upperRangeY);
g2.drawString(String.valueOf(rangeMin), INSETS_WIDTH, lowerRangeY);
g2.drawString(String.valueOf(rangeMid), INSETS_WIDTH, midRangeY);
g2.dispose();
}
}
/**
* DOCUMENT ME!
*
* @version 1.0
*/
private final class SliderChangeL implements ChangeListener {
//~ Methods ------------------------------------------------------------
@Override
public void stateChanged(final ChangeEvent e) {
if (!updateInProgress) {
pnlEqualizer.repaint();
final JSlider slider = (JSlider)e.getSource();
if (updateModelWhileAdjusting || !slider.getValueIsAdjusting()) {
final int index = (Integer)slider.getClientProperty(PROP_MODEL_INDEX);
model.setValueAt(index, slider.getValue());
}
}
}
}
/**
* DOCUMENT ME!
*
* @version 1.0
*/
private final class EqualizerModelL implements EqualizerModelListener {
//~ Methods ------------------------------------------------------------
@Override
public void equalizerChanged(final EqualizerModelEvent event) {
if ((event.getSource() == model)) {
updateInProgress = true;
try {
if (event.getIndex() < 0) {
// full update
for (int i = 0; i < model.getEqualizerCategoryCount(); ++i) {
sliderMap.get(i).setValue(model.getValueAt(i));
}
} else {
final JSlider slider = sliderMap.get(event.getIndex());
final int newValue = event.getNewValue();
if (slider.getValue() != newValue) {
slider.setValue(newValue);
}
}
} finally {
updateInProgress = false;
}
}
}
}
}
| true | true | protected void paintComponent(final Graphics g) {
super.paintComponent(g);
if (!splinePainted) {
// nothing to do, bail out
return;
}
final Collection<JSlider> sliders = sliderMap.values();
Double[] p = new Double[sliders.size()];
int i = 0;
boolean isAdjusting = false;
for (final JSlider s : sliderMap.values()) {
if (!updateSplineWhileAdjusting && s.getValueIsAdjusting()) {
isAdjusting = true;
break;
}
final Point handle = new Point();
// hack to get position of the knob
final SliderUI sui = s.getUI();
if (!useSliderKnobPositionFallback && (sui instanceof BasicSliderUI)) {
final BasicSliderUI bui = (BasicSliderUI)sui;
Field field = null;
Boolean accessible = null;
try {
field = BasicSliderUI.class.getDeclaredField("thumbRect"); // NOI18N
accessible = field.isAccessible();
field.setAccessible(true);
final Rectangle r = (Rectangle)field.get(bui);
final Point loc = r.getLocation();
handle.x = loc.x + (r.width / 2);
handle.y = loc.y + (r.height / 2);
} catch (final Exception e) {
useSliderKnobPositionFallback = true;
} finally {
if ((field != null) && (accessible != null)) {
field.setAccessible(accessible);
}
}
} else {
useSliderKnobPositionFallback = true;
}
if (useSliderKnobPositionFallback) {
// calculate position using slider value which is most likely inaccurate for y location
final int min = s.getMinimum();
final int max = s.getMaximum();
final int val = s.getValue();
final Dimension sliderSize = s.getSize();
handle.x = sliderSize.width / 2;
// slider percentage from upper bound (reversed)
final double sliderPercentage = 1 - (val / (double)(max - min));
// assume offset because of shape of knob and internal insets
final double offset = 13 * (1 - (2 * sliderPercentage));
handle.y = (int)((sliderSize.height * sliderPercentage) + offset);
}
final Point rel = SwingUtilities.convertPoint(s, handle, this);
p[i] = new Double(rel.x, rel.y);
i++;
}
if (isAdjusting) {
p = currentPoints;
}
final Double[] p1 = new Double[p.length - 1];
final Double[] p2 = new Double[p.length - 1];
calculateControlPoints(p, p1, p2);
final Graphics2D g2 = (Graphics2D)g.create();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
final GeneralPath path = new GeneralPath();
path.moveTo(p[0].x, p[0].y);
for (i = 0; i < p1.length; ++i) {
path.curveTo(p1[i].x, p1[i].y, p2[i].x, p2[i].y, p[i + 1].x, p[i + 1].y);
}
g2.setPaint(splinePaint);
g2.setStroke(splineStroke);
g2.draw(path);
g2.dispose();
currentPoints = p;
}
| protected void paintComponent(final Graphics g) {
super.paintComponent(g);
if (!splinePainted || model.getEqualizerCategoryCount() < 2) {
// nothing to do, bail out
return;
}
final Collection<JSlider> sliders = sliderMap.values();
Double[] p = new Double[sliders.size()];
int i = 0;
boolean isAdjusting = false;
for (final JSlider s : sliderMap.values()) {
if (!updateSplineWhileAdjusting && s.getValueIsAdjusting()) {
isAdjusting = true;
break;
}
final Point handle = new Point();
// hack to get position of the knob
final SliderUI sui = s.getUI();
if (!useSliderKnobPositionFallback && (sui instanceof BasicSliderUI)) {
final BasicSliderUI bui = (BasicSliderUI)sui;
Field field = null;
Boolean accessible = null;
try {
field = BasicSliderUI.class.getDeclaredField("thumbRect"); // NOI18N
accessible = field.isAccessible();
field.setAccessible(true);
final Rectangle r = (Rectangle)field.get(bui);
final Point loc = r.getLocation();
handle.x = loc.x + (r.width / 2);
handle.y = loc.y + (r.height / 2);
} catch (final Exception e) {
useSliderKnobPositionFallback = true;
} finally {
if ((field != null) && (accessible != null)) {
field.setAccessible(accessible);
}
}
} else {
useSliderKnobPositionFallback = true;
}
if (useSliderKnobPositionFallback) {
// calculate position using slider value which is most likely inaccurate for y location
final int min = s.getMinimum();
final int max = s.getMaximum();
final int val = s.getValue();
final Dimension sliderSize = s.getSize();
handle.x = sliderSize.width / 2;
// slider percentage from upper bound (reversed)
final double sliderPercentage = 1 - (val / (double)(max - min));
// assume offset because of shape of knob and internal insets
final double offset = 13 * (1 - (2 * sliderPercentage));
handle.y = (int)((sliderSize.height * sliderPercentage) + offset);
}
final Point rel = SwingUtilities.convertPoint(s, handle, this);
p[i] = new Double(rel.x, rel.y);
i++;
}
if (isAdjusting) {
p = currentPoints;
}
final Double[] p1 = new Double[p.length - 1];
final Double[] p2 = new Double[p.length - 1];
calculateControlPoints(p, p1, p2);
final Graphics2D g2 = (Graphics2D)g.create();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
final GeneralPath path = new GeneralPath();
path.moveTo(p[0].x, p[0].y);
for (i = 0; i < p1.length; ++i) {
path.curveTo(p1[i].x, p1[i].y, p2[i].x, p2[i].y, p[i + 1].x, p[i + 1].y);
}
g2.setPaint(splinePaint);
g2.setStroke(splineStroke);
g2.draw(path);
g2.dispose();
currentPoints = p;
}
|
diff --git a/src/main/java/com/griefcraft/modules/doors/DoorsModule.java b/src/main/java/com/griefcraft/modules/doors/DoorsModule.java
index dd5ddf04..3e5e5de2 100644
--- a/src/main/java/com/griefcraft/modules/doors/DoorsModule.java
+++ b/src/main/java/com/griefcraft/modules/doors/DoorsModule.java
@@ -1,281 +1,281 @@
/*
* Copyright 2011 Tyler Blair. 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.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and contributors and should not be interpreted as representing official policies,
* either expressed or implied, of anybody else.
*/
package com.griefcraft.modules.doors;
import com.griefcraft.lwc.LWC;
import com.griefcraft.model.Protection;
import com.griefcraft.scripting.JavaModule;
import com.griefcraft.scripting.event.LWCProtectionInteractEvent;
import com.griefcraft.util.config.Configuration;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
public class DoorsModule extends JavaModule {
/**
* The amount of server ticks there usually are per second
*/
private final static int TICKS_PER_SECOND = 20;
/**
* The course of action for opening doors
*/
private enum Action {
/**
* The door should automatically open and then close
*/
OPEN_AND_CLOSE,
/**
* The doors should just be opened, not closed after a set amount of time
*/
TOGGLE;
/**
* Resolve an Action using its case insensitive name
*
* @param name
* @return
*/
public static Action resolve(String name) {
for (Action action : values()) {
if (action.toString().equalsIgnoreCase(name)) {
return action;
}
}
return null;
}
}
/**
* The configuration file
*/
private final Configuration configuration = Configuration.load("doors.yml");
/**
* The LWC object, set by load ()
*/
private LWC lwc;
/**
* The current action to use, default to toggling the door open and closed
*/
private Action action = Action.TOGGLE;
@Override
public void load(LWC lwc) {
this.lwc = lwc;
loadAction();
}
@Override
public void onProtectionInteract(LWCProtectionInteractEvent event) {
if (event.getResult() == Result.CANCEL || !isEnabled()) {
return;
}
// The more important check
if (!event.canAccess()) {
return;
}
Protection protection = event.getProtection();
Block block = event.getEvent().getClickedBlock(); // The block they actually clicked :)
// Check if the block is even something that should be opened
if (!isValid(block.getType())) {
return;
}
// Are we looking at the top half?
// If we are, we need to get the bottom half instead
if ((block.getData() & 0x8) == 0x8) {
// Inspect the bottom half instead, fool!
block = block.getRelative(BlockFace.DOWN);
}
// Should we look for double doors?
boolean doubleDoors = usingDoubleDoors();
// The BOTTOM half of the other side of the double door
Block doubleDoorBlock = null;
// Only waste CPU if we need the double door block
if (doubleDoors) {
doubleDoorBlock = getDoubleDoor(block);
}
// Either way we are going to be toggling the door open
// So toggle both doors to be open. We can safely pass null values to changeDoorStates
- changeDoorStates(true, (block.getType() == Material.WOODEN_DOOR ? null : block) /* They clicked it so it auto opens already */,
+ changeDoorStates(true, ((block.getType() == Material.WOODEN_DOOR || block.getType() == Material.FENCE_GATE) ? null : block) /* They clicked it so it auto opens already */,
doubleDoorBlock);
if (action == Action.OPEN_AND_CLOSE) {
// Abuse the fact that we still use final variables inside the task
// The double door block object is initially only assigned if we need
// it, so we just create a second variable ^^
final Block finalBlock = block;
final Block finalDoubleDoorBlock = doubleDoorBlock;
// Calculate the wait time
// This is basically Interval * TICKS_PER_SECOND
int wait = getAutoCloseInterval() * TICKS_PER_SECOND;
// Create the task
// If we are set to close the door after a set period, let's create a sync task for it
lwc.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(lwc.getPlugin(), new Runnable() {
public void run() {
// Essentially all we need to do is reset the door states
// But DO NOT open the door if it's closed !
changeDoorStates(false, finalBlock, finalDoubleDoorBlock);
}
}, wait);
}
}
/**
* Change all of the given door states to be inverse; that is, if a door is open, it will be closed afterwards.
* If the door is closed, it will become open.
* <p/>
* Note that the blocks given must be the bottom block of the door.
*
* @param allowDoorToOpen If FALSE, and the door is currently CLOSED, it will NOT be opened!
* @param doors Blocks given must be the bottom block of the door
*/
private void changeDoorStates(boolean allowDoorToOpen, Block... doors) {
for (Block door : doors) {
if (door == null) {
continue;
}
// If we aren't allowing the door to open, check if it's already closed
if (!allowDoorToOpen && (door.getData() & 0x4) == 0) {
// The door is already closed and we don't want to open it
// the bit 0x4 is set when the door is open
continue;
}
// Get the top half of the door
Block topHalf = door.getRelative(BlockFace.UP);
// Now xor both data values with 0x8, the flag that states if the door is open
door.setData((byte) (door.getData() ^ 0x4));
// Only change the block above it if it is something we can open or close
if (isValid(topHalf.getType())) {
topHalf.setData((byte) (topHalf.getData() ^ 0x4));
}
}
}
/**
* Get the double door for the given block
*
* @param block
* @return
*/
private Block getDoubleDoor(Block block) {
if (!isValid(block.getType())) {
return null;
}
Block found;
// Try a wooden door
if ((found = lwc.findAdjacentBlock(block, Material.WOODEN_DOOR)) != null) {
return found;
}
// Now an iron door
if ((found = lwc.findAdjacentBlock(block, Material.IRON_DOOR_BLOCK)) != null) {
return found;
}
// Nothing at all :-(
return null;
}
/**
* Check if automatic door opening is enabled
*
* @return
*/
public boolean isEnabled() {
return configuration.getBoolean("doors.enabled", true);
}
/**
* Check if the material is auto openable/closable
*
* @param material
* @return
*/
private boolean isValid(Material material) {
return material == Material.IRON_DOOR_BLOCK || material == Material.WOODEN_DOOR || material == Material.FENCE_GATE;
}
/**
* Get the amount of seconds after opening a door it should be closed
*
* @return
*/
private int getAutoCloseInterval() {
return configuration.getInt("doors.interval", 3);
}
/**
* Get if we are allowing double doors to be used
*
* @return
*/
private boolean usingDoubleDoors() {
return configuration.getBoolean("doors.doubleDoors", true);
}
/**
* Load the action from the configuration
*/
private void loadAction() {
String strAction = configuration.getString("doors.action");
if (strAction.equalsIgnoreCase("openAndClose")) {
this.action = Action.OPEN_AND_CLOSE;
} else {
this.action = Action.TOGGLE;
}
}
}
| true | true | public void onProtectionInteract(LWCProtectionInteractEvent event) {
if (event.getResult() == Result.CANCEL || !isEnabled()) {
return;
}
// The more important check
if (!event.canAccess()) {
return;
}
Protection protection = event.getProtection();
Block block = event.getEvent().getClickedBlock(); // The block they actually clicked :)
// Check if the block is even something that should be opened
if (!isValid(block.getType())) {
return;
}
// Are we looking at the top half?
// If we are, we need to get the bottom half instead
if ((block.getData() & 0x8) == 0x8) {
// Inspect the bottom half instead, fool!
block = block.getRelative(BlockFace.DOWN);
}
// Should we look for double doors?
boolean doubleDoors = usingDoubleDoors();
// The BOTTOM half of the other side of the double door
Block doubleDoorBlock = null;
// Only waste CPU if we need the double door block
if (doubleDoors) {
doubleDoorBlock = getDoubleDoor(block);
}
// Either way we are going to be toggling the door open
// So toggle both doors to be open. We can safely pass null values to changeDoorStates
changeDoorStates(true, (block.getType() == Material.WOODEN_DOOR ? null : block) /* They clicked it so it auto opens already */,
doubleDoorBlock);
if (action == Action.OPEN_AND_CLOSE) {
// Abuse the fact that we still use final variables inside the task
// The double door block object is initially only assigned if we need
// it, so we just create a second variable ^^
final Block finalBlock = block;
final Block finalDoubleDoorBlock = doubleDoorBlock;
// Calculate the wait time
// This is basically Interval * TICKS_PER_SECOND
int wait = getAutoCloseInterval() * TICKS_PER_SECOND;
// Create the task
// If we are set to close the door after a set period, let's create a sync task for it
lwc.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(lwc.getPlugin(), new Runnable() {
public void run() {
// Essentially all we need to do is reset the door states
// But DO NOT open the door if it's closed !
changeDoorStates(false, finalBlock, finalDoubleDoorBlock);
}
}, wait);
}
}
| public void onProtectionInteract(LWCProtectionInteractEvent event) {
if (event.getResult() == Result.CANCEL || !isEnabled()) {
return;
}
// The more important check
if (!event.canAccess()) {
return;
}
Protection protection = event.getProtection();
Block block = event.getEvent().getClickedBlock(); // The block they actually clicked :)
// Check if the block is even something that should be opened
if (!isValid(block.getType())) {
return;
}
// Are we looking at the top half?
// If we are, we need to get the bottom half instead
if ((block.getData() & 0x8) == 0x8) {
// Inspect the bottom half instead, fool!
block = block.getRelative(BlockFace.DOWN);
}
// Should we look for double doors?
boolean doubleDoors = usingDoubleDoors();
// The BOTTOM half of the other side of the double door
Block doubleDoorBlock = null;
// Only waste CPU if we need the double door block
if (doubleDoors) {
doubleDoorBlock = getDoubleDoor(block);
}
// Either way we are going to be toggling the door open
// So toggle both doors to be open. We can safely pass null values to changeDoorStates
changeDoorStates(true, ((block.getType() == Material.WOODEN_DOOR || block.getType() == Material.FENCE_GATE) ? null : block) /* They clicked it so it auto opens already */,
doubleDoorBlock);
if (action == Action.OPEN_AND_CLOSE) {
// Abuse the fact that we still use final variables inside the task
// The double door block object is initially only assigned if we need
// it, so we just create a second variable ^^
final Block finalBlock = block;
final Block finalDoubleDoorBlock = doubleDoorBlock;
// Calculate the wait time
// This is basically Interval * TICKS_PER_SECOND
int wait = getAutoCloseInterval() * TICKS_PER_SECOND;
// Create the task
// If we are set to close the door after a set period, let's create a sync task for it
lwc.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(lwc.getPlugin(), new Runnable() {
public void run() {
// Essentially all we need to do is reset the door states
// But DO NOT open the door if it's closed !
changeDoorStates(false, finalBlock, finalDoubleDoorBlock);
}
}, wait);
}
}
|
diff --git a/src/net/ishchenko/idea/navigatefromliteral/FileReferenceContributor.java b/src/net/ishchenko/idea/navigatefromliteral/FileReferenceContributor.java
index fd0e44f..8e89633 100644
--- a/src/net/ishchenko/idea/navigatefromliteral/FileReferenceContributor.java
+++ b/src/net/ishchenko/idea/navigatefromliteral/FileReferenceContributor.java
@@ -1,42 +1,42 @@
package net.ishchenko.idea.navigatefromliteral;
import com.intellij.patterns.PsiJavaPatterns;
import com.intellij.patterns.XmlPatterns;
import com.intellij.psi.*;
import com.intellij.psi.xml.XmlAttributeValue;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ProcessingContext;
import org.jetbrains.annotations.NotNull;
/**
* Created with IntelliJ IDEA.
* User: Max
* Date: 05.05.13
* Time: 0:19
*/
public class FileReferenceContributor extends PsiReferenceContributor {
@Override
public void registerReferenceProviders(PsiReferenceRegistrar registrar) {
registrar.registerReferenceProvider(PsiJavaPatterns.psiLiteral(), new PsiReferenceProvider() {
@NotNull
public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
return new PsiReference[]{new OneWayPsiFileFromPsiLiteralReference((PsiLiteral) element)};
}
- });
+ }, PsiReferenceRegistrar.LOWER_PRIORITY);
registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue(), new PsiReferenceProvider() {
@NotNull
@Override
public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
return new PsiReference[]{new OneWayPsiFileFromXmlAttributeValueReference((XmlAttributeValue) element)};
}
- });
+ }, PsiReferenceRegistrar.LOWER_PRIORITY);
registrar.registerReferenceProvider(XmlPatterns.xmlTag(), new PsiReferenceProvider() {
@NotNull
@Override
public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
return new PsiReference[]{new OneWayPsiFileFromXmlTagReference((XmlTag) element)};
}
- });
+ }, PsiReferenceRegistrar.LOWER_PRIORITY);
}
}
| false | true | public void registerReferenceProviders(PsiReferenceRegistrar registrar) {
registrar.registerReferenceProvider(PsiJavaPatterns.psiLiteral(), new PsiReferenceProvider() {
@NotNull
public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
return new PsiReference[]{new OneWayPsiFileFromPsiLiteralReference((PsiLiteral) element)};
}
});
registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue(), new PsiReferenceProvider() {
@NotNull
@Override
public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
return new PsiReference[]{new OneWayPsiFileFromXmlAttributeValueReference((XmlAttributeValue) element)};
}
});
registrar.registerReferenceProvider(XmlPatterns.xmlTag(), new PsiReferenceProvider() {
@NotNull
@Override
public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
return new PsiReference[]{new OneWayPsiFileFromXmlTagReference((XmlTag) element)};
}
});
}
| public void registerReferenceProviders(PsiReferenceRegistrar registrar) {
registrar.registerReferenceProvider(PsiJavaPatterns.psiLiteral(), new PsiReferenceProvider() {
@NotNull
public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
return new PsiReference[]{new OneWayPsiFileFromPsiLiteralReference((PsiLiteral) element)};
}
}, PsiReferenceRegistrar.LOWER_PRIORITY);
registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue(), new PsiReferenceProvider() {
@NotNull
@Override
public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
return new PsiReference[]{new OneWayPsiFileFromXmlAttributeValueReference((XmlAttributeValue) element)};
}
}, PsiReferenceRegistrar.LOWER_PRIORITY);
registrar.registerReferenceProvider(XmlPatterns.xmlTag(), new PsiReferenceProvider() {
@NotNull
@Override
public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
return new PsiReference[]{new OneWayPsiFileFromXmlTagReference((XmlTag) element)};
}
}, PsiReferenceRegistrar.LOWER_PRIORITY);
}
|
diff --git a/source/net/sourceforge/fullsync/ui/ProfileDetails.java b/source/net/sourceforge/fullsync/ui/ProfileDetails.java
index a37d5b1..458bcf5 100644
--- a/source/net/sourceforge/fullsync/ui/ProfileDetails.java
+++ b/source/net/sourceforge/fullsync/ui/ProfileDetails.java
@@ -1,664 +1,664 @@
package net.sourceforge.fullsync.ui;
import java.io.File;
import net.sourceforge.fullsync.ConnectionDescription;
import net.sourceforge.fullsync.ExceptionHandler;
import net.sourceforge.fullsync.Profile;
import net.sourceforge.fullsync.ProfileManager;
import net.sourceforge.fullsync.RuleSetDescriptor;
import net.sourceforge.fullsync.impl.AdvancedRuleSetDescriptor;
import net.sourceforge.fullsync.impl.SimplyfiedRuleSetDescriptor;
import net.sourceforge.fullsync.schedule.Schedule;
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.DirectoryDialog;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
/**
* This code was generated using CloudGarden's Jigloo
* SWT/Swing GUI Builder, which is free for non-commercial
* use. If Jigloo is being used commercially (ie, by a corporation,
* company or business for any purpose whatever) then you
* should purchase a license for each developer using Jigloo.
* Please visit www.cloudgarden.com for details.
* Use of Jigloo implies acceptance of these licensing terms.
* *************************************
* A COMMERCIAL LICENSE HAS NOT BEEN PURCHASED
* for this machine, so Jigloo or this code cannot be used legally
* for any corporate or commercial purpose.
* *************************************
*/
public class ProfileDetails extends org.eclipse.swt.widgets.Composite {
private ProfileManager profileManager;
private Button buttonResetError;
private Button buttonEnabled;
private Button buttonScheduling;
private Label label17;
private Label labelTypeDescription;
private Combo comboType;
private Label label16;
private Text textDescription;
private Label label15;
private Label label1;
private Text textRuleSet;
private Label label4;
private Group advancedRuleOptionsGroup;
private Text textAcceptPattern;
private Label label14;
private Text textIgnorePatter;
private Label label13;
private Button syncSubsButton;
private Group simplyfiedOptionsGroup;
private Button rbAdvancedRuleSet;
private Button rbSimplyfiedRuleSet;
private Group ruleSetGroup;
private Label label12;
private Text textDestinationPassword;
private Label label11;
private Text textDestinationUsername;
private Label label10;
private Button buttonDestinationBuffered;
private Label label9;
private Button buttonBrowseDst;
private Text textDestination;
private Label label3;
private Label label8;
private Text textSourcePassword;
private Label label6;
private Text textSourceUsername;
private Label label5;
private Button buttonSourceBuffered;
private Label label7;
private Button buttonBrowseSrc;
private Text textSource;
private Label label2;
private Text textName;
private String profileName;
public ProfileDetails(Composite parent, int style) {
super(parent, style);
initGUI();
}
/**
* Initializes the GUI.
* Auto-generated code - any changes you make will disappear.
*/
public void initGUI(){
try {
preInitGUI();
GridLayout thisLayout = new GridLayout(7, true);
thisLayout.marginWidth = 10;
thisLayout.marginHeight = 10;
thisLayout.numColumns = 7;
thisLayout.makeColumnsEqualWidth = false;
thisLayout.horizontalSpacing = 5;
thisLayout.verticalSpacing = 5;
this.setLayout(thisLayout);
{
label1 = new Label(this, SWT.NONE);
GridData label1LData = new GridData();
label1.setLayoutData(label1LData);
label1.setText("Name:");
}
{
textName = new Text(this, SWT.BORDER);
GridData textNameLData = new GridData();
textName.setToolTipText("Name for the profile");
textNameLData.horizontalAlignment = GridData.FILL;
textNameLData.horizontalSpan = 6;
textName.setLayoutData(textNameLData);
}
{
label15 = new Label(this, SWT.NONE);
label15.setText("Description:");
}
{
textDescription = new Text(this, SWT.BORDER);
GridData textDescriptionLData = new GridData();
textDescriptionLData.horizontalSpan = 6;
textDescriptionLData.horizontalAlignment = GridData.FILL;
textDescription.setLayoutData(textDescriptionLData);
}
{
label2 = new Label(this, SWT.NONE);
label2.setText("Source:");
GridData label2LData = new GridData();
label2.setLayoutData(label2LData);
}
{
textSource = new Text(this, SWT.BORDER);
GridData textSourceLData = new GridData();
textSource.setToolTipText("Source location");
textSourceLData.horizontalAlignment = GridData.FILL;
textSourceLData.horizontalSpan = 5;
textSourceLData.grabExcessHorizontalSpace = true;
textSource.setLayoutData(textSourceLData);
}
{
buttonBrowseSrc = new Button(this, SWT.PUSH | SWT.CENTER);
buttonBrowseSrc.setText("...");
GridData buttonBrowseSrcLData = new GridData();
buttonBrowseSrc.setLayoutData(buttonBrowseSrcLData);
buttonBrowseSrc.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
buttonBrowseSrcWidgetSelected(evt);
}
});
}
{
label7 = new Label(this, SWT.NONE);
}
{
buttonSourceBuffered = new Button(this, SWT.CHECK | SWT.LEFT);
buttonSourceBuffered.setText("buffered");
buttonSourceBuffered.setEnabled( false );
}
{
label5 = new Label(this, SWT.NONE);
label5.setText("Username:");
}
{
textSourceUsername = new Text(this, SWT.BORDER);
}
{
label6 = new Label(this, SWT.NONE);
label6.setText("Password:");
}
{
textSourcePassword = new Text(this, SWT.BORDER);
}
{
label8 = new Label(this, SWT.NONE);
}
{
label3 = new Label(this, SWT.NONE);
label3.setText("Destination:");
GridData label3LData = new GridData();
label3.setLayoutData(label3LData);
}
{
textDestination = new Text(this, SWT.BORDER);
GridData textDestinationLData = new GridData();
textDestination.setToolTipText("Destination location");
textDestinationLData.horizontalAlignment = GridData.FILL;
textDestinationLData.horizontalSpan = 5;
textDestinationLData.grabExcessHorizontalSpace = true;
textDestination.setLayoutData(textDestinationLData);
}
{
buttonBrowseDst = new Button(this, SWT.PUSH | SWT.CENTER);
buttonBrowseDst.setText("...");
GridData buttonBrowseDstLData = new GridData();
buttonBrowseDst.setLayoutData(buttonBrowseDstLData);
buttonBrowseDst.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
buttonBrowseDstWidgetSelected(evt);
}
});
}
{
label9 = new Label(this, SWT.NONE);
}
{
buttonDestinationBuffered = new Button(this, SWT.CHECK | SWT.LEFT);
buttonDestinationBuffered.setText("buffered");
//buttonDestinationBuffered.setEnabled( false );
}
{
label10 = new Label(this, SWT.NONE);
label10.setText("Username:");
}
{
textDestinationUsername = new Text(this, SWT.BORDER);
}
{
label11 = new Label(this, SWT.NONE);
label11.setText("Password:");
}
{
textDestinationPassword = new Text(this, SWT.BORDER);
}
{
label12 = new Label(this, SWT.NONE);
}
{
label16 = new Label(this, SWT.NONE);
label16.setText("Type:");
}
{
comboType = new Combo(this, SWT.DROP_DOWN | SWT.READ_ONLY);
comboType.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent evt) {
if( comboType.getText().equals( "Publish/Update" ) )
{
labelTypeDescription.setText(
"Will apply any changes in source to destination. \n" +
"New files created in destination will be ignored, \n" +
"and changes to existing ones will result in a warning." );
buttonSourceBuffered.setSelection( false );
buttonDestinationBuffered.setSelection( true );
} else if( comboType.getText().equals( "Backup Copy" ) ) {
labelTypeDescription.setText(
"Will copy any changes to destination but \n" +
"won't delete anything." );
buttonSourceBuffered.setSelection( false );
buttonDestinationBuffered.setSelection( false );
} else if( comboType.getText().equals( "Exact Copy" ) ) {
labelTypeDescription.setText(
"Will copy any changes to destination so \n" +
"it stays an exact copy of the source." );
buttonSourceBuffered.setSelection( false );
buttonDestinationBuffered.setSelection( false );
}
}
});
- comboType.add( "Publish/Update" );
- comboType.add( "Backup Copy" );
- comboType.add( "Exact Copy" );
}
{
labelTypeDescription = new Label(this, SWT.WRAP);
labelTypeDescription.setText("Description");
GridData labelTypeDescriptionLData = new GridData();
labelTypeDescriptionLData.heightHint = 40;
labelTypeDescriptionLData.horizontalSpan = 5;
labelTypeDescriptionLData.horizontalAlignment = GridData.FILL;
labelTypeDescription.setLayoutData(labelTypeDescriptionLData);
}
{
label17 = new Label(this, SWT.NONE);
label17.setText("Scheduling:");
}
{
buttonScheduling = new Button(this, SWT.PUSH | SWT.CENTER);
buttonScheduling.setText("Edit Scheduling");
buttonScheduling.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
ScheduleSelectionDialog dialog = new ScheduleSelectionDialog( getShell(), SWT.NULL );
dialog.setSchedule( (Schedule)buttonScheduling.getData() );
dialog.open();
buttonScheduling.setData( dialog.getSchedule() );
}
});
}
{
buttonEnabled = new Button(this, SWT.CHECK | SWT.RIGHT);
buttonEnabled.setText("Enabled");
}
{
buttonResetError = new Button(this, SWT.CHECK | SWT.RIGHT);
buttonResetError.setText("Reset Errorflag");
}
{
ruleSetGroup = new Group(this, SWT.NONE);
GridLayout ruleSetGroupLayout = new GridLayout();
GridData ruleSetGroupLData = new GridData();
ruleSetGroupLData.horizontalSpan = 7;
ruleSetGroupLData.horizontalIndent = 5;
ruleSetGroupLData.grabExcessHorizontalSpace = true;
ruleSetGroupLData.horizontalAlignment = GridData.FILL;
ruleSetGroup.setLayoutData(ruleSetGroupLData);
ruleSetGroupLayout.numColumns = 2;
ruleSetGroupLayout.makeColumnsEqualWidth = true;
ruleSetGroupLayout.horizontalSpacing = 20;
ruleSetGroup.setLayout(ruleSetGroupLayout);
ruleSetGroup.setText("RuleSet");
{
rbSimplyfiedRuleSet = new Button(ruleSetGroup, SWT.RADIO | SWT.LEFT);
rbSimplyfiedRuleSet.setText("Simple Rule Set");
rbSimplyfiedRuleSet.setSelection(true);
GridData rbSimplyfiedRuleSetLData = new GridData();
rbSimplyfiedRuleSetLData.grabExcessHorizontalSpace = true;
rbSimplyfiedRuleSetLData.horizontalAlignment = GridData.FILL;
rbSimplyfiedRuleSet.setLayoutData(rbSimplyfiedRuleSetLData);
rbSimplyfiedRuleSet
.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
selectRuleSetButton(rbSimplyfiedRuleSet);
}
});
}
{
rbAdvancedRuleSet = new Button(ruleSetGroup, SWT.RADIO | SWT.LEFT);
rbAdvancedRuleSet.setText("Advanced Rule Set");
GridData rbAdvancedRuleSetLData = new GridData();
rbAdvancedRuleSetLData.heightHint = 16;
rbAdvancedRuleSetLData.grabExcessHorizontalSpace = true;
rbAdvancedRuleSetLData.horizontalAlignment = GridData.FILL;
rbAdvancedRuleSet.setLayoutData(rbAdvancedRuleSetLData);
rbAdvancedRuleSet
.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
selectRuleSetButton(rbAdvancedRuleSet);
}
});
}
{
simplyfiedOptionsGroup = new Group(ruleSetGroup, SWT.NONE);
GridLayout simplyfiedOptionsGroupLayout = new GridLayout();
GridData simplyfiedOptionsGroupLData = new GridData();
simplyfiedOptionsGroupLData.verticalAlignment = GridData.BEGINNING;
simplyfiedOptionsGroupLData.grabExcessHorizontalSpace = true;
simplyfiedOptionsGroupLData.horizontalAlignment = GridData.FILL;
simplyfiedOptionsGroup.setLayoutData(simplyfiedOptionsGroupLData);
simplyfiedOptionsGroupLayout.numColumns = 2;
simplyfiedOptionsGroup.setLayout(simplyfiedOptionsGroupLayout);
simplyfiedOptionsGroup.setText("Simple Rule Options");
{
syncSubsButton = new Button(simplyfiedOptionsGroup, SWT.CHECK | SWT.LEFT);
syncSubsButton.setText("Sync Subdirectories");
GridData syncSubsButtonLData = new GridData();
syncSubsButton
.setToolTipText("Recurre into subdirectories?");
syncSubsButtonLData.widthHint = 115;
syncSubsButtonLData.heightHint = 16;
syncSubsButtonLData.horizontalSpan = 2;
syncSubsButton.setLayoutData(syncSubsButtonLData);
}
{
label13 = new Label(simplyfiedOptionsGroup, SWT.NONE);
label13.setText("Ignore pattern");
}
{
textIgnorePatter = new Text(simplyfiedOptionsGroup, SWT.BORDER);
GridData textIgnorePatterLData = new GridData();
textIgnorePatter.setToolTipText("Ignore RegExp");
textIgnorePatterLData.heightHint = 13;
//textIgnorePatterLData.widthHint = 100;
textIgnorePatterLData.grabExcessHorizontalSpace = true;
textIgnorePatterLData.horizontalAlignment = GridData.FILL;
textIgnorePatter.setLayoutData(textIgnorePatterLData);
}
{
label14 = new Label(simplyfiedOptionsGroup, SWT.NONE);
label14.setText("Accept pattern");
}
{
textAcceptPattern = new Text(simplyfiedOptionsGroup, SWT.BORDER);
GridData textAcceptPatternLData = new GridData();
textAcceptPatternLData.heightHint = 13;
//textAcceptPatternLData.widthHint = 100;
textAcceptPatternLData.grabExcessHorizontalSpace = true;
textAcceptPatternLData.horizontalAlignment = GridData.FILL;
textAcceptPattern.setLayoutData(textAcceptPatternLData);
}
}
{
advancedRuleOptionsGroup = new Group(ruleSetGroup, SWT.NONE);
GridLayout advancedRuleOptionsGroupLayout = new GridLayout();
GridData advancedRuleOptionsGroupLData = new GridData();
advancedRuleOptionsGroup.setEnabled(false);
advancedRuleOptionsGroupLData.heightHint = 31;
advancedRuleOptionsGroupLData.verticalAlignment = GridData.BEGINNING;
advancedRuleOptionsGroupLData.grabExcessHorizontalSpace = true;
advancedRuleOptionsGroupLData.horizontalAlignment = GridData.FILL;
advancedRuleOptionsGroup.setLayoutData(advancedRuleOptionsGroupLData);
advancedRuleOptionsGroupLayout.numColumns = 2;
advancedRuleOptionsGroup.setLayout(advancedRuleOptionsGroupLayout);
advancedRuleOptionsGroup.setText("Advanced Rule Options");
{
label4 = new Label(advancedRuleOptionsGroup, SWT.NONE);
GridData label4LData = new GridData();
label4.setEnabled(false);
label4.setLayoutData(label4LData);
label4.setText("RuleSet:");
}
{
textRuleSet = new Text(advancedRuleOptionsGroup, SWT.BORDER);
GridData textRuleSetLData = new GridData();
textRuleSet.setEnabled(false);
textRuleSetLData.widthHint = 100;
textRuleSetLData.heightHint = 13;
textRuleSet.setLayoutData(textRuleSetLData);
}
}
}
+ comboType.add( "Publish/Update" );
+ comboType.add( "Backup Copy" );
+ comboType.add( "Exact Copy" );
this.layout();
this.setSize(500, 400);
postInitGUI();
} catch (Exception e) {
ExceptionHandler.reportException( e );
}
}
/** Add your pre-init code in here */
public void preInitGUI(){
}
/** Add your post-init code in here */
public void postInitGUI()
{
textSourcePassword.setEchoChar( '*' );
textDestinationPassword.setEchoChar( '*' );
comboType.select(0);
}
public void setProfileManager( ProfileManager manager )
{
this.profileManager = manager;
}
public void setProfileName( String name )
{
this.profileName = name;
if( profileName == null )
return;
Profile p = profileManager.getProfile( profileName );
if( p == null )
throw new IllegalArgumentException( "profile does not exist" );
textName.setText( p.getName() );
textDescription.setText( p.getDescription() );
textSource.setText( p.getSource().getUri().toString() );
buttonSourceBuffered.setSelection( "syncfiles".equals( p.getSource().getBufferStrategy() ) );
if( p.getSource().getUsername() != null )
textSourceUsername.setText( p.getSource().getUsername() );
if( p.getSource().getPassword() != null )
textSourcePassword.setText( p.getSource().getPassword() );
textDestination.setText( p.getDestination().getUri().toString() );
buttonDestinationBuffered.setSelection( "syncfiles".equals( p.getDestination().getBufferStrategy() ) );
if( p.getDestination().getUsername() != null )
textDestinationUsername.setText( p.getDestination().getUsername() );
if( p.getDestination().getPassword() != null )
textDestinationPassword.setText( p.getDestination().getPassword() );
if( p.getSynchronizationType() != null && p.getSynchronizationType().length() > 0 )
comboType.setText( p.getSynchronizationType() );
else comboType.select( 0 );
buttonScheduling.setData( p.getSchedule() );
buttonEnabled.setSelection( p.isEnabled() );
RuleSetDescriptor ruleSetDescriptor = p.getRuleSet();
// TODO [Michele] I don't like this extend use of instanceof.
// I'll try to find a better way soon.
if (ruleSetDescriptor instanceof SimplyfiedRuleSetDescriptor) {
selectRuleSetButton(rbSimplyfiedRuleSet);
rbSimplyfiedRuleSet.setSelection(true);
rbAdvancedRuleSet.setSelection(false);
SimplyfiedRuleSetDescriptor simpleDesc = (SimplyfiedRuleSetDescriptor)ruleSetDescriptor;
syncSubsButton.setSelection(simpleDesc.isSyncSubDirs());
textIgnorePatter.setText(simpleDesc.getIgnorePattern());
textAcceptPattern.setText(simpleDesc.getTakePattern());
} else {
selectRuleSetButton(rbAdvancedRuleSet);
rbSimplyfiedRuleSet.setSelection(false);
rbAdvancedRuleSet.setSelection(true);
AdvancedRuleSetDescriptor advDesc = (AdvancedRuleSetDescriptor) ruleSetDescriptor;
textRuleSet.setText(advDesc.getRuleSetName());
}
}
public static void showProfile( Shell parent, ProfileManager manager, String name ){
try {
/* /
Display display = Display.getDefault();
Shell shell = new Shell(display);
shell.setText( "Profile Details" );
ProfileDetails inst = new ProfileDetails(shell, SWT.NULL);
inst.setProfileManager( manager );
inst.setProfileName( name );
shell.setImage( new Image( display, "images/Button_Edit.gif" ) );
shell.setLayout(new org.eclipse.swt.layout.FillLayout());
shell.setSize( shell.computeSize( inst.getSize().x, inst.getSize().y ) );
shell.open();
/* */
WizardDialog dialog = new WizardDialog( parent, SWT.APPLICATION_MODAL );
ProfileDetailsPage page = new ProfileDetailsPage( dialog, manager, name );
dialog.show();
/* */
} catch (Exception e) {
ExceptionHandler.reportException( e );
}
}
public void apply()
{
ConnectionDescription src, dst;
try {
src = new ConnectionDescription( textSource.getText(), "" );
if( buttonSourceBuffered.getSelection() )
src.setBufferStrategy( "syncfiles" );
if( textSourceUsername.getText().length() > 0 )
{
src.setUsername( textSourceUsername.getText() );
src.setPassword( textSourcePassword.getText() );
}
dst = new ConnectionDescription( textDestination.getText(), "" );
if( buttonDestinationBuffered.getSelection() )
dst.setBufferStrategy( "syncfiles" );
if( textDestinationUsername.getText().length() > 0 )
{
dst.setUsername( textDestinationUsername.getText() );
dst.setPassword( textDestinationPassword.getText() );
}
} catch( Exception e ) {
ExceptionHandler.reportException( e );
return;
}
if( profileName == null || !textName.getText().equals( profileName ) )
{
Profile pr = profileManager.getProfile( textName.getText() );
if( pr != null )
{
MessageBox mb = new MessageBox( this.getShell(), SWT.ICON_ERROR );
mb.setText( "Duplicate Entry" );
mb.setMessage( "A Profile with the same name already exists." );
mb.open();
return;
}
}
Profile p;
RuleSetDescriptor ruleSetDescriptor = null;
if (rbSimplyfiedRuleSet.getSelection()) {
ruleSetDescriptor = new SimplyfiedRuleSetDescriptor(syncSubsButton.getSelection(),
textIgnorePatter.getText(),
textAcceptPattern.getText());
}
if (rbAdvancedRuleSet.getSelection()) {
String ruleSetName = textRuleSet.getText();
ruleSetDescriptor = new AdvancedRuleSetDescriptor(ruleSetName);
}
if( profileName == null )
{
p = new Profile( textName.getText(), src, dst, ruleSetDescriptor );
p.setSynchronizationType( comboType.getText() );
p.setDescription( textDescription.getText() );
p.setSchedule( (Schedule)buttonScheduling.getData() );
p.setEnabled( buttonEnabled.getSelection() );
if( buttonResetError.getSelection() )
p.setLastError( 0, null );
profileManager.addProfile( p );
} else {
p = profileManager.getProfile( profileName );
p.beginUpdate();
p.setName( textName.getText() );
p.setDescription( textDescription.getText() );
p.setSynchronizationType( comboType.getText() );
p.setSource( src );
p.setDestination( dst );
p.setSchedule( (Schedule)buttonScheduling.getData() );
p.setEnabled( buttonEnabled.getSelection() );
p.setRuleSet( ruleSetDescriptor );
if( buttonResetError.getSelection() )
p.setLastError( 0, null );
p.endUpdate();
}
profileManager.save();
}
/** Auto-generated event handler method */
protected void buttonCancelWidgetSelected(SelectionEvent evt){
getShell().dispose();
}
/** Auto-generated event handler method */
protected void buttonBrowseSrcWidgetSelected(SelectionEvent evt){
DirectoryDialog dd = new DirectoryDialog( getShell() );
dd.setMessage( "Choose local source directory." );
String str = dd.open();
if( str != null )
textSource.setText( new File( str ).toURI().toString() );
}
/** Auto-generated event handler method */
protected void buttonBrowseDstWidgetSelected(SelectionEvent evt){
DirectoryDialog dd = new DirectoryDialog( getShell() );
dd.setMessage( "Choose local source directory." );
String str = dd.open();
if( str != null )
textDestination.setText( new File( str ).toURI().toString() );
}
protected void selectRuleSetButton(Button button) {
if (button.equals(rbSimplyfiedRuleSet)) {
advancedRuleOptionsGroup.setEnabled(false);
label4.setEnabled(false);
textRuleSet.setEnabled(false);
simplyfiedOptionsGroup.setEnabled(true);
syncSubsButton.setEnabled(true);
label13.setEnabled(true);
label14.setEnabled(true);
textAcceptPattern.setEnabled(true);
textIgnorePatter.setEnabled(true);
}
else {
advancedRuleOptionsGroup.setEnabled(true);
label4.setEnabled(true);
textRuleSet.setEnabled(true);
simplyfiedOptionsGroup.setEnabled(false);
syncSubsButton.setEnabled(false);
label13.setEnabled(false);
label14.setEnabled(false);
textAcceptPattern.setEnabled(false);
textIgnorePatter.setEnabled(false);
}
}
}
| false | true | public void initGUI(){
try {
preInitGUI();
GridLayout thisLayout = new GridLayout(7, true);
thisLayout.marginWidth = 10;
thisLayout.marginHeight = 10;
thisLayout.numColumns = 7;
thisLayout.makeColumnsEqualWidth = false;
thisLayout.horizontalSpacing = 5;
thisLayout.verticalSpacing = 5;
this.setLayout(thisLayout);
{
label1 = new Label(this, SWT.NONE);
GridData label1LData = new GridData();
label1.setLayoutData(label1LData);
label1.setText("Name:");
}
{
textName = new Text(this, SWT.BORDER);
GridData textNameLData = new GridData();
textName.setToolTipText("Name for the profile");
textNameLData.horizontalAlignment = GridData.FILL;
textNameLData.horizontalSpan = 6;
textName.setLayoutData(textNameLData);
}
{
label15 = new Label(this, SWT.NONE);
label15.setText("Description:");
}
{
textDescription = new Text(this, SWT.BORDER);
GridData textDescriptionLData = new GridData();
textDescriptionLData.horizontalSpan = 6;
textDescriptionLData.horizontalAlignment = GridData.FILL;
textDescription.setLayoutData(textDescriptionLData);
}
{
label2 = new Label(this, SWT.NONE);
label2.setText("Source:");
GridData label2LData = new GridData();
label2.setLayoutData(label2LData);
}
{
textSource = new Text(this, SWT.BORDER);
GridData textSourceLData = new GridData();
textSource.setToolTipText("Source location");
textSourceLData.horizontalAlignment = GridData.FILL;
textSourceLData.horizontalSpan = 5;
textSourceLData.grabExcessHorizontalSpace = true;
textSource.setLayoutData(textSourceLData);
}
{
buttonBrowseSrc = new Button(this, SWT.PUSH | SWT.CENTER);
buttonBrowseSrc.setText("...");
GridData buttonBrowseSrcLData = new GridData();
buttonBrowseSrc.setLayoutData(buttonBrowseSrcLData);
buttonBrowseSrc.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
buttonBrowseSrcWidgetSelected(evt);
}
});
}
{
label7 = new Label(this, SWT.NONE);
}
{
buttonSourceBuffered = new Button(this, SWT.CHECK | SWT.LEFT);
buttonSourceBuffered.setText("buffered");
buttonSourceBuffered.setEnabled( false );
}
{
label5 = new Label(this, SWT.NONE);
label5.setText("Username:");
}
{
textSourceUsername = new Text(this, SWT.BORDER);
}
{
label6 = new Label(this, SWT.NONE);
label6.setText("Password:");
}
{
textSourcePassword = new Text(this, SWT.BORDER);
}
{
label8 = new Label(this, SWT.NONE);
}
{
label3 = new Label(this, SWT.NONE);
label3.setText("Destination:");
GridData label3LData = new GridData();
label3.setLayoutData(label3LData);
}
{
textDestination = new Text(this, SWT.BORDER);
GridData textDestinationLData = new GridData();
textDestination.setToolTipText("Destination location");
textDestinationLData.horizontalAlignment = GridData.FILL;
textDestinationLData.horizontalSpan = 5;
textDestinationLData.grabExcessHorizontalSpace = true;
textDestination.setLayoutData(textDestinationLData);
}
{
buttonBrowseDst = new Button(this, SWT.PUSH | SWT.CENTER);
buttonBrowseDst.setText("...");
GridData buttonBrowseDstLData = new GridData();
buttonBrowseDst.setLayoutData(buttonBrowseDstLData);
buttonBrowseDst.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
buttonBrowseDstWidgetSelected(evt);
}
});
}
{
label9 = new Label(this, SWT.NONE);
}
{
buttonDestinationBuffered = new Button(this, SWT.CHECK | SWT.LEFT);
buttonDestinationBuffered.setText("buffered");
//buttonDestinationBuffered.setEnabled( false );
}
{
label10 = new Label(this, SWT.NONE);
label10.setText("Username:");
}
{
textDestinationUsername = new Text(this, SWT.BORDER);
}
{
label11 = new Label(this, SWT.NONE);
label11.setText("Password:");
}
{
textDestinationPassword = new Text(this, SWT.BORDER);
}
{
label12 = new Label(this, SWT.NONE);
}
{
label16 = new Label(this, SWT.NONE);
label16.setText("Type:");
}
{
comboType = new Combo(this, SWT.DROP_DOWN | SWT.READ_ONLY);
comboType.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent evt) {
if( comboType.getText().equals( "Publish/Update" ) )
{
labelTypeDescription.setText(
"Will apply any changes in source to destination. \n" +
"New files created in destination will be ignored, \n" +
"and changes to existing ones will result in a warning." );
buttonSourceBuffered.setSelection( false );
buttonDestinationBuffered.setSelection( true );
} else if( comboType.getText().equals( "Backup Copy" ) ) {
labelTypeDescription.setText(
"Will copy any changes to destination but \n" +
"won't delete anything." );
buttonSourceBuffered.setSelection( false );
buttonDestinationBuffered.setSelection( false );
} else if( comboType.getText().equals( "Exact Copy" ) ) {
labelTypeDescription.setText(
"Will copy any changes to destination so \n" +
"it stays an exact copy of the source." );
buttonSourceBuffered.setSelection( false );
buttonDestinationBuffered.setSelection( false );
}
}
});
comboType.add( "Publish/Update" );
comboType.add( "Backup Copy" );
comboType.add( "Exact Copy" );
}
{
labelTypeDescription = new Label(this, SWT.WRAP);
labelTypeDescription.setText("Description");
GridData labelTypeDescriptionLData = new GridData();
labelTypeDescriptionLData.heightHint = 40;
labelTypeDescriptionLData.horizontalSpan = 5;
labelTypeDescriptionLData.horizontalAlignment = GridData.FILL;
labelTypeDescription.setLayoutData(labelTypeDescriptionLData);
}
{
label17 = new Label(this, SWT.NONE);
label17.setText("Scheduling:");
}
{
buttonScheduling = new Button(this, SWT.PUSH | SWT.CENTER);
buttonScheduling.setText("Edit Scheduling");
buttonScheduling.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
ScheduleSelectionDialog dialog = new ScheduleSelectionDialog( getShell(), SWT.NULL );
dialog.setSchedule( (Schedule)buttonScheduling.getData() );
dialog.open();
buttonScheduling.setData( dialog.getSchedule() );
}
});
}
{
buttonEnabled = new Button(this, SWT.CHECK | SWT.RIGHT);
buttonEnabled.setText("Enabled");
}
{
buttonResetError = new Button(this, SWT.CHECK | SWT.RIGHT);
buttonResetError.setText("Reset Errorflag");
}
{
ruleSetGroup = new Group(this, SWT.NONE);
GridLayout ruleSetGroupLayout = new GridLayout();
GridData ruleSetGroupLData = new GridData();
ruleSetGroupLData.horizontalSpan = 7;
ruleSetGroupLData.horizontalIndent = 5;
ruleSetGroupLData.grabExcessHorizontalSpace = true;
ruleSetGroupLData.horizontalAlignment = GridData.FILL;
ruleSetGroup.setLayoutData(ruleSetGroupLData);
ruleSetGroupLayout.numColumns = 2;
ruleSetGroupLayout.makeColumnsEqualWidth = true;
ruleSetGroupLayout.horizontalSpacing = 20;
ruleSetGroup.setLayout(ruleSetGroupLayout);
ruleSetGroup.setText("RuleSet");
{
rbSimplyfiedRuleSet = new Button(ruleSetGroup, SWT.RADIO | SWT.LEFT);
rbSimplyfiedRuleSet.setText("Simple Rule Set");
rbSimplyfiedRuleSet.setSelection(true);
GridData rbSimplyfiedRuleSetLData = new GridData();
rbSimplyfiedRuleSetLData.grabExcessHorizontalSpace = true;
rbSimplyfiedRuleSetLData.horizontalAlignment = GridData.FILL;
rbSimplyfiedRuleSet.setLayoutData(rbSimplyfiedRuleSetLData);
rbSimplyfiedRuleSet
.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
selectRuleSetButton(rbSimplyfiedRuleSet);
}
});
}
{
rbAdvancedRuleSet = new Button(ruleSetGroup, SWT.RADIO | SWT.LEFT);
rbAdvancedRuleSet.setText("Advanced Rule Set");
GridData rbAdvancedRuleSetLData = new GridData();
rbAdvancedRuleSetLData.heightHint = 16;
rbAdvancedRuleSetLData.grabExcessHorizontalSpace = true;
rbAdvancedRuleSetLData.horizontalAlignment = GridData.FILL;
rbAdvancedRuleSet.setLayoutData(rbAdvancedRuleSetLData);
rbAdvancedRuleSet
.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
selectRuleSetButton(rbAdvancedRuleSet);
}
});
}
{
simplyfiedOptionsGroup = new Group(ruleSetGroup, SWT.NONE);
GridLayout simplyfiedOptionsGroupLayout = new GridLayout();
GridData simplyfiedOptionsGroupLData = new GridData();
simplyfiedOptionsGroupLData.verticalAlignment = GridData.BEGINNING;
simplyfiedOptionsGroupLData.grabExcessHorizontalSpace = true;
simplyfiedOptionsGroupLData.horizontalAlignment = GridData.FILL;
simplyfiedOptionsGroup.setLayoutData(simplyfiedOptionsGroupLData);
simplyfiedOptionsGroupLayout.numColumns = 2;
simplyfiedOptionsGroup.setLayout(simplyfiedOptionsGroupLayout);
simplyfiedOptionsGroup.setText("Simple Rule Options");
{
syncSubsButton = new Button(simplyfiedOptionsGroup, SWT.CHECK | SWT.LEFT);
syncSubsButton.setText("Sync Subdirectories");
GridData syncSubsButtonLData = new GridData();
syncSubsButton
.setToolTipText("Recurre into subdirectories?");
syncSubsButtonLData.widthHint = 115;
syncSubsButtonLData.heightHint = 16;
syncSubsButtonLData.horizontalSpan = 2;
syncSubsButton.setLayoutData(syncSubsButtonLData);
}
{
label13 = new Label(simplyfiedOptionsGroup, SWT.NONE);
label13.setText("Ignore pattern");
}
{
textIgnorePatter = new Text(simplyfiedOptionsGroup, SWT.BORDER);
GridData textIgnorePatterLData = new GridData();
textIgnorePatter.setToolTipText("Ignore RegExp");
textIgnorePatterLData.heightHint = 13;
//textIgnorePatterLData.widthHint = 100;
textIgnorePatterLData.grabExcessHorizontalSpace = true;
textIgnorePatterLData.horizontalAlignment = GridData.FILL;
textIgnorePatter.setLayoutData(textIgnorePatterLData);
}
{
label14 = new Label(simplyfiedOptionsGroup, SWT.NONE);
label14.setText("Accept pattern");
}
{
textAcceptPattern = new Text(simplyfiedOptionsGroup, SWT.BORDER);
GridData textAcceptPatternLData = new GridData();
textAcceptPatternLData.heightHint = 13;
//textAcceptPatternLData.widthHint = 100;
textAcceptPatternLData.grabExcessHorizontalSpace = true;
textAcceptPatternLData.horizontalAlignment = GridData.FILL;
textAcceptPattern.setLayoutData(textAcceptPatternLData);
}
}
{
advancedRuleOptionsGroup = new Group(ruleSetGroup, SWT.NONE);
GridLayout advancedRuleOptionsGroupLayout = new GridLayout();
GridData advancedRuleOptionsGroupLData = new GridData();
advancedRuleOptionsGroup.setEnabled(false);
advancedRuleOptionsGroupLData.heightHint = 31;
advancedRuleOptionsGroupLData.verticalAlignment = GridData.BEGINNING;
advancedRuleOptionsGroupLData.grabExcessHorizontalSpace = true;
advancedRuleOptionsGroupLData.horizontalAlignment = GridData.FILL;
advancedRuleOptionsGroup.setLayoutData(advancedRuleOptionsGroupLData);
advancedRuleOptionsGroupLayout.numColumns = 2;
advancedRuleOptionsGroup.setLayout(advancedRuleOptionsGroupLayout);
advancedRuleOptionsGroup.setText("Advanced Rule Options");
{
label4 = new Label(advancedRuleOptionsGroup, SWT.NONE);
GridData label4LData = new GridData();
label4.setEnabled(false);
label4.setLayoutData(label4LData);
label4.setText("RuleSet:");
}
{
textRuleSet = new Text(advancedRuleOptionsGroup, SWT.BORDER);
GridData textRuleSetLData = new GridData();
textRuleSet.setEnabled(false);
textRuleSetLData.widthHint = 100;
textRuleSetLData.heightHint = 13;
textRuleSet.setLayoutData(textRuleSetLData);
}
}
}
this.layout();
this.setSize(500, 400);
postInitGUI();
} catch (Exception e) {
ExceptionHandler.reportException( e );
}
}
| public void initGUI(){
try {
preInitGUI();
GridLayout thisLayout = new GridLayout(7, true);
thisLayout.marginWidth = 10;
thisLayout.marginHeight = 10;
thisLayout.numColumns = 7;
thisLayout.makeColumnsEqualWidth = false;
thisLayout.horizontalSpacing = 5;
thisLayout.verticalSpacing = 5;
this.setLayout(thisLayout);
{
label1 = new Label(this, SWT.NONE);
GridData label1LData = new GridData();
label1.setLayoutData(label1LData);
label1.setText("Name:");
}
{
textName = new Text(this, SWT.BORDER);
GridData textNameLData = new GridData();
textName.setToolTipText("Name for the profile");
textNameLData.horizontalAlignment = GridData.FILL;
textNameLData.horizontalSpan = 6;
textName.setLayoutData(textNameLData);
}
{
label15 = new Label(this, SWT.NONE);
label15.setText("Description:");
}
{
textDescription = new Text(this, SWT.BORDER);
GridData textDescriptionLData = new GridData();
textDescriptionLData.horizontalSpan = 6;
textDescriptionLData.horizontalAlignment = GridData.FILL;
textDescription.setLayoutData(textDescriptionLData);
}
{
label2 = new Label(this, SWT.NONE);
label2.setText("Source:");
GridData label2LData = new GridData();
label2.setLayoutData(label2LData);
}
{
textSource = new Text(this, SWT.BORDER);
GridData textSourceLData = new GridData();
textSource.setToolTipText("Source location");
textSourceLData.horizontalAlignment = GridData.FILL;
textSourceLData.horizontalSpan = 5;
textSourceLData.grabExcessHorizontalSpace = true;
textSource.setLayoutData(textSourceLData);
}
{
buttonBrowseSrc = new Button(this, SWT.PUSH | SWT.CENTER);
buttonBrowseSrc.setText("...");
GridData buttonBrowseSrcLData = new GridData();
buttonBrowseSrc.setLayoutData(buttonBrowseSrcLData);
buttonBrowseSrc.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
buttonBrowseSrcWidgetSelected(evt);
}
});
}
{
label7 = new Label(this, SWT.NONE);
}
{
buttonSourceBuffered = new Button(this, SWT.CHECK | SWT.LEFT);
buttonSourceBuffered.setText("buffered");
buttonSourceBuffered.setEnabled( false );
}
{
label5 = new Label(this, SWT.NONE);
label5.setText("Username:");
}
{
textSourceUsername = new Text(this, SWT.BORDER);
}
{
label6 = new Label(this, SWT.NONE);
label6.setText("Password:");
}
{
textSourcePassword = new Text(this, SWT.BORDER);
}
{
label8 = new Label(this, SWT.NONE);
}
{
label3 = new Label(this, SWT.NONE);
label3.setText("Destination:");
GridData label3LData = new GridData();
label3.setLayoutData(label3LData);
}
{
textDestination = new Text(this, SWT.BORDER);
GridData textDestinationLData = new GridData();
textDestination.setToolTipText("Destination location");
textDestinationLData.horizontalAlignment = GridData.FILL;
textDestinationLData.horizontalSpan = 5;
textDestinationLData.grabExcessHorizontalSpace = true;
textDestination.setLayoutData(textDestinationLData);
}
{
buttonBrowseDst = new Button(this, SWT.PUSH | SWT.CENTER);
buttonBrowseDst.setText("...");
GridData buttonBrowseDstLData = new GridData();
buttonBrowseDst.setLayoutData(buttonBrowseDstLData);
buttonBrowseDst.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
buttonBrowseDstWidgetSelected(evt);
}
});
}
{
label9 = new Label(this, SWT.NONE);
}
{
buttonDestinationBuffered = new Button(this, SWT.CHECK | SWT.LEFT);
buttonDestinationBuffered.setText("buffered");
//buttonDestinationBuffered.setEnabled( false );
}
{
label10 = new Label(this, SWT.NONE);
label10.setText("Username:");
}
{
textDestinationUsername = new Text(this, SWT.BORDER);
}
{
label11 = new Label(this, SWT.NONE);
label11.setText("Password:");
}
{
textDestinationPassword = new Text(this, SWT.BORDER);
}
{
label12 = new Label(this, SWT.NONE);
}
{
label16 = new Label(this, SWT.NONE);
label16.setText("Type:");
}
{
comboType = new Combo(this, SWT.DROP_DOWN | SWT.READ_ONLY);
comboType.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent evt) {
if( comboType.getText().equals( "Publish/Update" ) )
{
labelTypeDescription.setText(
"Will apply any changes in source to destination. \n" +
"New files created in destination will be ignored, \n" +
"and changes to existing ones will result in a warning." );
buttonSourceBuffered.setSelection( false );
buttonDestinationBuffered.setSelection( true );
} else if( comboType.getText().equals( "Backup Copy" ) ) {
labelTypeDescription.setText(
"Will copy any changes to destination but \n" +
"won't delete anything." );
buttonSourceBuffered.setSelection( false );
buttonDestinationBuffered.setSelection( false );
} else if( comboType.getText().equals( "Exact Copy" ) ) {
labelTypeDescription.setText(
"Will copy any changes to destination so \n" +
"it stays an exact copy of the source." );
buttonSourceBuffered.setSelection( false );
buttonDestinationBuffered.setSelection( false );
}
}
});
}
{
labelTypeDescription = new Label(this, SWT.WRAP);
labelTypeDescription.setText("Description");
GridData labelTypeDescriptionLData = new GridData();
labelTypeDescriptionLData.heightHint = 40;
labelTypeDescriptionLData.horizontalSpan = 5;
labelTypeDescriptionLData.horizontalAlignment = GridData.FILL;
labelTypeDescription.setLayoutData(labelTypeDescriptionLData);
}
{
label17 = new Label(this, SWT.NONE);
label17.setText("Scheduling:");
}
{
buttonScheduling = new Button(this, SWT.PUSH | SWT.CENTER);
buttonScheduling.setText("Edit Scheduling");
buttonScheduling.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
ScheduleSelectionDialog dialog = new ScheduleSelectionDialog( getShell(), SWT.NULL );
dialog.setSchedule( (Schedule)buttonScheduling.getData() );
dialog.open();
buttonScheduling.setData( dialog.getSchedule() );
}
});
}
{
buttonEnabled = new Button(this, SWT.CHECK | SWT.RIGHT);
buttonEnabled.setText("Enabled");
}
{
buttonResetError = new Button(this, SWT.CHECK | SWT.RIGHT);
buttonResetError.setText("Reset Errorflag");
}
{
ruleSetGroup = new Group(this, SWT.NONE);
GridLayout ruleSetGroupLayout = new GridLayout();
GridData ruleSetGroupLData = new GridData();
ruleSetGroupLData.horizontalSpan = 7;
ruleSetGroupLData.horizontalIndent = 5;
ruleSetGroupLData.grabExcessHorizontalSpace = true;
ruleSetGroupLData.horizontalAlignment = GridData.FILL;
ruleSetGroup.setLayoutData(ruleSetGroupLData);
ruleSetGroupLayout.numColumns = 2;
ruleSetGroupLayout.makeColumnsEqualWidth = true;
ruleSetGroupLayout.horizontalSpacing = 20;
ruleSetGroup.setLayout(ruleSetGroupLayout);
ruleSetGroup.setText("RuleSet");
{
rbSimplyfiedRuleSet = new Button(ruleSetGroup, SWT.RADIO | SWT.LEFT);
rbSimplyfiedRuleSet.setText("Simple Rule Set");
rbSimplyfiedRuleSet.setSelection(true);
GridData rbSimplyfiedRuleSetLData = new GridData();
rbSimplyfiedRuleSetLData.grabExcessHorizontalSpace = true;
rbSimplyfiedRuleSetLData.horizontalAlignment = GridData.FILL;
rbSimplyfiedRuleSet.setLayoutData(rbSimplyfiedRuleSetLData);
rbSimplyfiedRuleSet
.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
selectRuleSetButton(rbSimplyfiedRuleSet);
}
});
}
{
rbAdvancedRuleSet = new Button(ruleSetGroup, SWT.RADIO | SWT.LEFT);
rbAdvancedRuleSet.setText("Advanced Rule Set");
GridData rbAdvancedRuleSetLData = new GridData();
rbAdvancedRuleSetLData.heightHint = 16;
rbAdvancedRuleSetLData.grabExcessHorizontalSpace = true;
rbAdvancedRuleSetLData.horizontalAlignment = GridData.FILL;
rbAdvancedRuleSet.setLayoutData(rbAdvancedRuleSetLData);
rbAdvancedRuleSet
.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
selectRuleSetButton(rbAdvancedRuleSet);
}
});
}
{
simplyfiedOptionsGroup = new Group(ruleSetGroup, SWT.NONE);
GridLayout simplyfiedOptionsGroupLayout = new GridLayout();
GridData simplyfiedOptionsGroupLData = new GridData();
simplyfiedOptionsGroupLData.verticalAlignment = GridData.BEGINNING;
simplyfiedOptionsGroupLData.grabExcessHorizontalSpace = true;
simplyfiedOptionsGroupLData.horizontalAlignment = GridData.FILL;
simplyfiedOptionsGroup.setLayoutData(simplyfiedOptionsGroupLData);
simplyfiedOptionsGroupLayout.numColumns = 2;
simplyfiedOptionsGroup.setLayout(simplyfiedOptionsGroupLayout);
simplyfiedOptionsGroup.setText("Simple Rule Options");
{
syncSubsButton = new Button(simplyfiedOptionsGroup, SWT.CHECK | SWT.LEFT);
syncSubsButton.setText("Sync Subdirectories");
GridData syncSubsButtonLData = new GridData();
syncSubsButton
.setToolTipText("Recurre into subdirectories?");
syncSubsButtonLData.widthHint = 115;
syncSubsButtonLData.heightHint = 16;
syncSubsButtonLData.horizontalSpan = 2;
syncSubsButton.setLayoutData(syncSubsButtonLData);
}
{
label13 = new Label(simplyfiedOptionsGroup, SWT.NONE);
label13.setText("Ignore pattern");
}
{
textIgnorePatter = new Text(simplyfiedOptionsGroup, SWT.BORDER);
GridData textIgnorePatterLData = new GridData();
textIgnorePatter.setToolTipText("Ignore RegExp");
textIgnorePatterLData.heightHint = 13;
//textIgnorePatterLData.widthHint = 100;
textIgnorePatterLData.grabExcessHorizontalSpace = true;
textIgnorePatterLData.horizontalAlignment = GridData.FILL;
textIgnorePatter.setLayoutData(textIgnorePatterLData);
}
{
label14 = new Label(simplyfiedOptionsGroup, SWT.NONE);
label14.setText("Accept pattern");
}
{
textAcceptPattern = new Text(simplyfiedOptionsGroup, SWT.BORDER);
GridData textAcceptPatternLData = new GridData();
textAcceptPatternLData.heightHint = 13;
//textAcceptPatternLData.widthHint = 100;
textAcceptPatternLData.grabExcessHorizontalSpace = true;
textAcceptPatternLData.horizontalAlignment = GridData.FILL;
textAcceptPattern.setLayoutData(textAcceptPatternLData);
}
}
{
advancedRuleOptionsGroup = new Group(ruleSetGroup, SWT.NONE);
GridLayout advancedRuleOptionsGroupLayout = new GridLayout();
GridData advancedRuleOptionsGroupLData = new GridData();
advancedRuleOptionsGroup.setEnabled(false);
advancedRuleOptionsGroupLData.heightHint = 31;
advancedRuleOptionsGroupLData.verticalAlignment = GridData.BEGINNING;
advancedRuleOptionsGroupLData.grabExcessHorizontalSpace = true;
advancedRuleOptionsGroupLData.horizontalAlignment = GridData.FILL;
advancedRuleOptionsGroup.setLayoutData(advancedRuleOptionsGroupLData);
advancedRuleOptionsGroupLayout.numColumns = 2;
advancedRuleOptionsGroup.setLayout(advancedRuleOptionsGroupLayout);
advancedRuleOptionsGroup.setText("Advanced Rule Options");
{
label4 = new Label(advancedRuleOptionsGroup, SWT.NONE);
GridData label4LData = new GridData();
label4.setEnabled(false);
label4.setLayoutData(label4LData);
label4.setText("RuleSet:");
}
{
textRuleSet = new Text(advancedRuleOptionsGroup, SWT.BORDER);
GridData textRuleSetLData = new GridData();
textRuleSet.setEnabled(false);
textRuleSetLData.widthHint = 100;
textRuleSetLData.heightHint = 13;
textRuleSet.setLayoutData(textRuleSetLData);
}
}
}
comboType.add( "Publish/Update" );
comboType.add( "Backup Copy" );
comboType.add( "Exact Copy" );
this.layout();
this.setSize(500, 400);
postInitGUI();
} catch (Exception e) {
ExceptionHandler.reportException( e );
}
}
|
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultPM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultPM.java
index 86eb7440f..d73146426 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultPM.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultPM.java
@@ -1,290 +1,291 @@
/*******************************************************************************
* Copyright (c) 2004, 2010 BREDEX GmbH.
* 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:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
package org.eclipse.jubula.client.core.persistence;
import java.util.Date;
import java.util.List;
import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.Query;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root;
import org.apache.commons.lang.time.DateUtils;
import org.eclipse.jubula.client.core.events.DataEventDispatcher;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.TestresultState;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.ITestResultPO;
import org.eclipse.jubula.client.core.model.ITestResultSummaryPO;
import org.eclipse.jubula.client.core.model.PoMaker;
import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.JBFatalException;
import org.eclipse.jubula.tools.exception.ProjectDeletedException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
/**
* PM to handle all test result related Persistence (JPA / EclipseLink) queries
*
* @author BREDEX GmbH
* @created Mar 3, 2010
*/
public class TestResultPM {
/**
* hide
*/
private TestResultPM() {
// empty
}
/**
* store test result details of test result node in database
* @param session Session
*/
public static final void storeTestResult(EntityManager session) {
try {
final EntityTransaction tx =
Persistor.instance().getTransaction(session);
Persistor.instance().commitTransaction(session, tx);
} catch (PMException e) {
throw new JBFatalException(Messages.StoringOfTestResultsFailed, e,
MessageIDs.E_DATABASE_GENERAL);
} catch (ProjectDeletedException e) {
throw new JBFatalException(Messages.StoringOfTestResultsFailed, e,
MessageIDs.E_PROJECT_NOT_FOUND);
} finally {
Persistor.instance().dropSession(session);
}
}
/**
* delete test result elements of selected summary
* @param resultId id of test result
*/
private static final void deleteTestresultOfSummary(
Long resultId) {
Persistor persistor = Persistor.instance();
if (persistor == null) {
return;
}
final EntityManager session = persistor.openSession();
try {
final EntityTransaction tx =
persistor.getTransaction(session);
persistor.lockDB();
executeDeleteTestresultOfSummary(session, resultId);
deleteMonitoringReports(session, resultId);
persistor.commitTransaction(session, tx);
} catch (PMException e) {
throw new JBFatalException(Messages.DeleteTestresultElementFailed,
e, MessageIDs.E_DATABASE_GENERAL);
} catch (ProjectDeletedException e) {
throw new JBFatalException(Messages.DeleteTestresultElementFailed,
e, MessageIDs.E_PROJECT_NOT_FOUND);
} finally {
persistor.dropSessionWithoutLockRelease(session);
persistor.unlockDB();
}
}
/**
* deleting monitoring reports by age (days of existence)
* or deleting all, if the summaryId is null.
* @param session The current session (EntityManager)
* @param summaryId The summaryToDelete.
* This value can be null, if all test results were deleted.
* if summaryId is null, all monitoring reports will also be deleted.
*/
private static void deleteMonitoringReports(
EntityManager session, Long summaryId) {
ITestResultSummaryPO summaryPo = null;
if (summaryId != null) {
summaryPo = session.find(
PoMaker.getTestResultSummaryClass(), summaryId);
if (summaryPo != null) {
summaryPo.setMonitoringReport(null);
summaryPo.setReportWritten(false);
}
} else {
// Optimization: Since all monitoring reports need to be deleted,
// we delete them with a JPQL query before removing
// them via iteration. This prevents OutOfMemoryErrors
// caused by loading all reports in to memory at the
// same time.
Query deleteMonitoringReportsQuery = session.createQuery(
- "DELETE from " + PoMaker.getMonitoringReportClass().getSimpleName()); //$NON-NLS-1$
+ "UPDATE " + PoMaker.getMonitoringReportClass().getSimpleName() //$NON-NLS-1$
+ + " SET report = null"); //$NON-NLS-1$
deleteMonitoringReportsQuery.executeUpdate();
session.flush();
StringBuilder queryBuilder = new StringBuilder();
queryBuilder.append("SELECT summary FROM ") //$NON-NLS-1$
.append(PoMaker.getTestResultSummaryClass().getSimpleName())
.append(" AS summary where summary.reportWritten = :isReportWritten"); //$NON-NLS-1$
Query q = session.createQuery(queryBuilder.toString());
q.setParameter("isReportWritten", true); //$NON-NLS-1$
@SuppressWarnings("unchecked")
List<ITestResultSummaryPO> reportList = q.getResultList();
for (ITestResultSummaryPO summary : reportList) {
summary.setMonitoringReport(null);
summary.setReportWritten(false);
}
}
}
/**
* execute delete-test-result of summary without commit
* @param session Session
* @param resultId id of testresult-summary-entry, or <code>null</code> if
* all test results should be deleted.
*/
public static final void executeDeleteTestresultOfSummary(
EntityManager session, Long resultId) {
boolean isDeleteAll = resultId == null;
//delete parameter details of test results
String paramQueryBaseString =
"delete from PARAMETER_DETAILS"; //$NON-NLS-1$
if (isDeleteAll) {
session.createNativeQuery(paramQueryBaseString).executeUpdate();
} else {
Query paramQuery = session.createNativeQuery(
paramQueryBaseString + " where FK_TESTRESULT in (select ID from TESTRESULT where INTERNAL_TESTRUN_ID = #summaryId)"); //$NON-NLS-1$
paramQuery.setParameter("summaryId", resultId); //$NON-NLS-1$
paramQuery.executeUpdate();
}
//delete test result details
StringBuilder resultQueryBuilder = new StringBuilder();
resultQueryBuilder.append(
"delete from TestResultPO testResult"); //$NON-NLS-1$
if (!isDeleteAll) {
resultQueryBuilder.append(" where testResult.internalTestResultSummaryID = :id"); //$NON-NLS-1$
}
Query resultQuery = session.createQuery(resultQueryBuilder.toString());
if (!isDeleteAll) {
resultQuery.setParameter("id", resultId); //$NON-NLS-1$
}
resultQuery.executeUpdate();
}
/**
* delete all test result details
*/
public static final void deleteAllTestresultDetails() {
deleteTestresultOfSummary(null);
}
/**
* clean test result details by age (days of existence)
* testrun summaries will not be deleted
* @param days days
* @param projGUID the project guid
* @param majorVersion the project major version number
* @param minorVersion the project minor version number
*/
public static final void cleanTestresultDetails(int days, String projGUID,
int majorVersion, int minorVersion) {
Date cleanDate = DateUtils.addDays(new Date(), days * -1);
try {
Set<Long> summaries = TestResultSummaryPM
.findTestResultSummariesByDate(cleanDate, projGUID,
majorVersion, minorVersion);
for (Long summaryId : summaries) {
deleteTestresultOfSummary(summaryId);
}
DataEventDispatcher.getInstance().fireTestresultChanged(
TestresultState.Refresh);
} catch (JBException e) {
throw new JBFatalException(Messages.DeletingTestresultsFailed, e,
MessageIDs.E_DELETE_TESTRESULT);
}
}
/**
* @param session The session in which to execute the Persistence (JPA / EclipseLink) query.
* @param summaryId The database ID of the summary for which to compute the
* corresponding Test Result nodes.
* @return the Test Result nodes associated with the given Test Result
* Summary, sorted by sequence (ascending).
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
public static List<ITestResultPO> computeTestResultListForSummary(
EntityManager session, Long summaryId) {
CriteriaBuilder builder = session.getCriteriaBuilder();
CriteriaQuery query = builder.createQuery();
Root from = query.from(PoMaker.getTestResultClass());
query.orderBy(builder.asc(from.get("keywordSequence"))) //$NON-NLS-1$
.select(from).where(
builder.equal(from.get("internalTestResultSummaryID"), summaryId)); //$NON-NLS-1$
return session.createQuery(query).getResultList();
}
/**
* @param session The session in which to execute the Persistence (JPA / EclipseLink) query.
* @param summaryId The database ID of the summary for which to compute the
* corresponding Test Result nodes.
* @return the Test Result nodes associated with the given Test Result
* Summary, sorted by sequence (ascending).
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
public static boolean hasTestResultDetails(
EntityManager session, Long summaryId) {
boolean hasDetails = false;
if (session == null) {
return hasDetails;
}
CriteriaBuilder builder = session.getCriteriaBuilder();
CriteriaQuery query = builder.createQuery();
Root from = query.from(PoMaker.getTestResultClass());
query.select(builder.count(from)).where(
builder.equal(from.get("internalTestResultSummaryID"), summaryId)); //$NON-NLS-1$
Number result = (Number)session.createQuery(query).getSingleResult();
if (result.longValue() > 0) {
hasDetails = true;
}
return hasDetails;
}
/**
* @param session
* The session in which to execute the Persistence (JPA / EclipseLink) query.
* @return a list of test result ids that have test result details
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
public static List<Number>
computeTestresultIdsWithDetails(EntityManager session) {
CriteriaBuilder builder = session.getCriteriaBuilder();
CriteriaQuery query = builder.createQuery();
Path from = query.from(PoMaker.getTestResultClass()).get("internalTestResultSummaryID"); //$NON-NLS-1$
query.select(from).distinct(true);
return session.createQuery(query).getResultList();
}
}
| true | true | private static void deleteMonitoringReports(
EntityManager session, Long summaryId) {
ITestResultSummaryPO summaryPo = null;
if (summaryId != null) {
summaryPo = session.find(
PoMaker.getTestResultSummaryClass(), summaryId);
if (summaryPo != null) {
summaryPo.setMonitoringReport(null);
summaryPo.setReportWritten(false);
}
} else {
// Optimization: Since all monitoring reports need to be deleted,
// we delete them with a JPQL query before removing
// them via iteration. This prevents OutOfMemoryErrors
// caused by loading all reports in to memory at the
// same time.
Query deleteMonitoringReportsQuery = session.createQuery(
"DELETE from " + PoMaker.getMonitoringReportClass().getSimpleName()); //$NON-NLS-1$
deleteMonitoringReportsQuery.executeUpdate();
session.flush();
StringBuilder queryBuilder = new StringBuilder();
queryBuilder.append("SELECT summary FROM ") //$NON-NLS-1$
.append(PoMaker.getTestResultSummaryClass().getSimpleName())
.append(" AS summary where summary.reportWritten = :isReportWritten"); //$NON-NLS-1$
Query q = session.createQuery(queryBuilder.toString());
q.setParameter("isReportWritten", true); //$NON-NLS-1$
@SuppressWarnings("unchecked")
List<ITestResultSummaryPO> reportList = q.getResultList();
for (ITestResultSummaryPO summary : reportList) {
summary.setMonitoringReport(null);
summary.setReportWritten(false);
}
}
}
| private static void deleteMonitoringReports(
EntityManager session, Long summaryId) {
ITestResultSummaryPO summaryPo = null;
if (summaryId != null) {
summaryPo = session.find(
PoMaker.getTestResultSummaryClass(), summaryId);
if (summaryPo != null) {
summaryPo.setMonitoringReport(null);
summaryPo.setReportWritten(false);
}
} else {
// Optimization: Since all monitoring reports need to be deleted,
// we delete them with a JPQL query before removing
// them via iteration. This prevents OutOfMemoryErrors
// caused by loading all reports in to memory at the
// same time.
Query deleteMonitoringReportsQuery = session.createQuery(
"UPDATE " + PoMaker.getMonitoringReportClass().getSimpleName() //$NON-NLS-1$
+ " SET report = null"); //$NON-NLS-1$
deleteMonitoringReportsQuery.executeUpdate();
session.flush();
StringBuilder queryBuilder = new StringBuilder();
queryBuilder.append("SELECT summary FROM ") //$NON-NLS-1$
.append(PoMaker.getTestResultSummaryClass().getSimpleName())
.append(" AS summary where summary.reportWritten = :isReportWritten"); //$NON-NLS-1$
Query q = session.createQuery(queryBuilder.toString());
q.setParameter("isReportWritten", true); //$NON-NLS-1$
@SuppressWarnings("unchecked")
List<ITestResultSummaryPO> reportList = q.getResultList();
for (ITestResultSummaryPO summary : reportList) {
summary.setMonitoringReport(null);
summary.setReportWritten(false);
}
}
}
|
diff --git a/src/de/uni_koblenz/jgralab/greql2/evaluator/vertexeval/TypeIdEvaluator.java b/src/de/uni_koblenz/jgralab/greql2/evaluator/vertexeval/TypeIdEvaluator.java
index f653c801d..23ebd5ddd 100644
--- a/src/de/uni_koblenz/jgralab/greql2/evaluator/vertexeval/TypeIdEvaluator.java
+++ b/src/de/uni_koblenz/jgralab/greql2/evaluator/vertexeval/TypeIdEvaluator.java
@@ -1,133 +1,133 @@
/*
* JGraLab - The Java graph laboratory
* (c) 2006-2008 Institute for Software Technology
* University of Koblenz-Landau, Germany
*
* [email protected]
*
* Please report bugs to http://serres.uni-koblenz.de/bugzilla
*
* 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 de.uni_koblenz.jgralab.greql2.evaluator.vertexeval;
import java.util.ArrayList;
import java.util.List;
import de.uni_koblenz.jgralab.Graph;
import de.uni_koblenz.jgralab.Vertex;
import de.uni_koblenz.jgralab.greql2.evaluator.GreqlEvaluator;
import de.uni_koblenz.jgralab.greql2.evaluator.costmodel.GraphSize;
import de.uni_koblenz.jgralab.greql2.evaluator.costmodel.VertexCosts;
import de.uni_koblenz.jgralab.greql2.exception.EvaluateException;
import de.uni_koblenz.jgralab.greql2.exception.UnknownTypeException;
import de.uni_koblenz.jgralab.greql2.jvalue.JValue;
import de.uni_koblenz.jgralab.greql2.jvalue.JValueTypeCollection;
import de.uni_koblenz.jgralab.greql2.schema.TypeId;
import de.uni_koblenz.jgralab.schema.AttributedElementClass;
import de.uni_koblenz.jgralab.schema.QualifiedName;
import de.uni_koblenz.jgralab.schema.Schema;
/**
* Creates a List of types out of the TypeId-Vertex.
*
* @author [email protected]
*
*/
public class TypeIdEvaluator extends VertexEvaluator {
/**
* returns the vertex this VertexEvaluator evaluates
*/
@Override
public Vertex getVertex() {
return vertex;
}
private TypeId vertex;
public TypeIdEvaluator(TypeId vertex, GreqlEvaluator eval) {
super(eval);
this.vertex = vertex;
}
/**
* Creates a list of types from this TypeId-Vertex
*
* @param schema
* the schema of the datagraph
* @return the generated list of types
*/
protected List<AttributedElementClass> createTypeList(Schema schema)
throws EvaluateException {
ArrayList<AttributedElementClass> returnTypes = new ArrayList<AttributedElementClass>();
AttributedElementClass elemClass = (AttributedElementClass) schema
.getAttributedElementClass(new QualifiedName(vertex.getName()));
if (elemClass == null) {
elemClass = greqlEvaluator.getKnownType(vertex.getName());
if (elemClass == null)
throw new UnknownTypeException(vertex.getName(),
createPossibleSourcePositions());
else
vertex.setName(elemClass.getQualifiedName());
}
returnTypes.add(elemClass);
if (!vertex.isType()) {
- returnTypes.add(elemClass);
+ returnTypes.addAll(elemClass.getAllSubClasses());
}
return returnTypes;
}
@Override
public JValue evaluate() throws EvaluateException {
Graph datagraph = getDatagraph();
Schema schema = datagraph.getSchema();
return new JValueTypeCollection(createTypeList(schema), vertex
.isExcluded());
}
@Override
public VertexCosts calculateSubtreeEvaluationCosts(GraphSize graphSize) {
return this.greqlEvaluator.getCostModel().calculateCostsTypeId(this,
graphSize);
}
@Override
public double calculateEstimatedSelectivity(GraphSize graphSize) {
return greqlEvaluator.getCostModel().calculateSelectivityTypeId(this,
graphSize);
}
/*
* (non-Javadoc)
*
* @seede.uni_koblenz.jgralab.greql2.evaluator.vertexeval.VertexEvaluator#
* getLoggingName()
*/
@Override
public String getLoggingName() {
StringBuilder name = new StringBuilder();
name.append(vertex.getAttributedElementClass().getQualifiedName());
if (vertex.isType()) {
name.append("-type");
}
if (vertex.isExcluded()) {
name.append("-excluded");
}
return name.toString();
}
}
| true | true | protected List<AttributedElementClass> createTypeList(Schema schema)
throws EvaluateException {
ArrayList<AttributedElementClass> returnTypes = new ArrayList<AttributedElementClass>();
AttributedElementClass elemClass = (AttributedElementClass) schema
.getAttributedElementClass(new QualifiedName(vertex.getName()));
if (elemClass == null) {
elemClass = greqlEvaluator.getKnownType(vertex.getName());
if (elemClass == null)
throw new UnknownTypeException(vertex.getName(),
createPossibleSourcePositions());
else
vertex.setName(elemClass.getQualifiedName());
}
returnTypes.add(elemClass);
if (!vertex.isType()) {
returnTypes.add(elemClass);
}
return returnTypes;
}
| protected List<AttributedElementClass> createTypeList(Schema schema)
throws EvaluateException {
ArrayList<AttributedElementClass> returnTypes = new ArrayList<AttributedElementClass>();
AttributedElementClass elemClass = (AttributedElementClass) schema
.getAttributedElementClass(new QualifiedName(vertex.getName()));
if (elemClass == null) {
elemClass = greqlEvaluator.getKnownType(vertex.getName());
if (elemClass == null)
throw new UnknownTypeException(vertex.getName(),
createPossibleSourcePositions());
else
vertex.setName(elemClass.getQualifiedName());
}
returnTypes.add(elemClass);
if (!vertex.isType()) {
returnTypes.addAll(elemClass.getAllSubClasses());
}
return returnTypes;
}
|
diff --git a/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java b/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
index 5be0bad7e..f5eca9b7d 100644
--- a/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
+++ b/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
@@ -1,155 +1,157 @@
package org.apache.maven.continuum.project.builder;
/*
* Copyright 2004-2006 The Apache Software Foundation.
*
* 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.
*/
import org.codehaus.plexus.formica.util.MungedHttpsURL;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
/**
* @author <a href="mailto:[email protected]">Trygve Laugstøl</a>
* @version $Id$
*/
public abstract class AbstractContinuumProjectBuilder
extends AbstractLogEnabled
implements ContinuumProjectBuilder
{
private static final String TMP_DIR = System.getProperty( "java.io.tmpdir" );
protected File createMetadataFile( URL metadata, String username, String password )
throws IOException
{
getLogger().info( "Downloading " + metadata.toExternalForm() );
InputStream is = null;
if ( metadata.getProtocol().startsWith( "http" ) )
{
is = new MungedHttpsURL( metadata.toExternalForm(), username, password ).getURLConnection().getInputStream();
}
else
{
is = metadata.openStream();
}
String path = metadata.getPath();
String baseDirectory;
String fileName;
int lastIndex = path.lastIndexOf( "/" );
if ( lastIndex >= 0 )
{
baseDirectory = path.substring( 0, lastIndex );
// Required for windows
int colonIndex = baseDirectory.indexOf( ":" );
if ( colonIndex >= 0 )
{
baseDirectory = baseDirectory.substring( colonIndex + 1 );
}
fileName = path.substring( lastIndex + 1 );
}
else
{
baseDirectory = "";
fileName = path;
}
// Little hack for URLs that contains '*' like "http://svn.codehaus.org/*checkout*/trunk/pom.xml?root=plexus"
baseDirectory = StringUtils.replace( baseDirectory, "*", "" );
File continuumTmpDir = new File( TMP_DIR, "continuum" );
File uploadDirectory = new File( continuumTmpDir, baseDirectory );
+ // resolve any '..' as it will cause issues
+ uploadDirectory = uploadDirectory.getCanonicalFile();
uploadDirectory.mkdirs();
FileUtils.forceDeleteOnExit( continuumTmpDir );
File file = new File( uploadDirectory, fileName );
file.deleteOnExit();
FileWriter writer = new FileWriter( file );
IOUtil.copy( is, writer );
is.close();
writer.close();
return file;
}
/**
* Create metadata file and handle exceptions, adding the errors to the result object.
*
* @param result holder with result and errors.
* @param metadata
* @param username
* @param password
* @return
*/
protected File createMetadataFile( ContinuumProjectBuildingResult result, URL metadata, String username,
String password )
{
try
{
return createMetadataFile( metadata, username, password );
}
catch ( FileNotFoundException e )
{
getLogger().info( "URL not found: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_POM_NOT_FOUND );
}
catch ( MalformedURLException e )
{
getLogger().info( "Malformed URL: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
}
catch ( UnknownHostException e )
{
getLogger().info( "Unknown host: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN_HOST );
}
catch ( IOException e )
{
getLogger().warn( "Could not download the URL: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
}
return null;
}
}
| true | true | protected File createMetadataFile( URL metadata, String username, String password )
throws IOException
{
getLogger().info( "Downloading " + metadata.toExternalForm() );
InputStream is = null;
if ( metadata.getProtocol().startsWith( "http" ) )
{
is = new MungedHttpsURL( metadata.toExternalForm(), username, password ).getURLConnection().getInputStream();
}
else
{
is = metadata.openStream();
}
String path = metadata.getPath();
String baseDirectory;
String fileName;
int lastIndex = path.lastIndexOf( "/" );
if ( lastIndex >= 0 )
{
baseDirectory = path.substring( 0, lastIndex );
// Required for windows
int colonIndex = baseDirectory.indexOf( ":" );
if ( colonIndex >= 0 )
{
baseDirectory = baseDirectory.substring( colonIndex + 1 );
}
fileName = path.substring( lastIndex + 1 );
}
else
{
baseDirectory = "";
fileName = path;
}
// Little hack for URLs that contains '*' like "http://svn.codehaus.org/*checkout*/trunk/pom.xml?root=plexus"
baseDirectory = StringUtils.replace( baseDirectory, "*", "" );
File continuumTmpDir = new File( TMP_DIR, "continuum" );
File uploadDirectory = new File( continuumTmpDir, baseDirectory );
uploadDirectory.mkdirs();
FileUtils.forceDeleteOnExit( continuumTmpDir );
File file = new File( uploadDirectory, fileName );
file.deleteOnExit();
FileWriter writer = new FileWriter( file );
IOUtil.copy( is, writer );
is.close();
writer.close();
return file;
}
| protected File createMetadataFile( URL metadata, String username, String password )
throws IOException
{
getLogger().info( "Downloading " + metadata.toExternalForm() );
InputStream is = null;
if ( metadata.getProtocol().startsWith( "http" ) )
{
is = new MungedHttpsURL( metadata.toExternalForm(), username, password ).getURLConnection().getInputStream();
}
else
{
is = metadata.openStream();
}
String path = metadata.getPath();
String baseDirectory;
String fileName;
int lastIndex = path.lastIndexOf( "/" );
if ( lastIndex >= 0 )
{
baseDirectory = path.substring( 0, lastIndex );
// Required for windows
int colonIndex = baseDirectory.indexOf( ":" );
if ( colonIndex >= 0 )
{
baseDirectory = baseDirectory.substring( colonIndex + 1 );
}
fileName = path.substring( lastIndex + 1 );
}
else
{
baseDirectory = "";
fileName = path;
}
// Little hack for URLs that contains '*' like "http://svn.codehaus.org/*checkout*/trunk/pom.xml?root=plexus"
baseDirectory = StringUtils.replace( baseDirectory, "*", "" );
File continuumTmpDir = new File( TMP_DIR, "continuum" );
File uploadDirectory = new File( continuumTmpDir, baseDirectory );
// resolve any '..' as it will cause issues
uploadDirectory = uploadDirectory.getCanonicalFile();
uploadDirectory.mkdirs();
FileUtils.forceDeleteOnExit( continuumTmpDir );
File file = new File( uploadDirectory, fileName );
file.deleteOnExit();
FileWriter writer = new FileWriter( file );
IOUtil.copy( is, writer );
is.close();
writer.close();
return file;
}
|
diff --git a/game/screen/ScreenMainMenu.java b/game/screen/ScreenMainMenu.java
index cac1654..fcd225b 100644
--- a/game/screen/ScreenMainMenu.java
+++ b/game/screen/ScreenMainMenu.java
@@ -1,96 +1,96 @@
package game.screen;
import game.Game;
import game.Map;
import game.utils.FileSaver;
import game.utils.SpriteSheet;
import java.awt.Color;
import java.awt.Graphics;
import java.awt.Rectangle;
import java.awt.event.KeyEvent;
public class ScreenMainMenu extends Screen {
Graphics g;
private int lastWidth = 0;
private int lastHeight = 0;
public ScreenMainMenu(int width, int height, SpriteSheet sheet) {
super(width, height, sheet);
addButton("Singleplayer", new Rectangle(290, 116, 232, 25));
addButton("Wave mode", new Rectangle(290, 148, 232, 25));
addButton("Map editor", new Rectangle(290, 180, 232, 25));
addButton("Options", new Rectangle(290, 212, 232, 25));
addButton("Exit", new Rectangle(290, 244, 232, 25));
}
@Override
public void render(Graphics g) {
this.g = g;
this.drawBackgroundScreen();
// this.drawAnimatedBackground();
//game.getFontRenderer().drawCenteredString(Game.TITLE, 36, 3);
g.drawImage(game.logo, (game.getWidth()/2)-164, 36, 328, 66, game);
ScreenTools.drawButton((game.getWidth()/2)-116, 116, 232, 25, "Singleplayer", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 148, 232, 25, "TEST BUTTON", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 180, 232, 25, "Map Editor", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 212, 232, 25, "Options", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 244, 232, 25, "Quit", g, game, new Color(
255, 255, 255, 155), Color.white);
game.getFontRenderer().drawString(
String.format("%s version %s", Game.TITLE, Game.VERSION), 0,
game.getHeight()-9, 1);
if(game.startError != null)
- ScreenTools.drawButton(100, 300, 600, 200, "Substrate experianced the following\nerror whilst starting:\n "+game.startError+"\n\nThe game may not work correctly!", g, game, new Color(155,0,0), new Color(255,255,255,255));
+ ScreenTools.drawButton(100, 300, 600, 200, "Substrate experienced the following\nerror whilst starting:\n "+game.startError+"\n\nThe game may not work correctly!", g, game, new Color(155,0,0), new Color(255,255,255,255));
}
@Override
public void tick() {
if(game.getWidth() != lastWidth || game.getHeight() != lastHeight)
{
lastWidth = game.getWidth();
lastHeight = game.getHeight();
clearButtons();
addButton("Singleplayer", new Rectangle((game.getWidth()/2)-116, 116, 232, 25));
addButton("Wave mode", new Rectangle((game.getWidth()/2)-116, 148, 232, 25));
addButton("Map editor", new Rectangle((game.getWidth()/2)-116, 180, 232, 25));
addButton("Options", new Rectangle((game.getWidth()/2)-116, 212, 232, 25));
addButton("Exit", new Rectangle((game.getWidth()/2)-116, 244, 232, 25));
}
}
@Override
public void postAction(String action) {
switch (action) {
case "Singleplayer":
game.setScreen(new ScreenIntro(w, h, sheet));
break;
case "Wave mode":
game.setScreen(new ScreenDeath(w, h, sheet));
break;
case "Map editor":
game.setScreen(new ScreenMapEditor(w, h, sheet));
break;
case "Options":
game.setScreen(new ScreenOptions(w, h, sheet, game.SETTINGS));
break;
case "Exit":
game.shutdown();
break;
}
}
@Override
public void keyReleased(KeyEvent arg0) {
}
}
| true | true | public void render(Graphics g) {
this.g = g;
this.drawBackgroundScreen();
// this.drawAnimatedBackground();
//game.getFontRenderer().drawCenteredString(Game.TITLE, 36, 3);
g.drawImage(game.logo, (game.getWidth()/2)-164, 36, 328, 66, game);
ScreenTools.drawButton((game.getWidth()/2)-116, 116, 232, 25, "Singleplayer", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 148, 232, 25, "TEST BUTTON", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 180, 232, 25, "Map Editor", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 212, 232, 25, "Options", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 244, 232, 25, "Quit", g, game, new Color(
255, 255, 255, 155), Color.white);
game.getFontRenderer().drawString(
String.format("%s version %s", Game.TITLE, Game.VERSION), 0,
game.getHeight()-9, 1);
if(game.startError != null)
ScreenTools.drawButton(100, 300, 600, 200, "Substrate experianced the following\nerror whilst starting:\n "+game.startError+"\n\nThe game may not work correctly!", g, game, new Color(155,0,0), new Color(255,255,255,255));
}
| public void render(Graphics g) {
this.g = g;
this.drawBackgroundScreen();
// this.drawAnimatedBackground();
//game.getFontRenderer().drawCenteredString(Game.TITLE, 36, 3);
g.drawImage(game.logo, (game.getWidth()/2)-164, 36, 328, 66, game);
ScreenTools.drawButton((game.getWidth()/2)-116, 116, 232, 25, "Singleplayer", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 148, 232, 25, "TEST BUTTON", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 180, 232, 25, "Map Editor", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 212, 232, 25, "Options", g, game,
new Color(255, 255, 255, 155), Color.white);
ScreenTools.drawButton((game.getWidth()/2)-116, 244, 232, 25, "Quit", g, game, new Color(
255, 255, 255, 155), Color.white);
game.getFontRenderer().drawString(
String.format("%s version %s", Game.TITLE, Game.VERSION), 0,
game.getHeight()-9, 1);
if(game.startError != null)
ScreenTools.drawButton(100, 300, 600, 200, "Substrate experienced the following\nerror whilst starting:\n "+game.startError+"\n\nThe game may not work correctly!", g, game, new Color(155,0,0), new Color(255,255,255,255));
}
|
diff --git a/master/src/com/indago/helpme/gui/dashboard/HelpEEDashboardActivity.java b/master/src/com/indago/helpme/gui/dashboard/HelpEEDashboardActivity.java
index a259c4b..c15dc05 100644
--- a/master/src/com/indago/helpme/gui/dashboard/HelpEEDashboardActivity.java
+++ b/master/src/com/indago/helpme/gui/dashboard/HelpEEDashboardActivity.java
@@ -1,467 +1,467 @@
package com.indago.helpme.gui.dashboard;
import android.animation.Animator;
import android.animation.AnimatorInflater;
import android.animation.AnimatorListenerAdapter;
import android.media.MediaPlayer;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.os.Vibrator;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnTouchListener;
import android.widget.ImageView;
import com.android.helpme.demo.interfaces.DrawManagerInterface;
import com.android.helpme.demo.manager.HistoryManager;
import com.android.helpme.demo.manager.MessageOrchestrator;
import com.android.helpme.demo.manager.UserManager;
import com.android.helpme.demo.utils.Task;
import com.android.helpme.demo.utils.ThreadPool;
import com.android.helpme.demo.utils.User;
import com.indago.helpme.R;
import com.indago.helpme.gui.ATemplateActivity;
import com.indago.helpme.gui.dashboard.statemachine.HelpEEStateMachine;
import com.indago.helpme.gui.dashboard.statemachine.STATES;
import com.indago.helpme.gui.dashboard.views.HelpEEButtonView;
import com.indago.helpme.gui.dashboard.views.HelpEEHintView;
import com.indago.helpme.gui.dashboard.views.HelpEEProgressView;
/**
*
* @author martinmajewski
*
*/
public class HelpEEDashboardActivity extends ATemplateActivity implements DrawManagerInterface {
private static final String LOGTAG = HelpEEDashboardActivity.class.getSimpleName();
private Handler mHandler;
private MessageOrchestrator orchestrator;
private ImageView mTopCover;
private ImageView mHelpMeLogo;
private Animator mFadeIn;
private Animator mFadeOut;
private HelpEEProgressView mProgressBars;
private HelpEEButtonView mButton;
private HelpEEHintView mHintViewer;
private HelpEEStateMachine mStateMachine;
private Vibrator mVibrator;
private ResetTimer mIdleTimer;
private MediaPlayerExitTimer mMP3Timer;
@Override
public void onCreate(Bundle savedInstanceState) {
Log.d(LOGTAG, "onCreate()");
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_help_ee_dashboard);
mHandler = new Handler();
mVibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
mTopCover = (ImageView) findViewById(R.id.iv_topcover);
mFadeIn = (Animator) AnimatorInflater.loadAnimator(getApplicationContext(), R.animator.fade_in);
mFadeOut = (Animator) AnimatorInflater.loadAnimator(getApplicationContext(), R.animator.fade_out);
mProgressBars = (HelpEEProgressView) findViewById(R.id.iv_help_ee_indicator);
mHintViewer = (HelpEEHintView) findViewById(R.id.tv_help_ee_infoarea);
mButton = (HelpEEButtonView) findViewById(R.id.btn_help_ee_button);
mHelpMeLogo = (ImageView) findViewById(R.id.iv_logo);
mStateMachine = HelpEEStateMachine.getInstance();
mStateMachine.addOne(mButton);
mStateMachine.addOne(mHintViewer);
mStateMachine.addOne(mProgressBars);
mStateMachine.setState(STATES.SHIELDED);
init();
}
@Override
protected void onResume() {
mStateMachine.setState(STATES.SHIELDED);
orchestrator.addDrawManager(DRAWMANAGER_TYPE.SEEKER, this);
super.onResume();
}
@Override
public void onBackPressed() {
if(mStateMachine.getState() == STATES.FINISHED || mStateMachine.getState() == STATES.SHIELDED) {
exit();
}
}
private void exit() {
if(mIdleTimer != null) {
mIdleTimer.dismiss();
}
if(mMP3Timer != null) {
mMP3Timer.dismiss();
}
orchestrator.removeDrawManager(DRAWMANAGER_TYPE.SEEKER);
orchestrator.removeDrawManager(DRAWMANAGER_TYPE.HELPERCOMMING);
ThreadPool.runTask(UserManager.getInstance().deleteUserChoice(getApplicationContext()));
finish();
}
private void init() {
final MediaPlayer player = MediaPlayer.create(this, R.raw.callcenter);
mHelpMeLogo.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if(mStateMachine.getState() == STATES.HELP_INCOMMING) {
- mStateMachine.nextState();
+ mStateMachine.setState(STATES.HELP_ARRIVED);
}
}
});
mButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if(mStateMachine.getState() == STATES.HELP_ARRIVED) {
mHandler.post(new Runnable() {
@Override
public void run() {
exit();
}
});
}
}
});
mButton.setOnTouchListener(new OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
if(v instanceof HelpEEButtonView) {
switch(event.getAction()) {
case MotionEvent.ACTION_DOWN:
if(mStateMachine.getState() != STATES.LOCKED &&
mStateMachine.getState() != STATES.HELP_ARRIVED &&
mStateMachine.getState() != STATES.FINISHED) {
mStateMachine.nextState();
switch((STATES) mStateMachine.getState()) {
case PART_SHIELDED:
if(mIdleTimer == null) {
mIdleTimer = new ResetTimer();
mIdleTimer.execute(6000L);
}
break;
case PRESSED:
if(mIdleTimer != null) {
mIdleTimer.dismiss();
}
break;
case CALLCENTER_PRESSED:
mMP3Timer = new MediaPlayerExitTimer();
mMP3Timer.execute(player);
mStateMachine.setState(STATES.FINISHED);
break;
default:
if(mIdleTimer != null) {
mIdleTimer.resetTime();
}
break;
}
mVibrator.vibrate(15);
}
break;
case MotionEvent.ACTION_UP:
if(mStateMachine.getState() == STATES.PRESSED) {
ButtonStateChangeDelay mBRTimer = new ButtonStateChangeDelay();
mBRTimer.execute(STATES.LOCKED);
HistoryManager.getInstance().startNewTask();
}
break;
}
}
return false;
}
});
orchestrator = MessageOrchestrator.getInstance();
}
private void reset() {
mTopCover.setImageResource(R.drawable.drawable_white);
mFadeIn.setTarget(mTopCover);
mFadeOut.setTarget(mTopCover);
mFadeOut.setStartDelay(100);
mFadeIn.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
mStateMachine.setState(STATES.SHIELDED);
mFadeOut.start();
super.onAnimationEnd(animation);
}
});
long[] pattern = { 0, 25, 75, 25, 75, 25, 75, 25 };
mVibrator.vibrate(pattern, -1);
mFadeIn.start();
}
public void toHelpIncomming() {
if(mStateMachine.getState() == STATES.LOCKED) {
mTopCover.setImageResource(R.drawable.drawable_green);
mFadeIn.setTarget(mTopCover);
mFadeOut.setTarget(mTopCover);
mFadeOut.setStartDelay(100);
mFadeIn.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
mStateMachine.setState(STATES.HELP_INCOMMING);
mFadeOut.start();
super.onAnimationEnd(animation);
}
});
orchestrator.removeDrawManager(DRAWMANAGER_TYPE.SEEKER);
orchestrator.addDrawManager(DRAWMANAGER_TYPE.HELPERCOMMING, this);
long[] pattern = { 0, 25, 75, 25, 75, 25, 75, 25 };
mVibrator.vibrate(pattern, -1);
mFadeIn.start();
}
}
public void toCallCenter() {
if(mStateMachine.getState() == STATES.LOCKED) {
mTopCover.setImageResource(R.drawable.drawable_yellow);
mFadeIn.setTarget(mTopCover);
mFadeOut.setTarget(mTopCover);
mFadeOut.setStartDelay(100);
mFadeIn.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
mStateMachine.setState(STATES.CALLCENTER);
mFadeOut.start();
super.onAnimationEnd(animation);
}
});
long[] pattern = { 0, 25, 75, 25, 75, 25, 75, 25 };
mVibrator.vibrate(pattern, -1);
mFadeIn.start();
}
}
@Override
public void drawThis(Object object) {
if(object instanceof User) {
if(mStateMachine.getState() != STATES.HELP_INCOMMING) {
mHandler.post(new Runnable() {
@Override
public void run() {
toHelpIncomming();
}
});
}
}
if(object instanceof Task) {
Task task = (Task) object;
if(!task.isSuccsessfull()) {
mHandler.post(new Runnable() {
@Override
public void run() {
toCallCenter();
}
});
}
else {
orchestrator.removeDrawManager(DRAWMANAGER_TYPE.HELPERCOMMING);
mHandler.post(new Runnable() {
@Override
public void run() {
mStateMachine.setState(STATES.HELP_ARRIVED);
// exit();
}
});
}
}
}
class ResetTimer extends AsyncTask<Long, Void, Void> {
private volatile long idleTimeout = 10000;
private volatile boolean dismissed = false;
private long oldTime;
public ResetTimer() {}
synchronized public void resetTime() {
oldTime = System.currentTimeMillis();
}
synchronized public void dismiss() {
dismissed = true;
mIdleTimer = null;
}
@Override
protected Void doInBackground(Long... params) {
idleTimeout = params[0];
oldTime = System.currentTimeMillis();
while(!dismissed && (System.currentTimeMillis() - oldTime) <= idleTimeout) {
try {
Thread.sleep((long) (250));
} catch(InterruptedException e) {
e.printStackTrace();
}
}
return null;
}
@Override
protected void onPostExecute(Void result) {
if(!dismissed) {
reset();
}
super.onPostExecute(result);
mIdleTimer = null;
}
}
class SetStateTimer extends AsyncTask<STATES, Void, STATES> {
private volatile long idleTimeout = 10000;
private volatile boolean dismissed = false;
private long oldTime;
public SetStateTimer(long waitTime) {
idleTimeout = waitTime;
}
synchronized public void dismiss() {
dismissed = true;
}
@Override
protected STATES doInBackground(STATES... params) {
oldTime = System.currentTimeMillis();
while(!dismissed && (System.currentTimeMillis() - oldTime) <= idleTimeout) {
try {
Thread.sleep((long) (250));
} catch(InterruptedException e) {
e.printStackTrace();
}
}
return params[0];
}
@Override
protected void onPostExecute(STATES result) {
if(!dismissed && result != null) {
mStateMachine.setState(result);
}
super.onPostExecute(result);
}
}
class ButtonStateChangeDelay extends AsyncTask<STATES, Void, STATES> {
@Override
protected STATES doInBackground(STATES... params) {
try {
Thread.sleep((long) (500));
} catch(InterruptedException e) {
e.printStackTrace();
}
return params[0];
}
@Override
protected void onPostExecute(STATES state) {
if(state != null) {
mStateMachine.setState(state);
}
super.onPostExecute(state);
}
}
class MediaPlayerExitTimer extends AsyncTask<MediaPlayer, Void, Void> {
private MediaPlayer player;
private volatile boolean dismissed = false;
synchronized public void dismiss() {
dismissed = true;
}
@Override
protected Void doInBackground(MediaPlayer... params) {
player = params[0];
try {
if(!dismissed && player != null) {
player.start();
while(!dismissed && player.isPlaying()) {
Thread.sleep(1000);
}
}
} catch(InterruptedException e) {
e.printStackTrace();
} catch(IllegalStateException e) {
Log.e(LOGTAG, "MediaPlayerExitTimer Thread - MediaPlayer throws IllegalStateException!");
e.printStackTrace();
}
return null;
}
@Override
protected void onPostExecute(Void result) {
if(dismissed && player != null) {
player.seekTo(player.getDuration());
player.stop();
player.release();
}
super.onPostExecute(result);
exit();
}
}
}
| true | true | private void init() {
final MediaPlayer player = MediaPlayer.create(this, R.raw.callcenter);
mHelpMeLogo.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if(mStateMachine.getState() == STATES.HELP_INCOMMING) {
mStateMachine.nextState();
}
}
});
mButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if(mStateMachine.getState() == STATES.HELP_ARRIVED) {
mHandler.post(new Runnable() {
@Override
public void run() {
exit();
}
});
}
}
});
mButton.setOnTouchListener(new OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
if(v instanceof HelpEEButtonView) {
switch(event.getAction()) {
case MotionEvent.ACTION_DOWN:
if(mStateMachine.getState() != STATES.LOCKED &&
mStateMachine.getState() != STATES.HELP_ARRIVED &&
mStateMachine.getState() != STATES.FINISHED) {
mStateMachine.nextState();
switch((STATES) mStateMachine.getState()) {
case PART_SHIELDED:
if(mIdleTimer == null) {
mIdleTimer = new ResetTimer();
mIdleTimer.execute(6000L);
}
break;
case PRESSED:
if(mIdleTimer != null) {
mIdleTimer.dismiss();
}
break;
case CALLCENTER_PRESSED:
mMP3Timer = new MediaPlayerExitTimer();
mMP3Timer.execute(player);
mStateMachine.setState(STATES.FINISHED);
break;
default:
if(mIdleTimer != null) {
mIdleTimer.resetTime();
}
break;
}
mVibrator.vibrate(15);
}
break;
case MotionEvent.ACTION_UP:
if(mStateMachine.getState() == STATES.PRESSED) {
ButtonStateChangeDelay mBRTimer = new ButtonStateChangeDelay();
mBRTimer.execute(STATES.LOCKED);
HistoryManager.getInstance().startNewTask();
}
break;
}
}
return false;
}
});
orchestrator = MessageOrchestrator.getInstance();
}
| private void init() {
final MediaPlayer player = MediaPlayer.create(this, R.raw.callcenter);
mHelpMeLogo.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if(mStateMachine.getState() == STATES.HELP_INCOMMING) {
mStateMachine.setState(STATES.HELP_ARRIVED);
}
}
});
mButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if(mStateMachine.getState() == STATES.HELP_ARRIVED) {
mHandler.post(new Runnable() {
@Override
public void run() {
exit();
}
});
}
}
});
mButton.setOnTouchListener(new OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
if(v instanceof HelpEEButtonView) {
switch(event.getAction()) {
case MotionEvent.ACTION_DOWN:
if(mStateMachine.getState() != STATES.LOCKED &&
mStateMachine.getState() != STATES.HELP_ARRIVED &&
mStateMachine.getState() != STATES.FINISHED) {
mStateMachine.nextState();
switch((STATES) mStateMachine.getState()) {
case PART_SHIELDED:
if(mIdleTimer == null) {
mIdleTimer = new ResetTimer();
mIdleTimer.execute(6000L);
}
break;
case PRESSED:
if(mIdleTimer != null) {
mIdleTimer.dismiss();
}
break;
case CALLCENTER_PRESSED:
mMP3Timer = new MediaPlayerExitTimer();
mMP3Timer.execute(player);
mStateMachine.setState(STATES.FINISHED);
break;
default:
if(mIdleTimer != null) {
mIdleTimer.resetTime();
}
break;
}
mVibrator.vibrate(15);
}
break;
case MotionEvent.ACTION_UP:
if(mStateMachine.getState() == STATES.PRESSED) {
ButtonStateChangeDelay mBRTimer = new ButtonStateChangeDelay();
mBRTimer.execute(STATES.LOCKED);
HistoryManager.getInstance().startNewTask();
}
break;
}
}
return false;
}
});
orchestrator = MessageOrchestrator.getInstance();
}
|
diff --git a/libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java b/libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java
index 9f2701a83..53f098af9 100644
--- a/libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java
+++ b/libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java
@@ -1,468 +1,468 @@
/*
* AlsaMidiIn.java
*/
/*
* Copyright (c) 1999 - 2001 by Matthias Pfisterer <[email protected]>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as published
* by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This 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 Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
package org.tritonus.midi.device.alsa;
import javax.sound.midi.InvalidMidiDataException;
import javax.sound.midi.MetaMessage;
import javax.sound.midi.MidiEvent;
import javax.sound.midi.MidiMessage;
import javax.sound.midi.ShortMessage;
import javax.sound.midi.SysexMessage;
import org.tritonus.lowlevel.alsa.AlsaSeq;
import org.tritonus.lowlevel.alsa.AlsaSeqEvent;
import org.tritonus.lowlevel.alsa.AlsaSeqPortSubscribe;
import org.tritonus.share.TDebug;
/** Handles input from an ALSA port.
*/
public class AlsaMidiIn
extends Thread
{
/** ALSA client used to receive events.
*/
private AlsaSeq m_alsaSeq;
/** ALSA port number (belonging to the client represented be
m_alsaSeq) used to receive events.
*/
private int m_nDestPort;
/** ALSA client number to subscribe to to receive events.
*/
private int m_nSourceClient;
/** ALSA port number (belonging to m_nSourceClient) to
subscribe to to receive events.
*/
private int m_nSourcePort;
private AlsaMidiInListener m_listener;
private AlsaSeqEvent m_event = new AlsaSeqEvent();
// used to query event for detailed information
private int[] m_anValues = new int[5];
private long[] m_alValues = new long[1];
/** Receives events without timestamping them.
Does establish a subscription where events are routed directely
(not getting a timestamp).
@param alsaSeq The client that should be used to receive
events.
@param nDestPort The port number that should be used to receive
events. This port has to exist on the client represented by
alsaSeq.
@param nSourceClient The client number that should be listened
to. This and nSourcePort must exist prior to calling this
constructor. The port has to allow read subscriptions.
@param nSourcePort The port number that should be listened
to. This and nSourceClient must exist prior to calling this
constructor. The port has to allow read subscriptions.
@param listener The listener that should receive the
MidiMessage objects created here from received events.
*/
public AlsaMidiIn(AlsaSeq alsaSeq,
int nDestPort,
int nSourceClient,
int nSourcePort,
AlsaMidiInListener listener)
{
this(alsaSeq,
nDestPort,
nSourceClient,
nSourcePort,
-1, false, // signals: do not do timestamping
listener);
}
/**
Does establish a subscription where events are routed through
a queue to get a timestamp.
*/
public AlsaMidiIn(AlsaSeq alsaSeq,
int nDestPort,
int nSourceClient,
int nSourcePort,
int nTimestampingQueue,
boolean bRealtime,
AlsaMidiInListener listener)
{
m_nSourceClient = nSourceClient;
m_nSourcePort = nSourcePort;
m_listener = listener;
m_alsaSeq = alsaSeq;
m_nDestPort = nDestPort;
if (nTimestampingQueue >= 0)
{
AlsaSeqPortSubscribe portSubscribe = new AlsaSeqPortSubscribe();
portSubscribe.setSender(nSourceClient, nSourcePort);
portSubscribe.setDest(getAlsaSeq().getClientId(), nDestPort);
portSubscribe.setQueue(nTimestampingQueue);
portSubscribe.setExclusive(false);
portSubscribe.setTimeUpdate(true);
portSubscribe.setTimeReal(bRealtime);
getAlsaSeq().subscribePort(portSubscribe);
portSubscribe.free();
}
else
{
AlsaSeqPortSubscribe portSubscribe = new AlsaSeqPortSubscribe();
portSubscribe.setSender(nSourceClient, nSourcePort);
portSubscribe.setDest(getAlsaSeq().getClientId(), nDestPort);
getAlsaSeq().subscribePort(portSubscribe);
portSubscribe.free();
}
setDaemon(true);
}
private AlsaSeq getAlsaSeq()
{
return m_alsaSeq;
}
/** The working part of the class.
Here, the thread repeats in blocking in a call to
getEvent() and calling the listener's
dequeueEvent() method.
*/
public void run()
{
// TODO: recheck interupt mechanism
while (!interrupted())
{
MidiEvent event = getEvent();
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.run(): got event: " + event); }
if (event != null)
{
MidiMessage message = event.getMessage();
long lTimestamp = event.getTick();
if (message instanceof MetaMessage)
{
MetaMessage me = (MetaMessage) message;
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.run(): MetaMessage.getData().length: " + me.getData().length); }
}
m_listener.dequeueEvent(message, lTimestamp);
}
else
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllWarnings) { TDebug.out("AlsaMidiIn.run(): received null from getEvent()"); }
}
}
}
private MidiEvent getEvent()
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): before eventInput()"); }
while (true)
{
int nReturn = getAlsaSeq().eventInput(m_event);
if (nReturn >= 0)
{
break;
}
/*
* Sleep for 1 ms to enable scheduling.
*/
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllWarnings) { TDebug.out("AlsaMidiIn.getEvent(): sleeping because got no event"); }
try
{
Thread.sleep(1);
}
catch (InterruptedException e)
{
if (TDebug.TraceAllExceptions) { TDebug.out(e); }
}
}
MidiMessage message = null;
int nType = m_event.getType();
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_NOTEON:
case AlsaSeq.SND_SEQ_EVENT_NOTEOFF:
case AlsaSeq.SND_SEQ_EVENT_KEYPRESS:
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): note/aftertouch event"); }
m_event.getNote(m_anValues);
ShortMessage shortMessage = new ShortMessage();
int nCommand = -1;
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_NOTEON:
nCommand = ShortMessage.NOTE_ON;
break;
case AlsaSeq.SND_SEQ_EVENT_NOTEOFF:
nCommand = ShortMessage.NOTE_OFF;
break;
case AlsaSeq.SND_SEQ_EVENT_KEYPRESS:
nCommand = ShortMessage.POLY_PRESSURE;
break;
}
int nChannel = m_anValues[0] & 0xF;
int nKey = m_anValues[1] & 0x7F;
int nVelocity = m_anValues[2] & 0x7F;
try
{
shortMessage.setMessage(nCommand, nChannel, nKey, nVelocity);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = shortMessage;
break;
}
// all event types that use snd_seq_ev_ctrl_t
// TODO: more
case AlsaSeq.SND_SEQ_EVENT_CONTROLLER:
case AlsaSeq.SND_SEQ_EVENT_PGMCHANGE:
case AlsaSeq.SND_SEQ_EVENT_CHANPRESS:
case AlsaSeq.SND_SEQ_EVENT_PITCHBEND:
case AlsaSeq.SND_SEQ_EVENT_QFRAME:
case AlsaSeq.SND_SEQ_EVENT_SONGPOS:
case AlsaSeq.SND_SEQ_EVENT_SONGSEL:
{
m_event.getControl(m_anValues);
int nCommand = -1;
int nChannel = m_anValues[0] & 0xF;
int nData1 = -1;
int nData2 = -1;
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_CONTROLLER:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): controller event"); }
nCommand = ShortMessage.CONTROL_CHANGE;
nData1 = m_anValues[1] & 0x7F;
nData2 = m_anValues[2] & 0x7F;
break;
case AlsaSeq.SND_SEQ_EVENT_PGMCHANGE:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): program change event"); }
nCommand = ShortMessage.PROGRAM_CHANGE;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
case AlsaSeq.SND_SEQ_EVENT_CHANPRESS:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): channel pressure event"); }
nCommand = ShortMessage.CHANNEL_PRESSURE;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
case AlsaSeq.SND_SEQ_EVENT_PITCHBEND:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): pitchbend event"); }
nCommand = ShortMessage.PITCH_BEND;
nData1 = m_anValues[2] & 0x7F;
nData2 = (m_anValues[2] >> 7) & 0x7F;
break;
case AlsaSeq.SND_SEQ_EVENT_QFRAME:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): MTC event"); }
nCommand = ShortMessage.MIDI_TIME_CODE;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
case AlsaSeq.SND_SEQ_EVENT_SONGPOS:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): song position event"); }
nCommand = ShortMessage.SONG_POSITION_POINTER;
nData1 = m_anValues[2] & 0x7F;
nData2 = (m_anValues[2] >> 7) & 0x7F;
break;
case AlsaSeq.SND_SEQ_EVENT_SONGSEL:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): song select event"); }
nCommand = ShortMessage.SONG_SELECT;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
}
ShortMessage shortMessage = new ShortMessage();
try
{
shortMessage.setMessage(nCommand, nChannel, nData1, nData2);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = shortMessage;
}
break;
// status-only events
case AlsaSeq.SND_SEQ_EVENT_TUNE_REQUEST:
case AlsaSeq.SND_SEQ_EVENT_CLOCK:
case AlsaSeq.SND_SEQ_EVENT_START:
case AlsaSeq.SND_SEQ_EVENT_CONTINUE:
case AlsaSeq.SND_SEQ_EVENT_STOP:
case AlsaSeq.SND_SEQ_EVENT_SENSING:
case AlsaSeq.SND_SEQ_EVENT_RESET:
{
int nStatus = -1;
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_TUNE_REQUEST:
nStatus = ShortMessage.TUNE_REQUEST;
break;
case AlsaSeq.SND_SEQ_EVENT_CLOCK:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): clock event"); }
nStatus = ShortMessage.TIMING_CLOCK;
break;
case AlsaSeq.SND_SEQ_EVENT_START:
nStatus = ShortMessage.START;
break;
case AlsaSeq.SND_SEQ_EVENT_CONTINUE:
nStatus = ShortMessage.CONTINUE;
break;
case AlsaSeq.SND_SEQ_EVENT_STOP:
nStatus = ShortMessage.STOP;
break;
case AlsaSeq.SND_SEQ_EVENT_SENSING:
nStatus = ShortMessage.ACTIVE_SENSING;
break;
case AlsaSeq.SND_SEQ_EVENT_RESET:
nStatus = ShortMessage.SYSTEM_RESET;
break;
}
ShortMessage shortMessage = new ShortMessage();
try
{
shortMessage.setMessage(nStatus);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = shortMessage;
break;
}
case AlsaSeq.SND_SEQ_EVENT_USR_VAR4:
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): meta event"); }
MetaMessage metaMessage = new MetaMessage();
byte[] abTransferData = m_event.getVar();
int nMetaType = abTransferData[0];
byte[] abData = new byte[abTransferData.length - 1];
System.arraycopy(abTransferData, 1, abData, 0, abTransferData.length - 1);
try
{
metaMessage.setMessage(nMetaType, abData, abData.length);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = metaMessage;
break;
}
case AlsaSeq.SND_SEQ_EVENT_SYSEX:
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): sysex event"); }
SysexMessage sysexMessage = new SysexMessage();
byte[] abData = m_event.getVar();
try
{
sysexMessage.setMessage(abData, abData.length);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = sysexMessage;
break;
}
default:
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllWarnings) { TDebug.out("AlsaMidiIn.getEvent(): unknown event"); }
}
if (message != null)
{
/*
If the timestamp is in ticks, ticks in the MidiEvent
gets this value.
Otherwise, if the timestamp is in realtime (ns),
we put us in the tick value.
*/
long lTimestamp = m_event.getTimestamp();
if ((m_event.getFlags() & AlsaSeq.SND_SEQ_TIME_STAMP_MASK) == AlsaSeq.SND_SEQ_TIME_STAMP_REAL)
{
- // ns -> �s
+ // ns -> micros
lTimestamp /= 1000;
}
MidiEvent event = new MidiEvent(message, lTimestamp);
return event;
}
else
{
return null;
}
}
/**
*/
public static interface AlsaMidiInListener
{
public void dequeueEvent(MidiMessage message, long lTimestamp);
}
}
/*** AlsaMidiIn.java ***/
| true | true | private MidiEvent getEvent()
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): before eventInput()"); }
while (true)
{
int nReturn = getAlsaSeq().eventInput(m_event);
if (nReturn >= 0)
{
break;
}
/*
* Sleep for 1 ms to enable scheduling.
*/
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllWarnings) { TDebug.out("AlsaMidiIn.getEvent(): sleeping because got no event"); }
try
{
Thread.sleep(1);
}
catch (InterruptedException e)
{
if (TDebug.TraceAllExceptions) { TDebug.out(e); }
}
}
MidiMessage message = null;
int nType = m_event.getType();
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_NOTEON:
case AlsaSeq.SND_SEQ_EVENT_NOTEOFF:
case AlsaSeq.SND_SEQ_EVENT_KEYPRESS:
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): note/aftertouch event"); }
m_event.getNote(m_anValues);
ShortMessage shortMessage = new ShortMessage();
int nCommand = -1;
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_NOTEON:
nCommand = ShortMessage.NOTE_ON;
break;
case AlsaSeq.SND_SEQ_EVENT_NOTEOFF:
nCommand = ShortMessage.NOTE_OFF;
break;
case AlsaSeq.SND_SEQ_EVENT_KEYPRESS:
nCommand = ShortMessage.POLY_PRESSURE;
break;
}
int nChannel = m_anValues[0] & 0xF;
int nKey = m_anValues[1] & 0x7F;
int nVelocity = m_anValues[2] & 0x7F;
try
{
shortMessage.setMessage(nCommand, nChannel, nKey, nVelocity);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = shortMessage;
break;
}
// all event types that use snd_seq_ev_ctrl_t
// TODO: more
case AlsaSeq.SND_SEQ_EVENT_CONTROLLER:
case AlsaSeq.SND_SEQ_EVENT_PGMCHANGE:
case AlsaSeq.SND_SEQ_EVENT_CHANPRESS:
case AlsaSeq.SND_SEQ_EVENT_PITCHBEND:
case AlsaSeq.SND_SEQ_EVENT_QFRAME:
case AlsaSeq.SND_SEQ_EVENT_SONGPOS:
case AlsaSeq.SND_SEQ_EVENT_SONGSEL:
{
m_event.getControl(m_anValues);
int nCommand = -1;
int nChannel = m_anValues[0] & 0xF;
int nData1 = -1;
int nData2 = -1;
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_CONTROLLER:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): controller event"); }
nCommand = ShortMessage.CONTROL_CHANGE;
nData1 = m_anValues[1] & 0x7F;
nData2 = m_anValues[2] & 0x7F;
break;
case AlsaSeq.SND_SEQ_EVENT_PGMCHANGE:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): program change event"); }
nCommand = ShortMessage.PROGRAM_CHANGE;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
case AlsaSeq.SND_SEQ_EVENT_CHANPRESS:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): channel pressure event"); }
nCommand = ShortMessage.CHANNEL_PRESSURE;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
case AlsaSeq.SND_SEQ_EVENT_PITCHBEND:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): pitchbend event"); }
nCommand = ShortMessage.PITCH_BEND;
nData1 = m_anValues[2] & 0x7F;
nData2 = (m_anValues[2] >> 7) & 0x7F;
break;
case AlsaSeq.SND_SEQ_EVENT_QFRAME:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): MTC event"); }
nCommand = ShortMessage.MIDI_TIME_CODE;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
case AlsaSeq.SND_SEQ_EVENT_SONGPOS:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): song position event"); }
nCommand = ShortMessage.SONG_POSITION_POINTER;
nData1 = m_anValues[2] & 0x7F;
nData2 = (m_anValues[2] >> 7) & 0x7F;
break;
case AlsaSeq.SND_SEQ_EVENT_SONGSEL:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): song select event"); }
nCommand = ShortMessage.SONG_SELECT;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
}
ShortMessage shortMessage = new ShortMessage();
try
{
shortMessage.setMessage(nCommand, nChannel, nData1, nData2);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = shortMessage;
}
break;
// status-only events
case AlsaSeq.SND_SEQ_EVENT_TUNE_REQUEST:
case AlsaSeq.SND_SEQ_EVENT_CLOCK:
case AlsaSeq.SND_SEQ_EVENT_START:
case AlsaSeq.SND_SEQ_EVENT_CONTINUE:
case AlsaSeq.SND_SEQ_EVENT_STOP:
case AlsaSeq.SND_SEQ_EVENT_SENSING:
case AlsaSeq.SND_SEQ_EVENT_RESET:
{
int nStatus = -1;
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_TUNE_REQUEST:
nStatus = ShortMessage.TUNE_REQUEST;
break;
case AlsaSeq.SND_SEQ_EVENT_CLOCK:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): clock event"); }
nStatus = ShortMessage.TIMING_CLOCK;
break;
case AlsaSeq.SND_SEQ_EVENT_START:
nStatus = ShortMessage.START;
break;
case AlsaSeq.SND_SEQ_EVENT_CONTINUE:
nStatus = ShortMessage.CONTINUE;
break;
case AlsaSeq.SND_SEQ_EVENT_STOP:
nStatus = ShortMessage.STOP;
break;
case AlsaSeq.SND_SEQ_EVENT_SENSING:
nStatus = ShortMessage.ACTIVE_SENSING;
break;
case AlsaSeq.SND_SEQ_EVENT_RESET:
nStatus = ShortMessage.SYSTEM_RESET;
break;
}
ShortMessage shortMessage = new ShortMessage();
try
{
shortMessage.setMessage(nStatus);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = shortMessage;
break;
}
case AlsaSeq.SND_SEQ_EVENT_USR_VAR4:
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): meta event"); }
MetaMessage metaMessage = new MetaMessage();
byte[] abTransferData = m_event.getVar();
int nMetaType = abTransferData[0];
byte[] abData = new byte[abTransferData.length - 1];
System.arraycopy(abTransferData, 1, abData, 0, abTransferData.length - 1);
try
{
metaMessage.setMessage(nMetaType, abData, abData.length);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = metaMessage;
break;
}
case AlsaSeq.SND_SEQ_EVENT_SYSEX:
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): sysex event"); }
SysexMessage sysexMessage = new SysexMessage();
byte[] abData = m_event.getVar();
try
{
sysexMessage.setMessage(abData, abData.length);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = sysexMessage;
break;
}
default:
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllWarnings) { TDebug.out("AlsaMidiIn.getEvent(): unknown event"); }
}
if (message != null)
{
/*
If the timestamp is in ticks, ticks in the MidiEvent
gets this value.
Otherwise, if the timestamp is in realtime (ns),
we put us in the tick value.
*/
long lTimestamp = m_event.getTimestamp();
if ((m_event.getFlags() & AlsaSeq.SND_SEQ_TIME_STAMP_MASK) == AlsaSeq.SND_SEQ_TIME_STAMP_REAL)
{
// ns -> �s
lTimestamp /= 1000;
}
MidiEvent event = new MidiEvent(message, lTimestamp);
return event;
}
else
{
return null;
}
}
| private MidiEvent getEvent()
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): before eventInput()"); }
while (true)
{
int nReturn = getAlsaSeq().eventInput(m_event);
if (nReturn >= 0)
{
break;
}
/*
* Sleep for 1 ms to enable scheduling.
*/
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllWarnings) { TDebug.out("AlsaMidiIn.getEvent(): sleeping because got no event"); }
try
{
Thread.sleep(1);
}
catch (InterruptedException e)
{
if (TDebug.TraceAllExceptions) { TDebug.out(e); }
}
}
MidiMessage message = null;
int nType = m_event.getType();
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_NOTEON:
case AlsaSeq.SND_SEQ_EVENT_NOTEOFF:
case AlsaSeq.SND_SEQ_EVENT_KEYPRESS:
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): note/aftertouch event"); }
m_event.getNote(m_anValues);
ShortMessage shortMessage = new ShortMessage();
int nCommand = -1;
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_NOTEON:
nCommand = ShortMessage.NOTE_ON;
break;
case AlsaSeq.SND_SEQ_EVENT_NOTEOFF:
nCommand = ShortMessage.NOTE_OFF;
break;
case AlsaSeq.SND_SEQ_EVENT_KEYPRESS:
nCommand = ShortMessage.POLY_PRESSURE;
break;
}
int nChannel = m_anValues[0] & 0xF;
int nKey = m_anValues[1] & 0x7F;
int nVelocity = m_anValues[2] & 0x7F;
try
{
shortMessage.setMessage(nCommand, nChannel, nKey, nVelocity);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = shortMessage;
break;
}
// all event types that use snd_seq_ev_ctrl_t
// TODO: more
case AlsaSeq.SND_SEQ_EVENT_CONTROLLER:
case AlsaSeq.SND_SEQ_EVENT_PGMCHANGE:
case AlsaSeq.SND_SEQ_EVENT_CHANPRESS:
case AlsaSeq.SND_SEQ_EVENT_PITCHBEND:
case AlsaSeq.SND_SEQ_EVENT_QFRAME:
case AlsaSeq.SND_SEQ_EVENT_SONGPOS:
case AlsaSeq.SND_SEQ_EVENT_SONGSEL:
{
m_event.getControl(m_anValues);
int nCommand = -1;
int nChannel = m_anValues[0] & 0xF;
int nData1 = -1;
int nData2 = -1;
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_CONTROLLER:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): controller event"); }
nCommand = ShortMessage.CONTROL_CHANGE;
nData1 = m_anValues[1] & 0x7F;
nData2 = m_anValues[2] & 0x7F;
break;
case AlsaSeq.SND_SEQ_EVENT_PGMCHANGE:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): program change event"); }
nCommand = ShortMessage.PROGRAM_CHANGE;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
case AlsaSeq.SND_SEQ_EVENT_CHANPRESS:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): channel pressure event"); }
nCommand = ShortMessage.CHANNEL_PRESSURE;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
case AlsaSeq.SND_SEQ_EVENT_PITCHBEND:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): pitchbend event"); }
nCommand = ShortMessage.PITCH_BEND;
nData1 = m_anValues[2] & 0x7F;
nData2 = (m_anValues[2] >> 7) & 0x7F;
break;
case AlsaSeq.SND_SEQ_EVENT_QFRAME:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): MTC event"); }
nCommand = ShortMessage.MIDI_TIME_CODE;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
case AlsaSeq.SND_SEQ_EVENT_SONGPOS:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): song position event"); }
nCommand = ShortMessage.SONG_POSITION_POINTER;
nData1 = m_anValues[2] & 0x7F;
nData2 = (m_anValues[2] >> 7) & 0x7F;
break;
case AlsaSeq.SND_SEQ_EVENT_SONGSEL:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): song select event"); }
nCommand = ShortMessage.SONG_SELECT;
nData1 = m_anValues[2] & 0x7F;
nData2 = 0;
break;
}
ShortMessage shortMessage = new ShortMessage();
try
{
shortMessage.setMessage(nCommand, nChannel, nData1, nData2);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = shortMessage;
}
break;
// status-only events
case AlsaSeq.SND_SEQ_EVENT_TUNE_REQUEST:
case AlsaSeq.SND_SEQ_EVENT_CLOCK:
case AlsaSeq.SND_SEQ_EVENT_START:
case AlsaSeq.SND_SEQ_EVENT_CONTINUE:
case AlsaSeq.SND_SEQ_EVENT_STOP:
case AlsaSeq.SND_SEQ_EVENT_SENSING:
case AlsaSeq.SND_SEQ_EVENT_RESET:
{
int nStatus = -1;
switch (nType)
{
case AlsaSeq.SND_SEQ_EVENT_TUNE_REQUEST:
nStatus = ShortMessage.TUNE_REQUEST;
break;
case AlsaSeq.SND_SEQ_EVENT_CLOCK:
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): clock event"); }
nStatus = ShortMessage.TIMING_CLOCK;
break;
case AlsaSeq.SND_SEQ_EVENT_START:
nStatus = ShortMessage.START;
break;
case AlsaSeq.SND_SEQ_EVENT_CONTINUE:
nStatus = ShortMessage.CONTINUE;
break;
case AlsaSeq.SND_SEQ_EVENT_STOP:
nStatus = ShortMessage.STOP;
break;
case AlsaSeq.SND_SEQ_EVENT_SENSING:
nStatus = ShortMessage.ACTIVE_SENSING;
break;
case AlsaSeq.SND_SEQ_EVENT_RESET:
nStatus = ShortMessage.SYSTEM_RESET;
break;
}
ShortMessage shortMessage = new ShortMessage();
try
{
shortMessage.setMessage(nStatus);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = shortMessage;
break;
}
case AlsaSeq.SND_SEQ_EVENT_USR_VAR4:
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): meta event"); }
MetaMessage metaMessage = new MetaMessage();
byte[] abTransferData = m_event.getVar();
int nMetaType = abTransferData[0];
byte[] abData = new byte[abTransferData.length - 1];
System.arraycopy(abTransferData, 1, abData, 0, abTransferData.length - 1);
try
{
metaMessage.setMessage(nMetaType, abData, abData.length);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = metaMessage;
break;
}
case AlsaSeq.SND_SEQ_EVENT_SYSEX:
{
if (TDebug.TraceAlsaMidiIn) { TDebug.out("AlsaMidiIn.getEvent(): sysex event"); }
SysexMessage sysexMessage = new SysexMessage();
byte[] abData = m_event.getVar();
try
{
sysexMessage.setMessage(abData, abData.length);
}
catch (InvalidMidiDataException e)
{
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllExceptions) { TDebug.out(e); }
}
message = sysexMessage;
break;
}
default:
if (TDebug.TraceAlsaMidiIn || TDebug.TraceAllWarnings) { TDebug.out("AlsaMidiIn.getEvent(): unknown event"); }
}
if (message != null)
{
/*
If the timestamp is in ticks, ticks in the MidiEvent
gets this value.
Otherwise, if the timestamp is in realtime (ns),
we put us in the tick value.
*/
long lTimestamp = m_event.getTimestamp();
if ((m_event.getFlags() & AlsaSeq.SND_SEQ_TIME_STAMP_MASK) == AlsaSeq.SND_SEQ_TIME_STAMP_REAL)
{
// ns -> micros
lTimestamp /= 1000;
}
MidiEvent event = new MidiEvent(message, lTimestamp);
return event;
}
else
{
return null;
}
}
|
diff --git a/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java b/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
index ee88bdd2a..ace323291 100644
--- a/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
+++ b/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
@@ -1,387 +1,387 @@
/*
* 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.synapse.transport.nhttp;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.Header;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpVersion;
import org.apache.http.nio.util.ContentOutputBuffer;
import org.apache.http.nio.entity.ContentOutputStream;
import org.apache.http.entity.BasicHttpEntity;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.protocol.HTTP;
import org.apache.synapse.transport.nhttp.util.MessageFormatterDecoratorFactory;
import org.apache.synapse.transport.nhttp.util.NhttpUtil;
import org.apache.synapse.commons.util.TemporaryData;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.channels.ClosedChannelException;
import java.util.Iterator;
import java.util.Map;
import java.net.URL;
/**
* Represents an outgoing Axis2 HTTP/s request. It holds the EPR of the destination, the
* Axis2 MessageContext to be sent, an HttpHost object which captures information about the
* destination, and a Pipe used to write the message stream to the destination
*/
public class Axis2HttpRequest {
private static final Log log = LogFactory.getLog(Axis2HttpRequest.class);
/** the EPR of the destination */
private EndpointReference epr = null;
/** the HttpHost that contains the HTTP connection information */
private HttpHost httpHost = null;
/** The [socket | connect] timeout */
private int timeout = -1;
/** the message context being sent */
private MessageContext msgContext = null;
/** The Axis2 MessageFormatter that will ensure proper serialization as per Axis2 semantics */
MessageFormatter messageFormatter = null;
/** The OM Output format holder */
OMOutputFormat format = null;
private ContentOutputBuffer outputBuffer = null;
/** ready to begin streaming? */
private volatile boolean readyToStream = false;
/** The sending of this request has fully completed */
private volatile boolean sendingCompleted = false;
/**
* for request complete checking - request complete means the request has been fully sent
* and the response it fully received
*/
private volatile boolean completed = false;
/** The URL prefix of the endpoint (to be used for Location header re-writing in the response)*/
private String endpointURLPrefix = null;
/** weather chunking is enabled or not */
private boolean chunked = true;
public Axis2HttpRequest(EndpointReference epr, HttpHost httpHost, MessageContext msgContext) {
this.epr = epr;
this.httpHost = httpHost;
this.msgContext = msgContext;
this.format = NhttpUtil.getOMOutputFormat(msgContext);
this.messageFormatter =
MessageFormatterDecoratorFactory.createMessageFormatterDecorator(msgContext);
this.chunked = !msgContext.isPropertyTrue(NhttpConstants.DISABLE_CHUNKING);
}
public void setReadyToStream(boolean readyToStream) {
this.readyToStream = readyToStream;
}
public void setOutputBuffer(ContentOutputBuffer outputBuffer) {
this.outputBuffer = outputBuffer;
}
public void clear() {
this.epr = null;
this.httpHost = null;
this.msgContext = null;
this.format = null;
this.messageFormatter = null;
this.outputBuffer = null;
}
public EndpointReference getEpr() {
return epr;
}
public HttpHost getHttpHost() {
return httpHost;
}
public MessageContext getMsgContext() {
return msgContext;
}
public int getTimeout() {
return timeout;
}
public void setTimeout(int timeout) {
this.timeout = timeout;
}
public String getEndpointURLPrefix() {
return endpointURLPrefix;
}
public void setEndpointURLPrefix(String endpointURLPrefix) {
this.endpointURLPrefix = endpointURLPrefix;
}
/**
* Create and return a new HttpPost request to the destination EPR
* @return the HttpRequest to be sent out
*/
public HttpRequest getRequest() throws IOException {
String httpMethod = (String) msgContext.getProperty(Constants.Configuration.HTTP_METHOD);
if (httpMethod == null) {
httpMethod = "POST";
}
endpointURLPrefix = (String) msgContext.getProperty(NhttpConstants.ENDPOINT_PREFIX);
HttpRequest httpRequest = null;
if ("POST".equals(httpMethod) || "PUT".equals(httpMethod)) {
httpRequest = new BasicHttpEntityEnclosingRequest(
httpMethod,
msgContext.isPropertyTrue(NhttpConstants.POST_TO_URI) ?
epr.getAddress() : new URL(epr.getAddress()).getPath(),
msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
BasicHttpEntity entity = new BasicHttpEntity();
if (msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0)) {
setStreamAsTempData(entity);
} else {
entity.setChunked(chunked);
if (!chunked) {
setStreamAsTempData(entity);
}
}
((BasicHttpEntityEnclosingRequest) httpRequest).setEntity(entity);
httpRequest.setHeader(
HTTP.CONTENT_TYPE,
messageFormatter.getContentType(msgContext, format, msgContext.getSoapAction()));
} else if ("GET".equals(httpMethod)) {
URL reqURI = messageFormatter.getTargetAddress(
msgContext, format, new URL(epr.getAddress()));
String path = (msgContext.isPropertyTrue(NhttpConstants.POST_TO_URI) ?
- reqURI.toString() : reqURI.getPath()) +
- (reqURI.getQuery() != null ? "?" + reqURI.getQuery() : "");
+ reqURI.toString() : reqURI.getPath() +
+ (reqURI.getQuery() != null ? "?" + reqURI.getQuery() : ""));
httpRequest = new BasicHttpRequest(httpMethod, path,
msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
httpRequest.setHeader(HTTP.CONTENT_TYPE, messageFormatter.getContentType(
msgContext, format, msgContext.getSoapAction()));
} else {
httpRequest = new BasicHttpRequest(
httpMethod,
msgContext.isPropertyTrue(NhttpConstants.POST_TO_URI) ?
epr.getAddress() : new URL(epr.getAddress()).getPath(),
msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
}
// set any transport headers
Object o = msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (o != null && o instanceof Map) {
Map headers = (Map) o;
Iterator iter = headers.keySet().iterator();
while (iter.hasNext()) {
Object header = iter.next();
Object value = headers.get(header);
if (header instanceof String && value != null && value instanceof String) {
if (!HTTPConstants.HEADER_HOST.equalsIgnoreCase((String) header)) {
httpRequest.setHeader((String) header, (String) value);
}
}
}
}
// if the message is SOAP 11 (for which a SOAPAction is *required*), and
// the msg context has a SOAPAction or a WSA-Action (give pref to SOAPAction)
// use that over any transport header that may be available
String soapAction = msgContext.getSoapAction();
if (soapAction == null) {
soapAction = msgContext.getWSAAction();
}
if (soapAction == null) {
msgContext.getAxisOperation().getInputAction();
}
if (msgContext.isSOAP11() && soapAction != null &&
soapAction.length() > 0) {
Header existingHeader =
httpRequest.getFirstHeader(HTTPConstants.HEADER_SOAP_ACTION);
if (existingHeader != null) {
httpRequest.removeHeader(existingHeader);
}
httpRequest.setHeader(HTTPConstants.HEADER_SOAP_ACTION,
messageFormatter.formatSOAPAction(msgContext, null, soapAction));
}
if (NHttpConfiguration.getInstance().isKeepAliveDisabled() ||
msgContext.isPropertyTrue(NhttpConstants.NO_KEEPALIVE)) {
httpRequest.setHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE);
}
return httpRequest;
}
/**
* Start streaming the message into the Pipe, so that the contents could be read off the source
* channel returned by getSourceChannel()
* @throws AxisFault on error
*/
public void streamMessageContents() throws AxisFault {
if (log.isDebugEnabled()) {
log.debug("Start streaming outgoing http request : [Message ID : " + msgContext.getMessageID() + "]");
if (log.isTraceEnabled()) {
log.trace("Message [Request Message ID : " + msgContext.getMessageID() + "] " +
"[Request Message Payload : [ " + msgContext.getEnvelope() + "]");
}
}
synchronized(this) {
while (!readyToStream && !completed) {
try {
this.wait();
} catch (InterruptedException ignore) {}
}
}
if (!completed) {
OutputStream out = new ContentOutputStream(outputBuffer);
try {
if (msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0)) {
writeMessageFromTempData(out);
} else {
if (chunked) {
messageFormatter.writeTo(msgContext, format, out, false);
} else {
writeMessageFromTempData(out);
}
}
} catch (Exception e) {
Throwable t = e.getCause();
if (t != null && t.getCause() != null && t.getCause() instanceof ClosedChannelException) {
if (log.isDebugEnabled()) {
log.debug("Ignore closed channel exception, as the " +
"SessionRequestCallback handles this exception");
}
} else {
Integer errorCode = msgContext == null ? null :
(Integer) msgContext.getProperty(NhttpConstants.ERROR_CODE);
if (errorCode == null || errorCode == NhttpConstants.SEND_ABORT) {
if (log.isDebugEnabled()) {
log.debug("Remote server aborted request being sent, and responded");
}
} else {
if (e instanceof AxisFault) {
throw (AxisFault) e;
} else {
handleException("Error streaming message context", e);
}
}
}
}
finally {
try {
out.flush();
out.close();
} catch (IOException e) {
handleException("Error closing outgoing message stream", e);
}
setSendingCompleted(true);
}
}
}
/**
* Write the stream to a temporary storage and calculate the content length
* @param entity HTTPEntity
* @throws IOException if an exception occurred while writing data
*/
private void setStreamAsTempData(BasicHttpEntity entity) throws IOException {
TemporaryData serialized = new TemporaryData(256, 4096, "http-nio_", ".dat");
OutputStream out = serialized.getOutputStream();
try {
messageFormatter.writeTo(msgContext, format, out, true);
} finally {
out.close();
}
msgContext.setProperty(NhttpConstants.SERIALIZED_BYTES, serialized);
entity.setContentLength(serialized.getLength());
}
/**
* Take the data from temporary storage and write it to the output stream
* @param out output stream
* @throws IOException if an exception occurred while writing data
*/
private void writeMessageFromTempData(OutputStream out) throws IOException {
TemporaryData serialized =
(TemporaryData) msgContext.getProperty(NhttpConstants.SERIALIZED_BYTES);
try {
serialized.writeTo(out);
} finally {
serialized.release();
}
}
// -------------- utility methods -------------
private void handleException(String msg, Exception e) throws AxisFault {
log.error(msg, e);
throw new AxisFault(msg, e);
}
public boolean isCompleted() {
return completed;
}
public void setCompleted(boolean completed) {
this.completed = completed;
synchronized(this) {
this.notifyAll();
}
}
public boolean isSendingCompleted() {
return sendingCompleted;
}
public void setSendingCompleted(boolean sendingCompleted) {
this.sendingCompleted = sendingCompleted;
}
@Override
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("Axis2Request [Message ID : ").append(msgContext.getMessageID()).append("] ");
sb.append("[Status Completed : ").append(isCompleted() ? "true" : "false").append("] ");
sb.append("[Status SendingCompleted : ").append(
isSendingCompleted() ? "true" : "false").append("]");
return sb.toString();
}
}
| true | true | public HttpRequest getRequest() throws IOException {
String httpMethod = (String) msgContext.getProperty(Constants.Configuration.HTTP_METHOD);
if (httpMethod == null) {
httpMethod = "POST";
}
endpointURLPrefix = (String) msgContext.getProperty(NhttpConstants.ENDPOINT_PREFIX);
HttpRequest httpRequest = null;
if ("POST".equals(httpMethod) || "PUT".equals(httpMethod)) {
httpRequest = new BasicHttpEntityEnclosingRequest(
httpMethod,
msgContext.isPropertyTrue(NhttpConstants.POST_TO_URI) ?
epr.getAddress() : new URL(epr.getAddress()).getPath(),
msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
BasicHttpEntity entity = new BasicHttpEntity();
if (msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0)) {
setStreamAsTempData(entity);
} else {
entity.setChunked(chunked);
if (!chunked) {
setStreamAsTempData(entity);
}
}
((BasicHttpEntityEnclosingRequest) httpRequest).setEntity(entity);
httpRequest.setHeader(
HTTP.CONTENT_TYPE,
messageFormatter.getContentType(msgContext, format, msgContext.getSoapAction()));
} else if ("GET".equals(httpMethod)) {
URL reqURI = messageFormatter.getTargetAddress(
msgContext, format, new URL(epr.getAddress()));
String path = (msgContext.isPropertyTrue(NhttpConstants.POST_TO_URI) ?
reqURI.toString() : reqURI.getPath()) +
(reqURI.getQuery() != null ? "?" + reqURI.getQuery() : "");
httpRequest = new BasicHttpRequest(httpMethod, path,
msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
httpRequest.setHeader(HTTP.CONTENT_TYPE, messageFormatter.getContentType(
msgContext, format, msgContext.getSoapAction()));
} else {
httpRequest = new BasicHttpRequest(
httpMethod,
msgContext.isPropertyTrue(NhttpConstants.POST_TO_URI) ?
epr.getAddress() : new URL(epr.getAddress()).getPath(),
msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
}
// set any transport headers
Object o = msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (o != null && o instanceof Map) {
Map headers = (Map) o;
Iterator iter = headers.keySet().iterator();
while (iter.hasNext()) {
Object header = iter.next();
Object value = headers.get(header);
if (header instanceof String && value != null && value instanceof String) {
if (!HTTPConstants.HEADER_HOST.equalsIgnoreCase((String) header)) {
httpRequest.setHeader((String) header, (String) value);
}
}
}
}
// if the message is SOAP 11 (for which a SOAPAction is *required*), and
// the msg context has a SOAPAction or a WSA-Action (give pref to SOAPAction)
// use that over any transport header that may be available
String soapAction = msgContext.getSoapAction();
if (soapAction == null) {
soapAction = msgContext.getWSAAction();
}
if (soapAction == null) {
msgContext.getAxisOperation().getInputAction();
}
if (msgContext.isSOAP11() && soapAction != null &&
soapAction.length() > 0) {
Header existingHeader =
httpRequest.getFirstHeader(HTTPConstants.HEADER_SOAP_ACTION);
if (existingHeader != null) {
httpRequest.removeHeader(existingHeader);
}
httpRequest.setHeader(HTTPConstants.HEADER_SOAP_ACTION,
messageFormatter.formatSOAPAction(msgContext, null, soapAction));
}
if (NHttpConfiguration.getInstance().isKeepAliveDisabled() ||
msgContext.isPropertyTrue(NhttpConstants.NO_KEEPALIVE)) {
httpRequest.setHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE);
}
return httpRequest;
}
| public HttpRequest getRequest() throws IOException {
String httpMethod = (String) msgContext.getProperty(Constants.Configuration.HTTP_METHOD);
if (httpMethod == null) {
httpMethod = "POST";
}
endpointURLPrefix = (String) msgContext.getProperty(NhttpConstants.ENDPOINT_PREFIX);
HttpRequest httpRequest = null;
if ("POST".equals(httpMethod) || "PUT".equals(httpMethod)) {
httpRequest = new BasicHttpEntityEnclosingRequest(
httpMethod,
msgContext.isPropertyTrue(NhttpConstants.POST_TO_URI) ?
epr.getAddress() : new URL(epr.getAddress()).getPath(),
msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
BasicHttpEntity entity = new BasicHttpEntity();
if (msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0)) {
setStreamAsTempData(entity);
} else {
entity.setChunked(chunked);
if (!chunked) {
setStreamAsTempData(entity);
}
}
((BasicHttpEntityEnclosingRequest) httpRequest).setEntity(entity);
httpRequest.setHeader(
HTTP.CONTENT_TYPE,
messageFormatter.getContentType(msgContext, format, msgContext.getSoapAction()));
} else if ("GET".equals(httpMethod)) {
URL reqURI = messageFormatter.getTargetAddress(
msgContext, format, new URL(epr.getAddress()));
String path = (msgContext.isPropertyTrue(NhttpConstants.POST_TO_URI) ?
reqURI.toString() : reqURI.getPath() +
(reqURI.getQuery() != null ? "?" + reqURI.getQuery() : ""));
httpRequest = new BasicHttpRequest(httpMethod, path,
msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
httpRequest.setHeader(HTTP.CONTENT_TYPE, messageFormatter.getContentType(
msgContext, format, msgContext.getSoapAction()));
} else {
httpRequest = new BasicHttpRequest(
httpMethod,
msgContext.isPropertyTrue(NhttpConstants.POST_TO_URI) ?
epr.getAddress() : new URL(epr.getAddress()).getPath(),
msgContext.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
}
// set any transport headers
Object o = msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (o != null && o instanceof Map) {
Map headers = (Map) o;
Iterator iter = headers.keySet().iterator();
while (iter.hasNext()) {
Object header = iter.next();
Object value = headers.get(header);
if (header instanceof String && value != null && value instanceof String) {
if (!HTTPConstants.HEADER_HOST.equalsIgnoreCase((String) header)) {
httpRequest.setHeader((String) header, (String) value);
}
}
}
}
// if the message is SOAP 11 (for which a SOAPAction is *required*), and
// the msg context has a SOAPAction or a WSA-Action (give pref to SOAPAction)
// use that over any transport header that may be available
String soapAction = msgContext.getSoapAction();
if (soapAction == null) {
soapAction = msgContext.getWSAAction();
}
if (soapAction == null) {
msgContext.getAxisOperation().getInputAction();
}
if (msgContext.isSOAP11() && soapAction != null &&
soapAction.length() > 0) {
Header existingHeader =
httpRequest.getFirstHeader(HTTPConstants.HEADER_SOAP_ACTION);
if (existingHeader != null) {
httpRequest.removeHeader(existingHeader);
}
httpRequest.setHeader(HTTPConstants.HEADER_SOAP_ACTION,
messageFormatter.formatSOAPAction(msgContext, null, soapAction));
}
if (NHttpConfiguration.getInstance().isKeepAliveDisabled() ||
msgContext.isPropertyTrue(NhttpConstants.NO_KEEPALIVE)) {
httpRequest.setHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE);
}
return httpRequest;
}
|
diff --git a/HUD.java b/HUD.java
index 9a42fea..c2a8a0e 100644
--- a/HUD.java
+++ b/HUD.java
@@ -1,347 +1,347 @@
import java.io.*;
import java.awt.*;
import java.applet.*;
import javax.swing.*;
import java.util.*;
import java.awt.image.*;
import java.net.*;
import javax.imageio.*;
import java.util.Random;
import java.awt.event.*;
import java.lang.Math;
import javax.sound.sampled.*;
import java.awt.*;
import java.awt.image.BufferedImage;
import javax.swing.*;
class HUD extends Applet
{
private Player p;
private Monster m;
private Pointer c;
private int INVENTORYSIZE;
Item[] inventory= new Item[INVENTORYSIZE];
Item[] equipped= new Item[INVENTORYSIZE];
private Image[] icons;
private int selectedItem=0;
private Color HPColor = new Color(230, 0, 0);
private Color ManaColor = new Color(0, 0, 170);
private Color ExperienceColor = new Color(255, 255, 50);
private int thickness = 20;
private boolean battleHUD = false;
private NPCData nd = new NPCData();
public HUD(Player p, Image[] icons) {
this.p = p;
this.icons = icons;
}
public HUD(Player p, Monster m, Image[] icons) {
this.p = p;
this.m = m;
this.icons = icons;
}
public void drawInventory(Graphics g, Pointer c) {
this.c=c;
if (c.getPointer()==2)
{
if (selectedItem<10)
selectedItem++;
c.setPointer(6);
}
if (c.getPointer()==0)
{
if (selectedItem>0)
selectedItem--;
c.setPointer(6);
}
if (c.getPointer()==10)
{
if (selectedItem<10)
{
if(!(inventory[selectedItem] == null)) {
if(!p.alreadySameType(inventory[selectedItem]) && !p.isEquipped(inventory[selectedItem]))
{
p.equip(inventory[selectedItem]);
- } else {
+ } else if (p.isEquipped(inventory[selectedItem])){
p.unequip(inventory[selectedItem]);
}
} else {
System.out.println("tried to fetch non-existent item");
}
c.setPointer(6);
}
else
c.setPointer(7);//back out of inventory
}
g.setColor(Color.white);
g.fillRect(600,0,200,400);
g.setColor(Color.black);
g.drawRect(600,0,200,400);
g.setColor(Color.red);
g.drawRect(601,24+selectedItem*20,198,20);
g.setColor(Color.black);
g.drawString("Gold: "+p.getGold(),640,20);
inventory =p.getInventory();
for (int i=0;i<inventory.length;i++)
{
if(inventory[i]!=null)
{
g.drawString(inventory[i].getName(),650,40+20*i);
drawIcon(g, inventory[i].getIcon(), 620, 25+20*i);
if(selectedItem<inventory.length&&!(inventory[selectedItem] == null))
drawItemPane(g, inventory[selectedItem]);
}
if (p.isEquipped(inventory[i])&&inventory[i]!=null) {
//g.drawString("E",605,40+20*i);
drawIcon(g,3, 601,24+20*i);
}
}
g.drawString("Exit",640,40+20*10);
}
public void draw(Graphics g) {
int health = p.getHealth();
int healthmax = p.getHealthMax();
int level = p.getLevel();
int gold = p.getGold();
int experience = p.getExperience();
int mana = p.getMana();
int levelExperience = p.getLevelExperience();
int offsetx = 5;
int offsety = 5;
//hp, mana, exp bars
drawBar(g, offsetx, 0*thickness + offsety, 250, thickness, HPColor, health, healthmax);
drawBar(g, offsetx, 1*thickness + offsety, 250, thickness, ManaColor, mana, mana);
drawBar(g, offsetx, 2*thickness + offsety, 250, thickness, ExperienceColor, experience, levelExperience);
//icons
drawIcon(g, 0, 0+offsetx,3*thickness+offsety+3); //gold
drawIcon(g, 1, 80+offsetx,3*thickness+offsety+3); //shield
drawIcon(g, 2, 160+offsetx,3*thickness+offsety+3); //sword
Color textColor;
if(battleHUD) textColor = Color.WHITE;
else textColor = Color.BLACK;
drawLabel(g, Integer.toString(p.getGold()), 30+offsetx, (int)(thickness*3.7)+offsety+3, textColor);
drawLabel(g, Integer.toString(p.getDefense()), 110+offsetx, (int)(thickness*3.7)+offsety+3, textColor);
drawLabel(g, Integer.toString(p.getStrength()), 190+offsetx, (int)(thickness*3.7)+offsety+3, textColor);
drawLabel(g, p.getName() + " (level " + Integer.toString(p.getLevel()) + ")", 10+offsetx, (int)(thickness*4.7)+offsety+3, textColor);
drawLabel(g, Integer.toString(health)+" / "+Integer.toString(healthmax),
15+offsetx, (int)(0.7*thickness)+offsety, Color.WHITE);
drawLabel(g, Integer.toString(mana)+" / "+Integer.toString(mana),
15+offsetx, (int)(1.7*thickness)+offsety, Color.WHITE);
drawLabel(g, Integer.toString(experience)+" / "+Integer.toString(levelExperience),
15+offsetx, (int)(2.7*thickness)+offsety, Color.BLACK);
}
public void drawBar(Graphics g, int xStart, int yStart, int length, int thickness, Color color, int currentVal, int maxVal) {
float percentage = (float)currentVal / (float)maxVal;
if(battleHUD) g.setColor(color.brighter().brighter());
else g.setColor(color.darker().darker());
g.drawRect(xStart-1, yStart-1, length+1, thickness+1);
g.setColor(Color.WHITE);
g.fillRect(xStart, yStart, length, thickness);
g.setColor(color);
g.fillRect(xStart, yStart, (int)(percentage*length), thickness);
}
public void drawIcon(Graphics g, int iconID, int xStart, int yStart) {
g.drawImage(icons[iconID], xStart,yStart, null);
}
public void drawLabel(Graphics g, String label, int xStart, int yStart, Color color) {
Color temp = g.getColor();
Font labelFont = new Font("DialogInput",Font.BOLD,15);
g.setFont(labelFont);
g.setColor(color);
g.drawString(label,xStart,yStart);
g.setColor(temp);
}
public void drawLabelInt(Graphics g, String label, int val, int xStart, int yStart, Color color) {
Color temp = g.getColor();
Font labelFont = new Font("DialogInput",Font.BOLD,15);
g.setFont(labelFont);
g.setColor(color);
g.drawString(label + Integer.toString(val),xStart,yStart);
g.setColor(temp);
}
public void drawLabelIntComp(Graphics g, String label, int val, String label2, int offsetx, int xStart, int yStart, Color color) {
Color temp = g.getColor();
Font labelFont = new Font("DialogInput",Font.BOLD,15);
g.setFont(labelFont);
g.setColor(color);
g.drawString(label + Integer.toString(val),xStart,yStart);
Color color2;
if(label2 == "(+)") color2 = Color.GREEN;
else if(label2 == "(-)") color2 = Color.RED;
else color2 = Color.BLUE;
g.setColor(color2);
g.drawString(label2,xStart+offsetx,yStart);
g.setColor(temp);
}
public void drawTextInBox(Graphics g, String str, int xOffset, int yOffset, int width, int height) {
Font f = g.getFont();
JLabel textLabel = new JLabel(str);
textLabel.setFont(f);
textLabel.setSize(textLabel.getPreferredSize());
BufferedImage bi = new BufferedImage(width, height,BufferedImage.TYPE_INT_ARGB);
Graphics g0 = bi.createGraphics();
g0.setColor(Color.BLACK);
textLabel.paint(g0);
g.drawImage(bi, xOffset, yOffset, this);
}
public void battleDraw(Graphics g) {
Color temp = g.getColor();
battleHUD = true;
draw(g);
int health = m.getHealth();
int healthmax = m.getHealthMax();
int mana = m.getMana();
int offsetx = 550-5;
int offsety = 5;
drawBar(g, offsetx, 0*thickness+offsety, 250, thickness, HPColor, health, healthmax);
drawBar(g, offsetx, 1*thickness+offsety, 250, thickness, ManaColor, mana, mana);
drawLabel(g, Integer.toString(health)+" / "+Integer.toString(healthmax),
offsetx+15, (int)(0.7*thickness)+offsety, Color.WHITE);
drawLabel(g, Integer.toString(mana)+" / "+Integer.toString(mana),
offsetx+15, (int)(1.7*thickness)+offsety, Color.WHITE);
//icons
drawIcon(g, 1, 0+offsetx,2*thickness+offsety+3); //shield
drawIcon(g, 2, 80+offsetx,2*thickness+offsety+3); //sword
Color textColor = Color.WHITE;
drawLabel(g, Integer.toString(m.getDefense()), 30+offsetx, (int)(thickness*2.7)+offsety+3, textColor);
drawLabel(g, Integer.toString(m.getStrength()), 110+offsetx, (int)(thickness*2.7)+offsety+3, textColor);
g.setColor(temp);
}
public void drawItemPane(Graphics g, Item i) {
Color temp = g.getColor();
int paddingx = 5;
int paddingy = 5;
int offsetx = 15; // dist from left of screen
int offsety = 600-160+paddingy*3; // dist from top of screen
int length = 800-paddingx*2;
int height = 160-paddingy*2;
int col2Offset = length/2; // x distance between two main (inventory and equip) columns
int compOffset = 150; // x distance between column and comparison strings
int thickness = 20;
String better = "(+)";
String worse = "(-)";
String same = "(=)";
String healthComp = "";
String strComp = "";
String defComp = "";
String spdComp = "";
g.setColor(Color.BLACK);
g.drawRect(800-length-paddingx-1, 600-height-paddingy-1, length+1, height+1);
g.setColor(Color.WHITE);
g.fillRect(800-length-paddingx, 600-height-paddingy, length, height);
g.setColor(Color.BLACK);
g.drawLine(length/2, 600-height-paddingy, length/2, 600-paddingy);
Item e = p.equippedOfType(i);
if(e != null) {
//if(e.getName() == i.getName())
healthComp = comparison(i.getHealth(), e.getHealth(), better, worse, same);
strComp = comparison(i.getStrength(), e.getStrength(), better, worse, same);
defComp = comparison(i.getDefense(), e.getDefense(), better, worse, same);
spdComp = comparison(i.getSpeed(), e.getSpeed(), better, worse, same);
drawIcon(g, e.getIcon(), offsetx+col2Offset, offsety+0*thickness-3);
drawLabel(g, e.getName(), offsetx+col2Offset+26, offsety+ 0*thickness + 10, Color.BLACK);
drawLabelInt(g, "Health: ", e.getHealth(), offsetx+col2Offset, offsety+ 1*thickness + 10, Color.BLACK);
drawLabelInt(g, "Strength: ", e.getStrength(), offsetx+col2Offset, offsety+ 2*thickness + 10, Color.BLACK);
drawLabelInt(g, "Defense: ", e.getDefense(), offsetx+col2Offset, offsety+ 3*thickness + 10, Color.BLACK);
drawLabelInt(g, "Speed: ", e.getSpeed(), offsetx+col2Offset, offsety+ 4*thickness + 10, Color.BLACK);
}
//getIcon returns int IconID
drawIcon(g, i.getIcon(), offsetx, offsety+0*thickness-3);
drawLabel(g, i.getName(), offsetx+26, offsety+ 0*thickness + 10, Color.BLACK);
//drawLabelInt(g, "Health: ", i.getHealth(), offsetx, offsety+ 1*thickness + 10, Color.BLACK);
drawLabelIntComp(g, "Health: ", i.getHealth(), healthComp, compOffset, offsetx, offsety+ 1*thickness + 10, Color.BLACK);
drawLabelIntComp(g, "Strength: ", i.getStrength(), strComp, compOffset, offsetx, offsety+ 2*thickness + 10, Color.BLACK);
drawLabelIntComp(g, "Defense: ", i.getDefense(), defComp, compOffset, offsetx, offsety+ 3*thickness + 10, Color.BLACK);
drawLabelIntComp(g, "Speed: ", i.getSpeed(), spdComp, compOffset, offsetx, offsety+ 4*thickness + 10, Color.BLACK);
drawIcon(g,3, length-paddingx-20,offsety);
g.setColor(temp);
}
public void drawInteractionPane(Graphics g, int sID) {
Color temp = g.getColor();
int paddingx = 5;
int paddingy = 5;
int offsetx = 15; // dist from left of screen
int offsety = 600-160+paddingy*3; // dist from top of screen
int length = 800-paddingx*2;
int height = 160-paddingy*2;
int col2Offset = length/2; // x distance between two main (inventory and equip) columns
int compOffset = 150; // x distance between column and comparison strings
int thickness = 20;
g.setColor(Color.BLACK);
g.drawRect(800-length-paddingx-1, 600-height-paddingy-1, length+1, height+1);
g.setColor(Color.WHITE);
g.fillRect(800-length-paddingx, 600-height-paddingy, length, height);
g.setColor(Color.BLACK);
String str;
str = "<html><h1>My name is " + nd.getName(sID) + ".</h1><br>";
str += nd.getDesc(sID);
drawTextInBox(g, str, offsetx, offsety, (int)(0.8*length), height);
g.setColor(temp);
}
public String comparison(int one, int two, String greater, String less, String equal) {
if(one == two) return equal;
else if(one > two) return greater;
else return less;
}
}
| true | true | public void drawInventory(Graphics g, Pointer c) {
this.c=c;
if (c.getPointer()==2)
{
if (selectedItem<10)
selectedItem++;
c.setPointer(6);
}
if (c.getPointer()==0)
{
if (selectedItem>0)
selectedItem--;
c.setPointer(6);
}
if (c.getPointer()==10)
{
if (selectedItem<10)
{
if(!(inventory[selectedItem] == null)) {
if(!p.alreadySameType(inventory[selectedItem]) && !p.isEquipped(inventory[selectedItem]))
{
p.equip(inventory[selectedItem]);
} else {
p.unequip(inventory[selectedItem]);
}
} else {
System.out.println("tried to fetch non-existent item");
}
c.setPointer(6);
}
else
c.setPointer(7);//back out of inventory
}
g.setColor(Color.white);
g.fillRect(600,0,200,400);
g.setColor(Color.black);
g.drawRect(600,0,200,400);
g.setColor(Color.red);
g.drawRect(601,24+selectedItem*20,198,20);
g.setColor(Color.black);
g.drawString("Gold: "+p.getGold(),640,20);
inventory =p.getInventory();
for (int i=0;i<inventory.length;i++)
{
if(inventory[i]!=null)
{
g.drawString(inventory[i].getName(),650,40+20*i);
drawIcon(g, inventory[i].getIcon(), 620, 25+20*i);
if(selectedItem<inventory.length&&!(inventory[selectedItem] == null))
drawItemPane(g, inventory[selectedItem]);
}
if (p.isEquipped(inventory[i])&&inventory[i]!=null) {
//g.drawString("E",605,40+20*i);
drawIcon(g,3, 601,24+20*i);
}
}
g.drawString("Exit",640,40+20*10);
}
| public void drawInventory(Graphics g, Pointer c) {
this.c=c;
if (c.getPointer()==2)
{
if (selectedItem<10)
selectedItem++;
c.setPointer(6);
}
if (c.getPointer()==0)
{
if (selectedItem>0)
selectedItem--;
c.setPointer(6);
}
if (c.getPointer()==10)
{
if (selectedItem<10)
{
if(!(inventory[selectedItem] == null)) {
if(!p.alreadySameType(inventory[selectedItem]) && !p.isEquipped(inventory[selectedItem]))
{
p.equip(inventory[selectedItem]);
} else if (p.isEquipped(inventory[selectedItem])){
p.unequip(inventory[selectedItem]);
}
} else {
System.out.println("tried to fetch non-existent item");
}
c.setPointer(6);
}
else
c.setPointer(7);//back out of inventory
}
g.setColor(Color.white);
g.fillRect(600,0,200,400);
g.setColor(Color.black);
g.drawRect(600,0,200,400);
g.setColor(Color.red);
g.drawRect(601,24+selectedItem*20,198,20);
g.setColor(Color.black);
g.drawString("Gold: "+p.getGold(),640,20);
inventory =p.getInventory();
for (int i=0;i<inventory.length;i++)
{
if(inventory[i]!=null)
{
g.drawString(inventory[i].getName(),650,40+20*i);
drawIcon(g, inventory[i].getIcon(), 620, 25+20*i);
if(selectedItem<inventory.length&&!(inventory[selectedItem] == null))
drawItemPane(g, inventory[selectedItem]);
}
if (p.isEquipped(inventory[i])&&inventory[i]!=null) {
//g.drawString("E",605,40+20*i);
drawIcon(g,3, 601,24+20*i);
}
}
g.drawString("Exit",640,40+20*10);
}
|
diff --git a/src/main/java/eu/neq/mais/request/comet/EchoService.java b/src/main/java/eu/neq/mais/request/comet/EchoService.java
index 22d37af..1650ba8 100644
--- a/src/main/java/eu/neq/mais/request/comet/EchoService.java
+++ b/src/main/java/eu/neq/mais/request/comet/EchoService.java
@@ -1,146 +1,146 @@
package eu.neq.mais.request.comet;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.cometd.bayeux.Message;
import org.cometd.bayeux.server.BayeuxServer;
import org.cometd.bayeux.server.ConfigurableServerChannel;
import org.cometd.bayeux.server.ServerChannel;
import org.cometd.bayeux.server.ServerMessage;
import org.cometd.bayeux.server.ServerSession;
import org.cometd.java.annotation.Configure;
import org.cometd.java.annotation.Listener;
import org.cometd.java.annotation.Service;
import org.cometd.java.annotation.Session;
import org.cometd.server.AbstractService;
import org.cometd.server.authorizer.GrantAuthorizer;
import com.google.gson.Gson;
import eu.neq.mais.domain.ChartCoordinateFactory;
@Service("echoService")
public final class EchoService {
@Inject
private BayeuxServer server;
@Session
private ServerSession serverSession;
private HashMap<String, Thread> request = new HashMap<String, Thread>();
@PostConstruct
void init() {
server.addListener(new BayeuxServer.SessionListener() {
public void sessionRemoved(ServerSession session, boolean arg1) {
// System.out.println("SESSION REMOVED");
}
public void sessionAdded(ServerSession session) {
// System.out.println("SESSION ADDED");
}
});
server.addListener(new BayeuxServer.ChannelListener() {
public void configureChannel(ConfigurableServerChannel arg0) {
}
public void channelRemoved(String arg0) {
}
public void channelAdded(ServerChannel arg0) {
}
});
server.addListener(new BayeuxServer.SubscriptionListener() {
public void unsubscribed(ServerSession arg0, ServerChannel arg1) {
// TODO Auto-generated method stub
}
public void subscribed(ServerSession arg0, ServerChannel arg1) {
System.out.println("Subscribe: "+arg1.getId());
}
});
}
@Configure("/**")
void any(ConfigurableServerChannel channel) {
channel.addAuthorizer(GrantAuthorizer.GRANT_ALL);
}
@Configure("/cometd/echo")
void echo(ConfigurableServerChannel channel) {
channel.addAuthorizer(GrantAuthorizer.GRANT_ALL);
}
@Configure("/cometd/pulse")
void pulse(ConfigurableServerChannel channel) {
channel.addAuthorizer(GrantAuthorizer.GRANT_ALL);
}
@Listener("/cometd/echo")
void echo(ServerSession remote, ServerMessage.Mutable message) {
remote.deliver(serverSession, message.getChannel(), message.getData(),
null);
}
@Listener("/cometd/pulse/*")
void pulse(final ServerSession remote, final ServerMessage.Mutable message) {
if (request.containsKey(message.getChannel())) {
request.get(message.getChannel()).stop();
request.remove(message.getChannel());
System.out.println("pulse request on channel:" + message.getChannel()+" | receivers: "+request.size() + " - REMOVED");
} else {
System.out.println("pulse request on channel:" + message.getChannel()+" | receivers: "+request.size() + " - STARTED");
final Thread t = new Thread() {
public void run() {
ChartCoordinateFactory ccf = new ChartCoordinateFactory();
Heartbeat hb = new Heartbeat();
int packet_id = 0;
System.out.println("run");
double x = 0;
while (x < 30000) {
double y = hb.getNextY();
String json = new Gson().toJson(ccf.getChartCoordinate(System.currentTimeMillis(), y));
- System.out.println(y);
+ //System.out.println(y);
remote.deliver(serverSession, message.getChannel(),
json, String.valueOf(packet_id++));
x += 0.1;
try {
sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
};
request.put(message.getChannel(), t);
t.start();
//remote.disconnect();
}
}
}
| true | true | void pulse(final ServerSession remote, final ServerMessage.Mutable message) {
if (request.containsKey(message.getChannel())) {
request.get(message.getChannel()).stop();
request.remove(message.getChannel());
System.out.println("pulse request on channel:" + message.getChannel()+" | receivers: "+request.size() + " - REMOVED");
} else {
System.out.println("pulse request on channel:" + message.getChannel()+" | receivers: "+request.size() + " - STARTED");
final Thread t = new Thread() {
public void run() {
ChartCoordinateFactory ccf = new ChartCoordinateFactory();
Heartbeat hb = new Heartbeat();
int packet_id = 0;
System.out.println("run");
double x = 0;
while (x < 30000) {
double y = hb.getNextY();
String json = new Gson().toJson(ccf.getChartCoordinate(System.currentTimeMillis(), y));
System.out.println(y);
remote.deliver(serverSession, message.getChannel(),
json, String.valueOf(packet_id++));
x += 0.1;
try {
sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
};
request.put(message.getChannel(), t);
t.start();
//remote.disconnect();
}
}
| void pulse(final ServerSession remote, final ServerMessage.Mutable message) {
if (request.containsKey(message.getChannel())) {
request.get(message.getChannel()).stop();
request.remove(message.getChannel());
System.out.println("pulse request on channel:" + message.getChannel()+" | receivers: "+request.size() + " - REMOVED");
} else {
System.out.println("pulse request on channel:" + message.getChannel()+" | receivers: "+request.size() + " - STARTED");
final Thread t = new Thread() {
public void run() {
ChartCoordinateFactory ccf = new ChartCoordinateFactory();
Heartbeat hb = new Heartbeat();
int packet_id = 0;
System.out.println("run");
double x = 0;
while (x < 30000) {
double y = hb.getNextY();
String json = new Gson().toJson(ccf.getChartCoordinate(System.currentTimeMillis(), y));
//System.out.println(y);
remote.deliver(serverSession, message.getChannel(),
json, String.valueOf(packet_id++));
x += 0.1;
try {
sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
};
request.put(message.getChannel(), t);
t.start();
//remote.disconnect();
}
}
|
diff --git a/riot/src/org/riotfamily/riot/security/policy/LoggingPolicy.java b/riot/src/org/riotfamily/riot/security/policy/LoggingPolicy.java
index e0c972ccf..dcf19ec6f 100644
--- a/riot/src/org/riotfamily/riot/security/policy/LoggingPolicy.java
+++ b/riot/src/org/riotfamily/riot/security/policy/LoggingPolicy.java
@@ -1,77 +1,79 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Riot.
*
* The Initial Developer of the Original Code is
* Neteye GmbH
* artundweise GmbH
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Felix Gnass [fgnass at neteye dot de]
* Alf Werder [alf dot werder at artundweise dot de]
*
* ***** END LICENSE BLOCK ***** */
package org.riotfamily.riot.security.policy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.riotfamily.riot.security.auth.RiotUser;
/**
* A logging policy for debugging purposes.
*
* @since 6.5
* @author Alf Werder [alf dot werder at artundweise dot de]
*/
public class LoggingPolicy implements AuthorizationPolicy {
private Log log = LogFactory.getLog(LoggingPolicy.class);
private int order = Integer.MIN_VALUE;
public int getOrder() {
return this.order;
}
public void setOrder(int order) {
this.order = order;
}
public int checkPermission(RiotUser user, String action, Object object) {
if (log.isDebugEnabled()) {
StringBuffer message = new StringBuffer();
message.append("user: [").append(user.getUserId()).append("], ");
message.append("action: [").append(action).append("], ");
message.append("object: ");
if (object != null) {
if (object.getClass().isArray()) {
Object[] objects = (Object[]) object;
for (Object o : objects) {
- message.append(o.getClass().getName());
- message.append(',');
+ if (o != null) {
+ message.append(o.getClass().getName());
+ message.append(',');
+ }
}
}
else {
message.append(object.getClass().getName());
}
}
message.append("[").append(object).append("]");
log.debug(message.toString());
}
return ACCESS_ABSTAIN;
}
}
| true | true | public int checkPermission(RiotUser user, String action, Object object) {
if (log.isDebugEnabled()) {
StringBuffer message = new StringBuffer();
message.append("user: [").append(user.getUserId()).append("], ");
message.append("action: [").append(action).append("], ");
message.append("object: ");
if (object != null) {
if (object.getClass().isArray()) {
Object[] objects = (Object[]) object;
for (Object o : objects) {
message.append(o.getClass().getName());
message.append(',');
}
}
else {
message.append(object.getClass().getName());
}
}
message.append("[").append(object).append("]");
log.debug(message.toString());
}
return ACCESS_ABSTAIN;
}
| public int checkPermission(RiotUser user, String action, Object object) {
if (log.isDebugEnabled()) {
StringBuffer message = new StringBuffer();
message.append("user: [").append(user.getUserId()).append("], ");
message.append("action: [").append(action).append("], ");
message.append("object: ");
if (object != null) {
if (object.getClass().isArray()) {
Object[] objects = (Object[]) object;
for (Object o : objects) {
if (o != null) {
message.append(o.getClass().getName());
message.append(',');
}
}
}
else {
message.append(object.getClass().getName());
}
}
message.append("[").append(object).append("]");
log.debug(message.toString());
}
return ACCESS_ABSTAIN;
}
|
diff --git a/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/data/std/accessors/KmerHashPartitioncomputerFactory.java b/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/data/std/accessors/KmerHashPartitioncomputerFactory.java
index 53eafaac1..231470abb 100644
--- a/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/data/std/accessors/KmerHashPartitioncomputerFactory.java
+++ b/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/data/std/accessors/KmerHashPartitioncomputerFactory.java
@@ -1,47 +1,44 @@
package edu.uci.ics.genomix.data.std.accessors;
import java.nio.ByteBuffer;
import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor;
import edu.uci.ics.hyracks.api.dataflow.value.ITuplePartitionComputer;
import edu.uci.ics.hyracks.api.dataflow.value.ITuplePartitionComputerFactory;
public class KmerHashPartitioncomputerFactory implements
ITuplePartitionComputerFactory {
private static final long serialVersionUID = 1L;
public static int hashBytes(byte[] bytes, int offset, int length) {
int hash = 1;
for (int i = offset; i < offset + length; i++)
hash = (31 * hash) + (int) bytes[i];
return hash;
}
@Override
public ITuplePartitionComputer createPartitioner() {
return new ITuplePartitionComputer() {
@Override
public int partition(IFrameTupleAccessor accessor, int tIndex,
int nParts) {
- if (nParts == 1) {
- return 0;
- }
int startOffset = accessor.getTupleStartOffset(tIndex);
int fieldOffset = accessor.getFieldStartOffset(tIndex, 0);
int slotLength = accessor.getFieldSlotsLength();
int fieldLength = accessor.getFieldLength(tIndex, 0);
ByteBuffer buf = accessor.getBuffer();
int hash = hashBytes(buf.array(), startOffset + fieldOffset
+ slotLength, fieldLength);
if (hash < 0){
- hash = (-hash+1);
+ hash = -(hash+1);
}
return hash % nParts;
}
};
}
}
| false | true | public ITuplePartitionComputer createPartitioner() {
return new ITuplePartitionComputer() {
@Override
public int partition(IFrameTupleAccessor accessor, int tIndex,
int nParts) {
if (nParts == 1) {
return 0;
}
int startOffset = accessor.getTupleStartOffset(tIndex);
int fieldOffset = accessor.getFieldStartOffset(tIndex, 0);
int slotLength = accessor.getFieldSlotsLength();
int fieldLength = accessor.getFieldLength(tIndex, 0);
ByteBuffer buf = accessor.getBuffer();
int hash = hashBytes(buf.array(), startOffset + fieldOffset
+ slotLength, fieldLength);
if (hash < 0){
hash = (-hash+1);
}
return hash % nParts;
}
};
}
| public ITuplePartitionComputer createPartitioner() {
return new ITuplePartitionComputer() {
@Override
public int partition(IFrameTupleAccessor accessor, int tIndex,
int nParts) {
int startOffset = accessor.getTupleStartOffset(tIndex);
int fieldOffset = accessor.getFieldStartOffset(tIndex, 0);
int slotLength = accessor.getFieldSlotsLength();
int fieldLength = accessor.getFieldLength(tIndex, 0);
ByteBuffer buf = accessor.getBuffer();
int hash = hashBytes(buf.array(), startOffset + fieldOffset
+ slotLength, fieldLength);
if (hash < 0){
hash = -(hash+1);
}
return hash % nParts;
}
};
}
|
diff --git a/src/com/vodafone360/people/service/transport/DecoderThread.java b/src/com/vodafone360/people/service/transport/DecoderThread.java
index 2e2dfb5..ee1ee43 100644
--- a/src/com/vodafone360/people/service/transport/DecoderThread.java
+++ b/src/com/vodafone360/people/service/transport/DecoderThread.java
@@ -1,330 +1,333 @@
/*
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the Common Development
* and Distribution License (the "License").
* You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at
* src/com/vodafone360/people/VODAFONE.LICENSE.txt or
* http://github.com/360/360-Engine-for-Android
* See the License for the specific language governing permissions and
* limitations under the License.
*
* When distributing Covered Code, include this CDDL HEADER in each file and
* include the License file at src/com/vodafone360/people/VODAFONE.LICENSE.txt.
* If applicable, add the following below this CDDL HEADER, with the fields
* enclosed by brackets "[]" replaced with your own identifying information:
* Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
*
* Copyright 2010 Vodafone Sales & Services Ltd. All rights reserved.
* Use is subject to license terms.
*/
package com.vodafone360.people.service.transport;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import com.vodafone360.people.datatypes.BaseDataType;
import com.vodafone360.people.datatypes.PushEvent;
import com.vodafone360.people.datatypes.ServerError;
import com.vodafone360.people.engine.EngineManager.EngineId;
import com.vodafone360.people.service.io.QueueManager;
import com.vodafone360.people.service.io.Request;
import com.vodafone360.people.service.io.ResponseQueue;
import com.vodafone360.people.service.io.Request.Type;
import com.vodafone360.people.service.io.ResponseQueue.DecodedResponse;
import com.vodafone360.people.service.io.rpg.RpgHeader;
import com.vodafone360.people.service.io.rpg.RpgHelper;
import com.vodafone360.people.service.io.rpg.RpgMessage;
import com.vodafone360.people.service.io.rpg.RpgMessageTypes;
import com.vodafone360.people.service.transport.http.HttpConnectionThread;
import com.vodafone360.people.service.utils.hessian.HessianDecoder;
import com.vodafone360.people.utils.LogUtils;
/**
* Responsible for decoding 'raw' Hessian response data. Data is decoded into
* specific data types and added to the response queue. The Response queue
* stores request id (except for unsolicited Push msgs) and a source/destination
* engine to allow appropriate routing.
*/
public class DecoderThread implements Runnable {
private static final String THREAD_NAME = "DecoderThread";
private static final long THREAD_SLEEP_TIME = 300; // ms
private volatile boolean mRunning = false;
private final List<RawResponse> mResponses = new ArrayList<RawResponse>();
private ResponseQueue mRespQueue = null;
/**
* The hessian decoder is here declared as member and will be reused instead
* of making new instances on every need
*/
private HessianDecoder mHessianDecoder = new HessianDecoder();
/**
* Container class for raw undecoded response data. Holds a request id
* (obtained from outgoing request or 0 for unsolicited Push message) and
* whether data is GZip compressed or unsolicited.
*/
public static class RawResponse {
public int mReqId;
public byte[] mData;
public boolean mIsCompressed = false;
public boolean mIsPushMessage = false;
public RawResponse(int reqId, byte[] data, boolean isCompressed, boolean isPushMessage) {
mReqId = reqId;
mData = data;
mIsCompressed = isCompressed;
mIsPushMessage = isPushMessage;
}
}
/**
* Start decoder thread
*/
protected void startThread() {
mRunning = true;
Thread decoderThread = new Thread(this);
decoderThread.setName(THREAD_NAME);
decoderThread.start();
}
/**
* Stop decoder thread
*/
protected synchronized void stopThread() {
this.mRunning = false;
this.notify();
}
public DecoderThread() {
mRespQueue = ResponseQueue.getInstance();
}
/**
* Add raw response to decoding queue
*
* @param resp raw data
*/
public void addToDecode(RawResponse resp) {
synchronized (this) {
mResponses.add(resp);
this.notify();
}
}
public synchronized boolean getIsRunning() {
return mRunning;
}
/**
* Thread's run function If the decoding queue contains any entries we
* decode the first response and add the decoded data to the response queue.
* If the decode queue is empty, the thread will become inactive. It is
* resumed when a raw data entry is added to the decode queue.
*/
public void run() {
LogUtils.logI("DecoderThread.run() [Start thread]");
while (mRunning) {
EngineId engineId = EngineId.UNDEFINED;
Type type = Type.PUSH_MSG;
int reqId = -1;
try {
if (mResponses.size() > 0) {
LogUtils.logI("DecoderThread.run() Decoding [" + mResponses.size()
+ "x] responses");
// Decode first entry in queue
RawResponse decode = mResponses.get(0);
reqId = decode.mReqId;
if (!decode.mIsPushMessage) {
// Attempt to get type from request
Request request = QueueManager.getInstance().getRequest(reqId);
if (request != null) {
type = request.mType;
engineId = request.mEngineId;
} else {
type = Type.COMMON;
}
}
DecodedResponse response = mHessianDecoder.decodeHessianByteArray(reqId, decode.mData, type, decode.mIsCompressed, engineId);
// if we have a push message let's try to find out to which engine it should be routed
if ((response.getResponseType() == DecodedResponse.ResponseType.PUSH_MESSAGE.ordinal()) && (response.mDataTypes.get(0) != null)) {
- engineId = ((PushEvent) response.mDataTypes.get(0)).mEngineId;
+ // for push messages we have to override the engine id as it is parsed inside the hessian decoder
+ engineId = ((PushEvent) response.mDataTypes.get(0)).mEngineId;
+ response.mSource = engineId;
+ // TODO mSource should get the engineId inside the decoder once types for mDataTypes is out. see PAND-1805.
}
// This is usually the case for SYSTEM_NOTIFICATION messages
// or where the server is returning an error for requests
// sent by the engines. IN this case, if there is no special
// handling for the engine, we get the engine ID based on
// the request ID.
if (type == Type.PUSH_MSG && reqId != 0 && engineId == EngineId.UNDEFINED) {
Request request = QueueManager.getInstance().getRequest(reqId);
if (request != null) {
engineId = request.mEngineId;
}
}
if (engineId == EngineId.UNDEFINED) {
LogUtils.logE("DecoderThread.run() Unknown engine for message with type["
+ type.name() + "]");
// TODO: Throw Exception for undefined messages, as
// otherwise they might always remain on the Queue?
}
// Add data to response queue
HttpConnectionThread.logV("DecoderThread.run()", "Add message[" + decode.mReqId
+ "] to ResponseQueue for engine[" + engineId + "] with data [" + response.mDataTypes
+ "]");
mRespQueue.addToResponseQueue(response);
// Remove item from our list of responses.
mResponses.remove(0);
// be nice to the other threads
Thread.sleep(THREAD_SLEEP_TIME);
} else {
synchronized (this) {
// No waiting responses, so the thread should sleep.
try {
LogUtils.logV("DecoderThread.run() [Waiting for more responses]");
wait();
} catch (InterruptedException ie) {
// Do nothing
}
}
}
} catch (Throwable t) {
/*
* Keep thread running regardless of error. When something goes
* wrong we should remove response from queue and report error
* back to engine.
*/
if (mResponses.size() > 0) {
mResponses.remove(0);
}
if (type != Type.PUSH_MSG && engineId != EngineId.UNDEFINED) {
List<BaseDataType> list = new ArrayList<BaseDataType>();
// this error type was chosen to make engines remove request
// or retry
// we may consider using other error code later
ServerError error = new ServerError(ServerError.ErrorType.INTERNALERROR);
error.errorDescription = "Decoder thread was unable to decode server message";
list.add(error);
mRespQueue.addToResponseQueue(new DecodedResponse(reqId, list, engineId, DecodedResponse.ResponseType.SERVER_ERROR.ordinal()));
}
LogUtils.logE("DecoderThread.run() Throwable on reqId[" + reqId + "]", t);
}
}
LogUtils.logI("DecoderThread.run() [End thread]");
}
/**
* <p>
* Looks at the response and adds it to the necessary decoder.
* </p>
* TODO: this method should be worked on. The decoder should take care of
* deciding which methods are decoded in which way.
*
* @param response The server response to decode.
* @throws Exception Thrown if the returned status line was null or if the
* response was null.
*/
public void handleResponse(byte[] response) throws Exception {
InputStream is = null;
if (response != null) {
try {
is = new ByteArrayInputStream(response);
final List<RpgMessage> mRpgMessages = new ArrayList<RpgMessage>();
// Get array of RPG messages
// throws IO Exception, we pass it to the calling method
RpgHelper.splitRpgResponse(is, mRpgMessages);
byte[] body = null;
RpgHeader rpgHeader = null;
// Process each header
for (RpgMessage mRpgMessage : mRpgMessages) {
body = mRpgMessage.body();
rpgHeader = mRpgMessage.header();
// Determine RPG mssageType (internal response, push
// etc)
final int mMessageType = rpgHeader.reqType();
HttpConnectionThread.logD("DecoderThread.handleResponse()",
"Non-RPG_POLL_MESSAGE");
// Reset blank header counter
final boolean mZipped = mRpgMessage.header().compression();
if (body != null && (body.length > 0)) {
switch (mMessageType) {
case RpgMessageTypes.RPG_EXT_RESP:
// External message response
HttpConnectionThread
.logD(
"DecoderThread.handleResponse()",
"RpgMessageTypes.RPG_EXT_RESP - "
+ "Add External Message RawResponse to Decode queue:"
+ rpgHeader.reqId() + "mBody.len="
+ body.length);
addToDecode(new RawResponse(rpgHeader.reqId(), body, mZipped, false));
break;
case RpgMessageTypes.RPG_PUSH_MSG:
// Define push message callback to
// notify controller
HttpConnectionThread.logD("DecoderThread.handleResponse()",
"RpgMessageTypes.RPG_PUSH_MSG - Add Push "
+ "Message RawResponse to Decode queue:" + 0
+ "mBody.len=" + body.length);
addToDecode(new RawResponse(rpgHeader.reqId(), body, mZipped, true));
break;
case RpgMessageTypes.RPG_INT_RESP:
// Internal message response
HttpConnectionThread.logD("DecoderThread.handleResponse()",
"RpgMessageTypes.RPG_INT_RESP - Add RawResponse to Decode queue:"
+ rpgHeader.reqId() + "mBody.len=" + body.length);
addToDecode(new RawResponse(rpgHeader.reqId(), body, mZipped, false));
break;
case RpgMessageTypes.RPG_PRESENCE_RESPONSE:
HttpConnectionThread.logD("DecoderThread.handleResponse()",
"RpgMessageTypes.RPG_PRESENCE_RESPONSE - "
+ "Add RawResponse to Decode queue - mZipped["
+ mZipped + "]" + "mBody.len=" + body.length);
addToDecode(new RawResponse(rpgHeader.reqId(), body, mZipped, false));
break;
default:
// FIXME after the refactoring we need to add an
// error to the responsedecoder
break;
}
}
}
} finally {
if (is != null) {
try {
is.close();
} catch (IOException ioe) {
HttpConnectionThread.logE("DecoderThread.handleResponse()",
"Could not close IS: ", ioe);
} finally {
is = null;
}
}
}
}
}
}
| true | true | public void run() {
LogUtils.logI("DecoderThread.run() [Start thread]");
while (mRunning) {
EngineId engineId = EngineId.UNDEFINED;
Type type = Type.PUSH_MSG;
int reqId = -1;
try {
if (mResponses.size() > 0) {
LogUtils.logI("DecoderThread.run() Decoding [" + mResponses.size()
+ "x] responses");
// Decode first entry in queue
RawResponse decode = mResponses.get(0);
reqId = decode.mReqId;
if (!decode.mIsPushMessage) {
// Attempt to get type from request
Request request = QueueManager.getInstance().getRequest(reqId);
if (request != null) {
type = request.mType;
engineId = request.mEngineId;
} else {
type = Type.COMMON;
}
}
DecodedResponse response = mHessianDecoder.decodeHessianByteArray(reqId, decode.mData, type, decode.mIsCompressed, engineId);
// if we have a push message let's try to find out to which engine it should be routed
if ((response.getResponseType() == DecodedResponse.ResponseType.PUSH_MESSAGE.ordinal()) && (response.mDataTypes.get(0) != null)) {
engineId = ((PushEvent) response.mDataTypes.get(0)).mEngineId;
}
// This is usually the case for SYSTEM_NOTIFICATION messages
// or where the server is returning an error for requests
// sent by the engines. IN this case, if there is no special
// handling for the engine, we get the engine ID based on
// the request ID.
if (type == Type.PUSH_MSG && reqId != 0 && engineId == EngineId.UNDEFINED) {
Request request = QueueManager.getInstance().getRequest(reqId);
if (request != null) {
engineId = request.mEngineId;
}
}
if (engineId == EngineId.UNDEFINED) {
LogUtils.logE("DecoderThread.run() Unknown engine for message with type["
+ type.name() + "]");
// TODO: Throw Exception for undefined messages, as
// otherwise they might always remain on the Queue?
}
// Add data to response queue
HttpConnectionThread.logV("DecoderThread.run()", "Add message[" + decode.mReqId
+ "] to ResponseQueue for engine[" + engineId + "] with data [" + response.mDataTypes
+ "]");
mRespQueue.addToResponseQueue(response);
// Remove item from our list of responses.
mResponses.remove(0);
// be nice to the other threads
Thread.sleep(THREAD_SLEEP_TIME);
} else {
synchronized (this) {
// No waiting responses, so the thread should sleep.
try {
LogUtils.logV("DecoderThread.run() [Waiting for more responses]");
wait();
} catch (InterruptedException ie) {
// Do nothing
}
}
}
} catch (Throwable t) {
/*
* Keep thread running regardless of error. When something goes
* wrong we should remove response from queue and report error
* back to engine.
*/
if (mResponses.size() > 0) {
mResponses.remove(0);
}
if (type != Type.PUSH_MSG && engineId != EngineId.UNDEFINED) {
List<BaseDataType> list = new ArrayList<BaseDataType>();
// this error type was chosen to make engines remove request
// or retry
// we may consider using other error code later
ServerError error = new ServerError(ServerError.ErrorType.INTERNALERROR);
error.errorDescription = "Decoder thread was unable to decode server message";
list.add(error);
mRespQueue.addToResponseQueue(new DecodedResponse(reqId, list, engineId, DecodedResponse.ResponseType.SERVER_ERROR.ordinal()));
}
LogUtils.logE("DecoderThread.run() Throwable on reqId[" + reqId + "]", t);
}
}
LogUtils.logI("DecoderThread.run() [End thread]");
}
| public void run() {
LogUtils.logI("DecoderThread.run() [Start thread]");
while (mRunning) {
EngineId engineId = EngineId.UNDEFINED;
Type type = Type.PUSH_MSG;
int reqId = -1;
try {
if (mResponses.size() > 0) {
LogUtils.logI("DecoderThread.run() Decoding [" + mResponses.size()
+ "x] responses");
// Decode first entry in queue
RawResponse decode = mResponses.get(0);
reqId = decode.mReqId;
if (!decode.mIsPushMessage) {
// Attempt to get type from request
Request request = QueueManager.getInstance().getRequest(reqId);
if (request != null) {
type = request.mType;
engineId = request.mEngineId;
} else {
type = Type.COMMON;
}
}
DecodedResponse response = mHessianDecoder.decodeHessianByteArray(reqId, decode.mData, type, decode.mIsCompressed, engineId);
// if we have a push message let's try to find out to which engine it should be routed
if ((response.getResponseType() == DecodedResponse.ResponseType.PUSH_MESSAGE.ordinal()) && (response.mDataTypes.get(0) != null)) {
// for push messages we have to override the engine id as it is parsed inside the hessian decoder
engineId = ((PushEvent) response.mDataTypes.get(0)).mEngineId;
response.mSource = engineId;
// TODO mSource should get the engineId inside the decoder once types for mDataTypes is out. see PAND-1805.
}
// This is usually the case for SYSTEM_NOTIFICATION messages
// or where the server is returning an error for requests
// sent by the engines. IN this case, if there is no special
// handling for the engine, we get the engine ID based on
// the request ID.
if (type == Type.PUSH_MSG && reqId != 0 && engineId == EngineId.UNDEFINED) {
Request request = QueueManager.getInstance().getRequest(reqId);
if (request != null) {
engineId = request.mEngineId;
}
}
if (engineId == EngineId.UNDEFINED) {
LogUtils.logE("DecoderThread.run() Unknown engine for message with type["
+ type.name() + "]");
// TODO: Throw Exception for undefined messages, as
// otherwise they might always remain on the Queue?
}
// Add data to response queue
HttpConnectionThread.logV("DecoderThread.run()", "Add message[" + decode.mReqId
+ "] to ResponseQueue for engine[" + engineId + "] with data [" + response.mDataTypes
+ "]");
mRespQueue.addToResponseQueue(response);
// Remove item from our list of responses.
mResponses.remove(0);
// be nice to the other threads
Thread.sleep(THREAD_SLEEP_TIME);
} else {
synchronized (this) {
// No waiting responses, so the thread should sleep.
try {
LogUtils.logV("DecoderThread.run() [Waiting for more responses]");
wait();
} catch (InterruptedException ie) {
// Do nothing
}
}
}
} catch (Throwable t) {
/*
* Keep thread running regardless of error. When something goes
* wrong we should remove response from queue and report error
* back to engine.
*/
if (mResponses.size() > 0) {
mResponses.remove(0);
}
if (type != Type.PUSH_MSG && engineId != EngineId.UNDEFINED) {
List<BaseDataType> list = new ArrayList<BaseDataType>();
// this error type was chosen to make engines remove request
// or retry
// we may consider using other error code later
ServerError error = new ServerError(ServerError.ErrorType.INTERNALERROR);
error.errorDescription = "Decoder thread was unable to decode server message";
list.add(error);
mRespQueue.addToResponseQueue(new DecodedResponse(reqId, list, engineId, DecodedResponse.ResponseType.SERVER_ERROR.ordinal()));
}
LogUtils.logE("DecoderThread.run() Throwable on reqId[" + reqId + "]", t);
}
}
LogUtils.logI("DecoderThread.run() [End thread]");
}
|
diff --git a/geotools2/geotools-src/filter/src/org/geotools/filter/ExpressionXmlParser.java b/geotools2/geotools-src/filter/src/org/geotools/filter/ExpressionXmlParser.java
index e70def665..62563d75b 100644
--- a/geotools2/geotools-src/filter/src/org/geotools/filter/ExpressionXmlParser.java
+++ b/geotools2/geotools-src/filter/src/org/geotools/filter/ExpressionXmlParser.java
@@ -1,383 +1,401 @@
/*
* ExpressionXmlParser.java
*
* Created on 03 July 2002, 10:21
*/
package org.geotools.filter;
// J2SE dependencies
import java.util.logging.Logger;
import java.util.*;
import org.w3c.dom.*;
// Java Topology Suite dependencies
import com.vividsolutions.jts.geom.*;
/**
*
* @author iant
*/
public class ExpressionXmlParser {
/**
* The logger for the filter module.
*/
private static final Logger LOGGER = Logger.getLogger("org.geotools.filter");
/** Creates a new instance of ExpressionXmlParser */
public ExpressionXmlParser() {
}
public static Expression parseExpression(Node root){
LOGGER.finer("parsingExpression "+root.getNodeName());
//NodeList children = root.getChildNodes();
//LOGGER.finest("children "+children);
if(root == null || root.getNodeType() != Node.ELEMENT_NODE){
LOGGER.finer("bad node input ");
return null;
}
LOGGER.finer("processing root "+root.getNodeName());
Node child = root;
if(child.getNodeName().equalsIgnoreCase("add")){
try{
LOGGER.fine("processing an Add");
Node left=null,right=null;
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_ADD);
Node value = child.getFirstChild();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add left value -> "+value+"<-");
math.addLeftValue(parseExpression(value));
value = value.getNextSibling();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add right value -> "+value+"<-");
math.addRightValue(parseExpression(value));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("sub")){
try{
NodeList kids = child.getChildNodes();
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_SUBTRACT);
- math.addLeftValue(parseExpression(child.getFirstChild()));
- math.addRightValue(parseExpression(child.getLastChild()));
+ Node value = child.getFirstChild();
+ while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
+ LOGGER.finer("add left value -> "+value+"<-");
+ math.addLeftValue(parseExpression(value));
+ value = value.getNextSibling();
+ while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
+ LOGGER.finer("add right value -> "+value+"<-");
+ math.addRightValue(parseExpression(value));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("mul")){
try{
NodeList kids = child.getChildNodes();
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_MULTIPLY);
- math.addLeftValue(parseExpression(child.getFirstChild()));
- math.addRightValue(parseExpression(child.getLastChild()));
+ Node value = child.getFirstChild();
+ while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
+ LOGGER.finer("add left value -> "+value+"<-");
+ math.addLeftValue(parseExpression(value));
+ value = value.getNextSibling();
+ while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
+ LOGGER.finer("add right value -> "+value+"<-");
+ math.addRightValue(parseExpression(value));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("div")){
try{
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_DIVIDE);
- math.addLeftValue(parseExpression(child.getFirstChild()));
- math.addRightValue(parseExpression(child.getLastChild()));
+ Node value = child.getFirstChild();
+ while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
+ LOGGER.finer("add left value -> "+value+"<-");
+ math.addLeftValue(parseExpression(value));
+ value = value.getNextSibling();
+ while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
+ LOGGER.finer("add right value -> "+value+"<-");
+ math.addRightValue(parseExpression(value));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("Literal")){
LOGGER.finer("processing literal "+child);
NodeList kidList = child.getChildNodes();
LOGGER.finest("literal elements ("+kidList.getLength()+") "+kidList.toString());
for(int i=0;i<kidList.getLength();i++){
Node kid = kidList.item(i);
LOGGER.finest("kid "+i+" "+kid);
if(kid==null){
LOGGER.finest("Skipping ");
continue;
}
if(kid.getNodeValue()==null){
/* it might be a gml string so we need to convert it into a geometry
* this is a bit tricky since our standard gml parser is SAX based and
* we're a DOM here.
*/
LOGGER.finer("node "+kid.getNodeValue()+" namespace "+kid.getNamespaceURI());
LOGGER.fine("a literal gml string?");
try{
Geometry geom = parseGML(kid);
if(geom!=null){
LOGGER.finer("built a "+geom.getGeometryType()+" from gml");
LOGGER.finer("\tpoints: "+geom.getNumPoints());
}else{
LOGGER.finer("got a null geometry back from gml parser");
}
return new ExpressionLiteral(geom);
} catch (IllegalFilterException ife){
LOGGER.warning("Problem building GML/JTS object: " + ife);
}
return null;
}
if(kid.getNodeValue().trim().length()==0){
LOGGER.finest("empty text element");
continue;
}
// debuging only
/*switch(kid.getNodeType()){
case Node.ELEMENT_NODE:
LOGGER.finer("element :"+kid);
break;
case Node.TEXT_NODE:
LOGGER.finer("text :"+kid);
break;
case Node.ATTRIBUTE_NODE:
LOGGER.finer("Attribute :"+kid);
break;
case Node.CDATA_SECTION_NODE:
LOGGER.finer("Cdata :"+kid);
break;
case Node.COMMENT_NODE:
LOGGER.finer("comment :"+kid);
break;
} */
String nodeValue = kid.getNodeValue();
LOGGER.finer("processing "+nodeValue);
// see if it's an int
try{
try{
Integer I = new Integer(nodeValue);
LOGGER.finer("An integer");
return new ExpressionLiteral(I);
} catch (NumberFormatException e){
/* really empty */
}
// A double?
try{
Double D = new Double(nodeValue);
LOGGER.finer("A double");
return new ExpressionLiteral(D);
} catch (NumberFormatException e){
/* really empty */
}
// must be a string (or we have a problem)
LOGGER.finer("defaulting to string");
return new ExpressionLiteral(nodeValue);
} catch (IllegalFilterException ife){
LOGGER.finer("Unable to build expression " + ife);
return null;
}
}
}
if(child.getNodeName().equalsIgnoreCase("PropertyName")){
try{
NodeList kids = child.getChildNodes();
ExpressionAttribute attribute = new ExpressionAttribute(null);
attribute.setAttributePath(child.getFirstChild().getNodeValue());
return attribute;
}catch (IllegalFilterException ife){
LOGGER.finer("Unable to build expression: " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("Function")){
LOGGER.finer("function not yet implemented");
// TODO: should have a name and a (or more?) expressions
// TODO: find out what really happens here
}
if(child.getNodeType()== Node.TEXT_NODE){
LOGGER.finer("processing a text node "+root.getNodeValue());
String nodeValue = root.getNodeValue();
LOGGER.finer("Text name "+nodeValue);
// see if it's an int
try{
try{
Integer I = new Integer(nodeValue);
return new ExpressionLiteral(I);
} catch (NumberFormatException e){
/* really empty */
}
try{
Double D = new Double(nodeValue);
return new ExpressionLiteral(D);
} catch (NumberFormatException e){
/* really empty */
}
return new ExpressionLiteral(nodeValue);
} catch (IllegalFilterException ife){
LOGGER.finer("Unable to build expression " + ife);
}
}
return null;
}
/** parsez short sections of gml for use in expressions and filters
* Hopefully we can get away without a full parser here.
*/
static GeometryFactory gfac = new GeometryFactory();
public static Geometry parseGML(Node root){
LOGGER.finer("processing gml "+root);
java.util.ArrayList coords = new java.util.ArrayList();
int type = 0;
Node child = root;
if(child.getNodeName().equalsIgnoreCase("gml:box")){
LOGGER.finer("box");
type = GML_BOX;
coords = parseCoords(child);
com.vividsolutions.jts.geom.Envelope env = new com.vividsolutions.jts.geom.Envelope();
for(int i=0;i<coords.size();i++){
env.expandToInclude((Coordinate)coords.get(i));
}
Coordinate[] c = new Coordinate[5];
c[0] = new Coordinate(env.getMinX(), env.getMinY());
c[1] = new Coordinate(env.getMinX(), env.getMaxY());
c[2] = new Coordinate(env.getMaxX(), env.getMaxY());
c[3] = new Coordinate(env.getMaxX(), env.getMinY());
c[4] = new Coordinate(env.getMinX(), env.getMinY());
com.vividsolutions.jts.geom.LinearRing r = null;
try {
r = gfac.createLinearRing(c);
} catch (com.vividsolutions.jts.geom.TopologyException e){
System.err.println("Topology Exception in GMLBox");
return null;
}
return gfac.createPolygon(r, null);
}
if(child.getNodeName().equalsIgnoreCase("gml:polygon")){
LOGGER.finer("polygon");
type = GML_POLYGON;
LinearRing outer =null;
ArrayList inner = new ArrayList();
NodeList kids = root.getChildNodes();
for(int i=0;i<kids.getLength();i++){
Node kid = kids.item(i);
LOGGER.finer("doing "+kid);
if(kid.getNodeName().equalsIgnoreCase("gml:outerBoundaryIs")){
outer = (LinearRing) parseGML(kid);
}
if(kid.getNodeName().equalsIgnoreCase("gml:innerBoundaryIs")){
inner.add((LinearRing) parseGML(kid));
}
}
if(inner.size()>0){
return gfac.createPolygon(outer,(LinearRing[]) inner.toArray(new LinearRing[0]));
}else{
return gfac.createPolygon(outer, null);
}
}
if(child.getNodeName().equalsIgnoreCase("gml:outerBoundaryIs") ||
child.getNodeName().equalsIgnoreCase("gml:innerBoundaryIs") ){
LOGGER.finer("Boundary layer");
NodeList kids = ((Element)child).getElementsByTagName("gml:LinearRing");
return parseGML(kids.item(0));
}
if(child.getNodeName().equalsIgnoreCase("gml:linearRing")){
LOGGER.finer("LinearRing");
coords = parseCoords(child);
com.vividsolutions.jts.geom.LinearRing r = null;
try{
r = gfac.createLinearRing((Coordinate[])coords.toArray(new Coordinate[]{}));
} catch (TopologyException te ){
LOGGER.finer("Topology Exception build linear ring: " + te);
return null;
}
return r;
}
if(child.getNodeName().equalsIgnoreCase("gml:linestring")){
LOGGER.finer("linestring");
type = GML_LINESTRING;
coords = parseCoords(child);
com.vividsolutions.jts.geom.LineString r = null;
r = gfac.createLineString((Coordinate[])coords.toArray(new Coordinate[]{}));
return r;
}
if(child.getNodeName().equalsIgnoreCase("gml:point")){
LOGGER.finer("point");
type = GML_POINT;
coords = parseCoords(child);
com.vividsolutions.jts.geom.Point r = null;
r = gfac.createPoint((Coordinate)coords.get(0));
return r;
}
if(child.getNodeName().toLowerCase().startsWith("gml:multiPolygon")){
LOGGER.finer("MultiPolygon");
ArrayList gc = new ArrayList();
// parse all children thru parseGML
NodeList kids = child.getChildNodes();
for(int i=0;i<kids.getLength();i++){
gc.add(parseGML(kids.item(i)));
}
return gfac.createMultiPolygon((Polygon[])gc.toArray(new Polygon[0]));
}
return null;
}
public static java.util.ArrayList parseCoords(Node root){
LOGGER.finer("parsing coordinate(s) "+root);
ArrayList clist = new ArrayList();
NodeList kids = root.getChildNodes();
for(int i=0;i<kids.getLength();i++){
Node child = kids.item(i);
LOGGER.finer("doing "+child);
if(child.getNodeName().equalsIgnoreCase("gml:coordinate")){
String internal = child.getNodeValue();
}
if(child.getNodeName().equalsIgnoreCase("gml:coordinates")){
LOGGER.finer("coordinates "+child.getFirstChild().getNodeValue());
NodeList grandKids = child.getChildNodes();
for(int k=0;k<grandKids.getLength();k++){
Node grandKid = grandKids.item(k);
if(grandKid.getNodeValue()==null) continue;
if(grandKid.getNodeValue().trim().length()==0) continue;
String outer = grandKid.getNodeValue().trim();
StringTokenizer ost = new StringTokenizer(outer," ");
while(ost.hasMoreTokens()){
String internal = ost.nextToken();
StringTokenizer ist = new StringTokenizer(internal,",");
double x = Double.parseDouble(ist.nextToken());
double y = Double.parseDouble(ist.nextToken());
double z = Double.NaN;
if(ist.hasMoreTokens()){
z = Double.parseDouble(ist.nextToken());
}
clist.add(new Coordinate(x,y,z));
}
}
}
}
return clist;
}
static int GML_BOX = 1;
static int GML_POLYGON = 2;
static int GML_LINESTRING = 3;
static int GML_POINT = 4;
}
| false | true | public static Expression parseExpression(Node root){
LOGGER.finer("parsingExpression "+root.getNodeName());
//NodeList children = root.getChildNodes();
//LOGGER.finest("children "+children);
if(root == null || root.getNodeType() != Node.ELEMENT_NODE){
LOGGER.finer("bad node input ");
return null;
}
LOGGER.finer("processing root "+root.getNodeName());
Node child = root;
if(child.getNodeName().equalsIgnoreCase("add")){
try{
LOGGER.fine("processing an Add");
Node left=null,right=null;
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_ADD);
Node value = child.getFirstChild();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add left value -> "+value+"<-");
math.addLeftValue(parseExpression(value));
value = value.getNextSibling();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add right value -> "+value+"<-");
math.addRightValue(parseExpression(value));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("sub")){
try{
NodeList kids = child.getChildNodes();
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_SUBTRACT);
math.addLeftValue(parseExpression(child.getFirstChild()));
math.addRightValue(parseExpression(child.getLastChild()));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("mul")){
try{
NodeList kids = child.getChildNodes();
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_MULTIPLY);
math.addLeftValue(parseExpression(child.getFirstChild()));
math.addRightValue(parseExpression(child.getLastChild()));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("div")){
try{
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_DIVIDE);
math.addLeftValue(parseExpression(child.getFirstChild()));
math.addRightValue(parseExpression(child.getLastChild()));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("Literal")){
LOGGER.finer("processing literal "+child);
NodeList kidList = child.getChildNodes();
LOGGER.finest("literal elements ("+kidList.getLength()+") "+kidList.toString());
for(int i=0;i<kidList.getLength();i++){
Node kid = kidList.item(i);
LOGGER.finest("kid "+i+" "+kid);
if(kid==null){
LOGGER.finest("Skipping ");
continue;
}
if(kid.getNodeValue()==null){
/* it might be a gml string so we need to convert it into a geometry
* this is a bit tricky since our standard gml parser is SAX based and
* we're a DOM here.
*/
LOGGER.finer("node "+kid.getNodeValue()+" namespace "+kid.getNamespaceURI());
LOGGER.fine("a literal gml string?");
try{
Geometry geom = parseGML(kid);
if(geom!=null){
LOGGER.finer("built a "+geom.getGeometryType()+" from gml");
LOGGER.finer("\tpoints: "+geom.getNumPoints());
}else{
LOGGER.finer("got a null geometry back from gml parser");
}
return new ExpressionLiteral(geom);
} catch (IllegalFilterException ife){
LOGGER.warning("Problem building GML/JTS object: " + ife);
}
return null;
}
if(kid.getNodeValue().trim().length()==0){
LOGGER.finest("empty text element");
continue;
}
// debuging only
/*switch(kid.getNodeType()){
case Node.ELEMENT_NODE:
LOGGER.finer("element :"+kid);
break;
case Node.TEXT_NODE:
LOGGER.finer("text :"+kid);
break;
case Node.ATTRIBUTE_NODE:
LOGGER.finer("Attribute :"+kid);
break;
case Node.CDATA_SECTION_NODE:
LOGGER.finer("Cdata :"+kid);
break;
case Node.COMMENT_NODE:
LOGGER.finer("comment :"+kid);
break;
} */
String nodeValue = kid.getNodeValue();
LOGGER.finer("processing "+nodeValue);
// see if it's an int
try{
try{
Integer I = new Integer(nodeValue);
LOGGER.finer("An integer");
return new ExpressionLiteral(I);
} catch (NumberFormatException e){
/* really empty */
}
// A double?
try{
Double D = new Double(nodeValue);
LOGGER.finer("A double");
return new ExpressionLiteral(D);
} catch (NumberFormatException e){
/* really empty */
}
// must be a string (or we have a problem)
LOGGER.finer("defaulting to string");
return new ExpressionLiteral(nodeValue);
} catch (IllegalFilterException ife){
LOGGER.finer("Unable to build expression " + ife);
return null;
}
}
}
| public static Expression parseExpression(Node root){
LOGGER.finer("parsingExpression "+root.getNodeName());
//NodeList children = root.getChildNodes();
//LOGGER.finest("children "+children);
if(root == null || root.getNodeType() != Node.ELEMENT_NODE){
LOGGER.finer("bad node input ");
return null;
}
LOGGER.finer("processing root "+root.getNodeName());
Node child = root;
if(child.getNodeName().equalsIgnoreCase("add")){
try{
LOGGER.fine("processing an Add");
Node left=null,right=null;
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_ADD);
Node value = child.getFirstChild();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add left value -> "+value+"<-");
math.addLeftValue(parseExpression(value));
value = value.getNextSibling();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add right value -> "+value+"<-");
math.addRightValue(parseExpression(value));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("sub")){
try{
NodeList kids = child.getChildNodes();
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_SUBTRACT);
Node value = child.getFirstChild();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add left value -> "+value+"<-");
math.addLeftValue(parseExpression(value));
value = value.getNextSibling();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add right value -> "+value+"<-");
math.addRightValue(parseExpression(value));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("mul")){
try{
NodeList kids = child.getChildNodes();
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_MULTIPLY);
Node value = child.getFirstChild();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add left value -> "+value+"<-");
math.addLeftValue(parseExpression(value));
value = value.getNextSibling();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add right value -> "+value+"<-");
math.addRightValue(parseExpression(value));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("div")){
try{
ExpressionMath math = new ExpressionMath(ExpressionMath.MATH_DIVIDE);
Node value = child.getFirstChild();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add left value -> "+value+"<-");
math.addLeftValue(parseExpression(value));
value = value.getNextSibling();
while(value.getNodeType() != Node.ELEMENT_NODE ) value = value.getNextSibling();
LOGGER.finer("add right value -> "+value+"<-");
math.addRightValue(parseExpression(value));
return math;
}catch (IllegalFilterException ife){
LOGGER.warning("Unable to build expression " + ife);
return null;
}
}
if(child.getNodeName().equalsIgnoreCase("Literal")){
LOGGER.finer("processing literal "+child);
NodeList kidList = child.getChildNodes();
LOGGER.finest("literal elements ("+kidList.getLength()+") "+kidList.toString());
for(int i=0;i<kidList.getLength();i++){
Node kid = kidList.item(i);
LOGGER.finest("kid "+i+" "+kid);
if(kid==null){
LOGGER.finest("Skipping ");
continue;
}
if(kid.getNodeValue()==null){
/* it might be a gml string so we need to convert it into a geometry
* this is a bit tricky since our standard gml parser is SAX based and
* we're a DOM here.
*/
LOGGER.finer("node "+kid.getNodeValue()+" namespace "+kid.getNamespaceURI());
LOGGER.fine("a literal gml string?");
try{
Geometry geom = parseGML(kid);
if(geom!=null){
LOGGER.finer("built a "+geom.getGeometryType()+" from gml");
LOGGER.finer("\tpoints: "+geom.getNumPoints());
}else{
LOGGER.finer("got a null geometry back from gml parser");
}
return new ExpressionLiteral(geom);
} catch (IllegalFilterException ife){
LOGGER.warning("Problem building GML/JTS object: " + ife);
}
return null;
}
if(kid.getNodeValue().trim().length()==0){
LOGGER.finest("empty text element");
continue;
}
// debuging only
/*switch(kid.getNodeType()){
case Node.ELEMENT_NODE:
LOGGER.finer("element :"+kid);
break;
case Node.TEXT_NODE:
LOGGER.finer("text :"+kid);
break;
case Node.ATTRIBUTE_NODE:
LOGGER.finer("Attribute :"+kid);
break;
case Node.CDATA_SECTION_NODE:
LOGGER.finer("Cdata :"+kid);
break;
case Node.COMMENT_NODE:
LOGGER.finer("comment :"+kid);
break;
} */
String nodeValue = kid.getNodeValue();
LOGGER.finer("processing "+nodeValue);
// see if it's an int
try{
try{
Integer I = new Integer(nodeValue);
LOGGER.finer("An integer");
return new ExpressionLiteral(I);
} catch (NumberFormatException e){
/* really empty */
}
// A double?
try{
Double D = new Double(nodeValue);
LOGGER.finer("A double");
return new ExpressionLiteral(D);
} catch (NumberFormatException e){
/* really empty */
}
// must be a string (or we have a problem)
LOGGER.finer("defaulting to string");
return new ExpressionLiteral(nodeValue);
} catch (IllegalFilterException ife){
LOGGER.finer("Unable to build expression " + ife);
return null;
}
}
}
|
diff --git a/src/main/java/de/cismet/cismap/commons/gui/piccolo/PFeature.java b/src/main/java/de/cismet/cismap/commons/gui/piccolo/PFeature.java
index f19562e2..9a6503fd 100755
--- a/src/main/java/de/cismet/cismap/commons/gui/piccolo/PFeature.java
+++ b/src/main/java/de/cismet/cismap/commons/gui/piccolo/PFeature.java
@@ -1,2992 +1,2992 @@
/***************************************************
*
* cismet GmbH, Saarbruecken, Germany
*
* ... and it just works.
*
****************************************************/
/*
* PFeature.java
*
* Created on 12. April 2005, 10:52
*/
package de.cismet.cismap.commons.gui.piccolo;
import com.vividsolutions.jts.geom.*;
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jts.geom.Polygon;
import edu.umd.cs.piccolo.PCamera;
import edu.umd.cs.piccolo.PNode;
import edu.umd.cs.piccolo.event.PInputEvent;
import edu.umd.cs.piccolo.nodes.PImage;
import edu.umd.cs.piccolo.nodes.PPath;
import edu.umd.cs.piccolo.nodes.PText;
import edu.umd.cs.piccolo.util.PBounds;
import edu.umd.cs.piccolo.util.PDimension;
import pswing.PSwing;
import java.awt.*;
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.ListIterator;
import javax.swing.ImageIcon;
import javax.swing.JComponent;
import de.cismet.cismap.commons.Crs;
import de.cismet.cismap.commons.CrsTransformer;
import de.cismet.cismap.commons.Refreshable;
import de.cismet.cismap.commons.WorldToScreenTransform;
import de.cismet.cismap.commons.features.*;
import de.cismet.cismap.commons.gui.MappingComponent;
import de.cismet.cismap.commons.gui.piccolo.eventlistener.DrawSelectionFeature;
import de.cismet.cismap.commons.gui.piccolo.eventlistener.LinearReferencedPointFeature;
import de.cismet.cismap.commons.interaction.CismapBroker;
import de.cismet.tools.CurrentStackTrace;
import de.cismet.tools.collections.MultiMap;
/**
* DOCUMENT ME!
*
* @author hell
* @version $Revision$, $Date$
*/
public class PFeature extends PPath implements Highlightable, Selectable, Refreshable {
//~ Static fields/initializers ---------------------------------------------
private static final Color TRANSPARENT = new Color(255, 255, 255, 0);
private static final Stroke FIXED_WIDTH_STROKE = new FixedWidthStroke();
//~ Instance fields --------------------------------------------------------
ArrayList splitHandlesBetween = new ArrayList();
PHandle splitPolygonFromHandle = null;
PHandle splitPolygonToHandle = null;
PHandle ellipseHandle = null;
PFeature selectedOriginal = null;
PPath splitPolygonLine;
List<Point2D> splitPoints = new ArrayList<Point2D>();
private final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(this.getClass());
private Feature feature;
private WorldToScreenTransform wtst;
private double x_offset = 0.0d;
private double y_offset = 0.0d;
private PNode stickyChild = null;
private PNode secondStickyChild = null;
private PNode infoNode = null;
private Point2D mid = null;
private PHandle pivotHandle = null;
private boolean selected = false;
private Paint nonSelectedPaint = null;
private boolean highlighted = false;
private Paint nonHighlightingPaint = null;
private Coordinate[][][] entityRingCoordArr = null;
private float[][][] entityRingXArr = null;
private float[][][] entityRingYArr = null;
// private final ArrayList<CoordEntity> coordEntityList = new ArrayList<CoordEntity>();
private MappingComponent viewer;
private Stroke stroke = null;
private Paint strokePaint = null;
// private ColorTintFilter tinter;
private ImageIcon pushpinIco = new javax.swing.ImageIcon(getClass().getResource(
"/de/cismet/cismap/commons/gui/res/pushpin.png")); // NOI18N
private ImageIcon pushpinSelectedIco = new javax.swing.ImageIcon(getClass().getResource(
"/de/cismet/cismap/commons/gui/res/pushpinSelected.png")); // NOI18N
private boolean ignoreStickyFeature = false;
private InfoPanel infoPanel;
private JComponent infoComponent;
private PSwing pswingComp;
private PText primaryAnnotation = null;
private FeatureAnnotationSymbol pi = null;
private double sweetPureX = 0;
private double sweetPureY = 0;
private double sweetSelX = 0;
private double sweetSelY = 0;
private boolean snappable = true;
private int selectedEntity = -1;
// r/w access only in synchronized(this) block
private transient PImage rdfImage;
//~ Constructors -----------------------------------------------------------
/**
* Creates a new instance of PFeature.
*
* @param feature the underlying Feature
* @param viewer MappingComponent
*/
public PFeature(final Feature feature, final MappingComponent viewer) {
this(feature, viewer.getWtst(), 0, 0, viewer);
}
/**
* Creates a new PFeature object.
*
* @param feature DOCUMENT ME!
* @param wtst DOCUMENT ME!
* @param x_offset DOCUMENT ME!
* @param y_offset DOCUMENT ME!
* @param viewer DOCUMENT ME!
*/
public PFeature(final Feature feature,
final WorldToScreenTransform wtst,
final double x_offset,
final double y_offset,
final MappingComponent viewer) {
this(feature, wtst, x_offset, y_offset, viewer, false);
}
/**
* Creates a new PFeature object.
*
* @param canvasPoints DOCUMENT ME!
* @param wtst DOCUMENT ME!
* @param x_offset DOCUMENT ME!
* @param y_offset DOCUMENT ME!
* @param viewer DOCUMENT ME!
*/
@Deprecated
public PFeature(final Point2D[] canvasPoints,
final WorldToScreenTransform wtst,
final double x_offset,
final double y_offset,
final MappingComponent viewer) {
this(new PureNewFeature(canvasPoints, wtst), wtst, 0, 0, viewer);
}
/**
* Creates a new PFeature object.
*
* @param coordArr DOCUMENT ME!
* @param wtst DOCUMENT ME!
* @param x_offset DOCUMENT ME!
* @param y_offset DOCUMENT ME!
* @param viewer DOCUMENT ME!
*/
@Deprecated
public PFeature(final Coordinate[] coordArr,
final WorldToScreenTransform wtst,
final double x_offset,
final double y_offset,
final MappingComponent viewer) {
this(new PureNewFeature(coordArr, wtst), wtst, 0, 0, viewer);
}
/**
* Creates a new PFeature object.
*
* @param feature DOCUMENT ME!
* @param wtst DOCUMENT ME!
* @param x_offset DOCUMENT ME!
* @param y_offset DOCUMENT ME!
* @param viewer DOCUMENT ME!
* @param ignoreStickyfeature DOCUMENT ME!
*/
@Deprecated
public PFeature(final Feature feature,
final WorldToScreenTransform wtst,
final double x_offset,
final double y_offset,
final MappingComponent viewer,
final boolean ignoreStickyfeature) {
try {
setFeature(feature);
this.ignoreStickyFeature = ignoreStickyfeature;
this.wtst = wtst;
// this.x_offset=x_offset;
// this.y_offset=y_offset;
this.x_offset = 0;
this.y_offset = 0;
this.viewer = viewer;
visualize();
addInfoNode();
refreshDesign();
stroke = getStroke();
strokePaint = getStrokePaint();
// tinter = new ColorTintFilter(Color.BLUE, 0.5f);
} catch (Throwable t) {
log.error("Error in constructor of PFeature", t); // NOI18N
}
}
//~ Methods ----------------------------------------------------------------
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public PNode getPrimaryAnnotationNode() {
return primaryAnnotation;
}
/**
* DOCUMENT ME!
*
* @param g DOCUMENT ME!
*
* @return DOCUMENT ME!
*
* @throws IllegalArgumentException DOCUMENT ME!
*/
public PBounds boundsFromRectPolygonGeom(final Geometry g) {
if (g instanceof Polygon) {
final Polygon poly = (Polygon)g;
if (poly.isRectangle()) {
final Coordinate[] coords = poly.getCoordinates();
final Coordinate first = coords[0];
final PBounds b = new PBounds();
// init
double x1 = first.x;
double x2 = first.x;
double y1 = first.y;
double y2 = first.y;
for (int i = 0; i < coords.length; ++i) {
final Coordinate c = coords[i];
if (c.x < x1) {
x1 = c.x;
}
if (c.x > x2) {
x2 = c.x;
}
if (c.y < y1) {
y1 = c.y;
}
if (c.y > y1) {
y2 = c.y;
}
}
return new PBounds(wtst.getScreenX(x1), wtst.getScreenY(y2), Math.abs(x2 - x1), Math.abs(y2 - y1));
}
}
throw new IllegalArgumentException("Geometry is not a rectangle polygon!"); // NOI18N
}
/**
* DOCUMENT ME!
*/
public void visualize() {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("visualize()", new CurrentStackTrace()); // NOI18N
}
}
final Geometry geom = CrsTransformer.transformToGivenCrs(feature.getGeometry(), getViewerCrs().getCode());
if (feature instanceof RasterDocumentFeature) {
final RasterDocumentFeature rdf = (RasterDocumentFeature)feature;
try {
final PBounds bounds = boundsFromRectPolygonGeom(geom);
final PImage pImage = new PImage(rdf.getRasterDocument());
synchronized (this) {
if (rdfImage != null) {
removeChild(rdfImage);
}
rdfImage = pImage;
}
// x,y,with,heigth
pImage.setBounds(bounds);
addChild(pImage);
} catch (final IllegalArgumentException e) {
if (log.isInfoEnabled()) {
log.info("rasterdocumentfeature is no rectangle, we'll draw the geometry without raster image", e); // NOI18N
}
}
doGeometry(geom);
} else {
doGeometry(geom);
if ((geom instanceof Point) || (geom instanceof MultiPoint)) {
if (feature instanceof StyledFeature) {
if ((pi == null)
|| ((pi != null) && pi.equals(((StyledFeature)feature).getPointAnnotationSymbol()))) {
try {
// log.debug("Sweetspot updated");
pi = new FeatureAnnotationSymbol(((StyledFeature)getFeature()).getPointAnnotationSymbol()
.getImage());
if (log.isDebugEnabled()) {
log.debug("newSweetSpotx: "
+ ((StyledFeature)getFeature()).getPointAnnotationSymbol().getSweetSpotX()); // NOI18N
}
pi.setSweetSpotX(((StyledFeature)getFeature()).getPointAnnotationSymbol().getSweetSpotX());
pi.setSweetSpotY(((StyledFeature)getFeature()).getPointAnnotationSymbol().getSweetSpotY());
} catch (Throwable ex) {
log.warn("No PointAnnotationSymbol found", ex); // NOI18N
pi = new FeatureAnnotationSymbol(pushpinIco.getImage());
pi.setSweetSpotX(0.46d);
pi.setSweetSpotY(0.9d);
}
} else if ((pi != null) && (getFeature() != null) && (getFeature() instanceof StyledFeature)
&& (((StyledFeature)getFeature()).getPointAnnotationSymbol() != null)) {
// log.fatal("Sweetspot updated"); // NOI18N
if (log.isDebugEnabled()) {
log.debug("newSweetSpotx: "
+ ((StyledFeature)getFeature()).getPointAnnotationSymbol().getSweetSpotX()); // NOI18N
}
pi.setSweetSpotX(((StyledFeature)getFeature()).getPointAnnotationSymbol().getSweetSpotX());
pi.setSweetSpotY(((StyledFeature)getFeature()).getPointAnnotationSymbol().getSweetSpotY());
}
}
if (!ignoreStickyFeature) {
viewer.addStickyNode(pi);
}
// Hier soll getestet werden ob bei einem Punkt der pushpin schon hinzugef\u00FCgt wurde. Wegen
// reconsider Feature
if (stickyChild == null) {
stickyChild = pi;
} else {
if (stickyChild instanceof StickyPText) {
secondStickyChild = pi;
}
}
addChild(pi);
pi.setOffset(wtst.getScreenX(entityRingCoordArr[0][0][0].x),
wtst.getScreenY(entityRingCoordArr[0][0][0].y));
}
if (pi != null) {
sweetPureX = pi.getSweetSpotX();
sweetPureY = pi.getSweetSpotY();
sweetSelX = -1.0d;
sweetSelY = -1.0d;
}
setSelected(isSelected());
}
}
/**
* Dupliziert eine Koordinate.
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param coordPosition Position der zu duplizierenden Koordinate
*/
public void duplicateCoordinate(final int entityPosition, final int ringPosition, final int coordPosition) {
final Coordinate[] origCoordArr = entityRingCoordArr[entityPosition][ringPosition];
final float[] origXArr = entityRingXArr[entityPosition][ringPosition];
final float[] origYArr = entityRingYArr[entityPosition][ringPosition];
final Geometry geometry = getFeature().getGeometry();
if (((geometry instanceof Polygon) && (origCoordArr != null)
&& ((origCoordArr.length - 1) > coordPosition))
|| ((geometry instanceof LineString) && (origCoordArr != null)
&& (origCoordArr.length > coordPosition)
&& (origCoordArr.length > 2))) {
final Coordinate[] newCoordArr = new Coordinate[origCoordArr.length + 1];
final float[] newXArr = new float[origXArr.length + 1];
final float[] newYArr = new float[origYArr.length + 1];
// vorher
for (int i = 0; i <= coordPosition; ++i) {
newCoordArr[i] = origCoordArr[i];
newXArr[i] = origXArr[i];
newYArr[i] = origYArr[i];
}
// zu entferndes Element duplizieren, hier muss geklont werden
newCoordArr[coordPosition + 1] = (Coordinate)(origCoordArr[coordPosition].clone());
newXArr[coordPosition + 1] = origXArr[coordPosition];
newYArr[coordPosition + 1] = origYArr[coordPosition];
// nachher
for (int i = coordPosition + 1; i < origCoordArr.length; ++i) {
newCoordArr[i + 1] = origCoordArr[i];
newXArr[i + 1] = origXArr[i];
newYArr[i + 1] = origYArr[i];
}
// Sicherstellen dass der neue Anfangspunkt auch der Endpukt ist
if ((coordPosition == 0) && (geometry instanceof Polygon)) {
newCoordArr[newCoordArr.length - 1] = newCoordArr[0];
newXArr[newXArr.length - 1] = newXArr[0];
newYArr[newXArr.length - 1] = newYArr[0];
}
setNewCoordinates(entityPosition, ringPosition, newXArr, newYArr, newCoordArr);
}
}
/**
* Liefert eine exakte Kopie dieses PFeatures. Es besitzt denselben Inhalt, jedoch einen anderen Hashwert als das
* Original.
*
* @return Kopie dieses PFeatures
*/
@Override
public Object clone() {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("clone()", new CurrentStackTrace()); // NOI18N
}
}
final PFeature p = new PFeature(feature, wtst, this.x_offset, y_offset, viewer);
p.splitPolygonFromHandle = splitPolygonFromHandle;
p.splitPolygonToHandle = splitPolygonToHandle;
return p;
}
/**
* DOCUMENT ME!
*
* @param coord coordEntity DOCUMENT ME!
* @param geometryFactory DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private static Point createPoint(final Coordinate coord, final GeometryFactory geometryFactory) {
return geometryFactory.createPoint(coord);
}
/**
* DOCUMENT ME!
*
* @param coordArray coordEntity DOCUMENT ME!
* @param geometryFactory DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private static LineString createLineString(final Coordinate[] coordArray, final GeometryFactory geometryFactory) {
return geometryFactory.createLineString(coordArray);
}
/**
* DOCUMENT ME!
*
* @param ringCoordArray coordEntity DOCUMENT ME!
* @param geometryFactory DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private static Polygon createPolygon(final Coordinate[][] ringCoordArray, final GeometryFactory geometryFactory) {
// ring des polygons erstellen
final LinearRing shell = geometryFactory.createLinearRing(ringCoordArray[0]);
// ringe der löscher erstellen
final Collection<LinearRing> holes = new ArrayList<LinearRing>();
for (int ringIndex = 1; ringIndex < ringCoordArray.length; ringIndex++) {
final LinearRing holeShell = geometryFactory.createLinearRing(ringCoordArray[ringIndex]);
holes.add(holeShell);
}
// polygon erstellen und hinzufügen
final Polygon polygon = geometryFactory.createPolygon(shell, holes.toArray(new LinearRing[0]));
return polygon;
}
/**
* Gleicht die Geometrie an das PFeature an. Erstellt die jeweilige Geometrie (Punkt, Linie, Polygon) und f\u00FCgt
* sie dem Feature hinzu.
*/
public void syncGeometry() {
try {
if (getFeature().isEditable()) {
// geometryfactory erzeugen
final GeometryFactory geometryFactory = new GeometryFactory(
new PrecisionModel(PrecisionModel.FLOATING),
CrsTransformer.extractSridFromCrs(getViewerCrs().getCode()));
// sonderfall multipolygon TODO eigentlich garkein sonderfall, multipoint und multilinestring müssen
// langfristig genauso behandelt werden
if ((getFeature().getGeometry() instanceof MultiPolygon)
|| ((getFeature().getGeometry() instanceof Polygon) && (entityRingCoordArr.length > 1))) {
final Collection<Polygon> polygons = new ArrayList<Polygon>(entityRingCoordArr.length);
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
final Polygon polygon = createPolygon(entityRingCoordArr[entityIndex], geometryFactory);
polygons.add(polygon);
}
// multipolygon aus den polygonen erzeugen
final MultiPolygon multiPolygon = geometryFactory.createMultiPolygon(polygons.toArray(
new Polygon[0]));
assignSynchronizedGeometry(multiPolygon);
} else {
final boolean isSingle = entityRingCoordArr.length == 1;
if (isSingle) {
if (entityRingCoordArr[0][0] == null) {
log.warn("coordArr==null"); // NOI18N
} else {
final boolean isPoint = entityRingCoordArr[0][0].length == 1;
final boolean isPolygon = (entityRingCoordArr[0][0].length > 3)
&& entityRingCoordArr[0][0][0].equals(
entityRingCoordArr[0][0][entityRingCoordArr[0][0].length - 1]);
final boolean isLineString = !isPoint && !isPolygon;
if (isPoint) {
assignSynchronizedGeometry(createPoint(entityRingCoordArr[0][0][0], geometryFactory));
} else if (isLineString) {
assignSynchronizedGeometry(createLineString(entityRingCoordArr[0][0], geometryFactory));
} else if (isPolygon) {
assignSynchronizedGeometry(createPolygon(entityRingCoordArr[0], geometryFactory));
}
}
}
}
}
} catch (Exception e) {
log.error("Error while synchronising PFeature with feature.", e);
}
}
/**
* Assigns the PFeature geometry to the feature if they differ. The feature will keep its crs.
*
* @param newGeom DOCUMENT ME!
*/
private void assignSynchronizedGeometry(final Geometry newGeom) {
final Geometry oldGeom = feature.getGeometry();
final String oldCrs = CrsTransformer.createCrsFromSrid(oldGeom.getSRID());
final String newCrs = CrsTransformer.createCrsFromSrid(newGeom.getSRID());
// if (!newGeom.isValid()) {
// doGeometry(oldGeom);
// return;
// }
//
if ((newGeom.getSRID() == oldGeom.getSRID())
|| (CrsTransformer.isDefaultCrs(oldCrs) && CrsTransformer.isDefaultCrs(newCrs))) {
if (log.isDebugEnabled()) {
log.debug("feature and pfeature geometry differ, but have the same crs and will be synchronized."); // NOI18N
}
if (CrsTransformer.isDefaultCrs(newCrs)) {
newGeom.setSRID(CismapBroker.getInstance().getDefaultCrsAlias());
}
feature.setGeometry(newGeom);
} else {
try {
final CrsTransformer transformer = new CrsTransformer(newCrs);
final Geometry oldGeomWithNewSrid = transformer.transformGeometry(oldGeom, oldCrs);
if (!oldGeomWithNewSrid.equalsExact(newGeom)) {
final CrsTransformer reverseTransformer = new CrsTransformer(oldCrs);
final Geometry newGeomWithOldSrid = reverseTransformer.fastTransformGeometry(newGeom, newCrs);
if (log.isDebugEnabled()) {
log.debug("feature and pfeature geometry differ and will be synchronized."); // NOI18N
}
if (CrsTransformer.isDefaultCrs(oldCrs)) {
newGeomWithOldSrid.setSRID(CismapBroker.getInstance().getDefaultCrsAlias());
}
feature.setGeometry(newGeomWithOldSrid);
} else {
if (log.isDebugEnabled()) {
log.debug("feature and pfeature geometry do not differ."); // NOI18N
}
}
} catch (final Exception e) {
log.error("Cannot synchronize feature.", e); // NOI18N
}
}
}
/**
* Erzeugt Koordinaten- und Punktarrays aus einem gegebenen Geometry-Objekt.
*
* @param geom vorhandenes Geometry-Objekt
*/
private void doGeometry(final Geometry geom) {
if (geom instanceof Point) {
final Point point = (Point)geom;
entityRingCoordArr = new Coordinate[][][] {
{
{ point.getCoordinate() }
}
};
} else if (geom instanceof LineString) {
final LineString lineString = (LineString)geom;
entityRingCoordArr = new Coordinate[][][] {
{ lineString.getCoordinates() }
};
} else if (geom instanceof Polygon) {
final Polygon polygon = (Polygon)geom;
final int numOfHoles = polygon.getNumInteriorRing();
entityRingCoordArr = new Coordinate[1][1 + numOfHoles][];
entityRingCoordArr[0][0] = polygon.getExteriorRing().getCoordinates();
for (int ringIndex = 1; ringIndex < entityRingCoordArr[0].length; ++ringIndex) {
entityRingCoordArr[0][ringIndex] = polygon.getInteriorRingN(ringIndex - 1).getCoordinates();
}
} else if (geom instanceof LinearRing) {
// doPolygon((Polygon)geom);
} else if (geom instanceof MultiPoint) {
entityRingCoordArr = new Coordinate[][][] {
{ ((MultiPoint)geom).getCoordinates() }
};
} else if (geom instanceof MultiLineString) {
final MultiLineString multiLineString = (MultiLineString)geom;
final int numOfGeoms = multiLineString.getNumGeometries();
entityRingCoordArr = new Coordinate[numOfGeoms][][];
for (int entityIndex = 0; entityIndex < numOfGeoms; ++entityIndex) {
final Coordinate[] coordSubArr = ((LineString)multiLineString.getGeometryN(entityIndex))
.getCoordinates();
entityRingCoordArr[entityIndex] = new Coordinate[][] { coordSubArr };
}
} else if (geom instanceof MultiPolygon) {
final MultiPolygon multiPolygon = (MultiPolygon)geom;
final int numOfEntities = multiPolygon.getNumGeometries();
entityRingCoordArr = new Coordinate[numOfEntities][][];
for (int entityIndex = 0; entityIndex < numOfEntities; ++entityIndex) {
final Polygon polygon = (Polygon)multiPolygon.getGeometryN(entityIndex);
final int numOfHoles = polygon.getNumInteriorRing();
entityRingCoordArr[entityIndex] = new Coordinate[1 + numOfHoles][];
entityRingCoordArr[entityIndex][0] = polygon.getExteriorRing().getCoordinates();
for (int ringIndex = 1; ringIndex < entityRingCoordArr[entityIndex].length; ++ringIndex) {
entityRingCoordArr[entityIndex][ringIndex] = polygon.getInteriorRingN(ringIndex - 1)
.getCoordinates();
}
}
}
updateXpAndYp();
updatePath();
refreshDesign();
}
/**
* DOCUMENT ME!
*/
private void updateXpAndYp() {
entityRingXArr = new float[entityRingCoordArr.length][][];
entityRingYArr = new float[entityRingCoordArr.length][][];
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
entityRingXArr[entityIndex] = new float[entityRingCoordArr[entityIndex].length][];
entityRingYArr[entityIndex] = new float[entityRingCoordArr[entityIndex].length][];
for (int ringIndex = 0; ringIndex < entityRingCoordArr[entityIndex].length; ringIndex++) {
final Coordinate[] transformedCoordArr = transformCoordinateArr(
entityRingCoordArr[entityIndex][ringIndex]);
final int length = transformedCoordArr.length;
entityRingXArr[entityIndex][ringIndex] = new float[length];
entityRingYArr[entityIndex][ringIndex] = new float[length];
for (int coordIndex = 0; coordIndex < length; coordIndex++) {
entityRingXArr[entityIndex][ringIndex][coordIndex] = (float)transformedCoordArr[coordIndex].x;
entityRingYArr[entityIndex][ringIndex][coordIndex] = (float)transformedCoordArr[coordIndex].y;
}
}
}
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public Coordinate[] getCoordArr(final int entityPosition, final int ringPosition) {
return entityRingCoordArr[entityPosition][ringPosition];
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public float[] getXp(final int entityPosition, final int ringPosition) {
return entityRingXArr[entityPosition][ringPosition];
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public float[] getYp(final int entityPosition, final int ringPosition) {
return entityRingYArr[entityPosition][ringPosition];
}
/**
* F\u00FCgt dem PFeature ein weiteres Coordinate-Array hinzu. Dadurch entstehen Multipolygone und Polygone mit
* L\u00F6chern, je nachdem, ob der neue LinearRing ausserhalb oder innerhalb des PFeatures liegt.
*
* @param coordinateArr die Koordinaten des hinzuzuf\u00FCgenden Rings als Coordinate-Array
*/
private void addLinearRing(final Coordinate[] coordinateArr) {
final Coordinate[] points = transformCoordinateArr(coordinateArr);
final GeneralPath gp = new GeneralPath();
gp.reset();
gp.moveTo((float)points[0].x, (float)points[0].y);
for (int i = 1; i < points.length; i++) {
gp.lineTo((float)points[i].x, (float)points[i].y);
}
append(gp, false);
}
/**
* Erzeugt PCanvas-Koordinaten-Punktarrays aus Realworldkoordinaten.
*
* @param coordinateArr Array mit Realworld-Koordinaten
*
* @return DOCUMENT ME!
*/
private Coordinate[] transformCoordinateArr(final Coordinate[] coordinateArr) {
final Coordinate[] points = new Coordinate[coordinateArr.length];
for (int i = 0; i < coordinateArr.length; ++i) {
points[i] = new Coordinate();
if (wtst == null) {
points[i].x = (float)(coordinateArr[i].x + x_offset);
points[i].y = (float)(coordinateArr[i].y + y_offset);
} else {
points[i].x = (float)(wtst.getDestX(coordinateArr[i].x) + x_offset);
points[i].y = (float)(wtst.getDestY(coordinateArr[i].y) + y_offset);
}
}
return points;
}
/**
* Setzt die Zeichenobjekte des Features (z.B. unselektiert=rot) und st\u00F6\u00DFt ein Neuzeichnen an.
*/
public void refreshDesign() {
if (primaryAnnotation != null) {
removeChild(primaryAnnotation);
viewer.removeStickyNode(primaryAnnotation);
}
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("refreshDesign()", new CurrentStackTrace()); // NOI18N
}
}
if (getFeature().isHidden() && !getFeature().isEditable()) {
setStroke(null);
setPaint(null);
} else {
// hier muss die Anpassung bei den WFS Features hin.
Stroke overridingstroke = null;
if (getFeature() instanceof XStyledFeature) {
final XStyledFeature xsf = (XStyledFeature)getFeature();
overridingstroke = xsf.getLineStyle();
}
if (getFeature() instanceof RasterDocumentFeature) {
overridingstroke = FIXED_WIDTH_STROKE;
}
if ((getFeature() instanceof StyledFeature) && (overridingstroke == null)) {
final StyledFeature sf = (StyledFeature)getFeature();
if (sf.getLineWidth() <= 1) {
setStroke(FIXED_WIDTH_STROKE);
} else {
final CustomFixedWidthStroke old = new CustomFixedWidthStroke(sf.getLineWidth());
setStroke(old);
}
// Falls absichtlich keine Linie gesetzt worden ist (z.B. im StyleDialog)
if (sf.getLinePaint() == null) {
setStroke(null);
}
}
if (overridingstroke != null) {
setStroke(overridingstroke);
}
if ((getFeature().getGeometry() instanceof LineString)
|| (getFeature().getGeometry() instanceof MultiLineString)) {
if ((feature instanceof StyledFeature)) {
final java.awt.Paint linePaint = ((StyledFeature)feature).getLinePaint();
if (linePaint != null) {
setStrokePaint(linePaint);
}
}
} else {
if ((feature instanceof StyledFeature)) {
final java.awt.Paint paint = ((StyledFeature)feature).getFillingPaint();
final java.awt.Paint linePaint = ((StyledFeature)feature).getLinePaint();
if (paint != null) {
setPaint(paint);
nonHighlightingPaint = paint;
}
if (linePaint != null) {
setStrokePaint(linePaint);
}
}
}
stroke = getStroke();
strokePaint = getStrokePaint();
setSelected(this.isSelected());
// TODO:Wenn feature=labeledFeature jetzt noch Anpassungen machen
if (((feature instanceof AnnotatedFeature) && ((AnnotatedFeature)feature).isPrimaryAnnotationVisible()
&& (((AnnotatedFeature)feature).getPrimaryAnnotation() != null))) {
final AnnotatedFeature af = (AnnotatedFeature)feature;
primaryAnnotation = new StickyPText(af.getPrimaryAnnotation());
primaryAnnotation.setJustification(af.getPrimaryAnnotationJustification());
if (af.isAutoscale()) {
stickyChild = primaryAnnotation;
}
viewer.getCamera()
.addPropertyChangeListener(PCamera.PROPERTY_VIEW_TRANSFORM, new PropertyChangeListener() {
@Override
public void propertyChange(final PropertyChangeEvent evt) {
setVisibility(primaryAnnotation, af);
}
});
// if (true || af.getMaxScaleDenominator() == null || af.getMinScaleDenominator() == null ||
// af.getMaxScaleDenominator() > denom && af.getMinScaleDenominator() < denom) {
if (af.getPrimaryAnnotationPaint() != null) {
primaryAnnotation.setTextPaint(af.getPrimaryAnnotationPaint());
} else {
primaryAnnotation.setTextPaint(Color.BLACK);
}
if (af.getPrimaryAnnotationScaling() > 0) {
primaryAnnotation.setScale(af.getPrimaryAnnotationScaling());
}
if (af.getPrimaryAnnotationFont() != null) {
primaryAnnotation.setFont(af.getPrimaryAnnotationFont());
}
final boolean vis = primaryAnnotation.getVisible();
final Point intPoint = CrsTransformer.transformToGivenCrs(feature.getGeometry(),
getViewerCrs().getCode())
.getInteriorPoint();
primaryAnnotation.setOffset(wtst.getScreenX(intPoint.getX()), wtst.getScreenY(intPoint.getY()));
addChild(primaryAnnotation);
if (!ignoreStickyFeature && af.isAutoscale()) {
viewer.addStickyNode(primaryAnnotation);
viewer.rescaleStickyNode(primaryAnnotation);
}
setVisibility(primaryAnnotation, af);
// }
}
}
}
/**
* DOCUMENT ME!
*
* @param ptext DOCUMENT ME!
* @param af DOCUMENT ME!
*/
private void setVisibility(final PText ptext, final AnnotatedFeature af) {
final double denom = viewer.getScaleDenominator();
if ((af.getMaxScaleDenominator() == null) || (af.getMinScaleDenominator() == null)
|| ((af.getMaxScaleDenominator() > denom) && (af.getMinScaleDenominator() < denom))) {
ptext.setVisible(true);
} else {
ptext.setVisible(false);
}
}
/**
* F\u00FCgt eine neue \u00FCbergebene Koordinate in das Koordinatenarray ein, statt nur einen Punkt zu duplizieren.
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param coordPosition die Position des neuen Punktes im Array
* @param newValueX original das Original-Array
* @param newValueY der einzuf\u00FCgende Wert
*/
public void insertCoordinate(final int entityPosition,
final int ringPosition,
final int coordPosition,
final float newValueX,
final float newValueY) {
final Coordinate[] originalCoordArr = entityRingCoordArr[entityPosition][ringPosition];
final float[] originalXArr = entityRingXArr[entityPosition][ringPosition];
final float[] originalYArr = entityRingYArr[entityPosition][ringPosition];
if ((((getFeature().getGeometry() instanceof Polygon) || (getFeature().getGeometry() instanceof MultiPolygon))
&& (originalXArr != null)
&& ((originalXArr.length - 1) >= coordPosition))
|| ((getFeature().getGeometry() instanceof LineString) && (originalXArr != null)
&& (originalXArr.length > coordPosition)
&& (originalXArr.length > 2))) {
final Coordinate[] newCoordArr = new Coordinate[originalCoordArr.length + 1];
final float[] newXArr = new float[originalXArr.length + 1];
final float[] newYArr = new float[originalYArr.length + 1];
// vorher
for (int i = 0; i < coordPosition; ++i) {
newCoordArr[i] = originalCoordArr[i];
newXArr[i] = originalXArr[i];
newYArr[i] = originalYArr[i];
}
newCoordArr[coordPosition] = new Coordinate(viewer.getWtst().getSourceX(newValueX),
viewer.getWtst().getSourceY(newValueY));
newXArr[coordPosition] = newValueX;
newYArr[coordPosition] = newValueY;
// nachher
for (int i = coordPosition; i < originalCoordArr.length; ++i) {
newCoordArr[i + 1] = originalCoordArr[i];
newXArr[i + 1] = originalXArr[i];
newYArr[i + 1] = originalYArr[i];
}
if ((getFeature().getGeometry() instanceof Polygon)
|| (getFeature().getGeometry() instanceof MultiPolygon)) {
// Sicherstellen dass der neue Anfangspunkt auch der Endpukt ist
if ((coordPosition == 0) || (coordPosition == (originalCoordArr.length - 1))) {
newCoordArr[newCoordArr.length - 1] = newCoordArr[0];
newXArr[newXArr.length - 1] = newXArr[0];
newYArr[newYArr.length - 1] = newYArr[0];
}
}
setNewCoordinates(entityPosition, ringPosition, newXArr, newYArr, newCoordArr);
}
}
/**
* Entfernt eine Koordinate aus der Geometrie, z.B. beim L\u00F6schen eines Handles.
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param coordPosition Position des zu l\u00F6schenden Punkes im Koordinatenarray
*/
public void removeCoordinate(final int entityPosition, final int ringPosition, final int coordPosition) {
final Coordinate[] originalCoordArr = entityRingCoordArr[entityPosition][ringPosition];
final float[] originalXArr = entityRingXArr[entityPosition][ringPosition];
final float[] originalYArr = entityRingYArr[entityPosition][ringPosition];
if ((((getFeature().getGeometry() instanceof Polygon) || (getFeature().getGeometry() instanceof MultiPolygon))
&& (originalCoordArr != null)
&& ((originalCoordArr.length - 1) > coordPosition))
|| ((getFeature().getGeometry() instanceof LineString) && (originalCoordArr != null)
&& (originalCoordArr.length > coordPosition)
&& (originalCoordArr.length > 2))) {
final Coordinate[] newCoordArr = new Coordinate[originalCoordArr.length - 1];
final float[] newXArr = new float[originalXArr.length - 1];
final float[] newYArr = new float[originalYArr.length - 1];
// vorher
for (int i = 0; i < coordPosition; ++i) {
newCoordArr[i] = originalCoordArr[i];
newXArr[i] = originalXArr[i];
newYArr[i] = originalYArr[i];
}
// zu entferndes Element \u00FCberspringen
// nachher
for (int i = coordPosition; i < newCoordArr.length; ++i) {
newCoordArr[i] = originalCoordArr[i + 1];
newXArr[i] = originalXArr[i + 1];
newYArr[i] = originalYArr[i + 1];
}
// Sicherstellen dass der neue Anfangspunkt auch der Endpukt ist (nur beim Polygon)
if (((coordPosition == 0) && (getFeature().getGeometry() instanceof Polygon))
|| (getFeature().getGeometry() instanceof MultiPolygon)) {
newCoordArr[newCoordArr.length - 1] = newCoordArr[0];
newXArr[newXArr.length - 1] = newXArr[0];
newXArr[newYArr.length - 1] = newYArr[0];
}
setNewCoordinates(entityPosition, ringPosition, newXArr, newYArr, newCoordArr);
// Jetzt sind allerdings alle Locator noch falsch und das handle existiert noch
// handleLayer.removeChild(this);
// Das w\u00E4re zwar optimal (Performance) korrigiert allerdings nicht die falschen
// Locator
}
}
/**
* Erzeugt alle Handles f\u00FCr dieses PFeature auf dem \u00FCbergebenen HandleLayer.
*
* @param handleLayer PLayer der die Handles aufnimmt
*/
public void addHandles(final PNode handleLayer) {
if (getFeature() instanceof LinearReferencedPointFeature) {
addLinearReferencedPointPHandle(handleLayer);
} else if ((getFeature() instanceof PureNewFeature)
&& (((PureNewFeature)getFeature()).getGeometryType() == PureNewFeature.geomTypes.ELLIPSE)) {
addEllipseHandle(handleLayer);
} else {
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
for (int ringIndex = 0; ringIndex < entityRingCoordArr[entityIndex].length; ringIndex++) {
final Coordinate[] coordArr = entityRingCoordArr[entityIndex][ringIndex];
int length = coordArr.length;
final Geometry geometry = getFeature().getGeometry();
if ((geometry instanceof Polygon) || (geometry instanceof MultiPolygon)) {
length--; // xp.length-1 weil der erste und letzte Punkt identisch sind
}
for (int coordIndex = 0; coordIndex < length; ++coordIndex) {
addHandle(handleLayer, entityIndex, ringIndex, coordIndex);
}
}
}
}
}
/**
* Erzeugt ein PHandle an den Koordinaten eines bestimmten Punktes des Koordinatenarrays und f\u00FCgt es dem
* HandleLayer hinzu.
*
* @param handleLayer PLayer dem das Handle als Kind hinzugef\u00FCgt wird
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param coordPosition Position des Punktes im Koordinatenarray
*/
public void addHandle(final PNode handleLayer,
final int entityPosition,
final int ringPosition,
final int coordPosition) {
final int positionInArray = coordPosition;
final PHandle h = new TransformationPHandle(this, entityPosition, ringPosition, positionInArray);
// EventQueue.invokeLater(new Runnable() {
//
// public void run() {
handleLayer.addChild(h);
h.addClientProperty("coordinate", entityRingCoordArr[entityPosition][ringPosition][coordPosition]); // NOI18N
h.addClientProperty("coordinate_position_entity", new Integer(entityPosition)); // NOI18N
h.addClientProperty("coordinate_position_ring", new Integer(ringPosition)); // NOI18N
h.addClientProperty("coordinate_position_coord", new Integer(coordPosition)); // NOI18N
// }
// });
}
/**
* Pr\u00FCft alle Features, ob sie zu das gegebene PFeature \u00FCberschneiden und ein Handle besitzen das weniger
* als 1cm vom angeklickten Handle entfernt ist. Falls beides zutrifft, wird eine MultiMap mit diesen Features
* gef\u00FCllt und zur\u00FCckgegeben.
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param coordPosition Postion des geklickten Handles im Koordinatenarray um Koordinaten herauszufinden
*
* @return MultiMap mit Features, die die Bedingungen erf\u00FCllen
*/
public de.cismet.tools.collections.MultiMap checkforGlueCoords(
final int entityPosition,
final int ringPosition,
final int coordPosition) {
final GeometryFactory gf = new GeometryFactory();
final MultiMap glueCoords = new MultiMap();
// Alle vorhandenen Features holen und pr\u00FCfen
final List<Feature> allFeatures = getViewer().getFeatureCollection().getAllFeatures();
for (final Feature f : allFeatures) {
// \u00DCberschneiden sich die Features? if (!f.equals(PFeature.this.getFeature()) &&
// f.getGeometry().intersects(PFeature.this.getFeature().getGeometry()) ){
if (!f.equals(PFeature.this.getFeature())) {
final Geometry fgeo = CrsTransformer.transformToGivenCrs(f.getGeometry(), getViewerCrs().getCode());
final Geometry thisGeo = CrsTransformer.transformToGivenCrs(PFeature.this.getFeature().getGeometry(),
getViewerCrs().getCode());
if (fgeo.buffer(0.01).intersects(thisGeo.buffer(0.01))) {
final Coordinate coord = entityRingCoordArr[entityPosition][ringPosition][coordPosition];
final Point p = gf.createPoint(coord);
// Erzeuge Array mit allen Eckpunkten
final Coordinate[] ca = fgeo.getCoordinates();
// Prüfe für alle Punkte ob der Abstand < 1cm ist
for (int i = 0; i < ca.length; ++i) {
final Point p2 = gf.createPoint(ca[i]);
final double abstand = p.distance(p2);
if (abstand < 0.01) {
glueCoords.put(getViewer().getPFeatureHM().get(f), i);
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("checkforGlueCoords() Abstand kleiner als 1cm: " + abstand + " :: " + f); // NOI18N
}
}
} else {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("checkforGlueCoords() Abstand: " + abstand); // NOI18N
}
}
}
}
}
}
}
return glueCoords;
}
/**
* Erzeugt alle RotaionHandles f\u00FCr dieses PFeature auf dem \u00FCbergebenen HandleLayer.
*
* @param handleLayer PLayer der die RotationHandles aufnimmt
*/
public void addRotationHandles(final PNode handleLayer) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("addRotationHandles(): PFeature:" + this); // NOI18N
}
}
// SchwerpunktHandle erzeugen
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("PivotHandle==" + pivotHandle); // NOI18N
}
}
if (pivotHandle == null) {
addPivotHandle(handleLayer);
} else {
boolean contains = false;
for (final Object o : handleLayer.getChildrenReference()) {
if (o == pivotHandle) {
contains = true;
break;
}
}
if (!contains) {
handleLayer.addChild(pivotHandle);
}
}
// Handles einfügen
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
for (int ringIndex = 0; ringIndex < entityRingCoordArr[entityIndex].length; ringIndex++) {
final Coordinate[] coordArr = entityRingCoordArr[entityIndex][ringIndex];
int length = coordArr.length;
final Geometry geometry = getFeature().getGeometry();
if ((geometry instanceof Polygon) || (geometry instanceof MultiPolygon)) {
length--; // xp.length-1 weil der erste und letzte Punkt identisch sind
}
for (int coordIndex = 0; coordIndex < length; ++coordIndex) {
addRotationHandle(handleLayer, entityIndex, ringIndex, coordIndex);
}
}
}
}
/**
* F\u00FCgt dem PFeature spezielle Handles zum Rotieren des PFeatures an den Eckpunkten hinzu. Zus\u00E4tzlich ein
* Handle am Rotationsmittelpunkt, um diesen manuell \u00E4nder nzu k\u00F6nnen.
*
* @param handleLayer HandleLayer der MappingComponent
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param coordPosition DOCUMENT ME!
*/
private void addRotationHandle(final PNode handleLayer,
final int entityPosition,
final int ringPosition,
final int coordPosition) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("addRotationHandles():add from " + coordPosition + ". RotationHandle"); // NOI18N
}
}
final PHandle rotHandle = new RotationPHandle(
this,
entityPosition,
ringPosition,
coordPosition,
mid,
pivotHandle);
rotHandle.setPaint(new Color(1f, 1f, 0f, 0.7f));
// EventQueue.invokeLater(new Runnable() {
//
// @Override
// public void run() {
handleLayer.addChild(rotHandle);
rotHandle.addClientProperty("coordinate", entityRingCoordArr[entityPosition][ringPosition][coordPosition]); // NOI18N
rotHandle.addClientProperty("coordinate_position_entity", new Integer(entityPosition)); // NOI18N
rotHandle.addClientProperty("coordinate_position_ring", new Integer(ringPosition)); // NOI18N
rotHandle.addClientProperty("coordinate_position_coord", new Integer(coordPosition)); // NOI18N
// }
// });
}
/**
* Erzeugt den Rotations-Angelpunkt. Der Benutzer kann den Punkt verschieben, um die Drehung um einen anderen Punkt
* als den Mittel-/Schwerpunkt auszuf\u00FChren.
*
* @param handleLayer PLayer der das PivotHandle aufnimmt
*/
public void addPivotHandle(final PNode handleLayer) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("addPivotHandle()"); // NOI18N
}
}
PBounds allBounds = null;
if (getViewer().getFeatureCollection() instanceof DefaultFeatureCollection) {
final Collection selectedFeatures = getViewer().getFeatureCollection().getSelectedFeatures();
Rectangle2D tmpBounds = getBounds().getBounds2D();
for (final Object o : selectedFeatures) {
final PFeature pf = (PFeature)getViewer().getPFeatureHM().get(o);
if (!(selectedFeatures.contains(pf))) {
tmpBounds = pf.getBounds().getBounds2D().createUnion(tmpBounds);
}
}
allBounds = new PBounds(tmpBounds);
}
final Collection selArr = getViewer().getFeatureCollection().getSelectedFeatures();
for (final Object o : selArr) {
final PFeature pf = (PFeature)(getViewer().getPFeatureHM().get(o));
pf.setPivotPoint(allBounds.getCenter2D());
mid = allBounds.getCenter2D();
}
pivotHandle = new PivotPHandle(this, mid);
pivotHandle.setPaint(new Color(0f, 0f, 0f, 0.6f));
// EventQueue.invokeLater(new Runnable() {
//
// @Override
// public void run() {
handleLayer.addChild(pivotHandle);
// }
// });
for (final Object o : selArr) {
final PFeature pf = (PFeature)(getViewer().getPFeatureHM().get(o));
pf.pivotHandle = this.pivotHandle;
}
}
/**
* DOCUMENT ME!
*
* @param handleLayer DOCUMENT ME!
*/
public void addLinearReferencedPointPHandle(final PNode handleLayer) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("addLinearReferencingHandle()"); // NOI18N
}
}
final PHandle h = new LinearReferencedPointPHandle(this);
// EventQueue.invokeLater(new Runnable() {
//
// public void run() {
handleLayer.addChild(h);
// }
// });
}
/**
* DOCUMENT ME!
*
* @param handleLayer DOCUMENT ME!
*/
public void addEllipseHandle(final PNode handleLayer) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("addEllipseHandle()"); // NOI18N
}
}
ellipseHandle = new EllipsePHandle(this);
ellipseHandle.setPaint(new Color(0f, 0f, 0f, 0.6f));
handleLayer.addChild(ellipseHandle);
}
/**
* Sets a new pivotpoint for the roation.
*
* @param newPivot new Point2D
*/
public void setPivotPoint(final Point2D newPivot) {
this.mid = newPivot;
}
/**
* Berechnet anhand einer Rotationsmatrix die neuen Punkte des Features, diese werden dann mittels
* moveCoordinateToNewPiccoloPosition() auch auf die zugeh\u00F6rige Geometrie \u00FCbertragen.
*
* @param rad Winkel der Rotation im Bogenma\u00DF
* @param tempMid Mittelpunkt der Rotation
*/
public void rotateAllPoints(double rad, Point2D tempMid) {
final double[][] matrix = new double[2][2];
double cos;
double sin;
if (rad > 0.0d) { // Clockwise
cos = Math.cos(rad);
sin = Math.sin(rad);
matrix[0][0] = cos;
matrix[0][1] = sin * (-1);
matrix[1][0] = sin;
matrix[1][1] = cos;
} else { // Counterclockwise
rad *= -1;
cos = Math.cos(rad);
sin = Math.sin(rad);
matrix[0][0] = cos;
matrix[0][1] = sin;
matrix[1][0] = sin * (-1);
matrix[1][1] = cos;
}
if (tempMid == null) {
tempMid = mid;
}
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
for (int ringIndex = 0; ringIndex < entityRingCoordArr[entityIndex].length; ringIndex++) {
for (int coordIndex = entityRingCoordArr[entityIndex][ringIndex].length - 1; coordIndex >= 0;
coordIndex--) {
final double dx = entityRingXArr[entityIndex][ringIndex][coordIndex] - tempMid.getX();
final double dy = entityRingYArr[entityIndex][ringIndex][coordIndex] - tempMid.getY();
// Clockwise
final float resultX = new Double(tempMid.getX() + ((dx * matrix[0][0]) + (dy * matrix[0][1])))
.floatValue();
final float resultY = new Double(tempMid.getY() + ((dx * matrix[1][0]) + (dy * matrix[1][1])))
.floatValue();
moveCoordinateToNewPiccoloPosition(entityIndex, ringIndex, coordIndex, resultX, resultY);
}
}
}
}
/**
* Bildet aus Mausposition, Mittelpunkt und Handleposition ein Dreieck und berechnet daraus, den bei der Bewegung
* zur\u00FCckgelegten Winkel und dessen Richtung.
*
* @param event PInputEvent der Mausbewegung
* @param x X-Koordinate des Handles
* @param y Y-Koordinate des Handles
*
* @return \u00FCberstrichener Winkel der Bewegung im Bogenma\u00DF
*/
public double calculateDrag(final PInputEvent event, final float x, final float y) {
final Point2D mousePos = event.getPosition();
// create vectors
final double[] mv = { (mousePos.getX() - mid.getX()), (mousePos.getY() - mid.getY()) };
final double[] hv = { (x - mid.getX()), (y - mid.getY()) };
final double cosm = ((mv[0]) / Math.hypot(mv[0], mv[1]));
final double cosh = ((hv[0]) / Math.hypot(hv[0], hv[1]));
final double resH = Math.acos(cosh);
final double resM = Math.acos(cosm);
double res = 0;
if (((mousePos.getY() - mid.getY()) > 0) && ((y - mid.getY()) > 0)) {
res = resM - resH;
} else if (((mousePos.getY() - mid.getY()) > 0) && ((y - mid.getY()) < 0)) {
res = resM - (resH * -1);
} else if ((y - mid.getY()) < 0) {
res = resH - resM;
} else if (((mousePos.getY() - mid.getY()) < 0) && ((y - mid.getY()) > 0)) {
res = (resH * -1) - resM;
}
return res;
}
/**
* Ver\u00E4ndert die PCanvas-Koordinaten eines Punkts des PFeatures.
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param coordPosition Position des Punkts im Koordinatenarray
* @param newX neue X-Koordinate
* @param newY neue Y-Koordinate
*/
public void moveCoordinateToNewPiccoloPosition(final int entityPosition,
final int ringPosition,
final int coordPosition,
final float newX,
final float newY) {
final Coordinate[] origCoordArr = entityRingCoordArr[entityPosition][ringPosition];
final float[] origXArr = entityRingXArr[entityPosition][ringPosition];
final float[] origYArr = entityRingYArr[entityPosition][ringPosition];
final Coordinate[] newCoordArr = new Coordinate[origCoordArr.length];
System.arraycopy(origCoordArr, 0, newCoordArr, 0, newCoordArr.length);
newCoordArr[coordPosition] = new Coordinate(wtst.getSourceX(newX - x_offset),
wtst.getSourceY(newY - y_offset));
final Geometry geometry = getFeature().getGeometry();
if ((coordPosition == 0) && ((geometry instanceof Polygon) || (geometry instanceof MultiPolygon))) {
newCoordArr[origXArr.length - 1] = newCoordArr[0];
}
origXArr[coordPosition] = newX;
origYArr[coordPosition] = newY;
origCoordArr[coordPosition] = newCoordArr[coordPosition];
if ((coordPosition == 0) && ((geometry instanceof Polygon) || (geometry instanceof MultiPolygon))) {
origXArr[origXArr.length - 1] = origXArr[0];
origYArr[origYArr.length - 1] = origYArr[0];
origCoordArr[origXArr.length - 1] = origCoordArr[0];
}
updatePath();
}
/**
* Removes the current splitline and creates a new one from the startingpoint.
*/
private void resetSplitLine() {
removeAllChildren();
splitPolygonLine = new PPath();
splitPoints = new ArrayList<Point2D>();
splitPoints.add(getFirstSplitHandle());
splitPolygonLine.setStroke(FIXED_WIDTH_STROKE);
// splitPolygonLine.setPaint(new Color(1f,0f,0f,0.5f));
addChild(splitPolygonLine);
}
/**
* Fügt dem PFeature ein Handle hinzu mit dem man das PFeature in zwei zerlegen kann.
*
* @param p das SplitHandle
*/
public void addSplitHandle(final PHandle p) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("addSplitHandle()"); // NOI18N
}
}
if (splitPolygonFromHandle == p) {
splitPolygonFromHandle = null;
p.setSelected(false);
} else if (splitPolygonToHandle == p) {
splitPolygonToHandle = null;
p.setSelected(false);
} else if (splitPolygonFromHandle == null) {
splitPolygonFromHandle = p;
p.setSelected(true);
resetSplitLine();
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("after addSplitHandle: splitPolygonFromHandle=" + splitPolygonFromHandle); // NOI18N
}
}
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("in addSplitHandle this=" + this); // NOI18N
}
}
} else if (splitPolygonToHandle == null) {
splitPolygonToHandle = p;
p.setSelected(true);
splitPoints.add(new Point2D.Double(
splitPolygonToHandle.getLocator().locateX(),
splitPolygonToHandle.getLocator().locateY()));
} else {
p.setSelected(false);
}
//LineString()
if ((splitPolygonFromHandle != null) && (splitPolygonToHandle != null)) {
final Coordinate[] ca = new Coordinate[splitPoints.size() + 2];
// ca[0]=(Coordinate)splitPolygonFromHandle.getClientProperty("coordinate");
// ca[1]=(Coordinate)splitPolygonToHandle.getClientProperty("coordinate");
// GeometryFactory gf=new GeometryFactory();
// LineString ls=gf.createLineString(ca);
// Geometry geom=feature.getGeometry();
// if ((geom.overlaps(ls))) {
// splitPolygonLine=PPath.createLine((float)splitPolygonFromHandle.getLocator().locateX(),(float)splitPolygonFromHandle.getLocator().locateY(),
// (float)splitPolygonToHandle.getLocator().locateX(),(float)splitPolygonToHandle.getLocator().locateY());
// splitPolygonLine.setStroke(new FixedWidthStroke());
// this.addChild(splitPolygonLine);
// }
}
}
/**
* Returns the point of the handle from which the split starts.
*
* @return Point2D
*/
public Point2D getFirstSplitHandle() {
if ((splitPolygonFromHandle != null)
&& (splitPolygonFromHandle.getClientProperty("coordinate") instanceof Coordinate)) { // NOI18N
final Coordinate c = ((Coordinate)splitPolygonFromHandle.getClientProperty("coordinate")); // NOI18N
final Point2D ret = new Point2D.Double((double)splitPolygonFromHandle.getLocator().locateX(),
(double)splitPolygonFromHandle.getLocator().locateY());
return ret;
} else {
return null;
}
}
/**
* Returns if the PFeature in currently in a splitmode.
*
* @return true, if splitmode is active, else false
*/
public boolean inSplitProgress() {
final CurrentStackTrace cst = new CurrentStackTrace();
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("splitPolygonFromHandle:" + splitPolygonFromHandle, cst); // NOI18N
}
}
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("splitPolygonToHandle:" + splitPolygonToHandle, cst); // NOI18N
}
}
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("inSplitProgress=" + ((splitPolygonFromHandle != null) && (splitPolygonToHandle == null))); // NOI18N
}
}
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("in inSplitProgress this=" + this); // NOI18N
}
}
return ((splitPolygonFromHandle != null) && (splitPolygonToHandle == null));
}
/**
* Zerlegt das Feature dieses PFeatures in zwei Features an Hand einer vom Benutzer gezogenen Linie zwischen 2
* Handles.
*
* @return Feature-Array mit den Teilfeatures
*/
public Feature[] split() {
if (isSplittable()) {
final PureNewFeature[] ret = new PureNewFeature[2];
- int from = ((Integer)(splitPolygonFromHandle.getClientProperty("coordinate_position_in_arr"))).intValue(); // NOI18N
- int to = ((Integer)(splitPolygonToHandle.getClientProperty("coordinate_position_in_arr"))).intValue(); // NOI18N
+ int from = ((Integer)(splitPolygonFromHandle.getClientProperty("coordinate_position_coord"))).intValue(); // NOI18N
+ int to = ((Integer)(splitPolygonToHandle.getClientProperty("coordinate_position_coord"))).intValue(); // NOI18N
splitPolygonToHandle = null;
splitPolygonFromHandle = null;
// In splitPoints.get(0) steht immer from
// In splitPoint.get(size-1) steht immer to
// Werden die beiden vertauscht, so muss dies sp\u00E4ter bei der Reihenfolge ber\u00FCcksichtigt werden.
boolean wasSwapped = false;
if (from > to) {
final int swap = from;
from = to;
to = swap;
wasSwapped = true;
}
// Erstes Polygon
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("ErstesPolygon" + (to - from + splitPoints.size())); // NOI18N
}
}
final Coordinate[] c1 = new Coordinate[to - from + splitPoints.size()];
int counter = 0;
// TODO multipolygon / multilinestring
final Coordinate[] coordArr = entityRingCoordArr[0][0];
for (int i = from; i <= to; ++i) {
c1[counter] = (Coordinate)coordArr[i].clone();
counter++;
}
if (wasSwapped) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("SWAPPED"); // NOI18N
}
}
for (int i = 1; i < (splitPoints.size() - 1); ++i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c1[counter] = splitCoord;
counter++;
}
} else {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("NOT_SWAPPED"); // NOI18N
}
}
for (int i = splitPoints.size() - 2; i > 0; --i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c1[counter] = splitCoord;
counter++;
}
}
c1[counter] = (Coordinate)coordArr[from].clone();
ret[0] = new PureNewFeature(c1, wtst);
ret[0].setEditable(true);
// Zweites Polygon
// Größe Array= (Anzahl vorh. Coords) - (anzahl vorh. Handles des ersten Polygons) + (SplitLinie )
final Coordinate[] c2 = new Coordinate[(coordArr.length) - (to - from + 1) + splitPoints.size()];
counter = 0;
for (int i = 0; i <= from; ++i) {
c2[counter] = (Coordinate)coordArr[i].clone();
counter++;
}
if (wasSwapped) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("SWAPPED"); // NOI18N
}
}
for (int i = splitPoints.size() - 2; i > 0; --i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c2[counter] = splitCoord;
counter++;
}
} else {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("NOT_SWAPPED"); // NOI18N
}
}
for (int i = 1; i < (splitPoints.size() - 1); ++i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c2[counter] = splitCoord;
counter++;
}
}
for (int i = to; i < coordArr.length; ++i) {
c2[counter] = (Coordinate)coordArr[i].clone();
counter++;
}
// c1[counter]=(Coordinate)coordArr[0].clone();
for (int i = 0; i < c2.length; ++i) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("c2[" + i + "]=" + c2[i]); // NOI18N
}
}
}
// ret[1]=new PFeature(c2,wtst,x_offset,y_offset,viewer);
ret[1] = new PureNewFeature(c2, wtst);
ret[1].setEditable(true);
// ret[0].setViewer(viewer);
// ret[1].setViewer(viewer);
return ret;
// ret[1]=new PFeature(c1,wtst,x_offset,y_offset);
// ret[0].setViewer(viewer);
// ret[1].setViewer(viewer);
// return ret;
} else {
return null;
}
}
/**
* Moves the PFeature for a certain dimension.
*
* @param dim PDimension to move
*/
public void moveFeature(final PDimension dim) {
try {
final double scale = viewer.getCamera().getViewScale();
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("Scale=" + scale); // NOI18N
}
}
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
for (int ringIndex = 0; ringIndex < entityRingCoordArr[entityIndex].length; ringIndex++) {
for (int coordIndex = 0; coordIndex < entityRingCoordArr[entityIndex][ringIndex].length;
++coordIndex) {
final Coordinate[] coordArr = entityRingCoordArr[entityIndex][ringIndex];
final float[] xArr = entityRingXArr[entityIndex][ringIndex];
final float[] yArr = entityRingYArr[entityIndex][ringIndex];
xArr[coordIndex] = xArr[coordIndex] + (float)(dim.getWidth() / (float)scale);
yArr[coordIndex] = yArr[coordIndex] + (float)(dim.getHeight() / (float)scale);
coordArr[coordIndex].x = wtst.getSourceX(xArr[coordIndex]); // -x_offset);
coordArr[coordIndex].y = wtst.getSourceY(yArr[coordIndex]); // -y_offset);
}
}
}
updatePath();
syncGeometry();
resetInfoNodePosition();
} catch (NullPointerException npe) {
log.warn("error at moveFeature:", npe); // NOI18N
}
}
/**
* Sets the offset of the stickychild to the interiorpoint of this PFeature.
*/
public void resetInfoNodePosition() {
if (stickyChild != null) {
final Geometry geom = CrsTransformer.transformToGivenCrs(getFeature().getGeometry(),
getViewerCrs().getCode());
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("getFeature().getGeometry():" + geom); // NOI18N
}
}
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("getFeature().getGeometry().getInteriorPoint().getY():" // NOI18N
+ geom.getInteriorPoint().getY());
}
}
stickyChild.setOffset(wtst.getScreenX(geom.getInteriorPoint().getX()),
wtst.getScreenY(geom.getInteriorPoint().getY()));
}
}
/**
* Renews the InfoNode by deleting the old and creating a new one.
*/
public void refreshInfoNode() {
if ((stickyChild == infoNode) && (infoNode != null)) {
stickyChild = null;
removeChild(infoNode);
} else if ((stickyChild != null) && (infoNode != null)) {
stickyChild.removeChild(infoNode);
}
addInfoNode();
}
/**
* Calls refreshInfoNode() in the EDT.
*/
@Override
public void refresh() {
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
if (log.isDebugEnabled()) {
log.debug("refreshInfoNode"); // NOI18N
}
PFeature.this.refreshInfoNode();
}
});
}
/**
* Creates an InfoPanel which is located in a PSwingComponent. This component will be added as child of this
* PFeature. The InfoPanel contains the featuretype as icon and the name of the PFeature.
*/
public void addInfoNode() {
try {
if (getFeature() instanceof XStyledFeature) {
final XStyledFeature xsf = (XStyledFeature)getFeature();
if (infoComponent == null) {
infoComponent = xsf.getInfoComponent(this);
}
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("ADD INFONODE3"); // NOI18N
}
}
if (infoPanel != null) {
viewer.getSwingWrapper().remove(infoPanel);
}
infoPanel = new InfoPanel(infoComponent);
infoPanel.setPfeature(this);
infoPanel.setTitleText(xsf.getName());
infoPanel.setTitleIcon(xsf.getIconImage());
pswingComp = new PSwing(viewer, infoPanel);
pswingComp.resetBounds();
pswingComp.setOffset(0, 0);
// PText pt=new PText(xsf.getName());
// if (getFeature().isEditable()) {
// pt.setTextPaint(new Color(255,0,0));
// } else {
// pt.setTextPaint(new Color(0,0,0));
// }
// int width=(int)(pt.getWidth()+pi.getWidth());
// int height=(int)(pi.getHeight());
// Dieser node wird gebraucht damit die Mouseover sachen funktionieren. Geht nicht mit einem PSwing.
// Auch nicht wenn das PSwing Element ParentNodeIsAPFeature & PSticky implementieren
final StickyPPath p = new StickyPPath(new Rectangle(0, 0, 1, 1));
p.setStroke(null);
p.setPaint(new Color(250, 0, 0, 0)); // letzer Wert Wert Alpha: Wenn 0 dann unsichtbar
p.setStrokePaint(null);
infoPanel.setPNodeParent(p);
infoPanel.setPSwing(pswingComp);
p.addChild(pswingComp);
pswingComp.setOffset(0, 0);
if (stickyChild != null) {
stickyChild.addChild(p);
p.setOffset(stickyChild.getWidth(), 0);
} else {
syncGeometry();
final Geometry geom = CrsTransformer.transformToGivenCrs(getFeature().getGeometry(),
getViewerCrs().getCode());
Point interiorPoint = null;
try {
interiorPoint = geom.getInteriorPoint();
} catch (TopologyException e) {
log.warn("Interior point of geometry couldn't be calculated. Try to use buffering.");
// see http://www.vividsolutions.com/JTS/bin/JTS%20Developer%20Guide.pdf, p. 11/12
}
if (interiorPoint == null) {
final GeometryFactory factory = new GeometryFactory();
final GeometryCollection collection = factory.createGeometryCollection(new Geometry[] { geom });
final Geometry union = collection.buffer(0);
interiorPoint = union.getInteriorPoint();
}
p.setOffset(wtst.getScreenX(interiorPoint.getX()),
wtst.getScreenY(interiorPoint.getY()));
addChild(p);
p.setWidth(pswingComp.getWidth());
p.setHeight(pswingComp.getHeight());
stickyChild = p;
if (!ignoreStickyFeature) {
viewer.addStickyNode(p);
viewer.rescaleStickyNodes();
}
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("addInfoNode()"); // NOI18N
}
}
}
infoNode = p;
if (viewer != null) {
infoNode.setVisible(viewer.isInfoNodesVisible());
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("addInfoNode()"); // NOI18N
}
}
viewer.rescaleStickyNodes();
p.setWidth(pswingComp.getWidth());
p.setHeight(pswingComp.getHeight());
} else {
infoNode.setVisible(false);
}
pswingComp.addPropertyChangeListener("fullBounds", new PropertyChangeListener() { // NOI18N
@Override
public void propertyChange(final PropertyChangeEvent evt) {
p.setWidth(pswingComp.getWidth());
p.setHeight(pswingComp.getHeight());
}
});
}
} catch (Throwable t) {
log.error("Error in AddInfoNode", t); // NOI18N
}
}
/**
* Deletes the InfoPanel and hides the PFeature.
*/
public void cleanup() {
if (infoPanel != null) {
infoPanel.setVisible(false);
viewer.getSwingWrapper().remove(infoPanel);
}
this.setVisible(false);
}
/**
* DOCUMENT ME!
*/
public void ensureFullVisibility() {
final PBounds all = viewer.getCamera().getViewBounds();
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("getViewBounds()" + all); // NOI18N
}
}
final PBounds newBounds = new PBounds();
newBounds.setRect(this.getFullBounds().createUnion(all.getBounds2D()));
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("getFullBounds()" + getFullBounds()); // NOI18N
}
}
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("newBounds" + newBounds); // NOI18N
}
}
viewer.getCamera().animateViewToCenterBounds(newBounds.getBounds2D(), true, viewer.getAnimationDuration());
viewer.refresh();
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public boolean isInfoNodeExpanded() {
return (infoPanel != null) && infoPanel.isExpanded();
}
/**
* DOCUMENT ME!
*
* @param expanded DOCUMENT ME!
*/
public void setInfoNodeExpanded(final boolean expanded) {
if (infoPanel != null) {
infoPanel.setExpanded(expanded, false);
}
}
/**
* DOCUMENT ME!
*
* @param selectedOriginal DOCUMENT ME!
*/
public void setSelectedOriginal(final PFeature selectedOriginal) {
this.selectedOriginal = selectedOriginal;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public PFeature getSelectedOriginal() {
return selectedOriginal;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public Feature getFeature() {
return feature;
}
/**
* DOCUMENT ME!
*
* @param feature DOCUMENT ME!
*/
public void setFeature(final Feature feature) {
this.feature = feature;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public PPath getSplitLine() {
return splitPolygonLine;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public List<Point2D> getSplitPoints() {
return splitPoints;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public boolean isSplittable() {
if ((splitPolygonFromHandle != null) && (splitPolygonToHandle != null)) {
return true;
} else {
return false;
}
}
/**
* Zeichnet das PFeature bei einem RollOver um 40% heller.
*
* @param highlighting true, wenn das PFeature hervorgehoben werden soll
*/
@Override
public void setHighlighting(final boolean highlighting) {
final boolean highlightingEnabledIfStyledFeature = ((getFeature() != null)
&& !(getFeature() instanceof StyledFeature))
|| ((getFeature() != null) && ((StyledFeature)getFeature()).isHighlightingEnabled());
if (!isSelected() && (getPaint() != null) && highlightingEnabledIfStyledFeature) {
highlighted = highlighting;
if (highlighted) {
nonHighlightingPaint = getPaint();
if (nonHighlightingPaint instanceof Color) {
final Color c = (Color)nonHighlightingPaint;
int red = (int)(c.getRed() + 70);
int green = (int)(c.getGreen() + 70);
int blue = (int)(c.getBlue() + 70);
if (red > 255) {
red = 255;
}
if (green > 255) {
green = 255;
}
if (blue > 255) {
blue = 255;
}
setPaint(new Color(red, green, blue, c.getAlpha()));
} else {
setPaint(new Color(1f, 1f, 1f, 0.6f));
}
} else {
setPaint(nonHighlightingPaint);
}
repaint();
}
}
/**
* Liefert ein boolean, ob das Pfeature gerade hervorgehoben wird.
*
* @return true, falls hervorgehoben
*/
@Override
public boolean getHighlighting() {
return highlighted;
}
/**
* Selektiert das PFeature je nach \u00FCbergebenem boolean-Wert.
*
* @param selected true, markiert. false, nicht markiert
*/
@Override
public void setSelected(final boolean selected) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("setSelected(" + selected + ")"); // NOI18N
}
}
this.selected = selected;
this.selectedEntity = -1;
boolean showSelected = true;
if (getFeature() instanceof DrawSelectionFeature) {
showSelected = (((DrawSelectionFeature)getFeature()).isDrawingSelection());
}
if (showSelected) {
showSelected(selected);
}
}
/**
* DOCUMENT ME!
*
* @param selected DOCUMENT ME!
*/
private void showSelected(final boolean selected) {
splitPolygonFromHandle = null;
splitPolygonToHandle = null;
if (this.selected && !selected) {
pivotHandle = null;
}
this.selected = selected;
// PUNKT
if (getFeature().getGeometry() instanceof Point) {
PImage p = null;
for (final ListIterator lit = getChildrenIterator(); lit.hasNext();) {
final Object elem = (Object)lit.next();
if (elem instanceof PImage) {
p = (PImage)elem;
break;
}
}
if (p != null) {
Image iconImage = null;
if ((feature instanceof StyledFeature)
&& (((StyledFeature)getFeature()).getPointAnnotationSymbol() != null)) {
final FeatureAnnotationSymbol symbolization = ((StyledFeature)getFeature())
.getPointAnnotationSymbol();
// assign pure unselected image
iconImage = symbolization.getImage();
final Image selectedImage = symbolization.getSelectedFeatureAnnotationSymbol();
if (selectedImage != null) {
if (selected) {
// assign pure selected image
iconImage = selectedImage;
}
} else if (iconImage != null) {
final Image old = iconImage;
final int inset = 10;
if (selected) {
// assign unselected image with selection frame
iconImage = highlightImageAsSelected(
iconImage,
new Color(0.3f, 0.3f, 1.0f, 0.4f),
new Color(0.2f, 0.2f, 1.0f, 0.8f),
inset);
} else {
// assign unselected image with invisible offset with size of the selection frame
iconImage = highlightImageAsSelected(iconImage, TRANSPARENT, TRANSPARENT, inset);
}
// adjust sweetspot if necessary
if (sweetSelX < 0f) {
sweetSelX = ((sweetPureX * old.getWidth(null)) + inset) / iconImage.getWidth(null);
sweetSelY = ((sweetPureY * old.getHeight(null)) + inset) / iconImage.getHeight(null);
}
pi.setSweetSpotX(sweetSelX);
pi.setSweetSpotY(sweetSelY);
}
}
// Fallback case: Pushpin icons
if (iconImage == null) {
if (selected) {
iconImage = pushpinSelectedIco.getImage();
} else {
iconImage = pushpinIco.getImage();
}
}
p.setImage(iconImage);
// Necessary "evil" to refresh sweetspot
p.setScale(p.getScale());
}
} // LINESTRING
else if ((feature.getGeometry() instanceof LineString) || (feature.getGeometry() instanceof MultiLineString)) {
if (selected) {
final CustomFixedWidthStroke fws = new CustomFixedWidthStroke(5f);
setStroke(fws);
setStrokePaint(javax.swing.UIManager.getDefaults().getColor("Table.selectionBackground")); // NOI18N
setPaint(null);
} else {
// setStroke(new FixedWidthStroke());
if (stroke != null) {
setStroke(stroke);
} else {
setStroke(FIXED_WIDTH_STROKE);
}
if (strokePaint != null) {
setStrokePaint(strokePaint);
} else {
setStrokePaint(Color.black);
}
}
} // POLYGON
else {
if (stroke != null) {
setStroke(stroke);
} else {
setStroke(FIXED_WIDTH_STROKE);
}
if (selected) {
nonSelectedPaint = getPaint();
if (nonSelectedPaint instanceof Color) {
final Color c = (Color)nonHighlightingPaint;
if (c != null) {
final int red = (int)(javax.swing.UIManager.getDefaults().getColor("Table.selectionBackground")
.getRed()); // NOI18N
final int green = (int)(javax.swing.UIManager.getDefaults().getColor(
"Table.selectionBackground").getGreen()); // NOI18N
final int blue = (int)(javax.swing.UIManager.getDefaults().getColor(
"Table.selectionBackground").getBlue()); // NOI18N
setPaint(new Color(red, green, blue, c.getAlpha() / 2));
}
} else {
setPaint(new Color(172, 210, 248, 178));
}
} else {
setPaint(nonHighlightingPaint);
}
}
repaint();
}
/**
* DOCUMENT ME!
*
* @param s DOCUMENT ME!
*/
@Override
public void setStroke(final Stroke s) {
// log.debug("setStroke: " + s, new CurrentStackTrace());
super.setStroke(s);
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
@Override
public boolean isSelected() {
return selected;
}
/**
* DOCUMENT ME!
*
* @param polygon DOCUMENT ME!
*/
public void addEntity(final Polygon polygon) {
if (getFeature().isEditable()) {
final int numOfHoles = polygon.getNumInteriorRing();
final Coordinate[][][] origEntityCoordArr = entityRingCoordArr;
// neues entityRingCoordArr mit entity-länge + 1, und alte daten daten darin kopieren
final Coordinate[][][] newEntityCoordArr = new Coordinate[origEntityCoordArr.length + 1][][];
System.arraycopy(origEntityCoordArr, 0, newEntityCoordArr, 0, origEntityCoordArr.length);
// neues ringCoordArr für neues entity erzeugen, und Hülle + Löcher darin speicherm
final Coordinate[][] newRingCoordArr = new Coordinate[1 + numOfHoles][];
newRingCoordArr[0] = polygon.getExteriorRing().getCoordinates();
for (int ringIndex = 1; ringIndex < newRingCoordArr.length; ++ringIndex) {
newRingCoordArr[ringIndex] = polygon.getInteriorRingN(ringIndex - 1).getCoordinates();
}
// neues entity an letzte stelle speichern, und als neues entityRingCoordArr übernehmen
newEntityCoordArr[origEntityCoordArr.length] = newRingCoordArr;
entityRingCoordArr = newEntityCoordArr;
// refresh
syncGeometry();
updateXpAndYp();
updatePath();
}
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
*/
public void removeEntity(final int entityPosition) {
if (getFeature().isEditable()) {
final Coordinate[][][] origEntityCoordArr = entityRingCoordArr;
final boolean isInBounds = (entityPosition >= 0) && (entityPosition < origEntityCoordArr.length);
if (isInBounds) {
if (origEntityCoordArr.length == 1) { // wenn nur ein entity drin
entityRingCoordArr = new Coordinate[0][][]; // dann nur durch leeres ersetzen
} else { // wenn mehr als ein entity drin
// neues entityRingCoordArr mit entity-länge - 1, und originaldaten daten darin kopieren außer
// entityPosition
final Coordinate[][][] newEntityCoordArr = new Coordinate[origEntityCoordArr.length - 1][][];
// alles vor entityPosition
System.arraycopy(origEntityCoordArr, 0, newEntityCoordArr, 0, entityPosition);
// alles nach entityPosition
System.arraycopy(
origEntityCoordArr,
entityPosition
+ 1,
newEntityCoordArr,
entityPosition,
newEntityCoordArr.length
- entityPosition);
// original durch neues ersetzen
entityRingCoordArr = newEntityCoordArr;
}
// refresh
syncGeometry();
updateXpAndYp();
updatePath();
}
}
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
* @param lineString DOCUMENT ME!
*/
public void addHoleToEntity(final int entityPosition, final LineString lineString) {
if (getFeature().isEditable()) {
final boolean isInBounds = (entityPosition >= 0) && (entityPosition < entityRingCoordArr.length);
if (isInBounds) {
final Coordinate[][] origRingCoordArr = entityRingCoordArr[entityPosition];
final int origLength = origRingCoordArr.length;
final Coordinate[][] newRingCoordArr = new Coordinate[origLength + 1][];
System.arraycopy(origRingCoordArr, 0, newRingCoordArr, 0, origLength);
newRingCoordArr[origLength] = lineString.getCoordinates();
entityRingCoordArr[entityPosition] = newRingCoordArr;
}
syncGeometry();
updateXpAndYp();
updatePath();
}
}
/**
* alle entities die diesen punkt beinhalten (löscher werden ignoriert, da sonst nur eine entity existieren kann).
*
* @param point coordinate DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private List<Integer> getEntitiesPositionsUnderPoint(final Point point) {
final List<Integer> positions = new ArrayList<Integer>();
final Geometry geometry = getFeature().getGeometry();
for (int entityIndex = 0; entityIndex < geometry.getNumGeometries(); entityIndex++) {
final Geometry envelope = geometry.getEnvelope(); // ohne löscher
if (envelope.contains(point)) {
positions.add(entityIndex);
}
}
return positions;
}
/**
* DOCUMENT ME!
*
* @param point coordinate DOCUMENT ME!
*/
public void removeHoleUnderPoint(final Point point) {
final int entityPosition = getMostInnerEntityUnderPoint(point);
final boolean isEntityInBounds = (entityPosition >= 0) && (entityPosition < entityRingCoordArr.length);
if (isEntityInBounds) {
final Coordinate[][] origRingCoordArr = entityRingCoordArr[entityPosition];
final int holePosition = getHolePositionUnderPoint(point, entityPosition);
final boolean isRingInBounds = (holePosition >= 0) && (holePosition < origRingCoordArr.length);
if (isRingInBounds) {
final Polygon entityPolygon = ((Polygon)getFeature().getGeometry().getGeometryN(entityPosition));
final Geometry holeGeometry = entityPolygon.getInteriorRingN(holePosition - 1).getEnvelope(); // zu entfernende
// Geometrie, ohne
// Löcher
if (!hasEntitiesInGeometry(holeGeometry)) {
final Coordinate[][] newRingCoordArr = new Coordinate[origRingCoordArr.length - 1][];
System.arraycopy(origRingCoordArr, 0, newRingCoordArr, 0, holePosition);
System.arraycopy(
origRingCoordArr,
holePosition
+ 1,
newRingCoordArr,
holePosition,
newRingCoordArr.length
- holePosition);
// original durch neues ersetzen
entityRingCoordArr[entityPosition] = newRingCoordArr;
// refresh
syncGeometry();
updateXpAndYp();
updatePath();
}
}
}
}
/**
* DOCUMENT ME!
*
* @param point coordinate DOCUMENT ME!
* @param entityPosition DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public int getHolePositionUnderPoint(final Point point, final int entityPosition) {
final Geometry geometry = getFeature().getGeometry();
final boolean isInBounds = (entityPosition >= 0) && (entityPosition < geometry.getNumGeometries());
if (isInBounds) {
final Polygon polygon = (Polygon)geometry.getGeometryN(entityPosition);
if (polygon.getNumInteriorRing() > 0) { // hat überhaupt löscher ?
for (int ringIndex = 0; ringIndex < polygon.getNumInteriorRing(); ringIndex++) {
final Geometry envelope = polygon.getInteriorRingN(ringIndex).getEnvelope();
if (envelope.contains(point)) {
return ringIndex + 1; // +1 weil ring 0 der äußere ring ist
}
}
}
}
return -1;
}
/**
* DOCUMENT ME!
*
* @param point DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private int getMostInnerEntityUnderPoint(final Point point) {
// alle außenringe (löscher werden zunächst ignoriert) holen die grundsätzlich unter der koordinate liegen
final List<Integer> entityPositions = getEntitiesPositionsUnderPoint(point);
// interessant sind nur entities die Löscher haben
final List<Integer> entityPositionsWithHoles = new ArrayList<Integer>();
for (final int position : entityPositions) {
if (entityRingCoordArr[position].length > 1) {
entityPositionsWithHoles.add(position);
}
}
final Geometry geometry = getFeature().getGeometry();
if (entityPositionsWithHoles.size() == 1) {
return entityPositionsWithHoles.get(0); // nur eine entity mit loch, also muss sie das sein
} else {
// mehrere entities, es wird geprüft welche entity welche andere beinhaltet
for (int indexA = 0; indexA < entityPositionsWithHoles.size(); indexA++) {
final int entityPositionA = entityPositionsWithHoles.get(indexA);
final Geometry envelopeA = geometry.getGeometryN(entityPositionA).getEnvelope();
boolean containsAnyOtherRing = false;
for (int indexB = 0; indexB < entityPositionsWithHoles.size(); indexB++) {
if (indexA != indexB) {
final int entityPositionB = entityPositionsWithHoles.get(indexB);
final Geometry envelopeB = geometry.getGeometryN(entityPositionB).getEnvelope();
if (envelopeA.contains(envelopeB)) {
containsAnyOtherRing = true;
}
}
}
if (!containsAnyOtherRing) {
return entityPositionA;
}
}
return -1;
}
}
/**
* DOCUMENT ME!
*
* @param point DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public int getEntityPositionUnderPoint(final Point point) {
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
final Geometry geometry = getFeature().getGeometry().getGeometryN(entityIndex);
if (geometry.contains(point)) {
return entityIndex;
}
}
return -1;
}
/**
* DOCUMENT ME!
*
* @param geometry DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public boolean hasEntitiesInGeometry(final Geometry geometry) {
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
final Geometry entityGeometry = getFeature().getGeometry().getGeometryN(entityIndex);
if (geometry.contains(entityGeometry)) {
return true;
}
}
return false;
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
*/
public void setSelectedEntity(final int entityPosition) {
final boolean isInBounds = (entityPosition >= 0) && (entityPosition < entityRingCoordArr.length);
if (isInBounds) {
selectedEntity = entityPosition;
} else {
selectedEntity = -1;
}
}
/**
* DOCUMENT ME!
*
* @param toSelect DOCUMENT ME!
* @param colFill DOCUMENT ME!
* @param colEdge DOCUMENT ME!
* @param insetSize DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private Image highlightImageAsSelected(final Image toSelect, Color colFill, Color colEdge, final int insetSize) {
if (colFill == null) {
colFill = TRANSPARENT;
}
if (colEdge == null) {
colEdge = TRANSPARENT;
}
if (toSelect != null) {
final int doubleInset = 2 * insetSize;
final BufferedImage tint = new BufferedImage(toSelect.getWidth(null) + doubleInset,
toSelect.getHeight(null)
+ doubleInset,
BufferedImage.TYPE_INT_ARGB);
final Graphics2D g2d = (Graphics2D)tint.getGraphics();
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
g2d.setPaint(colFill);
g2d.fillRoundRect(
0,
0,
toSelect.getWidth(null)
- 1
+ doubleInset,
toSelect.getHeight(null)
- 1
+ doubleInset,
insetSize,
insetSize);
g2d.setPaint(colEdge);
g2d.drawRoundRect(
0,
0,
toSelect.getWidth(null)
- 1
+ doubleInset,
toSelect.getHeight(null)
- 1
+ doubleInset,
insetSize,
insetSize);
g2d.drawImage(toSelect, insetSize, insetSize, null);
return tint;
} else {
return toSelect;
}
}
/**
* Ver\u00E4ndert die Sichtbarkeit der InfoNode.
*
* @param visible true, wenn die InfoNode sichtbar sein soll
*/
public void setInfoNodeVisible(final boolean visible) {
if (infoNode != null) {
infoNode.setVisible(visible);
}
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public MappingComponent getViewer() {
return viewer;
}
/**
* DOCUMENT ME!
*
* @param viewer DOCUMENT ME!
*/
public void setViewer(final MappingComponent viewer) {
this.viewer = viewer;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private Crs getViewerCrs() {
return viewer.getMappingModel().getSrs();
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public MappingComponent getMappingComponent() {
return viewer;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public Paint getNonSelectedPaint() {
return nonSelectedPaint;
}
/**
* DOCUMENT ME!
*
* @param nonSelectedPaint DOCUMENT ME!
*/
public void setNonSelectedPaint(final Paint nonSelectedPaint) {
this.nonSelectedPaint = nonSelectedPaint;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public Paint getNonHighlightingPaint() {
return nonHighlightingPaint;
}
/**
* DOCUMENT ME!
*
* @param nonHighlightingPaint DOCUMENT ME!
*/
public void setNonHighlightingPaint(final Paint nonHighlightingPaint) {
this.nonHighlightingPaint = nonHighlightingPaint;
}
/**
* DOCUMENT ME!
*
* @param entityPosition coordEntity DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param xp DOCUMENT ME!
* @param yp DOCUMENT ME!
* @param coordArr DOCUMENT ME!
*/
private void setNewCoordinates(final int entityPosition,
final int ringPosition,
final float[] xp,
final float[] yp,
final Coordinate[] coordArr) {
if (isValidWithThisCoordinates(entityPosition, ringPosition, coordArr)) {
entityRingCoordArr[entityPosition][ringPosition] = coordArr;
entityRingXArr[entityPosition][ringPosition] = xp;
entityRingYArr[entityPosition][ringPosition] = yp;
syncGeometry();
updatePath();
getViewer().showHandles(false);
final Collection<Feature> features = new ArrayList<Feature>();
features.add(getFeature());
((DefaultFeatureCollection)getViewer().getFeatureCollection()).fireFeaturesChanged(features);
}
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public boolean isValid(final int entityPosition, final int ringPosition) {
return isValidWithThisCoordinates(
entityPosition,
ringPosition,
getCoordArr(entityPosition, ringPosition));
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
* @param ringCoordArr DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
private boolean isValidWithThisEntity(final int entityPosition, final Coordinate[][] ringCoordArr) {
// polygon für die prüfung erzeugen
final Polygon newPolygon;
try {
final GeometryFactory geometryFactory = new GeometryFactory(
new PrecisionModel(PrecisionModel.FLOATING),
CrsTransformer.extractSridFromCrs(getViewerCrs().getCode()));
newPolygon = createPolygon(ringCoordArr, geometryFactory);
if (!newPolygon.isValid()) {
return false;
}
final Geometry geometry = getFeature().getGeometry();
for (int entityIndex = 0; entityIndex < geometry.getNumGeometries(); entityIndex++) {
if ((entityPosition < 0) || (entityIndex != entityPosition)) { // nicht mit sich (bzw seinem alten
// selbst) selbst vergleichen
final Geometry otherGeometry = geometry.getGeometryN(entityIndex);
if (newPolygon.intersects(otherGeometry)) {
// polygon schneidet ein anderes teil-polygon
return false;
}
}
}
// alles ok
return true;
} catch (final Exception ex) {
// verändertes teil-polygon ist selbst schon nicht gültig;
return false;
}
}
/**
* DOCUMENT ME!
*
* @param coordArr DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public boolean isValidWithThisNewEntityCoordinates(final Coordinate[] coordArr) {
final Coordinate[][] tempRingCoordArr = new Coordinate[1][];
tempRingCoordArr[0] = coordArr;
return isValidWithThisEntity(-1, tempRingCoordArr);
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
* @param coordArr DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public boolean isValidWithThisNewHoleCoordinates(final int entityPosition, final Coordinate[] coordArr) {
final Coordinate[][] tempRingCoordArr = new Coordinate[entityRingCoordArr[entityPosition].length + 1][];
System.arraycopy(
entityRingCoordArr[entityPosition],
0,
tempRingCoordArr,
0,
entityRingCoordArr[entityPosition].length);
tempRingCoordArr[entityRingCoordArr[entityPosition].length] = coordArr;
return isValidWithThisEntity(entityPosition, tempRingCoordArr);
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param coordArr DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public boolean isValidWithThisCoordinates(final int entityPosition,
final int ringPosition,
final Coordinate[] coordArr) {
// copy von original teil-polygon machen
final Coordinate[][] tempRingCoordArr = new Coordinate[entityRingCoordArr[entityPosition].length][];
System.arraycopy(
entityRingCoordArr[entityPosition],
0,
tempRingCoordArr,
0,
entityRingCoordArr[entityPosition].length);
// ring in der kopie austauschen
tempRingCoordArr[ringPosition] = coordArr;
return isValidWithThisEntity(entityPosition, tempRingCoordArr);
}
/**
* DOCUMENT ME!
*/
public void updatePath() {
getPathReference().reset();
final Geometry geom = feature.getGeometry();
if (geom instanceof Point) {
setPathToPolyline(
new float[] { entityRingXArr[0][0][0], entityRingXArr[0][0][0] },
new float[] { entityRingYArr[0][0][0], entityRingYArr[0][0][0] });
} else if ((geom instanceof LineString) || (geom instanceof MultiPoint)) {
setPathToPolyline(entityRingXArr[0][0], entityRingYArr[0][0]);
} else if ((geom instanceof Polygon) || (geom instanceof MultiPolygon)) {
getPathReference().setWindingRule(GeneralPath.WIND_EVEN_ODD);
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
for (int ringIndex = 0; ringIndex < entityRingCoordArr[entityIndex].length; ringIndex++) {
final Coordinate[] coordArr = entityRingCoordArr[entityIndex][ringIndex];
addLinearRing(coordArr);
}
}
} else if (geom instanceof MultiLineString) {
for (int entityIndex = 0; entityIndex < entityRingCoordArr.length; entityIndex++) {
for (int ringIndex = 0; ringIndex < entityRingCoordArr[entityIndex].length; ringIndex++) {
final Coordinate[] coordArr = entityRingCoordArr[entityIndex][ringIndex];
addLinearRing(coordArr);
}
}
}
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public PNode getInfoNode() {
return infoNode;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public PNode getStickyChild() {
return stickyChild;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public boolean hasSecondStickyChild() {
return (secondStickyChild != null);
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public PNode getSecondStickyChild() {
return secondStickyChild;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public boolean isSnappable() {
return snappable;
}
/**
* DOCUMENT ME!
*
* @param snappable DOCUMENT ME!
*/
public void setSnappable(final boolean snappable) {
this.snappable = snappable;
}
/**
* DOCUMENT ME!
*
* @param coordArr DOCUMENT ME!
*
* @deprecated DOCUMENT ME!
*/
public void setCoordArr(final Coordinate[] coordArr) {
entityRingCoordArr = new Coordinate[][][] {
{ coordArr }
};
updateXpAndYp();
}
/**
* DOCUMENT ME!
*
* @param entityPosition DOCUMENT ME!
* @param ringPosition DOCUMENT ME!
* @param coordArr DOCUMENT ME!
*/
public void setCoordArr(final int entityPosition, final int ringPosition, final Coordinate[] coordArr) {
entityRingCoordArr[entityPosition][ringPosition] = coordArr;
updateXpAndYp();
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public int getNumOfEntities() {
return entityRingCoordArr.length;
}
/**
* DOCUMENT ME!
*
* @param entityIndex DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public int getNumOfRings(final int entityIndex) {
return entityRingCoordArr[entityIndex].length;
}
//~ Inner Classes ----------------------------------------------------------
/**
* DOCUMENT ME!
*
* @version $Revision$, $Date$
*/
class StickyPPath extends PPath implements ParentNodeIsAPFeature, PSticky {
//~ Instance fields ----------------------------------------------------
int transparency = 0;
Color c = null;
//~ Constructors -------------------------------------------------------
/**
* Creates a new StickyPPath object.
*
* @param s DOCUMENT ME!
*/
public StickyPPath(final Shape s) {
super(s);
}
}
/**
* StickyPText represents the annotation of a PFeature.
*
* @version $Revision$, $Date$
*/
class StickyPText extends PText implements ParentNodeIsAPFeature, PSticky {
//~ Constructors -------------------------------------------------------
/**
* Creates a new StickyPText object.
*/
public StickyPText() {
super();
}
/**
* Creates a new StickyPText object.
*
* @param text DOCUMENT ME!
*/
public StickyPText(final String text) {
super(text);
}
}
}
| true | true | public Feature[] split() {
if (isSplittable()) {
final PureNewFeature[] ret = new PureNewFeature[2];
int from = ((Integer)(splitPolygonFromHandle.getClientProperty("coordinate_position_in_arr"))).intValue(); // NOI18N
int to = ((Integer)(splitPolygonToHandle.getClientProperty("coordinate_position_in_arr"))).intValue(); // NOI18N
splitPolygonToHandle = null;
splitPolygonFromHandle = null;
// In splitPoints.get(0) steht immer from
// In splitPoint.get(size-1) steht immer to
// Werden die beiden vertauscht, so muss dies sp\u00E4ter bei der Reihenfolge ber\u00FCcksichtigt werden.
boolean wasSwapped = false;
if (from > to) {
final int swap = from;
from = to;
to = swap;
wasSwapped = true;
}
// Erstes Polygon
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("ErstesPolygon" + (to - from + splitPoints.size())); // NOI18N
}
}
final Coordinate[] c1 = new Coordinate[to - from + splitPoints.size()];
int counter = 0;
// TODO multipolygon / multilinestring
final Coordinate[] coordArr = entityRingCoordArr[0][0];
for (int i = from; i <= to; ++i) {
c1[counter] = (Coordinate)coordArr[i].clone();
counter++;
}
if (wasSwapped) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("SWAPPED"); // NOI18N
}
}
for (int i = 1; i < (splitPoints.size() - 1); ++i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c1[counter] = splitCoord;
counter++;
}
} else {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("NOT_SWAPPED"); // NOI18N
}
}
for (int i = splitPoints.size() - 2; i > 0; --i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c1[counter] = splitCoord;
counter++;
}
}
c1[counter] = (Coordinate)coordArr[from].clone();
ret[0] = new PureNewFeature(c1, wtst);
ret[0].setEditable(true);
// Zweites Polygon
// Größe Array= (Anzahl vorh. Coords) - (anzahl vorh. Handles des ersten Polygons) + (SplitLinie )
final Coordinate[] c2 = new Coordinate[(coordArr.length) - (to - from + 1) + splitPoints.size()];
counter = 0;
for (int i = 0; i <= from; ++i) {
c2[counter] = (Coordinate)coordArr[i].clone();
counter++;
}
if (wasSwapped) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("SWAPPED"); // NOI18N
}
}
for (int i = splitPoints.size() - 2; i > 0; --i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c2[counter] = splitCoord;
counter++;
}
} else {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("NOT_SWAPPED"); // NOI18N
}
}
for (int i = 1; i < (splitPoints.size() - 1); ++i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c2[counter] = splitCoord;
counter++;
}
}
for (int i = to; i < coordArr.length; ++i) {
c2[counter] = (Coordinate)coordArr[i].clone();
counter++;
}
// c1[counter]=(Coordinate)coordArr[0].clone();
for (int i = 0; i < c2.length; ++i) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("c2[" + i + "]=" + c2[i]); // NOI18N
}
}
}
// ret[1]=new PFeature(c2,wtst,x_offset,y_offset,viewer);
ret[1] = new PureNewFeature(c2, wtst);
ret[1].setEditable(true);
// ret[0].setViewer(viewer);
// ret[1].setViewer(viewer);
return ret;
// ret[1]=new PFeature(c1,wtst,x_offset,y_offset);
// ret[0].setViewer(viewer);
// ret[1].setViewer(viewer);
// return ret;
} else {
return null;
}
}
| public Feature[] split() {
if (isSplittable()) {
final PureNewFeature[] ret = new PureNewFeature[2];
int from = ((Integer)(splitPolygonFromHandle.getClientProperty("coordinate_position_coord"))).intValue(); // NOI18N
int to = ((Integer)(splitPolygonToHandle.getClientProperty("coordinate_position_coord"))).intValue(); // NOI18N
splitPolygonToHandle = null;
splitPolygonFromHandle = null;
// In splitPoints.get(0) steht immer from
// In splitPoint.get(size-1) steht immer to
// Werden die beiden vertauscht, so muss dies sp\u00E4ter bei der Reihenfolge ber\u00FCcksichtigt werden.
boolean wasSwapped = false;
if (from > to) {
final int swap = from;
from = to;
to = swap;
wasSwapped = true;
}
// Erstes Polygon
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("ErstesPolygon" + (to - from + splitPoints.size())); // NOI18N
}
}
final Coordinate[] c1 = new Coordinate[to - from + splitPoints.size()];
int counter = 0;
// TODO multipolygon / multilinestring
final Coordinate[] coordArr = entityRingCoordArr[0][0];
for (int i = from; i <= to; ++i) {
c1[counter] = (Coordinate)coordArr[i].clone();
counter++;
}
if (wasSwapped) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("SWAPPED"); // NOI18N
}
}
for (int i = 1; i < (splitPoints.size() - 1); ++i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c1[counter] = splitCoord;
counter++;
}
} else {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("NOT_SWAPPED"); // NOI18N
}
}
for (int i = splitPoints.size() - 2; i > 0; --i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c1[counter] = splitCoord;
counter++;
}
}
c1[counter] = (Coordinate)coordArr[from].clone();
ret[0] = new PureNewFeature(c1, wtst);
ret[0].setEditable(true);
// Zweites Polygon
// Größe Array= (Anzahl vorh. Coords) - (anzahl vorh. Handles des ersten Polygons) + (SplitLinie )
final Coordinate[] c2 = new Coordinate[(coordArr.length) - (to - from + 1) + splitPoints.size()];
counter = 0;
for (int i = 0; i <= from; ++i) {
c2[counter] = (Coordinate)coordArr[i].clone();
counter++;
}
if (wasSwapped) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("SWAPPED"); // NOI18N
}
}
for (int i = splitPoints.size() - 2; i > 0; --i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c2[counter] = splitCoord;
counter++;
}
} else {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("NOT_SWAPPED"); // NOI18N
}
}
for (int i = 1; i < (splitPoints.size() - 1); ++i) {
final Point2D splitPoint = (Point2D)splitPoints.get(i);
final Coordinate splitCoord = new Coordinate(wtst.getSourceX(splitPoint.getX()),
wtst.getSourceY(splitPoint.getY()));
c2[counter] = splitCoord;
counter++;
}
}
for (int i = to; i < coordArr.length; ++i) {
c2[counter] = (Coordinate)coordArr[i].clone();
counter++;
}
// c1[counter]=(Coordinate)coordArr[0].clone();
for (int i = 0; i < c2.length; ++i) {
if (viewer.isFeatureDebugging()) {
if (log.isDebugEnabled()) {
log.debug("c2[" + i + "]=" + c2[i]); // NOI18N
}
}
}
// ret[1]=new PFeature(c2,wtst,x_offset,y_offset,viewer);
ret[1] = new PureNewFeature(c2, wtst);
ret[1].setEditable(true);
// ret[0].setViewer(viewer);
// ret[1].setViewer(viewer);
return ret;
// ret[1]=new PFeature(c1,wtst,x_offset,y_offset);
// ret[0].setViewer(viewer);
// ret[1].setViewer(viewer);
// return ret;
} else {
return null;
}
}
|
diff --git a/src/share/classes/sun/java2d/cmm/lcms/LCMS.java b/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
index 4ce85425f..c089ba66f 100644
--- a/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
+++ b/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
@@ -1,104 +1,104 @@
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package sun.java2d.cmm.lcms;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
import java.awt.color.CMMException;
import sun.java2d.cmm.ColorTransform;
import sun.java2d.cmm.PCMM;
import sun.java2d.cmm.lcms.LCMS;
import sun.java2d.cmm.lcms.LCMSTransform;
public class LCMS implements PCMM {
/* methods invoked from ICC_Profile */
public native long loadProfile(byte[] data);
public native void freeProfile(long profileID);
public native synchronized int getProfileSize(long profileID);
public native synchronized void getProfileData(long profileID, byte[] data);
public native synchronized int getTagSize(long profileID, int tagSignature);
public native synchronized void getTagData(long profileID, int tagSignature,
byte[] data);
public native synchronized void setTagData(long profileID, int tagSignature,
byte[] data);
public static native long getProfileID(ICC_Profile profile);
public static native long createNativeTransform(
long[] profileIDs, int renderType, int inFormatter, int outFormatter,
Object disposerRef);
/**
* Constructs ColorTransform object corresponding to an ICC_profile
*/
public ColorTransform createTransform(ICC_Profile profile,
int renderType,
int transformType)
{
return new LCMSTransform(profile, renderType, renderType);
}
/**
* Constructs an ColorTransform object from a list of ColorTransform
* objects
*/
public synchronized ColorTransform createTransform(
ColorTransform[] transforms)
{
return new LCMSTransform(transforms);
}
/* methods invoked from LCMSTransform */
public static native void colorConvert(LCMSTransform trans,
LCMSImageLayout src,
LCMSImageLayout dest);
public static native void freeTransform(long ID);
public static native void initLCMS(Class Trans, Class IL, Class Pf);
/* the class initializer which loads the CMM */
static {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
public Object run() {
/* We need to load awt here because of usage trace and
* disposer frameworks
*/
System.loadLibrary("awt");
- System.loadLibrary("lcms");
+ System.loadLibrary("javalcms");
return null;
}
}
);
initLCMS(LCMSTransform.class, LCMSImageLayout.class, ICC_Profile.class);
}
}
| true | true | public Object run() {
/* We need to load awt here because of usage trace and
* disposer frameworks
*/
System.loadLibrary("awt");
System.loadLibrary("lcms");
return null;
}
| public Object run() {
/* We need to load awt here because of usage trace and
* disposer frameworks
*/
System.loadLibrary("awt");
System.loadLibrary("javalcms");
return null;
}
|
diff --git a/src/share/classes/com/sun/tools/javafx/main/Main.java b/src/share/classes/com/sun/tools/javafx/main/Main.java
index 2f124655a..28e42913d 100644
--- a/src/share/classes/com/sun/tools/javafx/main/Main.java
+++ b/src/share/classes/com/sun/tools/javafx/main/Main.java
@@ -1,743 +1,737 @@
/*
* Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
package com.sun.tools.javafx.main;
import com.sun.tools.javac.util.Options;
import java.io.File;
import java.io.FilenameFilter;
import java.io.Reader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ResourceBundle;
import java.util.MissingResourceException;
import com.sun.tools.javac.code.Source;
import com.sun.tools.javac.jvm.Target;
import com.sun.tools.javac.jvm.ClassReader;
import com.sun.tools.javafx.main.JavafxOption.Option;
import com.sun.tools.javac.util.*;
import com.sun.tools.javafx.main.RecognizedOptions.OptionHelper;
import com.sun.tools.javafx.util.JavafxFileManager;
import com.sun.tools.javafx.util.PlatformPlugin;
import com.sun.tools.javafx.util.MsgSym;
import javax.tools.Diagnostic;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.DiagnosticListener;
/** This class provides a commandline interface to the GJC compiler.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/
public class Main {
/** The name of the compiler, for use in diagnostics.
*/
String ownName;
/** The writer to use for diagnostic output.
*/
PrintWriter out;
/**
* If true, any command line arg errors will cause an exception.
*/
boolean fatalErrors;
/** Result codes.
*/
static final int
EXIT_OK = 0, // Compilation completed with no errors.
EXIT_ERROR = 1, // Completed but reported errors.
EXIT_CMDERR = 2, // Bad command-line arguments
EXIT_SYSERR = 3, // System error or resource exhaustion.
EXIT_ABNORMAL = 4; // Compiler terminated abnormally
private Option[] recognizedOptions = RecognizedOptions.getJavaCompilerOptions(new OptionHelper() {
public void setOut(PrintWriter out) {
Main.this.out = out;
}
public void error(String key, Object... args) {
Main.this.error(key, args);
}
public void printVersion() {
Log.printLines(out, getLocalizedString(MsgSym.MESSAGE_VERSION, ownName, JavafxCompiler.version()));
}
public void printFullVersion() {
Log.printLines(out, getLocalizedString(MsgSym.MESSAGE_FULLVERSION, ownName, JavafxCompiler.fullVersion()));
}
public void printHelp() {
help();
}
public void printXhelp() {
xhelp();
}
public void addFile(File f) {
if (!filenames.contains(f))
filenames.append(f);
}
public void addClassName(String s) {
classnames.append(s);
}
});
/**
* Construct a compiler instance.
*/
public Main(String name) {
this(name, new PrintWriter(System.err, true));
}
/**
* Construct a compiler instance.
*/
public Main(String name, PrintWriter out) {
this.ownName = name;
this.out = out;
}
/** A table of all options that's passed to the JavaCompiler constructor. */
private Options options = null;
/** The list of source files to process
*/
public ListBuffer<File> filenames = null; // XXX sb protected
/** List of class files names passed on the command line
*/
public ListBuffer<String> classnames = null; // XXX sb protected
/** Print a string that explains usage.
*/
void help() {
Log.printLines(out, getLocalizedString(MsgSym.MESSAGE_MSG_USAGE_HEADER, ownName));
for (int i=0; i<recognizedOptions.length; i++) {
recognizedOptions[i].help(out);
}
out.println();
}
/** Print a string that explains usage for X options.
*/
void xhelp() {
for (int i=0; i<recognizedOptions.length; i++) {
recognizedOptions[i].xhelp(out);
}
out.println();
Log.printLines(out, getLocalizedString(MsgSym.MESSAGE_MSG_USAGE_NONSTANDARD_FOOTER));
}
/** Report a usage error.
*/
void error(String key, Object... args) {
if (fatalErrors) {
String msg = getLocalizedString(key, args);
throw new PropagatedException(new IllegalStateException(msg));
}
warning(key, args);
Log.printLines(out, getLocalizedString(MsgSym.MESSAGE_MSG_USAGE, ownName));
}
/** Report a warning.
*/
void warning(String key, Object... args) {
Log.printLines(out, ownName + ": "
+ getLocalizedString(key, args));
}
public Option getOption(String flag) {
for (Option option : recognizedOptions) {
if (option.matches(flag))
return option;
}
return null;
}
public void setOptions(Options options) {
if (options == null)
throw new NullPointerException();
this.options = options;
}
public void setFatalErrors(boolean fatalErrors) {
this.fatalErrors = fatalErrors;
}
/** Process command line arguments: store all command line options
* in `options' table and return all source filenames.
* @param flags The array of command line arguments.
*/
public List<File> processArgs(String[] flags) { // XXX sb protected
int ac = 0;
while (ac < flags.length) {
String flag = flags[ac];
ac++;
int j;
// quick hack to speed up file processing:
// if the option does not begin with '-', there is no need to check
// most of the compiler options.
int firstOptionToCheck = flag.charAt(0) == '-' ? 0 : recognizedOptions.length-1;
for (j=firstOptionToCheck; j<recognizedOptions.length; j++)
if (recognizedOptions[j].matches(flag)) break;
if (j == recognizedOptions.length) {
error(MsgSym.MESSAGE_ERR_INVALID_FLAG, flag);
return null;
}
Option option = recognizedOptions[j];
if (option.hasArg()) {
if (ac == flags.length) {
error(MsgSym.MESSAGE_ERR_REQ_ARG, flag);
return null;
}
String operand = flags[ac];
ac++;
if (option.process(options, flag, operand))
return null;
} else {
if (option.process(options, flag))
return null;
}
}
if (!checkDirectory("-d"))
return null;
if (!checkDirectory("-s"))
return null;
String sourceString = options.get("-source");
Source source = (sourceString != null)
? Source.lookup(sourceString)
: Source.DEFAULT;
String targetString = options.get("-target");
Target target = (targetString != null)
? Target.lookup(targetString)
: Target.DEFAULT;
// We don't check source/target consistency for CLDC, as J2ME
// profiles are not aligned with J2SE targets; moreover, a
// single CLDC target may have many profiles. In addition,
// this is needed for the continued functioning of the JSR14
// prototype.
if (Character.isDigit(target.name.charAt(0))) {
if (target.compareTo(source.requiredTarget()) < 0) {
if (targetString != null) {
if (sourceString == null) {
warning(MsgSym.MESSAGE_WARN_TARGET_DEFAULT_SOURCE_CONFLICT,
targetString,
source.requiredTarget().name);
} else {
warning(MsgSym.MESSAGE_WARN_SOURCE_TARGET_CONFLICT,
sourceString,
source.requiredTarget().name);
}
return null;
} else {
options.put("-target", source.requiredTarget().name);
}
} else {
if (targetString == null && !source.allowGenerics()) {
options.put("-target", Target.JDK1_4.name);
}
}
}
return filenames.toList();
}
// where
private boolean checkDirectory(String optName) {
String value = options.get(optName);
if (value == null)
return true;
File file = new File(value);
if (!file.exists()) {
error(MsgSym.MESSAGE_ERR_DIR_NOT_FOUND, value);
return false;
}
if (!file.isDirectory()) {
error(MsgSym.MESSAGE_ERR_FILE_NOT_DIRECTORY, value);
return false;
}
return true;
}
/** Programmatic interface for main function.
* @param args The command line parameters.
*/
public int compile(String[] args) {
Context context = new Context();
int result = compile(args, context, List.<JavaFileObject>nil());
if (fileManager instanceof JavacFileManager) {
// A fresh context was created above, so jfm must be a JavacFileManager
((JavacFileManager)fileManager).close();
}
return result;
}
public void registerServices(Context context, String[] args) {
Context backEndContext = new Context();
backEndContext.put(DiagnosticListener.class, new DiagnosticForwarder(context));
// add -target flag to backEndContext, if specified
options = Options.instance(backEndContext);
try {
String[] allArgs = CommandLine.parse(args);
for (int i = 0; i < allArgs.length; i++) {
String opt = allArgs[i];
if (opt.equals("-g") || opt.startsWith("-g:"))
options.put(opt, opt);
if (opt.equals("-Xjcov"))
options.put(opt, opt);
if (opt.endsWith("-target") && ++i < allArgs.length)
options.put("-target", allArgs[i]);
}
} catch (IOException e) {
// ignore: will be caught and reported on second command line parse.
}
options = null;
filenames = null;
com.sun.tools.javafx.comp.JavafxFlow.preRegister(backEndContext);
com.sun.tools.javafx.code.JavafxLint.preRegister(backEndContext);
com.sun.tools.javafx.code.BlockExprSymtab.preRegister(backEndContext);
com.sun.tools.javafx.comp.BlockExprAttr.preRegister(backEndContext);
com.sun.tools.javafx.comp.BlockExprEnter.preRegister(backEndContext);
com.sun.tools.javafx.comp.BlockExprMemberEnter.preRegister(backEndContext);
com.sun.tools.javafx.comp.BlockExprResolve.preRegister(backEndContext);
com.sun.tools.javafx.comp.BlockExprLower.preRegister(backEndContext);
com.sun.tools.javafx.comp.BlockExprTransTypes.preRegister(backEndContext);
com.sun.tools.javafx.comp.BlockExprGen.preRegister(backEndContext);
JavaFileManager currentFileManager = context.get(JavaFileManager.class);
if (currentFileManager == null)
JavafxFileManager.preRegister(backEndContext);
else
backEndContext.put(JavaFileManager.class, currentFileManager);
// Sequencing requires that we get the name table from the fully initialized back-end
// rather than send the completed one.
JavafxJavaCompiler javafxJavaCompiler = JavafxJavaCompiler.instance(backEndContext);
context.put(JavafxJavaCompiler.javafxJavaCompilerKey, javafxJavaCompiler);
// Tranfer the name table -- must be done before any initialization
context.put(Name.Table.namesKey, backEndContext.get(Name.Table.namesKey));
// Tranfer the options -- must be done before any initialization
context.put(Options.optionsKey, (Options)null); // remove any old value
context.put(Options.optionsKey, backEndContext.get(Options.optionsKey));
ClassReader jreader = ClassReader.instance(backEndContext);
com.sun.tools.javafx.comp.JavafxClassReader.preRegister(context, jreader);
if (currentFileManager == null)
JavafxFileManager.preRegister(context); // can't create it until Log has been set up
com.sun.tools.javafx.code.JavafxLint.preRegister(context);
}
/** Load a plug-in corresponding to platform option. If platform option had
* not been defined, the method returns immediately.
* @param context The compiler context.
* @param options The compiler options.
*/
private void loadPlatformPlugin(Context context, Options options)
{
String platform = options.get("-platform");
if (platform == null)
return;
// collect names of jar files located in the compiler lib directory
String path = this.getClass().getCanonicalName();
path = path.substring(path.lastIndexOf('.') + 1);
path = this.getClass().getResource(path + ".class").toString();
path = path.substring(0, path.lastIndexOf(".jar!"));
path = path.substring("jar:file:".length(), path.lastIndexOf("/"));
File dir = new File(path);
File[] jars = dir.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.endsWith(".jar");
}
});
// search for platform plugins in jar files collected above
PlatformPlugin plugin = null;
URL urls[] = new URL[1];
for (File jar : jars) {
try {
plugin = null;
urls[0] = jar.toURL();
URLClassLoader loader = new URLClassLoader(urls);
InputStream stream = loader.getResourceAsStream(
"META-INF/services/" + PlatformPlugin.SERVICE);
if (stream == null)
continue; // there is no platform plugin in this jar
// read service provider class name
Reader reader = new InputStreamReader(stream);
String pname = Main.readServiceProvider(reader);
try {
reader.close();
} catch (IOException ioe) {
}
if (pname == null) {
Log.instance(context).warning(
MsgSym.MESSAGE_PLUGIN_CANNOT_LOAD_PLUGIN, urls[0].getPath());
continue;
}
// load and instantiate plug-in class
Class pclass = loader.loadClass(pname);
plugin = (PlatformPlugin)pclass.newInstance();
if (!plugin.isSupported(platform))
continue; // this plugin does not support required platform
try {
// attempt to load plug-in's messages
Class mclass = loader.loadClass(PlatformPlugin.MESSAGE);
ResourceBundle msgs = (ResourceBundle)mclass.newInstance();
Messages.instance(context).add(msgs);
} catch (java.lang.ClassNotFoundException cnfe) {
} catch (java.lang.InstantiationException ie) {
}
plugin.initialize(options, Log.instance(context));
context.put(PlatformPlugin.pluginKey, plugin);
break; // the plugin had been loaded; no need to continue
} catch (java.net.MalformedURLException murle) {
// cannot resolve URL: ignore this jar
} catch (java.lang.ClassNotFoundException cnfe) {
// cannot load service provider
Log.instance(context).warning(
MsgSym.MESSAGE_PLUGIN_CANNOT_LOAD_PLUGIN, urls[0].getPath());
} catch (java.lang.InstantiationException ie) {
// cannot create an instance of plugin
Log.instance(context).warning(
MsgSym.MESSAGE_PLUGIN_CANNOT_LOAD_PLUGIN, urls[0].getPath());
} catch (java.lang.IllegalAccessException iae) {
// cannot create an instance of plugin
Log.instance(context).warning(
MsgSym.MESSAGE_PLUGIN_CANNOT_LOAD_PLUGIN, urls[0].getPath());
}
}
// handle no plugin found
if (plugin == null) {
Log.instance(context).error(
MsgSym.MESSAGE_PLUGIN_CANNOT_FIND_PLUGIN, platform);
}
}
/** Reads the first class name as defined by Jar "Service provider"
* specification.
* @param reader The reader of service provider configuration file.
* @return Plugin's class name on successful read, null otherwise.
*/
private static String readServiceProvider(Reader reader)
{
StringBuffer name = new StringBuffer(128);
int st = 0;
try {
int ch;
while ((ch = reader.read()) >= 0) {
switch (st) {
case 0: // skip white spaces before class name
switch (ch) {
case ' ':
case '\t':
case '\r':
case '\n':
break;
case '#':
st = 1; // skip comment before the class name
break;
default:
name.append((char)ch);
st = 2; // accumulate characters of the class name
break;
}
break;
case 1: // skip comment before the class name
switch (ch) {
case '\r':
case '\n':
st = 0; // skip white spaces before class name
break;
default:
break;
}
break;
case 2: // accumulate characters of the class name
switch (ch) {
case ' ':
case '\t':
case '\r':
case '\n':
case '#':
return name.toString();
default:
name.append((char)ch);
break;
}
break;
default:
return null;
}
}
} catch (IOException ioe) {
return null;
}
return (st == 2)? name.toString(): null;
}
/** Programmatic interface for main function.
* @param args The command line parameters.
*/
public int compile(String[] args,
Context context,
List<JavaFileObject> fileObjects)
{
- String[] args2 = new String[args.length + 1];
- for (int i = 0; i < args.length; ++i) {
- args2[i+1] = args[i];
- }
- args2[0] = "-XDdumpjava=I:\\work";
- args = args2;
registerServices(context, args);
if (options == null)
options = Options.instance(context); // creates a new one
filenames = new ListBuffer<File>();
classnames = new ListBuffer<String>();
JavafxCompiler comp = null;
/*
* TODO: Logic below about what is an acceptable command line
* should be updated to take annotation processing semantics
* into account.
*/
try {
if (args.length == 0 && fileObjects.isEmpty()) {
help();
return EXIT_CMDERR;
}
List<File> fnames;
try {
fnames = processArgs(CommandLine.parse(args));
if (fnames == null) {
// null signals an error in options, abort
return EXIT_CMDERR;
} else if (fnames.isEmpty() && fileObjects.isEmpty() && classnames.isEmpty()) {
// it is allowed to compile nothing if just asking for help or version info
if (options.get("-help") != null
|| options.get("-X") != null
|| options.get("-version") != null
|| options.get("-fullversion") != null)
return EXIT_OK;
error(MsgSym.MESSAGE_ERR_NO_SOURCE_FILES);
return EXIT_CMDERR;
}
} catch (java.io.FileNotFoundException e) {
Log.printLines(out, ownName + ": " +
getLocalizedString(MsgSym.MESSAGE_ERR_FILE_NOT_FOUND,
e.getMessage()));
return EXIT_SYSERR;
}
boolean forceStdOut = options.get("stdout") != null;
if (forceStdOut) {
out.flush();
out = new PrintWriter(System.out, true);
}
context.put(Log.outKey, out);
fileManager = context.get(JavaFileManager.class);
comp = JavafxCompiler.instance(context);
if (comp == null) return EXIT_SYSERR;
loadPlatformPlugin(context, options);
if (!fnames.isEmpty()) {
// add filenames to fileObjects
comp = JavafxCompiler.instance(context);
List<JavaFileObject> otherFiles = List.nil();
JavacFileManager dfm = (JavacFileManager)fileManager;
for (JavaFileObject fo : dfm.getJavaFileObjectsFromFiles(fnames))
otherFiles = otherFiles.prepend(fo);
for (JavaFileObject fo : otherFiles)
fileObjects = fileObjects.prepend(fo);
}
comp.compile(fileObjects,
classnames.toList());
if (comp.errorCount() != 0 ||
options.get("-Werror") != null && comp.warningCount() != 0)
return EXIT_ERROR;
} catch (IOException ex) {
ioMessage(ex);
return EXIT_SYSERR;
} catch (OutOfMemoryError ex) {
resourceMessage(ex);
return EXIT_SYSERR;
} catch (StackOverflowError ex) {
resourceMessage(ex);
return EXIT_SYSERR;
} catch (FatalError ex) {
feMessage(ex);
return EXIT_SYSERR;
} catch (ClientCodeException ex) {
// as specified by javax.tools.JavaCompiler#getTask
// and javax.tools.JavaCompiler.CompilationTask#call
throw new RuntimeException(ex.getCause());
} catch (PropagatedException ex) {
throw ex.getCause();
} catch (Throwable ex) {
// Nasty. If we've already reported an error, compensate
// for buggy compiler error recovery by swallowing thrown
// exceptions.
if (comp == null || comp.errorCount() == 0 ||
options == null || options.get("dev") != null)
bugMessage(ex);
return EXIT_ABNORMAL;
} finally {
if (comp != null) comp.close();
filenames = null;
options = null;
}
return EXIT_OK;
}
/** Print a message reporting an internal error.
*/
void bugMessage(Throwable ex) {
Log.printLines(out, getJavafxLocalizedString(MsgSym.MESSAGE_JAVAFX_MSG_BUG,
JavafxCompiler.version()));
ex.printStackTrace(out);
}
/** Print a message reporting an fatal error.
*/
void feMessage(Throwable ex) {
Log.printLines(out, ex.getMessage());
}
/** Print a message reporting an input/output error.
*/
void ioMessage(Throwable ex) {
Log.printLines(out, getLocalizedString(MsgSym.MESSAGE_MSG_IO));
ex.printStackTrace(out);
}
/** Print a message reporting an out-of-resources error.
*/
void resourceMessage(Throwable ex) {
Log.printLines(out, getLocalizedString(MsgSym.MESSAGE_MSG_RESOURCE));
// System.out.println("(name buffer len = " + Name.names.length + " " + Name.nc);//DEBUG
ex.printStackTrace(out);
}
private JavaFileManager fileManager;
/* ************************************************************************
* Internationalization
*************************************************************************/
/** Find a localized string in the resource bundle.
* @param key The key for the localized string.
*/
public static String getLocalizedString(String key, Object... args) { // FIXME sb private
try {
if (messages == null)
messages = new Messages(javacBundleName);
return messages.getLocalizedString(MsgSym.MESSAGEPREFIX_JAVAC + key, args);
}
catch (MissingResourceException e) {
throw new Error("Fatal Error: Resource for javac is missing", e);
}
}
/** Find a localized string in the resource bundle.
* @param key The key for the localized string.
*/
public static String getJavafxLocalizedString(String key, Object... args) { // FIXME sb private
try {
Messages fxmessages = new Messages(javafxBundleName);
return fxmessages.getLocalizedString(key, args);
}
catch (MissingResourceException e) {
throw new Error("Fatal Error: Resource for javac is missing", e);
}
}
public static void useRawMessages(boolean enable) {
if (enable) {
messages = new Messages(javacBundleName) {
@Override
public String getLocalizedString(String key, Object... args) {
return key;
}
};
} else {
messages = new Messages(javacBundleName);
}
}
private static final String javacBundleName =
"com.sun.tools.javac.resources.javac";
private static final String javafxBundleName =
"com.sun.tools.javafx.resources.javafxcompiler";
private static Messages messages;
private static class DiagnosticForwarder implements DiagnosticListener {
Context otherContext;
public DiagnosticForwarder(Context context) {
otherContext = context;
}
public void report(Diagnostic diag) {
Log log = Log.instance(otherContext);
log.report((JCDiagnostic)diag);
}
}
}
| true | true | public int compile(String[] args,
Context context,
List<JavaFileObject> fileObjects)
{
String[] args2 = new String[args.length + 1];
for (int i = 0; i < args.length; ++i) {
args2[i+1] = args[i];
}
args2[0] = "-XDdumpjava=I:\\work";
args = args2;
registerServices(context, args);
if (options == null)
options = Options.instance(context); // creates a new one
filenames = new ListBuffer<File>();
classnames = new ListBuffer<String>();
JavafxCompiler comp = null;
/*
* TODO: Logic below about what is an acceptable command line
* should be updated to take annotation processing semantics
* into account.
*/
try {
if (args.length == 0 && fileObjects.isEmpty()) {
help();
return EXIT_CMDERR;
}
List<File> fnames;
try {
fnames = processArgs(CommandLine.parse(args));
if (fnames == null) {
// null signals an error in options, abort
return EXIT_CMDERR;
} else if (fnames.isEmpty() && fileObjects.isEmpty() && classnames.isEmpty()) {
// it is allowed to compile nothing if just asking for help or version info
if (options.get("-help") != null
|| options.get("-X") != null
|| options.get("-version") != null
|| options.get("-fullversion") != null)
return EXIT_OK;
error(MsgSym.MESSAGE_ERR_NO_SOURCE_FILES);
return EXIT_CMDERR;
}
} catch (java.io.FileNotFoundException e) {
Log.printLines(out, ownName + ": " +
getLocalizedString(MsgSym.MESSAGE_ERR_FILE_NOT_FOUND,
e.getMessage()));
return EXIT_SYSERR;
}
boolean forceStdOut = options.get("stdout") != null;
if (forceStdOut) {
out.flush();
out = new PrintWriter(System.out, true);
}
context.put(Log.outKey, out);
fileManager = context.get(JavaFileManager.class);
comp = JavafxCompiler.instance(context);
if (comp == null) return EXIT_SYSERR;
loadPlatformPlugin(context, options);
if (!fnames.isEmpty()) {
// add filenames to fileObjects
comp = JavafxCompiler.instance(context);
List<JavaFileObject> otherFiles = List.nil();
JavacFileManager dfm = (JavacFileManager)fileManager;
for (JavaFileObject fo : dfm.getJavaFileObjectsFromFiles(fnames))
otherFiles = otherFiles.prepend(fo);
for (JavaFileObject fo : otherFiles)
fileObjects = fileObjects.prepend(fo);
}
comp.compile(fileObjects,
classnames.toList());
if (comp.errorCount() != 0 ||
options.get("-Werror") != null && comp.warningCount() != 0)
return EXIT_ERROR;
} catch (IOException ex) {
ioMessage(ex);
return EXIT_SYSERR;
} catch (OutOfMemoryError ex) {
resourceMessage(ex);
return EXIT_SYSERR;
} catch (StackOverflowError ex) {
resourceMessage(ex);
return EXIT_SYSERR;
} catch (FatalError ex) {
feMessage(ex);
return EXIT_SYSERR;
} catch (ClientCodeException ex) {
// as specified by javax.tools.JavaCompiler#getTask
// and javax.tools.JavaCompiler.CompilationTask#call
throw new RuntimeException(ex.getCause());
} catch (PropagatedException ex) {
throw ex.getCause();
} catch (Throwable ex) {
// Nasty. If we've already reported an error, compensate
// for buggy compiler error recovery by swallowing thrown
// exceptions.
if (comp == null || comp.errorCount() == 0 ||
options == null || options.get("dev") != null)
bugMessage(ex);
return EXIT_ABNORMAL;
} finally {
if (comp != null) comp.close();
filenames = null;
options = null;
}
return EXIT_OK;
}
| public int compile(String[] args,
Context context,
List<JavaFileObject> fileObjects)
{
registerServices(context, args);
if (options == null)
options = Options.instance(context); // creates a new one
filenames = new ListBuffer<File>();
classnames = new ListBuffer<String>();
JavafxCompiler comp = null;
/*
* TODO: Logic below about what is an acceptable command line
* should be updated to take annotation processing semantics
* into account.
*/
try {
if (args.length == 0 && fileObjects.isEmpty()) {
help();
return EXIT_CMDERR;
}
List<File> fnames;
try {
fnames = processArgs(CommandLine.parse(args));
if (fnames == null) {
// null signals an error in options, abort
return EXIT_CMDERR;
} else if (fnames.isEmpty() && fileObjects.isEmpty() && classnames.isEmpty()) {
// it is allowed to compile nothing if just asking for help or version info
if (options.get("-help") != null
|| options.get("-X") != null
|| options.get("-version") != null
|| options.get("-fullversion") != null)
return EXIT_OK;
error(MsgSym.MESSAGE_ERR_NO_SOURCE_FILES);
return EXIT_CMDERR;
}
} catch (java.io.FileNotFoundException e) {
Log.printLines(out, ownName + ": " +
getLocalizedString(MsgSym.MESSAGE_ERR_FILE_NOT_FOUND,
e.getMessage()));
return EXIT_SYSERR;
}
boolean forceStdOut = options.get("stdout") != null;
if (forceStdOut) {
out.flush();
out = new PrintWriter(System.out, true);
}
context.put(Log.outKey, out);
fileManager = context.get(JavaFileManager.class);
comp = JavafxCompiler.instance(context);
if (comp == null) return EXIT_SYSERR;
loadPlatformPlugin(context, options);
if (!fnames.isEmpty()) {
// add filenames to fileObjects
comp = JavafxCompiler.instance(context);
List<JavaFileObject> otherFiles = List.nil();
JavacFileManager dfm = (JavacFileManager)fileManager;
for (JavaFileObject fo : dfm.getJavaFileObjectsFromFiles(fnames))
otherFiles = otherFiles.prepend(fo);
for (JavaFileObject fo : otherFiles)
fileObjects = fileObjects.prepend(fo);
}
comp.compile(fileObjects,
classnames.toList());
if (comp.errorCount() != 0 ||
options.get("-Werror") != null && comp.warningCount() != 0)
return EXIT_ERROR;
} catch (IOException ex) {
ioMessage(ex);
return EXIT_SYSERR;
} catch (OutOfMemoryError ex) {
resourceMessage(ex);
return EXIT_SYSERR;
} catch (StackOverflowError ex) {
resourceMessage(ex);
return EXIT_SYSERR;
} catch (FatalError ex) {
feMessage(ex);
return EXIT_SYSERR;
} catch (ClientCodeException ex) {
// as specified by javax.tools.JavaCompiler#getTask
// and javax.tools.JavaCompiler.CompilationTask#call
throw new RuntimeException(ex.getCause());
} catch (PropagatedException ex) {
throw ex.getCause();
} catch (Throwable ex) {
// Nasty. If we've already reported an error, compensate
// for buggy compiler error recovery by swallowing thrown
// exceptions.
if (comp == null || comp.errorCount() == 0 ||
options == null || options.get("dev") != null)
bugMessage(ex);
return EXIT_ABNORMAL;
} finally {
if (comp != null) comp.close();
filenames = null;
options = null;
}
return EXIT_OK;
}
|
diff --git a/thirdparties-extension/org.apache.poi.xwpf.converter.pdf/src/main/java/org/apache/poi/xwpf/converter/pdf/internal/elements/StylableDocument.java b/thirdparties-extension/org.apache.poi.xwpf.converter.pdf/src/main/java/org/apache/poi/xwpf/converter/pdf/internal/elements/StylableDocument.java
index 91f2d704..09d90e4f 100644
--- a/thirdparties-extension/org.apache.poi.xwpf.converter.pdf/src/main/java/org/apache/poi/xwpf/converter/pdf/internal/elements/StylableDocument.java
+++ b/thirdparties-extension/org.apache.poi.xwpf.converter.pdf/src/main/java/org/apache/poi/xwpf/converter/pdf/internal/elements/StylableDocument.java
@@ -1,410 +1,415 @@
/**
* Copyright (C) 2011-2012 The XDocReport Team <[email protected]>
*
* All rights reserved.
*
* 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 org.apache.poi.xwpf.converter.pdf.internal.elements;
import static org.apache.poi.xwpf.converter.core.utils.DxaUtil.dxa2points;
import java.io.OutputStream;
import org.apache.poi.xwpf.converter.core.MasterPageManager;
import org.apache.poi.xwpf.converter.core.PageOrientation;
import org.apache.poi.xwpf.converter.core.XWPFConverterException;
import org.apache.poi.xwpf.converter.core.utils.XWPFUtils;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPageMar;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPageSz;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSectPr;
import com.lowagie.text.Document;
import com.lowagie.text.DocumentException;
import com.lowagie.text.Element;
import com.lowagie.text.Paragraph;
import com.lowagie.text.Rectangle;
import com.lowagie.text.pdf.ColumnText;
import com.lowagie.text.pdf.PdfPCell;
import com.lowagie.text.pdf.PdfPTable;
import com.lowagie.text.pdf.PdfWriter;
import fr.opensagres.xdocreport.itext.extension.ExtendedDocument;
import fr.opensagres.xdocreport.itext.extension.ExtendedHeaderFooter;
import fr.opensagres.xdocreport.itext.extension.ExtendedPdfPTable;
import fr.opensagres.xdocreport.itext.extension.IITextContainer;
import fr.opensagres.xdocreport.itext.extension.IMasterPage;
import fr.opensagres.xdocreport.itext.extension.IMasterPageHeaderFooter;
public class StylableDocument
extends ExtendedDocument
{
private int titleNumber = 1;
private StylableMasterPage activeMasterPage;
private boolean masterPageJustChanged;
private boolean documentEmpty = true;
private PdfPTable layoutTable;
private ColumnText text;
private int colIdx;
private MasterPageManager masterPageManager;
public StylableDocument( OutputStream out )
throws DocumentException
{
super( out );
}
public void addElement( Element element )
{
if ( !super.isOpen() )
{
super.open();
}
if ( masterPageJustChanged )
{
// master page was changed but there was no explicit page break
pageBreak();
}
text.addElement( element );
StylableDocumentSection.getCell( layoutTable, colIdx ).getColumn().addElement( element );
simulateText();
documentEmpty = false;
}
public void columnBreak()
{
if ( colIdx + 1 < layoutTable.getNumberOfColumns() )
{
setColIdx( colIdx + 1 );
simulateText();
}
else
{
pageBreak();
}
}
public void pageBreak()
{
if ( documentEmpty )
{
// no element was added - ignore page break
}
else if ( masterPageJustChanged )
{
// we are just after master page change
// move to a new page but do not initialize column layout
// because it is already done
masterPageJustChanged = false;
super.newPage();
}
else
{
// flush pending content
flushTable();
// check if master page change necessary
// Style nextStyle = setNextActiveMasterPageIfNecessary();
// document new page
super.newPage();
// initialize column layout for new page
// if ( nextStyle == null )
// {
// ordinary page break
layoutTable = StylableDocumentSection.cloneAndClearTable( layoutTable, false );
// }
// else
// {
// // page break with new master page activation
// // style changed so recreate table
// layoutTable =
// StylableDocumentSection.createLayoutTable( getPageWidth(), getAdjustedPageHeight(), nextStyle );
// }
setColIdx( 0 );
simulateText();
}
}
@Override
public boolean newPage()
{
throw new XWPFConverterException( "internal error - do not call newPage directly" );
}
@Override
public void close()
{
flushTable();
super.close();
}
public float getWidthLimit()
{
PdfPCell cell = StylableDocumentSection.getCell( layoutTable, colIdx );
return cell.getRight() - cell.getPaddingRight() - cell.getLeft() - cell.getPaddingLeft();
}
public float getHeightLimit()
{
// yLine is negative
return StylableDocumentSection.getCell( layoutTable, colIdx ).getFixedHeight() + text.getYLine();
}
public float getPageWidth()
{
return right() - left();
}
private float getAdjustedPageHeight()
{
// subtract small value from height, otherwise table breaks to new page
return top() - bottom() - 0.001f;
}
private void setColIdx( int idx )
{
colIdx = idx;
PdfPCell cell = StylableDocumentSection.getCell( layoutTable, colIdx );
text.setSimpleColumn( cell.getLeft() + cell.getPaddingLeft(), -getAdjustedPageHeight(),
cell.getRight() - cell.getPaddingRight(), 0.0f );
cell.setColumn( ColumnText.duplicate( text ) );
}
private void simulateText()
{
int res = 0;
try
{
res = text.go( true );
}
catch ( DocumentException e )
{
throw new XWPFConverterException( e );
}
if ( ColumnText.hasMoreText( res ) )
{
// text does not fit into current column
// split it to a new column
columnBreak();
}
}
public StylableParagraph createParagraph( IITextContainer parent )
{
return new StylableParagraph( this, parent );
}
public Paragraph createParagraph()
{
return createParagraph( (IITextContainer) null );
}
public Paragraph createParagraph( Paragraph title )
{
return new StylableParagraph( this, title, null );
}
// public StylablePhrase createPhrase( IITextContainer parent )
// {
// return new StylablePhrase( this, parent );
// }
//
// public StylableAnchor createAnchor( IITextContainer parent )
// {
// return new StylableAnchor( this, parent );
// }
//
// public StylableList createList( IITextContainer parent )
// {
// return new StylableList( this, parent );
// }
//
// public StylableListItem createListItem( IITextContainer parent )
// {
// return new StylableListItem( this, parent );
// }
public StylableTable createTable( IITextContainer parent, int numColumns )
{
return new StylableTable( this, parent, numColumns );
}
public StylableTableCell createTableCell( IITextContainer parent )
{
return new StylableTableCell( this, parent );
}
public StylableTableCell createTableCell( IITextContainer parent, ExtendedPdfPTable table )
{
return new StylableTableCell( this, parent, table );
}
@Override
public void setActiveMasterPage( IMasterPage m )
{
StylableMasterPage masterPage = (StylableMasterPage) m;
if ( activeMasterPage != null && XWPFUtils.isContinuousSection( masterPage.getSectPr() ) )
{
// ignore section with "continous" section <w:sectPr><w:type w:val="continuous" />
// because continous section applies changes (ex: modify width/height)
// for the paragraph and iText cannot support that (a new page must be added to
// change the width/height of the page).
// see explanation about "continous" at http://officeopenxml.com/WPsection.php
return;
}
// flush pending content
flushTable();
// activate master page in three steps
// Style style = getStyleMasterPage( masterPage );
// if ( style != null )
// {
// step 1 - apply styles like page dimensions and orientation
this.applySectPr( masterPage.getSectPr() );
// }
// step 2 - set header/footer if any, it needs page dimensions from step 1
super.setActiveMasterPage( masterPage );
if ( activeMasterPage != null )
{
// set a flag used by addElement/pageBreak
masterPageJustChanged = true;
}
activeMasterPage = masterPage;
// step 3 - initialize column layout, it needs page dimensions which may be lowered by header/footer in step 2
layoutTable = StylableDocumentSection.createLayoutTable( getPageWidth(), getAdjustedPageHeight() );
text = StylableDocumentSection.createColumnText();
setColIdx( 0 );
}
private void applySectPr( CTSectPr sectPr )
{
// Set page size
CTPageSz pageSize = sectPr.getPgSz();
Rectangle pdfPageSize = new Rectangle( dxa2points( pageSize.getW() ), dxa2points( pageSize.getH() ) );
super.setPageSize( pdfPageSize );
// Orientation
PageOrientation orientation = XWPFUtils.getPageOrientation( pageSize.getOrient() );
if ( orientation != null )
{
switch ( orientation )
{
case Landscape:
super.setOrientation( fr.opensagres.xdocreport.itext.extension.PageOrientation.Landscape );
break;
case Portrait:
super.setOrientation( fr.opensagres.xdocreport.itext.extension.PageOrientation.Portrait );
break;
}
}
// Set page margin
CTPageMar pageMar = sectPr.getPgMar();
if ( pageMar != null )
{
super.setOriginalMargins( dxa2points( pageMar.getLeft() ), dxa2points( pageMar.getRight() ),
dxa2points( pageMar.getTop() ), dxa2points( pageMar.getBottom() ) );
}
}
private void flushTable()
{
if ( layoutTable != null )
{
// force calculate height because it may be zero
// and nothing will be flushed
layoutTable.calculateHeights( true );
try
{
super.add( layoutTable );
}
catch ( DocumentException e )
{
throw new XWPFConverterException( e );
}
}
}
@Override
protected ExtendedHeaderFooter createExtendedHeaderFooter()
{
return new ExtendedHeaderFooter( this )
{
@Override
public void onStartPage( PdfWriter writer, Document doc )
{
super.onStartPage( writer, doc );
StylableDocument.this.onStartPage();
}
@Override
protected float getHeaderY( IMasterPageHeaderFooter header )
{
Float headerY = ( (StylableHeaderFooter) header ).getY();
if ( headerY != null )
{
return document.getPageSize().getHeight() - headerY;
}
return super.getHeaderY( header );
}
@Override
protected float getFooterY( IMasterPageHeaderFooter footer )
{
Float footerY = ( (StylableHeaderFooter) footer ).getY();
if ( footerY != null )
{
return ( (StylableHeaderFooter) footer ).getTotalHeight();
}
return super.getFooterY( footer );
}
@Override
protected float adjustMargin( float margin, IMasterPageHeaderFooter headerFooter )
{
- if ( headerFooter.getTotalHeight() > margin )
+ if ( ( (StylableHeaderFooter) headerFooter ).getY() != null )
{
- return headerFooter.getTotalHeight();
+ // has page margin defined (PgMar)
+ if ( headerFooter.getTotalHeight() > margin )
+ {
+ return headerFooter.getTotalHeight();
+ }
+ return margin;
}
- return margin;
+ return super.adjustMargin( margin, headerFooter );
}
};
}
protected void onStartPage()
{
masterPageManager.onNewPage();
}
public void setMasterPageManager( MasterPageManager masterPageManager )
{
this.masterPageManager = masterPageManager;
}
}
| false | true | protected ExtendedHeaderFooter createExtendedHeaderFooter()
{
return new ExtendedHeaderFooter( this )
{
@Override
public void onStartPage( PdfWriter writer, Document doc )
{
super.onStartPage( writer, doc );
StylableDocument.this.onStartPage();
}
@Override
protected float getHeaderY( IMasterPageHeaderFooter header )
{
Float headerY = ( (StylableHeaderFooter) header ).getY();
if ( headerY != null )
{
return document.getPageSize().getHeight() - headerY;
}
return super.getHeaderY( header );
}
@Override
protected float getFooterY( IMasterPageHeaderFooter footer )
{
Float footerY = ( (StylableHeaderFooter) footer ).getY();
if ( footerY != null )
{
return ( (StylableHeaderFooter) footer ).getTotalHeight();
}
return super.getFooterY( footer );
}
@Override
protected float adjustMargin( float margin, IMasterPageHeaderFooter headerFooter )
{
if ( headerFooter.getTotalHeight() > margin )
{
return headerFooter.getTotalHeight();
}
return margin;
}
};
}
| protected ExtendedHeaderFooter createExtendedHeaderFooter()
{
return new ExtendedHeaderFooter( this )
{
@Override
public void onStartPage( PdfWriter writer, Document doc )
{
super.onStartPage( writer, doc );
StylableDocument.this.onStartPage();
}
@Override
protected float getHeaderY( IMasterPageHeaderFooter header )
{
Float headerY = ( (StylableHeaderFooter) header ).getY();
if ( headerY != null )
{
return document.getPageSize().getHeight() - headerY;
}
return super.getHeaderY( header );
}
@Override
protected float getFooterY( IMasterPageHeaderFooter footer )
{
Float footerY = ( (StylableHeaderFooter) footer ).getY();
if ( footerY != null )
{
return ( (StylableHeaderFooter) footer ).getTotalHeight();
}
return super.getFooterY( footer );
}
@Override
protected float adjustMargin( float margin, IMasterPageHeaderFooter headerFooter )
{
if ( ( (StylableHeaderFooter) headerFooter ).getY() != null )
{
// has page margin defined (PgMar)
if ( headerFooter.getTotalHeight() > margin )
{
return headerFooter.getTotalHeight();
}
return margin;
}
return super.adjustMargin( margin, headerFooter );
}
};
}
|
diff --git a/jason/asSemantics/TransitionSystem.java b/jason/asSemantics/TransitionSystem.java
index 1eb5f91..b8fd482 100644
--- a/jason/asSemantics/TransitionSystem.java
+++ b/jason/asSemantics/TransitionSystem.java
@@ -1,1122 +1,1124 @@
// ----------------------------------------------------------------------------
// Copyright (C) 2003 Rafael H. Bordini, Jomi F. Hubner, et al.
//
// 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
//
// To contact the authors:
// http://www.inf.ufrgs.br/~bordini
// http://www.das.ufsc.br/~jomi
//
//----------------------------------------------------------------------------
package jason.asSemantics;
import jason.JasonException;
import jason.RevisionFailedException;
import jason.architecture.AgArch;
import jason.asSyntax.ASSyntax;
import jason.asSyntax.Atom;
import jason.asSyntax.BinaryStructure;
import jason.asSyntax.InternalActionLiteral;
import jason.asSyntax.ListTerm;
import jason.asSyntax.Literal;
import jason.asSyntax.LiteralImpl;
import jason.asSyntax.LogicalFormula;
import jason.asSyntax.NumberTermImpl;
import jason.asSyntax.Plan;
import jason.asSyntax.PlanBody;
import jason.asSyntax.PlanLibrary;
import jason.asSyntax.StringTermImpl;
import jason.asSyntax.Structure;
import jason.asSyntax.Term;
import jason.asSyntax.Trigger;
import jason.asSyntax.VarTerm;
import jason.asSyntax.PlanBody.BodyType;
import jason.asSyntax.Trigger.TEOperator;
import jason.asSyntax.Trigger.TEType;
import jason.asSyntax.parser.ParseException;
import jason.bb.BeliefBase;
import jason.runtime.Settings;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.logging.Level;
import java.util.logging.Logger;
public class TransitionSystem {
public enum State { StartRC, SelEv, RelPl, ApplPl, SelAppl, FindOp, AddIM, ProcAct, SelInt, ExecInt, ClrInt }
private Logger logger = null;
private Agent ag = null;
private AgArch agArch = null;
private Circumstance C = null;
private Settings setts = null;
private State step = State.StartRC; // first step of the SOS
private int nrcslbr = Settings.ODefaultNRC; // number of reasoning cycles since last belief revision
private List<GoalListener> goalListeners = null;
// both configuration and configuration' point to this
// object, this is just to make it look more like the SOS
private TransitionSystem confP;
private TransitionSystem conf;
private Queue<Runnable> taskForBeginOfCycle = new ConcurrentLinkedQueue<Runnable>();
public TransitionSystem(Agent a, Circumstance c, Settings s, AgArch ar) {
ag = a;
C = c;
agArch = ar;
if (s == null)
setts = new Settings();
else
setts = s;
if (C == null)
C = new Circumstance();
// we need to initialise this "aliases"
conf = confP = this;
nrcslbr = setts.nrcbp(); // to do BR to start with
setLogger(agArch);
if (setts != null)
logger.setLevel(setts.logLevel());
if (a != null)
a.setTS(this);
if (ar != null)
ar.setTS(this);
}
public void setLogger(AgArch arch) {
if (arch != null)
logger = Logger.getLogger(TransitionSystem.class.getName() + "." + arch.getAgName());
else
logger = Logger.getLogger(TransitionSystem.class.getName());
}
// ---------------------------------------------------------
// Goal Listeners support methods
private Map<GoalListener,CircumstanceListener> listenersMap; // map the circumstance listeners created for the goal listeners, used in remove goal listener
/** adds an object that will be notified about events on goals (creation, suspension, ...) */
public void addGoalListener(final GoalListener gl) {
if (goalListeners == null) {
goalListeners = new ArrayList<GoalListener>();
listenersMap = new HashMap<GoalListener, CircumstanceListener>();
} else {
// do not install two MetaEventGoalListener
for (GoalListener g: goalListeners)
if (g instanceof GoalListenerForMetaEvents)
return;
}
// we need to add a listener in C to map intention events to goal events
CircumstanceListener cl = new CircumstanceListener() {
public void intentionDropped(Intention i) {
for (IntendedMeans im: i.getIMs())
if (im.getTrigger().isAddition() && im.getTrigger().isGoal())
gl.goalFinished(im.getTrigger());
}
public void intentionSuspended(Intention i, String reason) {
for (IntendedMeans im: i.getIMs())
if (im.getTrigger().isAddition() && im.getTrigger().isGoal())
gl.goalSuspended(im.getTrigger(), reason);
}
public void intentionResumed(Intention i) {
for (IntendedMeans im: i.getIMs())
if (im.getTrigger().isAddition() && im.getTrigger().isGoal())
gl.goalResumed(im.getTrigger());
}
public void eventAdded(Event e) {
if (e.getTrigger().isAddition() && e.getTrigger().isGoal())
gl.goalStarted(e);
}
public void intentionAdded(Intention i) { }
};
C.addEventListener(cl);
listenersMap.put(gl,cl);
goalListeners.add(gl);
}
public boolean hasGoalListener() {
return goalListeners != null && !goalListeners.isEmpty();
}
public List<GoalListener> getGoalListeners() {
return goalListeners;
}
public boolean removeGoalListener(GoalListener gl) {
CircumstanceListener cl = listenersMap.get(gl);
if (cl != null) C.removeEventListener(cl);
return goalListeners.remove(gl);
}
/** ******************************************************************* */
/* SEMANTIC RULES */
/** ******************************************************************* */
private void applySemanticRule() throws JasonException {
// check the current step in the reasoning cycle
// only the main parts of the interpretation appear here
// the individual semantic rules appear below
switch (step) {
case StartRC: applyProcMsg(); break;
case SelEv: applySelEv(); break;
case RelPl: applyRelPl(); break;
case ApplPl: applyApplPl(); break;
case SelAppl: applySelAppl(); break;
case FindOp: applyFindOp(); break;
case AddIM: applyAddIM(); break;
case ProcAct: applyProcAct(); break;
case SelInt: applySelInt(); break;
case ExecInt: applyExecInt(); break;
case ClrInt: confP.step = State.StartRC;
applyClrInt(conf.C.SI);
break;
}
}
// the semantic rules are referred to in comments in the functions below
private void applyProcMsg() throws JasonException {
confP.step = State.SelEv;
if (!conf.C.MB.isEmpty()) {
Message m = conf.ag.selectMessage(conf.C.MB);
if (m == null) return;
// get the content, it can be any term (literal, list, number, ...; see ask)
Term content = null;
if (m.getPropCont() instanceof Term) {
content = (Term)m.getPropCont();
} else {
try {
content = ASSyntax.parseTerm(m.getPropCont().toString());
} catch (ParseException e) {
logger.warning("The content of the message '"+m.getPropCont()+"' is not a term!");
return;
}
}
// check if an intention was suspended waiting this message
Intention intention = null;
if (m.getInReplyTo() != null) {
intention = getC().removePendingIntention(m.getInReplyTo());
}
// is it a pending intention?
if (intention != null) {
// unify the message answer with the .send fourth argument.
// the send that put the intention in Pending state was
// something like
// .send(ag1,askOne, value, X)
// if the answer was tell 3, unifies X=3
// if the answer was untell 3, unifies X=false
Structure send = (Structure)intention.peek().removeCurrentStep();
if (m.isUnTell() && send.getTerm(1).toString().equals("askOne")) {
content = Literal.LFalse;
}
if (intention.peek().getUnif().unifies(send.getTerm(3), content)) {
getC().resumeIntention(intention);
} else {
generateGoalDeletion(intention, JasonException.createBasicErrorAnnots("ask_failed", "reply of an ask message ('"+content+"') does not unify with fourth argument of .send ('"+send.getTerm(3)+"')"));
}
// the message is not an ask answer
} else if (conf.ag.socAcc(m)) {
// generate an event
String sender = m.getSender();
if (sender.equals(agArch.getAgName()))
sender = "self";
Literal received = new LiteralImpl("kqml_received").addTerms(
new Atom(sender),
new Atom(m.getIlForce()),
content,
new Atom(m.getMsgId()));
updateEvents(new Event(new Trigger(TEOperator.add, TEType.achieve, received), Intention.EmptyInt));
}
}
}
private void applySelEv() throws JasonException {
// Rule for atomic, if there is an atomic intention, do not select event
if (C.hasAtomicIntention()) {
confP.step = State.ProcAct; // need to go to ProcAct to see if an atomic intention received a feedback action
return;
}
if (conf.C.hasEvent()) {
// Rule for atomic, events from atomic intention has priority
confP.C.SE = C.removeAtomicEvent();
if (confP.C.SE != null) {
confP.step = State.RelPl;
return;
}
// Rule SelEv1
confP.C.SE = conf.ag.selectEvent(confP.C.getEvents());
if (logger.isLoggable(Level.FINE)) logger.fine("Selected event "+confP.C.SE);
if (confP.C.SE != null) {
if (ag.hasCustomSelectOption() || setts.verbose() == 2) // verbose == 2 means debug mode
confP.step = State.RelPl;
else
confP.step = State.FindOp;
return;
}
}
// Rule SelEv2
// directly to ProcAct if no event to handle
confP.step = State.ProcAct;
}
private void applyRelPl() throws JasonException {
// get all relevant plans for the selected event
confP.C.RP = relevantPlans(conf.C.SE.trigger);
// Rule Rel1
if (confP.C.RP != null || setts.retrieve())
// retrieve is mainly for Coo-AgentSpeak
confP.step = State.ApplPl;
else
applyRelApplPlRule2("relevant");
}
private void applyApplPl() throws JasonException {
confP.C.AP = applicablePlans(confP.C.RP);
// Rule Appl1
if (confP.C.AP != null || setts.retrieve())
// retrieve is mainly for Coo-AgentSpeak
confP.step = State.SelAppl;
else
applyRelApplPlRule2("applicable");
}
/** generates goal deletion event */
private void applyRelApplPlRule2(String m) throws JasonException {
confP.step = State.ProcAct; // default next step
if (conf.C.SE.trigger.isGoal()) {
// can't carry on, no relevant/applicable plan.
String msg = "Found a goal for which there is no "+m+" plan:" + conf.C.SE;
if (!generateGoalDeletionFromEvent(JasonException.createBasicErrorAnnots("no_"+m, msg)))
logger.warning(msg);
} else {
if (conf.C.SE.isInternal()) {
// e.g. belief addition as internal event, just go ahead
// but note that the event was relevant, yet it is possible
// the programmer just wanted to add the belief and it was
// relevant by chance, so just carry on instead of dropping the
// intention
confP.C.SI = conf.C.SE.intention;
updateIntention();
} else if (setts.requeue()) {
// if external, then needs to check settings
confP.C.addEvent(conf.C.SE);
} else {
// current event is external and irrelevant,
// discard that event and select another one
confP.step = State.SelEv;
}
}
}
private void applySelAppl() throws JasonException {
// Rule SelAppl
confP.C.SO = conf.ag.selectOption(confP.C.AP);
if (confP.C.SO != null) {
confP.step = State.AddIM;
if (logger.isLoggable(Level.FINE)) logger.fine("Selected option "+confP.C.SO+" for event "+confP.C.SE);
} else {
logger.fine("** selectOption returned null!");
generateGoalDeletionFromEvent(JasonException.createBasicErrorAnnots("no_option", "selectOption returned null"));
// can't carry on, no applicable plan.
confP.step = State.ProcAct;
}
}
/**
* This step is new in Jason 1.1 and replaces the steps RelPl->ApplPl->SelAppl when the user
* does not customise selectOption. This version does not create the RP and AP lists and thus
* optimise the reasoning cycle. It searches for the first option and automatically selects it.
*
* @since 1.1
*/
private void applyFindOp() throws JasonException {
confP.step = State.AddIM; // default next step
// get all relevant plans for the selected event
//Trigger te = (Trigger) conf.C.SE.trigger.clone();
List<Plan> candidateRPs = conf.ag.pl.getCandidatePlans(conf.C.SE.trigger);
if (candidateRPs != null) {
for (Plan pl : candidateRPs) {
Unifier relUn = pl.isRelevant(conf.C.SE.trigger);
if (relUn != null) { // is relevant
LogicalFormula context = pl.getContext();
if (context == null) { // context is true
confP.C.SO = new Option(pl, relUn);
return;
} else {
Iterator<Unifier> r = context.logicalConsequence(ag, relUn);
if (r != null && r.hasNext()) {
confP.C.SO = new Option(pl, r.next());
return;
}
}
}
}
applyRelApplPlRule2("applicable");
} else {
// problem: no plan
applyRelApplPlRule2("relevant");
}
}
private void applyAddIM() throws JasonException {
// create a new intended means
IntendedMeans im = new IntendedMeans(conf.C.SO, conf.C.SE.getTrigger());
// Rule ExtEv
if (conf.C.SE.intention == Intention.EmptyInt) {
Intention intention = new Intention();
intention.push(im);
confP.C.addIntention(intention);
} else {
// Rule IntEv
confP.C.SE.intention.push(im);
confP.C.addIntention(confP.C.SE.intention);
}
confP.step = State.ProcAct;
}
private void applyProcAct() throws JasonException {
confP.step = State.SelInt; // default next step
if (conf.C.hasFeedbackAction()) {
ActionExec a = conf.ag.selectAction(conf.C.getFeedbackActions());
if (a != null) {
confP.C.SI = a.getIntention();
// remove the intention from PA (PA has all pending action, including those in FA;
// but, if the intention is not in PA, it means that the intention was dropped
// and should not return to I)
if (C.removePendingAction(confP.C.SI.getId()) != null) {
if (a.getResult()) {
// add the intention back in I
updateIntention();
applyClrInt(confP.C.SI);
if (hasGoalListener())
for (GoalListener gl: getGoalListeners())
for (IntendedMeans im: confP.C.SI.getIMs())
gl.goalResumed(im.getTrigger());
} else {
String reason = a.getFailureMsg();
if (reason == null) reason = "";
ListTerm annots = JasonException.createBasicErrorAnnots("action_failed", reason);
if (a.getFailureReason() != null)
annots.append(a.getFailureReason());
generateGoalDeletion(conf.C.SI, annots);
}
} else {
applyProcAct(); // get next action
}
}
}
}
private void applySelInt() throws JasonException {
confP.step = State.ExecInt; // default next step
// Rule for Atomic Intentions
confP.C.SI = C.removeAtomicIntention();
if (confP.C.SI != null) {
return;
}
// Rule SelInt1
if (!conf.C.isAtomicIntentionSuspended() && conf.C.hasIntention()) { // the isAtomicIntentionSuspended is necessary because the atomic intention may be suspended (the above removeAtomicInt returns null in that case)
// but no other intention could be selected
confP.C.SI = conf.ag.selectIntention(conf.C.getIntentions());
if (confP.C.SI != null) { // the selectIntention function returned null
return;
}
}
confP.step = State.StartRC;
}
@SuppressWarnings("unchecked")
private void applyExecInt() throws JasonException {
confP.step = State.ClrInt; // default next step
if (conf.C.SI.isFinished()) {
return;
}
// get next formula in the body of the intended means
// on the top of the selected intention
IntendedMeans im = conf.C.SI.peek();
if (im.isFinished()) {
// for empty plans! may need unif, etc
updateIntention();
return;
}
Unifier u = im.unif;
PlanBody h = im.getCurrentStep();
Term bTerm = h.getBodyTerm();
// de-var bTerm
while (bTerm instanceof VarTerm) {
// check if bTerm is ground
- if (bTerm.isGround()) {
+ //if (bTerm.isGround()) {
+ if (((VarTerm)bTerm).hasValue()) {
bTerm = ((VarTerm)bTerm).getValue();
continue; // restart the loop
}
// h should be 'groundable' (considering the current unifier)
Term bValue = u.get((VarTerm)bTerm);
+ //System.out.println("*** "+bTerm+"="+bValue+" "+bTerm.isGround()+" "+u);
if (bValue == null) { // the case of !A with A not ground
String msg = h.getSrcInfo()+": "+ "Variable '"+bTerm+"' must be ground.";
if (!generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("body_var_unground", msg)))
logger.log(Level.SEVERE, msg);
return;
}
if (bValue.isPlanBody()) {
if (h.getBodyType() != BodyType.action) { // the case of ...; A = { !g }; +g; ....
String msg = h.getSrcInfo()+": "+ "The operator '"+h.getBodyType()+"' is lost with the variable '"+bTerm+"' unified with a plan body '"+bValue+"'. ";
if (!generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("body_var_with_op", msg)))
logger.log(Level.SEVERE, msg);
return;
}
h = (PlanBody)bValue;
if (h.getPlanSize() > 1) { // the case of A unified with {a;b;c}
h.add(im.getCurrentStep().getBodyNext());
im.insertAsNextStep(h.getBodyNext());
}
bTerm = h.getBodyTerm();
} else {
ListTerm annots = ((VarTerm)bTerm).getAnnots();
bTerm = bValue;
if (bTerm.isLiteral() && annots != null) {
bTerm = ((Literal)bTerm).forceFullLiteralImpl();
((Literal)bTerm).addAnnots(annots);
}
}
}
Literal body = null;
if (bTerm instanceof Literal)
body = (Literal)bTerm;
switch (h.getBodyType()) {
// Rule Action
case action:
body = body.copy(); body.apply(u);
confP.C.A = new ActionExec(body, conf.C.SI);
break;
case internalAction:
boolean ok = false;
List<Term> errorAnnots = null;
try {
InternalAction ia = ((InternalActionLiteral)bTerm).getIA(ag);
Term[] terms = ia.prepareArguments(body, u); // clone and apply args
Object oresult = ia.execute(this, u, terms);
if (oresult != null) {
ok = oresult instanceof Boolean && (Boolean)oresult;
if (!ok && oresult instanceof Iterator) { // ia result is an Iterator
Iterator<Unifier> iu = (Iterator<Unifier>)oresult;
if (iu.hasNext()) {
// change the unifier of the current IM to the first returned by the IA
im.unif = iu.next();
ok = true;
}
}
if (!ok) { // IA returned false
errorAnnots = JasonException.createBasicErrorAnnots("ia_failed", "");
}
}
if (ok && !ia.suspendIntention())
updateIntention();
} catch (JasonException e) {
errorAnnots = e.getErrorTerms();
if (!generateGoalDeletion(conf.C.SI, errorAnnots))
logger.log(Level.SEVERE, body.getErrorMsg()+": "+ e.getMessage());
ok = true; // just to not generate the event again
} catch (Exception e) {
if (body == null)
logger.log(Level.SEVERE, "Selected an intention with null body in '"+h+"' and IM "+im, e);
else
logger.log(Level.SEVERE, body.getErrorMsg()+": "+ e.getMessage(), e);
}
if (!ok)
generateGoalDeletion(conf.C.SI, errorAnnots);
break;
case constraint:
Iterator<Unifier> iu = ((LogicalFormula)bTerm).logicalConsequence(ag, u);
if (iu.hasNext()) {
im.unif = iu.next();
updateIntention();
} else {
String msg = "Constraint "+h+" was not satisfied ("+h.getSrcInfo()+").";
generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots(new Atom("constraint_failed"), msg));
logger.fine(msg);
}
break;
// Rule Achieve
case achieve:
body = prepareBodyForEvent(body, u);
Event evt = conf.C.addAchvGoal(body, conf.C.SI);
confP.step = State.StartRC;
break;
// Rule Achieve as a New Focus (the !! operator)
case achieveNF:
body = prepareBodyForEvent(body, u);
evt = conf.C.addAchvGoal(body, Intention.EmptyInt);
updateIntention();
break;
// Rule Test
case test:
LogicalFormula f = (LogicalFormula)bTerm;
if (conf.ag.believes(f, u)) {
updateIntention();
} else {
boolean fail = true;
// generate event when using literal in the test (no events for log. expr. like ?(a & b))
if (f.isLiteral() && !(f instanceof BinaryStructure)) {
body = prepareBodyForEvent(body, u);
if (body.isLiteral()) { // in case body is a var with content that is not a literal (note the VarTerm pass in the instanceof Literal)
Trigger te = new Trigger(TEOperator.add, TEType.test, body);
evt = new Event(te, conf.C.SI);
if (ag.getPL().hasCandidatePlan(te)) {
if (logger.isLoggable(Level.FINE)) logger.fine("Test Goal '" + h + "' failed as simple query. Generating internal event for it: "+te);
conf.C.addEvent(evt);
confP.step = State.StartRC;
fail = false;
}
}
}
if (fail) {
if (logger.isLoggable(Level.FINE)) logger.fine("Test '"+h+"' failed ("+h.getSrcInfo()+").");
generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("test_goal_failed", "Failed to test '"+h+"'"));
}
}
break;
case delAddBel:
// -+a(1,X) ===> remove a(_,_), add a(1,X)
// change all vars to anon vars to remove it
Literal b2 = prepareBodyForEvent(body, u);
b2.makeTermsAnnon(); // do not change body (but b2), to not interfere in addBel
// to delete, create events as external to avoid that
// remove/add create two events for the same intention
// (in future releases, creates a two branches for this operator)
try {
List<Literal>[] result = ag.brf(null, b2, conf.C.SI); // the intention is not the new focus
if (result != null) { // really delete something
// generate events
updateEvents(result,Intention.EmptyInt);
}
} catch (RevisionFailedException re) {
generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("belief_revision_failed", "BRF failed for '"+body+"'"));
break;
}
// add the belief, so no break;
// Rule AddBel
case addBel:
body = prepareBodyForEvent(body, u);
// calculate focus
Intention newfocus = Intention.EmptyInt;
if (setts.sameFocus())
newfocus = conf.C.SI;
// call BRF
try {
List<Literal>[] result = ag.brf(body,null,conf.C.SI); // the intention is not the new focus
if (result != null) { // really add something
// generate events
updateEvents(result,newfocus);
if (!setts.sameFocus()) {
updateIntention();
}
} else {
updateIntention();
}
} catch (RevisionFailedException re) {
generateGoalDeletion(conf.C.SI, null);
}
break;
case delBel:
body = prepareBodyForEvent(body, u);
newfocus = Intention.EmptyInt;
if (setts.sameFocus())
newfocus = conf.C.SI;
// call BRF
try {
List<Literal>[] result = ag.brf(null, body, conf.C.SI); // the intention is not the new focus
if (result != null) { // really change something
// generate events
updateEvents(result,newfocus);
if (!setts.sameFocus()) {
updateIntention();
}
} else {
updateIntention();
}
} catch (RevisionFailedException re) {
generateGoalDeletion(conf.C.SI, null);
}
break;
}
}
// add the self source in the body in case no other source was given
private Literal prepareBodyForEvent(Literal body, Unifier u) {
body = body.copy();
body.apply(u);
body.makeVarsAnnon(u); // free variables in an event cannot conflict with those in the plan
body = body.forceFullLiteralImpl();
if (!body.hasSource()) { // do not add source(self) in case the programmer set the source
body.addAnnot(BeliefBase.TSelf);
}
return body;
}
public void applyClrInt(Intention i) throws JasonException {
while (true) { // quit the method by return
// Rule ClrInt
if (i == null)
return;
if (i.isFinished()) {
// intention finished, remove it
confP.C.dropIntention(i);
//conf.C.SI = null;
return;
}
IntendedMeans im = i.peek();
if (!im.isFinished()) {
// nothing to do
return;
}
// remove the finished IM from the top of the intention
IntendedMeans topIM = i.pop();
Trigger topTrigger = topIM.getTrigger();
Literal topLiteral = topTrigger.getLiteral();
if (logger.isLoggable(Level.FINE)) logger.fine("Returning from IM "+topIM.getPlan().getLabel()+", te="+topIM.getPlan().getTrigger()+" unif="+topIM.unif);
// produce ^!g[state(finished)] event
if (topTrigger.getOperator() == TEOperator.add && topTrigger.isGoal()) {
if (hasGoalListener())
for (GoalListener gl: goalListeners)
gl.goalFinished(topTrigger);
}
// if has finished a failure handling IM ...
if (im.getTrigger().isGoal() && !im.getTrigger().isAddition() && i.size() > 0) {
// needs to get rid of the IM until a goal that
// has failure handling. E.g,
// -!b
// +!c
// +!d
// +!b
// +!s: !b; !z
// should became
// +!s: !z
im = i.peek();
if (im.isFinished() || !im.unif.unifies(im.getCurrentStep().getBodyTerm(), topLiteral) || im.getCurrentStep().getBodyTerm() instanceof VarTerm) {
im = i.pop(); // +!c above
}
while (i.size() > 0 &&
!im.unif.unifies(im.getTrigger().getLiteral(), topLiteral) &&
!im.unif.unifies(im.getCurrentStep().getBodyTerm(), topLiteral)) {
im = i.pop();
}
}
if (!i.isFinished()) {
im = i.peek(); // +!s or +?s
if (!im.isFinished()) {
// removes !b or ?s
// unifies the final event with the body that called it
topLiteral.apply(topIM.unif);
im.unif.unifies(im.removeCurrentStep(), topLiteral);
}
}
}
}
/**********************************************/
/* auxiliary functions for the semantic rules */
/**********************************************/
public List<Option> relevantPlans(Trigger teP) throws JasonException {
Trigger te = teP.clone();
List<Option> rp = null;
List<Plan> candidateRPs = conf.ag.pl.getCandidatePlans(te);
if (candidateRPs != null) {
for (Plan pl : candidateRPs) {
Unifier relUn = pl.isRelevant(te);
if (relUn != null) {
if (rp == null) rp = new LinkedList<Option>();
rp.add(new Option(pl, relUn));
}
}
}
return rp;
}
public List<Option> applicablePlans(List<Option> rp) throws JasonException {
List<Option> ap = null;
if (rp != null) {
//ap = new ApplPlanTimeOut().get(rp);
for (Option opt: rp) {
LogicalFormula context = opt.getPlan().getContext();
if (context == null) { // context is true
if (ap == null) ap = new LinkedList<Option>();
ap.add(opt);
} else {
boolean allUnifs = opt.getPlan().isAllUnifs();
Iterator<Unifier> r = context.logicalConsequence(ag, opt.getUnifier());
if (r != null) {
while (r.hasNext()) {
opt.setUnifier(r.next());
if (ap == null) ap = new LinkedList<Option>();
ap.add(opt);
if (!allUnifs) break; // returns only the first unification
if (r.hasNext()) {
// create a new option for the next loop step
opt = new Option(opt.getPlan(), null);
}
}
}
}
}
}
return ap;
}
public void updateEvents(List<Literal>[] result, Intention focus) {
if (result == null) return;
// create the events
for (Literal ladd: result[0]) {
Trigger te = new Trigger(TEOperator.add, TEType.belief, ladd);
updateEvents(new Event(te, focus));
focus = Intention.EmptyInt;
}
for (Literal lrem: result[1]) {
Trigger te = new Trigger(TEOperator.del, TEType.belief, lrem);
updateEvents(new Event(te, focus));
focus = Intention.EmptyInt;
}
}
// only add External Event if it is relevant in respect to the PlanLibrary
public void updateEvents(Event e) {
// Note: we have to add events even if they are not relevant to
// a) allow the user to override selectOption and then provide an "unknown" plan; or then
// b) create the failure event (it is done by SelRelPlan)
if (e.isInternal() || C.hasListener() || ag.getPL().hasCandidatePlan(e.trigger)) {
C.addEvent(e);
if (logger.isLoggable(Level.FINE)) logger.fine("Added event " + e);
}
}
/** remove the top action and requeue the current intention */
private void updateIntention() {
if (!conf.C.SI.isFinished()) {
IntendedMeans im = conf.C.SI.peek();
im.removeCurrentStep();
confP.C.addIntention(conf.C.SI);
} else {
logger.fine("trying to update a finished intention!");
}
}
/** generate a failure event for an intention */
public boolean generateGoalDeletion(Intention i, List<Term> failAnnots) throws JasonException {
boolean failEeventGenerated = false;
IntendedMeans im = i.peek();
if (im.isGoalAdd()) {
// notify listener
if (hasGoalListener())
for (GoalListener gl: goalListeners)
gl.goalFailed(im.getTrigger());
// produce failure event
Event failEvent = findEventForFailure(i, im.getTrigger());
if (failEvent != null) {
setDefaultFailureAnnots(failEvent, im.getCurrentStep().getBodyTerm(), failAnnots);
confP.C.addEvent(failEvent);
failEeventGenerated = true;
if (logger.isLoggable(Level.FINE)) logger.fine("Generating goal deletion " + failEvent.getTrigger() + " from goal: " + im.getTrigger());
} else {
logger.warning("No failure event was generated for " + im.getTrigger());
}
}
// if "discard" is set, we are deleting the whole intention!
// it is simply not going back to 'I' nor anywhere else!
else if (setts.requeue()) {
// get the external event (or the one that started
// the whole focus of attention) and requeue it
im = i.get(0);
confP.C.addExternalEv(im.getTrigger());
} else {
logger.warning("Could not finish intention: " + i);
}
return failEeventGenerated;
}
// similar to the one above, but for an Event rather than intention
private boolean generateGoalDeletionFromEvent(List<Term> failAnnots) throws JasonException {
Event ev = conf.C.SE;
if (ev == null) {
logger.warning("** It was not possible to generate a goal deletion event because SE is null! " + conf.C);
return false;
}
Trigger tevent = ev.trigger;
boolean failEeventGenerated = false;
if (tevent.isAddition() && tevent.isGoal()) {
// notify listener
if (hasGoalListener())
for (GoalListener gl: goalListeners)
gl.goalFailed(tevent);
// produce failure event
Event failEvent = findEventForFailure(ev.intention, tevent);
if (failEvent != null) {
setDefaultFailureAnnots(failEvent, tevent.getLiteral(), failAnnots);
confP.C.addEvent(failEvent);
failEeventGenerated = true;
//logger.warning("Generating goal deletion " + failEvent.getTrigger() + " from event: " + ev.getTrigger());
} else {
logger.warning("No fail event was generated for " + ev.getTrigger());
}
} else if (ev.isInternal()) {
logger.warning("Could not finish intention:\n" + ev.intention);
}
// if "discard" is set, we are deleting the whole intention!
// it is simply not going back to I nor anywhere else!
else if (setts.requeue()) {
confP.C.addEvent(ev);
logger.warning("Requeing external event: " + ev);
} else
logger.warning("Discarding external event: " + ev);
return failEeventGenerated;
}
public Event findEventForFailure(Intention i, Trigger tevent) {
Trigger failTrigger = new Trigger(TEOperator.del, tevent.getType(), tevent.getLiteral());
if (i != Intention.EmptyInt) {
ListIterator<IntendedMeans> ii = i.iterator();
while (!getAg().getPL().hasCandidatePlan(failTrigger) && ii.hasPrevious()) {
// TODO: pop IM until +!g or *!g (this TODO is valid only if meta events are pushed on top of the intention)
// If *!g is found first, no failure event
// - while popping, if some meta event (* > !) is in the stack, stop and simple pop instead of producing an failure event
IntendedMeans im = ii.previous();
tevent = im.getTrigger();
failTrigger = new Trigger(TEOperator.del, tevent.getType(), tevent.getLiteral());
}
}
// if some failure handling plan is found
if (tevent.isGoal() && tevent.isAddition() && getAg().getPL().hasCandidatePlan(failTrigger)) {
return new Event(failTrigger.clone(), i);
}
return null;
}
private static final Atom aNOCODE = new Atom("no_code");
/** add default error annotations (error, error_msg, code, code_src, code_line) in the failure event */
private static void setDefaultFailureAnnots(Event failEvent, Term body, List<Term> failAnnots) {
// add default failure annots
if (failAnnots == null)
failAnnots = JasonException.createBasicErrorAnnots( JasonException.UNKNOW_ERROR, "");
Literal eventLiteral = failEvent.getTrigger().getLiteral();
eventLiteral.addAnnots(failAnnots);
// add failure annots in the event related to the code source
Literal bodyterm = aNOCODE;
Term codesrc = aNOCODE;
Term codeline = aNOCODE;
if (body != null && body instanceof Literal) {
bodyterm = (Literal)body;
if (bodyterm.getSrcInfo() != null) {
if (bodyterm.getSrcInfo().getSrcFile() != null)
codesrc = new StringTermImpl(bodyterm.getSrcInfo().getSrcFile());
codeline = new NumberTermImpl(bodyterm.getSrcInfo().getSrcLine());
}
}
// code
if (eventLiteral.getAnnots("code").isEmpty())
eventLiteral.addAnnot(ASSyntax.createStructure("code", bodyterm.copy().makeVarsAnnon()));
// ASL source
if (eventLiteral.getAnnots("code_src").isEmpty())
eventLiteral.addAnnot(ASSyntax.createStructure("code_src", codesrc));
// line in the source
if (eventLiteral.getAnnots("code_line").isEmpty())
eventLiteral.addAnnot(ASSyntax.createStructure("code_line", codeline));
}
public boolean canSleep() {
return (C.isAtomicIntentionSuspended() && conf.C.MB.isEmpty())
|| (!conf.C.hasEvent() && !conf.C.hasIntention() &&
!conf.C.hasFeedbackAction() &&
conf.C.MB.isEmpty() &&
//taskForBeginOfCycle.isEmpty() &&
agArch.canSleep());
}
/**
* Schedule a task to be executed in the begin of the next reasoning cycle.
* It is used mostly to change the C only by the TS thread (e.g. by .wait)
*/
public void runAtBeginOfNextCycle(Runnable r) {
taskForBeginOfCycle.offer(r);
}
/**********************************************************************/
/* MAIN LOOP */
/**********************************************************************/
/* infinite loop on one reasoning cycle */
/* plus the other parts of the agent architecture besides */
/* the actual transition system of the AS interpreter */
/**********************************************************************/
public void reasoningCycle() {
if (logger.isLoggable(Level.FINE)) logger.fine("Start new reasoning cycle");
try {
C.reset();
// run tasks allocated to be performed in the begin of the cycle
Runnable r = taskForBeginOfCycle.poll();
while (r != null) {
r.run();
r = taskForBeginOfCycle.poll();
}
if (nrcslbr >= setts.nrcbp()) {
nrcslbr = 0;
ag.buf(agArch.perceive());
agArch.checkMail();
}
nrcslbr++; // counting number of cycles since last belief revision
if (canSleep()) {
if (ag.pl.getIdlePlans() != null) {
logger.fine("generating idle event");
C.addExternalEv(PlanLibrary.TE_IDLE);
} else {
agArch.sleep();
return;
}
}
step = State.StartRC;
do {
if (!agArch.isRunning()) return;
applySemanticRule();
} while (step != State.StartRC);
ActionExec action = C.getAction();
if (action != null) {
C.addPendingAction(action);
// We need to send a wrapper for FA to the user so that add method then calls C.addFA (which control atomic things)
agArch.act(action, C.getFeedbackActionsWrapper());
}
} catch (Exception e) {
logger.log(Level.SEVERE, "*** ERROR in the transition system. "+conf.C+"\nCreating a new C!", e);
conf.C.create();
}
}
// Auxiliary functions
// (for Internal Actions to be able to access the configuration)
public Agent getAg() {
return ag;
}
public Circumstance getC() {
return C;
}
public State getStep() {
return step;
}
public Settings getSettings() {
return setts;
}
public AgArch getUserAgArch() {
return agArch;
}
public Logger getLogger() {
return logger;
}
}
| false | true | private void applyExecInt() throws JasonException {
confP.step = State.ClrInt; // default next step
if (conf.C.SI.isFinished()) {
return;
}
// get next formula in the body of the intended means
// on the top of the selected intention
IntendedMeans im = conf.C.SI.peek();
if (im.isFinished()) {
// for empty plans! may need unif, etc
updateIntention();
return;
}
Unifier u = im.unif;
PlanBody h = im.getCurrentStep();
Term bTerm = h.getBodyTerm();
// de-var bTerm
while (bTerm instanceof VarTerm) {
// check if bTerm is ground
if (bTerm.isGround()) {
bTerm = ((VarTerm)bTerm).getValue();
continue; // restart the loop
}
// h should be 'groundable' (considering the current unifier)
Term bValue = u.get((VarTerm)bTerm);
if (bValue == null) { // the case of !A with A not ground
String msg = h.getSrcInfo()+": "+ "Variable '"+bTerm+"' must be ground.";
if (!generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("body_var_unground", msg)))
logger.log(Level.SEVERE, msg);
return;
}
if (bValue.isPlanBody()) {
if (h.getBodyType() != BodyType.action) { // the case of ...; A = { !g }; +g; ....
String msg = h.getSrcInfo()+": "+ "The operator '"+h.getBodyType()+"' is lost with the variable '"+bTerm+"' unified with a plan body '"+bValue+"'. ";
if (!generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("body_var_with_op", msg)))
logger.log(Level.SEVERE, msg);
return;
}
h = (PlanBody)bValue;
if (h.getPlanSize() > 1) { // the case of A unified with {a;b;c}
h.add(im.getCurrentStep().getBodyNext());
im.insertAsNextStep(h.getBodyNext());
}
bTerm = h.getBodyTerm();
} else {
ListTerm annots = ((VarTerm)bTerm).getAnnots();
bTerm = bValue;
if (bTerm.isLiteral() && annots != null) {
bTerm = ((Literal)bTerm).forceFullLiteralImpl();
((Literal)bTerm).addAnnots(annots);
}
}
}
Literal body = null;
if (bTerm instanceof Literal)
body = (Literal)bTerm;
switch (h.getBodyType()) {
// Rule Action
case action:
body = body.copy(); body.apply(u);
confP.C.A = new ActionExec(body, conf.C.SI);
break;
case internalAction:
boolean ok = false;
List<Term> errorAnnots = null;
try {
InternalAction ia = ((InternalActionLiteral)bTerm).getIA(ag);
Term[] terms = ia.prepareArguments(body, u); // clone and apply args
Object oresult = ia.execute(this, u, terms);
if (oresult != null) {
ok = oresult instanceof Boolean && (Boolean)oresult;
if (!ok && oresult instanceof Iterator) { // ia result is an Iterator
Iterator<Unifier> iu = (Iterator<Unifier>)oresult;
if (iu.hasNext()) {
// change the unifier of the current IM to the first returned by the IA
im.unif = iu.next();
ok = true;
}
}
if (!ok) { // IA returned false
errorAnnots = JasonException.createBasicErrorAnnots("ia_failed", "");
}
}
if (ok && !ia.suspendIntention())
updateIntention();
} catch (JasonException e) {
errorAnnots = e.getErrorTerms();
if (!generateGoalDeletion(conf.C.SI, errorAnnots))
logger.log(Level.SEVERE, body.getErrorMsg()+": "+ e.getMessage());
ok = true; // just to not generate the event again
} catch (Exception e) {
if (body == null)
logger.log(Level.SEVERE, "Selected an intention with null body in '"+h+"' and IM "+im, e);
else
logger.log(Level.SEVERE, body.getErrorMsg()+": "+ e.getMessage(), e);
}
if (!ok)
generateGoalDeletion(conf.C.SI, errorAnnots);
break;
case constraint:
Iterator<Unifier> iu = ((LogicalFormula)bTerm).logicalConsequence(ag, u);
if (iu.hasNext()) {
im.unif = iu.next();
updateIntention();
} else {
String msg = "Constraint "+h+" was not satisfied ("+h.getSrcInfo()+").";
generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots(new Atom("constraint_failed"), msg));
logger.fine(msg);
}
break;
// Rule Achieve
case achieve:
body = prepareBodyForEvent(body, u);
Event evt = conf.C.addAchvGoal(body, conf.C.SI);
confP.step = State.StartRC;
break;
// Rule Achieve as a New Focus (the !! operator)
case achieveNF:
body = prepareBodyForEvent(body, u);
evt = conf.C.addAchvGoal(body, Intention.EmptyInt);
updateIntention();
break;
// Rule Test
case test:
LogicalFormula f = (LogicalFormula)bTerm;
if (conf.ag.believes(f, u)) {
updateIntention();
} else {
boolean fail = true;
// generate event when using literal in the test (no events for log. expr. like ?(a & b))
if (f.isLiteral() && !(f instanceof BinaryStructure)) {
body = prepareBodyForEvent(body, u);
if (body.isLiteral()) { // in case body is a var with content that is not a literal (note the VarTerm pass in the instanceof Literal)
Trigger te = new Trigger(TEOperator.add, TEType.test, body);
evt = new Event(te, conf.C.SI);
if (ag.getPL().hasCandidatePlan(te)) {
if (logger.isLoggable(Level.FINE)) logger.fine("Test Goal '" + h + "' failed as simple query. Generating internal event for it: "+te);
conf.C.addEvent(evt);
confP.step = State.StartRC;
fail = false;
}
}
}
if (fail) {
if (logger.isLoggable(Level.FINE)) logger.fine("Test '"+h+"' failed ("+h.getSrcInfo()+").");
generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("test_goal_failed", "Failed to test '"+h+"'"));
}
}
break;
case delAddBel:
// -+a(1,X) ===> remove a(_,_), add a(1,X)
// change all vars to anon vars to remove it
Literal b2 = prepareBodyForEvent(body, u);
b2.makeTermsAnnon(); // do not change body (but b2), to not interfere in addBel
// to delete, create events as external to avoid that
// remove/add create two events for the same intention
// (in future releases, creates a two branches for this operator)
try {
List<Literal>[] result = ag.brf(null, b2, conf.C.SI); // the intention is not the new focus
if (result != null) { // really delete something
// generate events
updateEvents(result,Intention.EmptyInt);
}
} catch (RevisionFailedException re) {
generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("belief_revision_failed", "BRF failed for '"+body+"'"));
break;
}
// add the belief, so no break;
// Rule AddBel
case addBel:
body = prepareBodyForEvent(body, u);
// calculate focus
Intention newfocus = Intention.EmptyInt;
if (setts.sameFocus())
newfocus = conf.C.SI;
// call BRF
try {
List<Literal>[] result = ag.brf(body,null,conf.C.SI); // the intention is not the new focus
if (result != null) { // really add something
// generate events
updateEvents(result,newfocus);
if (!setts.sameFocus()) {
updateIntention();
}
} else {
updateIntention();
}
} catch (RevisionFailedException re) {
generateGoalDeletion(conf.C.SI, null);
}
break;
case delBel:
body = prepareBodyForEvent(body, u);
newfocus = Intention.EmptyInt;
if (setts.sameFocus())
newfocus = conf.C.SI;
// call BRF
try {
List<Literal>[] result = ag.brf(null, body, conf.C.SI); // the intention is not the new focus
if (result != null) { // really change something
// generate events
updateEvents(result,newfocus);
if (!setts.sameFocus()) {
updateIntention();
}
} else {
updateIntention();
}
} catch (RevisionFailedException re) {
generateGoalDeletion(conf.C.SI, null);
}
break;
}
}
| private void applyExecInt() throws JasonException {
confP.step = State.ClrInt; // default next step
if (conf.C.SI.isFinished()) {
return;
}
// get next formula in the body of the intended means
// on the top of the selected intention
IntendedMeans im = conf.C.SI.peek();
if (im.isFinished()) {
// for empty plans! may need unif, etc
updateIntention();
return;
}
Unifier u = im.unif;
PlanBody h = im.getCurrentStep();
Term bTerm = h.getBodyTerm();
// de-var bTerm
while (bTerm instanceof VarTerm) {
// check if bTerm is ground
//if (bTerm.isGround()) {
if (((VarTerm)bTerm).hasValue()) {
bTerm = ((VarTerm)bTerm).getValue();
continue; // restart the loop
}
// h should be 'groundable' (considering the current unifier)
Term bValue = u.get((VarTerm)bTerm);
//System.out.println("*** "+bTerm+"="+bValue+" "+bTerm.isGround()+" "+u);
if (bValue == null) { // the case of !A with A not ground
String msg = h.getSrcInfo()+": "+ "Variable '"+bTerm+"' must be ground.";
if (!generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("body_var_unground", msg)))
logger.log(Level.SEVERE, msg);
return;
}
if (bValue.isPlanBody()) {
if (h.getBodyType() != BodyType.action) { // the case of ...; A = { !g }; +g; ....
String msg = h.getSrcInfo()+": "+ "The operator '"+h.getBodyType()+"' is lost with the variable '"+bTerm+"' unified with a plan body '"+bValue+"'. ";
if (!generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("body_var_with_op", msg)))
logger.log(Level.SEVERE, msg);
return;
}
h = (PlanBody)bValue;
if (h.getPlanSize() > 1) { // the case of A unified with {a;b;c}
h.add(im.getCurrentStep().getBodyNext());
im.insertAsNextStep(h.getBodyNext());
}
bTerm = h.getBodyTerm();
} else {
ListTerm annots = ((VarTerm)bTerm).getAnnots();
bTerm = bValue;
if (bTerm.isLiteral() && annots != null) {
bTerm = ((Literal)bTerm).forceFullLiteralImpl();
((Literal)bTerm).addAnnots(annots);
}
}
}
Literal body = null;
if (bTerm instanceof Literal)
body = (Literal)bTerm;
switch (h.getBodyType()) {
// Rule Action
case action:
body = body.copy(); body.apply(u);
confP.C.A = new ActionExec(body, conf.C.SI);
break;
case internalAction:
boolean ok = false;
List<Term> errorAnnots = null;
try {
InternalAction ia = ((InternalActionLiteral)bTerm).getIA(ag);
Term[] terms = ia.prepareArguments(body, u); // clone and apply args
Object oresult = ia.execute(this, u, terms);
if (oresult != null) {
ok = oresult instanceof Boolean && (Boolean)oresult;
if (!ok && oresult instanceof Iterator) { // ia result is an Iterator
Iterator<Unifier> iu = (Iterator<Unifier>)oresult;
if (iu.hasNext()) {
// change the unifier of the current IM to the first returned by the IA
im.unif = iu.next();
ok = true;
}
}
if (!ok) { // IA returned false
errorAnnots = JasonException.createBasicErrorAnnots("ia_failed", "");
}
}
if (ok && !ia.suspendIntention())
updateIntention();
} catch (JasonException e) {
errorAnnots = e.getErrorTerms();
if (!generateGoalDeletion(conf.C.SI, errorAnnots))
logger.log(Level.SEVERE, body.getErrorMsg()+": "+ e.getMessage());
ok = true; // just to not generate the event again
} catch (Exception e) {
if (body == null)
logger.log(Level.SEVERE, "Selected an intention with null body in '"+h+"' and IM "+im, e);
else
logger.log(Level.SEVERE, body.getErrorMsg()+": "+ e.getMessage(), e);
}
if (!ok)
generateGoalDeletion(conf.C.SI, errorAnnots);
break;
case constraint:
Iterator<Unifier> iu = ((LogicalFormula)bTerm).logicalConsequence(ag, u);
if (iu.hasNext()) {
im.unif = iu.next();
updateIntention();
} else {
String msg = "Constraint "+h+" was not satisfied ("+h.getSrcInfo()+").";
generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots(new Atom("constraint_failed"), msg));
logger.fine(msg);
}
break;
// Rule Achieve
case achieve:
body = prepareBodyForEvent(body, u);
Event evt = conf.C.addAchvGoal(body, conf.C.SI);
confP.step = State.StartRC;
break;
// Rule Achieve as a New Focus (the !! operator)
case achieveNF:
body = prepareBodyForEvent(body, u);
evt = conf.C.addAchvGoal(body, Intention.EmptyInt);
updateIntention();
break;
// Rule Test
case test:
LogicalFormula f = (LogicalFormula)bTerm;
if (conf.ag.believes(f, u)) {
updateIntention();
} else {
boolean fail = true;
// generate event when using literal in the test (no events for log. expr. like ?(a & b))
if (f.isLiteral() && !(f instanceof BinaryStructure)) {
body = prepareBodyForEvent(body, u);
if (body.isLiteral()) { // in case body is a var with content that is not a literal (note the VarTerm pass in the instanceof Literal)
Trigger te = new Trigger(TEOperator.add, TEType.test, body);
evt = new Event(te, conf.C.SI);
if (ag.getPL().hasCandidatePlan(te)) {
if (logger.isLoggable(Level.FINE)) logger.fine("Test Goal '" + h + "' failed as simple query. Generating internal event for it: "+te);
conf.C.addEvent(evt);
confP.step = State.StartRC;
fail = false;
}
}
}
if (fail) {
if (logger.isLoggable(Level.FINE)) logger.fine("Test '"+h+"' failed ("+h.getSrcInfo()+").");
generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("test_goal_failed", "Failed to test '"+h+"'"));
}
}
break;
case delAddBel:
// -+a(1,X) ===> remove a(_,_), add a(1,X)
// change all vars to anon vars to remove it
Literal b2 = prepareBodyForEvent(body, u);
b2.makeTermsAnnon(); // do not change body (but b2), to not interfere in addBel
// to delete, create events as external to avoid that
// remove/add create two events for the same intention
// (in future releases, creates a two branches for this operator)
try {
List<Literal>[] result = ag.brf(null, b2, conf.C.SI); // the intention is not the new focus
if (result != null) { // really delete something
// generate events
updateEvents(result,Intention.EmptyInt);
}
} catch (RevisionFailedException re) {
generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("belief_revision_failed", "BRF failed for '"+body+"'"));
break;
}
// add the belief, so no break;
// Rule AddBel
case addBel:
body = prepareBodyForEvent(body, u);
// calculate focus
Intention newfocus = Intention.EmptyInt;
if (setts.sameFocus())
newfocus = conf.C.SI;
// call BRF
try {
List<Literal>[] result = ag.brf(body,null,conf.C.SI); // the intention is not the new focus
if (result != null) { // really add something
// generate events
updateEvents(result,newfocus);
if (!setts.sameFocus()) {
updateIntention();
}
} else {
updateIntention();
}
} catch (RevisionFailedException re) {
generateGoalDeletion(conf.C.SI, null);
}
break;
case delBel:
body = prepareBodyForEvent(body, u);
newfocus = Intention.EmptyInt;
if (setts.sameFocus())
newfocus = conf.C.SI;
// call BRF
try {
List<Literal>[] result = ag.brf(null, body, conf.C.SI); // the intention is not the new focus
if (result != null) { // really change something
// generate events
updateEvents(result,newfocus);
if (!setts.sameFocus()) {
updateIntention();
}
} else {
updateIntention();
}
} catch (RevisionFailedException re) {
generateGoalDeletion(conf.C.SI, null);
}
break;
}
}
|
diff --git a/src/jp/atr/unr/pf/gui/KnowRobGuiMain.java b/src/jp/atr/unr/pf/gui/KnowRobGuiMain.java
index 6cae95f..634b006 100644
--- a/src/jp/atr/unr/pf/gui/KnowRobGuiMain.java
+++ b/src/jp/atr/unr/pf/gui/KnowRobGuiMain.java
@@ -1,251 +1,251 @@
/*
* Copyright (C) 2012
* ATR Intelligent Robotics and Communication Laboratories, Japan
*
* 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 jp.atr.unr.pf.gui;
import java.awt.Color;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import processing.core.PApplet;
import ros.Ros;
import edu.tum.cs.ias.knowrob.prolog.PrologInterface;
import edu.tum.cs.ias.knowrob.prolog.PrologQueryUtils;
/**
* Main class of the teleoperation interface combining knowledge from
* RoboEarth with execution based on the UNR-Platform.
*
* @author Moritz Tenorth, [email protected]
*
*/
public class KnowRobGuiMain extends PApplet implements MouseListener, MouseMotionListener {
private static final long serialVersionUID = 3248733082317739051L;
private static Ros ros;
protected String mapOwlFile = "";
protected String recipeOwlFile = "";
protected KnowRobGuiApplet gui;
// protected UnrExecutive executive=null;
private String recipeClass;
private String recipeURL = null;
private String mapInstance;
private String mapURL = null;
/**
* Initialization: start Prolog engine and set up the GUI.
*/
public void setup () {
size(1250, 750, P2D);
frameRate(10);
background(40);
//initLocalProlog("prolog/init.pl");
- PrologInterface.initJPLProlog("re_comm");
+ PrologInterface.initJPLProlog("mod_vis");
new jpl.Query("use_module(library('knowrob_coordinates'))").oneSolution();
new jpl.Query("use_module(library('comp_similarity'))").oneSolution();
if (this.frame != null)
{
this.frame.setTitle("UNR teleoperation console");
this.frame.setBackground(new Color(40, 40, 40));
this.frame.setResizable(true);
}
gui = new KnowRobGuiApplet();
gui.setFrame(this.frame);
gui.setOperatorMain(this);
gui.init();
gui.setBounds(0, 0, 1250,750);
this.add(gui);
// ROS initialization only needed for communication visualization
// initRos();
}
public void draw() {
background(40);
}
/**
* Thread-safe ROS initialization
*/
protected static void initRos() {
ros = Ros.getInstance();
if(!ros.isInitialized()) {
ros.init("knowrob_re_client");
}
}
//
// /**
// * Start the UNR-PF execution engine and connect to the platform.
// */
// public void startExecutionEngine() {
//
// try {
//
// executive = new UnrExecutive();
//
// vis = new PlanVisActionVisualizer(gui.planvis);
// executive.setVis(vis);
// executive.setNotificationListener(gui);
//
// executive.initUnrInterface();
//
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
//
// /**
// * Stop the UNR-PF engine and disconnect from the platform.
// */
// public void stopExecutionEngine() {
// try {
// executive.resetUnrInterface();
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
//
// /**
// * Execute the current recipe (as stored in the recipeClass field)
// * using the UNR Platform.
// */
// public void executeRecipeClass() {
//
// try {
//
// // synchronize Prolog knowledge base with current recipe editor state
// gui.planvis.getCurrTask().setSaveToProlog(true);
// gui.planvis.getCurrTask().writeToProlog();
//
// if(executive != null)
// executive.executeRecipeClass(gui.planvis.getCurrTask().getIRI());
//
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
/**
* Set the internal field storing the current map OWL file, and load this OWL file
* into the Prolog engine and the visualization.
*
* @param mapOwlFile File name to be loaded
* @param url URL of the map in RoboEarth, or null if not applicable
* @param streetName
* @param streetNumber
* @param floorNumber
* @param roomNumber
*/
public void setMapOwlFile(String mapOwlFile, String url, String roomNumber, String floorNumber, String streetNumber, String streetName) {
this.mapOwlFile = mapOwlFile;
gui.map_forms.loadInputFile(mapOwlFile);
this.mapInstance = PrologInterface.removeSingleQuotes(PrologQueryUtils.getSemanticMapInstance(roomNumber, floorNumber, streetNumber, streetName));
this.mapURL = url;
}
/**
* Set the internal field storing the current recipe OWL file, and load this OWL file
* into the Prolog engine and the visualization.
*
* @param recipeOwlFile File name to be loaded
* @param url URL of the action recipe in RoboEarth, or null if not applicable
*/
public void setRecipeOwlFile(String recipeOwlFile, String command, String url) {
PrologQueryUtils.parseOwlFile(recipeOwlFile);
this.recipeOwlFile = recipeOwlFile;
this.recipeClass = PrologInterface.removeSingleQuotes(PrologQueryUtils.readRecipeClass(command));
this.recipeURL = url;
gui.planvis.loadPrologPlan(recipeClass);
gui.planvis.drawActionsTreeLayout();
gui.planvis.redraw();
}
/**
* Get the file name of the OWL file describing the currently loaded action recipe
*
* @return File name of the recipe OWL file
*/
public String getRecipeOwlFile() {
return recipeOwlFile;
}
public String getRecipeURL() {
return recipeURL;
}
public void setRecipeURL(String recipeURL) {
this.recipeURL = recipeURL;
}
/**
* Get the file name of the OWL file describing the currently loaded semantic map
*
* @return File name of the map OWL file
*/
public String getMapOwlFile() {
return mapOwlFile;
}
public String getMapURL() {
return mapURL;
}
public void setMapURL(String mapURL) {
this.mapURL = mapURL;
}
public String getMapInstance() {
return mapInstance;
}
public void setMapInstance(String mapInstance) {
this.mapInstance = mapInstance;
}
public static void main(String args[]) {
PApplet.main(new String[] { "jp.atr.unr.pf.gui.KnowRobGuiMain" });
}
}
| true | true | public void setup () {
size(1250, 750, P2D);
frameRate(10);
background(40);
//initLocalProlog("prolog/init.pl");
PrologInterface.initJPLProlog("re_comm");
new jpl.Query("use_module(library('knowrob_coordinates'))").oneSolution();
new jpl.Query("use_module(library('comp_similarity'))").oneSolution();
if (this.frame != null)
{
this.frame.setTitle("UNR teleoperation console");
this.frame.setBackground(new Color(40, 40, 40));
this.frame.setResizable(true);
}
gui = new KnowRobGuiApplet();
gui.setFrame(this.frame);
gui.setOperatorMain(this);
gui.init();
gui.setBounds(0, 0, 1250,750);
this.add(gui);
// ROS initialization only needed for communication visualization
// initRos();
}
| public void setup () {
size(1250, 750, P2D);
frameRate(10);
background(40);
//initLocalProlog("prolog/init.pl");
PrologInterface.initJPLProlog("mod_vis");
new jpl.Query("use_module(library('knowrob_coordinates'))").oneSolution();
new jpl.Query("use_module(library('comp_similarity'))").oneSolution();
if (this.frame != null)
{
this.frame.setTitle("UNR teleoperation console");
this.frame.setBackground(new Color(40, 40, 40));
this.frame.setResizable(true);
}
gui = new KnowRobGuiApplet();
gui.setFrame(this.frame);
gui.setOperatorMain(this);
gui.init();
gui.setBounds(0, 0, 1250,750);
this.add(gui);
// ROS initialization only needed for communication visualization
// initRos();
}
|
diff --git a/vagrant/src/org/netbeans/modules/vagrant/boxes/VagrantBoxesSupport.java b/vagrant/src/org/netbeans/modules/vagrant/boxes/VagrantBoxesSupport.java
index 6093bfa..20d01f8 100644
--- a/vagrant/src/org/netbeans/modules/vagrant/boxes/VagrantBoxesSupport.java
+++ b/vagrant/src/org/netbeans/modules/vagrant/boxes/VagrantBoxesSupport.java
@@ -1,151 +1,157 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright 2013 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
* Development and Distribution License("CDDL") (collectively, the
* "License"). You may not use this file except in compliance with the
* License. You can obtain a copy of the License at
* http://www.netbeans.org/cddl-gplv2.html
* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
* If you wish your version of this file to be governed by only the CDDL
* or only the GPL Version 2, indicate your decision by adding
* "[Contributor] elects to include this software in this distribution
* under the [CDDL or GPL Version 2] license." If you do not indicate a
* single choice of license, a recipient has the option to distribute
* your version of this file under either the CDDL, the GPL Version 2 or
* to extend the choice of license to its licensees as provided above.
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
*
* Contributor(s):
*
* Portions Copyrighted 2013 Sun Microsystems, Inc.
*/
package org.netbeans.modules.vagrant.boxes;
import java.io.IOException;
import java.nio.charset.IllegalCharsetNameException;
import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.netbeans.modules.vagrant.options.VagrantOptions;
/**
*
* @author junichi11
*/
public final class VagrantBoxesSupport {
public static final String OFFICIAL_BOXES_URL = "https://github.com/mitchellh/vagrant/wiki/Available-Vagrant-Boxes"; // NOI18N
public static final String COMMUNITY_BOXES_URL = "http://vagrantbox.es"; // NOI18N
private static final Logger LOGGER = Logger.getLogger(VagrantBoxesSupport.class.getName());
private VagrantBoxesSupport() {
}
/**
* Get all boxes. (official and community)
*
* @return boxes.
*/
public static List<VagrantBoxItem> getBoxes() {
List<VagrantBoxItem> boxes = getOfficialBoxes();
boxes.addAll(getCommunityBoxes());
return boxes;
}
/**
* Get community boxes.
*
* @return boxes
*/
public static List<VagrantBoxItem> getCommunityBoxes() {
LinkedList<VagrantBoxItem> boxes = new LinkedList<VagrantBoxItem>();
String boxesUrl = VagrantOptions.getInstance().getBoxesUrl();
try {
// parse HTML
Document doc = Jsoup.connect(boxesUrl).get();
Elements ths = doc.select("thead th"); // NOI18N
if (!isBoxesTable(ths)) {
return boxes;
}
Elements trs = doc.select("tbody tr"); // NOI18N
for (Element tr : trs) {
- String name = tr.child(0).text().trim();
- String provider = tr.child(1).text().trim();
- String url = tr.child(2).text().trim();
- String size = tr.child(3).text().trim();
+ // #22
+ Elements tds = tr.select("td"); // NOI18N
+ int childSize = tds.size();
+ String name = childSize >= 1 ? tr.child(0).text().trim() : ""; // NOI18N
+ if (name.isEmpty()) {
+ continue;
+ }
+ String provider = childSize >= 2 ? tr.child(1).text().trim() : ""; // NOI18N
+ String url = childSize >= 3 ? tr.child(2).text().trim() : ""; // NOI18N
+ String size = childSize >= 4 ? tr.child(3).text().trim() : ""; // NOI18N
boxes.add(new VagrantBoxItem(name, provider, url, size));
}
} catch (IllegalCharsetNameException ex) {
// TODO report an issue
} catch (IOException ex) {
LOGGER.log(Level.WARNING, "connect failed:{0}", boxesUrl);
}
return boxes;
}
/**
* Get official boxes.
*
* @return boxes
*/
public static List<VagrantBoxItem> getOfficialBoxes() {
LinkedList<VagrantBoxItem> boxes = new LinkedList<VagrantBoxItem>();
try {
// parse HTML
Document doc = Jsoup.connect(OFFICIAL_BOXES_URL).get();
Elements links = doc.select(".markdown-body a"); // NOI18N
for (Element link : links) {
String url = link.attr("href"); // NOI18N
if (!url.endsWith(".box")) { // NOI18N
continue;
}
String name = "[Official] " + link.text().trim(); // NOI18N
String provider = url.contains("vmware_fusion") ? "VMware Fusion" : "VirtualBox"; // NOI18N
boxes.add(new VagrantBoxItem(name, provider, url, "")); // NOI18N
}
} catch (IOException ex) {
LOGGER.log(Level.WARNING, "connect failed:" + OFFICIAL_BOXES_URL);
}
return boxes;
}
private static boolean isBoxesTable(Elements ths) {
int thSize = ths.size();
if (thSize != 4) {
return false;
}
return ths.get(0).text().trim().toLowerCase().equals("name") // NOI18N
&& ths.get(1).text().trim().toLowerCase().equals("provider") // NOI18N
&& ths.get(2).text().trim().toLowerCase().equals("url") // NOI18N
&& ths.get(3).text().trim().toLowerCase().equals("size"); // NOI18N
}
}
| true | true | public static List<VagrantBoxItem> getCommunityBoxes() {
LinkedList<VagrantBoxItem> boxes = new LinkedList<VagrantBoxItem>();
String boxesUrl = VagrantOptions.getInstance().getBoxesUrl();
try {
// parse HTML
Document doc = Jsoup.connect(boxesUrl).get();
Elements ths = doc.select("thead th"); // NOI18N
if (!isBoxesTable(ths)) {
return boxes;
}
Elements trs = doc.select("tbody tr"); // NOI18N
for (Element tr : trs) {
String name = tr.child(0).text().trim();
String provider = tr.child(1).text().trim();
String url = tr.child(2).text().trim();
String size = tr.child(3).text().trim();
boxes.add(new VagrantBoxItem(name, provider, url, size));
}
} catch (IllegalCharsetNameException ex) {
// TODO report an issue
} catch (IOException ex) {
LOGGER.log(Level.WARNING, "connect failed:{0}", boxesUrl);
}
return boxes;
}
| public static List<VagrantBoxItem> getCommunityBoxes() {
LinkedList<VagrantBoxItem> boxes = new LinkedList<VagrantBoxItem>();
String boxesUrl = VagrantOptions.getInstance().getBoxesUrl();
try {
// parse HTML
Document doc = Jsoup.connect(boxesUrl).get();
Elements ths = doc.select("thead th"); // NOI18N
if (!isBoxesTable(ths)) {
return boxes;
}
Elements trs = doc.select("tbody tr"); // NOI18N
for (Element tr : trs) {
// #22
Elements tds = tr.select("td"); // NOI18N
int childSize = tds.size();
String name = childSize >= 1 ? tr.child(0).text().trim() : ""; // NOI18N
if (name.isEmpty()) {
continue;
}
String provider = childSize >= 2 ? tr.child(1).text().trim() : ""; // NOI18N
String url = childSize >= 3 ? tr.child(2).text().trim() : ""; // NOI18N
String size = childSize >= 4 ? tr.child(3).text().trim() : ""; // NOI18N
boxes.add(new VagrantBoxItem(name, provider, url, size));
}
} catch (IllegalCharsetNameException ex) {
// TODO report an issue
} catch (IOException ex) {
LOGGER.log(Level.WARNING, "connect failed:{0}", boxesUrl);
}
return boxes;
}
|
diff --git a/src/test/java/org/odlabs/wiquery/ui/selectable/SelectableAjaxBehaviorTestCase.java b/src/test/java/org/odlabs/wiquery/ui/selectable/SelectableAjaxBehaviorTestCase.java
index 2e0a4bed..bf09293f 100644
--- a/src/test/java/org/odlabs/wiquery/ui/selectable/SelectableAjaxBehaviorTestCase.java
+++ b/src/test/java/org/odlabs/wiquery/ui/selectable/SelectableAjaxBehaviorTestCase.java
@@ -1,85 +1,85 @@
/*
* Copyright (c) 2009 WiQuery team
*
* 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 org.odlabs.wiquery.ui.selectable;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.junit.Test;
import org.odlabs.wiquery.tester.WiQueryTestCase;
/**
* Test on {@link SelectableAjaxBehavior}
*
* @author Julien Roche
*/
public class SelectableAjaxBehaviorTestCase extends WiQueryTestCase {
/**
* Test method for
* {@link org.odlabs.wiquery.ui.selectable.SelectableAjaxBehavior#statement()}
* .
*/
@Test
public void testStatement() {
InnerSelectableAjaxBehavior selectableAjaxBehavior = new InnerSelectableAjaxBehavior();
WebMarkupContainer component = new WebMarkupContainer("anId");
component.setMarkupId("anId");
component.add(selectableAjaxBehavior);
WebPage webPage = new InnerPage();
webPage.add(component);
String genrateAjaxStatment = selectableAjaxBehavior.statement()
.render().toString();
String expectedAjaxStatement = "$('#anId').selectable({stop: function(event, ui) {\n\t"
- + "var selected = new Array();jQuery.each($('#anId').children(\"*[class*='ui-selected']\"), function(){selected.push($(this).attr('id'));});var wcall=wicketAjaxGet('?wicket:interface=:0:anId::IActivePageBehaviorListener:0:&wicket:ignoreIfNotActive=true&selectedArray='+ jQuery.unique(selected).toString(),function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('anId') != null;}.bind(this));\n"
+ + "var selected = new Array();jQuery.each($('#anId').find(\".ui-selectee.ui-selected\"), function(){selected.push($(this).attr('id'));});var wcall=wicketAjaxGet('?wicket:interface=:0:anId::IActivePageBehaviorListener:0:&wicket:ignoreIfNotActive=true&selectedArray='+ jQuery.unique(selected).toString(),function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('anId') != null;}.bind(this));\n"
+ "}});";
assertNotNull(selectableAjaxBehavior.getSelectableBehavior());
assertEquals(genrateAjaxStatment, expectedAjaxStatement);
}
private class InnerSelectableAjaxBehavior extends SelectableAjaxBehavior {
private static final long serialVersionUID = 1L;
/**
* {@inheritDoc}
*
* @see org.odlabs.wiquery.ui.selectable.SelectableAjaxBehavior#onSelection(org.apache.wicket.Component[],
* org.apache.wicket.ajax.AjaxRequestTarget)
*/
@Override
public void onSelection(Component[] components,
AjaxRequestTarget ajaxRequestTarget) {
// TODO Auto-generated method stub
}
}
private class InnerPage extends WebPage {
}
}
| true | true | public void testStatement() {
InnerSelectableAjaxBehavior selectableAjaxBehavior = new InnerSelectableAjaxBehavior();
WebMarkupContainer component = new WebMarkupContainer("anId");
component.setMarkupId("anId");
component.add(selectableAjaxBehavior);
WebPage webPage = new InnerPage();
webPage.add(component);
String genrateAjaxStatment = selectableAjaxBehavior.statement()
.render().toString();
String expectedAjaxStatement = "$('#anId').selectable({stop: function(event, ui) {\n\t"
+ "var selected = new Array();jQuery.each($('#anId').children(\"*[class*='ui-selected']\"), function(){selected.push($(this).attr('id'));});var wcall=wicketAjaxGet('?wicket:interface=:0:anId::IActivePageBehaviorListener:0:&wicket:ignoreIfNotActive=true&selectedArray='+ jQuery.unique(selected).toString(),function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('anId') != null;}.bind(this));\n"
+ "}});";
assertNotNull(selectableAjaxBehavior.getSelectableBehavior());
assertEquals(genrateAjaxStatment, expectedAjaxStatement);
}
| public void testStatement() {
InnerSelectableAjaxBehavior selectableAjaxBehavior = new InnerSelectableAjaxBehavior();
WebMarkupContainer component = new WebMarkupContainer("anId");
component.setMarkupId("anId");
component.add(selectableAjaxBehavior);
WebPage webPage = new InnerPage();
webPage.add(component);
String genrateAjaxStatment = selectableAjaxBehavior.statement()
.render().toString();
String expectedAjaxStatement = "$('#anId').selectable({stop: function(event, ui) {\n\t"
+ "var selected = new Array();jQuery.each($('#anId').find(\".ui-selectee.ui-selected\"), function(){selected.push($(this).attr('id'));});var wcall=wicketAjaxGet('?wicket:interface=:0:anId::IActivePageBehaviorListener:0:&wicket:ignoreIfNotActive=true&selectedArray='+ jQuery.unique(selected).toString(),function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('anId') != null;}.bind(this));\n"
+ "}});";
assertNotNull(selectableAjaxBehavior.getSelectableBehavior());
assertEquals(genrateAjaxStatment, expectedAjaxStatement);
}
|
diff --git a/examples/Java/identity.java b/examples/Java/identity.java
index df8552bd..07e75ab4 100644
--- a/examples/Java/identity.java
+++ b/examples/Java/identity.java
@@ -1,36 +1,36 @@
import org.zeromq.ZMQ;
import org.zeromq.ZMQ.Context;
import org.zeromq.ZMQ.Socket;
/**
* Demonstrate identities as used by the request-reply pattern.
*/
public class identity {
public static void main (String[] args) throws InterruptedException {
Context context = ZMQ.context(1);
Socket sink = context.socket(ZMQ.ROUTER);
sink.bind("inproc://example");
// First allow 0MQ to set the identity, [00] + random 4byte
Socket anonymous = context.socket(ZMQ.REQ);
anonymous.connect("inproc://example");
anonymous.send ("ROUTER uses a generated UUID",0);
ZHelper.dump (sink);
// Then set the identity ourself
Socket identified = context.socket(ZMQ.REQ);
- identified.setIdentity("Hello".getBytes ());
+ identified.setIdentity("PEER2".getBytes ());
identified.connect ("inproc://example");
- identified.send("ROUTER socket uses REQ's socket identity", 0);
+ identified.send("ROUTER uses REQ's socket identity", 0);
ZHelper.dump (sink);
sink.close ();
anonymous.close ();
identified.close();
context.term();
}
}
| false | true | public static void main (String[] args) throws InterruptedException {
Context context = ZMQ.context(1);
Socket sink = context.socket(ZMQ.ROUTER);
sink.bind("inproc://example");
// First allow 0MQ to set the identity, [00] + random 4byte
Socket anonymous = context.socket(ZMQ.REQ);
anonymous.connect("inproc://example");
anonymous.send ("ROUTER uses a generated UUID",0);
ZHelper.dump (sink);
// Then set the identity ourself
Socket identified = context.socket(ZMQ.REQ);
identified.setIdentity("Hello".getBytes ());
identified.connect ("inproc://example");
identified.send("ROUTER socket uses REQ's socket identity", 0);
ZHelper.dump (sink);
sink.close ();
anonymous.close ();
identified.close();
context.term();
}
| public static void main (String[] args) throws InterruptedException {
Context context = ZMQ.context(1);
Socket sink = context.socket(ZMQ.ROUTER);
sink.bind("inproc://example");
// First allow 0MQ to set the identity, [00] + random 4byte
Socket anonymous = context.socket(ZMQ.REQ);
anonymous.connect("inproc://example");
anonymous.send ("ROUTER uses a generated UUID",0);
ZHelper.dump (sink);
// Then set the identity ourself
Socket identified = context.socket(ZMQ.REQ);
identified.setIdentity("PEER2".getBytes ());
identified.connect ("inproc://example");
identified.send("ROUTER uses REQ's socket identity", 0);
ZHelper.dump (sink);
sink.close ();
anonymous.close ();
identified.close();
context.term();
}
|
diff --git a/DistFileSystem/src/distserver/ServCheckPosition.java b/DistFileSystem/src/distserver/ServCheckPosition.java
index 990daf0..32af7d3 100644
--- a/DistFileSystem/src/distserver/ServCheckPosition.java
+++ b/DistFileSystem/src/distserver/ServCheckPosition.java
@@ -1,180 +1,178 @@
/**
* @author paul
*/
package distserver;
import distconfig.ConnectionCodes;
import distconfig.DistConfig;
import distnodelisting.NodeSearchTable;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.ObjectOutputStream;
import java.io.PrintWriter;
import java.net.Socket;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
* Checks the clients position in the network
* @author paul
*/
public class ServCheckPosition implements Runnable {
private Socket client = null;
private DistConfig distConfig = null;
/**
*
* @param cli : The socket to which the client is connected
*/
public ServCheckPosition (Socket cli) {
this.client = cli;
}
/**
* Checks the position of the client
* If it is in the correct location, the server sends the new client
* its new predecessor ID and IP and new successor ID and IP
*/
@Override
public void run() {
try {
System.out.println("In thread for check position");
this.distConfig = DistConfig.get_Instance();
// Get the input stream for the client
BufferedReader inStream = new BufferedReader (
new InputStreamReader(client.getInputStream()));
System.out.println("Got the input stream");
// Get the output stream for the client
BufferedOutputStream bos = new BufferedOutputStream (
client.getOutputStream());
// Setup the writer to the client
PrintWriter outStream = new PrintWriter(bos, false);
System.out.println("Got the out stream");
// Setup the object writer to the client
ObjectOutputStream oos = new ObjectOutputStream (bos);
System.out.println("Got the object output stream");
// Send an acknowledgment that the server is connected
// for checking the position
System.out.println("Sending the connection code");
outStream.println(ConnectionCodes.CHECKPOSITION);
outStream.flush();
// Receive the new node's ID
System.out.println("Waiting for node ID");
String newNodeID = (String)inStream.readLine();
int newID = Integer.parseInt(newNodeID);
System.out.printf("Recieved ID as %d\n", newID);
+ System.out.flush();
NodeSearchTable dct = NodeSearchTable.get_Instance();
// Get own ID
int id = Integer.parseInt(dct.get_ownID());
// If own ID = the new nodes ID, create a new ID for it
if (newID == id) {
newID = (newID + 1) % distConfig.get_MaxNodes();
- System.out.println("Sending NewID");
- System.out.flush();
outStream.println(ConnectionCodes.NEWID);
outStream.flush();
System.out.println("Sending ID as " + Integer.toString(newID));
System.out.flush();
outStream.println(Integer.toString(newID));
outStream.flush();
- System.out.println("Finished with new node ID");
- System.out.flush();
// Now continue with the check
}
- System.out.printf("Own ID: %d\tPred ID: %d", id, Integer.parseInt(dct.get_predecessorID()));
+ System.out.printf("Own ID: %d\tPred ID: %d\n", id, Integer.parseInt(dct.get_predecessorID()));
+ System.out.flush();
// Check if the new node's ID is between the current ID and the next
int nextID = Integer.parseInt(dct.get_IDAt(0));
// If the new ID is between this ID and the next
if ((id < newID && newID < nextID) ||
(nextID < id && id < newID) ||
(newID < nextID && nextID < id) ||
(nextID == id)) {
// Send CORRECTPOSITION message
outStream.println(ConnectionCodes.CORRECTPOSITION);
outStream.flush();
// Send the string array of this id and ip
String[] ownInfo = { Integer.toString(id),
dct.get_ownIPAddress() };
oos.writeObject(ownInfo);
// Send the string array of the next id and ip
String[] nextInfo = { Integer.toString(nextID),
dct.get_IPAt(0) };
oos.writeObject(nextInfo);
// flush the output stream
oos.flush();
}
// Else, discover what two nodes it is between
else {
System.out.println("Not Correct Position");
// Check to see which two ID's in the connection table
// the new client ID is between
// First, use this server's ID as the starting point
String ipAddress = dct.get_ownIPAddress();
id = Integer.parseInt(dct.get_ownID());
boolean found = false;
// Now loop through all of the ID's and check if the new
// ID lies between them
for (int index = 0; index < dct.size(); index++) {
// Get the next ID
nextID = Integer.parseInt(dct.get_IDAt(index));
// Test if the new client is greater than or equal to the
// previous ID and less than the nextID
if (newID >= id && newID < nextID) {
found = true;
}
// Test if the new client is greater than or equal to the
// previous ID and greater than the next ID
else if (id > nextID && newID >= id && newID > nextID) {
found = true;
}
// Test if the new client is less than or equal to the
// previous ID and less than the next ID
else if (id > nextID && newID <= id && newID < nextID) {
found = true;
}
// If it is not between the two, set the id to the next
// id and the ip address to the next ip address
if (!found) {
id = nextID;
ipAddress = dct.get_IPAt(index);
}
}
// Once found, send the wrong position message
outStream.println(ConnectionCodes.WRONGPOSITION);
// Send the new ID and IP of the next node to check
outStream.println(Integer.toString(id));
outStream.println(ipAddress);
outStream.flush();
}
oos.close();
outStream.close();
bos.close();
inStream.close();
client.close();
}
catch (IOException ex) {
Logger.getLogger(ServCheckPosition.class.getName()).log(Level.SEVERE, null, ex);
}
}
}
| false | true | public void run() {
try {
System.out.println("In thread for check position");
this.distConfig = DistConfig.get_Instance();
// Get the input stream for the client
BufferedReader inStream = new BufferedReader (
new InputStreamReader(client.getInputStream()));
System.out.println("Got the input stream");
// Get the output stream for the client
BufferedOutputStream bos = new BufferedOutputStream (
client.getOutputStream());
// Setup the writer to the client
PrintWriter outStream = new PrintWriter(bos, false);
System.out.println("Got the out stream");
// Setup the object writer to the client
ObjectOutputStream oos = new ObjectOutputStream (bos);
System.out.println("Got the object output stream");
// Send an acknowledgment that the server is connected
// for checking the position
System.out.println("Sending the connection code");
outStream.println(ConnectionCodes.CHECKPOSITION);
outStream.flush();
// Receive the new node's ID
System.out.println("Waiting for node ID");
String newNodeID = (String)inStream.readLine();
int newID = Integer.parseInt(newNodeID);
System.out.printf("Recieved ID as %d\n", newID);
NodeSearchTable dct = NodeSearchTable.get_Instance();
// Get own ID
int id = Integer.parseInt(dct.get_ownID());
// If own ID = the new nodes ID, create a new ID for it
if (newID == id) {
newID = (newID + 1) % distConfig.get_MaxNodes();
System.out.println("Sending NewID");
System.out.flush();
outStream.println(ConnectionCodes.NEWID);
outStream.flush();
System.out.println("Sending ID as " + Integer.toString(newID));
System.out.flush();
outStream.println(Integer.toString(newID));
outStream.flush();
System.out.println("Finished with new node ID");
System.out.flush();
// Now continue with the check
}
System.out.printf("Own ID: %d\tPred ID: %d", id, Integer.parseInt(dct.get_predecessorID()));
// Check if the new node's ID is between the current ID and the next
int nextID = Integer.parseInt(dct.get_IDAt(0));
// If the new ID is between this ID and the next
if ((id < newID && newID < nextID) ||
(nextID < id && id < newID) ||
(newID < nextID && nextID < id) ||
(nextID == id)) {
// Send CORRECTPOSITION message
outStream.println(ConnectionCodes.CORRECTPOSITION);
outStream.flush();
// Send the string array of this id and ip
String[] ownInfo = { Integer.toString(id),
dct.get_ownIPAddress() };
oos.writeObject(ownInfo);
// Send the string array of the next id and ip
String[] nextInfo = { Integer.toString(nextID),
dct.get_IPAt(0) };
oos.writeObject(nextInfo);
// flush the output stream
oos.flush();
}
// Else, discover what two nodes it is between
else {
System.out.println("Not Correct Position");
// Check to see which two ID's in the connection table
// the new client ID is between
// First, use this server's ID as the starting point
String ipAddress = dct.get_ownIPAddress();
id = Integer.parseInt(dct.get_ownID());
boolean found = false;
// Now loop through all of the ID's and check if the new
// ID lies between them
for (int index = 0; index < dct.size(); index++) {
// Get the next ID
nextID = Integer.parseInt(dct.get_IDAt(index));
// Test if the new client is greater than or equal to the
// previous ID and less than the nextID
if (newID >= id && newID < nextID) {
found = true;
}
// Test if the new client is greater than or equal to the
// previous ID and greater than the next ID
else if (id > nextID && newID >= id && newID > nextID) {
found = true;
}
// Test if the new client is less than or equal to the
// previous ID and less than the next ID
else if (id > nextID && newID <= id && newID < nextID) {
found = true;
}
// If it is not between the two, set the id to the next
// id and the ip address to the next ip address
if (!found) {
id = nextID;
ipAddress = dct.get_IPAt(index);
}
}
// Once found, send the wrong position message
outStream.println(ConnectionCodes.WRONGPOSITION);
// Send the new ID and IP of the next node to check
outStream.println(Integer.toString(id));
outStream.println(ipAddress);
outStream.flush();
}
oos.close();
outStream.close();
bos.close();
inStream.close();
client.close();
}
catch (IOException ex) {
Logger.getLogger(ServCheckPosition.class.getName()).log(Level.SEVERE, null, ex);
}
}
| public void run() {
try {
System.out.println("In thread for check position");
this.distConfig = DistConfig.get_Instance();
// Get the input stream for the client
BufferedReader inStream = new BufferedReader (
new InputStreamReader(client.getInputStream()));
System.out.println("Got the input stream");
// Get the output stream for the client
BufferedOutputStream bos = new BufferedOutputStream (
client.getOutputStream());
// Setup the writer to the client
PrintWriter outStream = new PrintWriter(bos, false);
System.out.println("Got the out stream");
// Setup the object writer to the client
ObjectOutputStream oos = new ObjectOutputStream (bos);
System.out.println("Got the object output stream");
// Send an acknowledgment that the server is connected
// for checking the position
System.out.println("Sending the connection code");
outStream.println(ConnectionCodes.CHECKPOSITION);
outStream.flush();
// Receive the new node's ID
System.out.println("Waiting for node ID");
String newNodeID = (String)inStream.readLine();
int newID = Integer.parseInt(newNodeID);
System.out.printf("Recieved ID as %d\n", newID);
System.out.flush();
NodeSearchTable dct = NodeSearchTable.get_Instance();
// Get own ID
int id = Integer.parseInt(dct.get_ownID());
// If own ID = the new nodes ID, create a new ID for it
if (newID == id) {
newID = (newID + 1) % distConfig.get_MaxNodes();
outStream.println(ConnectionCodes.NEWID);
outStream.flush();
System.out.println("Sending ID as " + Integer.toString(newID));
System.out.flush();
outStream.println(Integer.toString(newID));
outStream.flush();
// Now continue with the check
}
System.out.printf("Own ID: %d\tPred ID: %d\n", id, Integer.parseInt(dct.get_predecessorID()));
System.out.flush();
// Check if the new node's ID is between the current ID and the next
int nextID = Integer.parseInt(dct.get_IDAt(0));
// If the new ID is between this ID and the next
if ((id < newID && newID < nextID) ||
(nextID < id && id < newID) ||
(newID < nextID && nextID < id) ||
(nextID == id)) {
// Send CORRECTPOSITION message
outStream.println(ConnectionCodes.CORRECTPOSITION);
outStream.flush();
// Send the string array of this id and ip
String[] ownInfo = { Integer.toString(id),
dct.get_ownIPAddress() };
oos.writeObject(ownInfo);
// Send the string array of the next id and ip
String[] nextInfo = { Integer.toString(nextID),
dct.get_IPAt(0) };
oos.writeObject(nextInfo);
// flush the output stream
oos.flush();
}
// Else, discover what two nodes it is between
else {
System.out.println("Not Correct Position");
// Check to see which two ID's in the connection table
// the new client ID is between
// First, use this server's ID as the starting point
String ipAddress = dct.get_ownIPAddress();
id = Integer.parseInt(dct.get_ownID());
boolean found = false;
// Now loop through all of the ID's and check if the new
// ID lies between them
for (int index = 0; index < dct.size(); index++) {
// Get the next ID
nextID = Integer.parseInt(dct.get_IDAt(index));
// Test if the new client is greater than or equal to the
// previous ID and less than the nextID
if (newID >= id && newID < nextID) {
found = true;
}
// Test if the new client is greater than or equal to the
// previous ID and greater than the next ID
else if (id > nextID && newID >= id && newID > nextID) {
found = true;
}
// Test if the new client is less than or equal to the
// previous ID and less than the next ID
else if (id > nextID && newID <= id && newID < nextID) {
found = true;
}
// If it is not between the two, set the id to the next
// id and the ip address to the next ip address
if (!found) {
id = nextID;
ipAddress = dct.get_IPAt(index);
}
}
// Once found, send the wrong position message
outStream.println(ConnectionCodes.WRONGPOSITION);
// Send the new ID and IP of the next node to check
outStream.println(Integer.toString(id));
outStream.println(ipAddress);
outStream.flush();
}
oos.close();
outStream.close();
bos.close();
inStream.close();
client.close();
}
catch (IOException ex) {
Logger.getLogger(ServCheckPosition.class.getName()).log(Level.SEVERE, null, ex);
}
}
|
diff --git a/src/me/comp/cPlugin/PlayerListener.java b/src/me/comp/cPlugin/PlayerListener.java
index 8a397a2..b1fcbab 100644
--- a/src/me/comp/cPlugin/PlayerListener.java
+++ b/src/me/comp/cPlugin/PlayerListener.java
@@ -1,59 +1,61 @@
package me.comp.cPlugin;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
public class PlayerListener implements Listener {
Main plugin;
public PlayerListener(Main instance){
plugin = instance;
}
@EventHandler
public void onPlayerJoin(PlayerJoinEvent e){
//define string, constants, and other.
String modsMessage = ChatColor.RED + "This string is for mod news";
String retModMessage = ChatColor.RED + "This string is for retired mod news";
Player player = e.getPlayer();
GameMode gamemode = player.getGameMode();
String buversio = Bukkit.getBukkitVersion();
+ String conmess = plugin.getConfig().getString("message");
//mod list string.
boolean mod = player.getName().equalsIgnoreCase("bluedawn76");
mod = player.getName().equalsIgnoreCase("reapersheart");
mod = player.getName().equalsIgnoreCase("computerxpds");
mod = player.getName().equalsIgnoreCase("kirresson");
mod = player.getName().equalsIgnoreCase("telstar86");
mod = player.getName().equalsIgnoreCase("w00lly");
//retired mod string.
boolean retmod = player.getName().equalsIgnoreCase("");
retmod = player.getName().equalsIgnoreCase("");
//fires messages when I join (I being computerxpds)
if(player.getName().equalsIgnoreCase("computerxpds")){
player.sendMessage(ChatColor.RED + "Welcome to the server, comp!");
player.sendMessage(ChatColor.BLUE + "Your gamemode is " + gamemode);
player.sendMessage(ChatColor.GREEN + "Bukkit version is " + buversio);
player.sendMessage(ChatColor.AQUA + "The Current world is " + player.getWorld());
player.sendMessage(plugin.getConfig().getString("Message.to.send"));
+ player.sendMessage(conmess);
}
//fires off when a mod joins.
if(mod){
player.sendMessage(ChatColor.RED + modsMessage);
}
if(retmod){
player.sendMessage(ChatColor.RED + retModMessage);
}
}
}
| false | true | public void onPlayerJoin(PlayerJoinEvent e){
//define string, constants, and other.
String modsMessage = ChatColor.RED + "This string is for mod news";
String retModMessage = ChatColor.RED + "This string is for retired mod news";
Player player = e.getPlayer();
GameMode gamemode = player.getGameMode();
String buversio = Bukkit.getBukkitVersion();
//mod list string.
boolean mod = player.getName().equalsIgnoreCase("bluedawn76");
mod = player.getName().equalsIgnoreCase("reapersheart");
mod = player.getName().equalsIgnoreCase("computerxpds");
mod = player.getName().equalsIgnoreCase("kirresson");
mod = player.getName().equalsIgnoreCase("telstar86");
mod = player.getName().equalsIgnoreCase("w00lly");
//retired mod string.
boolean retmod = player.getName().equalsIgnoreCase("");
retmod = player.getName().equalsIgnoreCase("");
//fires messages when I join (I being computerxpds)
if(player.getName().equalsIgnoreCase("computerxpds")){
player.sendMessage(ChatColor.RED + "Welcome to the server, comp!");
player.sendMessage(ChatColor.BLUE + "Your gamemode is " + gamemode);
player.sendMessage(ChatColor.GREEN + "Bukkit version is " + buversio);
player.sendMessage(ChatColor.AQUA + "The Current world is " + player.getWorld());
player.sendMessage(plugin.getConfig().getString("Message.to.send"));
}
//fires off when a mod joins.
if(mod){
player.sendMessage(ChatColor.RED + modsMessage);
}
if(retmod){
player.sendMessage(ChatColor.RED + retModMessage);
}
}
| public void onPlayerJoin(PlayerJoinEvent e){
//define string, constants, and other.
String modsMessage = ChatColor.RED + "This string is for mod news";
String retModMessage = ChatColor.RED + "This string is for retired mod news";
Player player = e.getPlayer();
GameMode gamemode = player.getGameMode();
String buversio = Bukkit.getBukkitVersion();
String conmess = plugin.getConfig().getString("message");
//mod list string.
boolean mod = player.getName().equalsIgnoreCase("bluedawn76");
mod = player.getName().equalsIgnoreCase("reapersheart");
mod = player.getName().equalsIgnoreCase("computerxpds");
mod = player.getName().equalsIgnoreCase("kirresson");
mod = player.getName().equalsIgnoreCase("telstar86");
mod = player.getName().equalsIgnoreCase("w00lly");
//retired mod string.
boolean retmod = player.getName().equalsIgnoreCase("");
retmod = player.getName().equalsIgnoreCase("");
//fires messages when I join (I being computerxpds)
if(player.getName().equalsIgnoreCase("computerxpds")){
player.sendMessage(ChatColor.RED + "Welcome to the server, comp!");
player.sendMessage(ChatColor.BLUE + "Your gamemode is " + gamemode);
player.sendMessage(ChatColor.GREEN + "Bukkit version is " + buversio);
player.sendMessage(ChatColor.AQUA + "The Current world is " + player.getWorld());
player.sendMessage(plugin.getConfig().getString("Message.to.send"));
player.sendMessage(conmess);
}
//fires off when a mod joins.
if(mod){
player.sendMessage(ChatColor.RED + modsMessage);
}
if(retmod){
player.sendMessage(ChatColor.RED + retModMessage);
}
}
|
diff --git a/ghana-national-functional-tests/src/main/java/org/motechproject/functional/base/FireFoxWebDriver.java b/ghana-national-functional-tests/src/main/java/org/motechproject/functional/base/FireFoxWebDriver.java
index bc19fe60..cd2e4844 100644
--- a/ghana-national-functional-tests/src/main/java/org/motechproject/functional/base/FireFoxWebDriver.java
+++ b/ghana-national-functional-tests/src/main/java/org/motechproject/functional/base/FireFoxWebDriver.java
@@ -1,26 +1,26 @@
package org.motechproject.functional.base;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.firefox.FirefoxBinary;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.firefox.FirefoxProfile;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.io.File;
@Component
public class FireFoxWebDriver extends BaseWebDriver {
@Value("#{functionalTestProperties['firefox.loc']}")
private String firefoxLocation;
@Value("#{functionalTestProperties['firefox.display']}")
private String firefoxDisplay;
public WebDriver getDriver() {
FirefoxBinary firefoxBinary = new FirefoxBinary(new File(firefoxLocation));
- firefoxBinary.setEnvironmentProperty("DISPLAY", System.getProperty("display", ":0.0"));
+ firefoxBinary.setEnvironmentProperty("DISPLAY", System.getProperty("functional.test.display", ":0.0"));
return new FirefoxDriver(firefoxBinary, new FirefoxProfile());
}
}
| true | true | public WebDriver getDriver() {
FirefoxBinary firefoxBinary = new FirefoxBinary(new File(firefoxLocation));
firefoxBinary.setEnvironmentProperty("DISPLAY", System.getProperty("display", ":0.0"));
return new FirefoxDriver(firefoxBinary, new FirefoxProfile());
}
| public WebDriver getDriver() {
FirefoxBinary firefoxBinary = new FirefoxBinary(new File(firefoxLocation));
firefoxBinary.setEnvironmentProperty("DISPLAY", System.getProperty("functional.test.display", ":0.0"));
return new FirefoxDriver(firefoxBinary, new FirefoxProfile());
}
|
diff --git a/OpERP/src/main/java/devopsdistilled/operp/client/commons/panes/ContactInfoPane.java b/OpERP/src/main/java/devopsdistilled/operp/client/commons/panes/ContactInfoPane.java
index 60486859..543bd273 100644
--- a/OpERP/src/main/java/devopsdistilled/operp/client/commons/panes/ContactInfoPane.java
+++ b/OpERP/src/main/java/devopsdistilled/operp/client/commons/panes/ContactInfoPane.java
@@ -1,179 +1,180 @@
package devopsdistilled.operp.client.commons.panes;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import net.miginfocom.swing.MigLayout;
import devopsdistilled.operp.client.abstracts.EntityOperation;
import devopsdistilled.operp.client.abstracts.EntityPane;
import devopsdistilled.operp.client.commons.controllers.ContactInfoController;
import devopsdistilled.operp.client.commons.panes.controllers.ContactInfoPaneController;
import devopsdistilled.operp.client.commons.panes.models.observers.ContactInfoPaneModelObserver;
import devopsdistilled.operp.server.data.entity.commons.ContactInfo;
import devopsdistilled.operp.server.data.entity.commons.PhoneType;
public class ContactInfoPane
extends
EntityPane<ContactInfo, ContactInfoController, ContactInfoPaneController>
implements ContactInfoPaneModelObserver {
private ContactInfoPaneController controller;
private final JPanel pane;
private final JTextField emailField;
private final JTextField workNumField;
private final JTextField mobileNumField;
private final JTextField homeNumField;
private JPanel addressPanel;
public ContactInfoPane() {
pane = new JPanel();
pane.setLayout(new MigLayout("", "[][grow]", "[][][][][][][][][]"));
JLabel lblAddress = new JLabel("Address");
pane.add(lblAddress, "flowx,cell 0 0");
addressPanel = new JPanel();
pane.add(addressPanel, "cell 0 1,grow,span");
JLabel lblEmail = new JLabel("Email");
pane.add(lblEmail, "cell 0 3");
emailField = new JTextField();
emailField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
String email = emailField.getText().trim();
if (!email.equalsIgnoreCase("")) {
try {
InternetAddress emailAddr = new InternetAddress(email);
emailAddr.validate();
controller.getModel().getEntity().setEmail(email);
} catch (AddressException e1) {
JOptionPane.showMessageDialog(getPane(),
"Not a valid email address");
+ e.getComponent().requestFocus();
}
}
}
});
pane.add(emailField, "cell 1 3,growx");
emailField.setColumns(10);
JLabel lblPhone = new JLabel("Phone");
pane.add(lblPhone, "cell 0 5");
JLabel lblWork = new JLabel("Work");
pane.add(lblWork, "cell 0 6,alignx trailing");
workNumField = new JTextField();
workNumField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
if (!workNumField.getText().trim().equalsIgnoreCase(""))
controller.getModel().getEntity().getPhoneNumbers()
.put(PhoneType.Work, workNumField.getText().trim());
}
});
pane.add(workNumField, "cell 1 6,growx");
workNumField.setColumns(10);
JLabel lblMobile = new JLabel("Mobile");
pane.add(lblMobile, "cell 0 7,alignx trailing");
mobileNumField = new JTextField();
mobileNumField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
if (!mobileNumField.getText().trim().equalsIgnoreCase(""))
controller
.getModel()
.getEntity()
.getPhoneNumbers()
.put(PhoneType.Mobile,
mobileNumField.getText().trim());
}
});
pane.add(mobileNumField, "cell 1 7,growx");
mobileNumField.setColumns(10);
JLabel lblHome = new JLabel("Home");
pane.add(lblHome, "cell 0 8,alignx trailing");
homeNumField = new JTextField();
homeNumField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
if (!homeNumField.getText().trim().equalsIgnoreCase(""))
controller.getModel().getEntity().getPhoneNumbers()
.put(PhoneType.Home, homeNumField.getText().trim());
}
});
pane.add(homeNumField, "cell 1 8,growx");
homeNumField.setColumns(10);
}
@Override
public JComponent getPane() {
return pane;
}
@Override
public void setController(ContactInfoPaneController controller) {
this.controller = controller;
}
public void setAddressPanel(JPanel addressPanel) {
MigLayout layout = (MigLayout) pane.getLayout();
Object constraints = layout.getComponentConstraints(this.addressPanel);
pane.remove(this.addressPanel);
pane.add(addressPanel, constraints);
this.addressPanel = addressPanel;
pane.validate();
}
@Override
public void updateEntity(ContactInfo contactInfo,
EntityOperation entityOperation) {
emailField.setText(contactInfo.getEmail());
workNumField.setText(contactInfo.getPhoneNumbers().get(PhoneType.Work));
mobileNumField.setText(contactInfo.getPhoneNumbers().get(
PhoneType.Mobile));
homeNumField.setText(contactInfo.getPhoneNumbers().get(PhoneType.Home));
if (EntityOperation.Details == entityOperation) {
emailField.setEditable(false);
workNumField.setEditable(false);
mobileNumField.setEditable(false);
homeNumField.setEditable(false);
}
}
@Override
public void resetComponents() {
emailField.setEditable(true);
workNumField.setEditable(true);
mobileNumField.setEditable(true);
homeNumField.setEditable(true);
}
@Override
public ContactInfoController getEntityController() {
// TODO Auto-generated method stub
return null;
}
}
| true | true | public ContactInfoPane() {
pane = new JPanel();
pane.setLayout(new MigLayout("", "[][grow]", "[][][][][][][][][]"));
JLabel lblAddress = new JLabel("Address");
pane.add(lblAddress, "flowx,cell 0 0");
addressPanel = new JPanel();
pane.add(addressPanel, "cell 0 1,grow,span");
JLabel lblEmail = new JLabel("Email");
pane.add(lblEmail, "cell 0 3");
emailField = new JTextField();
emailField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
String email = emailField.getText().trim();
if (!email.equalsIgnoreCase("")) {
try {
InternetAddress emailAddr = new InternetAddress(email);
emailAddr.validate();
controller.getModel().getEntity().setEmail(email);
} catch (AddressException e1) {
JOptionPane.showMessageDialog(getPane(),
"Not a valid email address");
}
}
}
});
pane.add(emailField, "cell 1 3,growx");
emailField.setColumns(10);
JLabel lblPhone = new JLabel("Phone");
pane.add(lblPhone, "cell 0 5");
JLabel lblWork = new JLabel("Work");
pane.add(lblWork, "cell 0 6,alignx trailing");
workNumField = new JTextField();
workNumField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
if (!workNumField.getText().trim().equalsIgnoreCase(""))
controller.getModel().getEntity().getPhoneNumbers()
.put(PhoneType.Work, workNumField.getText().trim());
}
});
pane.add(workNumField, "cell 1 6,growx");
workNumField.setColumns(10);
JLabel lblMobile = new JLabel("Mobile");
pane.add(lblMobile, "cell 0 7,alignx trailing");
mobileNumField = new JTextField();
mobileNumField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
if (!mobileNumField.getText().trim().equalsIgnoreCase(""))
controller
.getModel()
.getEntity()
.getPhoneNumbers()
.put(PhoneType.Mobile,
mobileNumField.getText().trim());
}
});
pane.add(mobileNumField, "cell 1 7,growx");
mobileNumField.setColumns(10);
JLabel lblHome = new JLabel("Home");
pane.add(lblHome, "cell 0 8,alignx trailing");
homeNumField = new JTextField();
homeNumField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
if (!homeNumField.getText().trim().equalsIgnoreCase(""))
controller.getModel().getEntity().getPhoneNumbers()
.put(PhoneType.Home, homeNumField.getText().trim());
}
});
pane.add(homeNumField, "cell 1 8,growx");
homeNumField.setColumns(10);
}
| public ContactInfoPane() {
pane = new JPanel();
pane.setLayout(new MigLayout("", "[][grow]", "[][][][][][][][][]"));
JLabel lblAddress = new JLabel("Address");
pane.add(lblAddress, "flowx,cell 0 0");
addressPanel = new JPanel();
pane.add(addressPanel, "cell 0 1,grow,span");
JLabel lblEmail = new JLabel("Email");
pane.add(lblEmail, "cell 0 3");
emailField = new JTextField();
emailField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
String email = emailField.getText().trim();
if (!email.equalsIgnoreCase("")) {
try {
InternetAddress emailAddr = new InternetAddress(email);
emailAddr.validate();
controller.getModel().getEntity().setEmail(email);
} catch (AddressException e1) {
JOptionPane.showMessageDialog(getPane(),
"Not a valid email address");
e.getComponent().requestFocus();
}
}
}
});
pane.add(emailField, "cell 1 3,growx");
emailField.setColumns(10);
JLabel lblPhone = new JLabel("Phone");
pane.add(lblPhone, "cell 0 5");
JLabel lblWork = new JLabel("Work");
pane.add(lblWork, "cell 0 6,alignx trailing");
workNumField = new JTextField();
workNumField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
if (!workNumField.getText().trim().equalsIgnoreCase(""))
controller.getModel().getEntity().getPhoneNumbers()
.put(PhoneType.Work, workNumField.getText().trim());
}
});
pane.add(workNumField, "cell 1 6,growx");
workNumField.setColumns(10);
JLabel lblMobile = new JLabel("Mobile");
pane.add(lblMobile, "cell 0 7,alignx trailing");
mobileNumField = new JTextField();
mobileNumField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
if (!mobileNumField.getText().trim().equalsIgnoreCase(""))
controller
.getModel()
.getEntity()
.getPhoneNumbers()
.put(PhoneType.Mobile,
mobileNumField.getText().trim());
}
});
pane.add(mobileNumField, "cell 1 7,growx");
mobileNumField.setColumns(10);
JLabel lblHome = new JLabel("Home");
pane.add(lblHome, "cell 0 8,alignx trailing");
homeNumField = new JTextField();
homeNumField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
if (!homeNumField.getText().trim().equalsIgnoreCase(""))
controller.getModel().getEntity().getPhoneNumbers()
.put(PhoneType.Home, homeNumField.getText().trim());
}
});
pane.add(homeNumField, "cell 1 8,growx");
homeNumField.setColumns(10);
}
|
diff --git a/activeweb/src/test/java/activeweb/ControllerClassLoaderSpec.java b/activeweb/src/test/java/activeweb/ControllerClassLoaderSpec.java
index 27dab84..738e002 100644
--- a/activeweb/src/test/java/activeweb/ControllerClassLoaderSpec.java
+++ b/activeweb/src/test/java/activeweb/ControllerClassLoaderSpec.java
@@ -1,47 +1,47 @@
/*
Copyright 2009-2010 Igor Polevoy
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 activeweb;
import static javalite.test.jspec.JSpec.*;
import org.junit.Test;
/**
* @author Igor Polevoy
*/
public class ControllerClassLoaderSpec {
@Test
public void test() throws ClassNotFoundException {
- String className = "activeweb.mock.MockController";
+ String className = "app.controllers.BlahController";
ControllerClassLoader cl1 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
ControllerClassLoader cl2 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
Class clazz1 = cl1.loadClass(className);
Class clazz2 = cl2.loadClass(className);
a(clazz1 == clazz2).shouldBeFalse();
className = "java.lang.String";
cl1 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
cl2 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
clazz1 = cl1.loadClass(className);
clazz2 = cl2.loadClass(className);
a(clazz1 == clazz2).shouldBeTrue();
}
}
| true | true | public void test() throws ClassNotFoundException {
String className = "activeweb.mock.MockController";
ControllerClassLoader cl1 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
ControllerClassLoader cl2 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
Class clazz1 = cl1.loadClass(className);
Class clazz2 = cl2.loadClass(className);
a(clazz1 == clazz2).shouldBeFalse();
className = "java.lang.String";
cl1 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
cl2 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
clazz1 = cl1.loadClass(className);
clazz2 = cl2.loadClass(className);
a(clazz1 == clazz2).shouldBeTrue();
}
| public void test() throws ClassNotFoundException {
String className = "app.controllers.BlahController";
ControllerClassLoader cl1 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
ControllerClassLoader cl2 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
Class clazz1 = cl1.loadClass(className);
Class clazz2 = cl2.loadClass(className);
a(clazz1 == clazz2).shouldBeFalse();
className = "java.lang.String";
cl1 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
cl2 = new ControllerClassLoader(ControllerClassLoaderSpec.class.getClassLoader(), "target/test-classes");
clazz1 = cl1.loadClass(className);
clazz2 = cl2.loadClass(className);
a(clazz1 == clazz2).shouldBeTrue();
}
|
diff --git a/Search/src/ru/chuprikov/search/search/Search.java b/Search/src/ru/chuprikov/search/search/Search.java
index 70bd86c..1809003 100644
--- a/Search/src/ru/chuprikov/search/search/Search.java
+++ b/Search/src/ru/chuprikov/search/search/Search.java
@@ -1,179 +1,179 @@
package ru.chuprikov.search.search;
import ru.chuprikov.search.database.*;
import ru.chuprikov.search.datatypes.*;
import ru.chuprikov.search.search.joiners.Joiners;
import ru.chuprikov.search.search.tokens.TokenKind;
import ru.chuprikov.search.search.tokens.Tokenizer;
import ru.kirillova.search.normspellcorr.Kgramm;
import ru.kirillova.search.normspellcorr.Normalize;
import ru.kirillova.search.normspellcorr.Suggestion;
import java.util.*;
public class Search implements AutoCloseable {
private final IndexDB indexDB;
private final TermDB termDB;
private final DocumentDB documentDB;
private final BigrammDB bigrammDB;
private final Kgramm kgramm;
public Search(SearchDatabase searchDB) throws Exception {
this.documentDB = searchDB.openDocumentDB();
this.indexDB = searchDB.openIndexDB(0);
this.termDB = searchDB.openTermDB();
this.bigrammDB = searchDB.openBigrammDB();
this.kgramm = new Kgramm(termDB, bigrammDB);
}
private Iterator<PostingInfo> parseE(Tokenizer tokenizer, List<CloseableIterator<Datatypes.Posting>> openedIterators, Suggestions sugest) throws Exception {
Iterator<PostingInfo> cur = parseN(tokenizer, openedIterators, sugest);
while (tokenizer.currentToken().kind() == TokenKind.PROXIMITY) {
int proximity = tokenizer.currentToken().getIntegerValue();
sugest.appendToken(" /" + proximity + " ");
tokenizer.readNextToken();
Iterator<PostingInfo> next = parseN(tokenizer, openedIterators, sugest);
cur = new Intersector(cur, next, Joiners.getProximityJoiner(proximity));
}
return cur;
}
private Iterator<PostingInfo> getWildcardIterator(String token, List<CloseableIterator<Datatypes.Posting>> openedIterators, Suggestions sugest) throws Exception {
final String stemmedToken = Normalize.getBasisWord(token);
final String suffix = token.substring(stemmedToken.length(), token.length());
Set<String> kgramms = new HashSet<>();
String[] bits = stemmedToken.split("\\*");
if (bits[0].length() >= 2)
kgramms.add("$" + bits[0].substring(0, 2));
- if (bits[bits.length - 1].length() >= 2)
+ if (!stemmedToken.endsWith("*") && bits[bits.length - 1].length() >= 2)
kgramms.add(bits[bits.length - 1].substring(bits[bits.length - 1].length() - 2, bits[bits.length - 1].length()) + "$");
for (String bit : bits) {
if (bit.length() == 2)
kgramms.add(bit);
else for (int i = 0; i < bit.length() - 2; i++)
kgramms.add(bit.substring(i, i + 3));
}
Map<Long, Integer> termHits = new HashMap<>();
for (String kg : kgramms) {
for (BigrammUnit bu : bigrammDB.get(kg)) {
if (!termHits.containsKey(bu.getTermID()))
termHits.put(bu.getTermID(), 0);
termHits.put(bu.getTermID(), termHits.get(bu.getTermID()) + 1);
}
}
List<Term> candidates = new ArrayList<>();
for (Long termID : termHits.keySet()) {
if (termHits.get(termID) == kgramms.size()) {
candidates.add(termDB.get(termID));
}
}
List<Iterator<PostingInfo>> options = new ArrayList<>();
sugest.appendToken("{");
for (Term term : candidates) {
if (term.getTerm().matches(stemmedToken.replaceAll("\\*", ".*"))) {
options.add(getTermIterator(term, openedIterators));
sugest.appendToken(term.getTerm() + suffix + " ");
}
}
sugest.appendToken("}");
return new Merger(options);
}
private Iterator<PostingInfo> getTermIterator(Term term, List<CloseableIterator<Datatypes.Posting>> openedIterators) throws Exception {
final CloseableIterator<Datatypes.Posting> termPostingsIterator = indexDB.iterator(term.getTermID());
openedIterators.add(termPostingsIterator);
return new PostingsAdapter(termPostingsIterator);
}
private Iterator<PostingInfo> getPostingsIterator(String token, List<CloseableIterator<Datatypes.Posting>> openedIterators, Suggestions sugest) throws Exception {
if (token.contains("*")) {
return getWildcardIterator(token, openedIterators, sugest);
} else {
final String termStr = Normalize.getBasisWord(token);
Term term = termDB.get(termStr);
if (term == null) {
List<Suggestion> suggestions = kgramm.fixMistake(token);
String tokenReplacement = suggestions.get(0).getWord();
term = termDB.get(Normalize.getBasisWord(tokenReplacement));
sugest.appendSuggestions(suggestions);
} else
sugest.appendToken(token);
return getTermIterator(term, openedIterators);
}
}
private Iterator<PostingInfo> parseN(Tokenizer tokenizer, List<CloseableIterator<Datatypes.Posting>> openedIterators, Suggestions sugest) throws Exception {
Iterator<PostingInfo> result;
if (tokenizer.currentToken().kind() == TokenKind.CITE) {
sugest.appendToken("\"");
tokenizer.readNextToken();
result = getPostingsIterator(tokenizer.currentToken().getStringValue(), openedIterators, sugest);
tokenizer.readNextToken();
while (tokenizer.currentToken().kind() != TokenKind.CITE) {
sugest.appendToken(" ");
result = new Intersector(result, getPostingsIterator(tokenizer.currentToken().getStringValue(), openedIterators, sugest), Joiners.getPhraseJoiner());
tokenizer.readNextToken();
}
sugest.appendToken("\"");
tokenizer.readNextToken();
} else {
result = getPostingsIterator(tokenizer.currentToken().getStringValue(), openedIterators, sugest);
tokenizer.readNextToken();
}
return result;
}
private Iterator<PostingInfo> parseC(Tokenizer tokenizer, List<CloseableIterator<Datatypes.Posting>> openedIterators, Suggestions sugest) throws Exception {
Iterator<PostingInfo> cur = parseE(tokenizer, openedIterators, sugest);
while (tokenizer.currentToken().kind() != TokenKind.EOF) {
sugest.appendToken(" ");
cur = new Intersector(cur, parseE(tokenizer, openedIterators, sugest), Joiners.getOrJoiner());
}
return cur;
}
public SearchResponse searchAndGetDocIDs(String request, int limit) throws Exception {
ArrayList<CloseableIterator<Datatypes.Posting>> openedIterators = new ArrayList<>();
try {
long startTime = System.currentTimeMillis();
Suggestions sugest = new Suggestions();
Iterator<PostingInfo> it = parseC(new Tokenizer(request), openedIterators, sugest);
Set<Long> duplicateEliminator = new HashSet<>();
while (it.hasNext() && duplicateEliminator.size() < limit)
duplicateEliminator.add(it.next().getDocumentID());
Document[] found = new Document[duplicateEliminator.size()];
int writeIdx = 0;
for (long documentID : duplicateEliminator)
found[writeIdx++] = documentDB.get(documentID);
return new SearchResponse(System.currentTimeMillis() - startTime, sugest.getSuggestions(5), found);
} finally {
for (CloseableIterator<Datatypes.Posting> cit : openedIterators)
cit.close();
}
}
@Override
public void close() throws Exception {
documentDB.close();
indexDB.close();
bigrammDB.close();
termDB.close();
}
}
| true | true | private Iterator<PostingInfo> getWildcardIterator(String token, List<CloseableIterator<Datatypes.Posting>> openedIterators, Suggestions sugest) throws Exception {
final String stemmedToken = Normalize.getBasisWord(token);
final String suffix = token.substring(stemmedToken.length(), token.length());
Set<String> kgramms = new HashSet<>();
String[] bits = stemmedToken.split("\\*");
if (bits[0].length() >= 2)
kgramms.add("$" + bits[0].substring(0, 2));
if (bits[bits.length - 1].length() >= 2)
kgramms.add(bits[bits.length - 1].substring(bits[bits.length - 1].length() - 2, bits[bits.length - 1].length()) + "$");
for (String bit : bits) {
if (bit.length() == 2)
kgramms.add(bit);
else for (int i = 0; i < bit.length() - 2; i++)
kgramms.add(bit.substring(i, i + 3));
}
Map<Long, Integer> termHits = new HashMap<>();
for (String kg : kgramms) {
for (BigrammUnit bu : bigrammDB.get(kg)) {
if (!termHits.containsKey(bu.getTermID()))
termHits.put(bu.getTermID(), 0);
termHits.put(bu.getTermID(), termHits.get(bu.getTermID()) + 1);
}
}
List<Term> candidates = new ArrayList<>();
for (Long termID : termHits.keySet()) {
if (termHits.get(termID) == kgramms.size()) {
candidates.add(termDB.get(termID));
}
}
List<Iterator<PostingInfo>> options = new ArrayList<>();
sugest.appendToken("{");
for (Term term : candidates) {
if (term.getTerm().matches(stemmedToken.replaceAll("\\*", ".*"))) {
options.add(getTermIterator(term, openedIterators));
sugest.appendToken(term.getTerm() + suffix + " ");
}
}
sugest.appendToken("}");
return new Merger(options);
}
| private Iterator<PostingInfo> getWildcardIterator(String token, List<CloseableIterator<Datatypes.Posting>> openedIterators, Suggestions sugest) throws Exception {
final String stemmedToken = Normalize.getBasisWord(token);
final String suffix = token.substring(stemmedToken.length(), token.length());
Set<String> kgramms = new HashSet<>();
String[] bits = stemmedToken.split("\\*");
if (bits[0].length() >= 2)
kgramms.add("$" + bits[0].substring(0, 2));
if (!stemmedToken.endsWith("*") && bits[bits.length - 1].length() >= 2)
kgramms.add(bits[bits.length - 1].substring(bits[bits.length - 1].length() - 2, bits[bits.length - 1].length()) + "$");
for (String bit : bits) {
if (bit.length() == 2)
kgramms.add(bit);
else for (int i = 0; i < bit.length() - 2; i++)
kgramms.add(bit.substring(i, i + 3));
}
Map<Long, Integer> termHits = new HashMap<>();
for (String kg : kgramms) {
for (BigrammUnit bu : bigrammDB.get(kg)) {
if (!termHits.containsKey(bu.getTermID()))
termHits.put(bu.getTermID(), 0);
termHits.put(bu.getTermID(), termHits.get(bu.getTermID()) + 1);
}
}
List<Term> candidates = new ArrayList<>();
for (Long termID : termHits.keySet()) {
if (termHits.get(termID) == kgramms.size()) {
candidates.add(termDB.get(termID));
}
}
List<Iterator<PostingInfo>> options = new ArrayList<>();
sugest.appendToken("{");
for (Term term : candidates) {
if (term.getTerm().matches(stemmedToken.replaceAll("\\*", ".*"))) {
options.add(getTermIterator(term, openedIterators));
sugest.appendToken(term.getTerm() + suffix + " ");
}
}
sugest.appendToken("}");
return new Merger(options);
}
|
diff --git a/src/Fast.java b/src/Fast.java
index 9a77654..84acaef 100644
--- a/src/Fast.java
+++ b/src/Fast.java
@@ -1,109 +1,113 @@
import java.util.Arrays;
import java.util.Collections;
public class Fast {
public static void main(String[] args)
{
// rescale coordinates and turn on animation mode
StdDraw.setXscale(0, 32768);
StdDraw.setYscale(0, 32768);
StdDraw.show(0);
//input processing.
String filename = args[0];
In in = new In(filename);
int N = in.readInt();
Point[] points = new Point[N];
for (int i = 0; i < N; i++) {
int x = in.readInt();
int y = in.readInt();
Point p = new Point(x, y);
points[i] = p;
p.draw();
}
//
//////////////////////////////////////////////////
int searchToken;
//Arrays.sort(points, Collections.reverseOrder());
//Arrays.sort(points);
for (int p = 0; p < N; p++)
{
Arrays.sort(points, p + 1, N, points[p].SLOPE_ORDER);
//
searchToken = 1;
+ /*
for (int i = 0; i < N; i++)
{
StdOut.println( "points["+i+"] "+points[i].toString());
}
+ */
for (int i = p + 2; i < N; ++i)
{
- StdOut.println(points[p].toString() + "Checking..."+i+"|"+points[i] + "-" + points[i-1].toString());
+ /*StdOut.println(points[p].toString() + "Checking..."+i+"|"+points[i] + "-" + points[i-1].toString());
StdOut.println("Slope 1:"+points[p].slopeTo(points[i])+" Slope 2:"+points[p].slopeTo(points[i-1]));
+ */
if (points[p].slopeTo(points[i])
== points[p].slopeTo(points[i-1]))
{
searchToken++;
//StdOut.println("<-------"+searchToken);
if (i == (N-1))
{
if (searchToken >= 3)
{
// Construct buffer
Point[] outputBuffer = new Point[searchToken + 1];
outputBuffer[0] = points[p];
int outCount = searchToken;
while (searchToken > 0)
{
outputBuffer[searchToken] = points[i-searchToken];
searchToken--;
}
// sort
Arrays.sort(outputBuffer);
for (int o = 0; o < outCount; o++)
{
StdOut.print(outputBuffer[o].toString() + "->");
}
StdOut.print(
- outputBuffer[outCount].toString() + "\n");
+ outputBuffer[outCount].toString() + "\n");
+ outputBuffer[0].drawTo(outputBuffer[outCount]);
}
searchToken = 1;
}
}
else
{
//StdOut.println("------->"+searchToken);
if (searchToken >= 3)
{
// Construct buffer
Point[] outputBuffer = new Point[searchToken + 1];
outputBuffer[0] = points[p];
int outCount = searchToken;
while (searchToken > 0)
{
outputBuffer[searchToken] = points[i-searchToken];
searchToken--;
}
// sort
Arrays.sort(outputBuffer);
for (int o = 0; o < outCount; o++)
{
StdOut.print(outputBuffer[o].toString() + "->");
}
StdOut.print(
outputBuffer[outCount].toString() + "\n");
- outputBuffer[0].drawTo(outputBuffer[searchToken]);
+ outputBuffer[0].drawTo(outputBuffer[outCount]);
}
searchToken = 1;
}
}
}
//////////////////////////////////////////////////
// display to screen all at once
StdDraw.show(0);
}
}
| false | true | public static void main(String[] args)
{
// rescale coordinates and turn on animation mode
StdDraw.setXscale(0, 32768);
StdDraw.setYscale(0, 32768);
StdDraw.show(0);
//input processing.
String filename = args[0];
In in = new In(filename);
int N = in.readInt();
Point[] points = new Point[N];
for (int i = 0; i < N; i++) {
int x = in.readInt();
int y = in.readInt();
Point p = new Point(x, y);
points[i] = p;
p.draw();
}
//
//////////////////////////////////////////////////
int searchToken;
//Arrays.sort(points, Collections.reverseOrder());
//Arrays.sort(points);
for (int p = 0; p < N; p++)
{
Arrays.sort(points, p + 1, N, points[p].SLOPE_ORDER);
//
searchToken = 1;
for (int i = 0; i < N; i++)
{
StdOut.println( "points["+i+"] "+points[i].toString());
}
for (int i = p + 2; i < N; ++i)
{
StdOut.println(points[p].toString() + "Checking..."+i+"|"+points[i] + "-" + points[i-1].toString());
StdOut.println("Slope 1:"+points[p].slopeTo(points[i])+" Slope 2:"+points[p].slopeTo(points[i-1]));
if (points[p].slopeTo(points[i])
== points[p].slopeTo(points[i-1]))
{
searchToken++;
//StdOut.println("<-------"+searchToken);
if (i == (N-1))
{
if (searchToken >= 3)
{
// Construct buffer
Point[] outputBuffer = new Point[searchToken + 1];
outputBuffer[0] = points[p];
int outCount = searchToken;
while (searchToken > 0)
{
outputBuffer[searchToken] = points[i-searchToken];
searchToken--;
}
// sort
Arrays.sort(outputBuffer);
for (int o = 0; o < outCount; o++)
{
StdOut.print(outputBuffer[o].toString() + "->");
}
StdOut.print(
outputBuffer[outCount].toString() + "\n");
}
searchToken = 1;
}
}
else
{
//StdOut.println("------->"+searchToken);
if (searchToken >= 3)
{
// Construct buffer
Point[] outputBuffer = new Point[searchToken + 1];
outputBuffer[0] = points[p];
int outCount = searchToken;
while (searchToken > 0)
{
outputBuffer[searchToken] = points[i-searchToken];
searchToken--;
}
// sort
Arrays.sort(outputBuffer);
for (int o = 0; o < outCount; o++)
{
StdOut.print(outputBuffer[o].toString() + "->");
}
StdOut.print(
outputBuffer[outCount].toString() + "\n");
outputBuffer[0].drawTo(outputBuffer[searchToken]);
}
searchToken = 1;
}
}
}
//////////////////////////////////////////////////
// display to screen all at once
StdDraw.show(0);
}
| public static void main(String[] args)
{
// rescale coordinates and turn on animation mode
StdDraw.setXscale(0, 32768);
StdDraw.setYscale(0, 32768);
StdDraw.show(0);
//input processing.
String filename = args[0];
In in = new In(filename);
int N = in.readInt();
Point[] points = new Point[N];
for (int i = 0; i < N; i++) {
int x = in.readInt();
int y = in.readInt();
Point p = new Point(x, y);
points[i] = p;
p.draw();
}
//
//////////////////////////////////////////////////
int searchToken;
//Arrays.sort(points, Collections.reverseOrder());
//Arrays.sort(points);
for (int p = 0; p < N; p++)
{
Arrays.sort(points, p + 1, N, points[p].SLOPE_ORDER);
//
searchToken = 1;
/*
for (int i = 0; i < N; i++)
{
StdOut.println( "points["+i+"] "+points[i].toString());
}
*/
for (int i = p + 2; i < N; ++i)
{
/*StdOut.println(points[p].toString() + "Checking..."+i+"|"+points[i] + "-" + points[i-1].toString());
StdOut.println("Slope 1:"+points[p].slopeTo(points[i])+" Slope 2:"+points[p].slopeTo(points[i-1]));
*/
if (points[p].slopeTo(points[i])
== points[p].slopeTo(points[i-1]))
{
searchToken++;
//StdOut.println("<-------"+searchToken);
if (i == (N-1))
{
if (searchToken >= 3)
{
// Construct buffer
Point[] outputBuffer = new Point[searchToken + 1];
outputBuffer[0] = points[p];
int outCount = searchToken;
while (searchToken > 0)
{
outputBuffer[searchToken] = points[i-searchToken];
searchToken--;
}
// sort
Arrays.sort(outputBuffer);
for (int o = 0; o < outCount; o++)
{
StdOut.print(outputBuffer[o].toString() + "->");
}
StdOut.print(
outputBuffer[outCount].toString() + "\n");
outputBuffer[0].drawTo(outputBuffer[outCount]);
}
searchToken = 1;
}
}
else
{
//StdOut.println("------->"+searchToken);
if (searchToken >= 3)
{
// Construct buffer
Point[] outputBuffer = new Point[searchToken + 1];
outputBuffer[0] = points[p];
int outCount = searchToken;
while (searchToken > 0)
{
outputBuffer[searchToken] = points[i-searchToken];
searchToken--;
}
// sort
Arrays.sort(outputBuffer);
for (int o = 0; o < outCount; o++)
{
StdOut.print(outputBuffer[o].toString() + "->");
}
StdOut.print(
outputBuffer[outCount].toString() + "\n");
outputBuffer[0].drawTo(outputBuffer[outCount]);
}
searchToken = 1;
}
}
}
//////////////////////////////////////////////////
// display to screen all at once
StdDraw.show(0);
}
|
diff --git a/rameses-osiris3-core2/src/com/rameses/osiris3/activedb/ActiveDBInvoker.java b/rameses-osiris3-core2/src/com/rameses/osiris3/activedb/ActiveDBInvoker.java
index 2a0ba5eb..fdbe0801 100644
--- a/rameses-osiris3-core2/src/com/rameses/osiris3/activedb/ActiveDBInvoker.java
+++ b/rameses-osiris3-core2/src/com/rameses/osiris3/activedb/ActiveDBInvoker.java
@@ -1,92 +1,94 @@
/*
* ActiveDBExecuter.java
*
* Created on August 30, 2013, 12:43 PM
*
* To change this template, choose Tools | Template Manager
* and open the template in the editor.
*/
package com.rameses.osiris3.activedb;
import com.rameses.osiris3.persistence.EntityManager;
import com.rameses.osiris3.sql.SqlExecutor;
import com.rameses.osiris3.sql.SqlQuery;
import java.util.Map;
/**
*
* @author Elmo
*/
public class ActiveDBInvoker {
private String schemaName;
private EntityManager em;
public ActiveDBInvoker(String schemaName, EntityManager em) {
this.em = em;
this.schemaName = schemaName;
}
public Object invokeMethod(String methodName, Object[] args) {
try {
String n = schemaName;
String subSchema = "";
Map m = null;
if( args!=null ) {
- m = (Map)args[0];
+ if( args.length > 0 ) {
+ m = (Map)args[0];
+ }
//used for subschema for entity managers.
if(args.length>1) {
subSchema = ":"+args[1];
}
}
if(methodName.equals("create")) {
return em.create(n+subSchema, m);
}
else if(methodName.equals("update")) {
return em.update(n+subSchema, m);
}
else if(methodName.equals("read")) {
return em.update(n+subSchema, m);
}
else if(methodName.equals("delete")) {
em.delete(n+subSchema, m);
return null;
}
else if(methodName.startsWith("get") || methodName.startsWith("findAll")) {
SqlQuery sq = em.getSqlContext().createNamedQuery( n+":"+methodName );
if(m!=null) {
sq.setVars(m).setParameters(m);
if(m.containsKey("_start")) {
int s = Integer.parseInt(m.get("_start")+"");
sq.setFirstResult( s );
}
if(m.containsKey("_limit")) {
int l = Integer.parseInt(m.get("_limit")+"");
sq.setMaxResults( l );
}
}
return sq.getResultList();
}
else if(methodName.startsWith("findAll")) {
SqlQuery sq = em.getSqlContext().createNamedQuery( n+":"+methodName );
if(m!=null) {
sq.setVars(m).setParameters(m);
}
return sq.getSingleResult();
}
else {
SqlExecutor sqe = em.getSqlContext().createNamedExecutor( n+":"+methodName );
if(m!=null) {
sqe.setVars(m).setParameters(m);
}
return sqe.execute();
}
} catch(Exception ex) {
throw new RuntimeException(ex.getMessage(), ex);
}
}
}
| true | true | public Object invokeMethod(String methodName, Object[] args) {
try {
String n = schemaName;
String subSchema = "";
Map m = null;
if( args!=null ) {
m = (Map)args[0];
//used for subschema for entity managers.
if(args.length>1) {
subSchema = ":"+args[1];
}
}
if(methodName.equals("create")) {
return em.create(n+subSchema, m);
}
else if(methodName.equals("update")) {
return em.update(n+subSchema, m);
}
else if(methodName.equals("read")) {
return em.update(n+subSchema, m);
}
else if(methodName.equals("delete")) {
em.delete(n+subSchema, m);
return null;
}
else if(methodName.startsWith("get") || methodName.startsWith("findAll")) {
SqlQuery sq = em.getSqlContext().createNamedQuery( n+":"+methodName );
if(m!=null) {
sq.setVars(m).setParameters(m);
if(m.containsKey("_start")) {
int s = Integer.parseInt(m.get("_start")+"");
sq.setFirstResult( s );
}
if(m.containsKey("_limit")) {
int l = Integer.parseInt(m.get("_limit")+"");
sq.setMaxResults( l );
}
}
return sq.getResultList();
}
else if(methodName.startsWith("findAll")) {
SqlQuery sq = em.getSqlContext().createNamedQuery( n+":"+methodName );
if(m!=null) {
sq.setVars(m).setParameters(m);
}
return sq.getSingleResult();
}
else {
SqlExecutor sqe = em.getSqlContext().createNamedExecutor( n+":"+methodName );
if(m!=null) {
sqe.setVars(m).setParameters(m);
}
return sqe.execute();
}
} catch(Exception ex) {
throw new RuntimeException(ex.getMessage(), ex);
}
}
| public Object invokeMethod(String methodName, Object[] args) {
try {
String n = schemaName;
String subSchema = "";
Map m = null;
if( args!=null ) {
if( args.length > 0 ) {
m = (Map)args[0];
}
//used for subschema for entity managers.
if(args.length>1) {
subSchema = ":"+args[1];
}
}
if(methodName.equals("create")) {
return em.create(n+subSchema, m);
}
else if(methodName.equals("update")) {
return em.update(n+subSchema, m);
}
else if(methodName.equals("read")) {
return em.update(n+subSchema, m);
}
else if(methodName.equals("delete")) {
em.delete(n+subSchema, m);
return null;
}
else if(methodName.startsWith("get") || methodName.startsWith("findAll")) {
SqlQuery sq = em.getSqlContext().createNamedQuery( n+":"+methodName );
if(m!=null) {
sq.setVars(m).setParameters(m);
if(m.containsKey("_start")) {
int s = Integer.parseInt(m.get("_start")+"");
sq.setFirstResult( s );
}
if(m.containsKey("_limit")) {
int l = Integer.parseInt(m.get("_limit")+"");
sq.setMaxResults( l );
}
}
return sq.getResultList();
}
else if(methodName.startsWith("findAll")) {
SqlQuery sq = em.getSqlContext().createNamedQuery( n+":"+methodName );
if(m!=null) {
sq.setVars(m).setParameters(m);
}
return sq.getSingleResult();
}
else {
SqlExecutor sqe = em.getSqlContext().createNamedExecutor( n+":"+methodName );
if(m!=null) {
sqe.setVars(m).setParameters(m);
}
return sqe.execute();
}
} catch(Exception ex) {
throw new RuntimeException(ex.getMessage(), ex);
}
}
|
diff --git a/src/com/simplechat/server/CommandHandler.java b/src/com/simplechat/server/CommandHandler.java
index abf250c..07df489 100644
--- a/src/com/simplechat/server/CommandHandler.java
+++ b/src/com/simplechat/server/CommandHandler.java
@@ -1,435 +1,437 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
/**
* @date Apr 30, 2011
* @author Techjar
* @version
*/
package com.simplechat.server;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.List;
import com.simplechat.protocol.*;
public class CommandHandler {
private ClientData client;
private List clients;
private DatagramSocket socket;
public CommandHandler(ClientData client, List clients, DatagramSocket socket) {
this.client = client;
this.clients = clients;
this.socket = socket;
}
public void parseCommand(String cmd, String[] args) {
PacketHandler ph = new PacketHandler();
DataManager dm = new DataManager();
if(cmd.equalsIgnoreCase("quit")) {
String msg = "";
for(int i = 0; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
System.out.println(client.getUsername() + " quit. Reason: " + msg) ;
Packet4Kick packet = new Packet4Kick("Quitting. Reason: " + msg);
Packet5Message packet2 = new Packet5Message(client.getUsername() + " quit. (" + msg + ")");
ph.sendPacket(packet, client, this.socket);
client.stopKeepAliveThread();
clients.remove(client);
ph.sendAllPacket(packet2, clients, this.socket);
}
else if(cmd.equalsIgnoreCase("stop")) {
if(dm.isOp(client.getUsername())) {
System.out.println(client.getUsername() + " stopped the server.");
System.exit(0);
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("say")) {
if(dm.isOp(client.getUsername())) {
String msg = "";
for(int i = 0; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
Packet5Message packet = new Packet5Message("[Server] " + msg);
ph.sendAllPacket(packet, clients, this.socket);
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("ping")) {
Packet5Message packet = new Packet5Message("Pong!");
ph.sendPacket(packet, client, this.socket);
}
else if(cmd.equalsIgnoreCase("kill")) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
Packet5Message packet = new Packet5Message(client.getUsername() + " was kicked for killing " + args[0] + ". " + args[0] + " will be missed. :(");
Packet4Kick packet2 = new Packet4Kick("YOU MURDERER, YOU KILLED " + args[0].toUpperCase() + "! GET OUT!!!!!");
ph.sendAllExcludePacket(packet, clients, client, this.socket);
ph.sendPacket(packet2, client, this.socket);
+ client.stopKeepAliveThread();
+ clients.remove(client);
}
}
else if(cmd.equalsIgnoreCase("whois")) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
ClientData client2 = findClient(args[0]);
if(client2 != null) {
String msg = "IP: " + client2.getIP().getHostAddress() + "\n";
msg += "Port: " + client2.getPort() + "\n";
msg += "Hostname: " + client2.getIP().getCanonicalHostName();
Packet5Message packet = new Packet5Message(msg);
ph.sendPacket(packet, client, this.socket);
}
else {
Packet5Message packet = new Packet5Message("User not found.");
ph.sendPacket(packet, client, this.socket);
}
}
}
else if(cmd.equalsIgnoreCase("list")) {
String msg = "Online Users: ";
for(int i = 0; i < clients.size(); i++) {
ClientData client2 = (ClientData)clients.get(i);
msg += client2.getUsername() + ", ";
}
Packet5Message packet = new Packet5Message(msg.substring(0, Math.min(msg.length() - 2, 500)));
ph.sendPacket(packet, client, this.socket);
}
else if(cmd.equalsIgnoreCase("me")) {
String msg = "";
for(int i = 0; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
System.out.println(client.getUsername() + " did action: " + msg);
Packet5Message packet = new Packet5Message("*" + client.getUsername() + " " + msg);
ph.sendAllPacket(packet, clients, this.socket);
}
else if(cmd.equalsIgnoreCase("nick")) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("Your name is already " + args[0] + ".");
ph.sendPacket(packet, client, this.socket);
}
else if(nameTaken(args[0])) {
Packet5Message packet = new Packet5Message("That name is taken.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isOp(args[0]) && !dm.isOp(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can't /nick to an op's name if you aren't an op.");
ph.sendPacket(packet, client, this.socket);
}
else {
System.out.println(client.getUsername() + " has changed name to " + args[0]);
Packet5Message packet = new Packet5Message(client.getUsername() + " is now known as " + args[0]);
clients.remove(client);
client.setUsername(args[0]);
clients.add(client);
Packet6NameChange packet2 = new Packet6NameChange(args[0]);
ph.sendAllPacket(packet, clients, this.socket);
ph.sendPacket(packet2, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("op")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not op yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isOp(args[0])) {
Packet5Message packet = new Packet5Message("That user is already an op.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.addOp(args[0]);
System.out.println(client.getUsername() + " opped " + args[0] + ".");
Packet5Message packet = new Packet5Message(args[0] + " has been opped.");
Packet5Message packet2 = new Packet5Message("You are now an op!");
ph.sendPacket(packet, client, this.socket);
ClientData client2 = findClient(args[0]);
if(client2 != null) ph.sendPacket(packet2, client2, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("deop")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not deop yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(!dm.isOp(args[0])) {
Packet5Message packet = new Packet5Message("That user is not an op.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.removeOp(args[0]);
System.out.println(client.getUsername() + " deopped " + args[0] + ".");
Packet5Message packet = new Packet5Message(args[0] + " has been deopped.");
Packet5Message packet2 = new Packet5Message("You are no longer an op!");
ph.sendPacket(packet, client, this.socket);
ClientData client2 = findClient(args[0]);
if(client2 != null) ph.sendPacket(packet2, client2, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("kick")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not kick yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(findClient(args[0]) == null) {
Packet5Message packet = new Packet5Message("That user isn't in the chat.");
ph.sendPacket(packet, client, this.socket);
}
else {
String msg = "";
for(int i = 1; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
System.out.println(client.getUsername() + " kicked " + args[0] + " with reason: " + msg);
Packet5Message packet = new Packet5Message(args[0] + " has been kicked. (" + (msg.equals("") ? "No reason." : msg) + ")");
Packet4Kick packet2 = new Packet4Kick("You were kicked: " + (msg.equals("") ? "No reason." : msg));
ClientData client2 = findClient(args[0]);
ph.sendPacket(packet2, client2, this.socket);
client2.stopKeepAliveThread();
clients.remove(client2);
ph.sendAllPacket(packet, clients, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("ban")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not ban yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isBanned(args[0])) {
Packet5Message packet = new Packet5Message("That user is already banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
String msg = "";
for(int i = 1; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
dm.addBan(args[0]);
System.out.println(client.getUsername() + " banned " + args[0] + " with reason: " + msg);
Packet5Message packet = new Packet5Message(args[0] + " has been banned. (" + (msg.equals("") ? "No reason." : msg) + ")");
Packet4Kick packet2 = new Packet4Kick("You have been banned: " + (msg.equals("") ? "No reason." : msg));
ClientData client2 = findClient(args[0]);
if(client2 != null) {
ph.sendPacket(packet2, client2, this.socket);
client2.stopKeepAliveThread();
clients.remove(client2);
}
ph.sendAllPacket(packet, clients, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("unban")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not unban yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(!dm.isBanned(args[0])) {
Packet5Message packet = new Packet5Message("That user is not banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.removeBan(args[0]);
System.out.println(client.getUsername() + " unbanned " + args[0] + ".");
Packet5Message packet = new Packet5Message(args[0] + " has been unbanned.");
ph.sendPacket(packet, client, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("banip")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
InetAddress ip = null;
try {
ip = InetAddress.getByName(args[0]);
}
catch(UnknownHostException e) {
//System.err.println("An invalid IP was entered.");
}
if(ip == null) {
Packet5Message packet = new Packet5Message("The IP is invalid.");
ph.sendPacket(packet, client, this.socket);
}
else if(ip == client.getIP()) {
Packet5Message packet = new Packet5Message("You can not ban your own IP.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isIPBanned(ip.getHostAddress())) {
Packet5Message packet = new Packet5Message("That IP is already banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
String msg = "";
for(int i = 1; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
dm.addIPBan(ip.getHostAddress());
System.out.println(client.getUsername() + " banned the IP " + ip.getHostAddress() + " with reason: " + msg);
Packet5Message packet = new Packet5Message("The IP " + ip.getHostAddress() + " has been banned. (" + (msg.equals("") ? "No reason." : msg) + ")");
Packet4Kick packet2 = new Packet4Kick("Your IP has been banned: " + (msg.equals("") ? "No reason." : msg));
ClientData client2 = findClient(ip);
if(client2 != null) {
ph.sendPacket(packet2, client2, this.socket);
client2.stopKeepAliveThread();
clients.remove(client2);
}
ph.sendAllPacket(packet, clients, this.socket);
}
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("unbanip")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
InetAddress ip = null;
try {
ip = InetAddress.getByName(args[0]);
}
catch(UnknownHostException e) {
//System.err.println("An invalid IP was entered.");
}
if(ip == null) {
Packet5Message packet = new Packet5Message("The IP is invalid.");
ph.sendPacket(packet, client, this.socket);
}
else if(ip == client.getIP()) {
Packet5Message packet = new Packet5Message("You can not unban your own IP.");
ph.sendPacket(packet, client, this.socket);
}
else if(!dm.isIPBanned(ip.getHostAddress())) {
Packet5Message packet = new Packet5Message("That IP is not banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.removeIPBan(ip.getHostAddress());
System.out.println(client.getUsername() + " unbanned the IP " + ip.getHostAddress() + ".");
Packet5Message packet = new Packet5Message("The IP " + ip.getHostAddress() + " has been unbanned.");
ph.sendPacket(packet, client, this.socket);
}
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else {
System.out.println("Command \"" + cmd + "\" not found.");
Packet5Message packet = new Packet5Message("Unknown command.");
ph.sendPacket(packet, client, this.socket);
}
}
private boolean nameTaken(String name) {
for(int i = 0; i < clients.size(); i++) {
ClientData client2 = (ClientData)clients.get(i);
if(client2.getUsername().equalsIgnoreCase(name)) return true;
}
return false;
}
private ClientData findClient(String name) {
for(int i = 0; i < clients.size(); i++) {
ClientData client2 = (ClientData)clients.get(i);
if(client2.getUsername().equalsIgnoreCase(name)) return client2;
}
return null;
}
private ClientData findClient(InetAddress ip) {
for(int i = 0; i < clients.size(); i++) {
ClientData client2 = (ClientData)clients.get(i);
if(client2.getIP() == ip) return client2;
}
return null;
}
}
| true | true | public void parseCommand(String cmd, String[] args) {
PacketHandler ph = new PacketHandler();
DataManager dm = new DataManager();
if(cmd.equalsIgnoreCase("quit")) {
String msg = "";
for(int i = 0; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
System.out.println(client.getUsername() + " quit. Reason: " + msg) ;
Packet4Kick packet = new Packet4Kick("Quitting. Reason: " + msg);
Packet5Message packet2 = new Packet5Message(client.getUsername() + " quit. (" + msg + ")");
ph.sendPacket(packet, client, this.socket);
client.stopKeepAliveThread();
clients.remove(client);
ph.sendAllPacket(packet2, clients, this.socket);
}
else if(cmd.equalsIgnoreCase("stop")) {
if(dm.isOp(client.getUsername())) {
System.out.println(client.getUsername() + " stopped the server.");
System.exit(0);
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("say")) {
if(dm.isOp(client.getUsername())) {
String msg = "";
for(int i = 0; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
Packet5Message packet = new Packet5Message("[Server] " + msg);
ph.sendAllPacket(packet, clients, this.socket);
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("ping")) {
Packet5Message packet = new Packet5Message("Pong!");
ph.sendPacket(packet, client, this.socket);
}
else if(cmd.equalsIgnoreCase("kill")) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
Packet5Message packet = new Packet5Message(client.getUsername() + " was kicked for killing " + args[0] + ". " + args[0] + " will be missed. :(");
Packet4Kick packet2 = new Packet4Kick("YOU MURDERER, YOU KILLED " + args[0].toUpperCase() + "! GET OUT!!!!!");
ph.sendAllExcludePacket(packet, clients, client, this.socket);
ph.sendPacket(packet2, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("whois")) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
ClientData client2 = findClient(args[0]);
if(client2 != null) {
String msg = "IP: " + client2.getIP().getHostAddress() + "\n";
msg += "Port: " + client2.getPort() + "\n";
msg += "Hostname: " + client2.getIP().getCanonicalHostName();
Packet5Message packet = new Packet5Message(msg);
ph.sendPacket(packet, client, this.socket);
}
else {
Packet5Message packet = new Packet5Message("User not found.");
ph.sendPacket(packet, client, this.socket);
}
}
}
else if(cmd.equalsIgnoreCase("list")) {
String msg = "Online Users: ";
for(int i = 0; i < clients.size(); i++) {
ClientData client2 = (ClientData)clients.get(i);
msg += client2.getUsername() + ", ";
}
Packet5Message packet = new Packet5Message(msg.substring(0, Math.min(msg.length() - 2, 500)));
ph.sendPacket(packet, client, this.socket);
}
else if(cmd.equalsIgnoreCase("me")) {
String msg = "";
for(int i = 0; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
System.out.println(client.getUsername() + " did action: " + msg);
Packet5Message packet = new Packet5Message("*" + client.getUsername() + " " + msg);
ph.sendAllPacket(packet, clients, this.socket);
}
else if(cmd.equalsIgnoreCase("nick")) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("Your name is already " + args[0] + ".");
ph.sendPacket(packet, client, this.socket);
}
else if(nameTaken(args[0])) {
Packet5Message packet = new Packet5Message("That name is taken.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isOp(args[0]) && !dm.isOp(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can't /nick to an op's name if you aren't an op.");
ph.sendPacket(packet, client, this.socket);
}
else {
System.out.println(client.getUsername() + " has changed name to " + args[0]);
Packet5Message packet = new Packet5Message(client.getUsername() + " is now known as " + args[0]);
clients.remove(client);
client.setUsername(args[0]);
clients.add(client);
Packet6NameChange packet2 = new Packet6NameChange(args[0]);
ph.sendAllPacket(packet, clients, this.socket);
ph.sendPacket(packet2, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("op")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not op yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isOp(args[0])) {
Packet5Message packet = new Packet5Message("That user is already an op.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.addOp(args[0]);
System.out.println(client.getUsername() + " opped " + args[0] + ".");
Packet5Message packet = new Packet5Message(args[0] + " has been opped.");
Packet5Message packet2 = new Packet5Message("You are now an op!");
ph.sendPacket(packet, client, this.socket);
ClientData client2 = findClient(args[0]);
if(client2 != null) ph.sendPacket(packet2, client2, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("deop")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not deop yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(!dm.isOp(args[0])) {
Packet5Message packet = new Packet5Message("That user is not an op.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.removeOp(args[0]);
System.out.println(client.getUsername() + " deopped " + args[0] + ".");
Packet5Message packet = new Packet5Message(args[0] + " has been deopped.");
Packet5Message packet2 = new Packet5Message("You are no longer an op!");
ph.sendPacket(packet, client, this.socket);
ClientData client2 = findClient(args[0]);
if(client2 != null) ph.sendPacket(packet2, client2, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("kick")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not kick yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(findClient(args[0]) == null) {
Packet5Message packet = new Packet5Message("That user isn't in the chat.");
ph.sendPacket(packet, client, this.socket);
}
else {
String msg = "";
for(int i = 1; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
System.out.println(client.getUsername() + " kicked " + args[0] + " with reason: " + msg);
Packet5Message packet = new Packet5Message(args[0] + " has been kicked. (" + (msg.equals("") ? "No reason." : msg) + ")");
Packet4Kick packet2 = new Packet4Kick("You were kicked: " + (msg.equals("") ? "No reason." : msg));
ClientData client2 = findClient(args[0]);
ph.sendPacket(packet2, client2, this.socket);
client2.stopKeepAliveThread();
clients.remove(client2);
ph.sendAllPacket(packet, clients, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("ban")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not ban yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isBanned(args[0])) {
Packet5Message packet = new Packet5Message("That user is already banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
String msg = "";
for(int i = 1; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
dm.addBan(args[0]);
System.out.println(client.getUsername() + " banned " + args[0] + " with reason: " + msg);
Packet5Message packet = new Packet5Message(args[0] + " has been banned. (" + (msg.equals("") ? "No reason." : msg) + ")");
Packet4Kick packet2 = new Packet4Kick("You have been banned: " + (msg.equals("") ? "No reason." : msg));
ClientData client2 = findClient(args[0]);
if(client2 != null) {
ph.sendPacket(packet2, client2, this.socket);
client2.stopKeepAliveThread();
clients.remove(client2);
}
ph.sendAllPacket(packet, clients, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("unban")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not unban yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(!dm.isBanned(args[0])) {
Packet5Message packet = new Packet5Message("That user is not banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.removeBan(args[0]);
System.out.println(client.getUsername() + " unbanned " + args[0] + ".");
Packet5Message packet = new Packet5Message(args[0] + " has been unbanned.");
ph.sendPacket(packet, client, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("banip")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
InetAddress ip = null;
try {
ip = InetAddress.getByName(args[0]);
}
catch(UnknownHostException e) {
//System.err.println("An invalid IP was entered.");
}
if(ip == null) {
Packet5Message packet = new Packet5Message("The IP is invalid.");
ph.sendPacket(packet, client, this.socket);
}
else if(ip == client.getIP()) {
Packet5Message packet = new Packet5Message("You can not ban your own IP.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isIPBanned(ip.getHostAddress())) {
Packet5Message packet = new Packet5Message("That IP is already banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
String msg = "";
for(int i = 1; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
dm.addIPBan(ip.getHostAddress());
System.out.println(client.getUsername() + " banned the IP " + ip.getHostAddress() + " with reason: " + msg);
Packet5Message packet = new Packet5Message("The IP " + ip.getHostAddress() + " has been banned. (" + (msg.equals("") ? "No reason." : msg) + ")");
Packet4Kick packet2 = new Packet4Kick("Your IP has been banned: " + (msg.equals("") ? "No reason." : msg));
ClientData client2 = findClient(ip);
if(client2 != null) {
ph.sendPacket(packet2, client2, this.socket);
client2.stopKeepAliveThread();
clients.remove(client2);
}
ph.sendAllPacket(packet, clients, this.socket);
}
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("unbanip")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
InetAddress ip = null;
try {
ip = InetAddress.getByName(args[0]);
}
catch(UnknownHostException e) {
//System.err.println("An invalid IP was entered.");
}
if(ip == null) {
Packet5Message packet = new Packet5Message("The IP is invalid.");
ph.sendPacket(packet, client, this.socket);
}
else if(ip == client.getIP()) {
Packet5Message packet = new Packet5Message("You can not unban your own IP.");
ph.sendPacket(packet, client, this.socket);
}
else if(!dm.isIPBanned(ip.getHostAddress())) {
Packet5Message packet = new Packet5Message("That IP is not banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.removeIPBan(ip.getHostAddress());
System.out.println(client.getUsername() + " unbanned the IP " + ip.getHostAddress() + ".");
Packet5Message packet = new Packet5Message("The IP " + ip.getHostAddress() + " has been unbanned.");
ph.sendPacket(packet, client, this.socket);
}
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else {
System.out.println("Command \"" + cmd + "\" not found.");
Packet5Message packet = new Packet5Message("Unknown command.");
ph.sendPacket(packet, client, this.socket);
}
}
| public void parseCommand(String cmd, String[] args) {
PacketHandler ph = new PacketHandler();
DataManager dm = new DataManager();
if(cmd.equalsIgnoreCase("quit")) {
String msg = "";
for(int i = 0; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
System.out.println(client.getUsername() + " quit. Reason: " + msg) ;
Packet4Kick packet = new Packet4Kick("Quitting. Reason: " + msg);
Packet5Message packet2 = new Packet5Message(client.getUsername() + " quit. (" + msg + ")");
ph.sendPacket(packet, client, this.socket);
client.stopKeepAliveThread();
clients.remove(client);
ph.sendAllPacket(packet2, clients, this.socket);
}
else if(cmd.equalsIgnoreCase("stop")) {
if(dm.isOp(client.getUsername())) {
System.out.println(client.getUsername() + " stopped the server.");
System.exit(0);
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("say")) {
if(dm.isOp(client.getUsername())) {
String msg = "";
for(int i = 0; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
Packet5Message packet = new Packet5Message("[Server] " + msg);
ph.sendAllPacket(packet, clients, this.socket);
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("ping")) {
Packet5Message packet = new Packet5Message("Pong!");
ph.sendPacket(packet, client, this.socket);
}
else if(cmd.equalsIgnoreCase("kill")) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
Packet5Message packet = new Packet5Message(client.getUsername() + " was kicked for killing " + args[0] + ". " + args[0] + " will be missed. :(");
Packet4Kick packet2 = new Packet4Kick("YOU MURDERER, YOU KILLED " + args[0].toUpperCase() + "! GET OUT!!!!!");
ph.sendAllExcludePacket(packet, clients, client, this.socket);
ph.sendPacket(packet2, client, this.socket);
client.stopKeepAliveThread();
clients.remove(client);
}
}
else if(cmd.equalsIgnoreCase("whois")) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
ClientData client2 = findClient(args[0]);
if(client2 != null) {
String msg = "IP: " + client2.getIP().getHostAddress() + "\n";
msg += "Port: " + client2.getPort() + "\n";
msg += "Hostname: " + client2.getIP().getCanonicalHostName();
Packet5Message packet = new Packet5Message(msg);
ph.sendPacket(packet, client, this.socket);
}
else {
Packet5Message packet = new Packet5Message("User not found.");
ph.sendPacket(packet, client, this.socket);
}
}
}
else if(cmd.equalsIgnoreCase("list")) {
String msg = "Online Users: ";
for(int i = 0; i < clients.size(); i++) {
ClientData client2 = (ClientData)clients.get(i);
msg += client2.getUsername() + ", ";
}
Packet5Message packet = new Packet5Message(msg.substring(0, Math.min(msg.length() - 2, 500)));
ph.sendPacket(packet, client, this.socket);
}
else if(cmd.equalsIgnoreCase("me")) {
String msg = "";
for(int i = 0; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
System.out.println(client.getUsername() + " did action: " + msg);
Packet5Message packet = new Packet5Message("*" + client.getUsername() + " " + msg);
ph.sendAllPacket(packet, clients, this.socket);
}
else if(cmd.equalsIgnoreCase("nick")) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("Your name is already " + args[0] + ".");
ph.sendPacket(packet, client, this.socket);
}
else if(nameTaken(args[0])) {
Packet5Message packet = new Packet5Message("That name is taken.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isOp(args[0]) && !dm.isOp(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can't /nick to an op's name if you aren't an op.");
ph.sendPacket(packet, client, this.socket);
}
else {
System.out.println(client.getUsername() + " has changed name to " + args[0]);
Packet5Message packet = new Packet5Message(client.getUsername() + " is now known as " + args[0]);
clients.remove(client);
client.setUsername(args[0]);
clients.add(client);
Packet6NameChange packet2 = new Packet6NameChange(args[0]);
ph.sendAllPacket(packet, clients, this.socket);
ph.sendPacket(packet2, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("op")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not op yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isOp(args[0])) {
Packet5Message packet = new Packet5Message("That user is already an op.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.addOp(args[0]);
System.out.println(client.getUsername() + " opped " + args[0] + ".");
Packet5Message packet = new Packet5Message(args[0] + " has been opped.");
Packet5Message packet2 = new Packet5Message("You are now an op!");
ph.sendPacket(packet, client, this.socket);
ClientData client2 = findClient(args[0]);
if(client2 != null) ph.sendPacket(packet2, client2, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("deop")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not deop yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(!dm.isOp(args[0])) {
Packet5Message packet = new Packet5Message("That user is not an op.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.removeOp(args[0]);
System.out.println(client.getUsername() + " deopped " + args[0] + ".");
Packet5Message packet = new Packet5Message(args[0] + " has been deopped.");
Packet5Message packet2 = new Packet5Message("You are no longer an op!");
ph.sendPacket(packet, client, this.socket);
ClientData client2 = findClient(args[0]);
if(client2 != null) ph.sendPacket(packet2, client2, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("kick")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not kick yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(findClient(args[0]) == null) {
Packet5Message packet = new Packet5Message("That user isn't in the chat.");
ph.sendPacket(packet, client, this.socket);
}
else {
String msg = "";
for(int i = 1; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
System.out.println(client.getUsername() + " kicked " + args[0] + " with reason: " + msg);
Packet5Message packet = new Packet5Message(args[0] + " has been kicked. (" + (msg.equals("") ? "No reason." : msg) + ")");
Packet4Kick packet2 = new Packet4Kick("You were kicked: " + (msg.equals("") ? "No reason." : msg));
ClientData client2 = findClient(args[0]);
ph.sendPacket(packet2, client2, this.socket);
client2.stopKeepAliveThread();
clients.remove(client2);
ph.sendAllPacket(packet, clients, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("ban")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not ban yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isBanned(args[0])) {
Packet5Message packet = new Packet5Message("That user is already banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
String msg = "";
for(int i = 1; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
dm.addBan(args[0]);
System.out.println(client.getUsername() + " banned " + args[0] + " with reason: " + msg);
Packet5Message packet = new Packet5Message(args[0] + " has been banned. (" + (msg.equals("") ? "No reason." : msg) + ")");
Packet4Kick packet2 = new Packet4Kick("You have been banned: " + (msg.equals("") ? "No reason." : msg));
ClientData client2 = findClient(args[0]);
if(client2 != null) {
ph.sendPacket(packet2, client2, this.socket);
client2.stopKeepAliveThread();
clients.remove(client2);
}
ph.sendAllPacket(packet, clients, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("unban")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else if(args[0].equalsIgnoreCase(client.getUsername())) {
Packet5Message packet = new Packet5Message("You can not unban yourself.");
ph.sendPacket(packet, client, this.socket);
}
else if(!dm.isBanned(args[0])) {
Packet5Message packet = new Packet5Message("That user is not banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.removeBan(args[0]);
System.out.println(client.getUsername() + " unbanned " + args[0] + ".");
Packet5Message packet = new Packet5Message(args[0] + " has been unbanned.");
ph.sendPacket(packet, client, this.socket);
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("banip")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
InetAddress ip = null;
try {
ip = InetAddress.getByName(args[0]);
}
catch(UnknownHostException e) {
//System.err.println("An invalid IP was entered.");
}
if(ip == null) {
Packet5Message packet = new Packet5Message("The IP is invalid.");
ph.sendPacket(packet, client, this.socket);
}
else if(ip == client.getIP()) {
Packet5Message packet = new Packet5Message("You can not ban your own IP.");
ph.sendPacket(packet, client, this.socket);
}
else if(dm.isIPBanned(ip.getHostAddress())) {
Packet5Message packet = new Packet5Message("That IP is already banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
String msg = "";
for(int i = 1; i < args.length; i++) msg += args[i] + " ";
msg = msg.trim();
dm.addIPBan(ip.getHostAddress());
System.out.println(client.getUsername() + " banned the IP " + ip.getHostAddress() + " with reason: " + msg);
Packet5Message packet = new Packet5Message("The IP " + ip.getHostAddress() + " has been banned. (" + (msg.equals("") ? "No reason." : msg) + ")");
Packet4Kick packet2 = new Packet4Kick("Your IP has been banned: " + (msg.equals("") ? "No reason." : msg));
ClientData client2 = findClient(ip);
if(client2 != null) {
ph.sendPacket(packet2, client2, this.socket);
client2.stopKeepAliveThread();
clients.remove(client2);
}
ph.sendAllPacket(packet, clients, this.socket);
}
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else if(cmd.equalsIgnoreCase("unbanip")) {
if(dm.isOp(client.getUsername())) {
if(args.length < 1) {
Packet5Message packet = new Packet5Message("Not enough paramters.");
ph.sendPacket(packet, client, this.socket);
}
else {
InetAddress ip = null;
try {
ip = InetAddress.getByName(args[0]);
}
catch(UnknownHostException e) {
//System.err.println("An invalid IP was entered.");
}
if(ip == null) {
Packet5Message packet = new Packet5Message("The IP is invalid.");
ph.sendPacket(packet, client, this.socket);
}
else if(ip == client.getIP()) {
Packet5Message packet = new Packet5Message("You can not unban your own IP.");
ph.sendPacket(packet, client, this.socket);
}
else if(!dm.isIPBanned(ip.getHostAddress())) {
Packet5Message packet = new Packet5Message("That IP is not banned.");
ph.sendPacket(packet, client, this.socket);
}
else {
dm.removeIPBan(ip.getHostAddress());
System.out.println(client.getUsername() + " unbanned the IP " + ip.getHostAddress() + ".");
Packet5Message packet = new Packet5Message("The IP " + ip.getHostAddress() + " has been unbanned.");
ph.sendPacket(packet, client, this.socket);
}
}
}
else {
Packet5Message packet = new Packet5Message("You are not an op.");
ph.sendPacket(packet, client, this.socket);
}
}
else {
System.out.println("Command \"" + cmd + "\" not found.");
Packet5Message packet = new Packet5Message("Unknown command.");
ph.sendPacket(packet, client, this.socket);
}
}
|
diff --git a/src/actions/commons/src/main/java/it/geosolutions/geobatch/actions/commons/ExtractAction.java b/src/actions/commons/src/main/java/it/geosolutions/geobatch/actions/commons/ExtractAction.java
index 313ebad7..125a1128 100644
--- a/src/actions/commons/src/main/java/it/geosolutions/geobatch/actions/commons/ExtractAction.java
+++ b/src/actions/commons/src/main/java/it/geosolutions/geobatch/actions/commons/ExtractAction.java
@@ -1,177 +1,177 @@
/*
* GeoBatch - Open Source geospatial batch processing system
* http://geobatch.geo-solutions.it/
* Copyright (C) 2007-2012 GeoSolutions S.A.S.
* http://www.geo-solutions.it
*
* GPLv3 + Classpath exception
*
* 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 it.geosolutions.geobatch.actions.commons;
import it.geosolutions.filesystemmonitor.monitor.FileSystemEvent;
import it.geosolutions.filesystemmonitor.monitor.FileSystemEventType;
import it.geosolutions.geobatch.flow.event.action.ActionException;
import it.geosolutions.geobatch.flow.event.action.BaseAction;
import it.geosolutions.tools.commons.file.Path;
import it.geosolutions.tools.compress.file.Extract;
import it.geosolutions.tools.io.file.IOUtils;
import java.io.File;
import java.util.EventObject;
import java.util.LinkedList;
import java.util.Queue;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Copy
*
* @author Carlo Cancellieri - [email protected]
*
*/
public class ExtractAction extends BaseAction<EventObject> {
private final static Logger LOGGER = LoggerFactory.getLogger(ExtractAction.class);
/**
* configuration
*/
private final ExtractConfiguration conf;
/**
*
* @param configuration
* @throws IllegalAccessException if input template file cannot be resolved
*
*/
public ExtractAction(ExtractConfiguration configuration) throws IllegalArgumentException {
super(configuration);
conf = configuration;
if (conf.getDestination() == null) {
throw new IllegalArgumentException("Unable to work with a null dest dir");
}
if (!conf.getDestination().isAbsolute()) {
// TODO LOG
conf.setConfigDir(new File(conf.getConfigDir(), conf.getDestination().getPath()));
}
}
/**
* Removes TemplateModelEvents from the queue and put
*/
public Queue<EventObject> execute(Queue<EventObject> events) throws ActionException {
listenerForwarder.started();
listenerForwarder.setTask("build the output absolute file name");
// return
final Queue<EventObject> ret = new LinkedList<EventObject>();
listenerForwarder.setTask("Building/getting the root data structure");
boolean extractMultipleFile;
final int size = events.size();
if (size == 0) {
throw new ActionException(this, "Empty file list");
} else if (size > 1) {
extractMultipleFile = true;
} else {
extractMultipleFile = false;
}
// getting valid destination dir
File dest = conf.getDestination();
if (dest != null && !dest.isDirectory()) {
if (!dest.isAbsolute()){
dest = new File(getTempDir(), dest.getPath());
}
if (!dest.mkdirs()) {
throw new ActionException(this, "bad destination (not writeable): " + dest);
}
} else {
dest = getTempDir();
}
while (!events.isEmpty()) {
listenerForwarder.setTask("Generating the output");
final EventObject event = events.remove();
if (event == null) {
final String message = "Incoming event is null";
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(message);
continue;
}
}
if (event instanceof FileSystemEvent) {
File source = ((FileSystemEvent) event).getSource();
try {
listenerForwarder.setTask("Extracting file: " + source);
final File extracted = Extract.extract(source, dest, false);
if (extracted != null) {
File newDest = new File(dest, extracted.getName());
listenerForwarder.setTask("moving \'" + extracted + "\' to \'" + newDest
+ "\'");
- FileUtils.moveDirectoryToDirectory(extracted, newDest, true);
+ //FileUtils.moveDirectoryToDirectory(extracted, newDest, true);
listenerForwarder.terminated();
ret.add(new FileSystemEvent(newDest, FileSystemEventType.DIR_CREATED));
} else {
final String message = "Unable to extract " + source;
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(message);
}
}
} catch (Exception e) {
final String message = "Unable to copy extracted archive";
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
ex.initCause(e);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(e.getLocalizedMessage());
}
}
} else {
final String message = "Incoming instance is not a FileSystemEvent: " + event;
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(message);
}
}
// TODO setup task progress
} // endwile
listenerForwarder.completed();
return ret;
}
}
| true | true | public Queue<EventObject> execute(Queue<EventObject> events) throws ActionException {
listenerForwarder.started();
listenerForwarder.setTask("build the output absolute file name");
// return
final Queue<EventObject> ret = new LinkedList<EventObject>();
listenerForwarder.setTask("Building/getting the root data structure");
boolean extractMultipleFile;
final int size = events.size();
if (size == 0) {
throw new ActionException(this, "Empty file list");
} else if (size > 1) {
extractMultipleFile = true;
} else {
extractMultipleFile = false;
}
// getting valid destination dir
File dest = conf.getDestination();
if (dest != null && !dest.isDirectory()) {
if (!dest.isAbsolute()){
dest = new File(getTempDir(), dest.getPath());
}
if (!dest.mkdirs()) {
throw new ActionException(this, "bad destination (not writeable): " + dest);
}
} else {
dest = getTempDir();
}
while (!events.isEmpty()) {
listenerForwarder.setTask("Generating the output");
final EventObject event = events.remove();
if (event == null) {
final String message = "Incoming event is null";
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(message);
continue;
}
}
if (event instanceof FileSystemEvent) {
File source = ((FileSystemEvent) event).getSource();
try {
listenerForwarder.setTask("Extracting file: " + source);
final File extracted = Extract.extract(source, dest, false);
if (extracted != null) {
File newDest = new File(dest, extracted.getName());
listenerForwarder.setTask("moving \'" + extracted + "\' to \'" + newDest
+ "\'");
FileUtils.moveDirectoryToDirectory(extracted, newDest, true);
listenerForwarder.terminated();
ret.add(new FileSystemEvent(newDest, FileSystemEventType.DIR_CREATED));
} else {
final String message = "Unable to extract " + source;
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(message);
}
}
} catch (Exception e) {
final String message = "Unable to copy extracted archive";
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
ex.initCause(e);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(e.getLocalizedMessage());
}
}
} else {
final String message = "Incoming instance is not a FileSystemEvent: " + event;
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(message);
}
}
// TODO setup task progress
} // endwile
listenerForwarder.completed();
return ret;
}
| public Queue<EventObject> execute(Queue<EventObject> events) throws ActionException {
listenerForwarder.started();
listenerForwarder.setTask("build the output absolute file name");
// return
final Queue<EventObject> ret = new LinkedList<EventObject>();
listenerForwarder.setTask("Building/getting the root data structure");
boolean extractMultipleFile;
final int size = events.size();
if (size == 0) {
throw new ActionException(this, "Empty file list");
} else if (size > 1) {
extractMultipleFile = true;
} else {
extractMultipleFile = false;
}
// getting valid destination dir
File dest = conf.getDestination();
if (dest != null && !dest.isDirectory()) {
if (!dest.isAbsolute()){
dest = new File(getTempDir(), dest.getPath());
}
if (!dest.mkdirs()) {
throw new ActionException(this, "bad destination (not writeable): " + dest);
}
} else {
dest = getTempDir();
}
while (!events.isEmpty()) {
listenerForwarder.setTask("Generating the output");
final EventObject event = events.remove();
if (event == null) {
final String message = "Incoming event is null";
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(message);
continue;
}
}
if (event instanceof FileSystemEvent) {
File source = ((FileSystemEvent) event).getSource();
try {
listenerForwarder.setTask("Extracting file: " + source);
final File extracted = Extract.extract(source, dest, false);
if (extracted != null) {
File newDest = new File(dest, extracted.getName());
listenerForwarder.setTask("moving \'" + extracted + "\' to \'" + newDest
+ "\'");
//FileUtils.moveDirectoryToDirectory(extracted, newDest, true);
listenerForwarder.terminated();
ret.add(new FileSystemEvent(newDest, FileSystemEventType.DIR_CREATED));
} else {
final String message = "Unable to extract " + source;
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(message);
}
}
} catch (Exception e) {
final String message = "Unable to copy extracted archive";
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
ex.initCause(e);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(e.getLocalizedMessage());
}
}
} else {
final String message = "Incoming instance is not a FileSystemEvent: " + event;
if (!getConfiguration().isFailIgnored()) {
ActionException ex = new ActionException(this.getClass(), message);
listenerForwarder.failed(ex);
throw ex;
} else {
LOGGER.warn(message);
}
}
// TODO setup task progress
} // endwile
listenerForwarder.completed();
return ret;
}
|
diff --git a/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java b/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
index da199fd..ed7d548 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
@@ -1,583 +1,583 @@
package org.apache.maven.plugin.dependency.fromConfiguration;
/*
* 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.
*/
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
import org.apache.maven.plugin.dependency.testUtils.DependencyTestUtils;
import org.apache.maven.plugin.dependency.utils.markers.UnpackFileMarkerHandler;
import org.apache.maven.plugin.testing.stubs.StubArtifactCollector;
import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
import org.apache.maven.plugin.testing.stubs.StubArtifactResolver;
import org.apache.maven.project.MavenProject;
public class TestUnpackMojo
extends AbstractDependencyMojoTestCase
{
UnpackMojo mojo;
public TestUnpackMojo()
{
super();
}
protected void setUp()
throws Exception
{
super.setUp( "unpack", true );
File testPom = new File( getBasedir(), "target/test-classes/unit/unpack-test/plugin-config.xml" );
mojo = (UnpackMojo) lookupMojo( "unpack", testPom );
mojo.setOutputDirectory( new File( this.testDir, "outputDirectory" ) );
mojo.setMarkersDirectory( new File( this.testDir, "markers" ) );
mojo.silent = true;
assertNotNull( mojo );
assertNotNull( mojo.getProject() );
// MavenProject project = mojo.getProject();
// init classifier things
// it needs to get the archivermanager
stubFactory.setUnpackableFile( mojo.getArchiverManager() );
// i'm using one file repeatedly to archive so I can test the name
// programmatically.
stubFactory.setSrcFile( new File( getBasedir() + File.separatorChar
+ "target/test-classes/unit/unpack-dependencies-test/test.txt" ) );
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
mojo.setResolver( new StubArtifactResolver( stubFactory, false, false ) );
mojo.setLocal( new StubArtifactRepository( this.testDir.getAbsolutePath() ) );
mojo.setArtifactCollector( new StubArtifactCollector() );
}
public ArtifactItem getSingleArtifactItem( boolean removeVersion )
throws MojoExecutionException
{
List<ArtifactItem> list = mojo.getProcessedArtifactItems( removeVersion );
return list.get( 0 );
}
public void testGetArtifactItems()
throws MojoExecutionException
{
ArtifactItem item = new ArtifactItem();
item.setArtifactId( "artifact" );
item.setGroupId( "groupId" );
item.setVersion( "1.0" );
ArrayList<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
ArtifactItem result = getSingleArtifactItem( false );
assertEquals( mojo.getOutputDirectory(), result.getOutputDirectory() );
File output = new File( mojo.getOutputDirectory(), "override" );
item.setOutputDirectory( output );
result = getSingleArtifactItem( false );
assertEquals( output, result.getOutputDirectory() );
}
public void assertMarkerFiles( Collection<ArtifactItem> items, boolean exist )
{
for ( ArtifactItem item : items )
{
assertMarkerFile( exist, item );
}
}
public void assertMarkerFile( boolean val, ArtifactItem item )
{
UnpackFileMarkerHandler handle = new UnpackFileMarkerHandler( item, mojo.getMarkersDirectory() );
try
{
assertEquals( val, handle.isMarkerSet() );
}
catch ( MojoExecutionException e )
{
fail( e.getLongMessage() );
}
}
public void testUnpackFile()
throws IOException, MojoExecutionException
{
List<ArtifactItem> list = stubFactory.getArtifactItems( stubFactory.getClassifiedArtifacts() );
mojo.setArtifactItems( list );
mojo.execute();
assertMarkerFiles( list, true );
}
public void testSkip()
throws IOException, MojoExecutionException
{
List<ArtifactItem> list = stubFactory.getArtifactItems( stubFactory.getClassifiedArtifacts() );
mojo.setSkip( true );
mojo.setArtifactItems( list );
mojo.execute();
assertMarkerFiles( list, false );
}
public void testUnpackToLocation()
throws IOException, MojoExecutionException
{
List<ArtifactItem> list = stubFactory.getArtifactItems( stubFactory.getClassifiedArtifacts() );
ArtifactItem item = (ArtifactItem) list.get( 0 );
item.setOutputDirectory( new File( mojo.getOutputDirectory(), "testOverride" ) );
mojo.setArtifactItems( list );
mojo.execute();
assertMarkerFiles( list, true );
}
public void testMissingVersionNotFound()
throws MojoExecutionException
{
ArtifactItem item = new ArtifactItem();
item.setArtifactId( "artifactId" );
item.setClassifier( "" );
item.setGroupId( "groupId" );
item.setType( "type" );
List<ArtifactItem> list = new ArrayList<ArtifactItem>();
list.add( item );
mojo.setArtifactItems( list );
try
{
mojo.execute();
fail( "Expected Exception Here." );
}
catch ( MojoExecutionException e )
{
// caught the expected exception.
}
}
public List<Dependency> getDependencyList( ArtifactItem item )
{
Dependency dep = new Dependency();
dep.setArtifactId( item.getArtifactId() );
dep.setClassifier( item.getClassifier() );
dep.setGroupId( item.getGroupId() );
dep.setType( item.getType() );
dep.setVersion( "2.0-SNAPSHOT" );
Dependency dep2 = new Dependency();
dep2.setArtifactId( item.getArtifactId() );
dep2.setClassifier( "classifier" );
dep2.setGroupId( item.getGroupId() );
dep2.setType( item.getType() );
dep2.setVersion( "2.1" );
List<Dependency> list = new ArrayList<Dependency>( 2 );
list.add( dep2 );
list.add( dep );
return list;
}
public void testMissingVersionFromDependencies()
throws MojoExecutionException
{
ArtifactItem item = new ArtifactItem();
item.setArtifactId( "artifactId" );
item.setClassifier( "" );
item.setGroupId( "groupId" );
item.setType( "jar" );
List<ArtifactItem> list = new ArrayList<ArtifactItem>();
list.add( item );
mojo.setArtifactItems( list );
MavenProject project = mojo.getProject();
project.setDependencies( getDependencyList( item ) );
mojo.execute();
assertMarkerFile( true, item );
assertEquals( "2.0-SNAPSHOT", item.getVersion() );
}
public void testMissingVersionFromDependenciesWithClassifier()
throws MojoExecutionException
{
ArtifactItem item = new ArtifactItem();
item.setArtifactId( "artifactId" );
item.setClassifier( "classifier" );
item.setGroupId( "groupId" );
item.setType( "war" );
List<ArtifactItem> list = new ArrayList<ArtifactItem>();
list.add( item );
mojo.setArtifactItems( list );
MavenProject project = mojo.getProject();
project.setDependencies( getDependencyList( item ) );
mojo.execute();
assertMarkerFile( true, item );
assertEquals( "2.1", item.getVersion() );
}
public List<Dependency> getDependencyMgtList( ArtifactItem item )
{
Dependency dep = new Dependency();
dep.setArtifactId( item.getArtifactId() );
dep.setClassifier( item.getClassifier() );
dep.setGroupId( item.getGroupId() );
dep.setType( item.getType() );
dep.setVersion( "3.0-SNAPSHOT" );
Dependency dep2 = new Dependency();
dep2.setArtifactId( item.getArtifactId() );
dep2.setClassifier( "classifier" );
dep2.setGroupId( item.getGroupId() );
dep2.setType( item.getType() );
dep2.setVersion( "3.1" );
List<Dependency> list = new ArrayList<Dependency>( 2 );
list.add( dep2 );
list.add( dep );
return list;
}
public void testMissingVersionFromDependencyMgt()
throws MojoExecutionException
{
ArtifactItem item = new ArtifactItem();
item.setArtifactId( "artifactId" );
item.setClassifier( "" );
item.setGroupId( "groupId" );
item.setType( "jar" );
MavenProject project = mojo.getProject();
project.setDependencies( getDependencyList( item ) );
item = new ArtifactItem();
item.setArtifactId( "artifactId-2" );
item.setClassifier( "" );
item.setGroupId( "groupId" );
item.setType( "jar" );
List<ArtifactItem> list = new ArrayList<ArtifactItem>();
list.add( item );
mojo.setArtifactItems( list );
project.getDependencyManagement().setDependencies( getDependencyMgtList( item ) );
mojo.execute();
assertMarkerFile( true, item );
assertEquals( "3.0-SNAPSHOT", item.getVersion() );
}
public void testMissingVersionFromDependencyMgtWithClassifier()
throws MojoExecutionException
{
ArtifactItem item = new ArtifactItem();
item.setArtifactId( "artifactId" );
item.setClassifier( "classifier" );
item.setGroupId( "groupId" );
item.setType( "jar" );
MavenProject project = mojo.getProject();
project.setDependencies( getDependencyList( item ) );
item = new ArtifactItem();
item.setArtifactId( "artifactId-2" );
item.setClassifier( "classifier" );
item.setGroupId( "groupId" );
item.setType( "jar" );
List<ArtifactItem> list = new ArrayList<ArtifactItem>();
list.add( item );
mojo.setArtifactItems( list );
project.getDependencyManagement().setDependencies( getDependencyMgtList( item ) );
mojo.execute();
assertMarkerFile( true, item );
assertEquals( "3.1", item.getVersion() );
}
public void testArtifactNotFound()
throws Exception
{
dotestArtifactExceptions( false, true );
}
public void testArtifactResolutionException()
throws Exception
{
dotestArtifactExceptions( true, false );
}
public void dotestArtifactExceptions( boolean are, boolean anfe )
throws Exception
{
ArtifactItem item = new ArtifactItem();
item.setArtifactId( "artifactId" );
item.setClassifier( "" );
item.setGroupId( "groupId" );
item.setType( "type" );
item.setVersion( "1.0" );
List<ArtifactItem> list = new ArrayList<ArtifactItem>();
list.add( item );
mojo.setArtifactItems( list );
// init classifier things
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
mojo.setResolver( new StubArtifactResolver( null, are, anfe ) );
mojo.setLocal( new StubArtifactRepository( this.testDir.getAbsolutePath() ) );
try
{
mojo.execute();
fail( "ExpectedException" );
}
catch ( MojoExecutionException e )
{
if ( are )
{
assertEquals( "Unable to resolve artifact.", e.getMessage() );
}
else
{
assertEquals( "Unable to find artifact.", e.getMessage() );
}
}
}
public void testNoArtifactItems()
{
try
{
mojo.getProcessedArtifactItems( false );
fail( "Expected Exception" );
}
catch ( MojoExecutionException e )
{
assertEquals( "There are no artifactItems configured.", e.getMessage() );
}
}
public void testUnpackDontOverWriteReleases()
throws IOException, MojoExecutionException, InterruptedException
{
stubFactory.setCreateFiles( true );
Artifact release = stubFactory.getReleaseArtifact();
release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
ArtifactItem item = new ArtifactItem( release );
List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
mojo.setOverWriteIfNewer( false );
mojo.execute();
assertUnpacked( item, false );
}
public void testUnpackDontOverWriteSnapshots()
throws IOException, MojoExecutionException, InterruptedException
{
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 );
ArtifactItem item = new ArtifactItem( artifact );
List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
mojo.setOverWriteIfNewer( false );
mojo.execute();
assertUnpacked( item, false );
}
public void testUnpackOverWriteReleases()
throws IOException, MojoExecutionException, InterruptedException
{
stubFactory.setCreateFiles( true );
Artifact release = stubFactory.getReleaseArtifact();
release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
ArtifactItem item = new ArtifactItem( release );
List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
mojo.setOverWriteIfNewer( false );
mojo.setOverWriteReleases( true );
mojo.execute();
assertUnpacked( item, true );
}
public void testUnpackOverWriteSnapshot()
throws IOException, MojoExecutionException, InterruptedException
{
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 );
ArtifactItem item = new ArtifactItem( artifact );
List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
mojo.setOverWriteIfNewer( false );
mojo.setOverWriteReleases( false );
mojo.setOverWriteSnapshots( true );
mojo.execute();
assertUnpacked( item, true );
}
public void testUnpackOverWriteIfNewer()
throws IOException, MojoExecutionException, InterruptedException
{
mojo.silent = false;
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
- assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
+ assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 20000 ) );
ArtifactItem item = new ArtifactItem( artifact );
List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
mojo.setOverWriteIfNewer( true );
mojo.execute();
File unpackedFile = getUnpackedFile( item );
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
// go back 10 more seconds for linux
time -= 10000;
// set to known value
assertTrue( unpackedFile.setLastModified( time ) );
// set source to be newer was 4s but test is brittle on MacOS if less than 5s
assertTrue( artifact.getFile().setLastModified( time + 5000 ) );
// manually set markerfile (must match getMarkerFile in DefaultMarkerFileHandler)
File marker = new File( mojo.getMarkersDirectory(), artifact.getId().replace( ':', '-' ) + ".marker" );
assertTrue( marker.setLastModified( time ) );
displayFile( "unpackedFile", unpackedFile );
displayFile( "artifact ", artifact.getFile() );
displayFile( "marker ", marker );
System.out.println( "mojo.execute()" );
mojo.execute();
displayFile( "unpackedFile", unpackedFile );
displayFile( "artifact ", artifact.getFile() );
displayFile( "marker ", marker );
System.out.println( "marker.lastModified() = " + time );
long unpackedFileTime = unpackedFile.lastModified();
System.out.println( "unpackedFile.lastModified() = " + unpackedFileTime );
assertTrue( "unpackedFile '" + unpackedFile + "' lastModified() == " + time + ": should be different",
time != unpackedFile.lastModified() );
}
private void displayFile( String description, File file )
{
System.out.println( description + ' ' + DateFormatUtils.ISO_DATETIME_FORMAT.format( file.lastModified() ) + ' '
+ file.getPath().substring( getBasedir().length() ) );
}
public void assertUnpacked( ArtifactItem item, boolean overWrite )
throws InterruptedException, MojoExecutionException
{
File unpackedFile = getUnpackedFile( item );
Thread.sleep( 100 );
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
unpackedFile.setLastModified( time );
assertEquals( time, unpackedFile.lastModified() );
mojo.execute();
if ( overWrite )
{
assertTrue( time != unpackedFile.lastModified() );
}
else
{
assertEquals( time, unpackedFile.lastModified() );
}
}
public File getUnpackedFile( ArtifactItem item )
{
File unpackedFile =
new File( item.getOutputDirectory(),
DependencyArtifactStubFactory.getUnpackableFileName( item.getArtifact() ) );
assertTrue( unpackedFile.exists() );
return unpackedFile;
}
}
| true | true | public void testUnpackOverWriteIfNewer()
throws IOException, MojoExecutionException, InterruptedException
{
mojo.silent = false;
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( artifact );
List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
mojo.setOverWriteIfNewer( true );
mojo.execute();
File unpackedFile = getUnpackedFile( item );
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
// go back 10 more seconds for linux
time -= 10000;
// set to known value
assertTrue( unpackedFile.setLastModified( time ) );
// set source to be newer was 4s but test is brittle on MacOS if less than 5s
assertTrue( artifact.getFile().setLastModified( time + 5000 ) );
// manually set markerfile (must match getMarkerFile in DefaultMarkerFileHandler)
File marker = new File( mojo.getMarkersDirectory(), artifact.getId().replace( ':', '-' ) + ".marker" );
assertTrue( marker.setLastModified( time ) );
displayFile( "unpackedFile", unpackedFile );
displayFile( "artifact ", artifact.getFile() );
displayFile( "marker ", marker );
System.out.println( "mojo.execute()" );
mojo.execute();
displayFile( "unpackedFile", unpackedFile );
displayFile( "artifact ", artifact.getFile() );
displayFile( "marker ", marker );
System.out.println( "marker.lastModified() = " + time );
long unpackedFileTime = unpackedFile.lastModified();
System.out.println( "unpackedFile.lastModified() = " + unpackedFileTime );
assertTrue( "unpackedFile '" + unpackedFile + "' lastModified() == " + time + ": should be different",
time != unpackedFile.lastModified() );
}
| public void testUnpackOverWriteIfNewer()
throws IOException, MojoExecutionException, InterruptedException
{
mojo.silent = false;
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 20000 ) );
ArtifactItem item = new ArtifactItem( artifact );
List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
mojo.setOverWriteIfNewer( true );
mojo.execute();
File unpackedFile = getUnpackedFile( item );
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
// go back 10 more seconds for linux
time -= 10000;
// set to known value
assertTrue( unpackedFile.setLastModified( time ) );
// set source to be newer was 4s but test is brittle on MacOS if less than 5s
assertTrue( artifact.getFile().setLastModified( time + 5000 ) );
// manually set markerfile (must match getMarkerFile in DefaultMarkerFileHandler)
File marker = new File( mojo.getMarkersDirectory(), artifact.getId().replace( ':', '-' ) + ".marker" );
assertTrue( marker.setLastModified( time ) );
displayFile( "unpackedFile", unpackedFile );
displayFile( "artifact ", artifact.getFile() );
displayFile( "marker ", marker );
System.out.println( "mojo.execute()" );
mojo.execute();
displayFile( "unpackedFile", unpackedFile );
displayFile( "artifact ", artifact.getFile() );
displayFile( "marker ", marker );
System.out.println( "marker.lastModified() = " + time );
long unpackedFileTime = unpackedFile.lastModified();
System.out.println( "unpackedFile.lastModified() = " + unpackedFileTime );
assertTrue( "unpackedFile '" + unpackedFile + "' lastModified() == " + time + ": should be different",
time != unpackedFile.lastModified() );
}
|
diff --git a/srcj/com/sun/electric/tool/EThread.java b/srcj/com/sun/electric/tool/EThread.java
index e649530c8..216d0d7a9 100644
--- a/srcj/com/sun/electric/tool/EThread.java
+++ b/srcj/com/sun/electric/tool/EThread.java
@@ -1,265 +1,266 @@
/* -*- tab-width: 4 -*-
*
* Electric(tm) VLSI Design System
*
* File: EThread.java
*
* Copyright (c) 2003 Sun Microsystems and Static Free Software
*
* Electric(tm) is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* Electric(tm) is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Electric(tm); see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, Mass 02111-1307, USA.
*/
package com.sun.electric.tool;
import com.sun.electric.StartupPrefs;
import com.sun.electric.database.EditingPreferences;
import com.sun.electric.database.Environment;
import com.sun.electric.database.Snapshot;
import com.sun.electric.database.change.Undo;
import com.sun.electric.database.constraint.Constraints;
import com.sun.electric.database.hierarchy.EDatabase;
import com.sun.electric.database.variable.UserInterface;
import com.sun.electric.tool.user.ActivityLogger;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.logging.Level;
/**
* Thread for execution Jobs in Electric.
*/
class EThread extends Thread {
private static final String CLASS_NAME = EThread.class.getName();
private static final ArrayList<Snapshot> snapshotCache = new ArrayList<Snapshot>();
private static int maximumSnapshots = StartupPrefs.getMaxUndoHistory();
/** EJob which Thread is executing now. */
EJob ejob;
/** True if this EThread is execution server job. */
boolean isServerThread;
/* Database in which thread is executing. */
EDatabase database;
final ServerJobManager.UserInterfaceRedirect userInterface = new ServerJobManager.UserInterfaceRedirect();
/** Creates a new instance of EThread */
EThread(int id) {
super("EThread-" + id);
// setUserInterface(Job.currentUI);
Job.logger.logp(Level.FINER, CLASS_NAME, "constructor", getName());
start();
}
public void run() {
Job.logger.logp(Level.FINE, CLASS_NAME, "run", getName());
EJob finishedEJob = null;
for (;;) {
ejob = Job.jobManager.selectEJob(finishedEJob);
Job.logger.logp(Level.FINER, CLASS_NAME, "run", "selectedJob {0}", ejob.jobName);
isServerThread = ejob.jobType != Job.Type.CLIENT_EXAMINE;
database = isServerThread ? EDatabase.serverDatabase() : EDatabase.clientDatabase();
ejob.changedFields = new ArrayList<Field>();
// Throwable jobException = null;
Environment.setThreadEnvironment(database.getEnvironment());
EditingPreferences.setThreadEditingPreferences(ejob.editingPreferences);
database.lock(!ejob.isExamine());
ejob.oldSnapshot = database.backup();
try {
if (ejob.jobType != Job.Type.CLIENT_EXAMINE && !ejob.startedByServer) {
Throwable e = ejob.deserializeToServer();
if (e != null)
throw e;
}
switch (ejob.jobType) {
case CHANGE:
database.lowLevelBeginChanging(ejob.serverJob.tool);
database.getNetworkManager().startBatch();
Constraints.getCurrent().startBatch(ejob.oldSnapshot);
userInterface.curTechId = ejob.serverJob.curTechId;
userInterface.curLibId = ejob.serverJob.curLibId;
userInterface.curCellId = ejob.serverJob.curCellId;
if (!ejob.serverJob.doIt())
throw new JobException("Job '" + ejob.jobName + "' failed");
Constraints.getCurrent().endBatch(ejob.client.userName);
database.getNetworkManager().endBatch();
database.lowLevelEndChanging();
ejob.newSnapshot = database.backup();
break;
case UNDO:
database.lowLevelSetCanUndoing(true);
database.getNetworkManager().startBatch();
userInterface.curTechId = null;
userInterface.curLibId = null;
userInterface.curCellId = null;
int snapshotId = ((Undo.UndoJob)ejob.serverJob).getSnapshotId();
Snapshot undoSnapshot = findInCache(snapshotId);
if (undoSnapshot == null)
throw new JobException("Snapshot " + snapshotId + " not found");
database.undo(undoSnapshot);
database.getNetworkManager().endBatch();
database.lowLevelSetCanUndoing(false);
break;
case SERVER_EXAMINE:
userInterface.curTechId = ejob.serverJob.curTechId;
userInterface.curLibId = ejob.serverJob.curLibId;
userInterface.curCellId = ejob.serverJob.curCellId;
if (!ejob.serverJob.doIt())
throw new JobException("Job '" + ejob.jobName + "' failed");
break;
case CLIENT_EXAMINE:
if (ejob.startedByServer) {
Throwable e = ejob.deserializeToClient();
if (e != null)
throw e;
}
userInterface.curTechId = ejob.clientJob.curTechId;
userInterface.curLibId = ejob.clientJob.curLibId;
userInterface.curCellId = ejob.clientJob.curCellId;
if (!ejob.clientJob.doIt())
throw new JobException("Job '" + ejob.jobName + "' failed");
break;
}
ejob.serializeResult(database);
ejob.newSnapshot = database.backup();
// database.checkFresh(ejob.newSnapshot);
// ejob.state = EJob.State.SERVER_DONE;
} catch (Throwable e) {
e.getStackTrace();
- e.printStackTrace();
+ if (!(e instanceof JobException))
+ e.printStackTrace();
if (!ejob.isExamine()) {
recoverDatabase(e instanceof JobException);
database.lowLevelEndChanging();
database.lowLevelSetCanUndoing(false);
}
ejob.serializeExceptionResult(e, database);
// ejob.state = EJob.State.SERVER_FAIL;
} finally {
database.unlock();
Environment.setThreadEnvironment(null);
EditingPreferences.setThreadEditingPreferences(null);
}
putInCache(ejob.oldSnapshot, ejob.newSnapshot);
finishedEJob = ejob;
ejob = null;
isServerThread = false;
database = null;
Job.logger.logp(Level.FINER, CLASS_NAME, "run", "finishedJob {0}", finishedEJob.jobName);
}
}
private void recoverDatabase(boolean quick) {
database.lowLevelSetCanUndoing(true);
try {
if (quick)
database.undo(ejob.oldSnapshot);
else
database.recover(ejob.oldSnapshot);
database.getNetworkManager().endBatch();
ejob.newSnapshot = ejob.oldSnapshot;
return;
} catch (Throwable e) {
ActivityLogger.logException(e);
}
for (;;) {
try {
Snapshot snapshot = findValidSnapshot();
database.recover(snapshot);
database.getNetworkManager().endBatch();
ejob.newSnapshot = snapshot;
return;
} catch (Throwable e) {
ActivityLogger.logException(e);
}
}
}
UserInterface getUserInterface() { return userInterface; }
/**
* Find some valid snapshot in cache.
*/
static Snapshot findValidSnapshot() {
for (;;) {
Snapshot snapshot;
synchronized (snapshotCache) {
if (snapshotCache.isEmpty()) return EDatabase.serverDatabase().getInitialSnapshot();
snapshot = snapshotCache.remove(snapshotCache.size() - 1);
}
try {
snapshot.check();
return snapshot;
} catch (Throwable e) {
ActivityLogger.logException(e);
}
}
}
private static Snapshot findInCache(int snapshotId) {
synchronized (snapshotCache) {
for (int i = snapshotCache.size() - 1; i >= 0; i--) {
Snapshot snapshot = snapshotCache.get(i);
if (snapshot.snapshotId == snapshotId)
return snapshot;
}
}
return null;
}
private static void putInCache(Snapshot oldSnapshot, Snapshot newSnapshot) {
synchronized (snapshotCache) {
if (!snapshotCache.contains(newSnapshot)) {
while (!snapshotCache.isEmpty() && snapshotCache.get(snapshotCache.size() - 1) != oldSnapshot)
snapshotCache.remove(snapshotCache.size() - 1);
snapshotCache.add(newSnapshot);
}
while (snapshotCache.size() > maximumSnapshots)
snapshotCache.remove(0);
}
}
/**
* Method to set the size of the history list and return the former size.
* @param newSize the new size of the history list (number of batches of changes).
* If not positive, the list size is not changed.
* @return the former size of the history list.
*/
public static int setHistoryListSize(int newSize) {
if (newSize <= 0) return maximumSnapshots;
int oldSize = maximumSnapshots;
maximumSnapshots = newSize;
while (snapshotCache.size() > maximumSnapshots)
snapshotCache.remove(0);
return oldSize;
}
/**
* If this EThread is running a Job return it.
* Return null otherwise.
* @return a running Job or null
*/
Job getRunningJob() {
if (ejob == null) return null;
return ejob.jobType == Job.Type.CLIENT_EXAMINE ? ejob.clientJob : ejob.serverJob;
}
EJob getRunningEJob() {
return ejob;
}
}
| true | true | public void run() {
Job.logger.logp(Level.FINE, CLASS_NAME, "run", getName());
EJob finishedEJob = null;
for (;;) {
ejob = Job.jobManager.selectEJob(finishedEJob);
Job.logger.logp(Level.FINER, CLASS_NAME, "run", "selectedJob {0}", ejob.jobName);
isServerThread = ejob.jobType != Job.Type.CLIENT_EXAMINE;
database = isServerThread ? EDatabase.serverDatabase() : EDatabase.clientDatabase();
ejob.changedFields = new ArrayList<Field>();
// Throwable jobException = null;
Environment.setThreadEnvironment(database.getEnvironment());
EditingPreferences.setThreadEditingPreferences(ejob.editingPreferences);
database.lock(!ejob.isExamine());
ejob.oldSnapshot = database.backup();
try {
if (ejob.jobType != Job.Type.CLIENT_EXAMINE && !ejob.startedByServer) {
Throwable e = ejob.deserializeToServer();
if (e != null)
throw e;
}
switch (ejob.jobType) {
case CHANGE:
database.lowLevelBeginChanging(ejob.serverJob.tool);
database.getNetworkManager().startBatch();
Constraints.getCurrent().startBatch(ejob.oldSnapshot);
userInterface.curTechId = ejob.serverJob.curTechId;
userInterface.curLibId = ejob.serverJob.curLibId;
userInterface.curCellId = ejob.serverJob.curCellId;
if (!ejob.serverJob.doIt())
throw new JobException("Job '" + ejob.jobName + "' failed");
Constraints.getCurrent().endBatch(ejob.client.userName);
database.getNetworkManager().endBatch();
database.lowLevelEndChanging();
ejob.newSnapshot = database.backup();
break;
case UNDO:
database.lowLevelSetCanUndoing(true);
database.getNetworkManager().startBatch();
userInterface.curTechId = null;
userInterface.curLibId = null;
userInterface.curCellId = null;
int snapshotId = ((Undo.UndoJob)ejob.serverJob).getSnapshotId();
Snapshot undoSnapshot = findInCache(snapshotId);
if (undoSnapshot == null)
throw new JobException("Snapshot " + snapshotId + " not found");
database.undo(undoSnapshot);
database.getNetworkManager().endBatch();
database.lowLevelSetCanUndoing(false);
break;
case SERVER_EXAMINE:
userInterface.curTechId = ejob.serverJob.curTechId;
userInterface.curLibId = ejob.serverJob.curLibId;
userInterface.curCellId = ejob.serverJob.curCellId;
if (!ejob.serverJob.doIt())
throw new JobException("Job '" + ejob.jobName + "' failed");
break;
case CLIENT_EXAMINE:
if (ejob.startedByServer) {
Throwable e = ejob.deserializeToClient();
if (e != null)
throw e;
}
userInterface.curTechId = ejob.clientJob.curTechId;
userInterface.curLibId = ejob.clientJob.curLibId;
userInterface.curCellId = ejob.clientJob.curCellId;
if (!ejob.clientJob.doIt())
throw new JobException("Job '" + ejob.jobName + "' failed");
break;
}
ejob.serializeResult(database);
ejob.newSnapshot = database.backup();
// database.checkFresh(ejob.newSnapshot);
// ejob.state = EJob.State.SERVER_DONE;
} catch (Throwable e) {
e.getStackTrace();
e.printStackTrace();
if (!ejob.isExamine()) {
recoverDatabase(e instanceof JobException);
database.lowLevelEndChanging();
database.lowLevelSetCanUndoing(false);
}
ejob.serializeExceptionResult(e, database);
// ejob.state = EJob.State.SERVER_FAIL;
} finally {
database.unlock();
Environment.setThreadEnvironment(null);
EditingPreferences.setThreadEditingPreferences(null);
}
putInCache(ejob.oldSnapshot, ejob.newSnapshot);
finishedEJob = ejob;
ejob = null;
isServerThread = false;
database = null;
Job.logger.logp(Level.FINER, CLASS_NAME, "run", "finishedJob {0}", finishedEJob.jobName);
}
}
| public void run() {
Job.logger.logp(Level.FINE, CLASS_NAME, "run", getName());
EJob finishedEJob = null;
for (;;) {
ejob = Job.jobManager.selectEJob(finishedEJob);
Job.logger.logp(Level.FINER, CLASS_NAME, "run", "selectedJob {0}", ejob.jobName);
isServerThread = ejob.jobType != Job.Type.CLIENT_EXAMINE;
database = isServerThread ? EDatabase.serverDatabase() : EDatabase.clientDatabase();
ejob.changedFields = new ArrayList<Field>();
// Throwable jobException = null;
Environment.setThreadEnvironment(database.getEnvironment());
EditingPreferences.setThreadEditingPreferences(ejob.editingPreferences);
database.lock(!ejob.isExamine());
ejob.oldSnapshot = database.backup();
try {
if (ejob.jobType != Job.Type.CLIENT_EXAMINE && !ejob.startedByServer) {
Throwable e = ejob.deserializeToServer();
if (e != null)
throw e;
}
switch (ejob.jobType) {
case CHANGE:
database.lowLevelBeginChanging(ejob.serverJob.tool);
database.getNetworkManager().startBatch();
Constraints.getCurrent().startBatch(ejob.oldSnapshot);
userInterface.curTechId = ejob.serverJob.curTechId;
userInterface.curLibId = ejob.serverJob.curLibId;
userInterface.curCellId = ejob.serverJob.curCellId;
if (!ejob.serverJob.doIt())
throw new JobException("Job '" + ejob.jobName + "' failed");
Constraints.getCurrent().endBatch(ejob.client.userName);
database.getNetworkManager().endBatch();
database.lowLevelEndChanging();
ejob.newSnapshot = database.backup();
break;
case UNDO:
database.lowLevelSetCanUndoing(true);
database.getNetworkManager().startBatch();
userInterface.curTechId = null;
userInterface.curLibId = null;
userInterface.curCellId = null;
int snapshotId = ((Undo.UndoJob)ejob.serverJob).getSnapshotId();
Snapshot undoSnapshot = findInCache(snapshotId);
if (undoSnapshot == null)
throw new JobException("Snapshot " + snapshotId + " not found");
database.undo(undoSnapshot);
database.getNetworkManager().endBatch();
database.lowLevelSetCanUndoing(false);
break;
case SERVER_EXAMINE:
userInterface.curTechId = ejob.serverJob.curTechId;
userInterface.curLibId = ejob.serverJob.curLibId;
userInterface.curCellId = ejob.serverJob.curCellId;
if (!ejob.serverJob.doIt())
throw new JobException("Job '" + ejob.jobName + "' failed");
break;
case CLIENT_EXAMINE:
if (ejob.startedByServer) {
Throwable e = ejob.deserializeToClient();
if (e != null)
throw e;
}
userInterface.curTechId = ejob.clientJob.curTechId;
userInterface.curLibId = ejob.clientJob.curLibId;
userInterface.curCellId = ejob.clientJob.curCellId;
if (!ejob.clientJob.doIt())
throw new JobException("Job '" + ejob.jobName + "' failed");
break;
}
ejob.serializeResult(database);
ejob.newSnapshot = database.backup();
// database.checkFresh(ejob.newSnapshot);
// ejob.state = EJob.State.SERVER_DONE;
} catch (Throwable e) {
e.getStackTrace();
if (!(e instanceof JobException))
e.printStackTrace();
if (!ejob.isExamine()) {
recoverDatabase(e instanceof JobException);
database.lowLevelEndChanging();
database.lowLevelSetCanUndoing(false);
}
ejob.serializeExceptionResult(e, database);
// ejob.state = EJob.State.SERVER_FAIL;
} finally {
database.unlock();
Environment.setThreadEnvironment(null);
EditingPreferences.setThreadEditingPreferences(null);
}
putInCache(ejob.oldSnapshot, ejob.newSnapshot);
finishedEJob = ejob;
ejob = null;
isServerThread = false;
database = null;
Job.logger.logp(Level.FINER, CLASS_NAME, "run", "finishedJob {0}", finishedEJob.jobName);
}
}
|
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java
index 09542c822..bf87ed031 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java
@@ -1,767 +1,770 @@
/*******************************************************************************
* Copyright (c) 2004, 2010 BREDEX GmbH.
* 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:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
package org.eclipse.jubula.client.core.model;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.CollectionTable;
import javax.persistence.Column;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.DiscriminatorValue;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.MapKeyColumn;
import javax.persistence.OrderColumn;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.Version;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.eclipse.jubula.client.core.businessprocess.problems.IProblem;
import org.eclipse.jubula.client.core.businessprocess.progress.ElementLoadedProgressListener;
import org.eclipse.jubula.client.core.businessprocess.progress.InsertProgressListener;
import org.eclipse.jubula.client.core.businessprocess.progress.RemoveProgressListener;
import org.eclipse.jubula.client.core.persistence.GeneralStorage;
import org.eclipse.jubula.client.core.persistence.PersistenceUtil;
import org.eclipse.jubula.client.core.utils.DependencyCheckerOp;
import org.eclipse.jubula.client.core.utils.TreeTraverser;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.persistence.annotations.BatchFetch;
import org.eclipse.persistence.annotations.BatchFetchType;
import org.eclipse.persistence.annotations.Index;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Base class for all kinds of nodes in test tree
*
* @author BREDEX GmbH
* @created 17.08.2004
*/
@Entity
@Table(name = "NODE")
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@DiscriminatorColumn(discriminatorType = DiscriminatorType.CHAR,
name = "CLASS_ID")
@DiscriminatorValue(value = "N")
@EntityListeners(value = {
ElementLoadedProgressListener.class,
InsertProgressListener.class, RemoveProgressListener.class })
abstract class NodePO implements INodePO {
/** the logger */
private static final Logger LOG = LoggerFactory
.getLogger(NodePO.class);
/** Persistence (JPA / EclipseLink) OID */
private transient Long m_id = null;
/** Globally Unique Identifier for recognizing nodes across databases */
private transient String m_guid = null;
/** Persistence (JPA / EclipseLink) version id */
private transient Integer m_version = null;
/** Flag if the parent at the children is set.
* @see getNodeList()
*/
private transient boolean m_isParentNodeSet = false;
/**
* generated tag
*/
private boolean m_isGenerated;
/**
* whether this element has been marked as "active" or "inactive"
*/
private boolean m_isActive = true;
/**
* The current toolkit level of this node.
* Not to persist!
*/
private transient String m_toolkitLevel = StringConstants.EMPTY;
/**
* name of the real node, e.g. CapPO name or Testcase name
*/
private String m_name;
/**
* the task Id of the node
*/
private String m_taskId;
/**
* The changed info is a map with a time stamp as key and a comment as value.
*/
private Map<Long, String> m_trackedChangesMap = new HashMap<Long, String>();
/**
* describes, if the node is derived from another node
*/
private INodePO m_parentNode = null;
/** The ID of the parent project */
private Long m_parentProjectId = null;
/**
* list of all child nodes, if existent
*/
private List<INodePO> m_nodeList = new ArrayList<INodePO>();
/**
* contains the comment for a node
*/
private String m_comment;
/** The timestamp */
private long m_timestamp = 0;
/** set of problems */
private Set<IProblem> m_problems = new HashSet<IProblem>(5);
/**
* constructor for a node with a pre-existing GUID
* @param name of the node
* @param guid of the node
* @param isGenerated indicates whether this node has been generated
*/
protected NodePO(String name, String guid, boolean isGenerated) {
setName(name);
setGuid(guid);
setGenerated(isGenerated);
}
/**
* constructor
* @param name of the node
* @param isGenerated indicates whether this node has been generated
*/
protected NodePO(String name, boolean isGenerated) {
this(name, PersistenceUtil.generateGuid(), isGenerated);
}
/**
* only for Persistence (JPA / EclipseLink)
*/
NodePO() {
// only for Persistence (JPA / EclipseLink)
}
/**
* @param nodeList The nodeList to set.
*/
void setHbmNodeList(List<INodePO> nodeList) {
m_nodeList = nodeList;
m_isParentNodeSet = false;
}
/**
*
* {@inheritDoc}
* @return The name of this node
*/
@Transient
public String getName() {
return getHbmName();
}
/**
* gets the value of the m_name property
*
* @return the name of the node
*/
@Basic
@Column(name = "NAME", length = MAX_STRING_LENGTH)
private String getHbmName() {
return m_name;
}
/**
* For Persistence (JPA / EclipseLink) only
* Sets the value of the m_name property.
*
* @param name
* the new value of the m_name property
*/
private void setHbmName(String name) {
m_name = name;
}
/**
* Sets the value of the m_name property.
* @param name the name of this node
*/
public void setName(String name) {
setHbmName(name);
}
/**
* @return the current value of the m_parentNode property or null
*/
@Transient
public INodePO getParentNode() {
return m_parentNode;
}
/**
* @param parent parent to set
*/
public void setParentNode(INodePO parent) {
if (LOG.isErrorEnabled() && parent == null) {
try {
throw new IllegalArgumentException(
"The parent of the INodePO (GUID " + getGuid() //$NON-NLS-1$
+ ") is not intended to be set to null."); //$NON-NLS-1$
} catch (IllegalArgumentException e) {
LOG.info(ExceptionUtils.getFullStackTrace(e), e);
}
}
m_parentNode = parent;
}
/**
*
* Access method for the m_nodeList property.
* only to use for Persistence (JPA / EclipseLink)
*
* @return the current value of the m_nodeList property
*/
@ManyToMany(fetch = FetchType.EAGER,
cascade = CascadeType.ALL,
targetEntity = NodePO.class)
@JoinTable(name = "NODE_LIST",
joinColumns = @JoinColumn(name = "PARENT"),
inverseJoinColumns = @JoinColumn(name = "CHILD"))
@OrderColumn(name = "IDX")
@BatchFetch(value = BatchFetchType.JOIN)
List<INodePO> getHbmNodeList() {
return m_nodeList;
}
/**
* @return The List of children nodes
*/
@Transient
List<INodePO> getNodeList() {
if (!m_isParentNodeSet) {
List<INodePO> nodeList = getHbmNodeList();
for (Object o : nodeList) {
INodePO node = (INodePO)o;
node.setParentNode(this);
}
m_isParentNodeSet = true;
}
return getHbmNodeList();
}
/**
* @return the unmodifiable node list.
*/
@Transient
public List<INodePO> getUnmodifiableNodeList() {
return Collections.unmodifiableList(getNodeList());
}
/**
*
* @return Returns the m_comment.
*/
@Basic
@Column(name = "COMM_TXT", length = MAX_STRING_LENGTH)
private String getHbmComment() {
return m_comment;
}
/**
* @return Returns the m_comment.
*/
@Transient
public String getComment() {
return getHbmComment();
}
/**
* For Persistence (JPA / EclipseLink) only
* @param comment The m_comment to set.
*/
private void setHbmComment(String comment) {
m_comment = comment;
}
/**
* @param comment The m_comment to set.
*/
public void setComment(String comment) {
setHbmComment(comment);
}
/**
* adds a childnode to an existent node
* creation of reference to the parent node
* @param childNode
* reference to the childnode
*/
public void addNode(INodePO childNode) {
addNode(-1, childNode);
}
/**
* adds a childnode to an existent node
* creation of reference to the parent node
* @param position the position to add the childnode.
* @param childNode
* reference to the childnode
*/
public void addNode(int position, INodePO childNode) {
if (position < 0 || position > getNodeList().size()) {
getNodeList().add(childNode);
} else {
getNodeList().add(position, childNode);
}
childNode.setParentNode(this);
setParentProjectIdForChildNode(childNode);
}
/**
* Sets the child node's parentProjectId equal to this node's parentProjectId.
* This is the default implementation. Subclasses may override.
*
* @param childNode The node that will have its parentProjectId set.
*/
protected void setParentProjectIdForChildNode(INodePO childNode) {
childNode.setParentProjectId(getParentProjectId());
}
/**
* deletes a node and resolves the
* reference to the parent node
* sign off as child node of the parent node
* @param childNode reference to the childnode
*/
public void removeNode(INodePO childNode) {
((NodePO)childNode).removeMe(this);
}
/**
* @param parent removes the node from childrenList or eventhandlerMap
*/
protected void removeMe(INodePO parent) {
((NodePO)parent).getNodeList().remove(this);
setParentNode(null);
}
/**
* Removes all child nodes and sets the parent of the child nodes
* to <code>null</code>
*/
public void removeAllNodes() {
Iterator<INodePO> iter = getNodeList().iterator();
while (iter.hasNext()) {
INodePO childNode = iter.next();
childNode.setParentNode(null);
iter.remove();
}
}
/**
* Returns the index of the given node in the node list.
* @param node the node whose index is want.
* @return the index of the given node.
*/
public int indexOf(INodePO node) {
return getNodeList().indexOf(node);
}
/**
* Returns the valis staus of the node.<br>
* Normally all Nodes are valid. only CapPOs with an InvalidComponent
* should return false.
* @return true if the Node is valid, false otherwise.
*/
@Transient
public boolean isValid() {
return true;
}
/**
* {@inheritDoc}
*/
public int hashCode() { // NOPMD by al on 3/19/07 1:35 PM
return getGuid().hashCode();
}
/**
*
* {@inheritDoc}
*/
@Transient
public Iterator<INodePO> getNodeListIterator() {
List<INodePO> nodeList = Collections.unmodifiableList(getNodeList());
return nodeList.iterator();
}
/**
* @return size of nodeList
*/
@Transient
public int getNodeListSize() {
return getNodeList().size();
}
/**
* {@inheritDoc}
*/
public String toString() {
return super.toString() + StringConstants.SPACE
+ StringConstants.LEFT_PARENTHESES + getName()
+ StringConstants.RIGHT_PARENTHESES;
}
/**
* @return Returns the id.
*/
@Id
@GeneratedValue
public Long getId() {
return m_id;
}
/**
* @param id The id to set.
*/
void setId(Long id) {
m_id = id;
}
/**
*
* @return Long
*/
@Version
@Column(name = "VERSION")
public Integer getVersion() {
return m_version;
}
/**
* @param version The version to set.
*/
@SuppressWarnings("unused")
private void setVersion(Integer version) {
m_version = version;
}
/**
*
* @return the GUID.
*/
@Basic
@Column(name = "GUID")
@Index(name = "PI_NODE_GUID")
public String getGuid() {
return m_guid;
}
/**
* @param guid The GUID to set.
*/
private void setGuid(String guid) {
m_guid = guid;
}
/**
* Checks for circular dependences with a potential parent.
* @param parent the parent to check
* @return true if there is a circular dependence, false otherwise.
*/
public boolean hasCircularDependences(INodePO parent) {
DependencyCheckerOp op = new DependencyCheckerOp(parent);
TreeTraverser traverser = new TreeTraverser(this, op);
traverser.traverse(true);
return op.hasDependency();
}
/**
* Checks the equality of the given Object with this Object.
* {@inheritDoc}
* @param obj the object to check
* @return if there is a database ID it returns true if the ID is equal.
* If there is no ID it will be compared to identity.
*/
public boolean equals(Object obj) { // NOPMD by al on 3/19/07 1:35 PM
if (this == obj) {
return true;
}
if (!(obj instanceof NodePO || obj instanceof INodePO)) {
return false;
}
INodePO o = (INodePO)obj;
return getGuid().equals(o.getGuid());
}
/**
*
* {@inheritDoc}
*/
@Transient
public Long getParentProjectId() {
return getHbmParentProjectId();
}
/**
*
* {@inheritDoc}
*/
public void setParentProjectId(Long projectId) {
setHbmParentProjectId(projectId);
for (INodePO node : getHbmNodeList()) {
node.setParentProjectId(projectId);
}
}
/**
*
* {@inheritDoc}
*/
@Basic
@Column(name = "PARENT_PROJ")
@Index(name = "PI_NODE_PARENT_PROJ")
Long getHbmParentProjectId() {
return m_parentProjectId;
}
/**
*
* {@inheritDoc}
*/
void setHbmParentProjectId(Long projectId) {
m_parentProjectId = projectId;
}
/**
* @return the current toolkit level of this node.
*/
@Transient
public String getToolkitLevel() {
return m_toolkitLevel;
}
/**
* Sets the current toolkit level of this node.
* @param toolkitLevel the toolkit level.
*/
public void setToolkitLevel(String toolkitLevel) {
m_toolkitLevel = toolkitLevel;
}
/**
*
* {@inheritDoc}
*/
@Basic
public long getTimestamp() {
return m_timestamp;
}
/**
* {@inheritDoc}
*/
public void setTimestamp(long timestamp) {
m_timestamp = timestamp;
}
/**
*
* @return the isGenerated Attribute for all nodes
*/
@Basic(optional = false)
@Column(name = "IS_GENERATED")
public boolean isGenerated() {
return m_isGenerated;
}
/**
* @param isGenerated the isGenerated to set
*/
public void setGenerated(boolean isGenerated) {
m_isGenerated = isGenerated;
}
/**
* @param isActive the isActive to set
*/
public void setActive(boolean isActive) {
m_isActive = isActive;
}
/**
*
* @return the isActive Attribute for all nodes
*/
@Basic(optional = false)
@Column(name = "IS_ACTIVE")
public boolean isActive() {
return m_isActive;
}
/** {@inheritDoc} */
public boolean addProblem(IProblem problem) {
if (isActive()) {
return m_problems.add(problem);
}
return false;
}
/** {@inheritDoc} */
public boolean removeProblem(IProblem problem) {
return m_problems.remove(problem);
}
/** {@inheritDoc} */
public Set<IProblem> getProblems() {
return Collections.unmodifiableSet(m_problems);
}
/**
* gets the value of the taskId property
*
* @return the taskId of the node
*/
@Basic
@Column(name = "TASK_ID", length = MAX_STRING_LENGTH)
public String getTaskId() {
return m_taskId;
}
/**
* For Persistence (JPA / EclipseLink) only
* Sets the value of the taskId property. If the length of
* the trimmed new taskId string is zero, the taskId property
* is set to null.
*
* @param taskId
* the new value of the taskId property
*/
public void setTaskId(String taskId) {
String newTaskId = taskId;
if (newTaskId != null) {
newTaskId = newTaskId.trim();
if (newTaskId.length() == 0) {
newTaskId = null;
}
}
m_taskId = newTaskId;
}
/**
* Only for Persistence (JPA / EclipseLink).
* @param trackedChangesMap The tracked changes as a map of time stamp as key and comment as value.
*/
@SuppressWarnings("unused")
private void setTrackedChangesMap(Map<Long, String> trackedChangesMap) {
this.m_trackedChangesMap = trackedChangesMap;
}
/**
* Only for Persistence (JPA / EclipseLink).
* @return The map of change information.
*/
@ElementCollection
@CollectionTable(name = "NODE_TRACK",
joinColumns = @JoinColumn(name = "NODE_ID", nullable = false))
@MapKeyColumn(name = "TIMESTAMP", nullable = false)
@Column(name = "TRACK_COMMENT")
private Map<Long, String> getTrackedChangesMap() {
return m_trackedChangesMap;
}
/**
* {@inheritDoc}
*/
public void addTrackedChange(String optionalComment) {
- final boolean isTrackingChanges = GeneralStorage.getInstance()
- .getProject().getIsTrackingActivated();
+ final IProjectPO project = GeneralStorage.getInstance().getProject();
+ boolean isTrackingChanges = false;
+ if (project != null) {
+ isTrackingChanges = project.getIsTrackingActivated();
+ }
if (isTrackingChanges) {
final long timestamp = new Date().getTime();
// remove tracked changes, if there are more than 30
// placeholder for data from project properties
int maxTrackedChangesPerNode = 30;
final long maxDurationOfTrackedChangesInMS =
1000L * 60 * 60 * 24 * 80;
if (maxTrackedChangesPerNode >= 0) {
while (m_trackedChangesMap.size() >= maxTrackedChangesPerNode) {
int removeCount = m_trackedChangesMap.size()
- maxTrackedChangesPerNode;
while (removeCount > 0) {
m_trackedChangesMap
.remove(getTrackedChanges().firstKey());
}
}
}
// remove tracked changes older than 80 days
if (maxDurationOfTrackedChangesInMS >= 0) {
SortedMap<Long, String> changes = getTrackedChanges();
while (changes.size() > 0
&& timestamp - changes.firstKey()
> maxDurationOfTrackedChangesInMS) {
m_trackedChangesMap.remove(changes.firstKey());
}
}
String systemPropertyName = GeneralStorage.getInstance()
.getProject().getProjectProperties()
.getTrackChangesSignature();
StringBuffer comment = new StringBuffer(
System.getProperty(systemPropertyName, "")); //$NON-NLS-1$
if (optionalComment != null) {
comment.append(": "); //$NON-NLS-1$
comment.append(optionalComment);
}
m_trackedChangesMap.put(timestamp, comment.toString());
}
}
/**
* {@inheritDoc}
*/
public SortedMap<Long, String> getTrackedChanges() {
SortedMap<Long, String> sortedMap = new TreeMap<Long, String>();
for (Long key : m_trackedChangesMap.keySet()) {
sortedMap.put(key, m_trackedChangesMap.get(key));
}
return sortedMap;
}
}
| true | true | public void addTrackedChange(String optionalComment) {
final boolean isTrackingChanges = GeneralStorage.getInstance()
.getProject().getIsTrackingActivated();
if (isTrackingChanges) {
final long timestamp = new Date().getTime();
// remove tracked changes, if there are more than 30
// placeholder for data from project properties
int maxTrackedChangesPerNode = 30;
final long maxDurationOfTrackedChangesInMS =
1000L * 60 * 60 * 24 * 80;
if (maxTrackedChangesPerNode >= 0) {
while (m_trackedChangesMap.size() >= maxTrackedChangesPerNode) {
int removeCount = m_trackedChangesMap.size()
- maxTrackedChangesPerNode;
while (removeCount > 0) {
m_trackedChangesMap
.remove(getTrackedChanges().firstKey());
}
}
}
// remove tracked changes older than 80 days
if (maxDurationOfTrackedChangesInMS >= 0) {
SortedMap<Long, String> changes = getTrackedChanges();
while (changes.size() > 0
&& timestamp - changes.firstKey()
> maxDurationOfTrackedChangesInMS) {
m_trackedChangesMap.remove(changes.firstKey());
}
}
String systemPropertyName = GeneralStorage.getInstance()
.getProject().getProjectProperties()
.getTrackChangesSignature();
StringBuffer comment = new StringBuffer(
System.getProperty(systemPropertyName, "")); //$NON-NLS-1$
if (optionalComment != null) {
comment.append(": "); //$NON-NLS-1$
comment.append(optionalComment);
}
m_trackedChangesMap.put(timestamp, comment.toString());
}
}
| public void addTrackedChange(String optionalComment) {
final IProjectPO project = GeneralStorage.getInstance().getProject();
boolean isTrackingChanges = false;
if (project != null) {
isTrackingChanges = project.getIsTrackingActivated();
}
if (isTrackingChanges) {
final long timestamp = new Date().getTime();
// remove tracked changes, if there are more than 30
// placeholder for data from project properties
int maxTrackedChangesPerNode = 30;
final long maxDurationOfTrackedChangesInMS =
1000L * 60 * 60 * 24 * 80;
if (maxTrackedChangesPerNode >= 0) {
while (m_trackedChangesMap.size() >= maxTrackedChangesPerNode) {
int removeCount = m_trackedChangesMap.size()
- maxTrackedChangesPerNode;
while (removeCount > 0) {
m_trackedChangesMap
.remove(getTrackedChanges().firstKey());
}
}
}
// remove tracked changes older than 80 days
if (maxDurationOfTrackedChangesInMS >= 0) {
SortedMap<Long, String> changes = getTrackedChanges();
while (changes.size() > 0
&& timestamp - changes.firstKey()
> maxDurationOfTrackedChangesInMS) {
m_trackedChangesMap.remove(changes.firstKey());
}
}
String systemPropertyName = GeneralStorage.getInstance()
.getProject().getProjectProperties()
.getTrackChangesSignature();
StringBuffer comment = new StringBuffer(
System.getProperty(systemPropertyName, "")); //$NON-NLS-1$
if (optionalComment != null) {
comment.append(": "); //$NON-NLS-1$
comment.append(optionalComment);
}
m_trackedChangesMap.put(timestamp, comment.toString());
}
}
|
diff --git a/src/com/time/master/view/TabTextView.java b/src/com/time/master/view/TabTextView.java
index 87b8f7a..0ba4961 100644
--- a/src/com/time/master/view/TabTextView.java
+++ b/src/com/time/master/view/TabTextView.java
@@ -1,125 +1,125 @@
package com.time.master.view;
import com.time.master.TimeMasterApplication;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Paint.Style;
import android.util.AttributeSet;
import android.view.Gravity;
import android.widget.RelativeLayout;
import android.widget.RelativeLayout.LayoutParams;
public class TabTextView extends SelectedTextView {
Context context;
protected int screen_width,
screen_height,
unit_width,//view �����
gap,//view�ļ������
screen_mode; //1�������� �� 2��������
protected RelativeLayout.LayoutParams params=(LayoutParams) this.getLayoutParams();
Paint mPaint,marginPaint,linePaint;
boolean hasRightEdge=false;
float strokeWdith=10f;
public TabTextView(Context context) {
super(context);
init(context);
}
public TabTextView(Context context, AttributeSet attrs) {
super(context, attrs);
init(context);
}
public TabTextView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
init(context);
}
/***
* ��ʼ�����в���
*/
protected void init(Context context){
this.context=context;
screen_mode=context.getResources().getConfiguration().orientation;
screen_width=TimeMasterApplication.getInstance().getScreen_W();
screen_height=TimeMasterApplication.getInstance().getScreen_H();
unit_width=screen_mode==Configuration.ORIENTATION_PORTRAIT?screen_width/6:screen_height/6;
gap=screen_mode==Configuration.ORIENTATION_PORTRAIT?screen_width/36:screen_height/36;
mPaint=new Paint();
mPaint.setColor(0xFFCCCCCC);
marginPaint=new Paint();
marginPaint.setColor(0xFFFFFFFF);
linePaint=new Paint();
linePaint.setColor(0xFFCCCCCC);
linePaint.setStyle(Style.STROKE);
linePaint.setStrokeWidth(strokeWdith);
linePaint.setAntiAlias(true); // �������
linePaint.setFlags(Paint.ANTI_ALIAS_FLAG); // �������
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
// if(!hasRightEdge)
// this.setMeasuredDimension(gap+unit_width, (int)(unit_width*0.75)+(int)strokeWdith);
// else
// this.setMeasuredDimension(gap+unit_width+gap, (int)(unit_width*0.75)+(int)strokeWdith);
screen_mode=context.getResources().getConfiguration().orientation;
if(screen_mode==Configuration.ORIENTATION_PORTRAIT)
this.setMeasuredDimension(screen_width/5, (int)(unit_width*0.75)+(int)strokeWdith);
else
this.setMeasuredDimension(screen_width/5, (int)(unit_width*0.75)+gap);
//super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
@Override
protected void onDraw(Canvas canvas) {
// canvas.drawRect(0, 0, gap, unit_width*0.75f, marginPaint);//��߿�
// canvas.drawRect(gap, 0, gap+unit_width, unit_width*0.75f, mPaint);//�����
// if(hasRightEdge)
// canvas.drawRect(gap+unit_width, 0, gap+gap+unit_width, unit_width*0.75f, marginPaint);//�ұ߿�
//
// canvas.drawLine(0, unit_width*0.75f+strokeWdith/2, unit_width+gap+(hasRightEdge?gap:0), unit_width*0.75f+strokeWdith/2, linePaint);
if(screen_mode==Configuration.ORIENTATION_PORTRAIT){
canvas.drawRect(0, 0, gap/2, unit_width*0.75f, marginPaint);//��߿�
canvas.drawRect(gap/2, 0, screen_width/5-gap/2, unit_width*0.75f, mPaint);//�����
canvas.drawRect(screen_width/5-gap/2, 0, screen_width/5, unit_width*0.75f, marginPaint);//�ұ߿�
canvas.drawLine(0, unit_width*0.75f+strokeWdith/2, screen_width/5, unit_width*0.75f+strokeWdith/2, linePaint);
}else{
canvas.drawRect(0, 0, gap/2, getMeasuredHeight(), marginPaint);//��߿�
canvas.drawRect(0, 0, getMeasuredWidth(),gap/2, marginPaint);//�ϱ߿�
canvas.drawRect(gap/2, 0, getMeasuredWidth()-gap/2, getMeasuredHeight()-gap/2, mPaint);//�����
- canvas.drawRect(0, getMeasuredHeightAndState()-gap/2, getMeasuredWidth(), getMeasuredHeight(), marginPaint);//�±߿�
+ canvas.drawRect(0, getMeasuredWidth()-gap/2, getMeasuredWidth(), getMeasuredHeight(), marginPaint);//�±߿�
canvas.drawRect(screen_width/5-gap/2, 0, screen_width/5, getMeasuredHeight(), marginPaint);//�ұ߿�
canvas.drawLine(getMeasuredWidth()-gap/2+strokeWdith/2, 0, getMeasuredWidth()-gap/2+strokeWdith/2, getMeasuredHeight(), linePaint);
}
super.onDraw(canvas);
}
public TabTextView setCenterText(String text){
this.setText(text);
this.setTextColor(0xFF000000);
this.setGravity(Gravity.CENTER);
//params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 0);
//params.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
return this;
}
public void setCenterBackgroud(int color){
this.naturalColor=color;
mPaint.setColor(naturalColor);
}
public void setRightMargin(){
hasRightEdge=true;
}
@Override
protected void actionDown() {
}
@Override
protected void actionUp() {
}
}
| true | true | protected void onDraw(Canvas canvas) {
// canvas.drawRect(0, 0, gap, unit_width*0.75f, marginPaint);//��߿�
// canvas.drawRect(gap, 0, gap+unit_width, unit_width*0.75f, mPaint);//�����
// if(hasRightEdge)
// canvas.drawRect(gap+unit_width, 0, gap+gap+unit_width, unit_width*0.75f, marginPaint);//�ұ߿�
//
// canvas.drawLine(0, unit_width*0.75f+strokeWdith/2, unit_width+gap+(hasRightEdge?gap:0), unit_width*0.75f+strokeWdith/2, linePaint);
if(screen_mode==Configuration.ORIENTATION_PORTRAIT){
canvas.drawRect(0, 0, gap/2, unit_width*0.75f, marginPaint);//��߿�
canvas.drawRect(gap/2, 0, screen_width/5-gap/2, unit_width*0.75f, mPaint);//�����
canvas.drawRect(screen_width/5-gap/2, 0, screen_width/5, unit_width*0.75f, marginPaint);//�ұ߿�
canvas.drawLine(0, unit_width*0.75f+strokeWdith/2, screen_width/5, unit_width*0.75f+strokeWdith/2, linePaint);
}else{
canvas.drawRect(0, 0, gap/2, getMeasuredHeight(), marginPaint);//��߿�
canvas.drawRect(0, 0, getMeasuredWidth(),gap/2, marginPaint);//�ϱ߿�
canvas.drawRect(gap/2, 0, getMeasuredWidth()-gap/2, getMeasuredHeight()-gap/2, mPaint);//�����
canvas.drawRect(0, getMeasuredHeightAndState()-gap/2, getMeasuredWidth(), getMeasuredHeight(), marginPaint);//�±߿�
canvas.drawRect(screen_width/5-gap/2, 0, screen_width/5, getMeasuredHeight(), marginPaint);//�ұ߿�
canvas.drawLine(getMeasuredWidth()-gap/2+strokeWdith/2, 0, getMeasuredWidth()-gap/2+strokeWdith/2, getMeasuredHeight(), linePaint);
}
super.onDraw(canvas);
}
| protected void onDraw(Canvas canvas) {
// canvas.drawRect(0, 0, gap, unit_width*0.75f, marginPaint);//��߿�
// canvas.drawRect(gap, 0, gap+unit_width, unit_width*0.75f, mPaint);//�����
// if(hasRightEdge)
// canvas.drawRect(gap+unit_width, 0, gap+gap+unit_width, unit_width*0.75f, marginPaint);//�ұ߿�
//
// canvas.drawLine(0, unit_width*0.75f+strokeWdith/2, unit_width+gap+(hasRightEdge?gap:0), unit_width*0.75f+strokeWdith/2, linePaint);
if(screen_mode==Configuration.ORIENTATION_PORTRAIT){
canvas.drawRect(0, 0, gap/2, unit_width*0.75f, marginPaint);//��߿�
canvas.drawRect(gap/2, 0, screen_width/5-gap/2, unit_width*0.75f, mPaint);//�����
canvas.drawRect(screen_width/5-gap/2, 0, screen_width/5, unit_width*0.75f, marginPaint);//�ұ߿�
canvas.drawLine(0, unit_width*0.75f+strokeWdith/2, screen_width/5, unit_width*0.75f+strokeWdith/2, linePaint);
}else{
canvas.drawRect(0, 0, gap/2, getMeasuredHeight(), marginPaint);//��߿�
canvas.drawRect(0, 0, getMeasuredWidth(),gap/2, marginPaint);//�ϱ߿�
canvas.drawRect(gap/2, 0, getMeasuredWidth()-gap/2, getMeasuredHeight()-gap/2, mPaint);//�����
canvas.drawRect(0, getMeasuredWidth()-gap/2, getMeasuredWidth(), getMeasuredHeight(), marginPaint);//�±߿�
canvas.drawRect(screen_width/5-gap/2, 0, screen_width/5, getMeasuredHeight(), marginPaint);//�ұ߿�
canvas.drawLine(getMeasuredWidth()-gap/2+strokeWdith/2, 0, getMeasuredWidth()-gap/2+strokeWdith/2, getMeasuredHeight(), linePaint);
}
super.onDraw(canvas);
}
|
diff --git a/src/com/mcprohosting/plugins/imraising/WhitelistHandler.java b/src/com/mcprohosting/plugins/imraising/WhitelistHandler.java
index 2d7bdd1..259e4f2 100644
--- a/src/com/mcprohosting/plugins/imraising/WhitelistHandler.java
+++ b/src/com/mcprohosting/plugins/imraising/WhitelistHandler.java
@@ -1,48 +1,48 @@
package com.mcprohosting.plugins.imraising;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.json.JSONArray;
import org.json.JSONObject;
public class WhitelistHandler {
public static void whitelistFromJSON(JSONObject jsonObject) {
JSONArray donationJSON = jsonObject.getJSONArray("donation");
for (int i = 0; i < donationJSON.length(); i++) {
String jsonObjectString = donationJSON.get(i).toString();
String playerName = jsonObjectString.substring(jsonObjectString.indexOf("custom")+9, jsonObjectString.length()-2);
double donationAmount = 0;
String message = jsonObjectString.substring(jsonObjectString.indexOf("comment\":")+10, jsonObjectString.indexOf("custom")-3);
if (!Bukkit.getWhitelistedPlayers().contains(playerName)) {
try {
donationAmount = Double.parseDouble(jsonObjectString.substring(jsonObjectString.indexOf("amount:")+11, jsonObjectString.indexOf(",\"screen")));
} catch(Exception e) {
System.out.println("Invalid data for donation amount from array!");
}
if (donationAmount >= 25) {
- Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "whitelist add " + playerName);
+ Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "whitelist add " + playerName);
whitelistPlayer(playerName);
Bukkit.broadcastMessage(ChatColor.GREEN + "Thank you to " + ChatColor.YELLOW + playerName + ChatColor.GREEN + " for donating " + ChatColor.YELLOW + "$" + donationAmount + ChatColor.GREEN + "!");
Bukkit.broadcastMessage(ChatColor.GREEN + message);
}
}
}
}
public static void whitelistPlayer(String playername) {
OfflinePlayer player = Bukkit.getOfflinePlayer(playername);
if (!Bukkit.getWhitelistedPlayers().contains(player)) {
Bukkit.getWhitelistedPlayers().add(player);
}
}
}
| true | true | public static void whitelistFromJSON(JSONObject jsonObject) {
JSONArray donationJSON = jsonObject.getJSONArray("donation");
for (int i = 0; i < donationJSON.length(); i++) {
String jsonObjectString = donationJSON.get(i).toString();
String playerName = jsonObjectString.substring(jsonObjectString.indexOf("custom")+9, jsonObjectString.length()-2);
double donationAmount = 0;
String message = jsonObjectString.substring(jsonObjectString.indexOf("comment\":")+10, jsonObjectString.indexOf("custom")-3);
if (!Bukkit.getWhitelistedPlayers().contains(playerName)) {
try {
donationAmount = Double.parseDouble(jsonObjectString.substring(jsonObjectString.indexOf("amount:")+11, jsonObjectString.indexOf(",\"screen")));
} catch(Exception e) {
System.out.println("Invalid data for donation amount from array!");
}
if (donationAmount >= 25) {
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "whitelist add " + playerName);
whitelistPlayer(playerName);
Bukkit.broadcastMessage(ChatColor.GREEN + "Thank you to " + ChatColor.YELLOW + playerName + ChatColor.GREEN + " for donating " + ChatColor.YELLOW + "$" + donationAmount + ChatColor.GREEN + "!");
Bukkit.broadcastMessage(ChatColor.GREEN + message);
}
}
}
}
| public static void whitelistFromJSON(JSONObject jsonObject) {
JSONArray donationJSON = jsonObject.getJSONArray("donation");
for (int i = 0; i < donationJSON.length(); i++) {
String jsonObjectString = donationJSON.get(i).toString();
String playerName = jsonObjectString.substring(jsonObjectString.indexOf("custom")+9, jsonObjectString.length()-2);
double donationAmount = 0;
String message = jsonObjectString.substring(jsonObjectString.indexOf("comment\":")+10, jsonObjectString.indexOf("custom")-3);
if (!Bukkit.getWhitelistedPlayers().contains(playerName)) {
try {
donationAmount = Double.parseDouble(jsonObjectString.substring(jsonObjectString.indexOf("amount:")+11, jsonObjectString.indexOf(",\"screen")));
} catch(Exception e) {
System.out.println("Invalid data for donation amount from array!");
}
if (donationAmount >= 25) {
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "whitelist add " + playerName);
whitelistPlayer(playerName);
Bukkit.broadcastMessage(ChatColor.GREEN + "Thank you to " + ChatColor.YELLOW + playerName + ChatColor.GREEN + " for donating " + ChatColor.YELLOW + "$" + donationAmount + ChatColor.GREEN + "!");
Bukkit.broadcastMessage(ChatColor.GREEN + message);
}
}
}
}
|
diff --git a/com.piece_framework.makegood.ui/src/com/piece_framework/makegood/ui/views/ResultViewController.java b/com.piece_framework.makegood.ui/src/com/piece_framework/makegood/ui/views/ResultViewController.java
index 03b48f31..fcad83b8 100644
--- a/com.piece_framework.makegood.ui/src/com/piece_framework/makegood/ui/views/ResultViewController.java
+++ b/com.piece_framework.makegood.ui/src/com/piece_framework/makegood/ui/views/ResultViewController.java
@@ -1,334 +1,335 @@
/**
* Copyright (c) 2009-2010 MATSUFUJI Hideharu <[email protected]>,
* 2010-2011 KUBO Atsuhiro <[email protected]>,
* All rights reserved.
*
* This file is part of MakeGood.
*
* 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
*/
package com.piece_framework.makegood.ui.views;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.IDebugEventSetListener;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.debug.internal.ui.views.console.ProcessConsole;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.php.internal.debug.core.model.IPHPDebugTarget;
import org.eclipse.ui.console.ConsolePlugin;
import org.eclipse.ui.console.IConsole;
import org.eclipse.ui.console.IConsoleConstants;
import org.eclipse.ui.console.IOConsoleOutputStream;
import org.eclipse.ui.progress.UIJob;
import com.piece_framework.makegood.core.result.TestCaseResult;
import com.piece_framework.makegood.core.result.TestSuiteResult;
import com.piece_framework.makegood.core.run.ResultReaderListener;
import com.piece_framework.makegood.launch.MakeGoodLaunch;
import com.piece_framework.makegood.launch.TestLifecycle;
import com.piece_framework.makegood.launch.TestingTargets;
import com.piece_framework.makegood.ui.Activator;
import com.piece_framework.makegood.ui.MakeGoodContext;
import com.piece_framework.makegood.ui.actions.StopTestAction;
import com.piece_framework.makegood.ui.markers.FatalErrorMarkerFactory;
import com.piece_framework.makegood.ui.markers.TestMarkerFactory;
import com.piece_framework.makegood.ui.markers.UnknownFatalErrorMessageException;
import com.piece_framework.makegood.ui.widgets.ResultSquare;
public class ResultViewController implements IDebugEventSetListener {
private static final String MAKEGOOD_RESULTVIEWCONTROLLER_MARKER_CREATE = "MAKEGOOD_RESULTVIEWCONTROLLER_MARKER_CREATE"; //$NON-NLS-1$
private static final String MAKEGOOD_RESULTVIEWCONTROLLER_MARKER_TERMINATE = "MAKEGOOD_RESULTVIEWCONTROLLER_MARKER_TERMINATE"; //$NON-NLS-1$
private TestLifecycle testLifecycle;
@Override
public void handleDebugEvents(DebugEvent[] events) {
if (events == null) return;
int size = events.length;
for (int i = 0; i < size; ++i) {
final Object source = events[i].getSource();
ILaunch launch = getLaunch(source);
if (launch == null) continue;
if (!(launch instanceof MakeGoodLaunch)) continue;
if (events[i].getKind() == DebugEvent.CREATE) {
handleCreateEvent((MakeGoodLaunch) launch);
} else if (events[i].getKind() == DebugEvent.TERMINATE) {
handleTerminateEvent((MakeGoodLaunch) launch);
}
}
}
private void handleCreateEvent(final MakeGoodLaunch launch) {
// TODO This marker is to avoid calling create() twice by PDT.
if (createEventFired(launch)) {
return;
}
markAsCreateEventFired(launch);
if (terminateEventFired(launch)) {
return;
}
testLifecycle = TestLifecycle.getInstance();
try {
testLifecycle.start(new ResultProjector());
} catch (CoreException e) {
Activator.getDefault().getLog().log(new Status(Status.WARNING, Activator.PLUGIN_ID, e.getMessage(), e));
return;
}
preventConsoleViewFocusing();
Job job = new UIJob("MakeGood Test Start") { //$NON-NLS-1$
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
ResultView resultView = (ResultView) ViewOpener.show(ResultView.VIEW_ID);
MakeGoodContext.getInstance().getTestRunner().restoreFocusToLastActivePart();
if (resultView != null) {
resultView.startTest(testLifecycle);
}
ResultSquare.getInstance().startTest();
try {
new TestMarkerFactory().clear(TestingTargets.getInstance().getProject());
new FatalErrorMarkerFactory().clear(TestingTargets.getInstance().getProject());
} catch (CoreException e) {
Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
}
return Status.OK_STATUS;
}
};
job.schedule();
}
private void handleTerminateEvent(final MakeGoodLaunch launch) {
// TODO This code is to avoid calling terminate() twice by PDT.
if (terminateEventFired(launch)) {
return;
}
markAsTerminateEventFired(launch);
if (!createEventFired(launch)) {
+ TestLifecycle.destroy();
return;
}
if (!testLifecycle.validateLaunchIdentity(launch)) {
return;
}
testLifecycle.end();
Job job = new UIJob("MakeGood Test End") { //$NON-NLS-1$
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
ResultSquare.getInstance().endTest();
if (testLifecycle.getProgress().hasFailures()) {
ResultSquare.getInstance().markAsFailed();
} else {
ResultSquare.getInstance().markAsPassed();
}
ResultView resultView = (ResultView) ViewOpener.find(ResultView.VIEW_ID);
if (resultView != null) {
resultView.endTest();
}
if (testLifecycle.hasErrors()) {
ResultSquare.getInstance().markAsStopped();
if (resultView != null) {
resultView.markAsStopped();
}
if (!StopTestAction.isStoppedByAction(launch)) {
FatalErrorMarkerFactory markerFactory = new FatalErrorMarkerFactory();
try {
IMarker marker = markerFactory.create(testLifecycle.getStreamOutput());
if (marker != null) {
EditorOpener.open(marker);
} else {
ViewOpener.show(IConsoleConstants.ID_CONSOLE_VIEW);
EditorOpener.open(markerFactory.getFile(), markerFactory.getLine());
}
} catch (CoreException e) {
Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
} catch (UnknownFatalErrorMessageException e) {
Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, e.getMessage(), e));
ViewOpener.show(IConsoleConstants.ID_CONSOLE_VIEW);
}
}
} else {
if (resultView != null) {
resultView.collapseResultTree();
}
}
TestLifecycle.destroy();
return Status.OK_STATUS;
}
};
job.schedule();
}
private void preventConsoleViewFocusing() {
for (IConsole console: ConsolePlugin.getDefault().getConsoleManager().getConsoles()) {
if (!(console instanceof ProcessConsole)) continue;
IOConsoleOutputStream stdoutStream = ((ProcessConsole) console).getStream(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM);
if (stdoutStream == null) continue;
stdoutStream.setActivateOnWrite(false);
IOConsoleOutputStream stderrStream = ((ProcessConsole) console).getStream(IDebugUIConstants.ID_STANDARD_ERROR_STREAM);
if (stderrStream == null) continue;
stderrStream.setActivateOnWrite(false);
}
}
private ILaunch getLaunch(Object eventSource) {
if (eventSource instanceof IPHPDebugTarget) {
return ((IPHPDebugTarget) eventSource).getLaunch();
} else if (eventSource instanceof IProcess) {
return ((IProcess) eventSource).getLaunch();
} else {
return null;
}
}
private void markAsCreateEventFired(ILaunch launch) {
launch.setAttribute(MAKEGOOD_RESULTVIEWCONTROLLER_MARKER_CREATE, Boolean.TRUE.toString());
}
private boolean createEventFired(ILaunch launch) {
String isCreated = launch.getAttribute(MAKEGOOD_RESULTVIEWCONTROLLER_MARKER_CREATE);
if (isCreated == null) return false;
return Boolean.TRUE.toString().equals(isCreated);
}
private void markAsTerminateEventFired(ILaunch launch) {
launch.setAttribute(MAKEGOOD_RESULTVIEWCONTROLLER_MARKER_TERMINATE, Boolean.TRUE.toString());
}
private boolean terminateEventFired(ILaunch launch) {
String isTerminated = launch.getAttribute(MAKEGOOD_RESULTVIEWCONTROLLER_MARKER_TERMINATE);
if (isTerminated == null) return false;
return Boolean.TRUE.toString().equals(isTerminated);
}
public class ResultProjector implements ResultReaderListener {
@Override
public void startTestSuite(TestSuiteResult testSuite) {
}
@Override
public void endTestSuite(TestSuiteResult testSuite) {
}
@Override
public void startTestCase(final TestCaseResult testCase) {
Job job = new UIJob("MakeGood Test Case Start") { //$NON-NLS-1$
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
ResultView resultView = (ResultView) ViewOpener.find(ResultView.VIEW_ID);
if (resultView != null) {
resultView.printCurrentlyRunningTestCase(testCase);
resultView.updateOnStartTestCase();
}
return Status.OK_STATUS;
}
};
job.schedule();
try {
job.join();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
@Override
public void endTestCase(final TestCaseResult testCase) {
Job job = new UIJob("MakeGood Test Case End") { //$NON-NLS-1$
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
ResultView resultView = (ResultView) ViewOpener.find(ResultView.VIEW_ID);
if (resultView != null) {
resultView.updateOnEndTestCase();
}
return Status.OK_STATUS;
}
};
job.schedule();
}
@Override
public void startFailure(final TestCaseResult failure) {
Job job = new UIJob("MakeGood Marker Create") { //$NON-NLS-1$
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
try {
new TestMarkerFactory().create(failure);
} catch (CoreException e) {
Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
}
return Status.OK_STATUS;
}
};
job.schedule();
}
@Override
public void endFailure(TestCaseResult failure) {
}
/**
* @since 1.7.0
*/
@Override
public void startError(final TestCaseResult error) {
startFailure(error);
}
/**
* @since 1.7.0
*/
@Override
public void endError(TestCaseResult error) {
}
/**
* @since 1.7.0
*/
@Override
public void startTest() {
}
@Override
public void endTest() {
}
/**
* @since 1.7.0
*/
@Override
public void onFirstTestSuite(final TestSuiteResult testSuite) {
Job job = new UIJob("MakeGood Result Tree Set") { //$NON-NLS-1$
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
ResultView resultView = (ResultView) ViewOpener.find(ResultView.VIEW_ID);
if (resultView != null) {
resultView.setTreeInput(testSuite);
}
return Status.OK_STATUS;
}
};
job.schedule();
}
}
}
| true | true | private void handleTerminateEvent(final MakeGoodLaunch launch) {
// TODO This code is to avoid calling terminate() twice by PDT.
if (terminateEventFired(launch)) {
return;
}
markAsTerminateEventFired(launch);
if (!createEventFired(launch)) {
return;
}
if (!testLifecycle.validateLaunchIdentity(launch)) {
return;
}
testLifecycle.end();
Job job = new UIJob("MakeGood Test End") { //$NON-NLS-1$
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
ResultSquare.getInstance().endTest();
if (testLifecycle.getProgress().hasFailures()) {
ResultSquare.getInstance().markAsFailed();
} else {
ResultSquare.getInstance().markAsPassed();
}
ResultView resultView = (ResultView) ViewOpener.find(ResultView.VIEW_ID);
if (resultView != null) {
resultView.endTest();
}
if (testLifecycle.hasErrors()) {
ResultSquare.getInstance().markAsStopped();
if (resultView != null) {
resultView.markAsStopped();
}
if (!StopTestAction.isStoppedByAction(launch)) {
FatalErrorMarkerFactory markerFactory = new FatalErrorMarkerFactory();
try {
IMarker marker = markerFactory.create(testLifecycle.getStreamOutput());
if (marker != null) {
EditorOpener.open(marker);
} else {
ViewOpener.show(IConsoleConstants.ID_CONSOLE_VIEW);
EditorOpener.open(markerFactory.getFile(), markerFactory.getLine());
}
} catch (CoreException e) {
Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
} catch (UnknownFatalErrorMessageException e) {
Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, e.getMessage(), e));
ViewOpener.show(IConsoleConstants.ID_CONSOLE_VIEW);
}
}
} else {
if (resultView != null) {
resultView.collapseResultTree();
}
}
TestLifecycle.destroy();
return Status.OK_STATUS;
}
};
job.schedule();
}
| private void handleTerminateEvent(final MakeGoodLaunch launch) {
// TODO This code is to avoid calling terminate() twice by PDT.
if (terminateEventFired(launch)) {
return;
}
markAsTerminateEventFired(launch);
if (!createEventFired(launch)) {
TestLifecycle.destroy();
return;
}
if (!testLifecycle.validateLaunchIdentity(launch)) {
return;
}
testLifecycle.end();
Job job = new UIJob("MakeGood Test End") { //$NON-NLS-1$
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
ResultSquare.getInstance().endTest();
if (testLifecycle.getProgress().hasFailures()) {
ResultSquare.getInstance().markAsFailed();
} else {
ResultSquare.getInstance().markAsPassed();
}
ResultView resultView = (ResultView) ViewOpener.find(ResultView.VIEW_ID);
if (resultView != null) {
resultView.endTest();
}
if (testLifecycle.hasErrors()) {
ResultSquare.getInstance().markAsStopped();
if (resultView != null) {
resultView.markAsStopped();
}
if (!StopTestAction.isStoppedByAction(launch)) {
FatalErrorMarkerFactory markerFactory = new FatalErrorMarkerFactory();
try {
IMarker marker = markerFactory.create(testLifecycle.getStreamOutput());
if (marker != null) {
EditorOpener.open(marker);
} else {
ViewOpener.show(IConsoleConstants.ID_CONSOLE_VIEW);
EditorOpener.open(markerFactory.getFile(), markerFactory.getLine());
}
} catch (CoreException e) {
Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
} catch (UnknownFatalErrorMessageException e) {
Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, e.getMessage(), e));
ViewOpener.show(IConsoleConstants.ID_CONSOLE_VIEW);
}
}
} else {
if (resultView != null) {
resultView.collapseResultTree();
}
}
TestLifecycle.destroy();
return Status.OK_STATUS;
}
};
job.schedule();
}
|
diff --git a/surefire/src/main/java/org/codehaus/surefire/report/XMLReporter.java b/surefire/src/main/java/org/codehaus/surefire/report/XMLReporter.java
index 249f92d9..66d2c061 100644
--- a/surefire/src/main/java/org/codehaus/surefire/report/XMLReporter.java
+++ b/surefire/src/main/java/org/codehaus/surefire/report/XMLReporter.java
@@ -1,254 +1,261 @@
package org.codehaus.surefire.report;
/*
* Copyright 2001-2005 The Codehaus.
*
* 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.
*/
import java.io.File;
import java.io.FileWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.DecimalFormat;
import java.util.Enumeration;
import java.util.Properties;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomWriter;
import org.codehaus.surefire.util.StringUtils;
/**
* XML format reporter.
* @author <a href="mailto:[email protected]">Johnny R. Ruiz III</a>
* @version $Id: XMLReporter.java 61 2005-10-07 04:07:33Z jruiz $
*/
public class XMLReporter
extends AbstractReporter
{
private PrintWriter writer;
private Xpp3Dom testSuite;
private Xpp3Dom testCase;
private long batteryStartTime;
public void runStarting( int testCount )
{
}
public void batteryStarting( ReportEntry report )
throws Exception
{
batteryStartTime = System.currentTimeMillis();
File reportFile = new File( getReportsDirectory(), "TEST-" + report.getName() + ".xml" );
File reportDir = reportFile.getParentFile();
reportDir.mkdirs();
writer = new PrintWriter( new FileWriter( reportFile ) );
writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
testSuite = new Xpp3Dom("testsuite");
testSuite.setAttribute("name", report.getName());
showProperties();
}
public void batteryCompleted( ReportEntry report )
{
testSuite.setAttribute("tests", String.valueOf(this.getNbTests()) );
testSuite.setAttribute("errors", String.valueOf(this.getNbErrors()) );
testSuite.setAttribute("failures", String.valueOf(this.getNbFailures()) );
long runTime = System.currentTimeMillis() - this.batteryStartTime;
testSuite.setAttribute("time", elapsedTimeAsString( runTime ));
try
{
Xpp3DomWriter.write( writer, testSuite );
}
finally
{
IOUtil.close( writer );
}
}
public void testStarting( ReportEntry report )
{
super.testStarting(report);
String reportName;
if ( report.getName().indexOf( "(" ) > 0 )
{
reportName = report.getName().substring( 0, report.getName().indexOf( "(" ) );
}
else
{
reportName = report.getName();
}
testCase = createElement(testSuite, "testcase");
testCase.setAttribute("name", reportName);
}
public void testSucceeded( ReportEntry report )
{
super.testSucceeded(report);
long runTime = this.endTime - this.startTime;
testCase.setAttribute("time", elapsedTimeAsString( runTime ));
}
public void testError( ReportEntry report, String stdOut, String stdErr )
{
super.testError(report, stdOut, stdErr);
String stackTrace = getStackTrace(report);
Xpp3Dom error = createElement (testCase, "error");
String message = StringUtils.replace(report.getThrowable().getMessage(),"<","<");
message = StringUtils.replace(message,">", ">");
message = StringUtils.replace( message, "\"", """ );
- error.setAttribute("message", message);
+ if( message != null && !message.equals( "" ) )
+ {
+ error.setAttribute("message", message);
- error.setAttribute("type", stackTrace.substring(0, stackTrace.indexOf(":")));
+ error.setAttribute("type", stackTrace.substring(0, stackTrace.indexOf(":")));
+ }
+ else
+ {
+ error.setAttribute("type", stackTrace.substring(0, stackTrace.indexOf("Exception") + 9 ));
+ }
error.setValue(stackTrace);
createElement(testCase, "system-out").setValue(stdOut);
createElement(testCase, "system-err").setValue(stdErr);
long runTime = endTime - startTime;
testCase.setAttribute("time", elapsedTimeAsString( runTime ));
}
public void testFailed( ReportEntry report, String stdOut, String stdErr )
{
super.testFailed(report,stdOut,stdErr);
String stackTrace = getStackTrace(report);
Xpp3Dom failure = createElement (testCase, "failure");
String message = StringUtils.replace(report.getThrowable().getMessage(),"<","<");
message = StringUtils.replace(message,">", ">");
message = StringUtils.replace( message, "\"", """ );
failure.setAttribute("message", message);
failure.setAttribute("type", stackTrace.substring(0, stackTrace.indexOf(":")));
failure.setValue(getStackTrace(report));
createElement(testCase, "system-out").setValue(stdOut);
createElement(testCase, "system-err").setValue(stdErr);
long runTime = endTime - startTime;
testCase.setAttribute("time", elapsedTimeAsString( runTime ));
}
public void dispose()
{
errors = 0;
failures = 0;
completedCount = 0;
}
private Xpp3Dom createElement( Xpp3Dom element, String name )
{
Xpp3Dom component = new Xpp3Dom( name );
element.addChild( component );
return component;
}
/**
* Returns stacktrace as String.
* @param report ReportEntry object.
* @return stacktrace as string.
*/
private String getStackTrace(ReportEntry report)
{
StringWriter writer = new StringWriter();
report.getThrowable().printStackTrace(new PrintWriter(writer));
writer.flush();
return writer.toString();
}
/**
* Adds system properties to the XML report.
*
*/
private void showProperties()
{
Xpp3Dom properties = createElement(testSuite,"properties");
Xpp3Dom property;
Properties systemProperties = System.getProperties();
if ( systemProperties != null )
{
Enumeration propertyKeys = systemProperties.propertyNames();
while ( propertyKeys.hasMoreElements() )
{
String key = (String) propertyKeys.nextElement();
property = createElement(properties,"property");
property.setAttribute("name", key);
property.setAttribute("value", systemProperties.getProperty( key ));
}
}
}
protected String elapsedTimeAsString( long runTime )
{
DecimalFormat DECIMAL_FORMAT = new DecimalFormat( "##0.00" );
return DECIMAL_FORMAT.format( (double) runTime / 1000 );
}
}
| false | true | public void testError( ReportEntry report, String stdOut, String stdErr )
{
super.testError(report, stdOut, stdErr);
String stackTrace = getStackTrace(report);
Xpp3Dom error = createElement (testCase, "error");
String message = StringUtils.replace(report.getThrowable().getMessage(),"<","<");
message = StringUtils.replace(message,">", ">");
message = StringUtils.replace( message, "\"", """ );
error.setAttribute("message", message);
error.setAttribute("type", stackTrace.substring(0, stackTrace.indexOf(":")));
error.setValue(stackTrace);
createElement(testCase, "system-out").setValue(stdOut);
createElement(testCase, "system-err").setValue(stdErr);
long runTime = endTime - startTime;
testCase.setAttribute("time", elapsedTimeAsString( runTime ));
}
| public void testError( ReportEntry report, String stdOut, String stdErr )
{
super.testError(report, stdOut, stdErr);
String stackTrace = getStackTrace(report);
Xpp3Dom error = createElement (testCase, "error");
String message = StringUtils.replace(report.getThrowable().getMessage(),"<","<");
message = StringUtils.replace(message,">", ">");
message = StringUtils.replace( message, "\"", """ );
if( message != null && !message.equals( "" ) )
{
error.setAttribute("message", message);
error.setAttribute("type", stackTrace.substring(0, stackTrace.indexOf(":")));
}
else
{
error.setAttribute("type", stackTrace.substring(0, stackTrace.indexOf("Exception") + 9 ));
}
error.setValue(stackTrace);
createElement(testCase, "system-out").setValue(stdOut);
createElement(testCase, "system-err").setValue(stdErr);
long runTime = endTime - startTime;
testCase.setAttribute("time", elapsedTimeAsString( runTime ));
}
|
diff --git a/qcadoo-view/src/main/java/com/qcadoo/view/api/utils/FormUtils.java b/qcadoo-view/src/main/java/com/qcadoo/view/api/utils/FormUtils.java
index d176cddd2..d4d8ece12 100644
--- a/qcadoo-view/src/main/java/com/qcadoo/view/api/utils/FormUtils.java
+++ b/qcadoo-view/src/main/java/com/qcadoo/view/api/utils/FormUtils.java
@@ -1,54 +1,54 @@
/**
* ***************************************************************************
* Copyright (c) 2010 Qcadoo Limited
* Project: Qcadoo Framework
* Version: 1.1.5
*
* This file is part of Qcadoo.
*
* Qcadoo 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, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* ***************************************************************************
*/
package com.qcadoo.view.api.utils;
import com.qcadoo.model.api.Entity;
import com.qcadoo.view.api.components.FormComponent;
/**
* Helper class for Form
*
* @deprecated
*/
@Deprecated
public final class FormUtils {
private FormUtils() {
}
/**
* Set Entity which be used to fill this form
*
* @deprecated this method is deprecated, if you want set form's entity, use {@link FormComponent#setEntity(Entity)}
*
* @param form
* form which want to fill
* @param entity
* entity which be used to fill form
*/
@Deprecated
- public static final void setFormEntity(final FormComponent form, final Entity entity) {
+ public static void setFormEntity(final FormComponent form, final Entity entity) {
form.setEntity(entity);
}
}
| true | true | public static final void setFormEntity(final FormComponent form, final Entity entity) {
form.setEntity(entity);
}
| public static void setFormEntity(final FormComponent form, final Entity entity) {
form.setEntity(entity);
}
|
diff --git a/src/main/java/org/cc/exception/JsonView.java b/src/main/java/org/cc/exception/JsonView.java
index caf961d..6a59d29 100644
--- a/src/main/java/org/cc/exception/JsonView.java
+++ b/src/main/java/org/cc/exception/JsonView.java
@@ -1,48 +1,49 @@
package org.cc.exception;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.cc.response.CloudErrorResponse;
import org.cc.util.LogUtil;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.web.servlet.View;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.util.Map;
/**
* View is intended for rendering error response objects.
*
* Daneel Yaitskov
*/
public class JsonView implements View {
private static final Logger logger = LogUtil.get();
public static final String DATA_FIELD_NAME = "data";
@Resource
private ObjectMapper mapper;
@Override
public String getContentType() {
return "application/json";
}
@Override
public void render(Map<String, ?> model, HttpServletRequest request,
HttpServletResponse response) throws Exception {
Object data = model.get(DATA_FIELD_NAME);
+ response.setContentType("application/json");
OutputStream ostream = response.getOutputStream();
if (data == null) {
String err = "Model doesn't have field '" + DATA_FIELD_NAME + "'";
logger.error(err);
CloudErrorResponse cer = new CloudErrorResponse("JsonViewError", err);
mapper.writeValue(ostream, cer);
} else {
mapper.writeValue(ostream, data);
}
}
}
| true | true | public void render(Map<String, ?> model, HttpServletRequest request,
HttpServletResponse response) throws Exception {
Object data = model.get(DATA_FIELD_NAME);
OutputStream ostream = response.getOutputStream();
if (data == null) {
String err = "Model doesn't have field '" + DATA_FIELD_NAME + "'";
logger.error(err);
CloudErrorResponse cer = new CloudErrorResponse("JsonViewError", err);
mapper.writeValue(ostream, cer);
} else {
mapper.writeValue(ostream, data);
}
}
| public void render(Map<String, ?> model, HttpServletRequest request,
HttpServletResponse response) throws Exception {
Object data = model.get(DATA_FIELD_NAME);
response.setContentType("application/json");
OutputStream ostream = response.getOutputStream();
if (data == null) {
String err = "Model doesn't have field '" + DATA_FIELD_NAME + "'";
logger.error(err);
CloudErrorResponse cer = new CloudErrorResponse("JsonViewError", err);
mapper.writeValue(ostream, cer);
} else {
mapper.writeValue(ostream, data);
}
}
|
diff --git a/src/main/java/net/nunnerycode/bukkit/mythicdrops/items/MythicDropBuilder.java b/src/main/java/net/nunnerycode/bukkit/mythicdrops/items/MythicDropBuilder.java
index 2eff29bc..52f35396 100644
--- a/src/main/java/net/nunnerycode/bukkit/mythicdrops/items/MythicDropBuilder.java
+++ b/src/main/java/net/nunnerycode/bukkit/mythicdrops/items/MythicDropBuilder.java
@@ -1,609 +1,616 @@
package net.nunnerycode.bukkit.mythicdrops.items;
import net.nunnerycode.bukkit.mythicdrops.MythicDropsPlugin;
import net.nunnerycode.bukkit.mythicdrops.api.enchantments.MythicEnchantment;
import net.nunnerycode.bukkit.mythicdrops.api.items.ItemGenerationReason;
import net.nunnerycode.bukkit.mythicdrops.api.items.MythicItemStack;
import net.nunnerycode.bukkit.mythicdrops.api.items.NonrepairableItemStack;
import net.nunnerycode.bukkit.mythicdrops.api.items.builders.DropBuilder;
import net.nunnerycode.bukkit.mythicdrops.api.names.NameType;
import net.nunnerycode.bukkit.mythicdrops.api.tiers.Tier;
import net.nunnerycode.bukkit.mythicdrops.events.RandomItemGenerationEvent;
import net.nunnerycode.bukkit.mythicdrops.names.NameMap;
import net.nunnerycode.bukkit.mythicdrops.tiers.TierMap;
import net.nunnerycode.bukkit.mythicdrops.utils.ItemStackUtil;
import net.nunnerycode.bukkit.mythicdrops.utils.ItemUtil;
import net.nunnerycode.bukkit.mythicdrops.utils.RandomRangeUtil;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.lang.math.RandomUtils;
import org.apache.commons.lang3.text.WordUtils;
import org.bukkit.Bukkit;
import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.enchantments.EnchantmentWrapper;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.material.MaterialData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public final class MythicDropBuilder implements DropBuilder {
private Tier tier;
private MaterialData materialData;
private ItemGenerationReason itemGenerationReason;
private World world;
private boolean useDurability;
private boolean callEvent;
public MythicDropBuilder() {
tier = null;
itemGenerationReason = ItemGenerationReason.DEFAULT;
world = Bukkit.getServer().getWorlds().get(0);
useDurability = false;
callEvent = true;
}
public DropBuilder withCallEvent(boolean b) {
this.callEvent = b;
return this;
}
@Override
public DropBuilder withTier(Tier tier) {
this.tier = tier;
return this;
}
@Override
public DropBuilder withTier(String tierName) {
this.tier = TierMap.getInstance().get(tierName);
return this;
}
@Override
public DropBuilder withMaterialData(MaterialData materialData) {
this.materialData = materialData;
return this;
}
@Override
public DropBuilder withMaterialData(String materialDataString) {
MaterialData matData = null;
if (materialDataString.contains(";")) {
String[] split = materialDataString.split(";");
matData =
new MaterialData(NumberUtils.toInt(split[0], 0), (byte) NumberUtils.toInt(split[1], 0));
} else {
matData = new MaterialData(NumberUtils.toInt(materialDataString, 0));
}
this.materialData = matData;
return this;
}
@Override
public DropBuilder withItemGenerationReason(ItemGenerationReason reason) {
this.itemGenerationReason = reason;
return this;
}
@Override
public DropBuilder inWorld(World world) {
this.world = world;
return this;
}
@Override
public DropBuilder inWorld(String worldName) {
this.world = Bukkit.getWorld(worldName);
return this;
}
@Override
public DropBuilder useDurability(boolean b) {
this.useDurability = b;
return this;
}
@Override
public ItemStack build() {
World w = world != null ? world : Bukkit.getWorlds().get(0);
Tier t = (tier != null) ? tier : TierMap.getInstance().getRandomWithChance(w.getName());
if (t == null) {
t = TierMap.getInstance().getRandomWithChance("default");
if (t == null) {
return null;
}
}
tier = t;
MaterialData
md =
(materialData != null) ? materialData : ItemUtil.getRandomMaterialDataFromCollection
(ItemUtil.getMaterialDatasFromTier(t));
NonrepairableItemStack nis = new NonrepairableItemStack(md.getItemType(), 1, (short) 0, "");
ItemMeta im = nis.getItemMeta();
Map<Enchantment, Integer> baseEnchantmentMap = getBaseEnchantments(nis, t);
Map<Enchantment, Integer> bonusEnchantmentMap = getBonusEnchantments(nis, t);
for (Map.Entry<Enchantment, Integer> baseEnch : baseEnchantmentMap.entrySet()) {
im.addEnchant(baseEnch.getKey(), baseEnch.getValue(), true);
}
for (Map.Entry<Enchantment, Integer> bonusEnch : bonusEnchantmentMap.entrySet()) {
im.addEnchant(bonusEnch.getKey(), bonusEnch.getValue(), true);
}
if (useDurability) {
nis.setDurability(
ItemStackUtil.getDurabilityForMaterial(nis.getType(), t.getMinimumDurabilityPercentage
(), t.getMaximumDurabilityPercentage()));
}
String name = generateName(nis);
List<String> lore = generateLore(nis);
im.setDisplayName(name);
im.setLore(lore);
if (nis.getItemMeta() instanceof LeatherArmorMeta) {
((LeatherArmorMeta) im).setColor(Color.fromRGB(RandomUtils.nextInt(255),
RandomUtils.nextInt(255),
RandomUtils.nextInt(255)));
}
nis.setItemMeta(im);
if (callEvent) {
RandomItemGenerationEvent rige = new RandomItemGenerationEvent(t, nis, itemGenerationReason);
Bukkit.getPluginManager().callEvent(rige);
if (rige.isCancelled()) {
return null;
}
return rige.getItemStack();
}
return nis;
}
private Map<Enchantment, Integer> getBonusEnchantments(MythicItemStack is, Tier t) {
Validate.notNull(is, "MythicItemStack cannot be null");
Validate.notNull(t, "Tier cannot be null");
if (t.getBonusEnchantments().isEmpty()) {
return new HashMap<>();
}
Map<Enchantment, Integer> map = new HashMap<>();
int added = 0;
int attempts = 0;
int range = (int) RandomRangeUtil.randomRangeDoubleInclusive(t.getMinimumBonusEnchantments(),
t.getMaximumBonusEnchantments());
MythicEnchantment[]
array =
t.getBonusEnchantments().toArray(new MythicEnchantment[t.getBonusEnchantments()
.size()]);
while (added < range && attempts < 10) {
MythicEnchantment chosenEnch = array[RandomUtils.nextInt(array.length)];
if (chosenEnch == null || chosenEnch.getEnchantment() == null) {
attempts++;
continue;
}
Enchantment e = chosenEnch.getEnchantment();
int randLevel = (int) RandomRangeUtil.randomRangeLongInclusive(chosenEnch.getMinimumLevel(),
chosenEnch.getMaximumLevel());
if (is.containsEnchantment(e)) {
randLevel += is.getEnchantmentLevel(e);
}
if (t.isSafeBonusEnchantments() && e.canEnchantItem(is)) {
if (t.isAllowHighBonusEnchantments()) {
map.put(e, randLevel);
} else {
map.put(e, getAcceptableEnchantmentLevel(e, randLevel));
}
} else if (!t.isSafeBonusEnchantments()) {
if (t.isAllowHighBonusEnchantments()) {
map.put(e, randLevel);
} else {
map.put(e, getAcceptableEnchantmentLevel(e, randLevel));
}
} else {
continue;
}
added++;
}
return map;
}
private Map<Enchantment, Integer> getBaseEnchantments(MythicItemStack is, Tier t) {
Validate.notNull(is, "MythicItemStack cannot be null");
Validate.notNull(t, "Tier cannot be null");
if (t.getBaseEnchantments().isEmpty()) {
return new HashMap<>();
}
Map<Enchantment, Integer> map = new HashMap<>();
for (MythicEnchantment me : t.getBaseEnchantments()) {
if (me == null || me.getEnchantment() == null) {
continue;
}
Enchantment e = me.getEnchantment();
int minimumLevel = Math.max(me.getMinimumLevel(), e.getStartLevel());
int maximumLevel = Math.min(me.getMaximumLevel(), e.getMaxLevel());
if (t.isSafeBaseEnchantments() && e.canEnchantItem(is)) {
if (t.isAllowHighBaseEnchantments()) {
map.put(e, (int) RandomRangeUtil.randomRangeLongInclusive
(minimumLevel, maximumLevel));
} else {
map.put(e, getAcceptableEnchantmentLevel(e,
(int) RandomRangeUtil
.randomRangeLongInclusive(minimumLevel,
maximumLevel)));
}
} else if (!t.isSafeBaseEnchantments()) {
map.put(e, (int) RandomRangeUtil.randomRangeLongInclusive
(minimumLevel, maximumLevel));
}
}
return map;
}
private int getAcceptableEnchantmentLevel(Enchantment ench, int level) {
EnchantmentWrapper ew = new EnchantmentWrapper(ench.getId());
return Math.max(Math.min(level, ew.getMaxLevel()), ew.getStartLevel());
}
private List<String> generateLore(ItemStack itemStack) {
List<String> lore = new ArrayList<String>();
if (itemStack == null || tier == null) {
return lore;
}
List<String>
tooltipFormat =
MythicDropsPlugin.getInstance().getConfigSettings().getTooltipFormat();
String minecraftName = getMinecraftMaterialName(itemStack.getData().getItemType());
String mythicName = getMythicMaterialName(itemStack.getData());
String itemType = getItemTypeName(ItemUtil.getItemTypeFromMaterialData(itemStack.getData()));
String
materialType =
getItemTypeName(ItemUtil.getMaterialTypeFromMaterialData(itemStack.getData()));
String tierName = tier.getDisplayName();
ItemMeta itemMeta = itemStack.getItemMeta();
String enchantment = getEnchantmentTypeName(itemMeta);
if (MythicDropsPlugin.getInstance().getConfigSettings().isRandomLoreEnabled()
&& RandomUtils.nextDouble() <
MythicDropsPlugin.getInstance().getConfigSettings().getRandomLoreChance()) {
String generalLoreString = NameMap.getInstance().getRandom(NameType.GENERAL_LORE, "");
String materialLoreString = NameMap.getInstance().getRandom(NameType.MATERIAL_LORE,
itemStack.getType().name()
.toLowerCase());
String
tierLoreString =
NameMap.getInstance().getRandom(NameType.TIER_LORE, tier.getName().toLowerCase());
String enchantmentLoreString = NameMap.getInstance().getRandom(NameType.ENCHANTMENT_LORE,
enchantment != null
? enchantment.toLowerCase()
: "");
List<String> generalLore = null;
if (generalLoreString != null && !generalLoreString.isEmpty()) {
generalLore = Arrays.asList(generalLoreString.replace('&',
'\u00A7').replace("\u00A7\u00A7", "&")
.split("/n"));
}
List<String> materialLore = null;
if (materialLoreString != null && !materialLoreString.isEmpty()) {
materialLore =
Arrays.asList(materialLoreString.replace('&', '\u00A7').replace("\u00A7\u00A7",
"&").split("/n"));
}
List<String> tierLore = null;
if (tierLoreString != null && !tierLoreString.isEmpty()) {
tierLore = Arrays.asList(tierLoreString.replace('&', '\u00A7').replace("\u00A7\u00A7",
"&").split("/n"));
}
List<String> enchantmentLore = null;
if (enchantmentLoreString != null && !enchantmentLoreString.isEmpty()) {
enchantmentLore = Arrays.asList(enchantmentLoreString.replace('&',
'\u00A7')
.replace("\u00A7\u00A7", "&").split("/n"));
}
if (generalLore != null && !generalLore.isEmpty()) {
lore.addAll(generalLore);
}
if (materialLore != null && !materialLore.isEmpty()) {
lore.addAll(materialLore);
}
if (tierLore != null && !tierLore.isEmpty()) {
lore.addAll(tierLore);
}
if (enchantmentLore != null && !enchantmentLore.isEmpty()) {
lore.addAll(enchantmentLore);
}
}
for (String s : tooltipFormat) {
String line = s;
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
lore.add(line);
}
for (String s : tier.getBaseLore()) {
String line = s;
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
String[] strings = line.split("/n");
lore.addAll(Arrays.asList(strings));
}
int numOfBonusLore = (int) RandomRangeUtil.randomRangeLongInclusive(tier.getMinimumBonusLore(),
tier.getMaximumBonusLore());
List<String> chosenLore = new ArrayList<>();
for (int i = 0; i < numOfBonusLore; i++) {
if (tier.getBonusLore() == null || tier.getBonusLore().isEmpty() || chosenLore.size() == tier
.getBonusLore().size()) {
continue;
}
// choose a random String out of the tier's bonus lore
String s = tier.getBonusLore().get(RandomUtils.nextInt(tier.getBonusLore().size()));
if (chosenLore.contains(s)) {
i--;
continue;
}
chosenLore.add(s);
// split on the next line /n
String[] strings = s.replace('&', '\u00A7').replace("\u00A7\u00A7", "&").split("/n");
// add to lore by wrapping in Arrays.asList(Object...)
lore.addAll(Arrays.asList(strings));
}
if (MythicDropsPlugin.getInstance().getSockettingSettings().isEnabled()
&& RandomUtils.nextDouble() < tier
.getChanceToHaveSockets()) {
int numberOfSockets = (int) RandomRangeUtil.randomRangeLongInclusive(tier.getMinimumSockets(),
tier.getMaximumSockets());
for (int i = 0; i < numberOfSockets; i++) {
- lore.add(
- MythicDropsPlugin.getInstance().getSockettingSettings().getSockettedItemString().replace
- ('&', '\u00A7').replace("\u00A7\u00A7", "&"));
+ String line = MythicDropsPlugin.getInstance().getSockettingSettings().getSockettedItemString();
+ line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
+ line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
+ line = line.replace("%itemtype%", itemType != null ? itemType : "");
+ line = line.replace("%materialtype%", materialType != null ? materialType : "");
+ line = line.replace("%tiername%", tierName != null ? tierName : "");
+ line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
+ line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
+ line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
+ lore.add(line);
}
if (numberOfSockets > 0) {
for (String s : MythicDropsPlugin.getInstance().getSockettingSettings()
.getSockettedItemLore()) {
String line = s;
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
lore.add(line);
}
}
}
return lore;
}
private String getEnchantmentTypeName(ItemMeta itemMeta) {
Enchantment enchantment = ItemStackUtil.getHighestEnchantment(itemMeta);
if (enchantment == null) {
return MythicDropsPlugin.getInstance().getConfigSettings()
.getFormattedLanguageString("displayNames" +
".Ordinary");
}
String
ench =
MythicDropsPlugin.getInstance().getConfigSettings()
.getFormattedLanguageString("displayNames."
+ enchantment.getName());
if (ench != null) {
return ench;
}
return "Ordinary";
}
private String getMythicMaterialName(MaterialData matData) {
String comb =
String.format("%s;%s", String.valueOf(matData.getItemTypeId()),
String.valueOf(matData.getData()));
String comb2;
if (matData.getData() == (byte) 0) {
comb2 = String.valueOf(matData.getItemTypeId());
} else {
comb2 = comb;
}
String
mythicMatName =
MythicDropsPlugin.getInstance().getConfigSettings().getFormattedLanguageString(
"displayNames." + comb.toLowerCase());
if (mythicMatName == null || mythicMatName.equals("displayNames." + comb.toLowerCase())) {
mythicMatName =
MythicDropsPlugin.getInstance().getConfigSettings().getFormattedLanguageString(
"displayNames." + comb2.toLowerCase());
if (mythicMatName == null || mythicMatName.equals("displayNames." + comb2.toLowerCase())) {
mythicMatName = getMinecraftMaterialName(matData.getItemType());
}
}
return WordUtils.capitalize(mythicMatName);
}
private String getMinecraftMaterialName(Material material) {
String prettyMaterialName = "";
String matName = material.name();
String[] split = matName.split("_");
for (String s : split) {
if (s.equals(split[split.length - 1])) {
prettyMaterialName = String
.format("%s%s%s", prettyMaterialName, s.substring(0, 1).toUpperCase(), s.substring(1,
s.length())
.toLowerCase());
} else {
prettyMaterialName = prettyMaterialName
+ (String
.format("%s%s", s.substring(0, 1).toUpperCase(), s.substring(1,
s.length())
.toLowerCase())) + " ";
}
}
return WordUtils.capitalizeFully(prettyMaterialName);
}
private String getItemTypeName(String itemType) {
if (itemType == null) {
return null;
}
String
mythicMatName =
MythicDropsPlugin.getInstance().getConfigSettings().getFormattedLanguageString(
"displayNames." + itemType.toLowerCase());
if (mythicMatName == null) {
mythicMatName = itemType;
}
return WordUtils.capitalizeFully(mythicMatName);
}
private String getItemTypeFromMaterialData(MaterialData matData) {
String comb =
String.format("%s;%s", String.valueOf(matData.getItemTypeId()),
String.valueOf(matData.getData()));
String comb2;
if (matData.getData() == (byte) 0) {
comb2 = String.valueOf(matData.getItemTypeId());
} else {
comb2 = comb;
}
String comb3 = String.valueOf(matData.getItemTypeId());
Map<String, List<String>> ids = new HashMap<String, List<String>>();
ids.putAll(MythicDropsPlugin.getInstance().getConfigSettings().getItemTypesWithIds());
for (Map.Entry<String, List<String>> e : ids.entrySet()) {
if (e.getValue().contains(comb)
|| e.getValue().contains(comb2) || e.getValue().contains(comb3)) {
if (MythicDropsPlugin.getInstance().getConfigSettings().getMaterialTypes()
.contains(e.getKey())) {
continue;
}
return e.getKey();
}
}
return null;
}
private String generateName(ItemStack itemStack) {
Validate.notNull(itemStack, "ItemStack cannot be null");
Validate.notNull(tier, "Tier cannot be null");
String format = MythicDropsPlugin.getInstance().getConfigSettings().getItemDisplayNameFormat();
if (format == null) {
return "Mythic Item";
}
String minecraftName = getMinecraftMaterialName(itemStack.getData().getItemType());
String mythicName = getMythicMaterialName(itemStack.getData());
String generalPrefix = NameMap.getInstance().getRandom(NameType.GENERAL_PREFIX, "");
String generalSuffix = NameMap.getInstance().getRandom(NameType.GENERAL_SUFFIX, "");
String materialPrefix = NameMap.getInstance().getRandom(NameType.MATERIAL_PREFIX,
itemStack.getType().name()
.toLowerCase());
String materialSuffix = NameMap.getInstance().getRandom(NameType.MATERIAL_SUFFIX,
itemStack.getType().name()
.toLowerCase());
String
tierPrefix =
NameMap.getInstance().getRandom(NameType.TIER_PREFIX, tier.getName().toLowerCase());
String
tierSuffix =
NameMap.getInstance().getRandom(NameType.TIER_SUFFIX, tier.getName().toLowerCase());
String itemType = ItemUtil.getItemTypeFromMaterialData(itemStack.getData());
String materialType = ItemUtil.getMaterialTypeFromMaterialData(itemStack.getData());
String tierName = tier.getDisplayName();
String enchantment = getEnchantmentTypeName(itemStack.getItemMeta());
Enchantment highestEnch = ItemStackUtil.getHighestEnchantment(itemStack.getItemMeta());
String enchantmentPrefix = NameMap.getInstance().getRandom(NameType.ENCHANTMENT_PREFIX,
highestEnch != null ? highestEnch
.getName().toLowerCase() : "");
String enchantmentSuffix = NameMap.getInstance().getRandom(NameType.ENCHANTMENT_SUFFIX,
highestEnch != null ? highestEnch
.getName().toLowerCase() : "");
String name = format;
if (name.contains("%basematerial%")) {
name = name.replace("%basematerial%", minecraftName);
}
if (name.contains("%mythicmaterial%")) {
name = name.replace("%mythicmaterial%", mythicName);
}
if (name.contains("%generalprefix%")) {
name = name.replace("%generalprefix%", generalPrefix);
}
if (name.contains("%generalsuffix%")) {
name = name.replace("%generalsuffix%", generalSuffix);
}
if (name.contains("%materialprefix%")) {
name = name.replace("%materialprefix%", materialPrefix);
}
if (name.contains("%materialsuffix%")) {
name = name.replace("%materialsuffix%", materialSuffix);
}
if (name.contains("%tierprefix%")) {
name = name.replace("%tierprefix%", tierPrefix);
}
if (name.contains("%tiersuffix%")) {
name = name.replace("%tiersuffix%", tierSuffix);
}
if (name.contains("%itemtype%")) {
name = name.replace("%itemtype%", itemType);
}
if (name.contains("%materialtype%")) {
name = name.replace("%materialtype%", materialType);
}
if (name.contains("%tiername%")) {
name = name.replace("%tiername%", tierName);
}
if (name.contains("%enchantment%")) {
name = name.replace("%enchantment%", enchantment);
}
if (name.contains("%enchantmentprefix%")) {
name = name.replace("%enchantmentprefix%", enchantmentPrefix);
}
if (name.contains("%enchantmentsuffix%")) {
name = name.replace("%enchantmentsuffix%", enchantmentSuffix);
}
return tier.getDisplayColor() + name.replace('&', '\u00A7').replace("\u00A7\u00A7", "&").trim()
+
tier.getIdentificationColor();
}
}
| true | true | private List<String> generateLore(ItemStack itemStack) {
List<String> lore = new ArrayList<String>();
if (itemStack == null || tier == null) {
return lore;
}
List<String>
tooltipFormat =
MythicDropsPlugin.getInstance().getConfigSettings().getTooltipFormat();
String minecraftName = getMinecraftMaterialName(itemStack.getData().getItemType());
String mythicName = getMythicMaterialName(itemStack.getData());
String itemType = getItemTypeName(ItemUtil.getItemTypeFromMaterialData(itemStack.getData()));
String
materialType =
getItemTypeName(ItemUtil.getMaterialTypeFromMaterialData(itemStack.getData()));
String tierName = tier.getDisplayName();
ItemMeta itemMeta = itemStack.getItemMeta();
String enchantment = getEnchantmentTypeName(itemMeta);
if (MythicDropsPlugin.getInstance().getConfigSettings().isRandomLoreEnabled()
&& RandomUtils.nextDouble() <
MythicDropsPlugin.getInstance().getConfigSettings().getRandomLoreChance()) {
String generalLoreString = NameMap.getInstance().getRandom(NameType.GENERAL_LORE, "");
String materialLoreString = NameMap.getInstance().getRandom(NameType.MATERIAL_LORE,
itemStack.getType().name()
.toLowerCase());
String
tierLoreString =
NameMap.getInstance().getRandom(NameType.TIER_LORE, tier.getName().toLowerCase());
String enchantmentLoreString = NameMap.getInstance().getRandom(NameType.ENCHANTMENT_LORE,
enchantment != null
? enchantment.toLowerCase()
: "");
List<String> generalLore = null;
if (generalLoreString != null && !generalLoreString.isEmpty()) {
generalLore = Arrays.asList(generalLoreString.replace('&',
'\u00A7').replace("\u00A7\u00A7", "&")
.split("/n"));
}
List<String> materialLore = null;
if (materialLoreString != null && !materialLoreString.isEmpty()) {
materialLore =
Arrays.asList(materialLoreString.replace('&', '\u00A7').replace("\u00A7\u00A7",
"&").split("/n"));
}
List<String> tierLore = null;
if (tierLoreString != null && !tierLoreString.isEmpty()) {
tierLore = Arrays.asList(tierLoreString.replace('&', '\u00A7').replace("\u00A7\u00A7",
"&").split("/n"));
}
List<String> enchantmentLore = null;
if (enchantmentLoreString != null && !enchantmentLoreString.isEmpty()) {
enchantmentLore = Arrays.asList(enchantmentLoreString.replace('&',
'\u00A7')
.replace("\u00A7\u00A7", "&").split("/n"));
}
if (generalLore != null && !generalLore.isEmpty()) {
lore.addAll(generalLore);
}
if (materialLore != null && !materialLore.isEmpty()) {
lore.addAll(materialLore);
}
if (tierLore != null && !tierLore.isEmpty()) {
lore.addAll(tierLore);
}
if (enchantmentLore != null && !enchantmentLore.isEmpty()) {
lore.addAll(enchantmentLore);
}
}
for (String s : tooltipFormat) {
String line = s;
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
lore.add(line);
}
for (String s : tier.getBaseLore()) {
String line = s;
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
String[] strings = line.split("/n");
lore.addAll(Arrays.asList(strings));
}
int numOfBonusLore = (int) RandomRangeUtil.randomRangeLongInclusive(tier.getMinimumBonusLore(),
tier.getMaximumBonusLore());
List<String> chosenLore = new ArrayList<>();
for (int i = 0; i < numOfBonusLore; i++) {
if (tier.getBonusLore() == null || tier.getBonusLore().isEmpty() || chosenLore.size() == tier
.getBonusLore().size()) {
continue;
}
// choose a random String out of the tier's bonus lore
String s = tier.getBonusLore().get(RandomUtils.nextInt(tier.getBonusLore().size()));
if (chosenLore.contains(s)) {
i--;
continue;
}
chosenLore.add(s);
// split on the next line /n
String[] strings = s.replace('&', '\u00A7').replace("\u00A7\u00A7", "&").split("/n");
// add to lore by wrapping in Arrays.asList(Object...)
lore.addAll(Arrays.asList(strings));
}
if (MythicDropsPlugin.getInstance().getSockettingSettings().isEnabled()
&& RandomUtils.nextDouble() < tier
.getChanceToHaveSockets()) {
int numberOfSockets = (int) RandomRangeUtil.randomRangeLongInclusive(tier.getMinimumSockets(),
tier.getMaximumSockets());
for (int i = 0; i < numberOfSockets; i++) {
lore.add(
MythicDropsPlugin.getInstance().getSockettingSettings().getSockettedItemString().replace
('&', '\u00A7').replace("\u00A7\u00A7", "&"));
}
if (numberOfSockets > 0) {
for (String s : MythicDropsPlugin.getInstance().getSockettingSettings()
.getSockettedItemLore()) {
String line = s;
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
lore.add(line);
}
}
}
return lore;
}
| private List<String> generateLore(ItemStack itemStack) {
List<String> lore = new ArrayList<String>();
if (itemStack == null || tier == null) {
return lore;
}
List<String>
tooltipFormat =
MythicDropsPlugin.getInstance().getConfigSettings().getTooltipFormat();
String minecraftName = getMinecraftMaterialName(itemStack.getData().getItemType());
String mythicName = getMythicMaterialName(itemStack.getData());
String itemType = getItemTypeName(ItemUtil.getItemTypeFromMaterialData(itemStack.getData()));
String
materialType =
getItemTypeName(ItemUtil.getMaterialTypeFromMaterialData(itemStack.getData()));
String tierName = tier.getDisplayName();
ItemMeta itemMeta = itemStack.getItemMeta();
String enchantment = getEnchantmentTypeName(itemMeta);
if (MythicDropsPlugin.getInstance().getConfigSettings().isRandomLoreEnabled()
&& RandomUtils.nextDouble() <
MythicDropsPlugin.getInstance().getConfigSettings().getRandomLoreChance()) {
String generalLoreString = NameMap.getInstance().getRandom(NameType.GENERAL_LORE, "");
String materialLoreString = NameMap.getInstance().getRandom(NameType.MATERIAL_LORE,
itemStack.getType().name()
.toLowerCase());
String
tierLoreString =
NameMap.getInstance().getRandom(NameType.TIER_LORE, tier.getName().toLowerCase());
String enchantmentLoreString = NameMap.getInstance().getRandom(NameType.ENCHANTMENT_LORE,
enchantment != null
? enchantment.toLowerCase()
: "");
List<String> generalLore = null;
if (generalLoreString != null && !generalLoreString.isEmpty()) {
generalLore = Arrays.asList(generalLoreString.replace('&',
'\u00A7').replace("\u00A7\u00A7", "&")
.split("/n"));
}
List<String> materialLore = null;
if (materialLoreString != null && !materialLoreString.isEmpty()) {
materialLore =
Arrays.asList(materialLoreString.replace('&', '\u00A7').replace("\u00A7\u00A7",
"&").split("/n"));
}
List<String> tierLore = null;
if (tierLoreString != null && !tierLoreString.isEmpty()) {
tierLore = Arrays.asList(tierLoreString.replace('&', '\u00A7').replace("\u00A7\u00A7",
"&").split("/n"));
}
List<String> enchantmentLore = null;
if (enchantmentLoreString != null && !enchantmentLoreString.isEmpty()) {
enchantmentLore = Arrays.asList(enchantmentLoreString.replace('&',
'\u00A7')
.replace("\u00A7\u00A7", "&").split("/n"));
}
if (generalLore != null && !generalLore.isEmpty()) {
lore.addAll(generalLore);
}
if (materialLore != null && !materialLore.isEmpty()) {
lore.addAll(materialLore);
}
if (tierLore != null && !tierLore.isEmpty()) {
lore.addAll(tierLore);
}
if (enchantmentLore != null && !enchantmentLore.isEmpty()) {
lore.addAll(enchantmentLore);
}
}
for (String s : tooltipFormat) {
String line = s;
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
lore.add(line);
}
for (String s : tier.getBaseLore()) {
String line = s;
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
String[] strings = line.split("/n");
lore.addAll(Arrays.asList(strings));
}
int numOfBonusLore = (int) RandomRangeUtil.randomRangeLongInclusive(tier.getMinimumBonusLore(),
tier.getMaximumBonusLore());
List<String> chosenLore = new ArrayList<>();
for (int i = 0; i < numOfBonusLore; i++) {
if (tier.getBonusLore() == null || tier.getBonusLore().isEmpty() || chosenLore.size() == tier
.getBonusLore().size()) {
continue;
}
// choose a random String out of the tier's bonus lore
String s = tier.getBonusLore().get(RandomUtils.nextInt(tier.getBonusLore().size()));
if (chosenLore.contains(s)) {
i--;
continue;
}
chosenLore.add(s);
// split on the next line /n
String[] strings = s.replace('&', '\u00A7').replace("\u00A7\u00A7", "&").split("/n");
// add to lore by wrapping in Arrays.asList(Object...)
lore.addAll(Arrays.asList(strings));
}
if (MythicDropsPlugin.getInstance().getSockettingSettings().isEnabled()
&& RandomUtils.nextDouble() < tier
.getChanceToHaveSockets()) {
int numberOfSockets = (int) RandomRangeUtil.randomRangeLongInclusive(tier.getMinimumSockets(),
tier.getMaximumSockets());
for (int i = 0; i < numberOfSockets; i++) {
String line = MythicDropsPlugin.getInstance().getSockettingSettings().getSockettedItemString();
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
lore.add(line);
}
if (numberOfSockets > 0) {
for (String s : MythicDropsPlugin.getInstance().getSockettingSettings()
.getSockettedItemLore()) {
String line = s;
line = line.replace("%basematerial%", minecraftName != null ? minecraftName : "");
line = line.replace("%mythicmaterial%", mythicName != null ? mythicName : "");
line = line.replace("%itemtype%", itemType != null ? itemType : "");
line = line.replace("%materialtype%", materialType != null ? materialType : "");
line = line.replace("%tiername%", tierName != null ? tierName : "");
line = line.replace("%enchantment%", enchantment != null ? enchantment : "");
line = line.replace("%tiercolor%", tier.getDisplayColor() + "");
line = line.replace('&', '\u00A7').replace("\u00A7\u00A7", "&");
lore.add(line);
}
}
}
return lore;
}
|
diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
index 292d09371..b540dae8d 100644
--- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
+++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
@@ -1,342 +1,344 @@
/*
* 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.ode.dao.jpa;
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.dao.MessageDAO;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.dao.PartnerLinkDAO;
import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.uuid.UUID;
import org.w3c.dom.Element;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import java.util.StringTokenizer;
@Entity
@Table(name="ODE_MESSAGE_EXCHANGE")
public class MessageExchangeDAOImpl implements MessageExchangeDAO {
@Id @Column(name="MESSAGE_EXCHANGE_ID")
private String _id;
@Basic @Column(name="CALLEE")
private String _callee;
@Basic @Column(name="CHANNEL")
private String _channel;
@Basic @Column(name="CORRELATION_ID")
private String _correlationId;
@Basic @Column(name="CORRELATION_STATUS")
private String _correlationStatus;
@Basic @Column(name="CREATE_TIME")
private Date _createTime;
@Basic @Column(name="DIRECTION")
private char _direction;
@Lob @Column(name="EPR")
private String _epr;
@Transient private
Element _eprElement;
@Basic @Column(name="FAULT")
private String _fault;
@Basic @Column(name="FAULT_EXPLANATION")
private String _faultExplanation;
@Basic @Column(name="OPERATION")
private String _operation;
@Basic @Column(name="PARTNER_LINK_MODEL_ID")
private int _partnerLinkModelId;
@Basic @Column(name="PATTERN")
private String _pattern;
@Basic @Column(name="PORT_TYPE")
private String _portType;
@Basic @Column(name="PROPAGATE_TRANS")
private boolean _propagateTransactionFlag;
@Basic @Column(name="STATUS")
private String _status;
@Basic @Column(name="CORRELATION_KEYS")
private String _correlationKeys;
@Basic @Column(name="PIPED_ID")
private String _pipedMessageExchangeId;
@OneToMany(targetEntity=MexProperty.class,mappedBy="_mex",fetch=FetchType.EAGER,cascade={CascadeType.ALL})
private Collection<MexProperty> _props = new ArrayList<MexProperty>();
@ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROCESS_INSTANCE_ID")
private ProcessInstanceDAOImpl _processInst;
@ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PARTNER_LINK_ID")
private PartnerLinkDAOImpl _partnerLink;
@ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROCESS_ID")
private ProcessDAOImpl _process;
@OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @Column(name="REQUEST_MESSAGE_ID")
private MessageDAOImpl _request;
@OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @Column(name="RESPONSE_MESSAGE_ID")
private MessageDAOImpl _response;
@ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="CORR_ID")
private CorrelatorDAOImpl _correlator;
public MessageExchangeDAOImpl() {}
public MessageExchangeDAOImpl(char direction){
_direction = direction;
_id = new UUID().toString();
}
public MessageDAO createMessage(QName type) {
MessageDAOImpl ret = new MessageDAOImpl(type,this);
return ret ;
}
public QName getCallee() {
return _callee == null ? null : QName.valueOf(_callee);
}
public String getChannel() {
return _channel;
}
public String getCorrelationId() {
return _correlationId;
}
public String getCorrelationStatus() {
return _correlationStatus;
}
public Date getCreateTime() {
return _createTime;
}
public char getDirection() {
return _direction;
}
public Element getEPR() {
if ( _eprElement == null && _epr != null && !"".equals(_epr)) {
try {
_eprElement = DOMUtils.stringToDOM(_epr);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
return _eprElement;
}
public QName getFault() {
return _fault == null ? null : QName.valueOf(_fault);
}
public String getFaultExplanation() {
return _faultExplanation;
}
public ProcessInstanceDAO getInstance() {
return _processInst;
}
public String getMessageExchangeId() {
//return _messageExchangeId;
return _id.toString();
}
public String getOperation() {
return _operation;
}
public PartnerLinkDAO getPartnerLink() {
return _partnerLink;
}
public int getPartnerLinkModelId() {
return _partnerLinkModelId;
}
public String getPattern() {
return _pattern;
}
public QName getPortType() {
return _portType == null ? null : QName.valueOf(_portType);
}
public ProcessDAO getProcess() {
return _process;
}
public boolean getPropagateTransactionFlag() {
return _propagateTransactionFlag;
}
public String getProperty(String key) {
for (MexProperty prop : _props) {
if (prop.getPropertyKey().equals(key)) return prop.getPropertyValue();
}
return null;
}
public Set<String> getPropertyNames() {
HashSet<String> propNames = new HashSet<String>();
for (MexProperty prop : _props) {
propNames.add(prop.getPropertyKey());
}
return propNames;
}
public MessageDAO getRequest() {
return _request;
}
public MessageDAO getResponse() {
return _response;
}
public String getStatus() {
return _status;
}
public void setCallee(QName callee) {
_callee = callee.toString();
}
public void setChannel(String channel) {
_channel = channel;
}
public void setCorrelationId(String correlationId) {
_correlationId = correlationId;
}
public void setCorrelationStatus(String cstatus) {
_correlationStatus = cstatus;
}
public void setEPR(Element epr) {
_eprElement = epr;
_epr = DOMUtils.domToString(epr);
}
public void setFault(QName faultType) {
_fault = faultType == null ? null : faultType.toString();
}
public void setFaultExplanation(String explanation) {
_faultExplanation = explanation;
}
public void setInstance(ProcessInstanceDAO dao) {
_processInst = (ProcessInstanceDAOImpl)dao;
}
public void setOperation(String opname) {
_operation = opname;
}
public void setPartnerLink(PartnerLinkDAO plinkDAO) {
_partnerLink = (PartnerLinkDAOImpl)plinkDAO;
}
public void setPartnerLinkModelId(int modelId) {
_partnerLinkModelId = modelId;
}
public void setPattern(String pattern) {
_pattern = pattern;
}
public void setPortType(QName porttype) {
_portType = porttype.toString();
}
public void setProcess(ProcessDAO process) {
_process = (ProcessDAOImpl)process;
}
public void setProperty(String key, String value) {
_props.add(new MexProperty(key, value, this));
}
public void setRequest(MessageDAO msg) {
_request = (MessageDAOImpl)msg;
}
public void setResponse(MessageDAO msg) {
_response = (MessageDAOImpl)msg;
}
public void setStatus(String status) {
_status = status;
}
public String getPipedMessageExchangeId() {
return _pipedMessageExchangeId;
}
public void setPipedMessageExchangeId(String pipedMessageExchangeId) {
_pipedMessageExchangeId = pipedMessageExchangeId;
}
public void addCorrelationKey(CorrelationKey correlationKey) {
if (_correlationKeys == null)
_correlationKeys = correlationKey.toCanonicalString();
else
_correlationKeys = _correlationKeys + "^" + correlationKey.toCanonicalString();
}
public Collection<CorrelationKey> getCorrelationKeys() {
ArrayList<CorrelationKey> correlationKeys = new ArrayList<CorrelationKey>();
- if (_correlationKeys.indexOf("^") > 0) {
- for (StringTokenizer tokenizer = new StringTokenizer(_correlationKeys, "^"); tokenizer.hasMoreTokens();) {
- String corrStr = tokenizer.nextToken();
- correlationKeys.add(new CorrelationKey(corrStr));
- }
- return correlationKeys;
- } else correlationKeys.add(new CorrelationKey(_correlationKeys));
+ if (_correlationKeys != null) {
+ if (_correlationKeys.indexOf("^") > 0) {
+ for (StringTokenizer tokenizer = new StringTokenizer(_correlationKeys, "^"); tokenizer.hasMoreTokens();) {
+ String corrStr = tokenizer.nextToken();
+ correlationKeys.add(new CorrelationKey(corrStr));
+ }
+ return correlationKeys;
+ } else correlationKeys.add(new CorrelationKey(_correlationKeys));
+ }
return correlationKeys;
}
public void release() {
// no-op for now, could be used to do some cleanup
}
public CorrelatorDAOImpl getCorrelator() {
return _correlator;
}
public void setCorrelator(CorrelatorDAOImpl correlator) {
_correlator = correlator;
}
}
| true | true | public Collection<CorrelationKey> getCorrelationKeys() {
ArrayList<CorrelationKey> correlationKeys = new ArrayList<CorrelationKey>();
if (_correlationKeys.indexOf("^") > 0) {
for (StringTokenizer tokenizer = new StringTokenizer(_correlationKeys, "^"); tokenizer.hasMoreTokens();) {
String corrStr = tokenizer.nextToken();
correlationKeys.add(new CorrelationKey(corrStr));
}
return correlationKeys;
} else correlationKeys.add(new CorrelationKey(_correlationKeys));
return correlationKeys;
}
| public Collection<CorrelationKey> getCorrelationKeys() {
ArrayList<CorrelationKey> correlationKeys = new ArrayList<CorrelationKey>();
if (_correlationKeys != null) {
if (_correlationKeys.indexOf("^") > 0) {
for (StringTokenizer tokenizer = new StringTokenizer(_correlationKeys, "^"); tokenizer.hasMoreTokens();) {
String corrStr = tokenizer.nextToken();
correlationKeys.add(new CorrelationKey(corrStr));
}
return correlationKeys;
} else correlationKeys.add(new CorrelationKey(_correlationKeys));
}
return correlationKeys;
}
|
diff --git a/luni/src/main/java/java/lang/ref/FinalizerReference.java b/luni/src/main/java/java/lang/ref/FinalizerReference.java
index a3f90248d..2d5cef20b 100644
--- a/luni/src/main/java/java/lang/ref/FinalizerReference.java
+++ b/luni/src/main/java/java/lang/ref/FinalizerReference.java
@@ -1,76 +1,76 @@
/*
* Copyright (C) 2011 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 java.lang.ref;
import java.lang.FinalizerThread;
/**
* @hide
*/
public final class FinalizerReference<T> extends Reference<T> {
private static FinalizerReference head = null;
private T zombie;
private FinalizerReference prev;
private FinalizerReference next;
public FinalizerReference(T r, ReferenceQueue<? super T> q) {
super(r, q);
}
@Override
public T get() {
return zombie;
}
@Override
public void clear() {
zombie = null;
}
static void add(Object referent) {
ReferenceQueue<Object> queue = FinalizerThread.queue;
FinalizerReference<?> reference = new FinalizerReference<Object>(referent, queue);
synchronized (FinalizerReference.class) {
reference.prev = null;
reference.next = head;
if (head != null) {
head.prev = reference;
}
head = reference;
}
}
public static void remove(FinalizerReference reference) {
synchronized (FinalizerReference.class) {
FinalizerReference next = reference.next;
FinalizerReference prev = reference.prev;
reference.next = null;
reference.prev = null;
if (prev != null) {
prev.next = next;
} else {
- head = reference;
+ head = next;
}
if (next != null) {
next.prev = prev;
}
}
}
}
| true | true | public static void remove(FinalizerReference reference) {
synchronized (FinalizerReference.class) {
FinalizerReference next = reference.next;
FinalizerReference prev = reference.prev;
reference.next = null;
reference.prev = null;
if (prev != null) {
prev.next = next;
} else {
head = reference;
}
if (next != null) {
next.prev = prev;
}
}
}
| public static void remove(FinalizerReference reference) {
synchronized (FinalizerReference.class) {
FinalizerReference next = reference.next;
FinalizerReference prev = reference.prev;
reference.next = null;
reference.prev = null;
if (prev != null) {
prev.next = next;
} else {
head = next;
}
if (next != null) {
next.prev = prev;
}
}
}
|
diff --git a/src/edu/umw/cpsc/collegesim/Decay.java b/src/edu/umw/cpsc/collegesim/Decay.java
index d02a482..cd03bf4 100644
--- a/src/edu/umw/cpsc/collegesim/Decay.java
+++ b/src/edu/umw/cpsc/collegesim/Decay.java
@@ -1,120 +1,120 @@
package edu.umw.cpsc.collegesim;
import java.util.ArrayList;
import sim.engine.*;
import sim.util.*;
import ec.util.*;
import sim.field.network.*;
public class Decay implements Steppable{
private int numTimes = 1;
private static final int MAX_ITER = 3;
public static final int NUM_STEPS_TO_DECAY = 3;
Decay( ){
}
//Problem: Sometimes the code checks the same person twice
//Ex: It will print "Person 1 last met person 2 a number of 2 steps ago." Immediately followed by
//"Person 1 last met person 2 a number of 3 steps ago." So it goes through the loop checking other
//connections twice with the same person. Note that this is not related to the fix where we made
//it so that when Person 0 checks the relationship with person 1, person 1 does not also check
//that relationship.
//Problem: The number of steps since meeting does not reset after two people meet if the decay
//class is stepped before those students are stepped.
//Ex: Person 2 met person 1 a number of 2 steps ago. Decay is stepped, then in the same iteration
//person 2 meets person 1. The next time decay is stepped, it still says person 2 met person 1 a
//number of 3 steps ago, even though it was now only 1 step ago.
public void step(SimState state){
//People is a bag of all people
Bag people = Sim.instance( ).people.getAllNodes( );
//We're going to print out the people for sanity check
System.out.println("The contents of the bag: ");
for(int m=0; m<people.size( ); m++){
Person mP = (Person) people.get(m);
System.out.println(mP.getID( ));
}
//for each of the people
for(int i=0; i<people.size( ); i++){
//pick one
Person person = (Person) people.get(i);
System.out.println("Looking at person " + person.getID( ));
//get a bag containing all of the edges between others and this person
Bag b = Sim.instance( ).lastMet.getEdgesIn(person);
//for each of the edges
for(int j=0; j<b.size( ); j++){
//pick one
Edge edge = (Edge)b.get(j);
//determine who the other person on that edge is
Person otherPerson = (Person) edge.getOtherNode(person);
if(otherPerson.getID( ) > person.getID( )){
//if the other person has a higher index, meaning we have not yet looked at them
System.out.println("Looking at when they last met person " + otherPerson.getID( ));
//obtain the number of steps since the two last met
- int steps = (int) edge.getInfo( );
+ int steps = ((Integer)edge.getInfo( )).intValue();
//increment this number
steps++;
System.out.println("This was " + steps + " steps ago.");
//if the steps is past the decay point
if(steps > NUM_STEPS_TO_DECAY){
System.out.println("Steps causes decay");
//remove the edge saying when they last met
Sim.instance( ).lastMet.removeEdge(edge);
//get a bag of all the friendships of this person
Bag friendships = Sim.instance( ).people.getEdgesIn(person);
//for each friendship
for(int m=0; m<friendships.size( ); m++){
//pick one
Edge edgeTest = (Edge)friendships.get(m);
//obtain the person on the other end
Person test = (Person) edgeTest.getOtherNode(person);
//when this person is the other friend in question
if(test.equals(otherPerson)){
System.out.println("We're removing the friendship between " + person.getID( ) + " and " + test.getID( ));
//remove this edge
Sim.instance( ).people.removeEdge(edgeTest);
}
}
//if we're not past the decay point
}else{
System.out.println("Steps does not cause decay.");
//just make the edge hold the new number of steps
Sim.instance( ).lastMet.updateEdge(edge, person, otherPerson, steps);
}
}else{
System.out.println("Skipping looking at person " + otherPerson.getID( ));
}
}
System.out.println("The friends for " + person.getID( ) + " are:");
Bag testBag = Sim.instance( ).people.getEdgesIn(person);
for(int k=0; k<testBag.size( ); k++){
Edge friendEdge = (Edge)testBag.get(k);
Person friend = (Person)friendEdge.getOtherNode(person);
System.out.println(friend.getID( ));
}
}
if(numTimes >= MAX_ITER){
System.out.println(this);
}else{
Sim.instance( ).schedule.scheduleOnceIn(1, this);
}
numTimes++;
}
public boolean met(Person other){
Bag b = Sim.instance( ).lastMet.getEdgesIn(this);
for(int i=0; i<b.size( ); i++){
Person otherSideOfThisEdge = (Person) ((Edge)b.get(i)).getOtherNode(this);
if(other == otherSideOfThisEdge){
return true;
}
}
return false;
}
}
| true | true | public void step(SimState state){
//People is a bag of all people
Bag people = Sim.instance( ).people.getAllNodes( );
//We're going to print out the people for sanity check
System.out.println("The contents of the bag: ");
for(int m=0; m<people.size( ); m++){
Person mP = (Person) people.get(m);
System.out.println(mP.getID( ));
}
//for each of the people
for(int i=0; i<people.size( ); i++){
//pick one
Person person = (Person) people.get(i);
System.out.println("Looking at person " + person.getID( ));
//get a bag containing all of the edges between others and this person
Bag b = Sim.instance( ).lastMet.getEdgesIn(person);
//for each of the edges
for(int j=0; j<b.size( ); j++){
//pick one
Edge edge = (Edge)b.get(j);
//determine who the other person on that edge is
Person otherPerson = (Person) edge.getOtherNode(person);
if(otherPerson.getID( ) > person.getID( )){
//if the other person has a higher index, meaning we have not yet looked at them
System.out.println("Looking at when they last met person " + otherPerson.getID( ));
//obtain the number of steps since the two last met
int steps = (int) edge.getInfo( );
//increment this number
steps++;
System.out.println("This was " + steps + " steps ago.");
//if the steps is past the decay point
if(steps > NUM_STEPS_TO_DECAY){
System.out.println("Steps causes decay");
//remove the edge saying when they last met
Sim.instance( ).lastMet.removeEdge(edge);
//get a bag of all the friendships of this person
Bag friendships = Sim.instance( ).people.getEdgesIn(person);
//for each friendship
for(int m=0; m<friendships.size( ); m++){
//pick one
Edge edgeTest = (Edge)friendships.get(m);
//obtain the person on the other end
Person test = (Person) edgeTest.getOtherNode(person);
//when this person is the other friend in question
if(test.equals(otherPerson)){
System.out.println("We're removing the friendship between " + person.getID( ) + " and " + test.getID( ));
//remove this edge
Sim.instance( ).people.removeEdge(edgeTest);
}
}
//if we're not past the decay point
}else{
System.out.println("Steps does not cause decay.");
//just make the edge hold the new number of steps
Sim.instance( ).lastMet.updateEdge(edge, person, otherPerson, steps);
}
}else{
System.out.println("Skipping looking at person " + otherPerson.getID( ));
}
}
System.out.println("The friends for " + person.getID( ) + " are:");
Bag testBag = Sim.instance( ).people.getEdgesIn(person);
for(int k=0; k<testBag.size( ); k++){
Edge friendEdge = (Edge)testBag.get(k);
Person friend = (Person)friendEdge.getOtherNode(person);
System.out.println(friend.getID( ));
}
}
if(numTimes >= MAX_ITER){
System.out.println(this);
}else{
Sim.instance( ).schedule.scheduleOnceIn(1, this);
}
numTimes++;
}
| public void step(SimState state){
//People is a bag of all people
Bag people = Sim.instance( ).people.getAllNodes( );
//We're going to print out the people for sanity check
System.out.println("The contents of the bag: ");
for(int m=0; m<people.size( ); m++){
Person mP = (Person) people.get(m);
System.out.println(mP.getID( ));
}
//for each of the people
for(int i=0; i<people.size( ); i++){
//pick one
Person person = (Person) people.get(i);
System.out.println("Looking at person " + person.getID( ));
//get a bag containing all of the edges between others and this person
Bag b = Sim.instance( ).lastMet.getEdgesIn(person);
//for each of the edges
for(int j=0; j<b.size( ); j++){
//pick one
Edge edge = (Edge)b.get(j);
//determine who the other person on that edge is
Person otherPerson = (Person) edge.getOtherNode(person);
if(otherPerson.getID( ) > person.getID( )){
//if the other person has a higher index, meaning we have not yet looked at them
System.out.println("Looking at when they last met person " + otherPerson.getID( ));
//obtain the number of steps since the two last met
int steps = ((Integer)edge.getInfo( )).intValue();
//increment this number
steps++;
System.out.println("This was " + steps + " steps ago.");
//if the steps is past the decay point
if(steps > NUM_STEPS_TO_DECAY){
System.out.println("Steps causes decay");
//remove the edge saying when they last met
Sim.instance( ).lastMet.removeEdge(edge);
//get a bag of all the friendships of this person
Bag friendships = Sim.instance( ).people.getEdgesIn(person);
//for each friendship
for(int m=0; m<friendships.size( ); m++){
//pick one
Edge edgeTest = (Edge)friendships.get(m);
//obtain the person on the other end
Person test = (Person) edgeTest.getOtherNode(person);
//when this person is the other friend in question
if(test.equals(otherPerson)){
System.out.println("We're removing the friendship between " + person.getID( ) + " and " + test.getID( ));
//remove this edge
Sim.instance( ).people.removeEdge(edgeTest);
}
}
//if we're not past the decay point
}else{
System.out.println("Steps does not cause decay.");
//just make the edge hold the new number of steps
Sim.instance( ).lastMet.updateEdge(edge, person, otherPerson, steps);
}
}else{
System.out.println("Skipping looking at person " + otherPerson.getID( ));
}
}
System.out.println("The friends for " + person.getID( ) + " are:");
Bag testBag = Sim.instance( ).people.getEdgesIn(person);
for(int k=0; k<testBag.size( ); k++){
Edge friendEdge = (Edge)testBag.get(k);
Person friend = (Person)friendEdge.getOtherNode(person);
System.out.println(friend.getID( ));
}
}
if(numTimes >= MAX_ITER){
System.out.println(this);
}else{
Sim.instance( ).schedule.scheduleOnceIn(1, this);
}
numTimes++;
}
|
diff --git a/src/edu/pitt/isp/sverchkov/scorecalculator/ScoreFileV1Writer.java b/src/edu/pitt/isp/sverchkov/scorecalculator/ScoreFileV1Writer.java
index 20c52d5..8cba27a 100644
--- a/src/edu/pitt/isp/sverchkov/scorecalculator/ScoreFileV1Writer.java
+++ b/src/edu/pitt/isp/sverchkov/scorecalculator/ScoreFileV1Writer.java
@@ -1,116 +1,117 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package edu.pitt.isp.sverchkov.scorecalculator;
import java.io.*;
import java.util.HashSet;
import java.util.Set;
import org.apache.log4j.Logger;
/**
*
* @author YUS24
*/
public class ScoreFileV1Writer implements ScoreWriter {
private static final Logger LOG = Logger.getLogger(ScoreFileV1Writer.class);
private final File outFile;
public ScoreFileV1Writer( File output ){
outFile = output;
}
@Override
public void writeScores(RecordSet rs, ScoreFunction sf) {
Variable[] variables = rs.getVariableArray();
if( variables.length > 31 )
throw new UnsupportedOperationException("Current implementation does not support more than 31 variables.");
- long[] bitmasks = new long[variables.length];
- long all = 0;
+ final long[] bitmasks = new long[variables.length];
+ final long all = (1L << bitmasks.length) - 1;
for( int i=0; i < bitmasks.length; i++ )
- all |= ( bitmasks[i] = 1L << i );
+ bitmasks[i] = 1L << i;
+ final int nscores = (int) (all+1)/2;
LOG.debug("All-parent bitmask: "+Long.toBinaryString(all));
// Initialize the output stream
try {
try ( DataOutputStream stream = new DataOutputStream( new BufferedOutputStream( new FileOutputStream( outFile ) ) )){
LOG.debug("Output file opened.");
// Write the header
writeHeader( stream, variables.length-1, rs.size(), variables.length );
LOG.debug("Header written.");
// Iterate over all variables
for( int i=0; i < variables.length; i++ ){
LOG.info("Writing scores for variable \""+variables[i].getName()+"\" ("+i+" out of "+variables.length+").");
LOG.debug("Variable bitmask: "+Long.toBinaryString(bitmasks[i]));
// Write header for variable
- writeVariable( stream, variables[i], (int) all/2 );
+ writeVariable( stream, variables[i], nscores );
- LOG.debug("Variable header weritten. Writing "+all/2+" scores...");
+ LOG.debug("Variable header weritten. Writing "+nscores+" scores...");
// Iterate over all subsets
for( long bits = all; bits >= 0; bits-- )
// If set doesn't contain current variable (i)
if( ( bits & bitmasks[i] ) == 0 ){
// Make set
Set<Variable> set = new HashSet<>();
for( int j=0; j<variables.length; j++ )
// If set contains variable j
if( ( bits & bitmasks[j] ) != 0 )
set.add( variables[j] );
// Compute score
- LOG.debug("Computing score...");
+ LOG.trace("Computing score...");
double score = sf.score( variables[i], set, rs );
// Write score
writeScore( stream, bits, score );
}
LOG.debug("Scores written.");
}
}
}catch( FileNotFoundException e ){
LOG.fatal( e.getMessage() );
LOG.trace( e, e );
}catch( IOException e ){
LOG.fatal( e.getMessage() );
LOG.trace( e, e );
}
}
private void writeVariable(DataOutputStream stream, Variable variable, int numScores) throws IOException {
stream.writeUTF( variable.getName() );
stream.writeByte( variable.getCardinality() );
for( String instantiation : variable.getInstantiations() )
stream.writeUTF(instantiation);
stream.writeInt(numScores);
}
private void writeScore(DataOutputStream stream, long bits, double score) throws IOException {
LOG.trace("Writing score "+score+" for parent set "+Long.toBinaryString(bits));
stream.writeLong(bits);
stream.writeFloat( (float) score );
}
private void writeHeader(DataOutputStream stream, int nParents, int nRecords, int nVariables) throws IOException {
stream.writeByte(1); // Version number 1
stream.writeByte(nParents); // Max number of parents
stream.writeInt(nRecords); // Number of records
stream.writeInt(nVariables); // Number of variables
}
}
| false | true | public void writeScores(RecordSet rs, ScoreFunction sf) {
Variable[] variables = rs.getVariableArray();
if( variables.length > 31 )
throw new UnsupportedOperationException("Current implementation does not support more than 31 variables.");
long[] bitmasks = new long[variables.length];
long all = 0;
for( int i=0; i < bitmasks.length; i++ )
all |= ( bitmasks[i] = 1L << i );
LOG.debug("All-parent bitmask: "+Long.toBinaryString(all));
// Initialize the output stream
try {
try ( DataOutputStream stream = new DataOutputStream( new BufferedOutputStream( new FileOutputStream( outFile ) ) )){
LOG.debug("Output file opened.");
// Write the header
writeHeader( stream, variables.length-1, rs.size(), variables.length );
LOG.debug("Header written.");
// Iterate over all variables
for( int i=0; i < variables.length; i++ ){
LOG.info("Writing scores for variable \""+variables[i].getName()+"\" ("+i+" out of "+variables.length+").");
LOG.debug("Variable bitmask: "+Long.toBinaryString(bitmasks[i]));
// Write header for variable
writeVariable( stream, variables[i], (int) all/2 );
LOG.debug("Variable header weritten. Writing "+all/2+" scores...");
// Iterate over all subsets
for( long bits = all; bits >= 0; bits-- )
// If set doesn't contain current variable (i)
if( ( bits & bitmasks[i] ) == 0 ){
// Make set
Set<Variable> set = new HashSet<>();
for( int j=0; j<variables.length; j++ )
// If set contains variable j
if( ( bits & bitmasks[j] ) != 0 )
set.add( variables[j] );
// Compute score
LOG.debug("Computing score...");
double score = sf.score( variables[i], set, rs );
// Write score
writeScore( stream, bits, score );
}
LOG.debug("Scores written.");
}
}
}catch( FileNotFoundException e ){
LOG.fatal( e.getMessage() );
LOG.trace( e, e );
}catch( IOException e ){
LOG.fatal( e.getMessage() );
LOG.trace( e, e );
}
}
| public void writeScores(RecordSet rs, ScoreFunction sf) {
Variable[] variables = rs.getVariableArray();
if( variables.length > 31 )
throw new UnsupportedOperationException("Current implementation does not support more than 31 variables.");
final long[] bitmasks = new long[variables.length];
final long all = (1L << bitmasks.length) - 1;
for( int i=0; i < bitmasks.length; i++ )
bitmasks[i] = 1L << i;
final int nscores = (int) (all+1)/2;
LOG.debug("All-parent bitmask: "+Long.toBinaryString(all));
// Initialize the output stream
try {
try ( DataOutputStream stream = new DataOutputStream( new BufferedOutputStream( new FileOutputStream( outFile ) ) )){
LOG.debug("Output file opened.");
// Write the header
writeHeader( stream, variables.length-1, rs.size(), variables.length );
LOG.debug("Header written.");
// Iterate over all variables
for( int i=0; i < variables.length; i++ ){
LOG.info("Writing scores for variable \""+variables[i].getName()+"\" ("+i+" out of "+variables.length+").");
LOG.debug("Variable bitmask: "+Long.toBinaryString(bitmasks[i]));
// Write header for variable
writeVariable( stream, variables[i], nscores );
LOG.debug("Variable header weritten. Writing "+nscores+" scores...");
// Iterate over all subsets
for( long bits = all; bits >= 0; bits-- )
// If set doesn't contain current variable (i)
if( ( bits & bitmasks[i] ) == 0 ){
// Make set
Set<Variable> set = new HashSet<>();
for( int j=0; j<variables.length; j++ )
// If set contains variable j
if( ( bits & bitmasks[j] ) != 0 )
set.add( variables[j] );
// Compute score
LOG.trace("Computing score...");
double score = sf.score( variables[i], set, rs );
// Write score
writeScore( stream, bits, score );
}
LOG.debug("Scores written.");
}
}
}catch( FileNotFoundException e ){
LOG.fatal( e.getMessage() );
LOG.trace( e, e );
}catch( IOException e ){
LOG.fatal( e.getMessage() );
LOG.trace( e, e );
}
}
|
diff --git a/SolarPanelApp/src/com/example/calendar/BasicCalendar.java b/SolarPanelApp/src/com/example/calendar/BasicCalendar.java
index 228cb35..9ee01e8 100644
--- a/SolarPanelApp/src/com/example/calendar/BasicCalendar.java
+++ b/SolarPanelApp/src/com/example/calendar/BasicCalendar.java
@@ -1,54 +1,56 @@
package com.example.calendar;
import java.util.Collection;
import java.util.Calendar;
import java.util.Map;
import java.util.TreeMap;
import com.example.solarpanelmanager.api.responses.Event;
public class BasicCalendar {
private Map<String, Event> calendar = new TreeMap<String, Event>();
private static final long DAY_MILLIS = 24 * 60 * 60 * 1000;
public BasicCalendar(Collection<Event> events) {
for (Event e : events)
addEvent(e);
}
public boolean addEvent(Event event) {
for (Event e : calendar.values()) {
if (isOverlap(event, e))
return false;
}
calendar.put(eventToKey(event), event);
return true;
}
public void removeEvent(Event event) {
calendar.remove(eventToKey(event));
}
public Map<String, Event> getCalendar() {
return calendar;
}
private static String eventToKey(Event e) {
Calendar day = Calendar.getInstance();
day.setTimeInMillis(e.getFirstTime());
return day.get(Calendar.HOUR) + ":" + day.get(Calendar.MINUTE);
}
private static boolean isOverlap(Event e1, Event e2) {
Calendar newDay = Calendar.getInstance();
+ newDay.setTimeInMillis(e1.getFirstTime());
long newStart = ((newDay.get(Calendar.HOUR) * 60 + newDay.get(Calendar.MINUTE)) * 60 * 1000) % DAY_MILLIS;
long newEnd = (newStart + e1.getDuration()) % DAY_MILLIS;
Calendar oldDay = Calendar.getInstance();
+ oldDay.setTimeInMillis(e2.getFirstTime());
long oldStart = ((oldDay.get(Calendar.HOUR) * 60 + oldDay.get(oldDay.get(Calendar.MINUTE)) * 60 * 1000)) % DAY_MILLIS;
long oldEnd = (oldStart + e2.getDuration()) % DAY_MILLIS;
return (newStart >= oldStart && newStart < oldEnd) || (newEnd <= oldEnd && newEnd > oldStart);
}
}
| false | true | private static boolean isOverlap(Event e1, Event e2) {
Calendar newDay = Calendar.getInstance();
long newStart = ((newDay.get(Calendar.HOUR) * 60 + newDay.get(Calendar.MINUTE)) * 60 * 1000) % DAY_MILLIS;
long newEnd = (newStart + e1.getDuration()) % DAY_MILLIS;
Calendar oldDay = Calendar.getInstance();
long oldStart = ((oldDay.get(Calendar.HOUR) * 60 + oldDay.get(oldDay.get(Calendar.MINUTE)) * 60 * 1000)) % DAY_MILLIS;
long oldEnd = (oldStart + e2.getDuration()) % DAY_MILLIS;
return (newStart >= oldStart && newStart < oldEnd) || (newEnd <= oldEnd && newEnd > oldStart);
}
| private static boolean isOverlap(Event e1, Event e2) {
Calendar newDay = Calendar.getInstance();
newDay.setTimeInMillis(e1.getFirstTime());
long newStart = ((newDay.get(Calendar.HOUR) * 60 + newDay.get(Calendar.MINUTE)) * 60 * 1000) % DAY_MILLIS;
long newEnd = (newStart + e1.getDuration()) % DAY_MILLIS;
Calendar oldDay = Calendar.getInstance();
oldDay.setTimeInMillis(e2.getFirstTime());
long oldStart = ((oldDay.get(Calendar.HOUR) * 60 + oldDay.get(oldDay.get(Calendar.MINUTE)) * 60 * 1000)) % DAY_MILLIS;
long oldEnd = (oldStart + e2.getDuration()) % DAY_MILLIS;
return (newStart >= oldStart && newStart < oldEnd) || (newEnd <= oldEnd && newEnd > oldStart);
}
|
diff --git a/cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/Cis.java b/cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/Cis.java
index c8619c10a..f179b14ef 100644
--- a/cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/Cis.java
+++ b/cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/Cis.java
@@ -1,1595 +1,1595 @@
/**
* Copyright (c) 2011, SOCIETIES Consortium (WATERFORD INSTITUTE OF TECHNOLOGY (TSSG), HERIOT-WATT UNIVERSITY (HWU), SOLUTA.NET
* (SN), GERMAN AEROSPACE CENTRE (Deutsches Zentrum fuer Luft- und Raumfahrt e.V.) (DLR), Zavod za varnostne tehnologije
* informacijske družbe in elektronsko poslovanje (SETCCE), INSTITUTE OF COMMUNICATION AND COMPUTER SYSTEMS (ICCS), LAKE
* COMMUNICATIONS (LAKE), INTEL PERFORMANCE LEARNING SOLUTIONS LTD (INTEL), PORTUGAL TELECOM INOVAÇÃO, SA (PTIN), IBM Corp.,
* INSTITUT TELECOM (ITSUD), AMITEC DIACHYTI EFYIA PLIROFORIKI KAI EPIKINONIES ETERIA PERIORISMENIS EFTHINIS (AMITEC), TELECOM
* ITALIA S.p.a.(TI), TRIALOG (TRIALOG), Stiftelsen SINTEF (SINTEF), NEC EUROPE LTD (NEC))
* 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.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.societies.cis.manager;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.annotations.CollectionOfElements;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.societies.activity.PersistedActivityFeed;
import org.societies.api.activity.IActivity;
import org.societies.api.activity.IActivityFeed;
import org.societies.api.cis.attributes.MembershipCriteria;
import org.societies.api.cis.attributes.Rule;
import org.societies.api.cis.management.ICisManagerCallback;
import org.societies.api.cis.management.ICisOwned;
import org.societies.api.cis.management.ICisParticipant;
import org.societies.api.comm.xmpp.datatypes.Stanza;
import org.societies.api.comm.xmpp.exceptions.CommunicationException;
import org.societies.api.comm.xmpp.exceptions.XMPPError;
import org.societies.api.comm.xmpp.interfaces.ICommManager;
import org.societies.api.comm.xmpp.interfaces.IFeatureServer;
import org.societies.api.comm.xmpp.pubsub.PubsubClient;
import org.societies.api.context.model.CtxAttributeValueType;
import org.societies.api.identity.IIdentity;
import org.societies.api.identity.InvalidFormatException;
import org.societies.api.identity.RequestorCis;
import org.societies.api.internal.comm.ICISCommunicationMgrFactory;
import org.societies.api.internal.privacytrust.privacyprotection.IPrivacyPolicyManager;
import org.societies.api.internal.privacytrust.privacyprotection.model.PrivacyException;
import org.societies.api.internal.servicelifecycle.IServiceControlRemote;
import org.societies.api.internal.servicelifecycle.IServiceDiscoveryRemote;
import org.societies.api.schema.activityfeed.*;
import org.societies.api.schema.cis.community.*;
import org.societies.api.schema.cis.manager.*;
import org.societies.cis.manager.CisParticipant.MembershipType;
import org.springframework.scheduling.annotation.AsyncResult;
import javax.persistence.*;
import java.util.*;
import java.util.List;
import java.util.concurrent.Future;
//import org.societies.api.schema.cis.community.GetInfo;
/**
* @author Thomas Vilarinho (Sintef)
*/
/**
* This object corresponds to an owned CIS. The CIS record will be the CIS data which is stored on DataBase
*/
@Entity
@Table(name = "org_societies_cis_manager_Cis")
public class Cis implements IFeatureServer, ICisOwned {
private static final long serialVersionUID = 1L;
@Transient
private final static List<String> NAMESPACES = Collections
.unmodifiableList( Arrays.asList("http://societies.org/api/schema/cis/manager",
"http://societies.org/api/schema/activityfeed",
"http://societies.org/api/schema/cis/community"));
// .singletonList("http://societies.org/api/schema/cis/community");
@Transient
private final static List<String> PACKAGES = Collections
//.singletonList("org.societies.api.schema.cis.community");
.unmodifiableList( Arrays.asList("org.societies.api.schema.cis.manager",
"org.societies.api.schema.activityfeed",
"org.societies.api.schema.cis.community"));
@Transient
private SessionFactory sessionFactory;
@Transient
private Session session;
public SessionFactory getSessionFactory() {
return sessionFactory;
}
public void setSessionFactory(SessionFactory sessionFactory) {
this.sessionFactory = sessionFactory;
}
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
@Column(name="cis_id")
private Long id;
// minimun attributes
@OneToOne(cascade=CascadeType.ALL)
public CisRecord cisRecord;
//@OneToOne(cascade=CascadeType.ALL)
@Transient
public PersistedActivityFeed activityFeed = new PersistedActivityFeed();
//TODO: should this be persisted?
@Transient
private ICommManager CISendpoint;
@Transient
IServiceDiscoveryRemote iServDiscRemote = null;
@Transient
IServiceControlRemote iServCtrlRemote = null;
@Transient
IPrivacyPolicyManager privacyPolicyManager = null;
public void setPrivacyPolicyManager(IPrivacyPolicyManager privacyPolicyManager) {
this.privacyPolicyManager = privacyPolicyManager;
}
@Transient
private IIdentity cisIdentity;
@Transient
private PubsubClient psc;
@OneToMany(cascade=CascadeType.ALL,fetch=FetchType.EAGER,orphanRemoval=true)
@JoinTable(
name="org_societies_cis_manager_Cis_CisParticipant",
joinColumns = @JoinColumn( name="cis_id"),
inverseJoinColumns = @JoinColumn( name="cisparticipant_id")
)
public Set<CisParticipant> membersCss; // TODO: this may be implemented in the CommunityManagement bundle. we need to define how they work together
@Column
public String cisType;
@Column
public String owner;
//@OneToMany(cascade=CascadeType.ALL,fetch=FetchType.EAGER,orphanRemoval=true)
//@Transient
//Set<MembershipCriteriaImp> cisCriteria = null;
@CollectionOfElements(targetElement = java.lang.String.class,fetch=FetchType.EAGER)
@CollectionTable(name="org_societies_cis_manager_Cis_criteria",joinColumns = @JoinColumn(name = "cis_id"))
@Column(name="criteria",length=500)
public Set<String> membershipCritOnDb;// we will store it in the db as "context,rank,operator,value1,value2"
@Transient
Hashtable<String, MembershipCriteria> cisCriteria = null;
private Set<String> getMembershipCritOnDb() {
return membershipCritOnDb;
}
private void setMembershipCritOnDb(Set<String> membershipCritOnDb) {
this.membershipCritOnDb = membershipCritOnDb;
}
public boolean checkQualification(HashMap<String,String> qualification){
for (String cisContext : cisCriteria.keySet()) { // loop through all my criterias
if(qualification.containsKey(cisContext)){
MembershipCriteria m = cisCriteria.get(cisContext); // retrieves the context for that criteria
if(m != null){ // if there is a rule we check it
String valueToBeCompared = qualification.get(cisContext);
if (! (m.getRule().checkRule(CtxAttributeValueType.STRING, valueToBeCompared))) //TODO: this CtxAttributeValueType.STRING should be changed!!
return false;
}
}
else{// did not have a needed context attribute in its qualification
return false;
}
}
return true;
}
private void buildCriteriaFromDb(){
for (String s : membershipCritOnDb) { // loop through all my criterias
LOG.warn("on the loop to build criteria with crit = " + s);
String[] tokens = s.split(",");
if(tokens == null || tokens.length < 4){
LOG.warn("Badly coded criteria on db");
return;
}else{
MembershipCriteria m = new MembershipCriteria();
m.setRank(Integer.parseInt(tokens[1]));
LOG.info("rank set");
Rule r = new Rule();
r.setOperation(tokens[2]);
LOG.info("op set");
List<String> o = new ArrayList<String>();
o.add(tokens[3]);
LOG.info("token set");
if(tokens.length>4)
o.add(tokens[4]);
if( (r.setValues(o) && m.setRule(r)) != true)
LOG.warn("Badly typed criteria on db");
LOG.info("adding on table");
cisCriteria.put(tokens[0], m);
LOG.info("added on table");
}
}
}
public boolean addCriteria(String contextAtribute, MembershipCriteria m){
LOG.warn("adding criteria on db");
String s = contextAtribute;
if(m.getRule() == null || m.getRule().getOperation() == null || m.getRule().getValues() == null
|| m.getRule().getValues().isEmpty()) return false;
s += "," + m.getRank();
s += "," + m.getRule().getOperation();
LOG.warn("got operation");
for(int i=0; i<m.getRule().getValues().size() && i<2; i++){
s+= "," + m.getRule().getValues().get(i);
}
LOG.warn("calling the list add inside the add criteria and s = " + s);
membershipCritOnDb.add(s);
LOG.warn("going to persist");
this.updatePersisted(this);
LOG.warn("before putting on the table");
cisCriteria.put(contextAtribute, m);
LOG.warn("criteria added on db");
return true;
}
//to be used only for the constructor
public boolean addCriteriaWithoutDBcall(String contextAtribute, MembershipCriteria m){
LOG.warn("adding criteria on db");
String s = contextAtribute;
if(m.getRule() == null || m.getRule().getOperation() == null || m.getRule().getValues() == null
|| m.getRule().getValues().isEmpty()) return false;
s += "," + m.getRank();
s += "," + m.getRule().getOperation();
LOG.warn("got operation");
for(int i=0; i<m.getRule().getValues().size() && i<2; i++){
s+= "," + m.getRule().getValues().get(i);
}
LOG.warn("calling the list add inside the add criteria and s = " + s);
membershipCritOnDb.add(s);
LOG.warn("going to persist");
LOG.warn("before putting on the table");
cisCriteria.put(contextAtribute, m);
LOG.warn("criteria added on db");
return true;
}
public boolean removeCriteria(String contextAtribute, MembershipCriteria m){
if(cisCriteria.containsKey(contextAtribute) && cisCriteria.get(contextAtribute).equals(m)){
//rule is there, lets remove it
String s = contextAtribute;
if(m.getRule() == null || m.getRule().getOperation() == null || m.getRule().getValues() == null
|| m.getRule().getValues().isEmpty()) return false;
s += "," + m.getRank();
s += "," + m.getRule().getOperation();
for(int i=0; i<m.getRule().getValues().size() && i<2; i++){
s+= "," + m.getRule().getValues().get(i);
}
if( membershipCritOnDb.remove(s) != true) return false;
this.updatePersisted(this);
cisCriteria.remove(contextAtribute); // TODO: maybe inver this from the remove
return true;
}else{
return false;
}
}
@Column
String description = "";
@Override
public String getDescription() {
return description;
}
@Override
public void setDescription(String description) {
this.description = description;
}
@Override
public IActivityFeed getActivityFeed() {
return activityFeed;
}
private void setActivityFeed(PersistedActivityFeed activityFeed) {
this.activityFeed = activityFeed;
}
public IServiceDiscoveryRemote getiServDiscRemote() {
return iServDiscRemote;
}
public void setiServDiscRemote(IServiceDiscoveryRemote iServDiscRemote) {
this.iServDiscRemote = iServDiscRemote;
}
public IServiceControlRemote getiServCtrlRemote() {
return iServCtrlRemote;
}
public void setiServCtrlRemote(IServiceControlRemote iServCtrlRemote) {
this.iServCtrlRemote = iServCtrlRemote;
}
private static Logger LOG = LoggerFactory
.getLogger(Cis.class);
public Cis(){
}
// internal method
public CisParticipant getMember(String cssJid){
Set<CisParticipant> se = this.getMembersCss();
Iterator<CisParticipant> it = se.iterator();
while(it.hasNext()){
CisParticipant element = it.next();
if (element.getMembersJid().equals(cssJid))
return element;
}
return null;
}
// constructor of a CIS without a pre-determined ID or host
public Cis(String cssOwner, String cisName, String cisType, ICISCommunicationMgrFactory ccmFactory
,IServiceDiscoveryRemote iServDiscRemote,IServiceControlRemote iServCtrlRemote,
IPrivacyPolicyManager privacyPolicyManager, SessionFactory sessionFactory,
String description, Hashtable<String, MembershipCriteria> inputCisCriteria) {
this.privacyPolicyManager = privacyPolicyManager;
this.description = description;
this.owner = cssOwner;
this.cisType = cisType;
this.iServCtrlRemote = iServCtrlRemote;
this.iServDiscRemote = iServDiscRemote;
membershipCritOnDb= new HashSet<String>();
membersCss = new HashSet<CisParticipant>();
membersCss.add(new CisParticipant(cssOwner,MembershipType.owner));
cisCriteria = new Hashtable<String, MembershipCriteria> ();
LOG.info("before adding membership criteria");
// adding membership criteria
if(inputCisCriteria != null && inputCisCriteria.size() >0){
Iterator<Map.Entry<String, MembershipCriteria>> it = inputCisCriteria.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, MembershipCriteria> pairs = (Map.Entry<String, MembershipCriteria>)it.next();
LOG.info("going to add criteria of attribute" + pairs.getKey());
if (this.addCriteriaWithoutDBcall(pairs.getKey(), pairs.getValue()) == false)
LOG.info("Got a false return when trying to add the criteria on the db");// TODO: add an exception here
//it.remove(); // avoids a ConcurrentModificationException
}
}
// m.setMinValue("Edinburgh");
// m.setMaxValue("Edinburgh");
// cisCriteria.add(m); // for test purposes only
LOG.info("CIS editor created");
try{
CISendpoint = ccmFactory.getNewCommManager();
} catch (CommunicationException e) {
e.printStackTrace();
LOG.info("could not start comm manager!");
}
LOG.info("CIS got new comm manager");
try {
cisIdentity = CISendpoint.getIdManager().getThisNetworkNode();//CISendpoint.getIdManager().fromJid(CISendpoint.getIdManager().getThisNetworkNode().getJid());
} catch (Exception e) {
e.printStackTrace();
}
LOG.info("CIS endpoint created");
try {
CISendpoint.register(this);
iServCtrlRemote.registerCISEndpoint(CISendpoint);
} catch (CommunicationException e) {
e.printStackTrace();
this.unregisterCIS();
LOG.info("could not start comm manager!");
}
LOG.info("CIS listener registered");
// TODO: we have to get a proper identity and pwd for the CIS...
cisRecord = new CisRecord(cisName, cisIdentity.getJid());
LOG.info("CIS creating pub sub service");
// PubsubServiceRouter psr = new PubsubServiceRouter(CISendpoint);
LOG.info("CIS pub sub service created");
//this.psc = psc;
LOG.info("CIS autowired PubSubClient");
// TODO: broadcast its creation to other nodes?
//session = sessionFactory.openSession();
System.out.println("activityFeed: "+activityFeed);
activityFeed.startUp(sessionFactory,this.getCisId()); // this must be called just after the CisRecord has been set
this.sessionFactory = sessionFactory;
//activityFeed.setSessionFactory(this.sessionFactory);
this.persist(this);
IActivity iActivity = new org.societies.activity.model.Activity();
iActivity.setActor(this.getOwnerId());
iActivity.setObject(cisIdentity.getJid());
iActivity.setPublished(System.currentTimeMillis()+"");
iActivity.setVerb("created");
activityFeed.addActivity(iActivity);
//activityFeed.getActivities("0 1339689547000");
}
public void startAfterDBretrieval(SessionFactory sessionFactory,ICISCommunicationMgrFactory ccmFactory,IPrivacyPolicyManager privacyPolicyManager){
this.privacyPolicyManager = privacyPolicyManager;
// first Ill try without members
try {
CISendpoint = ccmFactory.getNewCommManager(this.getCisId());
} catch (CommunicationException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
LOG.info("retrieved COM manager");
try {
cisIdentity = CISendpoint.getIdManager().getThisNetworkNode();//CISendpoint.getIdManager().fromJid(CISendpoint.getIdManager().getThisNetworkNode().getJid());
} catch (Exception e) {
e.printStackTrace();
}
LOG.info("CIS endpoint created");
try {
CISendpoint.register(this);
//iServCtrlRemote.registerCISEndpoint(CISendpoint);
// CISendpoint.register((IFeatureServer) iServCtrlRemote);
// CISendpoint.register((IFeatureServer) iServDiscRemote);
} catch (CommunicationException e) {
e.printStackTrace();
LOG.info("could not start comm manager!");
this.unregisterCIS();
}
LOG.info("CIS listener registered");
this.setSessionFactory(sessionFactory);
//session = sessionFactory.openSession();
LOG.info("building criteria from db");
cisCriteria = new Hashtable<String, MembershipCriteria> ();
this.buildCriteriaFromDb();
LOG.info("done building criteria from db");
activityFeed.startUp(sessionFactory,this.getCisId()); // this must be called just after the CisRecord has been set
activityFeed.getActivities("0 1339689547000");
}
public Set<CisParticipant> getMembersCss() {
return membersCss;
}
public void setMembersCss(Set<CisParticipant> membersCss) {
this.membersCss = membersCss;
}
@Override
public Future<Boolean> addMember(String jid, String role){
MembershipType typedRole;
try{
typedRole = MembershipType.valueOf(role);
}catch(IllegalArgumentException e) {
return new AsyncResult<Boolean>(new Boolean(false)); //the string was not valid
}
catch( NullPointerException e) {
return new AsyncResult<Boolean>(new Boolean(false)); //the string was not valid
}
boolean ret;
ret = this.insertMember(jid, typedRole);
Stanza sta;
LOG.info("new member added, going to notify the user");
IIdentity targetCssIdentity = null;
try {
targetCssIdentity = this.CISendpoint.getIdManager().fromJid(jid);
} catch (InvalidFormatException e) {
LOG.info("could not send addd notification");
e.printStackTrace();
}
// 1) Notifying the added user
CommunityManager cMan = new CommunityManager();
Notification n = new Notification();
SubscribedTo s = new SubscribedTo();
Community com = new Community();
this.fillCommmunityXMPPobj(com);
s.setRole(role.toString());
s.setCommunity(com);
n.setSubscribedTo(s);
cMan.setNotification(n);
LOG.info("finished building notification");
sta = new Stanza(targetCssIdentity);
try {
CISendpoint.sendMessage(sta, cMan);
} catch (CommunicationException e) {
// TODO Auto-generated catch block
LOG.info("problem sending notification to cis");
e.printStackTrace();
}
LOG.info("notification sent to the new user");
return new AsyncResult<Boolean>(new Boolean(ret));
}
// internal implementation of the method above
private boolean insertMember(String jid, MembershipType role) {
LOG.info("add member invoked");
if (role == null)
role = MembershipType.participant; // default role is participant
if (membersCss.add(new CisParticipant(jid, role))){
//persist in database
this.updatePersisted(this);
//activityFeed notification
IActivity iActivity = new org.societies.activity.model.Activity();
iActivity.setActor(jid);
iActivity.setObject(cisIdentity.getJid());
iActivity.setPublished(System.currentTimeMillis()+"");
iActivity.setVerb("joined");
activityFeed.addActivity(iActivity);
return true;
}else{
return false;
}
}
@Override
public Future<Boolean> removeMemberFromCIS(String jid) throws CommunicationException{
IIdentity targetCssIdentity;
try {
targetCssIdentity = this.CISendpoint.getIdManager().fromJid(jid);
} catch (InvalidFormatException e) {
LOG.warn("bad jid when trying to delete from CIS!");
e.printStackTrace();
return new AsyncResult<Boolean>(new Boolean(false));
}
if (!this.removeMember(jid))
return new AsyncResult<Boolean>(new Boolean(false));
// 2) Notification to deleted user here
CommunityManager message = new CommunityManager();
Notification n = new Notification();
DeleteMemberNotification d = new DeleteMemberNotification();
d.setCommunityJid(this.getCisId());
d.setMemberJid(jid);
n.setDeleteMemberNotification(d);
message.setNotification(n);
try {
targetCssIdentity = this.CISendpoint.getIdManager().fromJid(jid);
Stanza sta = new Stanza(targetCssIdentity);
LOG.info("stanza created");
this.CISendpoint.sendMessage(sta, message);
} catch (InvalidFormatException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return new AsyncResult<Boolean>(new Boolean(true));
}
// true if we were able to remove the user
// false if not
private boolean removeMember(String jid) throws CommunicationException{
//TODO: add a check if it is a valid JID
LOG.info("remove member invoked");
if (membersCss.contains(new CisParticipant(jid))){
LOG.info("user is a participant of the community");
// for database update
CisParticipant temp;
temp = this.getMember(jid);
// 1) Removing the user
if (membersCss.remove( new CisParticipant(jid)) == false)
return false;
// updating the database database
this.updatePersisted(this);
this.deletePersisted(temp);
//activityFeed notification
IActivity iActivity = new org.societies.activity.model.Activity();
iActivity.setActor(jid);
iActivity.setObject(cisIdentity.getJid());
iActivity.setPublished(System.currentTimeMillis()+"");
iActivity.setVerb("left");
activityFeed.addActivity(iActivity);
return true;
}else{
return false;
}
}
// constructor for creating a CIS from a CIS record, maybe the case when we are retrieving data from a database
// TODO: review as it is almost empty!!
public Cis(CisRecord cisRecord) {
this.cisRecord = cisRecord;
//CISendpoint = new XCCommunicationMgr(cisRecord.getHost(), cisRecord.getCisId(),cisRecord.getPassword());
// TODO: broadcast its creation to other nodes?
}
// equals comparing only cisRecord
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result
+ ((cisRecord == null) ? 0 : cisRecord.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Cis other = (Cis) obj;
if (cisRecord == null) {
if (other.cisRecord != null)
return false;
} else if (!cisRecord.equals(other.cisRecord))
return false;
return true;
}
public CisRecord getCisRecord() {
return cisRecord;
}
public void setCisRecord(CisRecord cisRecord) {
this.cisRecord = cisRecord;
}
@Override
public List<String> getJavaPackages() {
return PACKAGES;
}
@Override
public Object getQuery(Stanza stanza, Object payload) {
// all received IQs contain a community element
LOG.info("get Query received");
if (payload.getClass().equals(CommunityMethods.class)) {
LOG.info("community type received");
CommunityMethods c = (CommunityMethods) payload;
// JOIN
if (c.getJoin() != null) {
- String jid = "";
+ //String jid = "";
LOG.info("join received");
String senderjid = stanza.getFrom().getBareJid();
// information sent on the xmpp in case of failure or success
Community com = new Community();
CommunityMethods result = new CommunityMethods();
Participant p = new Participant();
JoinResponse j = new JoinResponse();
boolean addresult = false;
- p.setJid(jid);
+ p.setJid(senderjid);
this.fillCommmunityXMPPobj(com);
j.setCommunity(com);
result.setJoinResponse(j);
// TEMPORARELY DISABLING THE QUALIFICATION CHECKS
// TODO: uncomment this
// checking the criteria
if(this.cisCriteria.size()>0){
Join join = (Join) c.getJoin();
if(join.getQualification() != null && join.getQualification().size()>0 ){
// retrieving from marshalled object the qualifications to be checked
HashMap<String,String> qualification = new HashMap<String,String>();
for (Qualification q : join.getQualification()) {
qualification.put(q.getAttrib(), q.getValue());
}
if (this.checkQualification(qualification) == false){
j.setResult(addresult);
LOG.info("qualification mismatched");
return result;
}
}
else{
j.setResult(addresult);
LOG.info("qualification not found");
return result;
}
}
addresult = this.insertMember(senderjid, MembershipType.participant);
j.setResult(addresult);
// TODO: add the criteria to the response
if(addresult == true){
// information sent on the xmpp just in the case of success
p.setRole( ParticipantRole.fromValue("participant") );
}
j.setParticipant(p);
return result;
//return result;
}
if (c.getLeave() != null) {
LOG.info("get leave received");
CommunityMethods result = new CommunityMethods();
String jid = stanza.getFrom().getBareJid();
boolean b = false;
try{
b = this.removeMember(jid);
}catch(CommunicationException e){
// TODO Auto-generated catch block
e.printStackTrace();
}
LeaveResponse l = new LeaveResponse();
l.setResult(b);
result.setLeaveResponse(l);
return result;
}
if (c.getWho() != null) {
// WHO
LOG.info("get who received");
CommunityMethods result = new CommunityMethods();
Who who = new Who();
this.getMembersCss();
Set<CisParticipant> s = this.getMembersCss();
Iterator<CisParticipant> it = s.iterator();
while(it.hasNext()){
CisParticipant element = it.next();
Participant p = new Participant();
p.setJid(element.getMembersJid());
p.setRole( ParticipantRole.fromValue(element.getMtype().toString()) );
who.getParticipant().add(p);
}
result.setWho(who);
return result;
// END OF WHO
}
if (c.getAddMember() != null) {
// ADD
CommunityMethods result = new CommunityMethods();
AddMemberResponse ar = new AddMemberResponse();
String senderJid = stanza.getFrom().getBareJid();
Participant p = c.getAddMember().getParticipant();
ar.setParticipant(p);
// if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
//requester is not the owner
// ar.setResult(false);
// }else{
if(p!= null && p.getJid() != null){
String role = "";
if (p.getRole() != null)
role = p.getRole().value();
try{
if(this.addMember(p.getJid(), role).get()){
ar.setParticipant(p);
ar.setResult(true);
}
else{
ar.setResult(false);
}
}
catch(Exception e){
e.printStackTrace();
ar.setResult(false);
}
}
// }
result.setAddMemberResponse(ar);
return result;
// END OF ADD
}
if (c.getDeleteMember() != null) {
// DELETE MEMBER
CommunityMethods result = new CommunityMethods();
DeleteMemberResponse dr = new DeleteMemberResponse();
String senderJid = stanza.getFrom().getBareJid();
Participant p = c.getDeleteMember().getParticipant();
dr.setParticipant(p);
// if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
//requester is not the owner
// dr.setResult(false);
// }else{
try{
dr.setResult(this.removeMemberFromCIS(p.getJid()).get());
}
catch(Exception e){
e.printStackTrace();
dr.setResult(false);
}
// }
result.setDeleteMemberResponse(dr);
return result;
// END OF DELETE MEMBER
}
// get Info
if (c.getGetInfo()!= null) {
CommunityMethods result = new CommunityMethods();
Community com = new Community();
GetInfoResponse r = new GetInfoResponse();
this.fillCommmunityXMPPobj(com);
r.setResult(true);
r.setCommunity(com);
result.setGetInfoResponse(r);
return result;
} // END OF GET INFO
// set Info
// at the moment we limit this to description and type
if (c.getSetInfo()!= null && c.getSetInfo().getCommunity() != null) {
CommunityMethods result = new CommunityMethods();
Community com = new Community();
SetInfoResponse r = new SetInfoResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
Community inputCommunity = c.getSetInfo().getCommunity();
if( (inputCommunity.getCommunityType() != null) && (!inputCommunity.getCommunityType().isEmpty()) &&
(!inputCommunity.getCommunityType().equals(this.getCisType()))) // if is not empty and is different from current value
this.setCisType(inputCommunity.getCommunityType());
if( (inputCommunity.getDescription() != null) && (!inputCommunity.getDescription().isEmpty()) &&
(!inputCommunity.getDescription().equals(this.getDescription()))) // if is not empty and is different from current value
this.setDescription(inputCommunity.getDescription());
r.setResult(true);
// updating at DB
this.updatePersisted(this);
//}
this.fillCommmunityXMPPobj(com);
r.setCommunity(com);
result.setSetInfoResponse(r);
return result;
} // END OF GET INFO
// get Membership Criteria
if (c.getGetMembershipCriteria()!= null) {
CommunityMethods result = new CommunityMethods();
GetMembershipCriteriaResponse g = new GetMembershipCriteriaResponse();
MembershipCrit m = new MembershipCrit();
this.fillMembershipCritXMPPobj(m);
g.setMembershipCrit(m);
result.setGetMembershipCriteriaResponse(g);
return result;
}
// set Membership Criteria
if (c.getSetMembershipCriteria()!= null) {
CommunityMethods result = new CommunityMethods();
SetMembershipCriteriaResponse r = new SetMembershipCriteriaResponse();
result.setSetMembershipCriteriaResponse(r);
// retrieving from marshalled object the incoming criteria
MembershipCrit m = c.getSetMembershipCriteria().getMembershipCrit();
if (m!=null && m.getCriteria() != null && m.getCriteria().size()>0){
// populate the hashtable
for (Criteria crit : m.getCriteria()) {
MembershipCriteria meb = new MembershipCriteria();
meb.setRank(crit.getRank());
Rule rule = new Rule();
if( rule.setOperation(crit.getOperator()) == false) {r.setResult(false); return result;}
ArrayList<String> a = new ArrayList<String>();
a.add(crit.getValue1());
if (crit.getValue2() != null && !crit.getValue2().isEmpty()) a.add(crit.getValue2());
if( rule.setValues(a) == false) {r.setResult(false); return result;}
meb.setRule(rule);
if( this.addCriteria(crit.getAttrib(), meb) == false) {r.setResult(false); return result;}
}
}
r.setResult(true);
m = new MembershipCrit();
this.fillMembershipCritXMPPobj(m);
r.setMembershipCrit(m);
return result;
}
}
if (payload.getClass().equals(Activityfeed.class)) {
LOG.info("activity feed type received");
Activityfeed c = (Activityfeed) payload;
// delete Activity
if (c.getDeleteActivity() != null) {
Activityfeed result = new Activityfeed();
DeleteActivityResponse r = new DeleteActivityResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
IActivity iActivity = new org.societies.activity.model.Activity();
iActivity.setActor(c.getDeleteActivity().getActivity().getActor());
iActivity.setObject(c.getDeleteActivity().getActivity().getObject());
iActivity.setTarget(c.getDeleteActivity().getActivity().getTarget());
iActivity.setPublished(c.getDeleteActivity().getActivity().getPublished());
iActivity.setVerb(c.getDeleteActivity().getActivity().getVerb());
r.setResult(activityFeed.deleteActivity(iActivity));
result.setDeleteActivityResponse(r);
return result;
} // END OF delete Activity
// get Activities
if (c.getGetActivities() != null) {
LOG.info("get activities called");
org.societies.api.schema.activityfeed.Activityfeed result = new org.societies.api.schema.activityfeed.Activityfeed();
GetActivitiesResponse r = new GetActivitiesResponse();
String senderJid = stanza.getFrom().getBareJid();
List<IActivity> iActivityList;
List<org.societies.api.schema.activity.Activity> marshalledActivList = new ArrayList<org.societies.api.schema.activity.Activity>();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
if(c.getGetActivities().getQuery()==null || c.getGetActivities().getQuery().isEmpty())
iActivityList = activityFeed.getActivities(c.getGetActivities().getTimePeriod());
else
iActivityList = activityFeed.getActivities(c.getGetActivities().getQuery(),c.getGetActivities().getTimePeriod());
//}
LOG.info("loacl query worked activities called");
this.activityFeed.iactivToMarshActv(iActivityList, marshalledActivList);
/*
Iterator<IActivity> it = iActivityList.iterator();
while(it.hasNext()){
IActivity element = it.next();
org.societies.api.schema.activity.Activity a = new org.societies.api.schema.activity.Activity();
a.setActor(element.getActor());
a.setObject(a.getObject());
a.setPublished(a.getPublished());
a.setVerb(a.getVerb());
marshalledActivList.add(a);
}
*/
LOG.info("finished the marshling");
r.setActivity(marshalledActivList);
result.setGetActivitiesResponse(r);
return result;
} // END OF get ACTIVITIES
// add Activity
if (c.getAddActivity() != null) {
org.societies.api.schema.activityfeed.Activityfeed result = new org.societies.api.schema.activityfeed.Activityfeed();
AddActivityResponse r = new AddActivityResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
IActivity iActivity = new org.societies.activity.model.Activity();
iActivity.setActor(c.getAddActivity().getActivity().getActor());
iActivity.setObject(c.getAddActivity().getActivity().getObject());
iActivity.setTarget(c.getAddActivity().getActivity().getTarget());
iActivity.setPublished(c.getAddActivity().getActivity().getPublished());
iActivity.setVerb(c.getAddActivity().getActivity().getVerb());
activityFeed.addActivity(iActivity);
r.setResult(true); //TODO. add a return on the activity feed method
result.setAddActivityResponse(r);
return result;
} // END OF add Activity
// cleanup activities
if (c.getCleanUpActivityFeed() != null) {
org.societies.api.schema.activityfeed.Activityfeed result = new org.societies.api.schema.activityfeed.Activityfeed();
CleanUpActivityFeedResponse r = new CleanUpActivityFeedResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
r.setResult(activityFeed.cleanupFeed(c.getCleanUpActivityFeed().getCriteria())); //TODO. add a return on the activity feed method
result.setCleanUpActivityFeedResponse(r);
return result;
} // END OF cleanup activities
}
return null;
}
@Override
public Future<Set<ICisParticipant>> getMemberList(){
LOG.debug("local get member list WITHOUT CALLBACK called");
Set<ICisParticipant> s = new HashSet<ICisParticipant>();
s.addAll(this.getMembersCss());
return new AsyncResult<Set<ICisParticipant>>(s);
}
@Override
public void getListOfMembers(ICisManagerCallback callback){
LOG.debug("local get member list WITH CALLBACK called");
CommunityMethods c = new CommunityMethods();
// c.setCommunityJid(this.getCisId());
// c.setCommunityName(this.getName());
// c.setCommunityType(this.getCisType());
// c.setOwnerJid(this.getOwnerId());
// c.setDescription(this.getDescription());
// c.setGetInfo(new GetInfo());
Who w = new Who();
c.setWho(w);
Set<CisParticipant> s = this.getMembersCss();
Iterator<CisParticipant> it = s.iterator();
List<Participant> l = new ArrayList<Participant>();
while(it.hasNext()){
CisParticipant element = it.next();
Participant p = new Participant();
p.setJid(element.getMembersJid());
p.setRole( ParticipantRole.fromValue(element.getMtype().toString()) );
l.add(p);
}
w.setParticipant(l);
callback.receiveResult(c);
}
@Override
public List<String> getXMLNamespaces() {
return NAMESPACES;
}
@Override
public void receiveMessage(Stanza arg0, Object arg1) {
}
@Override
public Object setQuery(Stanza arg0, Object arg1) throws XMPPError {
// TODO Auto-generated method stub
return null;
}
public String getCisId() {
return this.cisRecord.getCisJID();
}
//"destructor" class which send a message to all users and closes the connection immediately
public boolean deleteCIS(){
boolean ret = true;
// TODO: do we need to make sure that at this point we are not taking any other XMPP input or api call?
//**** delete all members and send them a xmpp notification that the community has been deleted
CommunityManager message = new CommunityManager();
Notification n = new Notification();
DeleteNotification d = new DeleteNotification();
d.setCommunityJid(this.getCisId());
n.setDeleteNotification(d);
message.setNotification(n);
Set<CisParticipant> s = this.getMembersCss();
Iterator<CisParticipant> it = s.iterator();
// deleting from DB
activityFeed.clear();
activityFeed = null;
this.deletePersisted(this);
// unregistering policy
IIdentity cssOwnerId;
try {
cssOwnerId = this.CISendpoint.getIdManager().fromJid(this.getOwnerId());
RequestorCis requestorCis = new RequestorCis(cssOwnerId, cisIdentity);
if(this.privacyPolicyManager != null)
this.privacyPolicyManager.deletePrivacyPolicy(requestorCis);
} catch (InvalidFormatException e1) {
// TODO Auto-generated catch block
LOG.info("bad format in cis owner jid at delete method");
e1.printStackTrace();
} catch (PrivacyException e) {
// TODO Auto-generated catch block
LOG.info("problem deleting policy");
e.printStackTrace();
}
while(it.hasNext()){
CisParticipant element = it.next();
try {
// send notification
LOG.info("sending delete notification to " + element.getMembersJid());
IIdentity targetCssIdentity = this.CISendpoint.getIdManager().fromJid(element.getMembersJid());//new IdentityImpl(element.getMembersJid());
LOG.info("iidentity created");
Stanza sta = new Stanza(targetCssIdentity);
LOG.info("stanza created");
this.CISendpoint.sendMessage(sta, message);
} catch (CommunicationException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (InvalidFormatException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// delete user
it.remove();
}
//if(session!=null)
// session.close();
//**** end of delete all members and send them a xmpp notification
//cisRecord = null; this cant be called as it will be used for comparisson later. I hope the garbage collector can take care of it...
//activityFeed = null; // TODO: replace with proper way of destroying it
ret = CISendpoint.UnRegisterCommManager();
if(ret)
CISendpoint = null;
else
LOG.warn("could not unregister CIS");
//TODO: possibly do something in case we cant close it
//cisIdentity =null;
PubsubClient psc = null; // TODO: replace with proper way of destroying it
membersCss = null;
return ret;
}
public boolean unregisterCIS(){
boolean ret = CISendpoint.UnRegisterCommManager();
return ret;
}
// getters and setters
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
@Override
public String getName() {
return this.cisRecord.getCisName();
}
@Override
public String getOwnerId() {
return this.owner;
}
@Override
public String getCisType() {
return this.cisType;
}
@Override
public String setCisType(String type) {
return this.cisType = type;
}
@Override
public void getInfo(ICisManagerCallback callback){
LOG.debug("local client call to get info from this CIS");
CommunityMethods result = new CommunityMethods();
Community c = new Community();
GetInfoResponse r = new GetInfoResponse();
r.setResult(true);
this.fillCommmunityXMPPobj(c);
result.setGetInfoResponse(r);
r.setCommunity(c);
callback.receiveResult(result);
}
@Override
public void setInfo(Community c, ICisManagerCallback callback) {
// TODO Auto-generated method stub
LOG.debug("local client call to set info from this CIS");
SetInfoResponse r = new SetInfoResponse();
//check if he is not trying to set things which cant be set
if( ( (c.getCommunityJid() !=null) && (! c.getCommunityJid().equalsIgnoreCase(this.getCisId())) ) ||
(( (c.getCommunityName() !=null)) && (! c.getCommunityName().equals(this.getName())) )
//( (!c.getCommunityType().isEmpty()) && (! c.getCommunityJid().equalsIgnoreCase(this.getCisType())) ) ||
//|| ( (c.getMembershipMode() != null) && ( c.getMembershipMode() != this.getMembershipCriteria()))
){
r.setResult(false);
}
else{
r.setResult(true);
if(c.getDescription() != null && !c.getDescription().isEmpty())
this.description = c.getDescription();
if(c.getCommunityType() != null && !c.getCommunityType().isEmpty())
this.cisType = c.getCommunityType();
// commit in database
this.updatePersisted(this);
}
CommunityMethods result = new CommunityMethods();
Community resp = new Community();
this.fillCommmunityXMPPobj(resp);
result.setSetInfoResponse(r);
r.setCommunity(resp);
callback.receiveResult(result);
}
// session related methods
private void persist(Object o){
Session session = this.sessionFactory.openSession();
Transaction t = session.beginTransaction();
try{
session.save(o);
t.commit();
LOG.info("Saving CIS object succeded!");
// Query q = session.createQuery("select o from Cis aso");
}catch(Exception e){
e.printStackTrace();
t.rollback();
LOG.warn("Saving CIS object failed, rolling back");
}finally{
if(session!=null){
session.close();
}
}
}
private void deletePersisted(Object o){
Session session = this.sessionFactory.openSession();
Transaction t = session.beginTransaction();
try{
session.delete(o);
t.commit();
LOG.info("Deleting object in CisManager succeded!");
// Query q = session.createQuery("select o from Cis aso");
}catch(Exception e){
e.printStackTrace();
t.rollback();
LOG.warn("Deleting object in CisManager failed, rolling back");
}finally{
if(session!=null){
session.close();
}
}
}
private void updatePersisted(Object o){
Session session = this.sessionFactory.openSession();
Transaction t = session.beginTransaction();
try{
session.update(o);
t.commit();
LOG.info("Updated CIS object succeded!");
// Query q = session.createQuery("select o from Cis aso");
}catch(Exception e){
e.printStackTrace();
t.rollback();
LOG.warn("Updating CIS object failed, rolling back");
}finally{
if(session!=null){
session.close();
}
}
}
// local method
public Hashtable<String, MembershipCriteria> getMembershipCriteria() {
//return this.cisCriteria; // TODO: maybe we should return a copy instead
//returns a home-made clone
Hashtable<String, MembershipCriteria> h = new Hashtable<String, MembershipCriteria> ();
for(Map.Entry<String, MembershipCriteria> entry : this.cisCriteria.entrySet()){
MembershipCriteria orig = entry.getValue();
MembershipCriteria clone = new MembershipCriteria();
clone.setRank(orig.getRank());
clone.setRule(new Rule(orig.getRule().getOperation(), orig.getRule().getValues()));
h.put(new String(entry.getKey()),clone );
}
return h;
}
@Override
public void getMembershipCriteria(ICisManagerCallback callback) {
CommunityMethods result = new CommunityMethods();
GetMembershipCriteriaResponse g = new GetMembershipCriteriaResponse();
MembershipCrit m = new MembershipCrit();
this.fillMembershipCritXMPPobj(m);
g.setMembershipCrit(m);
result.setGetMembershipCriteriaResponse(g);
callback.receiveResult(result);
}
// internal method for filling up the MembershipCriteria marshalled object
public void fillMembershipCritXMPPobj(MembershipCrit m){
List<Criteria> l = new ArrayList<Criteria>();
for(Map.Entry<String, MembershipCriteria> entry : this.cisCriteria.entrySet()){
MembershipCriteria orig = entry.getValue();
Criteria c = new Criteria();
c.setAttrib(entry.getKey());
c.setOperator(orig.getRule().getOperation());
c.setRank(orig.getRank());
c.setValue1(orig.getRule().getValues().get(0));
if(orig.getRule().getValues().size()==2)
c.setValue1(orig.getRule().getValues().get(1));
l.add(c);
}
m.setCriteria(l);
}
// internal method for filling up the Community marshalled object
public void fillCommmunityXMPPobj(Community c){
c.setCommunityJid(this.getCisId());
c.setCommunityName(this.getName());
c.setCommunityType(this.getCisType());
c.setOwnerJid(this.getOwnerId());
c.setDescription(this.getDescription());
// fill criteria
MembershipCrit m = new MembershipCrit();
this.fillMembershipCritXMPPobj(m);
c.setMembershipCrit(m);
}
}
| false | true | public Object getQuery(Stanza stanza, Object payload) {
// all received IQs contain a community element
LOG.info("get Query received");
if (payload.getClass().equals(CommunityMethods.class)) {
LOG.info("community type received");
CommunityMethods c = (CommunityMethods) payload;
// JOIN
if (c.getJoin() != null) {
String jid = "";
LOG.info("join received");
String senderjid = stanza.getFrom().getBareJid();
// information sent on the xmpp in case of failure or success
Community com = new Community();
CommunityMethods result = new CommunityMethods();
Participant p = new Participant();
JoinResponse j = new JoinResponse();
boolean addresult = false;
p.setJid(jid);
this.fillCommmunityXMPPobj(com);
j.setCommunity(com);
result.setJoinResponse(j);
// TEMPORARELY DISABLING THE QUALIFICATION CHECKS
// TODO: uncomment this
// checking the criteria
if(this.cisCriteria.size()>0){
Join join = (Join) c.getJoin();
if(join.getQualification() != null && join.getQualification().size()>0 ){
// retrieving from marshalled object the qualifications to be checked
HashMap<String,String> qualification = new HashMap<String,String>();
for (Qualification q : join.getQualification()) {
qualification.put(q.getAttrib(), q.getValue());
}
if (this.checkQualification(qualification) == false){
j.setResult(addresult);
LOG.info("qualification mismatched");
return result;
}
}
else{
j.setResult(addresult);
LOG.info("qualification not found");
return result;
}
}
addresult = this.insertMember(senderjid, MembershipType.participant);
j.setResult(addresult);
// TODO: add the criteria to the response
if(addresult == true){
// information sent on the xmpp just in the case of success
p.setRole( ParticipantRole.fromValue("participant") );
}
j.setParticipant(p);
return result;
//return result;
}
if (c.getLeave() != null) {
LOG.info("get leave received");
CommunityMethods result = new CommunityMethods();
String jid = stanza.getFrom().getBareJid();
boolean b = false;
try{
b = this.removeMember(jid);
}catch(CommunicationException e){
// TODO Auto-generated catch block
e.printStackTrace();
}
LeaveResponse l = new LeaveResponse();
l.setResult(b);
result.setLeaveResponse(l);
return result;
}
if (c.getWho() != null) {
// WHO
LOG.info("get who received");
CommunityMethods result = new CommunityMethods();
Who who = new Who();
this.getMembersCss();
Set<CisParticipant> s = this.getMembersCss();
Iterator<CisParticipant> it = s.iterator();
while(it.hasNext()){
CisParticipant element = it.next();
Participant p = new Participant();
p.setJid(element.getMembersJid());
p.setRole( ParticipantRole.fromValue(element.getMtype().toString()) );
who.getParticipant().add(p);
}
result.setWho(who);
return result;
// END OF WHO
}
if (c.getAddMember() != null) {
// ADD
CommunityMethods result = new CommunityMethods();
AddMemberResponse ar = new AddMemberResponse();
String senderJid = stanza.getFrom().getBareJid();
Participant p = c.getAddMember().getParticipant();
ar.setParticipant(p);
// if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
//requester is not the owner
// ar.setResult(false);
// }else{
if(p!= null && p.getJid() != null){
String role = "";
if (p.getRole() != null)
role = p.getRole().value();
try{
if(this.addMember(p.getJid(), role).get()){
ar.setParticipant(p);
ar.setResult(true);
}
else{
ar.setResult(false);
}
}
catch(Exception e){
e.printStackTrace();
ar.setResult(false);
}
}
// }
result.setAddMemberResponse(ar);
return result;
// END OF ADD
}
if (c.getDeleteMember() != null) {
// DELETE MEMBER
CommunityMethods result = new CommunityMethods();
DeleteMemberResponse dr = new DeleteMemberResponse();
String senderJid = stanza.getFrom().getBareJid();
Participant p = c.getDeleteMember().getParticipant();
dr.setParticipant(p);
// if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
//requester is not the owner
// dr.setResult(false);
// }else{
try{
dr.setResult(this.removeMemberFromCIS(p.getJid()).get());
}
catch(Exception e){
e.printStackTrace();
dr.setResult(false);
}
// }
result.setDeleteMemberResponse(dr);
return result;
// END OF DELETE MEMBER
}
// get Info
if (c.getGetInfo()!= null) {
CommunityMethods result = new CommunityMethods();
Community com = new Community();
GetInfoResponse r = new GetInfoResponse();
this.fillCommmunityXMPPobj(com);
r.setResult(true);
r.setCommunity(com);
result.setGetInfoResponse(r);
return result;
} // END OF GET INFO
// set Info
// at the moment we limit this to description and type
if (c.getSetInfo()!= null && c.getSetInfo().getCommunity() != null) {
CommunityMethods result = new CommunityMethods();
Community com = new Community();
SetInfoResponse r = new SetInfoResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
Community inputCommunity = c.getSetInfo().getCommunity();
if( (inputCommunity.getCommunityType() != null) && (!inputCommunity.getCommunityType().isEmpty()) &&
(!inputCommunity.getCommunityType().equals(this.getCisType()))) // if is not empty and is different from current value
this.setCisType(inputCommunity.getCommunityType());
if( (inputCommunity.getDescription() != null) && (!inputCommunity.getDescription().isEmpty()) &&
(!inputCommunity.getDescription().equals(this.getDescription()))) // if is not empty and is different from current value
this.setDescription(inputCommunity.getDescription());
r.setResult(true);
// updating at DB
this.updatePersisted(this);
//}
this.fillCommmunityXMPPobj(com);
r.setCommunity(com);
result.setSetInfoResponse(r);
return result;
} // END OF GET INFO
// get Membership Criteria
if (c.getGetMembershipCriteria()!= null) {
CommunityMethods result = new CommunityMethods();
GetMembershipCriteriaResponse g = new GetMembershipCriteriaResponse();
MembershipCrit m = new MembershipCrit();
this.fillMembershipCritXMPPobj(m);
g.setMembershipCrit(m);
result.setGetMembershipCriteriaResponse(g);
return result;
}
// set Membership Criteria
if (c.getSetMembershipCriteria()!= null) {
CommunityMethods result = new CommunityMethods();
SetMembershipCriteriaResponse r = new SetMembershipCriteriaResponse();
result.setSetMembershipCriteriaResponse(r);
// retrieving from marshalled object the incoming criteria
MembershipCrit m = c.getSetMembershipCriteria().getMembershipCrit();
if (m!=null && m.getCriteria() != null && m.getCriteria().size()>0){
// populate the hashtable
for (Criteria crit : m.getCriteria()) {
MembershipCriteria meb = new MembershipCriteria();
meb.setRank(crit.getRank());
Rule rule = new Rule();
if( rule.setOperation(crit.getOperator()) == false) {r.setResult(false); return result;}
ArrayList<String> a = new ArrayList<String>();
a.add(crit.getValue1());
if (crit.getValue2() != null && !crit.getValue2().isEmpty()) a.add(crit.getValue2());
if( rule.setValues(a) == false) {r.setResult(false); return result;}
meb.setRule(rule);
if( this.addCriteria(crit.getAttrib(), meb) == false) {r.setResult(false); return result;}
}
}
r.setResult(true);
m = new MembershipCrit();
this.fillMembershipCritXMPPobj(m);
r.setMembershipCrit(m);
return result;
}
}
if (payload.getClass().equals(Activityfeed.class)) {
LOG.info("activity feed type received");
Activityfeed c = (Activityfeed) payload;
// delete Activity
if (c.getDeleteActivity() != null) {
Activityfeed result = new Activityfeed();
DeleteActivityResponse r = new DeleteActivityResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
IActivity iActivity = new org.societies.activity.model.Activity();
iActivity.setActor(c.getDeleteActivity().getActivity().getActor());
iActivity.setObject(c.getDeleteActivity().getActivity().getObject());
iActivity.setTarget(c.getDeleteActivity().getActivity().getTarget());
iActivity.setPublished(c.getDeleteActivity().getActivity().getPublished());
iActivity.setVerb(c.getDeleteActivity().getActivity().getVerb());
r.setResult(activityFeed.deleteActivity(iActivity));
result.setDeleteActivityResponse(r);
return result;
} // END OF delete Activity
// get Activities
if (c.getGetActivities() != null) {
LOG.info("get activities called");
org.societies.api.schema.activityfeed.Activityfeed result = new org.societies.api.schema.activityfeed.Activityfeed();
GetActivitiesResponse r = new GetActivitiesResponse();
String senderJid = stanza.getFrom().getBareJid();
List<IActivity> iActivityList;
List<org.societies.api.schema.activity.Activity> marshalledActivList = new ArrayList<org.societies.api.schema.activity.Activity>();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
if(c.getGetActivities().getQuery()==null || c.getGetActivities().getQuery().isEmpty())
iActivityList = activityFeed.getActivities(c.getGetActivities().getTimePeriod());
else
iActivityList = activityFeed.getActivities(c.getGetActivities().getQuery(),c.getGetActivities().getTimePeriod());
//}
LOG.info("loacl query worked activities called");
this.activityFeed.iactivToMarshActv(iActivityList, marshalledActivList);
/*
Iterator<IActivity> it = iActivityList.iterator();
while(it.hasNext()){
IActivity element = it.next();
org.societies.api.schema.activity.Activity a = new org.societies.api.schema.activity.Activity();
a.setActor(element.getActor());
a.setObject(a.getObject());
a.setPublished(a.getPublished());
a.setVerb(a.getVerb());
marshalledActivList.add(a);
}
*/
LOG.info("finished the marshling");
r.setActivity(marshalledActivList);
result.setGetActivitiesResponse(r);
return result;
} // END OF get ACTIVITIES
// add Activity
if (c.getAddActivity() != null) {
org.societies.api.schema.activityfeed.Activityfeed result = new org.societies.api.schema.activityfeed.Activityfeed();
AddActivityResponse r = new AddActivityResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
IActivity iActivity = new org.societies.activity.model.Activity();
iActivity.setActor(c.getAddActivity().getActivity().getActor());
iActivity.setObject(c.getAddActivity().getActivity().getObject());
iActivity.setTarget(c.getAddActivity().getActivity().getTarget());
iActivity.setPublished(c.getAddActivity().getActivity().getPublished());
iActivity.setVerb(c.getAddActivity().getActivity().getVerb());
activityFeed.addActivity(iActivity);
r.setResult(true); //TODO. add a return on the activity feed method
result.setAddActivityResponse(r);
return result;
} // END OF add Activity
// cleanup activities
if (c.getCleanUpActivityFeed() != null) {
org.societies.api.schema.activityfeed.Activityfeed result = new org.societies.api.schema.activityfeed.Activityfeed();
CleanUpActivityFeedResponse r = new CleanUpActivityFeedResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
r.setResult(activityFeed.cleanupFeed(c.getCleanUpActivityFeed().getCriteria())); //TODO. add a return on the activity feed method
result.setCleanUpActivityFeedResponse(r);
return result;
} // END OF cleanup activities
}
return null;
}
| public Object getQuery(Stanza stanza, Object payload) {
// all received IQs contain a community element
LOG.info("get Query received");
if (payload.getClass().equals(CommunityMethods.class)) {
LOG.info("community type received");
CommunityMethods c = (CommunityMethods) payload;
// JOIN
if (c.getJoin() != null) {
//String jid = "";
LOG.info("join received");
String senderjid = stanza.getFrom().getBareJid();
// information sent on the xmpp in case of failure or success
Community com = new Community();
CommunityMethods result = new CommunityMethods();
Participant p = new Participant();
JoinResponse j = new JoinResponse();
boolean addresult = false;
p.setJid(senderjid);
this.fillCommmunityXMPPobj(com);
j.setCommunity(com);
result.setJoinResponse(j);
// TEMPORARELY DISABLING THE QUALIFICATION CHECKS
// TODO: uncomment this
// checking the criteria
if(this.cisCriteria.size()>0){
Join join = (Join) c.getJoin();
if(join.getQualification() != null && join.getQualification().size()>0 ){
// retrieving from marshalled object the qualifications to be checked
HashMap<String,String> qualification = new HashMap<String,String>();
for (Qualification q : join.getQualification()) {
qualification.put(q.getAttrib(), q.getValue());
}
if (this.checkQualification(qualification) == false){
j.setResult(addresult);
LOG.info("qualification mismatched");
return result;
}
}
else{
j.setResult(addresult);
LOG.info("qualification not found");
return result;
}
}
addresult = this.insertMember(senderjid, MembershipType.participant);
j.setResult(addresult);
// TODO: add the criteria to the response
if(addresult == true){
// information sent on the xmpp just in the case of success
p.setRole( ParticipantRole.fromValue("participant") );
}
j.setParticipant(p);
return result;
//return result;
}
if (c.getLeave() != null) {
LOG.info("get leave received");
CommunityMethods result = new CommunityMethods();
String jid = stanza.getFrom().getBareJid();
boolean b = false;
try{
b = this.removeMember(jid);
}catch(CommunicationException e){
// TODO Auto-generated catch block
e.printStackTrace();
}
LeaveResponse l = new LeaveResponse();
l.setResult(b);
result.setLeaveResponse(l);
return result;
}
if (c.getWho() != null) {
// WHO
LOG.info("get who received");
CommunityMethods result = new CommunityMethods();
Who who = new Who();
this.getMembersCss();
Set<CisParticipant> s = this.getMembersCss();
Iterator<CisParticipant> it = s.iterator();
while(it.hasNext()){
CisParticipant element = it.next();
Participant p = new Participant();
p.setJid(element.getMembersJid());
p.setRole( ParticipantRole.fromValue(element.getMtype().toString()) );
who.getParticipant().add(p);
}
result.setWho(who);
return result;
// END OF WHO
}
if (c.getAddMember() != null) {
// ADD
CommunityMethods result = new CommunityMethods();
AddMemberResponse ar = new AddMemberResponse();
String senderJid = stanza.getFrom().getBareJid();
Participant p = c.getAddMember().getParticipant();
ar.setParticipant(p);
// if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
//requester is not the owner
// ar.setResult(false);
// }else{
if(p!= null && p.getJid() != null){
String role = "";
if (p.getRole() != null)
role = p.getRole().value();
try{
if(this.addMember(p.getJid(), role).get()){
ar.setParticipant(p);
ar.setResult(true);
}
else{
ar.setResult(false);
}
}
catch(Exception e){
e.printStackTrace();
ar.setResult(false);
}
}
// }
result.setAddMemberResponse(ar);
return result;
// END OF ADD
}
if (c.getDeleteMember() != null) {
// DELETE MEMBER
CommunityMethods result = new CommunityMethods();
DeleteMemberResponse dr = new DeleteMemberResponse();
String senderJid = stanza.getFrom().getBareJid();
Participant p = c.getDeleteMember().getParticipant();
dr.setParticipant(p);
// if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
//requester is not the owner
// dr.setResult(false);
// }else{
try{
dr.setResult(this.removeMemberFromCIS(p.getJid()).get());
}
catch(Exception e){
e.printStackTrace();
dr.setResult(false);
}
// }
result.setDeleteMemberResponse(dr);
return result;
// END OF DELETE MEMBER
}
// get Info
if (c.getGetInfo()!= null) {
CommunityMethods result = new CommunityMethods();
Community com = new Community();
GetInfoResponse r = new GetInfoResponse();
this.fillCommmunityXMPPobj(com);
r.setResult(true);
r.setCommunity(com);
result.setGetInfoResponse(r);
return result;
} // END OF GET INFO
// set Info
// at the moment we limit this to description and type
if (c.getSetInfo()!= null && c.getSetInfo().getCommunity() != null) {
CommunityMethods result = new CommunityMethods();
Community com = new Community();
SetInfoResponse r = new SetInfoResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
Community inputCommunity = c.getSetInfo().getCommunity();
if( (inputCommunity.getCommunityType() != null) && (!inputCommunity.getCommunityType().isEmpty()) &&
(!inputCommunity.getCommunityType().equals(this.getCisType()))) // if is not empty and is different from current value
this.setCisType(inputCommunity.getCommunityType());
if( (inputCommunity.getDescription() != null) && (!inputCommunity.getDescription().isEmpty()) &&
(!inputCommunity.getDescription().equals(this.getDescription()))) // if is not empty and is different from current value
this.setDescription(inputCommunity.getDescription());
r.setResult(true);
// updating at DB
this.updatePersisted(this);
//}
this.fillCommmunityXMPPobj(com);
r.setCommunity(com);
result.setSetInfoResponse(r);
return result;
} // END OF GET INFO
// get Membership Criteria
if (c.getGetMembershipCriteria()!= null) {
CommunityMethods result = new CommunityMethods();
GetMembershipCriteriaResponse g = new GetMembershipCriteriaResponse();
MembershipCrit m = new MembershipCrit();
this.fillMembershipCritXMPPobj(m);
g.setMembershipCrit(m);
result.setGetMembershipCriteriaResponse(g);
return result;
}
// set Membership Criteria
if (c.getSetMembershipCriteria()!= null) {
CommunityMethods result = new CommunityMethods();
SetMembershipCriteriaResponse r = new SetMembershipCriteriaResponse();
result.setSetMembershipCriteriaResponse(r);
// retrieving from marshalled object the incoming criteria
MembershipCrit m = c.getSetMembershipCriteria().getMembershipCrit();
if (m!=null && m.getCriteria() != null && m.getCriteria().size()>0){
// populate the hashtable
for (Criteria crit : m.getCriteria()) {
MembershipCriteria meb = new MembershipCriteria();
meb.setRank(crit.getRank());
Rule rule = new Rule();
if( rule.setOperation(crit.getOperator()) == false) {r.setResult(false); return result;}
ArrayList<String> a = new ArrayList<String>();
a.add(crit.getValue1());
if (crit.getValue2() != null && !crit.getValue2().isEmpty()) a.add(crit.getValue2());
if( rule.setValues(a) == false) {r.setResult(false); return result;}
meb.setRule(rule);
if( this.addCriteria(crit.getAttrib(), meb) == false) {r.setResult(false); return result;}
}
}
r.setResult(true);
m = new MembershipCrit();
this.fillMembershipCritXMPPobj(m);
r.setMembershipCrit(m);
return result;
}
}
if (payload.getClass().equals(Activityfeed.class)) {
LOG.info("activity feed type received");
Activityfeed c = (Activityfeed) payload;
// delete Activity
if (c.getDeleteActivity() != null) {
Activityfeed result = new Activityfeed();
DeleteActivityResponse r = new DeleteActivityResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
IActivity iActivity = new org.societies.activity.model.Activity();
iActivity.setActor(c.getDeleteActivity().getActivity().getActor());
iActivity.setObject(c.getDeleteActivity().getActivity().getObject());
iActivity.setTarget(c.getDeleteActivity().getActivity().getTarget());
iActivity.setPublished(c.getDeleteActivity().getActivity().getPublished());
iActivity.setVerb(c.getDeleteActivity().getActivity().getVerb());
r.setResult(activityFeed.deleteActivity(iActivity));
result.setDeleteActivityResponse(r);
return result;
} // END OF delete Activity
// get Activities
if (c.getGetActivities() != null) {
LOG.info("get activities called");
org.societies.api.schema.activityfeed.Activityfeed result = new org.societies.api.schema.activityfeed.Activityfeed();
GetActivitiesResponse r = new GetActivitiesResponse();
String senderJid = stanza.getFrom().getBareJid();
List<IActivity> iActivityList;
List<org.societies.api.schema.activity.Activity> marshalledActivList = new ArrayList<org.societies.api.schema.activity.Activity>();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
if(c.getGetActivities().getQuery()==null || c.getGetActivities().getQuery().isEmpty())
iActivityList = activityFeed.getActivities(c.getGetActivities().getTimePeriod());
else
iActivityList = activityFeed.getActivities(c.getGetActivities().getQuery(),c.getGetActivities().getTimePeriod());
//}
LOG.info("loacl query worked activities called");
this.activityFeed.iactivToMarshActv(iActivityList, marshalledActivList);
/*
Iterator<IActivity> it = iActivityList.iterator();
while(it.hasNext()){
IActivity element = it.next();
org.societies.api.schema.activity.Activity a = new org.societies.api.schema.activity.Activity();
a.setActor(element.getActor());
a.setObject(a.getObject());
a.setPublished(a.getPublished());
a.setVerb(a.getVerb());
marshalledActivList.add(a);
}
*/
LOG.info("finished the marshling");
r.setActivity(marshalledActivList);
result.setGetActivitiesResponse(r);
return result;
} // END OF get ACTIVITIES
// add Activity
if (c.getAddActivity() != null) {
org.societies.api.schema.activityfeed.Activityfeed result = new org.societies.api.schema.activityfeed.Activityfeed();
AddActivityResponse r = new AddActivityResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
IActivity iActivity = new org.societies.activity.model.Activity();
iActivity.setActor(c.getAddActivity().getActivity().getActor());
iActivity.setObject(c.getAddActivity().getActivity().getObject());
iActivity.setTarget(c.getAddActivity().getActivity().getTarget());
iActivity.setPublished(c.getAddActivity().getActivity().getPublished());
iActivity.setVerb(c.getAddActivity().getActivity().getVerb());
activityFeed.addActivity(iActivity);
r.setResult(true); //TODO. add a return on the activity feed method
result.setAddActivityResponse(r);
return result;
} // END OF add Activity
// cleanup activities
if (c.getCleanUpActivityFeed() != null) {
org.societies.api.schema.activityfeed.Activityfeed result = new org.societies.api.schema.activityfeed.Activityfeed();
CleanUpActivityFeedResponse r = new CleanUpActivityFeedResponse();
String senderJid = stanza.getFrom().getBareJid();
//if(!senderJid.equalsIgnoreCase(this.getOwnerId())){//first check if the one requesting the add has the rights
// r.setResult(false);
//}else{
//if((!c.getCommunityName().isEmpty()) && (!c.getCommunityName().equals(this.getName()))) // if is not empty and is different from current value
r.setResult(activityFeed.cleanupFeed(c.getCleanUpActivityFeed().getCriteria())); //TODO. add a return on the activity feed method
result.setCleanUpActivityFeedResponse(r);
return result;
} // END OF cleanup activities
}
return null;
}
|
diff --git a/src/powercrystals/minefactoryreloaded/gui/control/ButtonLogicBufferSelect.java b/src/powercrystals/minefactoryreloaded/gui/control/ButtonLogicBufferSelect.java
index 7cf640c6..0a567654 100644
--- a/src/powercrystals/minefactoryreloaded/gui/control/ButtonLogicBufferSelect.java
+++ b/src/powercrystals/minefactoryreloaded/gui/control/ButtonLogicBufferSelect.java
@@ -1,92 +1,92 @@
package powercrystals.minefactoryreloaded.gui.control;
import powercrystals.core.gui.controls.ButtonOption;
import powercrystals.minefactoryreloaded.gui.client.GuiRedNetLogic;
public class ButtonLogicBufferSelect extends ButtonOption
{
private LogicButtonType _buttonType;
private GuiRedNetLogic _logicScreen;
private int _pinIndex;
private boolean _ignoreChanges;
public ButtonLogicBufferSelect(GuiRedNetLogic containerScreen, int x, int y, int pinIndex, LogicButtonType buttonType, int rotation)
{
super(containerScreen, x, y, 30, 14);
_logicScreen = containerScreen;
_buttonType = buttonType;
_pinIndex = pinIndex;
- char[] dir = {'F','R','B','L'};
+ char[] dir = {'L','B','R','F',};
char[] dirMap = new char[4];
for (int i = 0; i < 4; ++i)
dirMap[(i + rotation) & 3] = dir[i];
_ignoreChanges = true;
if(_buttonType == LogicButtonType.Input)
{
setValue(0, "I/O D");
setValue(1, "I/O U");
setValue(2, "I/O " + dirMap[2]);
setValue(3, "I/O " + dirMap[0]);
setValue(4, "I/O " + dirMap[1]);
setValue(5, "I/O " + dirMap[3]);
setValue(12, "CNST");
setValue(13, "VARS");
setSelectedIndex(0);
}
else
{
setValue(6, "I/O D");
setValue(7, "I/O U");
setValue(8, "I/O " + dirMap[2]);
setValue(9, "I/O " + dirMap[0]);
setValue(10, "I/O " + dirMap[1]);
setValue(11, "I/O " + dirMap[3]);
setValue(13, "VARS");
setValue(14, "NULL");
setSelectedIndex(6);
}
_ignoreChanges = false;
setVisible(false);
}
public int getBuffer()
{
return getSelectedIndex();
}
public void setBuffer(int buffer)
{
_ignoreChanges = true;
setSelectedIndex(buffer);
_ignoreChanges = false;
}
@Override
public void onValueChanged(int value, String label)
{
if(_ignoreChanges)
{
return;
}
if(_buttonType == LogicButtonType.Input)
{
_logicScreen.setInputPinMapping(_pinIndex, value, 0);
}
else
{
_logicScreen.setOutputPinMapping(_pinIndex, value, 0);
}
}
@Override
public void drawForeground(int mouseX, int mouseY)
{
if(getValue() == null)
{
System.out.println("Buffer selection of " + getSelectedIndex() + " on " + _buttonType + " has null value!");
}
super.drawForeground(mouseX, mouseY);
}
}
| true | true | public ButtonLogicBufferSelect(GuiRedNetLogic containerScreen, int x, int y, int pinIndex, LogicButtonType buttonType, int rotation)
{
super(containerScreen, x, y, 30, 14);
_logicScreen = containerScreen;
_buttonType = buttonType;
_pinIndex = pinIndex;
char[] dir = {'F','R','B','L'};
char[] dirMap = new char[4];
for (int i = 0; i < 4; ++i)
dirMap[(i + rotation) & 3] = dir[i];
_ignoreChanges = true;
if(_buttonType == LogicButtonType.Input)
{
setValue(0, "I/O D");
setValue(1, "I/O U");
setValue(2, "I/O " + dirMap[2]);
setValue(3, "I/O " + dirMap[0]);
setValue(4, "I/O " + dirMap[1]);
setValue(5, "I/O " + dirMap[3]);
setValue(12, "CNST");
setValue(13, "VARS");
setSelectedIndex(0);
}
else
{
setValue(6, "I/O D");
setValue(7, "I/O U");
setValue(8, "I/O " + dirMap[2]);
setValue(9, "I/O " + dirMap[0]);
setValue(10, "I/O " + dirMap[1]);
setValue(11, "I/O " + dirMap[3]);
setValue(13, "VARS");
setValue(14, "NULL");
setSelectedIndex(6);
}
_ignoreChanges = false;
setVisible(false);
}
| public ButtonLogicBufferSelect(GuiRedNetLogic containerScreen, int x, int y, int pinIndex, LogicButtonType buttonType, int rotation)
{
super(containerScreen, x, y, 30, 14);
_logicScreen = containerScreen;
_buttonType = buttonType;
_pinIndex = pinIndex;
char[] dir = {'L','B','R','F',};
char[] dirMap = new char[4];
for (int i = 0; i < 4; ++i)
dirMap[(i + rotation) & 3] = dir[i];
_ignoreChanges = true;
if(_buttonType == LogicButtonType.Input)
{
setValue(0, "I/O D");
setValue(1, "I/O U");
setValue(2, "I/O " + dirMap[2]);
setValue(3, "I/O " + dirMap[0]);
setValue(4, "I/O " + dirMap[1]);
setValue(5, "I/O " + dirMap[3]);
setValue(12, "CNST");
setValue(13, "VARS");
setSelectedIndex(0);
}
else
{
setValue(6, "I/O D");
setValue(7, "I/O U");
setValue(8, "I/O " + dirMap[2]);
setValue(9, "I/O " + dirMap[0]);
setValue(10, "I/O " + dirMap[1]);
setValue(11, "I/O " + dirMap[3]);
setValue(13, "VARS");
setValue(14, "NULL");
setSelectedIndex(6);
}
_ignoreChanges = false;
setVisible(false);
}
|
diff --git a/src/main/java/org/ebayopensource/turmeric/tools/annoparser/outputgenerator/impl/ToStringOutputGenerator.java b/src/main/java/org/ebayopensource/turmeric/tools/annoparser/outputgenerator/impl/ToStringOutputGenerator.java
index 0867aff..47ce22b 100644
--- a/src/main/java/org/ebayopensource/turmeric/tools/annoparser/outputgenerator/impl/ToStringOutputGenerator.java
+++ b/src/main/java/org/ebayopensource/turmeric/tools/annoparser/outputgenerator/impl/ToStringOutputGenerator.java
@@ -1,82 +1,81 @@
package org.ebayopensource.turmeric.tools.annoparser.outputgenerator.impl;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.ebayopensource.turmeric.tools.annoparser.WSDLDocInterface;
import org.ebayopensource.turmeric.tools.annoparser.XSDDocInterface;
import org.ebayopensource.turmeric.tools.annoparser.context.OutputGenaratorParam;
import org.ebayopensource.turmeric.tools.annoparser.exception.WsdlDocException;
import org.ebayopensource.turmeric.tools.annoparser.exception.XsdDocException;
import org.ebayopensource.turmeric.tools.annoparser.outputgenerator.OutputGenerator;
public class ToStringOutputGenerator implements OutputGenerator {
private OutputGenaratorParam outParam;
private Map<Object,String> docs=new HashMap<Object, String>();
@Override
public void completeProcessing() throws XsdDocException {
for(Map.Entry<Object,String> entry:docs.entrySet()){
printToFileIfApplicable(entry.getKey(), outParam,entry.getValue());
}
}
@Override
public void generateWsdlOutput(WSDLDocInterface wsdlDoc,
OutputGenaratorParam outputGenaratorParam) throws WsdlDocException {
System.out.println(wsdlDoc.toString());
docs.put(wsdlDoc, wsdlDoc.getServiceName()+" To String.txt");
outParam=outputGenaratorParam;
}
private void printToFileIfApplicable(Object doc,
OutputGenaratorParam outputGenaratorParam,String fileName) throws WsdlDocException {
if (outputGenaratorParam.getParameters() != null) {
if (outputGenaratorParam.getParameters().get("writeToFile") != null
&& "true".equals(outputGenaratorParam.getParameters().get(
"writeToFile"))) {
- String outFile = outputGenaratorParam.getParameters().get(
- "filePath");
+ String outFile = outputGenaratorParam.getOutputDir();
if (outFile != null) {
try {
writeFile(doc.toString(),outFile,fileName);
} catch (IOException e) {
throw new WsdlDocException(e);
}
}
}
}
}
@Override
public void generateXsdOutput(XSDDocInterface xsdDoc,
OutputGenaratorParam outputGenaratorParam) throws XsdDocException {
System.out.println(xsdDoc.toString());
docs.put(xsdDoc, "XSD DocOutput");
outParam=outputGenaratorParam;
}
/**
* Write file.
*
* @param html
* the html
* @param dir
* the dir
* @param fileName
* the file name
* @throws IOException
*/
public static void writeFile(String fileContent, String dir,String fileName) throws IOException {
File file = new File(dir);
file.mkdirs();
FileWriter fw = new FileWriter(dir+ File.separator+fileName);
fw.write(fileContent);
fw.close();
}
}
| true | true | private void printToFileIfApplicable(Object doc,
OutputGenaratorParam outputGenaratorParam,String fileName) throws WsdlDocException {
if (outputGenaratorParam.getParameters() != null) {
if (outputGenaratorParam.getParameters().get("writeToFile") != null
&& "true".equals(outputGenaratorParam.getParameters().get(
"writeToFile"))) {
String outFile = outputGenaratorParam.getParameters().get(
"filePath");
if (outFile != null) {
try {
writeFile(doc.toString(),outFile,fileName);
} catch (IOException e) {
throw new WsdlDocException(e);
}
}
}
}
}
| private void printToFileIfApplicable(Object doc,
OutputGenaratorParam outputGenaratorParam,String fileName) throws WsdlDocException {
if (outputGenaratorParam.getParameters() != null) {
if (outputGenaratorParam.getParameters().get("writeToFile") != null
&& "true".equals(outputGenaratorParam.getParameters().get(
"writeToFile"))) {
String outFile = outputGenaratorParam.getOutputDir();
if (outFile != null) {
try {
writeFile(doc.toString(),outFile,fileName);
} catch (IOException e) {
throw new WsdlDocException(e);
}
}
}
}
}
|
diff --git a/src/main/java/com/mashape/client/http/HttpClient.java b/src/main/java/com/mashape/client/http/HttpClient.java
index 91dfcc3..c1bb538 100644
--- a/src/main/java/com/mashape/client/http/HttpClient.java
+++ b/src/main/java/com/mashape/client/http/HttpClient.java
@@ -1,231 +1,231 @@
/*
*
* Mashape Java Client library.
* Copyright (C) 2011 Mashape, Inc.
*
* 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/>.
*
*
* The author of this software is Mashape, Inc.
* For any question or feedback please contact us at: [email protected]
*
*/
package com.mashape.client.http;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.entity.StringEntity;
import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.entity.mime.content.StringBody;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicHeader;
import org.apache.http.protocol.HTTP;
import com.google.gson.Gson;
import com.mashape.client.authentication.Authentication;
import com.mashape.client.authentication.HeaderAuthentication;
import com.mashape.client.authentication.OAuth10aAuthentication;
import com.mashape.client.authentication.OAuth2Authentication;
import com.mashape.client.authentication.OAuthAuthentication;
import com.mashape.client.authentication.QueryAuthentication;
import com.mashape.client.http.utils.HttpUtils;
import com.mashape.client.http.utils.MapUtil;
public class HttpClient {
private static final String USER_AGENT = "mashape-java/2.0";
public static final String JSON_PARAM_BODY = "88416847677069008618"; // Just a random value
private static Gson gson;
static {
gson = new Gson();
// Create a trust manager that does not validate certificate chains
TrustManager[] trustAllCerts = new TrustManager[]{
new X509TrustManager() {
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return null;
}
public void checkClientTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
public void checkServerTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
}
};
// Install the all-trusting trust manager
try {
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(null, trustAllCerts, new java.security.SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
} catch (Exception e) {
}
}
public static <T> Thread doRequest(Class<T> clazz, HttpMethod httpMethod, String url, Map<String, Object> parameters, ContentType contentType, ResponseType responseType, List<Authentication> authenticationHandlers, MashapeCallback<T> callback) {
Thread t = new HttpRequestThread<T>(clazz, httpMethod, url, parameters, contentType, responseType, authenticationHandlers, callback);
t.start();
return t;
}
public static <T> MashapeResponse<T> doRequest (Class<T> clazz, HttpMethod httpMethod, String url, Map<String, Object> parameters, ContentType contentType, ResponseType responseType, List<Authentication> authenticationHandlers) {
if (authenticationHandlers == null) authenticationHandlers = new ArrayList<Authentication>();
if (parameters == null) parameters = new HashMap<String, Object>();
List<Header> headers = new LinkedList<Header>();
// Handle authentications
for (Authentication authentication : authenticationHandlers) {
if (authentication instanceof HeaderAuthentication) {
headers.addAll(authentication.getHeaders());
} else {
Map<String, String> queryParameters = authentication.getQueryParameters();
if (authentication instanceof QueryAuthentication) {
parameters.putAll(queryParameters);
} else if (authentication instanceof OAuth10aAuthentication) {
if (url.endsWith("/oauth_url") == false && (queryParameters == null ||
queryParameters.get(OAuthAuthentication.ACCESS_SECRET) == null ||
queryParameters.get(OAuthAuthentication.ACCESS_TOKEN) == null)) {
throw new RuntimeException("Before consuming OAuth endpoint, invoke authorize('access_token','access_secret') with not null values");
}
headers.add(new BasicHeader("x-mashape-oauth-consumerkey", queryParameters.get(OAuthAuthentication.CONSUMER_KEY)));
headers.add(new BasicHeader("x-mashape-oauth-consumersecret", queryParameters.get(OAuthAuthentication.CONSUMER_SECRET)));
headers.add(new BasicHeader("x-mashape-oauth-accesstoken", queryParameters.get(OAuthAuthentication.ACCESS_TOKEN)));
headers.add(new BasicHeader("x-mashape-oauth-accesssecret", queryParameters.get(OAuthAuthentication.ACCESS_SECRET)));
} else if (authentication instanceof OAuth2Authentication) {
if (url.endsWith("/oauth_url") == false && (queryParameters == null ||
queryParameters.get(OAuthAuthentication.ACCESS_TOKEN) == null)) {
throw new RuntimeException("Before consuming OAuth endpoint, invoke authorize('access_token') with a not null value");
}
parameters.put("access_token", queryParameters.get(OAuthAuthentication.ACCESS_TOKEN));
}
}
}
// Sanitize null parameters
Set<String> keySet = new HashSet<String>(parameters.keySet());
for (String key : keySet) {
if (parameters.get(key) == null) {
parameters.remove(key);
}
}
headers.add(new BasicHeader("User-Agent", USER_AGENT));
HttpUriRequest request = null;
switch(httpMethod) {
case GET:
request = new HttpGet(url + "?" + HttpUtils.getQueryString(parameters));
break;
case POST:
request = new HttpPost(url);
break;
case PUT:
request = new HttpPut(url);
break;
case DELETE:
request = new HttpDeleteWithBody(url);
break;
case PATCH:
request = new HttpPatchWithBody(url);
break;
}
for(Header header : headers) {
request.addHeader(header);
}
if (httpMethod != HttpMethod.GET) {
switch(contentType) {
case BINARY:
MultipartEntity entity = new MultipartEntity();
for(Entry<String, Object> parameter : parameters.entrySet()) {
if (parameter.getValue() instanceof File) {
entity.addPart(parameter.getKey(), new FileBody((File) parameter.getValue()));
} else {
try {
entity.addPart(parameter.getKey(), new StringBody(parameter.getValue().toString(), Charset.forName("UTF-8")));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
}
((HttpEntityEnclosingRequestBase) request).setEntity(entity);
break;
case FORM:
try {
((HttpEntityEnclosingRequestBase) request).setEntity(new UrlEncodedFormEntity(MapUtil.getList(parameters), HTTP.UTF_8));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
break;
case JSON:
String jsonBody = null;
- if((parameters.get(JSON_PARAM_BODY) == null)) {
+ if((parameters.get(JSON_PARAM_BODY) != null)) {
String jsonParamBody = parameters.get(JSON_PARAM_BODY).toString();
jsonBody = (HttpUtils.isJson(jsonParamBody)) ? jsonParamBody : gson.toJson(jsonParamBody);
}
try {
((HttpEntityEnclosingRequestBase) request).setEntity(new StringEntity(jsonBody, "UTF-8"));
((HttpEntityEnclosingRequestBase) request).setHeader(new BasicHeader("Content-Type", "application/json"));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
}
org.apache.http.client.HttpClient client = new DefaultHttpClient();
HttpResponse response;
try {
response = client.execute(request);
} catch (Exception e) {
throw new RuntimeException(e);
}
MashapeResponse<T> mashapeResponse = HttpUtils.getResponse(responseType, response);
return mashapeResponse;
}
}
| true | true | public static <T> MashapeResponse<T> doRequest (Class<T> clazz, HttpMethod httpMethod, String url, Map<String, Object> parameters, ContentType contentType, ResponseType responseType, List<Authentication> authenticationHandlers) {
if (authenticationHandlers == null) authenticationHandlers = new ArrayList<Authentication>();
if (parameters == null) parameters = new HashMap<String, Object>();
List<Header> headers = new LinkedList<Header>();
// Handle authentications
for (Authentication authentication : authenticationHandlers) {
if (authentication instanceof HeaderAuthentication) {
headers.addAll(authentication.getHeaders());
} else {
Map<String, String> queryParameters = authentication.getQueryParameters();
if (authentication instanceof QueryAuthentication) {
parameters.putAll(queryParameters);
} else if (authentication instanceof OAuth10aAuthentication) {
if (url.endsWith("/oauth_url") == false && (queryParameters == null ||
queryParameters.get(OAuthAuthentication.ACCESS_SECRET) == null ||
queryParameters.get(OAuthAuthentication.ACCESS_TOKEN) == null)) {
throw new RuntimeException("Before consuming OAuth endpoint, invoke authorize('access_token','access_secret') with not null values");
}
headers.add(new BasicHeader("x-mashape-oauth-consumerkey", queryParameters.get(OAuthAuthentication.CONSUMER_KEY)));
headers.add(new BasicHeader("x-mashape-oauth-consumersecret", queryParameters.get(OAuthAuthentication.CONSUMER_SECRET)));
headers.add(new BasicHeader("x-mashape-oauth-accesstoken", queryParameters.get(OAuthAuthentication.ACCESS_TOKEN)));
headers.add(new BasicHeader("x-mashape-oauth-accesssecret", queryParameters.get(OAuthAuthentication.ACCESS_SECRET)));
} else if (authentication instanceof OAuth2Authentication) {
if (url.endsWith("/oauth_url") == false && (queryParameters == null ||
queryParameters.get(OAuthAuthentication.ACCESS_TOKEN) == null)) {
throw new RuntimeException("Before consuming OAuth endpoint, invoke authorize('access_token') with a not null value");
}
parameters.put("access_token", queryParameters.get(OAuthAuthentication.ACCESS_TOKEN));
}
}
}
// Sanitize null parameters
Set<String> keySet = new HashSet<String>(parameters.keySet());
for (String key : keySet) {
if (parameters.get(key) == null) {
parameters.remove(key);
}
}
headers.add(new BasicHeader("User-Agent", USER_AGENT));
HttpUriRequest request = null;
switch(httpMethod) {
case GET:
request = new HttpGet(url + "?" + HttpUtils.getQueryString(parameters));
break;
case POST:
request = new HttpPost(url);
break;
case PUT:
request = new HttpPut(url);
break;
case DELETE:
request = new HttpDeleteWithBody(url);
break;
case PATCH:
request = new HttpPatchWithBody(url);
break;
}
for(Header header : headers) {
request.addHeader(header);
}
if (httpMethod != HttpMethod.GET) {
switch(contentType) {
case BINARY:
MultipartEntity entity = new MultipartEntity();
for(Entry<String, Object> parameter : parameters.entrySet()) {
if (parameter.getValue() instanceof File) {
entity.addPart(parameter.getKey(), new FileBody((File) parameter.getValue()));
} else {
try {
entity.addPart(parameter.getKey(), new StringBody(parameter.getValue().toString(), Charset.forName("UTF-8")));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
}
((HttpEntityEnclosingRequestBase) request).setEntity(entity);
break;
case FORM:
try {
((HttpEntityEnclosingRequestBase) request).setEntity(new UrlEncodedFormEntity(MapUtil.getList(parameters), HTTP.UTF_8));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
break;
case JSON:
String jsonBody = null;
if((parameters.get(JSON_PARAM_BODY) == null)) {
String jsonParamBody = parameters.get(JSON_PARAM_BODY).toString();
jsonBody = (HttpUtils.isJson(jsonParamBody)) ? jsonParamBody : gson.toJson(jsonParamBody);
}
try {
((HttpEntityEnclosingRequestBase) request).setEntity(new StringEntity(jsonBody, "UTF-8"));
((HttpEntityEnclosingRequestBase) request).setHeader(new BasicHeader("Content-Type", "application/json"));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
}
org.apache.http.client.HttpClient client = new DefaultHttpClient();
HttpResponse response;
try {
response = client.execute(request);
} catch (Exception e) {
throw new RuntimeException(e);
}
MashapeResponse<T> mashapeResponse = HttpUtils.getResponse(responseType, response);
return mashapeResponse;
}
| public static <T> MashapeResponse<T> doRequest (Class<T> clazz, HttpMethod httpMethod, String url, Map<String, Object> parameters, ContentType contentType, ResponseType responseType, List<Authentication> authenticationHandlers) {
if (authenticationHandlers == null) authenticationHandlers = new ArrayList<Authentication>();
if (parameters == null) parameters = new HashMap<String, Object>();
List<Header> headers = new LinkedList<Header>();
// Handle authentications
for (Authentication authentication : authenticationHandlers) {
if (authentication instanceof HeaderAuthentication) {
headers.addAll(authentication.getHeaders());
} else {
Map<String, String> queryParameters = authentication.getQueryParameters();
if (authentication instanceof QueryAuthentication) {
parameters.putAll(queryParameters);
} else if (authentication instanceof OAuth10aAuthentication) {
if (url.endsWith("/oauth_url") == false && (queryParameters == null ||
queryParameters.get(OAuthAuthentication.ACCESS_SECRET) == null ||
queryParameters.get(OAuthAuthentication.ACCESS_TOKEN) == null)) {
throw new RuntimeException("Before consuming OAuth endpoint, invoke authorize('access_token','access_secret') with not null values");
}
headers.add(new BasicHeader("x-mashape-oauth-consumerkey", queryParameters.get(OAuthAuthentication.CONSUMER_KEY)));
headers.add(new BasicHeader("x-mashape-oauth-consumersecret", queryParameters.get(OAuthAuthentication.CONSUMER_SECRET)));
headers.add(new BasicHeader("x-mashape-oauth-accesstoken", queryParameters.get(OAuthAuthentication.ACCESS_TOKEN)));
headers.add(new BasicHeader("x-mashape-oauth-accesssecret", queryParameters.get(OAuthAuthentication.ACCESS_SECRET)));
} else if (authentication instanceof OAuth2Authentication) {
if (url.endsWith("/oauth_url") == false && (queryParameters == null ||
queryParameters.get(OAuthAuthentication.ACCESS_TOKEN) == null)) {
throw new RuntimeException("Before consuming OAuth endpoint, invoke authorize('access_token') with a not null value");
}
parameters.put("access_token", queryParameters.get(OAuthAuthentication.ACCESS_TOKEN));
}
}
}
// Sanitize null parameters
Set<String> keySet = new HashSet<String>(parameters.keySet());
for (String key : keySet) {
if (parameters.get(key) == null) {
parameters.remove(key);
}
}
headers.add(new BasicHeader("User-Agent", USER_AGENT));
HttpUriRequest request = null;
switch(httpMethod) {
case GET:
request = new HttpGet(url + "?" + HttpUtils.getQueryString(parameters));
break;
case POST:
request = new HttpPost(url);
break;
case PUT:
request = new HttpPut(url);
break;
case DELETE:
request = new HttpDeleteWithBody(url);
break;
case PATCH:
request = new HttpPatchWithBody(url);
break;
}
for(Header header : headers) {
request.addHeader(header);
}
if (httpMethod != HttpMethod.GET) {
switch(contentType) {
case BINARY:
MultipartEntity entity = new MultipartEntity();
for(Entry<String, Object> parameter : parameters.entrySet()) {
if (parameter.getValue() instanceof File) {
entity.addPart(parameter.getKey(), new FileBody((File) parameter.getValue()));
} else {
try {
entity.addPart(parameter.getKey(), new StringBody(parameter.getValue().toString(), Charset.forName("UTF-8")));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
}
((HttpEntityEnclosingRequestBase) request).setEntity(entity);
break;
case FORM:
try {
((HttpEntityEnclosingRequestBase) request).setEntity(new UrlEncodedFormEntity(MapUtil.getList(parameters), HTTP.UTF_8));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
break;
case JSON:
String jsonBody = null;
if((parameters.get(JSON_PARAM_BODY) != null)) {
String jsonParamBody = parameters.get(JSON_PARAM_BODY).toString();
jsonBody = (HttpUtils.isJson(jsonParamBody)) ? jsonParamBody : gson.toJson(jsonParamBody);
}
try {
((HttpEntityEnclosingRequestBase) request).setEntity(new StringEntity(jsonBody, "UTF-8"));
((HttpEntityEnclosingRequestBase) request).setHeader(new BasicHeader("Content-Type", "application/json"));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
}
org.apache.http.client.HttpClient client = new DefaultHttpClient();
HttpResponse response;
try {
response = client.execute(request);
} catch (Exception e) {
throw new RuntimeException(e);
}
MashapeResponse<T> mashapeResponse = HttpUtils.getResponse(responseType, response);
return mashapeResponse;
}
|
diff --git a/app/utils/HttpUtil.java b/app/utils/HttpUtil.java
index 82277e10..7dc8c909 100644
--- a/app/utils/HttpUtil.java
+++ b/app/utils/HttpUtil.java
@@ -1,97 +1,97 @@
package utils;
import org.apache.commons.lang3.StringUtils;
import play.api.http.MediaRange;
import play.mvc.Http;
import scala.Option;
import java.io.UnsupportedEncodingException;
import java.net.*;
import java.util.*;
public class HttpUtil {
public static String getFirstValueFromQuery(Map<String, String[]> query, String name) {
String[] values = query.get(name);
if (values != null && values.length > 0) {
return values[0];
} else {
return null;
}
}
public static String encodeContentDisposition(String filename)
throws UnsupportedEncodingException {
// Encode the filename with RFC 2231; IE 8 or less, and Safari 5 or less
// are not supported. See http://greenbytes.de/tech/tc2231/
filename = filename.replaceAll("[:\\x5c\\/{?]", "_");
filename = URLEncoder.encode(filename, "UTF-8").replaceAll("\\+", "%20");
filename = "filename*=UTF-8''" + filename;
return filename;
}
public static String getPreferType(Http.Request request, String ... types) {
// acceptedTypes is sorted by preference.
for(MediaRange range : request.acceptedTypes()) {
for(String type : types) {
if (range.accepts(type)) {
return type;
}
}
}
return null;
}
/**
* 주어진 {@code url}의 query string에 주어진 key-value pair들을 추가하여 만든 url을 반환한다.
*
* key-value pair의 형식은 {@code key=value}이다.
*
* @param url
* @param encodedPairs
* @return
* @throws URISyntaxException
*/
public static String addQueryString(String url, String ... encodedPairs) throws
URISyntaxException {
URI aURI = new URI(url);
String query = aURI.getQuery();
query += (query.length() > 0 ? "&" : "") + StringUtils.join(encodedPairs, "&");
return new URI(aURI.getScheme(), aURI.getAuthority(), aURI.getPath(), query,
aURI.getFragment()).toString();
}
/**
* 주어진 {@code url}의 query string에서 주어진 {@code keys}에 해당하는 모든 key-value pair를 제외시켜
* 만든 url을 반환한다.
*
* key-value pair의 형식은 {@code key=value}이다.
*
* @param url
* @param keys query string에서 제거할 key. 인코딩되어있어서는 안된다.
* @return
* @throws URISyntaxException
* @throws UnsupportedEncodingException
*/
public static String removeQueryString(String url, String ... keys) throws
URISyntaxException, UnsupportedEncodingException {
URI aURI = new URI(url);
- List<String> pairStrings = new ArrayList<String>();
- Set<String> keySet = new HashSet(Arrays.asList(keys));
+ List<String> pairStrings = new ArrayList<>();
+ Set<String> keySet = new HashSet<>(Arrays.asList(keys));
for (String pairString : aURI.getQuery().split("&")) {
String[] pair = pairString.split("=");
if (pair.length == 0) {
continue;
}
if (!keySet.contains(URLDecoder.decode(pair[0], "UTF-8"))) {
pairStrings.add(pairString);
}
}
return new URI(aURI.getScheme(), aURI.getAuthority(), aURI.getPath(),
StringUtils.join(pairStrings, "&"), aURI.getFragment()).toString();
}
}
| true | true | public static String removeQueryString(String url, String ... keys) throws
URISyntaxException, UnsupportedEncodingException {
URI aURI = new URI(url);
List<String> pairStrings = new ArrayList<String>();
Set<String> keySet = new HashSet(Arrays.asList(keys));
for (String pairString : aURI.getQuery().split("&")) {
String[] pair = pairString.split("=");
if (pair.length == 0) {
continue;
}
if (!keySet.contains(URLDecoder.decode(pair[0], "UTF-8"))) {
pairStrings.add(pairString);
}
}
return new URI(aURI.getScheme(), aURI.getAuthority(), aURI.getPath(),
StringUtils.join(pairStrings, "&"), aURI.getFragment()).toString();
}
| public static String removeQueryString(String url, String ... keys) throws
URISyntaxException, UnsupportedEncodingException {
URI aURI = new URI(url);
List<String> pairStrings = new ArrayList<>();
Set<String> keySet = new HashSet<>(Arrays.asList(keys));
for (String pairString : aURI.getQuery().split("&")) {
String[] pair = pairString.split("=");
if (pair.length == 0) {
continue;
}
if (!keySet.contains(URLDecoder.decode(pair[0], "UTF-8"))) {
pairStrings.add(pairString);
}
}
return new URI(aURI.getScheme(), aURI.getAuthority(), aURI.getPath(),
StringUtils.join(pairStrings, "&"), aURI.getFragment()).toString();
}
|
diff --git a/integration/src/main/java/org/jboss/errai/cdi/server/EventSubscriptionListener.java b/integration/src/main/java/org/jboss/errai/cdi/server/EventSubscriptionListener.java
index 66dacb1fb..aaca27d8e 100644
--- a/integration/src/main/java/org/jboss/errai/cdi/server/EventSubscriptionListener.java
+++ b/integration/src/main/java/org/jboss/errai/cdi/server/EventSubscriptionListener.java
@@ -1,67 +1,69 @@
/*
* Copyright 2009 JBoss, a divison Red Hat, Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.errai.cdi.server;
import java.lang.annotation.Annotation;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import org.jboss.errai.bus.client.api.SubscribeListener;
import org.jboss.errai.bus.client.framework.MessageBus;
import org.jboss.errai.bus.client.framework.SubscriptionEvent;
import org.jboss.errai.cdi.server.events.EventObserverMethod;
/**
* @author Filip Rogaczewski
* @author Mike Brock
* @author Christian Sadilek <[email protected]>
*/
@ApplicationScoped
public class EventSubscriptionListener implements SubscribeListener {
private MessageBus bus;
private AfterBeanDiscovery abd;
private ContextManager mgr;
private Map<String, List<Annotation[]>> observedEvents;
public EventSubscriptionListener(AfterBeanDiscovery abd, MessageBus bus, ContextManager mgr, Map<String, List<Annotation[]>> observedEvents) {
this.abd = abd;
this.bus = bus;
this.mgr = mgr;
this.observedEvents = observedEvents;
}
public void onSubscribe(SubscriptionEvent event) {
if (event.isLocalOnly() || !event.isRemote() || !event.getSubject().startsWith("cdi.event:")) return;
String name = event.getSubject().substring("cdi.event:".length());
try {
if (observedEvents.containsKey(name) && event.getCount() == 1 && event.isNew()) {
final Class<?> type = this.getClass().getClassLoader().loadClass(name);
abd.addObserverMethod(new EventObserverMethod(type, bus, mgr));
- for(Annotation[] qualifiers : observedEvents.get(name)) {
- abd.addObserverMethod(new EventObserverMethod(type, bus, mgr, qualifiers));
+ if(observedEvents!=null) {
+ for(Annotation[] qualifiers : observedEvents.get(name)) {
+ abd.addObserverMethod(new EventObserverMethod(type, bus, mgr, qualifiers));
+ }
}
}
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
| true | true | public void onSubscribe(SubscriptionEvent event) {
if (event.isLocalOnly() || !event.isRemote() || !event.getSubject().startsWith("cdi.event:")) return;
String name = event.getSubject().substring("cdi.event:".length());
try {
if (observedEvents.containsKey(name) && event.getCount() == 1 && event.isNew()) {
final Class<?> type = this.getClass().getClassLoader().loadClass(name);
abd.addObserverMethod(new EventObserverMethod(type, bus, mgr));
for(Annotation[] qualifiers : observedEvents.get(name)) {
abd.addObserverMethod(new EventObserverMethod(type, bus, mgr, qualifiers));
}
}
} catch (Exception e) {
throw new RuntimeException(e);
}
}
| public void onSubscribe(SubscriptionEvent event) {
if (event.isLocalOnly() || !event.isRemote() || !event.getSubject().startsWith("cdi.event:")) return;
String name = event.getSubject().substring("cdi.event:".length());
try {
if (observedEvents.containsKey(name) && event.getCount() == 1 && event.isNew()) {
final Class<?> type = this.getClass().getClassLoader().loadClass(name);
abd.addObserverMethod(new EventObserverMethod(type, bus, mgr));
if(observedEvents!=null) {
for(Annotation[] qualifiers : observedEvents.get(name)) {
abd.addObserverMethod(new EventObserverMethod(type, bus, mgr, qualifiers));
}
}
}
} catch (Exception e) {
throw new RuntimeException(e);
}
}
|
diff --git a/components/patient-data/api/src/main/java/edu/toronto/cs/phenotips/data/internal/PhenoTipsPhenotype.java b/components/patient-data/api/src/main/java/edu/toronto/cs/phenotips/data/internal/PhenoTipsPhenotype.java
index eb7929f0f..9aca8ddd1 100644
--- a/components/patient-data/api/src/main/java/edu/toronto/cs/phenotips/data/internal/PhenoTipsPhenotype.java
+++ b/components/patient-data/api/src/main/java/edu/toronto/cs/phenotips/data/internal/PhenoTipsPhenotype.java
@@ -1,184 +1,184 @@
/*
* See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
*
* 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 edu.toronto.cs.phenotips.data.internal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.objects.BaseObject;
import com.xpn.xwiki.objects.DBStringListProperty;
import com.xpn.xwiki.objects.StringProperty;
import edu.toronto.cs.phenotips.data.Phenotype;
import edu.toronto.cs.phenotips.data.PhenotypeMetadatum;
/**
* Implementation of patient data based on the XWiki data model, where phenotype data is represented by properties in
* objects of type {@code PhenoTips.PatientClass}.
*
* @version $Id$
*/
public class PhenoTipsPhenotype implements Phenotype
{
/**
* Prefix marking negative phenotypes.
*
* @see #isPresent()
*/
private static final Pattern NEGATIVE_PREFIX = Pattern.compile("^negative_");
/** Logging helper object. */
private final Logger logger = LoggerFactory.getLogger(PhenoTipsPhenotype.class);
/** The property name, the type eventually prefixed by "negative_". */
private final String propertyName;
/** @see #getId() */
private final String id;
/** @see #getType() */
private final String type;
/** @see #isPresent() */
private final boolean present;
/** @see #getMetadata() */
private Map<String, PhenotypeMetadatum> metadata;
/**
* Constructor that copies the data from an XProperty value.
*
* @param doc the XDocument representing the described patient in XWiki
* @param property the phenotype category XProperty
* @param value the specific value from the property represented by this object
*/
PhenoTipsPhenotype(XWikiDocument doc, DBStringListProperty property, String value)
{
this.id = value;
this.propertyName = property.getName();
Matcher nameMatch = NEGATIVE_PREFIX.matcher(this.propertyName);
this.present = !nameMatch.lookingAt();
this.type = nameMatch.replaceFirst("");
this.metadata = new HashMap<String, PhenotypeMetadatum>();
try {
BaseObject metadataObject = findMetadataObject(doc);
if (metadataObject != null) {
for (PhenotypeMetadatum.Type metadataType : PhenotypeMetadatum.Type.values()) {
if (metadataObject.get(metadataType.toString()) != null) {
- this.metadata.put(metadataType.toString(),
- new PhenoTipsPhenotypeMetadatum((StringProperty) metadataObject.get(metadataType.toString())));
+ this.metadata.put(metadataType.toString(), new PhenoTipsPhenotypeMetadatum(
+ (StringProperty) metadataObject.get(metadataType.toString())));
}
}
}
} catch (XWikiException ex) {
// Cannot access metadata, simply ignore
this.logger.info("Failed to retrieve phenotype metadata: {}", ex.getMessage());
}
}
@Override
public String getType()
{
return this.type;
}
@Override
public String getId()
{
return this.id;
}
@Override
public String getName()
{
// FIXME implementation missing
throw new UnsupportedOperationException();
}
@Override
public boolean isPresent()
{
return this.present;
}
@Override
public Map<String, PhenotypeMetadatum> getMetadata()
{
return this.metadata;
}
@Override
public String toString()
{
return toJSON().toString(2);
}
@Override
public JSONObject toJSON()
{
JSONObject result = new JSONObject();
result.element("type", getType());
result.element("id", getId());
result.element("isPresent", this.present);
if (!this.metadata.isEmpty()) {
JSONArray metadataList = new JSONArray();
for (PhenotypeMetadatum metadatum : this.metadata.values()) {
metadataList.add(metadatum.toJSON());
}
result.element("metadata", metadataList);
}
return result;
}
/**
* Find the XObject that contains metadata for this phenotype, if any.
*
* @param doc the patient's XDocument, where metadata obects are stored
* @return the found object, or {@code null} if one wasn't found
* @throws XWikiException if accessing the data fails
*/
private BaseObject findMetadataObject(XWikiDocument doc) throws XWikiException
{
List<BaseObject> objects = doc.getXObjects(PhenotypeMetadatum.CLASS_REFERENCE);
if (objects != null) {
for (BaseObject o : objects) {
StringProperty nameProperty = (StringProperty) o.get("target_property_name");
StringProperty valueProperty = (StringProperty) o.get("target_property_value");
if (nameProperty != null && StringUtils.equals(nameProperty.getValue(), this.propertyName)
&& valueProperty != null && StringUtils.equals(valueProperty.getValue(), this.id)) {
return o;
}
}
}
return null;
}
}
| true | true | PhenoTipsPhenotype(XWikiDocument doc, DBStringListProperty property, String value)
{
this.id = value;
this.propertyName = property.getName();
Matcher nameMatch = NEGATIVE_PREFIX.matcher(this.propertyName);
this.present = !nameMatch.lookingAt();
this.type = nameMatch.replaceFirst("");
this.metadata = new HashMap<String, PhenotypeMetadatum>();
try {
BaseObject metadataObject = findMetadataObject(doc);
if (metadataObject != null) {
for (PhenotypeMetadatum.Type metadataType : PhenotypeMetadatum.Type.values()) {
if (metadataObject.get(metadataType.toString()) != null) {
this.metadata.put(metadataType.toString(),
new PhenoTipsPhenotypeMetadatum((StringProperty) metadataObject.get(metadataType.toString())));
}
}
}
} catch (XWikiException ex) {
// Cannot access metadata, simply ignore
this.logger.info("Failed to retrieve phenotype metadata: {}", ex.getMessage());
}
}
| PhenoTipsPhenotype(XWikiDocument doc, DBStringListProperty property, String value)
{
this.id = value;
this.propertyName = property.getName();
Matcher nameMatch = NEGATIVE_PREFIX.matcher(this.propertyName);
this.present = !nameMatch.lookingAt();
this.type = nameMatch.replaceFirst("");
this.metadata = new HashMap<String, PhenotypeMetadatum>();
try {
BaseObject metadataObject = findMetadataObject(doc);
if (metadataObject != null) {
for (PhenotypeMetadatum.Type metadataType : PhenotypeMetadatum.Type.values()) {
if (metadataObject.get(metadataType.toString()) != null) {
this.metadata.put(metadataType.toString(), new PhenoTipsPhenotypeMetadatum(
(StringProperty) metadataObject.get(metadataType.toString())));
}
}
}
} catch (XWikiException ex) {
// Cannot access metadata, simply ignore
this.logger.info("Failed to retrieve phenotype metadata: {}", ex.getMessage());
}
}
|
diff --git a/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationServiceImpl.java b/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationServiceImpl.java
index 0bc0b5b80..426362441 100644
--- a/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationServiceImpl.java
@@ -1,344 +1,344 @@
/*
* SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.impl.growlnotification;
import java.util.*;
import org.osgi.framework.*;
import com.growl.*;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import java.lang.reflect.*;
/**
* The Growl Notification Service displays on-screen information such as
* messages or call received, etc.
*
* @author Romain Kuntz
*/
public class GrowlNotificationServiceImpl
implements MessageListener,
ServiceListener
{
/**
* The logger for this class.
*/
private static Logger logger =
Logger.getLogger(GrowlNotificationServiceImpl.class);
/**
* The BundleContext that we got from the OSGI bus.
*/
private BundleContext bundleContext = null;
/**
* The Growl notifier
*/
private Growl notifier;
/**
* The noifyGrowlOf method of the growl class. We use reflection to access
* it in order to avoid compilation errors on non mac platforms.
*/
private Method notifyMethod = null;
/* All Growl Notifications and the default ones */
private String [] allNotif =
new String[] { "SIP Communicator Started",
"Protocol events",
"Message Received",
"Message Sent"};
private String [] defaultNotif =
new String[] { "SIP Communicator Started",
"Message Received" };
/**
* starts the service. Creates a Growl notifier, and check the current
* registerd protocol providers which supports BasicIM and adds message
* listener to them.
*
* @param bc a currently valid bundle context
* @throws java.lang.Exception if we fail initializing the growl notifier.
*/
public void start(BundleContext bc)
throws Exception
{
logger.debug("Starting the Growl Notification implementation.");
this.bundleContext = bc;
/* Register to Growl */
try
{
Constructor constructor = Growl.class.getConstructor(new Class[]
- {String.class, String.class, String.class});
+ {String.class, String[].class, String[].class});
notifier = (Growl)constructor.newInstance(
new Object[]{"SIP Communicator", allNotif, defaultNotif});
notifier.register();
//init the notifyGrowlOf method
notifyMethod = Growl.class.getMethod(
"notifyGrowlOf"
, new Class[]{String.class, String.class, String.class});
notifyGrowlOf("SIP Communicator Started"
, "Welcome to SIP Communicator"
, "http://www.sip-communicator.org");
}
catch (Exception ex)
{
logger.error("Could not send the message to Growl", ex);
throw ex;
}
/* Start listening for newly register or removed protocol providers */
bc.addServiceListener(this);
ServiceReference[] protocolProviderRefs = null;
try
{
protocolProviderRefs = bc.getServiceReferences(
ProtocolProviderService.class.getName(),
null);
}
catch (InvalidSyntaxException ex)
{
// this shouldn't happen since we're providing no parameter string
// but let's log just in case.
logger.error("Error while retrieving service refs", ex);
return;
}
// in case we found any
if (protocolProviderRefs != null)
{
logger.debug("Found "
+ protocolProviderRefs.length
+ " already installed providers.");
for (int i = 0; i < protocolProviderRefs.length; i++)
{
ProtocolProviderService provider = (ProtocolProviderService) bc
.getService(protocolProviderRefs[i]);
this.handleProviderAdded(provider);
}
}
}
/**
* stops the service.
*
* @param bc BundleContext
*/
public void stop(BundleContext bc)
{
// start listening for newly register or removed protocol providers
bc.removeServiceListener(this);
ServiceReference[] protocolProviderRefs = null;
try
{
protocolProviderRefs = bc.getServiceReferences(
ProtocolProviderService.class.getName(),
null);
}
catch (InvalidSyntaxException ex)
{
// this shouldn't happen since we're providing no parameter string
// but let's log just in case.
logger.error(
"Error while retrieving service refs", ex);
return;
}
// in case we found any
if (protocolProviderRefs != null)
{
for (int i = 0; i < protocolProviderRefs.length; i++)
{
ProtocolProviderService provider = (ProtocolProviderService) bc
.getService(protocolProviderRefs[i]);
this.handleProviderRemoved(provider);
}
}
}
// ////////////////////////////////////////////////////////////////////////
// MessageListener implementation methods
/**
* Passes the newly received message to growl.
* @param evt MessageReceivedEvent the vent containing the new message.
*/
public void messageReceived(MessageReceivedEvent evt)
{
try
{
notifyGrowlOf("Message Received"
, evt.getSourceContact().getDisplayName()
, evt.getSourceMessage().getContent());
}
catch (Exception ex)
{
logger.error("Could not notify the received message to Growl", ex);
}
}
/**
* Notify growl that a message has been sent.
* @param evt the event containing the message that has just been sent.
*/
public void messageDelivered(MessageDeliveredEvent evt)
{
try
{
notifyGrowlOf("Message Sent"
, "Me"
, evt.getSourceMessage().getContent());
}
catch (Exception ex)
{
logger.error("Could not pass the sent message to Growl", ex);
}
}
/**
* Currently unused
* @param evt ignored
*/
public void messageDeliveryFailed(MessageDeliveryFailedEvent evt)
{
}
// //////////////////////////////////////////////////////////////////////////
/**
* When new protocol provider is registered we check
* does it supports BasicIM and if so add a listener to it
*
* @param serviceEvent ServiceEvent
*/
public void serviceChanged(ServiceEvent serviceEvent)
{
Object sService
= bundleContext.getService(serviceEvent.getServiceReference());
logger.trace("Received a service event for: "
+ sService.getClass().getName());
// we don't care if the source service is not a protocol provider
if (! (sService instanceof ProtocolProviderService))
{
return;
}
logger.debug("Service is a protocol provider.");
if (serviceEvent.getType() == ServiceEvent.REGISTERED)
{
logger.debug("Handling registration of a new Protocol Provider.");
this.handleProviderAdded((ProtocolProviderService)sService);
}
else if (serviceEvent.getType() == ServiceEvent.UNREGISTERING)
{
this.handleProviderRemoved( (ProtocolProviderService) sService);
}
}
/**
* Used to attach the Growl Notification Service to existing or
* just registered protocol provider. Checks if the provider has
* implementation of OperationSetBasicInstantMessaging
*
* @param provider ProtocolProviderService
*/
private void handleProviderAdded(ProtocolProviderService provider)
{
logger.debug("Adding protocol provider " + provider.getProtocolName());
// check whether the provider has a basic im operation set
OperationSetBasicInstantMessaging opSetIm
= (OperationSetBasicInstantMessaging) provider
.getSupportedOperationSets().get(
OperationSetBasicInstantMessaging.class.getName());
if (opSetIm != null)
{
opSetIm.addMessageListener(this);
try
{
notifyGrowlOf("Protocol events"
, "New Protocol Registered"
, provider.getProtocolName() + " registered");
}
catch (Exception ex)
{
logger.error("Could not notify the message to Growl", ex);
}
}
else
{
logger.trace("Service did not have a im op. set.");
}
}
/**
* Removes the specified provider from the list of currently known providers
* and ignores all the messages exchanged by it
*
* @param provider the ProtocolProviderService that has been unregistered.
*/
private void handleProviderRemoved(ProtocolProviderService provider)
{
OperationSetBasicInstantMessaging opSetIm
= (OperationSetBasicInstantMessaging) provider
.getSupportedOperationSets().get(
OperationSetBasicInstantMessaging.class.getName());
if (opSetIm != null)
{
opSetIm.removeMessageListener(this);
try
{
notifyGrowlOf("Protocol events"
, "Protocol deregistered"
, provider.getProtocolName()
+ " deregistered");
}
catch (Exception ex)
{
logger.error("Could not notify the message to Growl", ex);
}
}
}
/**
* Convenience method that defers to notifier.notifyGrowlOf() using
* reflection without referencing it directly. The purpose of this method
* is to allow the class to compile on non-mac systems.
*
* @param inNotificationName The name of one of the notifications we told
* growl about.
* @param inTitle The Title of our Notification as Growl will show it
* @param inDescription The Description of our Notification as Growl will
* display it
*
* @throws Exception When a notification is not known
*/
public void notifyGrowlOf(String inNotificationName,
String inTitle,
String inDescription)
throws Exception
{
notifyMethod.invoke(
notifier, new Object[]{inNotificationName, inTitle, inDescription});
}
}
| true | true | public void start(BundleContext bc)
throws Exception
{
logger.debug("Starting the Growl Notification implementation.");
this.bundleContext = bc;
/* Register to Growl */
try
{
Constructor constructor = Growl.class.getConstructor(new Class[]
{String.class, String.class, String.class});
notifier = (Growl)constructor.newInstance(
new Object[]{"SIP Communicator", allNotif, defaultNotif});
notifier.register();
//init the notifyGrowlOf method
notifyMethod = Growl.class.getMethod(
"notifyGrowlOf"
, new Class[]{String.class, String.class, String.class});
notifyGrowlOf("SIP Communicator Started"
, "Welcome to SIP Communicator"
, "http://www.sip-communicator.org");
}
catch (Exception ex)
{
logger.error("Could not send the message to Growl", ex);
throw ex;
}
/* Start listening for newly register or removed protocol providers */
bc.addServiceListener(this);
ServiceReference[] protocolProviderRefs = null;
try
{
protocolProviderRefs = bc.getServiceReferences(
ProtocolProviderService.class.getName(),
null);
}
catch (InvalidSyntaxException ex)
{
// this shouldn't happen since we're providing no parameter string
// but let's log just in case.
logger.error("Error while retrieving service refs", ex);
return;
}
// in case we found any
if (protocolProviderRefs != null)
{
logger.debug("Found "
+ protocolProviderRefs.length
+ " already installed providers.");
for (int i = 0; i < protocolProviderRefs.length; i++)
{
ProtocolProviderService provider = (ProtocolProviderService) bc
.getService(protocolProviderRefs[i]);
this.handleProviderAdded(provider);
}
}
}
| public void start(BundleContext bc)
throws Exception
{
logger.debug("Starting the Growl Notification implementation.");
this.bundleContext = bc;
/* Register to Growl */
try
{
Constructor constructor = Growl.class.getConstructor(new Class[]
{String.class, String[].class, String[].class});
notifier = (Growl)constructor.newInstance(
new Object[]{"SIP Communicator", allNotif, defaultNotif});
notifier.register();
//init the notifyGrowlOf method
notifyMethod = Growl.class.getMethod(
"notifyGrowlOf"
, new Class[]{String.class, String.class, String.class});
notifyGrowlOf("SIP Communicator Started"
, "Welcome to SIP Communicator"
, "http://www.sip-communicator.org");
}
catch (Exception ex)
{
logger.error("Could not send the message to Growl", ex);
throw ex;
}
/* Start listening for newly register or removed protocol providers */
bc.addServiceListener(this);
ServiceReference[] protocolProviderRefs = null;
try
{
protocolProviderRefs = bc.getServiceReferences(
ProtocolProviderService.class.getName(),
null);
}
catch (InvalidSyntaxException ex)
{
// this shouldn't happen since we're providing no parameter string
// but let's log just in case.
logger.error("Error while retrieving service refs", ex);
return;
}
// in case we found any
if (protocolProviderRefs != null)
{
logger.debug("Found "
+ protocolProviderRefs.length
+ " already installed providers.");
for (int i = 0; i < protocolProviderRefs.length; i++)
{
ProtocolProviderService provider = (ProtocolProviderService) bc
.getService(protocolProviderRefs[i]);
this.handleProviderAdded(provider);
}
}
}
|
diff --git a/src/main/java/com/threerings/getdown/net/HTTPDownloader.java b/src/main/java/com/threerings/getdown/net/HTTPDownloader.java
index f8884d9..2f387a7 100644
--- a/src/main/java/com/threerings/getdown/net/HTTPDownloader.java
+++ b/src/main/java/com/threerings/getdown/net/HTTPDownloader.java
@@ -1,126 +1,126 @@
//
// $Id$
//
// Getdown - application installer, patcher and launcher
// Copyright (C) 2004-2010 Three Rings Design, Inc.
// http://code.google.com/p/getdown/
//
// 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.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.threerings.getdown.net;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URLConnection;
import java.util.List;
import com.samskivert.io.StreamUtil;
import com.threerings.getdown.data.Resource;
import static com.threerings.getdown.Log.log;
/**
* Implements downloading files over HTTP
*/
public class HTTPDownloader extends Downloader
{
public HTTPDownloader (List<Resource> resources, Observer obs)
{
super(resources, obs);
}
@Override
protected long checkSize (Resource rsrc)
throws IOException
{
URLConnection conn = rsrc.getRemote().openConnection();
try {
// if we're accessing our data via HTTP, we only need a HEAD request
if (conn instanceof HttpURLConnection) {
HttpURLConnection hcon = (HttpURLConnection)conn;
hcon.setRequestMethod("HEAD");
hcon.connect();
// make sure we got a satisfactory response code
if (hcon.getResponseCode() != HttpURLConnection.HTTP_OK) {
throw new IOException("Unable to check up-to-date for " +
rsrc.getRemote() + ": " + hcon.getResponseCode());
}
}
return conn.getContentLength();
} finally {
// let it be known that we're done with this connection
conn.getInputStream().close();
}
}
@Override
protected void doDownload (Resource rsrc)
throws IOException
{
// download the resource from the specified URL
URLConnection conn = rsrc.getRemote().openConnection();
conn.connect();
// make sure we got a satisfactory response code
if (conn instanceof HttpURLConnection) {
- HttpURLConnection hcon = (HttpURLConnection)rsrc.getRemote().openConnection();
+ HttpURLConnection hcon = (HttpURLConnection)conn;
if (hcon.getResponseCode() != HttpURLConnection.HTTP_OK) {
throw new IOException("Unable to download resource " + rsrc.getRemote() + ": " +
hcon.getResponseCode());
}
}
long actualSize = conn.getContentLength();
log.info("Downloading resource", "url", rsrc.getRemote(), "size", actualSize);
InputStream in = null;
FileOutputStream out = null;
long currentSize = 0L;
try {
in = conn.getInputStream();
out = new FileOutputStream(rsrc.getLocal());
int read;
// TODO: look to see if we have a download info file
// containing info on potentially partially downloaded data;
// if so, use a "Range: bytes=HAVE-" header.
// read in the file data
while ((read = in.read(_buffer)) != -1) {
// write it out to our local copy
out.write(_buffer, 0, read);
// if we have no observer, then don't bother computing download statistics
if (_obs == null) {
continue;
}
// note that we've downloaded some data
currentSize += read;
updateObserver(rsrc, currentSize, actualSize);
}
} finally {
StreamUtil.close(in);
StreamUtil.close(out);
}
}
}
| true | true | protected void doDownload (Resource rsrc)
throws IOException
{
// download the resource from the specified URL
URLConnection conn = rsrc.getRemote().openConnection();
conn.connect();
// make sure we got a satisfactory response code
if (conn instanceof HttpURLConnection) {
HttpURLConnection hcon = (HttpURLConnection)rsrc.getRemote().openConnection();
if (hcon.getResponseCode() != HttpURLConnection.HTTP_OK) {
throw new IOException("Unable to download resource " + rsrc.getRemote() + ": " +
hcon.getResponseCode());
}
}
long actualSize = conn.getContentLength();
log.info("Downloading resource", "url", rsrc.getRemote(), "size", actualSize);
InputStream in = null;
FileOutputStream out = null;
long currentSize = 0L;
try {
in = conn.getInputStream();
out = new FileOutputStream(rsrc.getLocal());
int read;
// TODO: look to see if we have a download info file
// containing info on potentially partially downloaded data;
// if so, use a "Range: bytes=HAVE-" header.
// read in the file data
while ((read = in.read(_buffer)) != -1) {
// write it out to our local copy
out.write(_buffer, 0, read);
// if we have no observer, then don't bother computing download statistics
if (_obs == null) {
continue;
}
// note that we've downloaded some data
currentSize += read;
updateObserver(rsrc, currentSize, actualSize);
}
} finally {
StreamUtil.close(in);
StreamUtil.close(out);
}
}
| protected void doDownload (Resource rsrc)
throws IOException
{
// download the resource from the specified URL
URLConnection conn = rsrc.getRemote().openConnection();
conn.connect();
// make sure we got a satisfactory response code
if (conn instanceof HttpURLConnection) {
HttpURLConnection hcon = (HttpURLConnection)conn;
if (hcon.getResponseCode() != HttpURLConnection.HTTP_OK) {
throw new IOException("Unable to download resource " + rsrc.getRemote() + ": " +
hcon.getResponseCode());
}
}
long actualSize = conn.getContentLength();
log.info("Downloading resource", "url", rsrc.getRemote(), "size", actualSize);
InputStream in = null;
FileOutputStream out = null;
long currentSize = 0L;
try {
in = conn.getInputStream();
out = new FileOutputStream(rsrc.getLocal());
int read;
// TODO: look to see if we have a download info file
// containing info on potentially partially downloaded data;
// if so, use a "Range: bytes=HAVE-" header.
// read in the file data
while ((read = in.read(_buffer)) != -1) {
// write it out to our local copy
out.write(_buffer, 0, read);
// if we have no observer, then don't bother computing download statistics
if (_obs == null) {
continue;
}
// note that we've downloaded some data
currentSize += read;
updateObserver(rsrc, currentSize, actualSize);
}
} finally {
StreamUtil.close(in);
StreamUtil.close(out);
}
}
|
diff --git a/src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsListPanel.java b/src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsListPanel.java
index b624b18bf..7de0380eb 100644
--- a/src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsListPanel.java
+++ b/src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsListPanel.java
@@ -1,277 +1,277 @@
/*
* Copyright (c) 2006-2009 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.addons.ui_swing.dialogs.actioneditor;
import com.dmdirc.actions.ActionCondition;
import com.dmdirc.actions.interfaces.ActionType;
import com.dmdirc.addons.ui_swing.components.text.TextLabel;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.swing.JLabel;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
/**
* Action conditions list panel.
*/
public class ActionConditionsListPanel extends JPanel implements ActionConditionRemovalListener,
PropertyChangeListener {
/**
* 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 = 1;
/** Action trigger. */
private ActionType trigger;
/** Conditions list. */
private List<ActionConditionDisplayPanel> conditions;
/** Condition tree panel. */
private ActionConditionsTreePanel treePanel;
/** Condition validation results. */
private Map<ActionConditionDisplayPanel, Boolean> validations;
/** validates. */
private boolean validates = true;
/**
* Instantiates the panel.
*
* @param treePanel Condition tree panel.
*/
public ActionConditionsListPanel(final ActionConditionsTreePanel treePanel) {
this(null, new ArrayList<ActionConditionDisplayPanel>(), treePanel);
}
/**
* Instantiates the panel.
*
* @param trigger Action trigger
* @param treePanel Condition tree panel.
*/
public ActionConditionsListPanel(final ActionType trigger,
final ActionConditionsTreePanel treePanel) {
this(trigger, new ArrayList<ActionConditionDisplayPanel>(), treePanel);
}
/**
* Instantiates the panel.
*
* @param trigger Action trigger
* @param conditions List of existing conditions;
* @param treePanel Condition tree panel.
*/
public ActionConditionsListPanel(final ActionType trigger,
final List<ActionConditionDisplayPanel> conditions,
final ActionConditionsTreePanel treePanel) {
super();
validations = new HashMap<ActionConditionDisplayPanel, Boolean>();
this.trigger = trigger;
this.conditions = new ArrayList<ActionConditionDisplayPanel>(conditions);
this.treePanel = treePanel;
initComponents();
addListeners();
layoutComponents();
}
/** Initialises the components. */
private void initComponents() {
setLayout(new MigLayout("fillx, wrap 2, pack"));
if (trigger == null) {
setEnabled(false);
}
}
/** Adds the listeners. */
private void addListeners() {
for (ActionConditionDisplayPanel condition : conditions) {
condition.addConditionListener(this);
}
}
/** Lays out the components. */
private void layoutComponents() {
setVisible(false);
removeAll();
int index = 0;
if (trigger == null) {
add(new TextLabel("You must add at least one trigger before you can add conditions."),
"alignx center, aligny top, grow, push, w 90%!");
} else if (trigger.getType().getArgNames().length == 0) {
add(new TextLabel("Trigger does not have any arguments."),
"alignx center, aligny top, grow, push, w 90%!");
} else {
synchronized (conditions) {
for (ActionConditionDisplayPanel condition : conditions) {
- index++;
add(new JLabel(index + "."), "aligny top");
add(condition, "growx, pushx, aligny top");
+ index++;
}
}
if (index == 0) {
add(new JLabel("No conditions."),
"alignx center, aligny top, growx, pushx");
}
}
setVisible(true);
}
/**
* Adds an action condition to the list.
*
* @param condition Action condition
*/
public void addCondition(final ActionCondition condition) {
final ActionConditionDisplayPanel panel =
new ActionConditionDisplayPanel(condition, trigger);
panel.addConditionListener(this);
panel.addPropertyChangeListener("validationResult", this);
validations.put(panel, panel.checkError());
propertyChange(null);
synchronized (conditions) {
conditions.add(panel);
}
treePanel.setConditionCount(conditions.size());
layoutComponents();
}
/**
* Deletes an action condition from the list.
*
* @param condition Action condition
*/
public void delCondition(final ActionCondition condition) {
ActionConditionDisplayPanel removeCondition = null;
synchronized (conditions) {
for (ActionConditionDisplayPanel localCondition : conditions) {
if (localCondition.getCondition().equals(condition)) {
removeCondition = localCondition;
break;
}
}
}
treePanel.setConditionCount(conditions.size());
if (removeCondition != null) {
conditionRemoved(removeCondition);
}
}
/**
* Clear conditions.
*/
public void clearConditions() {
for (ActionConditionDisplayPanel condition : conditions) {
delCondition(condition.getCondition());
}
}
/**
* Returns the condition list.
*
* @return condition list
*/
public List<ActionCondition> getConditions() {
final List<ActionCondition> conditionList =
new ArrayList<ActionCondition>();
synchronized (conditions) {
for (ActionConditionDisplayPanel condition : conditions) {
conditionList.add(condition.getCondition());
}
}
return conditionList;
}
/**
* Sets the action trigger for the panel.
*
* @param trigger Action trigger
*/
public void setTrigger(final ActionType trigger) {
if (this.trigger == null) {
conditions.clear();
}
for (ActionConditionDisplayPanel panel : conditions) {
panel.setTrigger(trigger);
}
this.trigger = trigger;
setEnabled(trigger != null);
layoutComponents();
}
/** {@inheritDoc} */
@Override
public void conditionRemoved(final ActionConditionDisplayPanel condition) {
synchronized (conditions) {
conditions.remove(condition);
validations.remove(condition);
}
propertyChange(null);
layoutComponents();
}
/** {@inheritDoc} */
@Override
public void setEnabled(final boolean enabled) {
for (ActionConditionDisplayPanel condition : conditions) {
condition.setEnabled(enabled);
}
}
/** {@inheritDoc} */
@Override
public void propertyChange(final PropertyChangeEvent evt) {
if (evt != null) {
validations.put((ActionConditionDisplayPanel) evt.getSource(),
(Boolean) evt.getNewValue());
}
boolean pass = true;
for (boolean validation : validations.values()) {
if (!validation) {
pass = false;
break;
}
}
firePropertyChange("validationResult", validates, pass);
validates = pass;
}
}
| false | true | private void layoutComponents() {
setVisible(false);
removeAll();
int index = 0;
if (trigger == null) {
add(new TextLabel("You must add at least one trigger before you can add conditions."),
"alignx center, aligny top, grow, push, w 90%!");
} else if (trigger.getType().getArgNames().length == 0) {
add(new TextLabel("Trigger does not have any arguments."),
"alignx center, aligny top, grow, push, w 90%!");
} else {
synchronized (conditions) {
for (ActionConditionDisplayPanel condition : conditions) {
index++;
add(new JLabel(index + "."), "aligny top");
add(condition, "growx, pushx, aligny top");
}
}
if (index == 0) {
add(new JLabel("No conditions."),
"alignx center, aligny top, growx, pushx");
}
}
setVisible(true);
}
| private void layoutComponents() {
setVisible(false);
removeAll();
int index = 0;
if (trigger == null) {
add(new TextLabel("You must add at least one trigger before you can add conditions."),
"alignx center, aligny top, grow, push, w 90%!");
} else if (trigger.getType().getArgNames().length == 0) {
add(new TextLabel("Trigger does not have any arguments."),
"alignx center, aligny top, grow, push, w 90%!");
} else {
synchronized (conditions) {
for (ActionConditionDisplayPanel condition : conditions) {
add(new JLabel(index + "."), "aligny top");
add(condition, "growx, pushx, aligny top");
index++;
}
}
if (index == 0) {
add(new JLabel("No conditions."),
"alignx center, aligny top, growx, pushx");
}
}
setVisible(true);
}
|
diff --git a/src/com/hlidskialf/android/alarmclock/AlarmAlert.java b/src/com/hlidskialf/android/alarmclock/AlarmAlert.java
index 664d006..237568c 100644
--- a/src/com/hlidskialf/android/alarmclock/AlarmAlert.java
+++ b/src/com/hlidskialf/android/alarmclock/AlarmAlert.java
@@ -1,232 +1,235 @@
/*
* Copyright (C) 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.hlidskialf.android.alarmclock;
import android.app.Activity;
import android.app.KeyguardManager;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.PixelFormat;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.view.LayoutInflater;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.Toast;
import android.widget.TextView;
import java.util.Calendar;
/**
* Alarm Clock alarm alert: pops visible indicator and plays alarm
* tone
*/
public class AlarmAlert extends Activity {
private final static int SNOOZE_MINUTES = 10;
private KeyguardManager mKeyguardManager;
private KeyguardManager.KeyguardLock mKeyguardLock = null;
private Button mSnoozeButton;
private boolean mSnoozed;
private AlarmKlaxon mKlaxon;
private int mAlarmId;
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
/* FIXME Intentionally verbose: always log this until we've
fully debugged the app failing to start up */
Log.v("AlarmAlert.onCreate()");
setContentView(R.layout.alarm_alert);
mKlaxon = AlarmKlaxon.getInstance(this);
// Popup alert over black screen
WindowManager.LayoutParams lp = getWindow().getAttributes();
lp.width = ViewGroup.LayoutParams.WRAP_CONTENT;
lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
// XXX DO NOT COPY THIS!!! THIS IS BOGUS! Making an activity have
// a system alert type is completely broken, because the activity
// manager will still hide/show it as if it is part of the normal
// activity stack. If this is really what you want and you want it
// to work correctly, you should create and show your own custom window.
lp.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
lp.token = null;
getWindow().setAttributes(lp);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
mKeyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
/* set clock face */
LayoutInflater mFactory = LayoutInflater.from(this);
SharedPreferences settings = getSharedPreferences(AlarmClock.PREFERENCES, 0);
int face = settings.getInt(AlarmClock.PREF_CLOCK_FACE, 0);
if (face < 0 || face >= AlarmClock.CLOCKS.length) face = 0;
View clockLayout = (View)mFactory.inflate(AlarmClock.CLOCKS[face], null);
ViewGroup clockView = (ViewGroup)findViewById(R.id.clockView);
clockView.addView(clockLayout);
if (clockLayout instanceof DigitalClock) {
((DigitalClock)clockLayout).setAnimate();
}
TextView nameText = (TextView)findViewById(R.id.alert_name);
- nameText.setText(mKlaxon.getName());
+ String n = mKlaxon.getName();
+ if (nameText != null && n != null) {
+ nameText.setText(mKlaxon.getName());
+ }
mAlarmId = getIntent().getIntExtra(Alarms.ID, -1);
/* allow next alarm to trigger while this activity is
active */
Alarms.disableSnoozeAlert(AlarmAlert.this);
Alarms.disableAlert(AlarmAlert.this, mAlarmId);
Alarms.setNextAlert(this);
/* snooze behavior: pop a snooze confirmation view, kick alarm
manager. */
mSnoozeButton = (Button) findViewById(R.id.snooze);
if (mKlaxon.getSnooze() == 0) {
mSnoozeButton.setVisibility(View.GONE);
}
else {
mSnoozeButton.requestFocus();
mSnoozeButton.setOnClickListener(new Button.OnClickListener() {
public void onClick(View v) {
/* If next alarm is set for sooner than the snooze interval,
don't snooze: instead toast user that snooze will not be set */
final long snoozeTarget = System.currentTimeMillis() + 1000 * 60 * mKlaxon.getSnooze();
long nextAlarm = Alarms.calculateNextAlert(AlarmAlert.this).getAlert();
if (nextAlarm < snoozeTarget) {
Calendar c = Calendar.getInstance();
c.setTimeInMillis(nextAlarm);
Toast.makeText(AlarmAlert.this,
getString(R.string.alarm_alert_snooze_not_set,
Alarms.formatTime(AlarmAlert.this, c)),
Toast.LENGTH_LONG).show();
} else {
Toast.makeText(AlarmAlert.this,
getString(R.string.alarm_alert_snooze_set,
mKlaxon.getSnooze()),
Toast.LENGTH_LONG).show();
Alarms.saveSnoozeAlert(AlarmAlert.this, mAlarmId, snoozeTarget);
Alarms.setNextAlert(AlarmAlert.this);
mSnoozed = true;
}
mKlaxon.stop(AlarmAlert.this, mSnoozed);
releaseLocks();
finish();
}
});
}
/* dismiss button: close notification */
findViewById(R.id.dismiss).setOnClickListener(new Button.OnClickListener() {
public void onClick(View v) {
mKlaxon.stop(AlarmAlert.this, mSnoozed);
releaseLocks();
finish();
}
});
mKlaxon.setKillerCallback(new AlarmKlaxon.KillerCallback() {
public void onKilled() {
if (Log.LOGV) Log.v("onKilled()");
TextView silenced = (TextView)findViewById(R.id.silencedText);
silenced.setText(
getString(R.string.alarm_alert_alert_silenced,
AlarmKlaxon.ALARM_TIMEOUT_SECONDS / 60));
silenced.setVisibility(View.VISIBLE);
/* don't allow snooze */
mSnoozeButton.setEnabled(false);
mKlaxon.stop(AlarmAlert.this, mSnoozed);
releaseLocks();
}
});
mKlaxon.restoreInstanceState(this, icicle);
}
/**
* this is called when a second alarm is triggered while a
* previous alert window is still active.
*/
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
if (Log.LOGV) Log.v("AlarmAlert.OnNewIntent()");
mSnoozeButton.setEnabled(true);
disableKeyguard();
mAlarmId = intent.getIntExtra(Alarms.ID, -1);
/* unset silenced message */
TextView silenced = (TextView)findViewById(R.id.silencedText);
silenced.setVisibility(View.GONE);
Alarms.setNextAlert(this);
setIntent(intent);
}
@Override
protected void onResume() {
super.onResume();
if (Log.LOGV) Log.v("AlarmAlert.onResume()");
disableKeyguard();
}
@Override
protected void onStop() {
super.onStop();
if (Log.LOGV) Log.v("AlarmAlert.onStop()");
mKlaxon.stop(this, mSnoozed);
releaseLocks();
}
@Override
protected void onSaveInstanceState(Bundle icicle) {
mKlaxon.onSaveInstanceState(icicle);
}
private synchronized void enableKeyguard() {
if (mKeyguardLock != null) {
mKeyguardLock.reenableKeyguard();
mKeyguardLock = null;
}
}
private synchronized void disableKeyguard() {
if (mKeyguardLock == null) {
mKeyguardLock = mKeyguardManager.newKeyguardLock(Log.LOGTAG);
mKeyguardLock.disableKeyguard();
}
}
/**
* release wake and keyguard locks
*/
private synchronized void releaseLocks() {
AlarmAlertWakeLock.release();
enableKeyguard();
}
}
| true | true | protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
/* FIXME Intentionally verbose: always log this until we've
fully debugged the app failing to start up */
Log.v("AlarmAlert.onCreate()");
setContentView(R.layout.alarm_alert);
mKlaxon = AlarmKlaxon.getInstance(this);
// Popup alert over black screen
WindowManager.LayoutParams lp = getWindow().getAttributes();
lp.width = ViewGroup.LayoutParams.WRAP_CONTENT;
lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
// XXX DO NOT COPY THIS!!! THIS IS BOGUS! Making an activity have
// a system alert type is completely broken, because the activity
// manager will still hide/show it as if it is part of the normal
// activity stack. If this is really what you want and you want it
// to work correctly, you should create and show your own custom window.
lp.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
lp.token = null;
getWindow().setAttributes(lp);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
mKeyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
/* set clock face */
LayoutInflater mFactory = LayoutInflater.from(this);
SharedPreferences settings = getSharedPreferences(AlarmClock.PREFERENCES, 0);
int face = settings.getInt(AlarmClock.PREF_CLOCK_FACE, 0);
if (face < 0 || face >= AlarmClock.CLOCKS.length) face = 0;
View clockLayout = (View)mFactory.inflate(AlarmClock.CLOCKS[face], null);
ViewGroup clockView = (ViewGroup)findViewById(R.id.clockView);
clockView.addView(clockLayout);
if (clockLayout instanceof DigitalClock) {
((DigitalClock)clockLayout).setAnimate();
}
TextView nameText = (TextView)findViewById(R.id.alert_name);
nameText.setText(mKlaxon.getName());
mAlarmId = getIntent().getIntExtra(Alarms.ID, -1);
/* allow next alarm to trigger while this activity is
active */
Alarms.disableSnoozeAlert(AlarmAlert.this);
Alarms.disableAlert(AlarmAlert.this, mAlarmId);
Alarms.setNextAlert(this);
/* snooze behavior: pop a snooze confirmation view, kick alarm
manager. */
mSnoozeButton = (Button) findViewById(R.id.snooze);
if (mKlaxon.getSnooze() == 0) {
mSnoozeButton.setVisibility(View.GONE);
}
else {
mSnoozeButton.requestFocus();
mSnoozeButton.setOnClickListener(new Button.OnClickListener() {
public void onClick(View v) {
/* If next alarm is set for sooner than the snooze interval,
don't snooze: instead toast user that snooze will not be set */
final long snoozeTarget = System.currentTimeMillis() + 1000 * 60 * mKlaxon.getSnooze();
long nextAlarm = Alarms.calculateNextAlert(AlarmAlert.this).getAlert();
if (nextAlarm < snoozeTarget) {
Calendar c = Calendar.getInstance();
c.setTimeInMillis(nextAlarm);
Toast.makeText(AlarmAlert.this,
getString(R.string.alarm_alert_snooze_not_set,
Alarms.formatTime(AlarmAlert.this, c)),
Toast.LENGTH_LONG).show();
} else {
Toast.makeText(AlarmAlert.this,
getString(R.string.alarm_alert_snooze_set,
mKlaxon.getSnooze()),
Toast.LENGTH_LONG).show();
Alarms.saveSnoozeAlert(AlarmAlert.this, mAlarmId, snoozeTarget);
Alarms.setNextAlert(AlarmAlert.this);
mSnoozed = true;
}
mKlaxon.stop(AlarmAlert.this, mSnoozed);
releaseLocks();
finish();
}
});
}
/* dismiss button: close notification */
findViewById(R.id.dismiss).setOnClickListener(new Button.OnClickListener() {
public void onClick(View v) {
mKlaxon.stop(AlarmAlert.this, mSnoozed);
releaseLocks();
finish();
}
});
mKlaxon.setKillerCallback(new AlarmKlaxon.KillerCallback() {
public void onKilled() {
if (Log.LOGV) Log.v("onKilled()");
TextView silenced = (TextView)findViewById(R.id.silencedText);
silenced.setText(
getString(R.string.alarm_alert_alert_silenced,
AlarmKlaxon.ALARM_TIMEOUT_SECONDS / 60));
silenced.setVisibility(View.VISIBLE);
/* don't allow snooze */
mSnoozeButton.setEnabled(false);
mKlaxon.stop(AlarmAlert.this, mSnoozed);
releaseLocks();
}
});
mKlaxon.restoreInstanceState(this, icicle);
}
| protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
/* FIXME Intentionally verbose: always log this until we've
fully debugged the app failing to start up */
Log.v("AlarmAlert.onCreate()");
setContentView(R.layout.alarm_alert);
mKlaxon = AlarmKlaxon.getInstance(this);
// Popup alert over black screen
WindowManager.LayoutParams lp = getWindow().getAttributes();
lp.width = ViewGroup.LayoutParams.WRAP_CONTENT;
lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
// XXX DO NOT COPY THIS!!! THIS IS BOGUS! Making an activity have
// a system alert type is completely broken, because the activity
// manager will still hide/show it as if it is part of the normal
// activity stack. If this is really what you want and you want it
// to work correctly, you should create and show your own custom window.
lp.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
lp.token = null;
getWindow().setAttributes(lp);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
mKeyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
/* set clock face */
LayoutInflater mFactory = LayoutInflater.from(this);
SharedPreferences settings = getSharedPreferences(AlarmClock.PREFERENCES, 0);
int face = settings.getInt(AlarmClock.PREF_CLOCK_FACE, 0);
if (face < 0 || face >= AlarmClock.CLOCKS.length) face = 0;
View clockLayout = (View)mFactory.inflate(AlarmClock.CLOCKS[face], null);
ViewGroup clockView = (ViewGroup)findViewById(R.id.clockView);
clockView.addView(clockLayout);
if (clockLayout instanceof DigitalClock) {
((DigitalClock)clockLayout).setAnimate();
}
TextView nameText = (TextView)findViewById(R.id.alert_name);
String n = mKlaxon.getName();
if (nameText != null && n != null) {
nameText.setText(mKlaxon.getName());
}
mAlarmId = getIntent().getIntExtra(Alarms.ID, -1);
/* allow next alarm to trigger while this activity is
active */
Alarms.disableSnoozeAlert(AlarmAlert.this);
Alarms.disableAlert(AlarmAlert.this, mAlarmId);
Alarms.setNextAlert(this);
/* snooze behavior: pop a snooze confirmation view, kick alarm
manager. */
mSnoozeButton = (Button) findViewById(R.id.snooze);
if (mKlaxon.getSnooze() == 0) {
mSnoozeButton.setVisibility(View.GONE);
}
else {
mSnoozeButton.requestFocus();
mSnoozeButton.setOnClickListener(new Button.OnClickListener() {
public void onClick(View v) {
/* If next alarm is set for sooner than the snooze interval,
don't snooze: instead toast user that snooze will not be set */
final long snoozeTarget = System.currentTimeMillis() + 1000 * 60 * mKlaxon.getSnooze();
long nextAlarm = Alarms.calculateNextAlert(AlarmAlert.this).getAlert();
if (nextAlarm < snoozeTarget) {
Calendar c = Calendar.getInstance();
c.setTimeInMillis(nextAlarm);
Toast.makeText(AlarmAlert.this,
getString(R.string.alarm_alert_snooze_not_set,
Alarms.formatTime(AlarmAlert.this, c)),
Toast.LENGTH_LONG).show();
} else {
Toast.makeText(AlarmAlert.this,
getString(R.string.alarm_alert_snooze_set,
mKlaxon.getSnooze()),
Toast.LENGTH_LONG).show();
Alarms.saveSnoozeAlert(AlarmAlert.this, mAlarmId, snoozeTarget);
Alarms.setNextAlert(AlarmAlert.this);
mSnoozed = true;
}
mKlaxon.stop(AlarmAlert.this, mSnoozed);
releaseLocks();
finish();
}
});
}
/* dismiss button: close notification */
findViewById(R.id.dismiss).setOnClickListener(new Button.OnClickListener() {
public void onClick(View v) {
mKlaxon.stop(AlarmAlert.this, mSnoozed);
releaseLocks();
finish();
}
});
mKlaxon.setKillerCallback(new AlarmKlaxon.KillerCallback() {
public void onKilled() {
if (Log.LOGV) Log.v("onKilled()");
TextView silenced = (TextView)findViewById(R.id.silencedText);
silenced.setText(
getString(R.string.alarm_alert_alert_silenced,
AlarmKlaxon.ALARM_TIMEOUT_SECONDS / 60));
silenced.setVisibility(View.VISIBLE);
/* don't allow snooze */
mSnoozeButton.setEnabled(false);
mKlaxon.stop(AlarmAlert.this, mSnoozed);
releaseLocks();
}
});
mKlaxon.restoreInstanceState(this, icicle);
}
|
diff --git a/src/test/java/sequenceplanner/editor/PropertyTests.java b/src/test/java/sequenceplanner/editor/PropertyTests.java
index cf20313..2565564 100644
--- a/src/test/java/sequenceplanner/editor/PropertyTests.java
+++ b/src/test/java/sequenceplanner/editor/PropertyTests.java
@@ -1,146 +1,146 @@
package sequenceplanner.editor;
import java.util.HashSet;
import java.util.Set;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import sequenceplanner.general.SP;
import sequenceplanner.model.TreeNode;
import sequenceplanner.model.data.OperationData;
import static org.junit.Assert.*;
/**
* To test properties
* @author patrik
*/
public class PropertyTests {
public PropertyTests() {
}
@BeforeClass
public static void setUpClass() throws Exception {
}
@AfterClass
public static void tearDownClass() throws Exception {
}
@Test
public void id85() {
//Create data------------------------------------------------------------
SP sp = new SP();
sp.loadFromTemplateSOPXFile("resources/filesForTesting/fileForTesting.sopx");
//Create properties
GlobalProperty gpColor = new GlobalProperty("Color");
Value blueValue = new Value("blue");
gpColor.addValue(blueValue);
Value redValue = new Value("red");
gpColor.addValue(redValue);
Value greenValue = new Value("green");
gpColor.addValue(greenValue);
GlobalProperty gpLetters = new GlobalProperty("Letters");
Value aValue = new Value("A");
gpLetters.addValue(aValue);
Value bValue = new Value("B");
gpLetters.addValue(bValue);
Value cValue = new Value("C");
gpLetters.addValue(cValue);
Value dValue = new Value("D");
gpLetters.addValue(dValue);
//Create operations
OperationData opA = sp.insertOperation();
opA.setName("opA");
final int idOpA = opA.getId();
OperationData opB = sp.insertOperation();
opB.setName("opB");
final int idOpB = opB.getId();
//Set letters A and B for operation A
Set<Integer> opAValueSet = new HashSet<Integer>();
opA.setProperty(aValue.getId(), true);
opAValueSet.add(aValue.getId());
opA.setProperty(bValue.getId(), true);
opAValueSet.add(bValue.getId());
opA.setProperty(gpLetters.getId(), true);
opAValueSet.add(gpLetters.getId());
//Set Color=red and Letters=C for operation B
Set<Integer> opBValueSet = new HashSet<Integer>();
opB.setProperty(redValue.getId(), true);
opBValueSet.add(redValue.getId());
opB.setProperty(gpColor.getId(), true);
opBValueSet.add(gpColor.getId());
opB.setProperty(cValue.getId(), true);
opBValueSet.add(cValue.getId());
opB.setProperty(gpLetters.getId(), true);
opBValueSet.add(gpLetters.getId());
//Save project
sp.saveToSOPXFile("C:/Users/patrik/Desktop/result.sopx");
//-----------------------------------------------------------------------
//Open a new project and compare inserted data with opened data.---------
SP sp2 = new SP();
//Open project
sp2.loadFromSOPXFile("C:/Users/patrik/Desktop/result.sopx");
TreeNode td;
td = sp2.getModel().getOperation(idOpA);
assertTrue("Op A could not be opened!", td != null);
OperationData opData = (OperationData) td.getNodeData();
assertTrue("No properties loaded to opA",opData.getProperties().keySet().size()>0);
- for (final Integer i : opData.getProperties().keySet()) {
+ for (Integer i : opData.getProperties().keySet()) {
assertTrue(opAValueSet.contains(i));
}
}
/**
* test of id 100
*/
// @Test
public void id100() {
//Insert property (A) with name Adam
//Insert property (B) with name Bertil
//assertTrue(all property names are different);
//Insert propery (C) with name empty
//assertTrue(nbr of properties == 2)
//Insert property (D) with name Ad
//assertTrue(nbr of properties == 3)
//Change name of B to empty
//assertTrue(nbr of properties == 3)
//assertTrue(A.getName.equals("Adam"))
//assertTrue(B.getName.equals("Bertil"))
//assertTrue(C.getName.equals("Ad"))
//Change name of B to Adam
//assertTrue(nbr of properties == 3)
//assertTrue(A.getName.equals("Adam"))
//assertTrue(B.getName.equals("Bertil"))
//assertTrue(C.getName.equals("Ad"))
//Insert value (1) with name ett to A
//Insert value (2) with name tv� to A
//assertTrue(A."nbr of values" == 2)
//Change name of 1 to empty
//assertTrue(A."nbr of values" == 2)
//assertTrue(1.getName.equals("ett"))
//assertTrue(2.getName.equals("tv�"))
//Change name of 1 to tv�
//assertTrue(A."nbr of values" == 2)
//assertTrue(1.getName.equals("ett"))
//assertTrue(2.getName.equals("tv�"))
//Insert value (3) with name ett to B
//assertTrue(B."nbr of values" == 1)
//assertTrue(3.getName.equals("ett"))
//assertTrue(A."nbr of values" == 2)
//assertTrue(1.getName.equals("ett"))
//assertTrue(2.getName.equals("tv�"))
//Insert value (4) with name empty to C
//assertTrue(C."nbr of values" == 0)
}
}
| true | true | public void id85() {
//Create data------------------------------------------------------------
SP sp = new SP();
sp.loadFromTemplateSOPXFile("resources/filesForTesting/fileForTesting.sopx");
//Create properties
GlobalProperty gpColor = new GlobalProperty("Color");
Value blueValue = new Value("blue");
gpColor.addValue(blueValue);
Value redValue = new Value("red");
gpColor.addValue(redValue);
Value greenValue = new Value("green");
gpColor.addValue(greenValue);
GlobalProperty gpLetters = new GlobalProperty("Letters");
Value aValue = new Value("A");
gpLetters.addValue(aValue);
Value bValue = new Value("B");
gpLetters.addValue(bValue);
Value cValue = new Value("C");
gpLetters.addValue(cValue);
Value dValue = new Value("D");
gpLetters.addValue(dValue);
//Create operations
OperationData opA = sp.insertOperation();
opA.setName("opA");
final int idOpA = opA.getId();
OperationData opB = sp.insertOperation();
opB.setName("opB");
final int idOpB = opB.getId();
//Set letters A and B for operation A
Set<Integer> opAValueSet = new HashSet<Integer>();
opA.setProperty(aValue.getId(), true);
opAValueSet.add(aValue.getId());
opA.setProperty(bValue.getId(), true);
opAValueSet.add(bValue.getId());
opA.setProperty(gpLetters.getId(), true);
opAValueSet.add(gpLetters.getId());
//Set Color=red and Letters=C for operation B
Set<Integer> opBValueSet = new HashSet<Integer>();
opB.setProperty(redValue.getId(), true);
opBValueSet.add(redValue.getId());
opB.setProperty(gpColor.getId(), true);
opBValueSet.add(gpColor.getId());
opB.setProperty(cValue.getId(), true);
opBValueSet.add(cValue.getId());
opB.setProperty(gpLetters.getId(), true);
opBValueSet.add(gpLetters.getId());
//Save project
sp.saveToSOPXFile("C:/Users/patrik/Desktop/result.sopx");
//-----------------------------------------------------------------------
//Open a new project and compare inserted data with opened data.---------
SP sp2 = new SP();
//Open project
sp2.loadFromSOPXFile("C:/Users/patrik/Desktop/result.sopx");
TreeNode td;
td = sp2.getModel().getOperation(idOpA);
assertTrue("Op A could not be opened!", td != null);
OperationData opData = (OperationData) td.getNodeData();
assertTrue("No properties loaded to opA",opData.getProperties().keySet().size()>0);
for (final Integer i : opData.getProperties().keySet()) {
assertTrue(opAValueSet.contains(i));
}
}
| public void id85() {
//Create data------------------------------------------------------------
SP sp = new SP();
sp.loadFromTemplateSOPXFile("resources/filesForTesting/fileForTesting.sopx");
//Create properties
GlobalProperty gpColor = new GlobalProperty("Color");
Value blueValue = new Value("blue");
gpColor.addValue(blueValue);
Value redValue = new Value("red");
gpColor.addValue(redValue);
Value greenValue = new Value("green");
gpColor.addValue(greenValue);
GlobalProperty gpLetters = new GlobalProperty("Letters");
Value aValue = new Value("A");
gpLetters.addValue(aValue);
Value bValue = new Value("B");
gpLetters.addValue(bValue);
Value cValue = new Value("C");
gpLetters.addValue(cValue);
Value dValue = new Value("D");
gpLetters.addValue(dValue);
//Create operations
OperationData opA = sp.insertOperation();
opA.setName("opA");
final int idOpA = opA.getId();
OperationData opB = sp.insertOperation();
opB.setName("opB");
final int idOpB = opB.getId();
//Set letters A and B for operation A
Set<Integer> opAValueSet = new HashSet<Integer>();
opA.setProperty(aValue.getId(), true);
opAValueSet.add(aValue.getId());
opA.setProperty(bValue.getId(), true);
opAValueSet.add(bValue.getId());
opA.setProperty(gpLetters.getId(), true);
opAValueSet.add(gpLetters.getId());
//Set Color=red and Letters=C for operation B
Set<Integer> opBValueSet = new HashSet<Integer>();
opB.setProperty(redValue.getId(), true);
opBValueSet.add(redValue.getId());
opB.setProperty(gpColor.getId(), true);
opBValueSet.add(gpColor.getId());
opB.setProperty(cValue.getId(), true);
opBValueSet.add(cValue.getId());
opB.setProperty(gpLetters.getId(), true);
opBValueSet.add(gpLetters.getId());
//Save project
sp.saveToSOPXFile("C:/Users/patrik/Desktop/result.sopx");
//-----------------------------------------------------------------------
//Open a new project and compare inserted data with opened data.---------
SP sp2 = new SP();
//Open project
sp2.loadFromSOPXFile("C:/Users/patrik/Desktop/result.sopx");
TreeNode td;
td = sp2.getModel().getOperation(idOpA);
assertTrue("Op A could not be opened!", td != null);
OperationData opData = (OperationData) td.getNodeData();
assertTrue("No properties loaded to opA",opData.getProperties().keySet().size()>0);
for (Integer i : opData.getProperties().keySet()) {
assertTrue(opAValueSet.contains(i));
}
}
|
diff --git a/src/core/interviews/sorts/BSTTraversalsort.java b/src/core/interviews/sorts/BSTTraversalsort.java
index 22508a2..cc5dc5e 100644
--- a/src/core/interviews/sorts/BSTTraversalsort.java
+++ b/src/core/interviews/sorts/BSTTraversalsort.java
@@ -1,17 +1,20 @@
package interviews.sorts;
import interviews.trees.BST;
import java.util.Comparator;
import java.util.List;
/**
* BSTTraversalsort.
* @author Francois Rousseau
*/
public class BSTTraversalSort {
- public static <E> void f(List<E> list, Comparator<E> comparator) {
+ public static <E> void f(final List<E> list, Comparator<E> comparator) {
BST<E> tree = new BST<E>(list, comparator);
- list = tree.traversalInOrderRecursive();
+ List<E> tmp = tree.traversalInOrderRecursive();
+ for (int i = 0; i < list.size(); i++) {
+ list.set(i, tmp.get(i));
+ }
}
}
| false | true | public static <E> void f(List<E> list, Comparator<E> comparator) {
BST<E> tree = new BST<E>(list, comparator);
list = tree.traversalInOrderRecursive();
}
| public static <E> void f(final List<E> list, Comparator<E> comparator) {
BST<E> tree = new BST<E>(list, comparator);
List<E> tmp = tree.traversalInOrderRecursive();
for (int i = 0; i < list.size(); i++) {
list.set(i, tmp.get(i));
}
}
|
diff --git a/WEB-INF/src/org/cdlib/xtf/util/DirSync.java b/WEB-INF/src/org/cdlib/xtf/util/DirSync.java
index 2d5b4ed5..0641e17a 100644
--- a/WEB-INF/src/org/cdlib/xtf/util/DirSync.java
+++ b/WEB-INF/src/org/cdlib/xtf/util/DirSync.java
@@ -1,192 +1,195 @@
package org.cdlib.xtf.util;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.cdlib.xtf.util.ProcessRunner.CommandFailedException;
/**
* Copyright (c) 2009, Regents of the University of California
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* - Neither the name of the University of California nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/**
* Routines to synchronize one directory hierarchy to match another. Now uses
* rsync for speed and simplicity, and adds a threshold above which we avoid
* per-subdirectory syncing and just do the whole thing.
*
* @author Martin Haye
*/
public class DirSync
{
private static final int MAX_SELECTIVE_SYNC = 500;
private static final int MAX_RSYNC_BATCH = 2;
private SubDirFilter filter;
/**
* Initialize a directory syncer with no sub-directory filter
* (all sub-directories will be scanned.)
*/
public DirSync() {
this(null);
}
/**
* Initialize with a sub-directory filter.
*/
public DirSync(SubDirFilter filter) {
this.filter = filter;
}
/**
* Sync the files from source to dest.
*
* @param srcDir Directory to match
* @param dstDir Directory to modify
* @throws IOException If anything goes wrong
*/
public void syncDirs(File srcDir, File dstDir)
throws IOException
{
// If there are no directories specified, or there are too many,
// just rsync the entire source to the dest.
//
if (filter == null || filter.size() > MAX_SELECTIVE_SYNC)
runRsync(srcDir, dstDir, null, new String[] { "--exclude=scanDirs.list" });
// Otherwise do a selective sync.
else
selectiveSync(srcDir, dstDir);
// Always do the scanDirs.list file last, since it governs incremental syncing.
// If it were done before other files, and the sync process aborted, we might
// mistakenly think two directories were perfectly in sync when in fact they
// are different.
//
runRsync(new File(srcDir, "scanDirs.list"), dstDir, null, null);
}
/**
* The main workhorse of the scanner.
*
* @param srcDir Directory to match
* @param dstDir Directory to modify
* @param subDirs Sub-directories to rsync
* @throws IOException If anything goes wrong
*/
private void selectiveSync(File srcDir, File dstDir)
throws IOException
{
// First, sync the top-level files (no sub-dirs)
runRsync(srcDir, dstDir, null, new String[] { "--exclude=/*/", "--exclude=scanDirs.list" });
// Now sync the subdirectories in batches, not to exceed the batch limit
if (!filter.isEmpty())
{
ArrayList<String> dirBatch = new ArrayList();
String basePath = srcDir.getCanonicalPath() + "/";
for (String target : filter.getTargets())
{
String targetPath = new File(target).getCanonicalPath();
assert targetPath.startsWith(basePath);
targetPath = targetPath.substring(basePath.length());
dirBatch.add(targetPath);
if (dirBatch.size() >= MAX_RSYNC_BATCH) {
runRsync(srcDir, dstDir, dirBatch, null);
dirBatch.clear();
}
}
// Finish the last batch of subdirs (if any)
if (!dirBatch.isEmpty())
runRsync(srcDir, dstDir, dirBatch, new String[] { "--exclude=scanDirs.list" });
}
}
/**
* Run an rsync command with the standard arguments plus the
* specified subdirectories and optional extra args.
*
* @param src Directory (or file) to match
* @param dst Directory (or file) to modify
* @param subDirs Sub-directories to rsync (null for all)
* @throws IOException If anything goes wrong
*/
public void runRsync(File src, File dst,
List<String> subDirs,
String[] extraArgs)
throws IOException
{
try
{
// First the basic arguments
ArrayList<String> args = new ArrayList(6);
args.add("rsync");
args.add("-av");
//args.add("--dry-run");
args.add("--delete");
// Add any extra arguments at this point, before the paths.
if (extraArgs != null) {
for (String extra : extraArgs)
args.add(extra);
}
// We want to hard link dest files to the source
if (src.isDirectory())
args.add("--link-dest=" + src.getAbsolutePath() + "/");
// For the source, add in the weird "./" syntax for relative syncing, e.g.
// rsync --relative server.org:data/13030/pairtree_root/qt/00/./{01/d5,04/k4} data/13030/pairtree_root/qt/00/
//
if (subDirs != null) {
args.add("--relative");
- for (String subDir : subDirs)
- args.add(src.getAbsolutePath() + "/./" + subDir);
+ for (String subDir : subDirs)
+ {
+ if (new File(src.getAbsolutePath(), subDir).canRead())
+ args.add(src.getAbsolutePath() + "/./" + subDir);
+ }
}
else
args.add(src.getAbsolutePath() + (src.isDirectory() ? "/" : ""));
// Finally add the destination path
args.add(dst.getAbsolutePath() + (dst.isDirectory() ? "/" : ""));
// And run the command
String[] argArray = args.toArray(new String[args.size()]);
ProcessRunner.runAndGrab(argArray, "", 0);
}
catch (InterruptedException e) {
throw new RuntimeException(e);
}
catch (CommandFailedException e) {
throw new IOException(e.getMessage());
}
}
}
| true | true | public void runRsync(File src, File dst,
List<String> subDirs,
String[] extraArgs)
throws IOException
{
try
{
// First the basic arguments
ArrayList<String> args = new ArrayList(6);
args.add("rsync");
args.add("-av");
//args.add("--dry-run");
args.add("--delete");
// Add any extra arguments at this point, before the paths.
if (extraArgs != null) {
for (String extra : extraArgs)
args.add(extra);
}
// We want to hard link dest files to the source
if (src.isDirectory())
args.add("--link-dest=" + src.getAbsolutePath() + "/");
// For the source, add in the weird "./" syntax for relative syncing, e.g.
// rsync --relative server.org:data/13030/pairtree_root/qt/00/./{01/d5,04/k4} data/13030/pairtree_root/qt/00/
//
if (subDirs != null) {
args.add("--relative");
for (String subDir : subDirs)
args.add(src.getAbsolutePath() + "/./" + subDir);
}
else
args.add(src.getAbsolutePath() + (src.isDirectory() ? "/" : ""));
// Finally add the destination path
args.add(dst.getAbsolutePath() + (dst.isDirectory() ? "/" : ""));
// And run the command
String[] argArray = args.toArray(new String[args.size()]);
ProcessRunner.runAndGrab(argArray, "", 0);
}
catch (InterruptedException e) {
throw new RuntimeException(e);
}
catch (CommandFailedException e) {
throw new IOException(e.getMessage());
}
}
| public void runRsync(File src, File dst,
List<String> subDirs,
String[] extraArgs)
throws IOException
{
try
{
// First the basic arguments
ArrayList<String> args = new ArrayList(6);
args.add("rsync");
args.add("-av");
//args.add("--dry-run");
args.add("--delete");
// Add any extra arguments at this point, before the paths.
if (extraArgs != null) {
for (String extra : extraArgs)
args.add(extra);
}
// We want to hard link dest files to the source
if (src.isDirectory())
args.add("--link-dest=" + src.getAbsolutePath() + "/");
// For the source, add in the weird "./" syntax for relative syncing, e.g.
// rsync --relative server.org:data/13030/pairtree_root/qt/00/./{01/d5,04/k4} data/13030/pairtree_root/qt/00/
//
if (subDirs != null) {
args.add("--relative");
for (String subDir : subDirs)
{
if (new File(src.getAbsolutePath(), subDir).canRead())
args.add(src.getAbsolutePath() + "/./" + subDir);
}
}
else
args.add(src.getAbsolutePath() + (src.isDirectory() ? "/" : ""));
// Finally add the destination path
args.add(dst.getAbsolutePath() + (dst.isDirectory() ? "/" : ""));
// And run the command
String[] argArray = args.toArray(new String[args.size()]);
ProcessRunner.runAndGrab(argArray, "", 0);
}
catch (InterruptedException e) {
throw new RuntimeException(e);
}
catch (CommandFailedException e) {
throw new IOException(e.getMessage());
}
}
|
diff --git a/src/com/palmergames/bukkit/TownyChat/Command/JoinCommand.java b/src/com/palmergames/bukkit/TownyChat/Command/JoinCommand.java
index ea3a17f..34e4d2c 100644
--- a/src/com/palmergames/bukkit/TownyChat/Command/JoinCommand.java
+++ b/src/com/palmergames/bukkit/TownyChat/Command/JoinCommand.java
@@ -1,84 +1,84 @@
package com.palmergames.bukkit.TownyChat.Command;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.palmergames.bukkit.TownyChat.Chat;
import com.palmergames.bukkit.TownyChat.channels.Channel;
import com.palmergames.bukkit.towny.TownyMessaging;
import com.palmergames.bukkit.towny.object.TownyUniverse;
public class JoinCommand implements CommandExecutor {
Chat plugin = null;
public JoinCommand(Chat instance) {
this.plugin = instance;
}
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
// If not our command
if ((!label.equalsIgnoreCase("join") || args.length != 1) &&
(!label.equalsIgnoreCase("ch") || args.length != 2 || !args[0].equalsIgnoreCase("join"))) {
TownyMessaging.sendErrorMsg(sender, "[TownyChat] Error: Invalid command!");
return false;
}
if (!(sender instanceof Player)) {
return false; // Don't think it can happen but ...
}
Player player = ((Player)sender);
String name = null;
if (label.equalsIgnoreCase("join")){
name = args[0];
} else {
name = args[1];
}
Channel chan = plugin.getChannelsHandler().getChannel(name);
// If we can't find the channel by name, look up all the channel commands for an alias
if (chan == null) {
for(Channel chan2 : plugin.getChannelsHandler().getAllChannels().values()) {
for (String command : chan2.getCommands()) {
if (command.equalsIgnoreCase(name)) {
chan = chan2;
break;
}
}
if (chan != null) {
break;
}
}
}
if (chan == null) {
- TownyMessaging.sendErrorMsg(sender, "[TownyChat] There is no channel called &f" + name);
+ TownyMessaging.sendErrorMsg(sender, "[TownyChat] There is no channel called " + Colors.White + name);
return true;
}
// You can join if:
// - Towny doesn't recognize your permissions plugin
// - channel has no permission set OR [by default they don't]
// - channel has permission set AND:
// - player has channel permission
String joinPerm = chan.getPermission();
if ((joinPerm != null && (plugin.getTowny().isPermissions() && !TownyUniverse.getPermissionSource().has(player, joinPerm)))) {
- TownyMessaging.sendErrorMsg(sender, "[TownyChat] You cannot join &f" + chan.getName());
+ TownyMessaging.sendErrorMsg(sender, "[TownyChat] You cannot join " + Colors.White + chan.getName());
return true;
}
if (!chan.join(sender.getName())){
- TownyMessaging.sendMsg(sender, "[TownyChat] You are already in &f" + chan.getName());
+ TownyMessaging.sendMsg(sender, "[TownyChat] You are already in " + Colors.White + chan.getName());
return true;
}
- TownyMessaging.sendMsg(sender, "[TownyChat] You joined &f" + chan.getName());
+ TownyMessaging.sendMsg(sender, "[TownyChat] You joined " + Colors.White + chan.getName());
return true;
}
}
| false | true | public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
// If not our command
if ((!label.equalsIgnoreCase("join") || args.length != 1) &&
(!label.equalsIgnoreCase("ch") || args.length != 2 || !args[0].equalsIgnoreCase("join"))) {
TownyMessaging.sendErrorMsg(sender, "[TownyChat] Error: Invalid command!");
return false;
}
if (!(sender instanceof Player)) {
return false; // Don't think it can happen but ...
}
Player player = ((Player)sender);
String name = null;
if (label.equalsIgnoreCase("join")){
name = args[0];
} else {
name = args[1];
}
Channel chan = plugin.getChannelsHandler().getChannel(name);
// If we can't find the channel by name, look up all the channel commands for an alias
if (chan == null) {
for(Channel chan2 : plugin.getChannelsHandler().getAllChannels().values()) {
for (String command : chan2.getCommands()) {
if (command.equalsIgnoreCase(name)) {
chan = chan2;
break;
}
}
if (chan != null) {
break;
}
}
}
if (chan == null) {
TownyMessaging.sendErrorMsg(sender, "[TownyChat] There is no channel called &f" + name);
return true;
}
// You can join if:
// - Towny doesn't recognize your permissions plugin
// - channel has no permission set OR [by default they don't]
// - channel has permission set AND:
// - player has channel permission
String joinPerm = chan.getPermission();
if ((joinPerm != null && (plugin.getTowny().isPermissions() && !TownyUniverse.getPermissionSource().has(player, joinPerm)))) {
TownyMessaging.sendErrorMsg(sender, "[TownyChat] You cannot join &f" + chan.getName());
return true;
}
if (!chan.join(sender.getName())){
TownyMessaging.sendMsg(sender, "[TownyChat] You are already in &f" + chan.getName());
return true;
}
TownyMessaging.sendMsg(sender, "[TownyChat] You joined &f" + chan.getName());
return true;
}
| public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
// If not our command
if ((!label.equalsIgnoreCase("join") || args.length != 1) &&
(!label.equalsIgnoreCase("ch") || args.length != 2 || !args[0].equalsIgnoreCase("join"))) {
TownyMessaging.sendErrorMsg(sender, "[TownyChat] Error: Invalid command!");
return false;
}
if (!(sender instanceof Player)) {
return false; // Don't think it can happen but ...
}
Player player = ((Player)sender);
String name = null;
if (label.equalsIgnoreCase("join")){
name = args[0];
} else {
name = args[1];
}
Channel chan = plugin.getChannelsHandler().getChannel(name);
// If we can't find the channel by name, look up all the channel commands for an alias
if (chan == null) {
for(Channel chan2 : plugin.getChannelsHandler().getAllChannels().values()) {
for (String command : chan2.getCommands()) {
if (command.equalsIgnoreCase(name)) {
chan = chan2;
break;
}
}
if (chan != null) {
break;
}
}
}
if (chan == null) {
TownyMessaging.sendErrorMsg(sender, "[TownyChat] There is no channel called " + Colors.White + name);
return true;
}
// You can join if:
// - Towny doesn't recognize your permissions plugin
// - channel has no permission set OR [by default they don't]
// - channel has permission set AND:
// - player has channel permission
String joinPerm = chan.getPermission();
if ((joinPerm != null && (plugin.getTowny().isPermissions() && !TownyUniverse.getPermissionSource().has(player, joinPerm)))) {
TownyMessaging.sendErrorMsg(sender, "[TownyChat] You cannot join " + Colors.White + chan.getName());
return true;
}
if (!chan.join(sender.getName())){
TownyMessaging.sendMsg(sender, "[TownyChat] You are already in " + Colors.White + chan.getName());
return true;
}
TownyMessaging.sendMsg(sender, "[TownyChat] You joined " + Colors.White + chan.getName());
return true;
}
|
diff --git a/src/uk/ac/ed/inf/Metabolic/sbmlexport/SBMLExportService.java b/src/uk/ac/ed/inf/Metabolic/sbmlexport/SBMLExportService.java
index 393e848..3ae2a81 100644
--- a/src/uk/ac/ed/inf/Metabolic/sbmlexport/SBMLExportService.java
+++ b/src/uk/ac/ed/inf/Metabolic/sbmlexport/SBMLExportService.java
@@ -1,148 +1,154 @@
package uk.ac.ed.inf.Metabolic.sbmlexport;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import org.pathwayeditor.businessobjectsAPI.IMap;
import org.pathwayeditor.contextadapter.publicapi.ExportServiceException;
import org.pathwayeditor.contextadapter.publicapi.IContext;
import org.pathwayeditor.contextadapter.publicapi.IContextAdapterExportService;
import org.pathwayeditor.contextadapter.publicapi.IContextAdapterServiceProvider;
import org.pathwayeditor.contextadapter.publicapi.IContextAdapterValidationService;
import org.pathwayeditor.contextadapter.publicapi.IValidationReport;
import uk.ac.ed.inf.Metabolic.ExportAdapterCreationException;
import uk.ac.ed.inf.Metabolic.IExportAdapter;
import uk.ac.ed.inf.Metabolic.MetabolicNDOMValidationService;
import uk.ac.ed.inf.Metabolic.ndomAPI.IModel;
public class SBMLExportService implements IContextAdapterExportService {
String DISPLAY_NAME = "SBML export L2v3";
String RECOMMENDED_SUFFIX = "sbml";
final String TYPECODE = "MetSBML_1.0.0";
private IContext context;
private IExportAdapter<IModel> generator;
public SBMLExportService(IContextAdapterServiceProvider provider) {
this.serviceProvider = provider;
context = provider.getContext();
}
private IContextAdapterServiceProvider serviceProvider;
public IContextAdapterServiceProvider getServiceProvider() {
return serviceProvider;
}
/**
* @throws IllegalArgumentException
* if either argument is null
* @throws ExportServiceException
* if exportFile:
* <ul>
* <li> Doesn't exist
* <li> Is not writable.
* <li> Cannot produce valid SBML
* </ul>
*/
- public void exportMap(IMap map, File exportFile)
- throws ExportServiceException {
+ public void exportMap(IMap map, File exportFile) throws ExportServiceException {
+ if(map == null || exportFile == null){
+ throw new IllegalArgumentException("parameters map or exportFile canot be null");
+ }
FileOutputStream fos = null;
try {
checkArgs(map, exportFile);
generator = getGenerator();//new MetabolicSBMLExportAdapter<IModel>();
IContextAdapterValidationService validator = serviceProvider
.getValidationService();
validator.setMapToValidate(map);
IModel ndom = null;
if (validator.isReadyToValidate()) {
validator.validateMap();
IValidationReport report =validator.getValidationReport();
if(!report.isMapValid()){
String sb="Map is not valid:\n";
throw new ExportServiceException(sb, report);
}else {
ndom=getModel(validator);
generator.createTarget(ndom);
fos = new FileOutputStream(exportFile);
generator.writeTarget(fos);
}
}
} catch (ExportAdapterCreationException e) {
throw new ExportServiceException(e);
} catch (IOException e) {
throw new ExportServiceException(e);
+ } catch (UnsatisfiedLinkError e){
+ throw new ExportServiceException(e);
+ } catch (RuntimeException e){
+ throw new ExportServiceException(e);
} finally {
try {
if (fos != null)
fos.close();
} catch (Exception e) {
}
}
}
IModel getModel(IContextAdapterValidationService validator) {
if(validator.getValidationReport().isMapValid()){
return (IModel) MetabolicNDOMValidationService.getInstance(serviceProvider).getNDOM();
}else{
return null;
}
}
private void checkArgs(IMap map, File exportFile)
throws ExportServiceException, IOException {
if (map == null || exportFile == null
|| map.getTheSingleRootMapObject() == null) {
throw new IllegalArgumentException("Arguments must not be null");
}
// yes yt is, export fails without it
// exportFile.createNewFile();
File parent = exportFile.getParentFile();
if (parent != null && !parent.canWrite()) {
throw new ExportServiceException("Directory " + parent + " is not writable");
}
}
public String getCode() {
return TYPECODE;
}
public IContext getContext() {
return context;
}
public String getDisplayName() {
return DISPLAY_NAME;
}
public String getRecommendedSuffix() {
return RECOMMENDED_SUFFIX;
}
public String toString() {
return new StringBuffer().append("Export service for context :")
.append(context.toString()).append("\n Display name :").append(
DISPLAY_NAME).append("\n Code: ").append(TYPECODE)
.toString();
}
IExportAdapter<IModel> getGenerator() {
generator = new MetabolicSBMLExportAdapter<IModel>();
return generator;
}
}
| false | true | public void exportMap(IMap map, File exportFile)
throws ExportServiceException {
FileOutputStream fos = null;
try {
checkArgs(map, exportFile);
generator = getGenerator();//new MetabolicSBMLExportAdapter<IModel>();
IContextAdapterValidationService validator = serviceProvider
.getValidationService();
validator.setMapToValidate(map);
IModel ndom = null;
if (validator.isReadyToValidate()) {
validator.validateMap();
IValidationReport report =validator.getValidationReport();
if(!report.isMapValid()){
String sb="Map is not valid:\n";
throw new ExportServiceException(sb, report);
}else {
ndom=getModel(validator);
generator.createTarget(ndom);
fos = new FileOutputStream(exportFile);
generator.writeTarget(fos);
}
}
} catch (ExportAdapterCreationException e) {
throw new ExportServiceException(e);
} catch (IOException e) {
throw new ExportServiceException(e);
} finally {
try {
if (fos != null)
fos.close();
} catch (Exception e) {
}
}
}
| public void exportMap(IMap map, File exportFile) throws ExportServiceException {
if(map == null || exportFile == null){
throw new IllegalArgumentException("parameters map or exportFile canot be null");
}
FileOutputStream fos = null;
try {
checkArgs(map, exportFile);
generator = getGenerator();//new MetabolicSBMLExportAdapter<IModel>();
IContextAdapterValidationService validator = serviceProvider
.getValidationService();
validator.setMapToValidate(map);
IModel ndom = null;
if (validator.isReadyToValidate()) {
validator.validateMap();
IValidationReport report =validator.getValidationReport();
if(!report.isMapValid()){
String sb="Map is not valid:\n";
throw new ExportServiceException(sb, report);
}else {
ndom=getModel(validator);
generator.createTarget(ndom);
fos = new FileOutputStream(exportFile);
generator.writeTarget(fos);
}
}
} catch (ExportAdapterCreationException e) {
throw new ExportServiceException(e);
} catch (IOException e) {
throw new ExportServiceException(e);
} catch (UnsatisfiedLinkError e){
throw new ExportServiceException(e);
} catch (RuntimeException e){
throw new ExportServiceException(e);
} finally {
try {
if (fos != null)
fos.close();
} catch (Exception e) {
}
}
}
|
diff --git a/src/core/java/org/wyona/yanel/core/ResourceConfiguration.java b/src/core/java/org/wyona/yanel/core/ResourceConfiguration.java
index e03e2b3bd..20ee83a39 100644
--- a/src/core/java/org/wyona/yanel/core/ResourceConfiguration.java
+++ b/src/core/java/org/wyona/yanel/core/ResourceConfiguration.java
@@ -1,238 +1,238 @@
/*
* Copyright 2007 Wyona
*
* 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.wyona.org/licenses/APACHE-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.wyona.yanel.core;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationUtil;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.log4j.Category;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
/**
* Abstraction of a resource configuration.
*/
public class ResourceConfiguration {
private Category log = Category.getInstance(ResourceConfiguration.class);
//protected Map properties;
protected String name;
protected String namespace;
private String encoding = null;
DefaultConfiguration config;
/**
*
*/
public ResourceConfiguration(InputStream in) throws Exception {
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(true);
config = (DefaultConfiguration) builder.build(in);
Configuration rtiConfig = config.getChild("rti");
name = rtiConfig.getAttribute("name");
namespace = rtiConfig.getAttribute("namespace");
log.debug("Universal Name: " + getUniversalName());
Configuration encodingConfig = config.getChild("encoding", false);
if (encodingConfig != null) encoding = encodingConfig.getValue();
// TODO: Read properties and set this.properties
}
/**
* Create a resource from scratch
* @param name Resource Type Name
* @param namespace Resource Type Namespace
*/
public ResourceConfiguration(String name, String namespace, Map properties) {
this.name = name;
this.namespace = namespace;
if (properties != null) {
String LOCATION = "resource_config_location";
String PREFIX = "yanel";
String RC_NAMESPACE = "http://www.wyona.org/yanel/rti/1.0";
config = new DefaultConfiguration("resource-config", LOCATION, RC_NAMESPACE, PREFIX);
DefaultConfiguration rti = new DefaultConfiguration("rti", LOCATION, RC_NAMESPACE, PREFIX);
rti.setAttribute("name", name);
rti.setAttribute("namespace", namespace);
config.addChild(rti);
java.util.Iterator keyIterator = properties.keySet().iterator();
while (keyIterator.hasNext()) {
DefaultConfiguration property = new DefaultConfiguration("property", LOCATION, RC_NAMESPACE, PREFIX);
String key = (String) keyIterator.next();
property.setAttribute("name", key);
property.setAttribute("value", (String) properties.get(key));
config.addChild(property);
}
}
}
/**
* Get universal name of resource type
*/
public String getUniversalName() {
return "<{" + namespace + "}" + name + "/>";
}
/**
* Get resource type name
*/
public String getName() {
return name;
}
/**
* Get resource type namespace
*/
public String getNamespace() {
return namespace;
}
/**
* Get encoding respectively charset
*/
public String getEncoding() {
return encoding;
}
/**
* @param key
* @return value for this key or null if no value exists for this key.
*/
public String getProperty(String key) throws Exception {
//return (String)properties.get(key);
if (config != null) {
Configuration[] props = config.getChildren("property");
for (int i = 0; i < props.length; i++) {
if (props[i].getAttribute("name") != null && props[i].getAttribute("name").equals(key)) {
return props[i].getAttribute("value");
}
}
}
return null;
}
/**
* @param key
* @return value for this key or null if no value exists for this key.
*/
public String[] getProperties(String key) throws Exception {
ArrayList properties = new ArrayList();
if (config != null) {
Configuration[] props = config.getChildren("property");
for (int i = 0; i < props.length; i++) {
if (props[i].getAttribute("name") != null && props[i].getAttribute("name").equals(key)) {
properties.add(props[i].getAttribute("value"));
}
}
if (properties.size() < 1) return null;
return (String[]) properties.toArray(new String[0]);
}
return null;
}
/**
* Check if property exists
*/
public boolean containsKey(String key) throws Exception {
//return properties.containsKey(key);
if (config != null) {
Configuration[] props = config.getChildren("property");
for (int i = 0; i < props.length; i++) {
if (props[i].getAttribute("name") != null && props[i].getAttribute("name").equals(key)) return true;
}
}
return false;
}
/**
* Get yanel:custom-config. Returns null if resource config does not contain a custom-config element.
*/
public org.w3c.dom.Document getCustomConfiguration() {
Configuration customConfig = config.getChild("custom-config", false);
if (customConfig != null) {
org.w3c.dom.Document doc = null;
javax.xml.parsers.DocumentBuilderFactory dbf= javax.xml.parsers.DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
try {
javax.xml.parsers.DocumentBuilder parser = dbf.newDocumentBuilder();
org.w3c.dom.DOMImplementation impl = parser.getDOMImplementation();
org.w3c.dom.DocumentType doctype = null;
doc = impl.createDocument(customConfig.getNamespace(), customConfig.getName(), doctype);
Configuration[] children = customConfig.getChildren();
if (children.length > 0) {
Element rootElement = doc.getDocumentElement();
for (int i = 0; i < children.length; i++) {
rootElement.appendChild(createElement(children[i], doc));
}
}
} catch(Exception e) {
log.error(e.getMessage(), e);
}
return doc;
// TODO: ConfigurationUtil doesn't seem to work properly
/*
org.w3c.dom.Element element = ConfigurationUtil.toElement(customConfig);
log.error("DEBUG: element: " + element.getLocalName());
org.w3c.dom.Document doc = element.getOwnerDocument();
org.w3c.dom.Element rootElement = doc.getDocumentElement();
rootElement.appendChild(element);
return doc;
*/
} else {
- log.warn("No custom configuration: " + getUniversalName());
+ log.info("No custom configuration: " + getUniversalName());
}
return null;
}
/**
*
*/
private Element createElement(Configuration config, Document doc) throws Exception {
Element element = doc.createElementNS(config.getNamespace(), config.getName());
String[] attrs = config.getAttributeNames();
for (int i = 0; i < attrs.length; i++) {
element.setAttributeNS(config.getNamespace(), attrs[i], config.getAttribute(attrs[i]));
}
// TODO: Does not work for elements with mixed content (text and elements)
try {
element.appendChild(doc.createTextNode(config.getValue()));
} catch(Exception e) {
log.debug("No value: " + element.getLocalName());
}
Configuration[] children = config.getChildren();
if (children.length > 0) {
for (int i = 0; i < children.length; i++) {
element.appendChild(createElement(children[i], doc));
}
}
return element;
}
}
| true | true | public org.w3c.dom.Document getCustomConfiguration() {
Configuration customConfig = config.getChild("custom-config", false);
if (customConfig != null) {
org.w3c.dom.Document doc = null;
javax.xml.parsers.DocumentBuilderFactory dbf= javax.xml.parsers.DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
try {
javax.xml.parsers.DocumentBuilder parser = dbf.newDocumentBuilder();
org.w3c.dom.DOMImplementation impl = parser.getDOMImplementation();
org.w3c.dom.DocumentType doctype = null;
doc = impl.createDocument(customConfig.getNamespace(), customConfig.getName(), doctype);
Configuration[] children = customConfig.getChildren();
if (children.length > 0) {
Element rootElement = doc.getDocumentElement();
for (int i = 0; i < children.length; i++) {
rootElement.appendChild(createElement(children[i], doc));
}
}
} catch(Exception e) {
log.error(e.getMessage(), e);
}
return doc;
// TODO: ConfigurationUtil doesn't seem to work properly
/*
org.w3c.dom.Element element = ConfigurationUtil.toElement(customConfig);
log.error("DEBUG: element: " + element.getLocalName());
org.w3c.dom.Document doc = element.getOwnerDocument();
org.w3c.dom.Element rootElement = doc.getDocumentElement();
rootElement.appendChild(element);
return doc;
*/
} else {
log.warn("No custom configuration: " + getUniversalName());
}
return null;
}
| public org.w3c.dom.Document getCustomConfiguration() {
Configuration customConfig = config.getChild("custom-config", false);
if (customConfig != null) {
org.w3c.dom.Document doc = null;
javax.xml.parsers.DocumentBuilderFactory dbf= javax.xml.parsers.DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
try {
javax.xml.parsers.DocumentBuilder parser = dbf.newDocumentBuilder();
org.w3c.dom.DOMImplementation impl = parser.getDOMImplementation();
org.w3c.dom.DocumentType doctype = null;
doc = impl.createDocument(customConfig.getNamespace(), customConfig.getName(), doctype);
Configuration[] children = customConfig.getChildren();
if (children.length > 0) {
Element rootElement = doc.getDocumentElement();
for (int i = 0; i < children.length; i++) {
rootElement.appendChild(createElement(children[i], doc));
}
}
} catch(Exception e) {
log.error(e.getMessage(), e);
}
return doc;
// TODO: ConfigurationUtil doesn't seem to work properly
/*
org.w3c.dom.Element element = ConfigurationUtil.toElement(customConfig);
log.error("DEBUG: element: " + element.getLocalName());
org.w3c.dom.Document doc = element.getOwnerDocument();
org.w3c.dom.Element rootElement = doc.getDocumentElement();
rootElement.appendChild(element);
return doc;
*/
} else {
log.info("No custom configuration: " + getUniversalName());
}
return null;
}
|
diff --git a/src/TreeWalker.java b/src/TreeWalker.java
index 8b5613e..d33b86d 100644
--- a/src/TreeWalker.java
+++ b/src/TreeWalker.java
@@ -1,156 +1,157 @@
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.RecognitionException;
import org.antlr.runtime.TokenStream;
import org.antlr.runtime.tree.CommonTree;
import java.io.*;
import org.antlr.runtime.*;
public class TreeWalker {
public void printTree(CommonTree t) {
if ( t != null ) {
for ( int i = 0; i < t.getChildCount(); i++ ) {
+ System.out.println("node text:"+t.getText());
switch(t.getType()){
//TODO: Add Code
case TanGParser.ADDSUB:
//print out ruby code to a file
break;
case TanGParser.AND:
break;
case TanGParser.ASSERT:
break;
case TanGParser.ASSN:
break;
case TanGParser.BITAND:
break;
case TanGParser.BITNOT:
break;
case TanGParser.BITOR:
break;
case TanGParser.BITSHIFT:
break;
case TanGParser.BITXOR:
break;
case TanGParser.BOOLAND:
break;
case TanGParser.BOOLOR:
break;
case TanGParser.BREAK:
break;
case TanGParser.BYTE:
break;
case TanGParser.COMMA:
break;
case TanGParser.COMMENT:
break;
case TanGParser.COND:
break;
case TanGParser.CONTINUE:
break;
case TanGParser.DO:
break;
case TanGParser.DOT:
break;
case TanGParser.ELSE:
break;
case TanGParser.END:
break;
case TanGParser.EOF:
break;
case TanGParser.EQTEST:
break;
case TanGParser.ESC_SEQ:
break;
case TanGParser.EXP:
break;
case TanGParser.EXPONENT:
break;
case TanGParser.FATCOMMA:
break;
case TanGParser.FILENAME:
break;
case TanGParser.FLOAT:
break;
case TanGParser.FOR:
break;
case TanGParser.FORK:
break;
case TanGParser.FROM:
break;
case TanGParser.HEX:
break;
case TanGParser.HEX_DIGIT:
break;
case TanGParser.ID:
break;
case TanGParser.IF:
break;
case TanGParser.IMPORT:
break;
case TanGParser.IN:
break;
case TanGParser.INT:
break;
case TanGParser.INTRANGE:
break;
case TanGParser.IS:
break;
case TanGParser.LBRACE:
break;
case TanGParser.LBRACK:
break;
case TanGParser.LOOP:
break;
case TanGParser.LPAREN:
break;
case TanGParser.MAGCOMP:
break;
case TanGParser.MOD:
break;
case TanGParser.MULT:
break;
case TanGParser.NEWLINE:
break;
case TanGParser.NODE:
break;
case TanGParser.NOT:
break;
case TanGParser.OR:
break;
case TanGParser.PIPE:
break;
case TanGParser.RANGE:
break;
case TanGParser.RBRACE:
break;
case TanGParser.RBRACK:
break;
case TanGParser.RETURN:
break;
case TanGParser.RPAREN:
break;
case TanGParser.STAR:
break;
case TanGParser.STRING:
break;
case TanGParser.TF:
break;
case TanGParser.UNLESS:
break;
case TanGParser.UNTIL:
break;
case TanGParser.WHILE:
break;
case TanGParser.WS:
break;
case TanGParser.XOR:
break;
}
printTree((CommonTree)t.getChild(i));
}
}
}
}
| true | true | public void printTree(CommonTree t) {
if ( t != null ) {
for ( int i = 0; i < t.getChildCount(); i++ ) {
switch(t.getType()){
//TODO: Add Code
case TanGParser.ADDSUB:
//print out ruby code to a file
break;
case TanGParser.AND:
break;
case TanGParser.ASSERT:
break;
case TanGParser.ASSN:
break;
case TanGParser.BITAND:
break;
case TanGParser.BITNOT:
break;
case TanGParser.BITOR:
break;
case TanGParser.BITSHIFT:
break;
case TanGParser.BITXOR:
break;
case TanGParser.BOOLAND:
break;
case TanGParser.BOOLOR:
break;
case TanGParser.BREAK:
break;
case TanGParser.BYTE:
break;
case TanGParser.COMMA:
break;
case TanGParser.COMMENT:
break;
case TanGParser.COND:
break;
case TanGParser.CONTINUE:
break;
case TanGParser.DO:
break;
case TanGParser.DOT:
break;
case TanGParser.ELSE:
break;
case TanGParser.END:
break;
case TanGParser.EOF:
break;
case TanGParser.EQTEST:
break;
case TanGParser.ESC_SEQ:
break;
case TanGParser.EXP:
break;
case TanGParser.EXPONENT:
break;
case TanGParser.FATCOMMA:
break;
case TanGParser.FILENAME:
break;
case TanGParser.FLOAT:
break;
case TanGParser.FOR:
break;
case TanGParser.FORK:
break;
case TanGParser.FROM:
break;
case TanGParser.HEX:
break;
case TanGParser.HEX_DIGIT:
break;
case TanGParser.ID:
break;
case TanGParser.IF:
break;
case TanGParser.IMPORT:
break;
case TanGParser.IN:
break;
case TanGParser.INT:
break;
case TanGParser.INTRANGE:
break;
case TanGParser.IS:
break;
case TanGParser.LBRACE:
break;
case TanGParser.LBRACK:
break;
case TanGParser.LOOP:
break;
case TanGParser.LPAREN:
break;
case TanGParser.MAGCOMP:
break;
case TanGParser.MOD:
break;
case TanGParser.MULT:
break;
case TanGParser.NEWLINE:
break;
case TanGParser.NODE:
break;
case TanGParser.NOT:
break;
case TanGParser.OR:
break;
case TanGParser.PIPE:
break;
case TanGParser.RANGE:
break;
case TanGParser.RBRACE:
break;
case TanGParser.RBRACK:
break;
case TanGParser.RETURN:
break;
case TanGParser.RPAREN:
break;
case TanGParser.STAR:
break;
case TanGParser.STRING:
break;
case TanGParser.TF:
break;
case TanGParser.UNLESS:
break;
case TanGParser.UNTIL:
break;
case TanGParser.WHILE:
break;
case TanGParser.WS:
break;
case TanGParser.XOR:
break;
}
printTree((CommonTree)t.getChild(i));
}
}
}
| public void printTree(CommonTree t) {
if ( t != null ) {
for ( int i = 0; i < t.getChildCount(); i++ ) {
System.out.println("node text:"+t.getText());
switch(t.getType()){
//TODO: Add Code
case TanGParser.ADDSUB:
//print out ruby code to a file
break;
case TanGParser.AND:
break;
case TanGParser.ASSERT:
break;
case TanGParser.ASSN:
break;
case TanGParser.BITAND:
break;
case TanGParser.BITNOT:
break;
case TanGParser.BITOR:
break;
case TanGParser.BITSHIFT:
break;
case TanGParser.BITXOR:
break;
case TanGParser.BOOLAND:
break;
case TanGParser.BOOLOR:
break;
case TanGParser.BREAK:
break;
case TanGParser.BYTE:
break;
case TanGParser.COMMA:
break;
case TanGParser.COMMENT:
break;
case TanGParser.COND:
break;
case TanGParser.CONTINUE:
break;
case TanGParser.DO:
break;
case TanGParser.DOT:
break;
case TanGParser.ELSE:
break;
case TanGParser.END:
break;
case TanGParser.EOF:
break;
case TanGParser.EQTEST:
break;
case TanGParser.ESC_SEQ:
break;
case TanGParser.EXP:
break;
case TanGParser.EXPONENT:
break;
case TanGParser.FATCOMMA:
break;
case TanGParser.FILENAME:
break;
case TanGParser.FLOAT:
break;
case TanGParser.FOR:
break;
case TanGParser.FORK:
break;
case TanGParser.FROM:
break;
case TanGParser.HEX:
break;
case TanGParser.HEX_DIGIT:
break;
case TanGParser.ID:
break;
case TanGParser.IF:
break;
case TanGParser.IMPORT:
break;
case TanGParser.IN:
break;
case TanGParser.INT:
break;
case TanGParser.INTRANGE:
break;
case TanGParser.IS:
break;
case TanGParser.LBRACE:
break;
case TanGParser.LBRACK:
break;
case TanGParser.LOOP:
break;
case TanGParser.LPAREN:
break;
case TanGParser.MAGCOMP:
break;
case TanGParser.MOD:
break;
case TanGParser.MULT:
break;
case TanGParser.NEWLINE:
break;
case TanGParser.NODE:
break;
case TanGParser.NOT:
break;
case TanGParser.OR:
break;
case TanGParser.PIPE:
break;
case TanGParser.RANGE:
break;
case TanGParser.RBRACE:
break;
case TanGParser.RBRACK:
break;
case TanGParser.RETURN:
break;
case TanGParser.RPAREN:
break;
case TanGParser.STAR:
break;
case TanGParser.STRING:
break;
case TanGParser.TF:
break;
case TanGParser.UNLESS:
break;
case TanGParser.UNTIL:
break;
case TanGParser.WHILE:
break;
case TanGParser.WS:
break;
case TanGParser.XOR:
break;
}
printTree((CommonTree)t.getChild(i));
}
}
}
|
diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/helpers/PackageExplorerView.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/helpers/PackageExplorerView.java
index 49549c9..70619fe 100644
--- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/helpers/PackageExplorerView.java
+++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/helpers/PackageExplorerView.java
@@ -1,79 +1,79 @@
/*******************************************************************************
* Copyright (c) 2008 Ketan Padegaonkar and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Ketan Padegaonkar - initial API and implementation
*******************************************************************************/
package org.eclipse.swtbot.eclipse.finder.widgets.helpers;
import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swtbot.eclipse.finder.SWTEclipseBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.waits.Conditions;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
/**
* Screen object that represents the operations that can be performed on the package explorer view.
*
* @author Ketan Padegaonkar <KetanPadegaonkar [at] gmail [dot] com>
* @version $Id$
*/
public class PackageExplorerView {
private SWTEclipseBot bot = new SWTEclipseBot();
public void deleteProject(String projectName) throws Exception {
SWTBotTree tree = tree();
tree.setFocus();
tree.select(projectName);
bot.menu("Edit").menu("Delete").click();
String version = (String) Platform.getBundle("org.eclipse.core.runtime").getHeaders().get("Bundle-Version");
if (version.startsWith("3.3")) {
SWTBotShell shell = bot.shell("Confirm Project Delete");
shell.activate();
Button button = (Button) bot.widget(widgetOfType(Button.class), shell.widget);
new SWTBotRadio(button).click();
bot.button("Yes").click();
bot.waitUntil(Conditions.shellCloses(shell));
}
- if (version.startsWith("3.4")) {
+ if (version.startsWith("3.4") || version.startsWith("3.5")) {
SWTBotShell shell = bot.shell("Delete Resources");
shell.activate();
Button button = (Button) bot.widget(widgetOfType(Button.class), shell.widget);
new SWTBotCheckBox(button).select();
bot.button("OK").click();
bot.waitUntil(Conditions.shellCloses(shell));
}
}
/**
* @return
* @throws WidgetNotFoundException
*/
private SWTBotTree tree() throws WidgetNotFoundException {
SWTBotView view = view();
SWTBotTree tree = new SWTBotTree((Tree) bot.widget(widgetOfType(Tree.class), view.getWidget()));
return tree;
}
/**
* @return
* @throws WidgetNotFoundException
*/
private SWTBotView view() throws WidgetNotFoundException {
return bot.view("Package Explorer");
}
}
| true | true | public void deleteProject(String projectName) throws Exception {
SWTBotTree tree = tree();
tree.setFocus();
tree.select(projectName);
bot.menu("Edit").menu("Delete").click();
String version = (String) Platform.getBundle("org.eclipse.core.runtime").getHeaders().get("Bundle-Version");
if (version.startsWith("3.3")) {
SWTBotShell shell = bot.shell("Confirm Project Delete");
shell.activate();
Button button = (Button) bot.widget(widgetOfType(Button.class), shell.widget);
new SWTBotRadio(button).click();
bot.button("Yes").click();
bot.waitUntil(Conditions.shellCloses(shell));
}
if (version.startsWith("3.4")) {
SWTBotShell shell = bot.shell("Delete Resources");
shell.activate();
Button button = (Button) bot.widget(widgetOfType(Button.class), shell.widget);
new SWTBotCheckBox(button).select();
bot.button("OK").click();
bot.waitUntil(Conditions.shellCloses(shell));
}
}
| public void deleteProject(String projectName) throws Exception {
SWTBotTree tree = tree();
tree.setFocus();
tree.select(projectName);
bot.menu("Edit").menu("Delete").click();
String version = (String) Platform.getBundle("org.eclipse.core.runtime").getHeaders().get("Bundle-Version");
if (version.startsWith("3.3")) {
SWTBotShell shell = bot.shell("Confirm Project Delete");
shell.activate();
Button button = (Button) bot.widget(widgetOfType(Button.class), shell.widget);
new SWTBotRadio(button).click();
bot.button("Yes").click();
bot.waitUntil(Conditions.shellCloses(shell));
}
if (version.startsWith("3.4") || version.startsWith("3.5")) {
SWTBotShell shell = bot.shell("Delete Resources");
shell.activate();
Button button = (Button) bot.widget(widgetOfType(Button.class), shell.widget);
new SWTBotCheckBox(button).select();
bot.button("OK").click();
bot.waitUntil(Conditions.shellCloses(shell));
}
}
|
diff --git a/src/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java b/src/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
index 4ae1d9cde..3c194f512 100755
--- a/src/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
+++ b/src/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
@@ -1,1684 +1,1686 @@
/*
* Copyright (c) 2003, 2004 The Regents of the University of Michigan, Trustees of Indiana University,
* Board of Trustees of the Leland Stanford, Jr., University, and The MIT Corporation
*
* Licensed under the Educational Community License Version 1.0 (the "License");
* By obtaining, using and/or copying this Original Work, you agree that you have read,
* understand, and will comply with the terms and conditions of the Educational Community License.
* You may obtain a copy of the License at:
*
* http://cvs.sakaiproject.org/licenses/license_1_0.html
*
* 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.
*/
/*
* Created on Aug 6, 2003
*
*/
package org.sakaiproject.tool.assessment.ui.bean.delivery;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import javax.faces.context.FacesContext;
import org.sakaiproject.tool.assessment.data.dao.assessment.AssessmentAccessControl;
import org.sakaiproject.tool.assessment.data.dao.grading.AssessmentGradingData;
import org.sakaiproject.tool.assessment.data.dao.grading.ItemGradingData;
import org.sakaiproject.tool.assessment.data.dao.grading.MediaData;
import org.sakaiproject.tool.assessment.data.dao.assessment.PublishedSecuredIPAddress;
import org.sakaiproject.tool.assessment.data.ifc.grading.MediaIfc;
import org.sakaiproject.tool.assessment.ui.bean.util.Validator;
import org.sakaiproject.tool.assessment.ui.listener.delivery.DeliveryActionListener;
import org.sakaiproject.tool.assessment.ui.listener.delivery.SubmitToGradingActionListener;
import org.sakaiproject.tool.assessment.ui.listener.delivery.UpdateTimerListener;
import org.sakaiproject.tool.assessment.ui.listener.select.SelectActionListener;
import java.io.FileInputStream;
import java.io.File;
import java.io.*;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import org.sakaiproject.tool.assessment.facade.AgentFacade;
import org.sakaiproject.tool.assessment.facade.PublishedAssessmentFacade;
import org.sakaiproject.tool.assessment.services.assessment.PublishedAssessmentService;
import org.sakaiproject.tool.assessment.services.GradingService;
import org.sakaiproject.tool.assessment.data.dao.assessment.PublishedItemData;
import org.sakaiproject.tool.assessment.data.dao.assessment.PublishedItemText;
import org.sakaiproject.tool.assessment.data.ifc.assessment.AssessmentAccessControlIfc;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.sakaiproject.tool.assessment.util.MimeTypesLocator;
/**
*
* @author casong To change the template for this generated type comment go to
* $Id$
*
* Used to be org.navigoproject.ui.web.asi.delivery.XmlDeliveryForm.java
*/
public class DeliveryBean
implements Serializable
{
private static Log log = LogFactory.getLog(DeliveryBean.class);
private String assessmentId;
private String assessmentTitle;
private ArrayList markedForReview;
private ArrayList blankItems;
private ArrayList markedForReviewIdents;
private ArrayList blankItemIdents;
private boolean reviewMarked;
private boolean reviewAll;
private boolean reviewBlank;
private int itemIndex;
private int size;
private String action;
private Date beginTime;
private String endTime;
private String currentTime;
private String multipleAttempts;
private String timeOutSubmission;
private String submissionTicket;
private String timeElapse;
private String username;
private int sectionIndex;
private boolean previous;
private String duration;
private String url;
private String confirmation;
private String outcome;
//Settings
private String questionLayout;
private String navigation;
private String numbering;
private String feedback;
private String noFeedback;
private String statistics;
private String creatorName;
private FeedbackComponent feedbackComponent;
private String errorMessage;
private SettingsDeliveryBean settings;
private java.util.Date dueDate;
private boolean statsAvailable;
private boolean submitted;
private boolean graded;
private String graderComment;
private String rawScore;
private String grade;
private java.util.Date submissionDate;
private java.util.Date submissionTime;
private String image;
private boolean hasImage;
private String instructorMessage;
private String courseName;
private String timeLimit;
private int timeLimit_hour;
private int timeLimit_minute;
private ContentsDeliveryBean tableOfContents;
private String previewMode;
private String previewAssessment;
private String notPublished;
private String submissionId;
private String submissionMessage;
private String instructorName;
private ContentsDeliveryBean pageContents;
private int submissionsRemaining;
private boolean forGrade;
private String password;
// For paging
private int partIndex;
private int questionIndex;
private boolean next_page;
private boolean reload = true;
// daisy added these for SelectActionListener
private boolean notTakeable = true;
private boolean pastDue;
private long subTime;
private long raw;
private String takenHours;
private String takenMinutes;
private AssessmentGradingData adata;
private PublishedAssessmentFacade publishedAssessment;
private java.util.Date feedbackDate;
private String showScore;
private boolean hasTimeLimit;
// daisyf added for servlet Login.java, to support anonymous login with
// publishedUrl
private boolean anonymousLogin = false;
private boolean accessViaUrl = false;
private String contextPath;
/** Use serialVersionUID for interoperability. */
private final static long serialVersionUID = -1090852048737428722L;
private boolean showStudentScore;
// lydial added for allowing studentScore view for random draw parts
private boolean forGrading; // to reuse deliveryActionListener for grading pages
// SAM-387
// esmiley added to track if timer has been started in timed assessments
private boolean timeRunning;
/**
* Creates a new DeliveryBean object.
*/
public DeliveryBean()
{
}
/**
*
*
* @return
*/
public int getItemIndex()
{
return this.itemIndex;
}
/**
*
*
* @param itemIndex
*/
public void setItemIndex(int itemIndex)
{
this.itemIndex = itemIndex;
}
/**
*
*
* @return
*/
public int getSize()
{
return this.size;
}
/**
*
*
* @param size
*/
public void setSize(int size)
{
this.size = size;
}
/**
*
*
* @return
*/
public String getAssessmentId()
{
return assessmentId;
}
/**
*
*
* @param assessmentId
*/
public void setAssessmentId(String assessmentId)
{
this.assessmentId = assessmentId;
}
/**
*
*
* @return
*/
public ArrayList getMarkedForReview()
{
return markedForReview;
}
/**
*
*
* @param markedForReview
*/
public void setMarkedForReview(ArrayList markedForReview)
{
this.markedForReview = markedForReview;
}
/**
*
*
* @return
*/
public boolean getReviewMarked()
{
return this.reviewMarked;
}
/**
*
*
* @param reviewMarked
*/
public void setReviewMarked(boolean reviewMarked)
{
this.reviewMarked = reviewMarked;
}
/**
*
*
* @return
*/
public boolean getReviewAll()
{
return this.reviewAll;
}
/**
*
*
* @param reviewAll
*/
public void setReviewAll(boolean reviewAll)
{
this.reviewAll = reviewAll;
}
/**
*
*
* @return
*/
public String getAction()
{
return this.action;
}
/**
*
*
* @param action
*/
public void setAction(String action)
{
this.action = action;
}
/**
*
*
* @return
*/
public Date getBeginTime()
{
return beginTime;
}
/**
*
*
* @param beginTime
*/
public void setBeginTime(Date beginTime)
{
this.beginTime = beginTime;
}
/**
*
*
* @return
*/
public String getEndTime()
{
return endTime;
}
/**
*
*
* @param endTime
*/
public void setEndTime(String endTime)
{
this.endTime = endTime;
}
/**
*
*
* @return
*/
public String getCurrentTime()
{
return this.currentTime;
}
/**
*
*
* @param currentTime
*/
public void setCurrentTime(String currentTime)
{
this.currentTime = currentTime;
}
/**
*
*
* @return
*/
public String getMultipleAttempts()
{
return this.multipleAttempts;
}
/**
*
*
* @param multipleAttempts
*/
public void setMultipleAttempts(String multipleAttempts)
{
this.multipleAttempts = multipleAttempts;
}
/**
*
*
* @return
*/
public String getTimeOutSubmission()
{
return this.timeOutSubmission;
}
/**
*
*
* @param timeOutSubmission
*/
public void setTimeOutSubmission(String timeOutSubmission)
{
this.timeOutSubmission = timeOutSubmission;
}
/**
*
*
* @return
*/
public java.util.Date getSubmissionTime()
{
return submissionTime;
}
/**
*
*
* @param submissionTime
*/
public void setSubmissionTime(java.util.Date submissionTime)
{
this.submissionTime = submissionTime;
}
/**
*
*
* @return
*/
public String getTimeElapse()
{
return timeElapse;
}
/**
*
*
* @param timeElapse
*/
public void setTimeElapse(String timeElapse)
{
this.timeElapse = timeElapse;
}
/**
*
*
* @return
*/
public String getSubmissionTicket()
{
return submissionTicket;
}
/**
*
*
* @param submissionTicket
*/
public void setSubmissionTicket(String submissionTicket)
{
this.submissionTicket = submissionTicket;
}
/**
*
*
* @return
*/
public int getDisplayIndex()
{
return this.itemIndex + 1;
}
/**
*
*
* @return
*/
public String getUsername()
{
return username;
}
/**
*
*
* @param username
*/
public void setUsername(String username)
{
this.username = username;
}
/**
*
*
* @return
*/
public String getAssessmentTitle()
{
return assessmentTitle;
}
/**
*
*
* @param assessmentTitle
*/
public void setAssessmentTitle(String assessmentTitle)
{
this.assessmentTitle = assessmentTitle;
}
/**
*
*
* @return
*/
public ArrayList getBlankItems()
{
return this.blankItems;
}
/**
*
*
* @param blankItems
*/
public void setBlankItems(ArrayList blankItems)
{
this.blankItems = blankItems;
}
/**
*
*
* @return
*/
public boolean getReviewBlank()
{
return reviewBlank;
}
/**
*
*
* @param reviewBlank
*/
public void setReviewBlank(boolean reviewBlank)
{
this.reviewBlank = reviewBlank;
}
/**
*
*
* @return
*/
public ArrayList getMarkedForReviewIdents()
{
return markedForReviewIdents;
}
/**
*
*
* @param markedForReviewIdents
*/
public void setMarkedForReviewIdents(ArrayList markedForReviewIdents)
{
this.markedForReviewIdents = markedForReviewIdents;
}
/**
*
*
* @return
*/
public ArrayList getBlankItemIdents()
{
return blankItemIdents;
}
/**
*
*
* @param blankItemIdents
*/
public void setBlankItemIdents(ArrayList blankItemIdents)
{
this.blankItemIdents = blankItemIdents;
}
/**
*
*
* @return
*/
public int getSectionIndex()
{
return this.sectionIndex;
}
/**
*
*
* @param sectionIndex
*/
public void setSectionIndex(int sectionIndex)
{
this.sectionIndex = sectionIndex;
}
/**
*
*
* @return
*/
public boolean getPrevious()
{
return previous;
}
/**
*
*
* @param previous
*/
public void setPrevious(boolean previous)
{
this.previous = previous;
}
//Settings
public String getQuestionLayout()
{
return questionLayout;
}
/**
*
*
* @param questionLayout
*/
public void setQuestionLayout(String questionLayout)
{
this.questionLayout = questionLayout;
}
/**
*
*
* @return
*/
public String getNavigation()
{
return navigation;
}
/**
*
*
* @param navigation
*/
public void setNavigation(String navigation)
{
this.navigation = navigation;
}
/**
*
*
* @return
*/
public String getNumbering()
{
return numbering;
}
/**
*
*
* @param numbering
*/
public void setNumbering(String numbering)
{
this.numbering = numbering;
}
/**
*
*
* @return
*/
public String getFeedback()
{
return feedback;
}
/**
*
*
* @param feedback
*/
public void setFeedback(String feedback)
{
this.feedback = feedback;
}
/**
*
*
* @return
*/
public String getNoFeedback()
{
return noFeedback;
}
/**
*
*
* @param noFeedback
*/
public void setNoFeedback(String noFeedback)
{
this.noFeedback = noFeedback;
}
/**
*
*
* @return
*/
public String getStatistics()
{
return statistics;
}
/**
*
*
* @param statistics
*/
public void setStatistics(String statistics)
{
this.statistics = statistics;
}
/**
*
*
* @return
*/
public FeedbackComponent getFeedbackComponent()
{
return feedbackComponent;
}
/**
*
*
* @param feedbackComponent
*/
public void setFeedbackComponent(FeedbackComponent feedbackComponent)
{
this.feedbackComponent = feedbackComponent;
}
/**
* Types of feedback in FeedbackComponent:
*
* SHOW CORRECT SCORE
* SHOW STUDENT SCORE
* SHOW ITEM LEVEL
* SHOW SECTION LEVEL
* SHOW GRADER COMMENT
* SHOW STATS
* SHOW QUESTION
* SHOW RESPONSE
**/
/**
* @return
*/
public SettingsDeliveryBean getSettings()
{
return settings;
}
/**
* @param bean
*/
public void setSettings(SettingsDeliveryBean settings)
{
this.settings = settings;
}
/**
* @return
*/
public String getErrorMessage()
{
return errorMessage;
}
/**
* @param string
*/
public void setErrorMessage(String string)
{
errorMessage = string;
}
/**
* @return
*/
public String getDuration()
{
return duration;
}
/**
* @param string
*/
public void setDuration(String string)
{
duration = string;
}
/**
* @return
*/
public String getCreatorName()
{
return creatorName;
}
/**
* @param string
*/
public void setCreatorName(String string)
{
creatorName = string;
}
public java.util.Date getDueDate()
{
return dueDate;
}
public void setDueDate(java.util.Date dueDate)
{
this.dueDate = dueDate;
}
public boolean isStatsAvailable() {
return statsAvailable;
}
public void setStatsAvailable(boolean statsAvailable) {
this.statsAvailable = statsAvailable;
}
public boolean isSubmitted() {
return submitted;
}
public void setSubmitted(boolean submitted) {
this.submitted = submitted;
}
public boolean isGraded() {
return graded;
}
public void setGraded(boolean graded) {
this.graded = graded;
}
public String getGraderComment() {
if (graderComment == null)
return "";
return graderComment;
}
public void setGraderComment(String newComment)
{
graderComment = newComment;
}
public String getRawScore() {
return rawScore;
}
public void setRawScore(String rawScore) {
this.rawScore = rawScore;
}
public long getRaw() {
return raw;
}
public void setRaw(long raw) {
this.raw = raw;
}
public String getGrade() {
return grade;
}
public void setGrade(String grade) {
this.grade = grade;
}
public java.util.Date getSubmissionDate() {
return submissionDate;
}
public void setSubmissionDate(java.util.Date submissionDate) {
this.submissionDate = submissionDate;
}
public String getImage() {
return image;
}
public void setImage(String image) {
this.image = image;
}
public boolean isHasImage() {
return hasImage;
}
public void setHasImage(boolean hasImage) {
this.hasImage = hasImage;
}
public String getInstructorMessage() {
return instructorMessage;
}
public void setInstructorMessage(String instructorMessage) {
this.instructorMessage = instructorMessage;
}
public String getCourseName() {
return courseName;
}
public void setCourseName(String courseName) {
this.courseName = courseName;
}
public String getTimeLimit() {
return timeLimit;
}
public void setTimeLimit(String timeLimit) {
this.timeLimit = timeLimit;
}
public int getTimeLimit_hour() {
return timeLimit_hour;
}
public void setTimeLimit_hour(int timeLimit_hour) {
this.timeLimit_hour = timeLimit_hour;
}
public int getTimeLimit_minute() {
return timeLimit_minute;
}
public void setTimeLimit_minute(int timeLimit_minute) {
this.timeLimit_minute = timeLimit_minute;
}
/**
* Bean with table of contents information and
* a list of all the sections in the assessment
* which in turn has a list of all the item contents.
* @return table of contents
*/
public ContentsDeliveryBean getTableOfContents() {
return tableOfContents;
}
/**
* Bean with table of contents information and
* a list of all the sections in the assessment
* which in turn has a list of all the item contents.
* @param tableOfContents table of contents
*/
public void setTableOfContents(ContentsDeliveryBean tableOfContents) {
this.tableOfContents = tableOfContents;
}
/**
* Bean with a list of all the sections in the current page
* which in turn has a list of all the item contents for the page.
*
* This is like the table of contents, but the selections are restricted to
* that on one page.
*
* Since these properties are on a page delivery basis--if:
* 1. there is only one item per page the list of items will
* contain one item and the list of parts will return one part, or if--
*
* 2. there is one part per page the list of items will be that
* for that part only and there will only be one part, however--
*
* 3. if it is all parts and items on a single page there
* will be a list of all parts and items.
*
* @return ContentsDeliveryBean
*/
public ContentsDeliveryBean getPageContents() {
return pageContents;
}
/**
* Bean with a list of all the sections in the current page
* which in turn has a list of all the item contents for the page.
*
* Since these properties are on a page delivery basis--if:
* 1. there is only one item per page the list of items will
* contain one item and the list of parts will return one part, or if--
*
* 2. there is one part per page the list of items will be that
* for that part only and there will only be one part, however--
*
* 3. if it is all parts and items on a single page there
* will be a list of all parts and items.
*
* @param pageContents ContentsDeliveryBean
*/
public void setPageContents(ContentsDeliveryBean pageContents) {
this.pageContents = pageContents;
}
/**
* track whether delivery is "live" with update of database allowed and
* whether the Ui components are disabled.
* @return true if preview only
*/
public String getPreviewMode() {
return Validator.check(previewMode, "false");
}
/**
* track whether delivery is "live" with update of database allowed and
* whether the UI components are disabled.
* @param previewMode true if preview only
*/
public void setPreviewMode(boolean previewMode) {
this.previewMode = new Boolean(previewMode).toString();
}
public String getPreviewAssessment() {
return previewAssessment;
}
public void setPreviewAssessment(String previewAssessment) {
this.previewAssessment = previewAssessment;
}
public String getNotPublished() {
return notPublished;
}
public void setNotPublished(String notPublished) {
this.notPublished = notPublished;
}
public String getSubmissionId() {
return submissionId;
}
public void setSubmissionId(String submissionId) {
this.submissionId = submissionId;
}
public String getSubmissionMessage() {
return submissionMessage;
}
public void setSubmissionMessage(String submissionMessage) {
this.submissionMessage = submissionMessage;
}
public int getSubmissionsRemaining() {
return submissionsRemaining;
}
public void setSubmissionsRemaining(int submissionsRemaining) {
this.submissionsRemaining = submissionsRemaining;
}
public String getInstructorName() {
return instructorName;
}
public void setInstructorName(String instructorName) {
this.instructorName = instructorName;
}
public boolean getForGrade() {
return forGrade;
}
public void setForGrade(boolean newfor) {
forGrade = newfor;
}
public String submitForGrade()
{
forGrade = true;
SubmitToGradingActionListener listener =
new SubmitToGradingActionListener();
listener.processAction(null);
forGrade = false;
SelectActionListener l2 = new SelectActionListener();
l2.processAction(null);
reload = true;
if (getAccessViaUrl()) // this is for accessing via published url
return "anonymousThankYou";
else
return "submitAssessment";
}
public String saveAndExit()
{
FacesContext context = FacesContext.getCurrentInstance();
System.out.println("***DeliverBean.saveAndEXit face context ="+context);
// If this was automatically triggered by running out of time,
// check for autosubmit, and do it if so.
if (timeOutSubmission != null && timeOutSubmission.equals("true"))
{
if (getSettings().getAutoSubmit())
{
submitForGrade();
return "timeout";
}
}
forGrade = false;
SubmitToGradingActionListener listener =
new SubmitToGradingActionListener();
listener.processAction(null);
SelectActionListener l2 = new SelectActionListener();
l2.processAction(null);
reload = true;
if (timeOutSubmission != null && timeOutSubmission.equals("true"))
{
return "timeout";
}
if (getAccessViaUrl()){ // if this is access via url, display quit message
System.out.println("**anonymous login, go to quit");
return "anonymousQuit";
}
else{
System.out.println("**NOT anonymous login, go to select");
return "select";
}
}
public String next_page()
{
if (getSettings().isFormatByPart())
partIndex++;
if (getSettings().isFormatByQuestion())
questionIndex++;
forGrade = false;
if (!("true").equals(previewAssessment))
{
SubmitToGradingActionListener listener =
new SubmitToGradingActionListener();
listener.processAction(null);
}
DeliveryActionListener l2 = new DeliveryActionListener();
l2.processAction(null);
reload = false;
return "takeAssessment";
}
public String previous()
{
if (getSettings().isFormatByPart())
partIndex--;
if (getSettings().isFormatByQuestion())
questionIndex--;
forGrade = false;
if (!("true").equals(previewAssessment))
{
SubmitToGradingActionListener listener =
new SubmitToGradingActionListener();
listener.processAction(null);
}
DeliveryActionListener l2 = new DeliveryActionListener();
l2.processAction(null);
reload = false;
return "takeAssessment";
}
// this is the PublishedAccessControl.finalPageUrl
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url= url;
}
public String getConfirmation() {
return confirmation;
}
public void setConfirmation(String confirmation) {
this.confirmation= confirmation;
}
/**
* if required, assessment password
* @return password
*/
public String getPassword()
{
return password;
}
/**
* if required, assessment password
* @param string assessment password
*/
public void setPassword(String string)
{
password = string;
}
public String validatePassword() {
log.debug("**** username="+username);
log.debug("**** password="+password);
log.debug("**** setting username="+getSettings().getUsername());
log.debug("**** setting password="+getSettings().getPassword());
if (password == null || username == null)
return "passwordAccessError";
if (password.equals(getSettings().getPassword()) &&
username.equals(getSettings().getUsername()))
{
if (getNavigation().equals
(AssessmentAccessControl.RANDOM_ACCESS.toString()))
return "tableOfContents";
else
return "takeAssessment";
}
else
return "passwordAccessError";
}
public String validateIP() {
String thisIp = ((javax.servlet.http.HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest()).getRemoteAddr();
Iterator addresses = getSettings().getIpAddresses().iterator();
while (addresses.hasNext())
{
String next = ((PublishedSecuredIPAddress) addresses.next()).
getIpAddress();
if (next != null && next.indexOf("*") > -1)
next = next.substring(0, next.indexOf("*"));
if (next == null || next.trim().equals("") ||
thisIp.trim().startsWith(next.trim()))
{
if (getNavigation().equals
(AssessmentAccessControl.RANDOM_ACCESS.toString()))
return "tableOfContents";
else
return "takeAssessment";
}
}
return "ipAccessError";
}
public String validate() {
try {
String results = "";
if (!getSettings().getUsername().equals(""))
results = validatePassword();
if (!results.equals("passwordAccessError") &&
getSettings().getIpAddresses() != null &&
!getSettings().getIpAddresses().isEmpty())
results = validateIP();
if (results.equals(""))
{
if (getNavigation().equals
(AssessmentAccessControl.RANDOM_ACCESS.toString()))
return "tableOfContents";
else
return "takeAssessment";
}
return results;
} catch (Exception e) {
e.printStackTrace();
return "accessError";
}
}
// Skipped paging methods
public int getPartIndex()
{
return partIndex;
}
public void setPartIndex(int newindex)
{
partIndex = newindex;
}
public int getQuestionIndex()
{
return questionIndex;
}
public void setQuestionIndex(int newindex)
{
questionIndex = newindex;
}
public boolean getContinue()
{
return next_page;
}
public void setContinue(boolean docontinue)
{
next_page = docontinue;
}
public boolean getReload()
{
return reload;
}
public void setReload(boolean doreload)
{
reload = doreload;
}
// Store for paging
public AssessmentGradingData getAssessmentGrading()
{
return adata;
}
public void setAssessmentGrading(AssessmentGradingData newdata)
{
adata = newdata;
}
private byte[] getMediaStream(String mediaLocation){
FileInputStream mediaStream=null;
FileInputStream mediaStream2=null;
byte[] mediaByte = new byte[0];
try {
int i = 0;
int size = 0;
mediaStream = new FileInputStream(mediaLocation);
if (mediaStream != null){
while((i = mediaStream.read()) != -1){
size++;
}
}
mediaStream2 = new FileInputStream(mediaLocation);
mediaByte = new byte[size];
mediaStream2.read(mediaByte, 0, size);
FileOutputStream out = new FileOutputStream("/tmp/test.txt");
out.write(mediaByte);
}
catch (FileNotFoundException ex) {
log.debug("file not found="+ex.getMessage());
}
catch (IOException ex) {
log.debug("io exception="+ex.getMessage());
}
finally{
try {
mediaStream.close();
}
catch (IOException ex1) {
}
}
return mediaByte;
}
/**
* This method is used by jsf/delivery/deliveryFileUpload.jsp
* <corejsf:upload
* target="/jsf/upload_tmp/assessment#{delivery.assessmentId}/
* question#{question.itemData.itemId}/admin"
* valueChangeListener="#{delivery.addMediaToItemGrading}" />
*/
public String addMediaToItemGrading(javax.faces.event.ValueChangeEvent e)
{
GradingService gradingService = new GradingService();
PublishedAssessmentService publishedService = new PublishedAssessmentService();
PublishedAssessmentFacade publishedAssessment = publishedService.getPublishedAssessment(assessmentId);
String agent = AgentFacade.getAgentString();
if (publishedAssessment.getAssessmentAccessControl().getReleaseTo().indexOf("Anonymous Users") > -1)
agent = AgentFacade.getAnonymousId();
// 1. create assessmentGrading if it is null
if (this.adata == null)
{
adata = new AssessmentGradingData();
adata.setAgentId(agent);
adata.setPublishedAssessment(publishedAssessment.getData());
log.debug("***1a. addMediaToItemGrading, getForGrade()="+getForGrade());
adata.setForGrade(new Boolean(getForGrade()));
adata.setAttemptDate(getBeginTime());
gradingService.saveOrUpdateAssessmentGrading(adata);
}
log.debug("***1b. addMediaToItemGrading, adata="+adata);
// 2. format of the media location is: assessmentXXX/questionXXX/agentId/myfile
String mediaLocation = (String) e.getNewValue();
log.debug("***2a. addMediaToItemGrading, new value ="+mediaLocation);
File media = new File(mediaLocation);
byte[] mediaByte = getMediaStream(mediaLocation);
// 3. get the questionId (which is the PublishedItemData.itemId)
int assessmentIndex = mediaLocation.lastIndexOf("assessment");
int questionIndex = mediaLocation.lastIndexOf("question");
int agentIndex = mediaLocation.indexOf("/", questionIndex+8);
String pubAssessmentId = mediaLocation.substring(assessmentIndex+10,questionIndex-1);
String questionId = mediaLocation.substring(questionIndex+8,agentIndex);
log.debug("***3a. addMediaToItemGrading, questionId ="+questionId);
log.debug("***3b. addMediaToItemGrading, assessmentId ="+assessmentId);
// 4. prepare itemGradingData and attach it to assessmentGarding
PublishedItemData item = publishedService.loadPublishedItem(questionId);
log.debug("***4a. addMediaToItemGrading, item ="+item);
log.debug("***4b. addMediaToItemGrading, itemTextArray ="+item.getItemTextArray());
log.debug("***4c. addMediaToItemGrading, itemText(0) ="+item.getItemTextArray().get(0));
// there is only one text in audio question
PublishedItemText itemText = (PublishedItemText) item.getItemTextArraySorted().get(0);
ItemGradingData itemGradingData = getItemGradingData(questionId);
if (itemGradingData == null){
itemGradingData = new ItemGradingData();
itemGradingData.setAssessmentGrading(adata);
itemGradingData.setPublishedItem(item);
itemGradingData.setPublishedItemText(itemText);
itemGradingData.setSubmittedDate(new Date());
itemGradingData.setAgentId(agent);
itemGradingData.setOverrideScore(new Float(0));
}
setAssessmentGrading(adata);
// 5. save AssessmentGardingData with ItemGardingData
Set itemDataSet = adata.getItemGradingSet();
log.debug("***5a. addMediaToItemGrading, itemDataSet="+itemDataSet);
if (itemDataSet == null)
itemDataSet = new HashSet();
itemDataSet.add(itemGradingData);
adata.setItemGradingSet(itemDataSet);
gradingService.saveOrUpdateAssessmentGrading(adata);
log.debug("***5b. addMediaToItemGrading, saved="+adata);
// 6. create a media record
String mimeType = MimeTypesLocator.getInstance().getContentType(media);
boolean SAVETODB = MediaData.saveToDB();
log.debug("**** SAVETODB="+SAVETODB);
MediaData mediaData=null;
log.debug("***6a. addMediaToItemGrading, itemGradinDataId="+itemGradingData.getItemGradingId());
log.debug("***6b. addMediaToItemGrading, publishedItemId="+((PublishedItemData)itemGradingData.getPublishedItem()).getItemId());
if (SAVETODB){ // put the byte[] in
mediaData = new MediaData(itemGradingData, mediaByte,
new Long(mediaByte.length + ""),
mimeType, "description", null,
media.getName(), false, false, new Integer(1),
agent, new Date(),
agent, new Date());
}
else{ // put the location in
mediaData = new MediaData(itemGradingData, null,
new Long(mediaByte.length + ""),
mimeType, "description", mediaLocation,
media.getName(), false, false, new Integer(1),
agent, new Date(),
agent, new Date());
}
Long mediaId = gradingService.saveMedia(mediaData);
log.debug("mediaId="+mediaId);
log.debug("***6c. addMediaToItemGrading, media.itemGradinDataId="+((ItemGradingData)mediaData.getItemGradingData()).getItemGradingId());
log.debug("***6d. addMediaToItemGrading, mediaId="+mediaData.getMediaId());
// 7. store mediaId in itemGradingRecord.answerText
log.debug("***7. addMediaToItemGrading, adata="+adata);
itemGradingData.setAnswerText(mediaId+"");
gradingService.saveItemGrading(itemGradingData);
// 8. do whatever need doing
DeliveryActionListener l2 = new DeliveryActionListener();
l2.processAction(null);
// 9. do the timer thing
- Integer timeLimit = adata.getPublishedAssessment().getAssessmentAccessControl().getTimeLimit();
+ Integer timeLimit = null;
+ if (adata.getPublishedAssessment().getAssessmentAccessControl()!=null)
+ timeLimit = adata.getPublishedAssessment().getAssessmentAccessControl().getTimeLimit();
if (timeLimit!=null && timeLimit.intValue()>0){
UpdateTimerListener l3 = new UpdateTimerListener();
l3.processAction(null);
}
reload = true;
return "takeAssessment";
}
public boolean getNotTakeable() {
return notTakeable;
}
public void setNotTakeable(boolean notTakeable) {
this.notTakeable = notTakeable;
}
public boolean getPastDue() {
return pastDue;
}
public void setPastDue(boolean pastDue) {
this.pastDue = pastDue;
}
public long getSubTime() {
return subTime;
}
public void setSubTime(long newSubTime)
{
subTime = newSubTime;
}
public String getSubmissionHours() {
return takenHours;
}
public void setSubmissionHours(String newHours)
{
takenHours = newHours;
}
public String getSubmissionMinutes() {
return takenMinutes;
}
public void setSubmissionMinutes(String newMinutes)
{
takenMinutes = newMinutes;
}
public PublishedAssessmentFacade getPublishedAssessment() {
return publishedAssessment;
}
public void setPublishedAssessment(PublishedAssessmentFacade publishedAssessment)
{
this.publishedAssessment = publishedAssessment;
}
public java.util.Date getFeedbackDate() {
return feedbackDate;
}
public void setFeedbackDate(java.util.Date feedbackDate) {
this.feedbackDate = feedbackDate;
}
public String getShowScore()
{
return showScore;
}
public void setShowScore(String showScore)
{
this.showScore = showScore;
}
public boolean getHasTimeLimit() {
return hasTimeLimit;
}
public void setHasTimeLimit(boolean hasTimeLimit) {
this.hasTimeLimit = hasTimeLimit;
}
public String getOutcome()
{
return outcome;
}
public void setOutcome(String outcome)
{
this.outcome = outcome;
}
public String doit(){
return outcome;
}
/*
public ItemGradingData getItemGradingData(String publishedItemId){
ItemGradingData itemGradingData = new ItemGradingData();
if (adata != null){
GradingService service = new GradingService();
itemGradingData = service.getItemGradingData(adata.getAssessmentGradingId().toString(), publishedItemId);
if (itemGradingData == null)
itemGradingData = new ItemGradingData();
}
return itemGradingData;
}
*/
public boolean getAnonymousLogin() {
return anonymousLogin;
}
public void setAnonymousLogin(boolean anonymousLogin) {
this.anonymousLogin = anonymousLogin;
}
public boolean getAccessViaUrl() {
return accessViaUrl;
}
public void setAccessViaUrl(boolean accessViaUrl) {
this.accessViaUrl = accessViaUrl;
}
public ItemGradingData getItemGradingData(String publishedItemId){
ItemGradingData selected = null;
if (adata != null){
Set items = adata.getItemGradingSet();
if (items!=null){
Iterator iter = items.iterator();
while (iter.hasNext()){
ItemGradingData itemGradingData = (ItemGradingData)iter.next();
String itemPublishedId = itemGradingData.getPublishedItem().getItemId().toString();
if ((publishedItemId).equals(itemPublishedId)){
log.debug("*** addMediaToItemGrading, same : found it");
selected = itemGradingData;
}
else{
log.debug("*** addMediaToItemGrading, not the same");
}
}
log.debug("*** addMediaToItemGrading, publishedItemId ="+publishedItemId);
if (selected!=null)
log.debug("*** addMediaToItemGrading, itemGradingData.publishedItemId ="+selected.getPublishedItem().getItemId().toString());
}
}
return selected;
}
public String getContextPath() {
return contextPath;
}
public void setContextPath(String contextPath) {
this.contextPath = contextPath;
}
public boolean isShowStudentScore()
{
return showStudentScore;
}
public void setShowStudentScore(boolean showStudentScore)
{
this.showStudentScore = showStudentScore;
}
public boolean getForGrading()
{
return forGrading;
}
public void setForGrading(boolean param)
{
this.forGrading= param;
}
public boolean isTimeRunning()
{
return timeRunning;
}
public void setTimeRunning(boolean timeRunning)
{
this.timeRunning = timeRunning;
}
}
| true | true | public String addMediaToItemGrading(javax.faces.event.ValueChangeEvent e)
{
GradingService gradingService = new GradingService();
PublishedAssessmentService publishedService = new PublishedAssessmentService();
PublishedAssessmentFacade publishedAssessment = publishedService.getPublishedAssessment(assessmentId);
String agent = AgentFacade.getAgentString();
if (publishedAssessment.getAssessmentAccessControl().getReleaseTo().indexOf("Anonymous Users") > -1)
agent = AgentFacade.getAnonymousId();
// 1. create assessmentGrading if it is null
if (this.adata == null)
{
adata = new AssessmentGradingData();
adata.setAgentId(agent);
adata.setPublishedAssessment(publishedAssessment.getData());
log.debug("***1a. addMediaToItemGrading, getForGrade()="+getForGrade());
adata.setForGrade(new Boolean(getForGrade()));
adata.setAttemptDate(getBeginTime());
gradingService.saveOrUpdateAssessmentGrading(adata);
}
log.debug("***1b. addMediaToItemGrading, adata="+adata);
// 2. format of the media location is: assessmentXXX/questionXXX/agentId/myfile
String mediaLocation = (String) e.getNewValue();
log.debug("***2a. addMediaToItemGrading, new value ="+mediaLocation);
File media = new File(mediaLocation);
byte[] mediaByte = getMediaStream(mediaLocation);
// 3. get the questionId (which is the PublishedItemData.itemId)
int assessmentIndex = mediaLocation.lastIndexOf("assessment");
int questionIndex = mediaLocation.lastIndexOf("question");
int agentIndex = mediaLocation.indexOf("/", questionIndex+8);
String pubAssessmentId = mediaLocation.substring(assessmentIndex+10,questionIndex-1);
String questionId = mediaLocation.substring(questionIndex+8,agentIndex);
log.debug("***3a. addMediaToItemGrading, questionId ="+questionId);
log.debug("***3b. addMediaToItemGrading, assessmentId ="+assessmentId);
// 4. prepare itemGradingData and attach it to assessmentGarding
PublishedItemData item = publishedService.loadPublishedItem(questionId);
log.debug("***4a. addMediaToItemGrading, item ="+item);
log.debug("***4b. addMediaToItemGrading, itemTextArray ="+item.getItemTextArray());
log.debug("***4c. addMediaToItemGrading, itemText(0) ="+item.getItemTextArray().get(0));
// there is only one text in audio question
PublishedItemText itemText = (PublishedItemText) item.getItemTextArraySorted().get(0);
ItemGradingData itemGradingData = getItemGradingData(questionId);
if (itemGradingData == null){
itemGradingData = new ItemGradingData();
itemGradingData.setAssessmentGrading(adata);
itemGradingData.setPublishedItem(item);
itemGradingData.setPublishedItemText(itemText);
itemGradingData.setSubmittedDate(new Date());
itemGradingData.setAgentId(agent);
itemGradingData.setOverrideScore(new Float(0));
}
setAssessmentGrading(adata);
// 5. save AssessmentGardingData with ItemGardingData
Set itemDataSet = adata.getItemGradingSet();
log.debug("***5a. addMediaToItemGrading, itemDataSet="+itemDataSet);
if (itemDataSet == null)
itemDataSet = new HashSet();
itemDataSet.add(itemGradingData);
adata.setItemGradingSet(itemDataSet);
gradingService.saveOrUpdateAssessmentGrading(adata);
log.debug("***5b. addMediaToItemGrading, saved="+adata);
// 6. create a media record
String mimeType = MimeTypesLocator.getInstance().getContentType(media);
boolean SAVETODB = MediaData.saveToDB();
log.debug("**** SAVETODB="+SAVETODB);
MediaData mediaData=null;
log.debug("***6a. addMediaToItemGrading, itemGradinDataId="+itemGradingData.getItemGradingId());
log.debug("***6b. addMediaToItemGrading, publishedItemId="+((PublishedItemData)itemGradingData.getPublishedItem()).getItemId());
if (SAVETODB){ // put the byte[] in
mediaData = new MediaData(itemGradingData, mediaByte,
new Long(mediaByte.length + ""),
mimeType, "description", null,
media.getName(), false, false, new Integer(1),
agent, new Date(),
agent, new Date());
}
else{ // put the location in
mediaData = new MediaData(itemGradingData, null,
new Long(mediaByte.length + ""),
mimeType, "description", mediaLocation,
media.getName(), false, false, new Integer(1),
agent, new Date(),
agent, new Date());
}
Long mediaId = gradingService.saveMedia(mediaData);
log.debug("mediaId="+mediaId);
log.debug("***6c. addMediaToItemGrading, media.itemGradinDataId="+((ItemGradingData)mediaData.getItemGradingData()).getItemGradingId());
log.debug("***6d. addMediaToItemGrading, mediaId="+mediaData.getMediaId());
// 7. store mediaId in itemGradingRecord.answerText
log.debug("***7. addMediaToItemGrading, adata="+adata);
itemGradingData.setAnswerText(mediaId+"");
gradingService.saveItemGrading(itemGradingData);
// 8. do whatever need doing
DeliveryActionListener l2 = new DeliveryActionListener();
l2.processAction(null);
// 9. do the timer thing
Integer timeLimit = adata.getPublishedAssessment().getAssessmentAccessControl().getTimeLimit();
if (timeLimit!=null && timeLimit.intValue()>0){
UpdateTimerListener l3 = new UpdateTimerListener();
l3.processAction(null);
}
reload = true;
return "takeAssessment";
}
| public String addMediaToItemGrading(javax.faces.event.ValueChangeEvent e)
{
GradingService gradingService = new GradingService();
PublishedAssessmentService publishedService = new PublishedAssessmentService();
PublishedAssessmentFacade publishedAssessment = publishedService.getPublishedAssessment(assessmentId);
String agent = AgentFacade.getAgentString();
if (publishedAssessment.getAssessmentAccessControl().getReleaseTo().indexOf("Anonymous Users") > -1)
agent = AgentFacade.getAnonymousId();
// 1. create assessmentGrading if it is null
if (this.adata == null)
{
adata = new AssessmentGradingData();
adata.setAgentId(agent);
adata.setPublishedAssessment(publishedAssessment.getData());
log.debug("***1a. addMediaToItemGrading, getForGrade()="+getForGrade());
adata.setForGrade(new Boolean(getForGrade()));
adata.setAttemptDate(getBeginTime());
gradingService.saveOrUpdateAssessmentGrading(adata);
}
log.debug("***1b. addMediaToItemGrading, adata="+adata);
// 2. format of the media location is: assessmentXXX/questionXXX/agentId/myfile
String mediaLocation = (String) e.getNewValue();
log.debug("***2a. addMediaToItemGrading, new value ="+mediaLocation);
File media = new File(mediaLocation);
byte[] mediaByte = getMediaStream(mediaLocation);
// 3. get the questionId (which is the PublishedItemData.itemId)
int assessmentIndex = mediaLocation.lastIndexOf("assessment");
int questionIndex = mediaLocation.lastIndexOf("question");
int agentIndex = mediaLocation.indexOf("/", questionIndex+8);
String pubAssessmentId = mediaLocation.substring(assessmentIndex+10,questionIndex-1);
String questionId = mediaLocation.substring(questionIndex+8,agentIndex);
log.debug("***3a. addMediaToItemGrading, questionId ="+questionId);
log.debug("***3b. addMediaToItemGrading, assessmentId ="+assessmentId);
// 4. prepare itemGradingData and attach it to assessmentGarding
PublishedItemData item = publishedService.loadPublishedItem(questionId);
log.debug("***4a. addMediaToItemGrading, item ="+item);
log.debug("***4b. addMediaToItemGrading, itemTextArray ="+item.getItemTextArray());
log.debug("***4c. addMediaToItemGrading, itemText(0) ="+item.getItemTextArray().get(0));
// there is only one text in audio question
PublishedItemText itemText = (PublishedItemText) item.getItemTextArraySorted().get(0);
ItemGradingData itemGradingData = getItemGradingData(questionId);
if (itemGradingData == null){
itemGradingData = new ItemGradingData();
itemGradingData.setAssessmentGrading(adata);
itemGradingData.setPublishedItem(item);
itemGradingData.setPublishedItemText(itemText);
itemGradingData.setSubmittedDate(new Date());
itemGradingData.setAgentId(agent);
itemGradingData.setOverrideScore(new Float(0));
}
setAssessmentGrading(adata);
// 5. save AssessmentGardingData with ItemGardingData
Set itemDataSet = adata.getItemGradingSet();
log.debug("***5a. addMediaToItemGrading, itemDataSet="+itemDataSet);
if (itemDataSet == null)
itemDataSet = new HashSet();
itemDataSet.add(itemGradingData);
adata.setItemGradingSet(itemDataSet);
gradingService.saveOrUpdateAssessmentGrading(adata);
log.debug("***5b. addMediaToItemGrading, saved="+adata);
// 6. create a media record
String mimeType = MimeTypesLocator.getInstance().getContentType(media);
boolean SAVETODB = MediaData.saveToDB();
log.debug("**** SAVETODB="+SAVETODB);
MediaData mediaData=null;
log.debug("***6a. addMediaToItemGrading, itemGradinDataId="+itemGradingData.getItemGradingId());
log.debug("***6b. addMediaToItemGrading, publishedItemId="+((PublishedItemData)itemGradingData.getPublishedItem()).getItemId());
if (SAVETODB){ // put the byte[] in
mediaData = new MediaData(itemGradingData, mediaByte,
new Long(mediaByte.length + ""),
mimeType, "description", null,
media.getName(), false, false, new Integer(1),
agent, new Date(),
agent, new Date());
}
else{ // put the location in
mediaData = new MediaData(itemGradingData, null,
new Long(mediaByte.length + ""),
mimeType, "description", mediaLocation,
media.getName(), false, false, new Integer(1),
agent, new Date(),
agent, new Date());
}
Long mediaId = gradingService.saveMedia(mediaData);
log.debug("mediaId="+mediaId);
log.debug("***6c. addMediaToItemGrading, media.itemGradinDataId="+((ItemGradingData)mediaData.getItemGradingData()).getItemGradingId());
log.debug("***6d. addMediaToItemGrading, mediaId="+mediaData.getMediaId());
// 7. store mediaId in itemGradingRecord.answerText
log.debug("***7. addMediaToItemGrading, adata="+adata);
itemGradingData.setAnswerText(mediaId+"");
gradingService.saveItemGrading(itemGradingData);
// 8. do whatever need doing
DeliveryActionListener l2 = new DeliveryActionListener();
l2.processAction(null);
// 9. do the timer thing
Integer timeLimit = null;
if (adata.getPublishedAssessment().getAssessmentAccessControl()!=null)
timeLimit = adata.getPublishedAssessment().getAssessmentAccessControl().getTimeLimit();
if (timeLimit!=null && timeLimit.intValue()>0){
UpdateTimerListener l3 = new UpdateTimerListener();
l3.processAction(null);
}
reload = true;
return "takeAssessment";
}
|
diff --git a/cruisecontrol/main/src/net/sourceforge/cruisecontrol/gendoc/html/ConfigHtmlGenerator.java b/cruisecontrol/main/src/net/sourceforge/cruisecontrol/gendoc/html/ConfigHtmlGenerator.java
index 7f077ea7..28aa15c0 100644
--- a/cruisecontrol/main/src/net/sourceforge/cruisecontrol/gendoc/html/ConfigHtmlGenerator.java
+++ b/cruisecontrol/main/src/net/sourceforge/cruisecontrol/gendoc/html/ConfigHtmlGenerator.java
@@ -1,166 +1,166 @@
/********************************************************************************
* CruiseControl, a Continuous Integration Toolkit
* Copyright (c) 2001-2003, 2006, ThoughtWorks, Inc.
* 200 E. Randolph, 25th Floor
* Chicago, IL 60601 USA
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* + Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* + Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* + Neither the name of ThoughtWorks, Inc., CruiseControl, nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
********************************************************************************/
package net.sourceforge.cruisecontrol.gendoc.html;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.util.Properties;
import net.sourceforge.cruisecontrol.gendoc.PluginInfoParser;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
//import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
import org.apache.velocity.runtime.resource.util.StringResourceRepository;
/**
* This Class provides the Mechanism for generator the Configxml.html
*
* @author Anthony Love ([email protected])
* @version 1.0
*/
public class ConfigHtmlGenerator {
private static VelocityEngine engine;
private final Template template;
private final Context context;
/**
* Creates a new HTML generator for documenting plugins.
* @throws Exception if anything goes wrong.
*/
public ConfigHtmlGenerator() throws Exception {
- final VelocityEngine engine = getVelocityEngine();
+ getVelocityEngine();
final String myTemplateBody = getTemplateFromJar();
final StringResourceRepository repository = StringResourceLoader.getRepository();
repository.putStringResource("myTemplate", myTemplateBody);
template = engine.getTemplate("myTemplate");
/* below appears to duplicate above, and below fails during JMX calls...
final Template templateTmp = engine.getTemplate("myTemplate");
String userDirDebug = System.getProperty("user.dir");
System.out.println("DEBUG: user.dir: " + userDirDebug);
String templateRelativePath = "\\main\\src\\net\\sourceforge\\cruisecontrol\\gendoc\\html\\"
+ "configxml_html.vm";
template = Velocity.getTemplate(templateRelativePath);
//*/
if (template == null) {
throw new IllegalArgumentException("Configuration error: template not found.");
}
context = new VelocityContext();
}
private String getTemplateFromJar() throws IOException {
// Reading the file contents from the JAR
InputStream inStream = ConfigHtmlGenerator.class.getResourceAsStream("configxml_html.vm");
StringBuilder stringBuilder = new StringBuilder();
InputStreamReader streamReader = new InputStreamReader(inStream);
BufferedReader bufferedReader = new BufferedReader(streamReader);
String line;
while ((line = bufferedReader.readLine()) != null) {
stringBuilder.append(line);
stringBuilder.append('\n');
}
return stringBuilder.toString();
}
/**
* Creates a VelocityEngine singleton
*
* @return The initiated VelocityEngine
* @throws Exception In Case of Initialize Error
*/
private static VelocityEngine getVelocityEngine() throws Exception {
//@todo Dan Rollo changed this to a singleton because multiple calls during unit test resulted
// in "engine already inited" errors from Velocity. We may want to revert the singleton if keeping it around is
// a memory hog, or if the singleton has other bad side effects....
if (engine == null) {
Properties p = new Properties();
p.setProperty("resource.loader", "string");
p.setProperty("string.resource.loader.class",
"org.apache.velocity.runtime.resource.loader.StringResourceLoader");
p.setProperty("runtime.log.logsystem.class", "org.apache.velocity.runtime.log.SimpleLog4JLogSystem");
p.setProperty("runtime.log.logsystem.log4j.category", "org.apache.velocity");
engine = new VelocityEngine();
engine.init(p);
}
return (engine);
}
/**
* Generates the HTML file from the given PluginTree
*
* @param parser The PluginParser to obtained the Plugin tree
* @return The generated HTML file
* @throws Exception In Case of failure
*/
public String generate(PluginInfoParser parser) throws Exception {
StringWriter sw = new StringWriter();
context.put("generalErrors", parser.getParsingErrors());
context.put("allPlugins", parser.getAllPlugins());
context.put("rootPlugin", parser.getRootPlugin());
context.put("utils", new HtmlUtils());
try {
this.template.merge(context, sw);
return sw.getBuffer().toString();
} catch (Exception e) {
e.printStackTrace(System.err);
throw e;
}
}
}
| true | true | public ConfigHtmlGenerator() throws Exception {
final VelocityEngine engine = getVelocityEngine();
final String myTemplateBody = getTemplateFromJar();
final StringResourceRepository repository = StringResourceLoader.getRepository();
repository.putStringResource("myTemplate", myTemplateBody);
template = engine.getTemplate("myTemplate");
/* below appears to duplicate above, and below fails during JMX calls...
final Template templateTmp = engine.getTemplate("myTemplate");
String userDirDebug = System.getProperty("user.dir");
System.out.println("DEBUG: user.dir: " + userDirDebug);
String templateRelativePath = "\\main\\src\\net\\sourceforge\\cruisecontrol\\gendoc\\html\\"
+ "configxml_html.vm";
template = Velocity.getTemplate(templateRelativePath);
//*/
if (template == null) {
throw new IllegalArgumentException("Configuration error: template not found.");
}
context = new VelocityContext();
}
| public ConfigHtmlGenerator() throws Exception {
getVelocityEngine();
final String myTemplateBody = getTemplateFromJar();
final StringResourceRepository repository = StringResourceLoader.getRepository();
repository.putStringResource("myTemplate", myTemplateBody);
template = engine.getTemplate("myTemplate");
/* below appears to duplicate above, and below fails during JMX calls...
final Template templateTmp = engine.getTemplate("myTemplate");
String userDirDebug = System.getProperty("user.dir");
System.out.println("DEBUG: user.dir: " + userDirDebug);
String templateRelativePath = "\\main\\src\\net\\sourceforge\\cruisecontrol\\gendoc\\html\\"
+ "configxml_html.vm";
template = Velocity.getTemplate(templateRelativePath);
//*/
if (template == null) {
throw new IllegalArgumentException("Configuration error: template not found.");
}
context = new VelocityContext();
}
|
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/GitCompareInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/GitCompareInput.java
index d31da74a..b6e44ee9 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/GitCompareInput.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/GitCompareInput.java
@@ -1,169 +1,170 @@
/*******************************************************************************
* Copyright (C) 2010, Dariusz Luksza <[email protected]>
*
* 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
*******************************************************************************/
package org.eclipse.egit.ui.internal.synchronize.compare;
import static org.eclipse.jgit.lib.ObjectId.zeroId;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.ITypedElement;
import org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.egit.ui.UIText;
import org.eclipse.egit.ui.internal.CompareUtils;
import org.eclipse.egit.ui.internal.FileRevisionTypedElement;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.team.ui.mapping.ISynchronizationCompareInput;
import org.eclipse.team.ui.mapping.SaveableComparison;
/**
* Git specific implementation of {@link ISynchronizationCompareInput}
*/
public class GitCompareInput implements ISynchronizationCompareInput {
private final String name;
private final ObjectId ancestorId;
private final ObjectId baseId;
private final ObjectId remoteId;
private final Repository repo;
private final String gitPath;
private final RevCommit ancestorCommit;
private final RevCommit remoteCommit;
private final RevCommit baseCommit;
/**
* Creates {@link GitCompareInput}
*
* @param repo
* repository that is connected with this object
* @param ancestroDataSource
* data that should be use to obtain common ancestor object data
* @param baseDataSource
* data that should be use to obtain base object data
* @param remoteDataSource
* data that should be used to obtain remote object data
* @param gitPath
* repository relative path of object
*/
public GitCompareInput(Repository repo,
ComparisonDataSource ancestroDataSource,
ComparisonDataSource baseDataSource,
ComparisonDataSource remoteDataSource, String gitPath) {
this.repo = repo;
this.gitPath = gitPath;
this.baseId = baseDataSource.getObjectId();
this.remoteId = remoteDataSource.getObjectId();
this.baseCommit = baseDataSource.getRevCommit();
this.ancestorId = ancestroDataSource.getObjectId();
this.remoteCommit = remoteDataSource.getRevCommit();
this.ancestorCommit = ancestroDataSource.getRevCommit();
- this.name = gitPath.substring(gitPath.lastIndexOf('/'));
+ this.name = gitPath.lastIndexOf('/') < 0 ? gitPath :
+ gitPath.substring(gitPath.lastIndexOf('/'));
}
public String getName() {
return name;
}
public Image getImage() {
// TODO Auto-generated method stub
return null;
}
public int getKind() {
// TODO Auto-generated method stub
return 0;
}
public ITypedElement getAncestor() {
if (objectExist(ancestorCommit, ancestorId))
return CompareUtils.getFileRevisionTypedElement(gitPath,
ancestorCommit, repo, ancestorId);
return null;
}
public ITypedElement getLeft() {
return CompareUtils.getFileRevisionTypedElement(gitPath, remoteCommit,
repo, remoteId);
}
public ITypedElement getRight() {
return CompareUtils.getFileRevisionTypedElement(gitPath, baseCommit,
repo, baseId);
}
public void addCompareInputChangeListener(
ICompareInputChangeListener listener) {
// data in commit will never change, therefore change listeners are
// useless
}
public void removeCompareInputChangeListener(
ICompareInputChangeListener listener) {
// data in commit will never change, therefore change listeners are
// useless
}
public void copy(boolean leftToRight) {
// do nothing, we should disallow coping content between commits
}
private boolean objectExist(RevCommit commit, ObjectId id) {
return commit != null && id != null && !id.equals(zeroId());
}
public SaveableComparison getSaveable() {
// not used
return null;
}
public void prepareInput(CompareConfiguration configuration,
IProgressMonitor monitor) throws CoreException {
configuration.setLeftLabel(getFileRevisionLabel(getLeft()));
configuration.setRightLabel(getFileRevisionLabel(getRight()));
}
public String getFullPath() {
return gitPath;
}
public boolean isCompareInputFor(Object object) {
// not used
return false;
}
private String getFileRevisionLabel(ITypedElement element) {
if (element instanceof FileRevisionTypedElement) {
FileRevisionTypedElement castElement = (FileRevisionTypedElement) element;
return NLS.bind(
UIText.GitCompareFileRevisionEditorInput_RevisionLabel,
new Object[] {
element.getName(),
CompareUtils.truncatedRevision(castElement
.getContentIdentifier()),
castElement.getAuthor() });
} else
return element.getName();
}
}
| true | true | public GitCompareInput(Repository repo,
ComparisonDataSource ancestroDataSource,
ComparisonDataSource baseDataSource,
ComparisonDataSource remoteDataSource, String gitPath) {
this.repo = repo;
this.gitPath = gitPath;
this.baseId = baseDataSource.getObjectId();
this.remoteId = remoteDataSource.getObjectId();
this.baseCommit = baseDataSource.getRevCommit();
this.ancestorId = ancestroDataSource.getObjectId();
this.remoteCommit = remoteDataSource.getRevCommit();
this.ancestorCommit = ancestroDataSource.getRevCommit();
this.name = gitPath.substring(gitPath.lastIndexOf('/'));
}
| public GitCompareInput(Repository repo,
ComparisonDataSource ancestroDataSource,
ComparisonDataSource baseDataSource,
ComparisonDataSource remoteDataSource, String gitPath) {
this.repo = repo;
this.gitPath = gitPath;
this.baseId = baseDataSource.getObjectId();
this.remoteId = remoteDataSource.getObjectId();
this.baseCommit = baseDataSource.getRevCommit();
this.ancestorId = ancestroDataSource.getObjectId();
this.remoteCommit = remoteDataSource.getRevCommit();
this.ancestorCommit = ancestroDataSource.getRevCommit();
this.name = gitPath.lastIndexOf('/') < 0 ? gitPath :
gitPath.substring(gitPath.lastIndexOf('/'));
}
|
diff --git a/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdxserver/CDXToCaptureSearchResultsWriter.java b/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdxserver/CDXToCaptureSearchResultsWriter.java
index ba7deac31..fce886b58 100644
--- a/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdxserver/CDXToCaptureSearchResultsWriter.java
+++ b/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdxserver/CDXToCaptureSearchResultsWriter.java
@@ -1,264 +1,268 @@
package org.archive.wayback.resourceindex.cdxserver;
import java.util.HashMap;
import java.util.LinkedList;
import org.apache.commons.lang.math.NumberUtils;
import org.archive.cdxserver.CDXQuery;
import org.archive.format.cdx.CDXLine;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.FastCaptureSearchResult;
import org.archive.wayback.resourceindex.filters.SelfRedirectFilter;
import org.archive.wayback.util.ObjectFilter;
import org.archive.wayback.util.Timestamp;
import org.archive.wayback.util.url.UrlOperations;
public class CDXToCaptureSearchResultsWriter extends CDXToSearchResultWriter {
public final static String REVISIT_VALUE = "warc/revisit";
protected CaptureSearchResults results = null;
protected String targetTimestamp;
protected int flip = 1;
protected boolean done = false;
protected CaptureSearchResult closest = null;
protected SelfRedirectFilter selfRedirFilter = null;
protected CaptureSearchResult lastResult = null;
protected HashMap<String, CaptureSearchResult> digestToOriginal;
protected HashMap<String, LinkedList<CaptureSearchResult>> digestToRevisits;
protected boolean resolveRevisits = false;
protected boolean seekSingleCapture = false;
protected boolean isReverse = false;
public CDXToCaptureSearchResultsWriter(CDXQuery query,
boolean resolveRevisits,
boolean seekSingleCapture)
{
super(query);
this.resolveRevisits = resolveRevisits;
this.seekSingleCapture = seekSingleCapture;
this.isReverse = query.isReverse();
}
public void setTargetTimestamp(String timestamp)
{
targetTimestamp = timestamp;
if (isReverse) {
flip = -1;
}
}
@Override
public void begin() {
results = new CaptureSearchResults();
if (resolveRevisits) {
if (isReverse) {
digestToRevisits = new HashMap<String, LinkedList<CaptureSearchResult>>();
} else {
digestToOriginal = new HashMap<String, CaptureSearchResult>();
}
}
}
@Override
public int writeLine(CDXLine line) {
FastCaptureSearchResult result = new FastCaptureSearchResult();
String timestamp = line.getTimestamp();
+ String originalUrl = line.getOriginalUrl();
+ String statusCode = line.getStatusCode();
if (lastResult != null) {
- if (lastResult.getCaptureTimestamp().equals(timestamp)) {
+ if (lastResult.getCaptureTimestamp().equals(timestamp) &&
+ lastResult.getOriginalUrl().equals(originalUrl) &&
+ lastResult.getHttpCode().equals(statusCode)) {
// Skip this
return 0;
}
}
result.setUrlKey(line.getUrlKey());
result.setCaptureTimestamp(timestamp);
- result.setOriginalUrl(line.getOriginalUrl());
+ result.setOriginalUrl(originalUrl);
// Special case: filter out captures that have userinfo
boolean hasUserInfo = (UrlOperations.urlToUserInfo(result.getOriginalUrl()) != null);
if (hasUserInfo) {
return 0;
}
result.setRedirectUrl(line.getRedirect());
- result.setHttpCode(line.getStatusCode());
+ result.setHttpCode(statusCode);
if (selfRedirFilter != null && !result.getRedirectUrl().equals(CDXLine.EMPTY_VALUE)) {
if (selfRedirFilter.filterObject(result) != ObjectFilter.FILTER_INCLUDE) {
return 0;
}
}
result.setMimeType(line.getMimeType());
result.setDigest(line.getDigest());
result.setOffset(NumberUtils.toLong(line.getOffset(), -1));
result.setCompressedLength(NumberUtils.toLong(line.getLength(), -1));
result.setFile(line.getFilename());
result.setRobotFlags(line.getRobotFlags());
boolean isRevisit = false;
if (resolveRevisits) {
isRevisit = result.getFile().equals(CDXLine.EMPTY_VALUE) ||
result.getMimeType().equals(REVISIT_VALUE);
String digest = result.getDigest();
if (isRevisit) {
if (!isReverse) {
CaptureSearchResult payload = digestToOriginal.get(digest);
if (payload != null) {
result.flagDuplicateDigest(payload);
}
} else {
LinkedList<CaptureSearchResult> revisits = digestToRevisits.get(digest);
if (revisits == null) {
revisits = new LinkedList<CaptureSearchResult>();
digestToRevisits.put(digest, revisits);
}
revisits.add(result);
}
} else {
if (!isReverse) {
digestToOriginal.put(digest, result);
} else {
LinkedList<CaptureSearchResult> revisits = digestToRevisits.remove(digest);
if (revisits != null) {
for (CaptureSearchResult revisit : revisits) {
revisit.flagDuplicateDigest(result);
}
}
}
}
}
// String payloadFile = line.getField(RevisitResolver.origfilename);
//
// if (!payloadFile.equals(CDXLine.EMPTY_VALUE)) {
// FastCaptureSearchResult payload = new FastCaptureSearchResult();
// payload.setFile(payloadFile);
// payload.setOffset(NumberUtils.toLong(line.getField(RevisitResolver.origoffset), -1));
// payload.setCompressedLength(NumberUtils.toLong(line.getField(RevisitResolver.origlength), -1));
// result.flagDuplicateDigest(payload);
// }
if ((targetTimestamp != null) && (closest == null)) {
closest = determineClosest(result);
}
results.addSearchResult(result, !isReverse);
lastResult = result;
// Short circuit the load if seeking single capture
if (seekSingleCapture && resolveRevisits) {
if (closest != null) {
// If not a revisit, we're done
if (!isRevisit) {
done = true;
// Else make sure the revisit is resolved
} else if (result.getDuplicatePayload() != null) {
done = true;
}
}
}
return 1;
}
@Override
public boolean isAborted()
{
return done;
}
protected CaptureSearchResult determineClosest(CaptureSearchResult nextResult)
{
int compare = targetTimestamp.compareTo(nextResult.getCaptureTimestamp()) * flip;
if (compare == 0) {
return nextResult;
} else if (compare > 0) {
// Too early to tell
return null;
}
// First result that is greater/less than target
if (results.isEmpty()) {
return nextResult;
}
CaptureSearchResult lastResult = getLastAdded();
// Now compare date diff
long nextTime = nextResult.getCaptureDate().getTime();
long lastTime = lastResult.getCaptureDate().getTime();
long targetTime = Timestamp.parseAfter(targetTimestamp).getDate().getTime();
if (Math.abs(nextTime - targetTime) < Math.abs(lastTime - targetTime)) {
return nextResult;
} else {
return lastResult;
}
}
public void end() {
results.setClosest(this.getClosest());
results.setReturnedCount(results.getResults().size());
results.setMatchingCount(results.getResults().size());
}
public CaptureSearchResult getClosest()
{
if (closest != null) {
return closest;
}
if (!results.isEmpty()) {
// If no target timestamp, always return the latest capture, otherwise first or last based on reverse state
if (targetTimestamp != null) {
return getLastAdded();
} else {
return results.getResults().getLast();
}
}
return null;
}
protected CaptureSearchResult getLastAdded()
{
if (!isReverse) {
return results.getResults().getLast();
} else {
return results.getResults().getFirst();
}
}
@Override
public CaptureSearchResults getSearchResults()
{
return results;
}
public SelfRedirectFilter getSelfRedirFilter() {
return selfRedirFilter;
}
public void setSelfRedirFilter(SelfRedirectFilter selfRedirFilter) {
this.selfRedirFilter = selfRedirFilter;
}
}
| false | true | public int writeLine(CDXLine line) {
FastCaptureSearchResult result = new FastCaptureSearchResult();
String timestamp = line.getTimestamp();
if (lastResult != null) {
if (lastResult.getCaptureTimestamp().equals(timestamp)) {
// Skip this
return 0;
}
}
result.setUrlKey(line.getUrlKey());
result.setCaptureTimestamp(timestamp);
result.setOriginalUrl(line.getOriginalUrl());
// Special case: filter out captures that have userinfo
boolean hasUserInfo = (UrlOperations.urlToUserInfo(result.getOriginalUrl()) != null);
if (hasUserInfo) {
return 0;
}
result.setRedirectUrl(line.getRedirect());
result.setHttpCode(line.getStatusCode());
if (selfRedirFilter != null && !result.getRedirectUrl().equals(CDXLine.EMPTY_VALUE)) {
if (selfRedirFilter.filterObject(result) != ObjectFilter.FILTER_INCLUDE) {
return 0;
}
}
result.setMimeType(line.getMimeType());
result.setDigest(line.getDigest());
result.setOffset(NumberUtils.toLong(line.getOffset(), -1));
result.setCompressedLength(NumberUtils.toLong(line.getLength(), -1));
result.setFile(line.getFilename());
result.setRobotFlags(line.getRobotFlags());
boolean isRevisit = false;
if (resolveRevisits) {
isRevisit = result.getFile().equals(CDXLine.EMPTY_VALUE) ||
result.getMimeType().equals(REVISIT_VALUE);
String digest = result.getDigest();
if (isRevisit) {
if (!isReverse) {
CaptureSearchResult payload = digestToOriginal.get(digest);
if (payload != null) {
result.flagDuplicateDigest(payload);
}
} else {
LinkedList<CaptureSearchResult> revisits = digestToRevisits.get(digest);
if (revisits == null) {
revisits = new LinkedList<CaptureSearchResult>();
digestToRevisits.put(digest, revisits);
}
revisits.add(result);
}
} else {
if (!isReverse) {
digestToOriginal.put(digest, result);
} else {
LinkedList<CaptureSearchResult> revisits = digestToRevisits.remove(digest);
if (revisits != null) {
for (CaptureSearchResult revisit : revisits) {
revisit.flagDuplicateDigest(result);
}
}
}
}
}
// String payloadFile = line.getField(RevisitResolver.origfilename);
//
// if (!payloadFile.equals(CDXLine.EMPTY_VALUE)) {
// FastCaptureSearchResult payload = new FastCaptureSearchResult();
// payload.setFile(payloadFile);
// payload.setOffset(NumberUtils.toLong(line.getField(RevisitResolver.origoffset), -1));
// payload.setCompressedLength(NumberUtils.toLong(line.getField(RevisitResolver.origlength), -1));
// result.flagDuplicateDigest(payload);
// }
if ((targetTimestamp != null) && (closest == null)) {
closest = determineClosest(result);
}
results.addSearchResult(result, !isReverse);
lastResult = result;
// Short circuit the load if seeking single capture
if (seekSingleCapture && resolveRevisits) {
if (closest != null) {
// If not a revisit, we're done
if (!isRevisit) {
done = true;
// Else make sure the revisit is resolved
} else if (result.getDuplicatePayload() != null) {
done = true;
}
}
}
return 1;
}
| public int writeLine(CDXLine line) {
FastCaptureSearchResult result = new FastCaptureSearchResult();
String timestamp = line.getTimestamp();
String originalUrl = line.getOriginalUrl();
String statusCode = line.getStatusCode();
if (lastResult != null) {
if (lastResult.getCaptureTimestamp().equals(timestamp) &&
lastResult.getOriginalUrl().equals(originalUrl) &&
lastResult.getHttpCode().equals(statusCode)) {
// Skip this
return 0;
}
}
result.setUrlKey(line.getUrlKey());
result.setCaptureTimestamp(timestamp);
result.setOriginalUrl(originalUrl);
// Special case: filter out captures that have userinfo
boolean hasUserInfo = (UrlOperations.urlToUserInfo(result.getOriginalUrl()) != null);
if (hasUserInfo) {
return 0;
}
result.setRedirectUrl(line.getRedirect());
result.setHttpCode(statusCode);
if (selfRedirFilter != null && !result.getRedirectUrl().equals(CDXLine.EMPTY_VALUE)) {
if (selfRedirFilter.filterObject(result) != ObjectFilter.FILTER_INCLUDE) {
return 0;
}
}
result.setMimeType(line.getMimeType());
result.setDigest(line.getDigest());
result.setOffset(NumberUtils.toLong(line.getOffset(), -1));
result.setCompressedLength(NumberUtils.toLong(line.getLength(), -1));
result.setFile(line.getFilename());
result.setRobotFlags(line.getRobotFlags());
boolean isRevisit = false;
if (resolveRevisits) {
isRevisit = result.getFile().equals(CDXLine.EMPTY_VALUE) ||
result.getMimeType().equals(REVISIT_VALUE);
String digest = result.getDigest();
if (isRevisit) {
if (!isReverse) {
CaptureSearchResult payload = digestToOriginal.get(digest);
if (payload != null) {
result.flagDuplicateDigest(payload);
}
} else {
LinkedList<CaptureSearchResult> revisits = digestToRevisits.get(digest);
if (revisits == null) {
revisits = new LinkedList<CaptureSearchResult>();
digestToRevisits.put(digest, revisits);
}
revisits.add(result);
}
} else {
if (!isReverse) {
digestToOriginal.put(digest, result);
} else {
LinkedList<CaptureSearchResult> revisits = digestToRevisits.remove(digest);
if (revisits != null) {
for (CaptureSearchResult revisit : revisits) {
revisit.flagDuplicateDigest(result);
}
}
}
}
}
// String payloadFile = line.getField(RevisitResolver.origfilename);
//
// if (!payloadFile.equals(CDXLine.EMPTY_VALUE)) {
// FastCaptureSearchResult payload = new FastCaptureSearchResult();
// payload.setFile(payloadFile);
// payload.setOffset(NumberUtils.toLong(line.getField(RevisitResolver.origoffset), -1));
// payload.setCompressedLength(NumberUtils.toLong(line.getField(RevisitResolver.origlength), -1));
// result.flagDuplicateDigest(payload);
// }
if ((targetTimestamp != null) && (closest == null)) {
closest = determineClosest(result);
}
results.addSearchResult(result, !isReverse);
lastResult = result;
// Short circuit the load if seeking single capture
if (seekSingleCapture && resolveRevisits) {
if (closest != null) {
// If not a revisit, we're done
if (!isRevisit) {
done = true;
// Else make sure the revisit is resolved
} else if (result.getDuplicatePayload() != null) {
done = true;
}
}
}
return 1;
}
|
diff --git a/src/main/web/tool-editor/src/fi/csc/chipster/web/tooledit/ConfirmClearAll.java b/src/main/web/tool-editor/src/fi/csc/chipster/web/tooledit/ConfirmClearAll.java
index e51664697..0c3794d7c 100644
--- a/src/main/web/tool-editor/src/fi/csc/chipster/web/tooledit/ConfirmClearAll.java
+++ b/src/main/web/tool-editor/src/fi/csc/chipster/web/tooledit/ConfirmClearAll.java
@@ -1,61 +1,62 @@
package fi.csc.chipster.web.tooledit;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
public class ConfirmClearAll extends Window{
private static final long serialVersionUID = -6901652612577754156L;
private Button ok = new Button("Ok");
private Button cancel = new Button("Cancel");
private ToolEditorUI root;
public ConfirmClearAll(ToolEditorUI root) {
super("Do you really want to clear everyting?");
this.setModal(true);
this.setHeight("200px");
this.root = root;
initButtonsListener();
VerticalLayout vLayout = new VerticalLayout();
vLayout.setSpacing(true);
vLayout.setMargin(true);
vLayout.addComponent(new Label("This will clear all. Allinputs, outputs and parameters. Do you really want to clear all?"));
HorizontalLayout hLayout = new HorizontalLayout();
hLayout.addComponent(ok);
hLayout.addComponent(cancel);
hLayout.setSpacing(true);
vLayout.addComponent(hLayout);
vLayout.setComponentAlignment(hLayout, Alignment.BOTTOM_RIGHT);
this.setContent(vLayout);
}
private void initButtonsListener() {
ok.addClickListener(new ClickListener() {
private static final long serialVersionUID = 6970174755245561409L;
@Override
public void buttonClick(ClickEvent event) {
root.getToolEditor().removeAllComponents();
root.getTreeToolEditor().removeAllChildren();
+ root.getTreeToolEditor().updateToolTitle("");
root.getTextEditor().setText("");
root.removeWindow(ConfirmClearAll.this);
}
});
cancel.addClickListener(new ClickListener() {
private static final long serialVersionUID = 5621280789210184012L;
@Override
public void buttonClick(ClickEvent event) {
root.removeWindow(ConfirmClearAll.this);
}
});
}
}
| true | true | private void initButtonsListener() {
ok.addClickListener(new ClickListener() {
private static final long serialVersionUID = 6970174755245561409L;
@Override
public void buttonClick(ClickEvent event) {
root.getToolEditor().removeAllComponents();
root.getTreeToolEditor().removeAllChildren();
root.getTextEditor().setText("");
root.removeWindow(ConfirmClearAll.this);
}
});
cancel.addClickListener(new ClickListener() {
private static final long serialVersionUID = 5621280789210184012L;
@Override
public void buttonClick(ClickEvent event) {
root.removeWindow(ConfirmClearAll.this);
}
});
}
| private void initButtonsListener() {
ok.addClickListener(new ClickListener() {
private static final long serialVersionUID = 6970174755245561409L;
@Override
public void buttonClick(ClickEvent event) {
root.getToolEditor().removeAllComponents();
root.getTreeToolEditor().removeAllChildren();
root.getTreeToolEditor().updateToolTitle("");
root.getTextEditor().setText("");
root.removeWindow(ConfirmClearAll.this);
}
});
cancel.addClickListener(new ClickListener() {
private static final long serialVersionUID = 5621280789210184012L;
@Override
public void buttonClick(ClickEvent event) {
root.removeWindow(ConfirmClearAll.this);
}
});
}
|
diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
index bd0c5b6f6..d5b77b257 100644
--- a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
+++ b/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
@@ -1,330 +1,330 @@
/*
* Copyright 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.scheduling.quartz;
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.quartz.Scheduler;
import org.quartz.StatefulJob;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.PropertyAccessorFactory;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.support.ArgumentConvertingMethodInvoker;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.MethodInvoker;
/**
* {@link org.springframework.beans.factory.FactoryBean} that exposes a
* {@link org.quartz.JobDetail} object which delegates job execution to a
* specified (static or non-static) method. Avoids the need for implementing
* a one-line Quartz Job that just invokes an existing service method on a
* Spring-managed target bean.
*
* <p>Inherits common configuration properties from the {@link MethodInvoker}
* base class, such as {@link #setTargetObject "targetObject"} and
* {@link #setTargetMethod "targetMethod"}, adding support for lookup of the target
* bean by name through the {@link #setTargetBeanName "targetBeanName"} property
* (as alternative to specifying a "targetObject" directly, allowing for
* non-singleton target objects).
*
* <p>Supports both concurrently running jobs and non-currently running
* jobs through the "concurrent" property. Jobs created by this
* MethodInvokingJobDetailFactoryBean are by default volatile and durable
* (according to Quartz terminology).
*
* <p><b>NOTE: JobDetails created via this FactoryBean are <i>not</i>
* serializable and thus not suitable for persistent job stores.</b>
* You need to implement your own Quartz Job as a thin wrapper for each case
* where you want a persistent job to delegate to a specific service method.
*
* <p>Compatible with Quartz 1.5+ as well as Quartz 2.0, as of Spring 3.1.
*
* @author Juergen Hoeller
* @author Alef Arendsen
* @since 18.02.2004
* @see #setTargetBeanName
* @see #setTargetObject
* @see #setTargetMethod
* @see #setConcurrent
*/
public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethodInvoker
implements FactoryBean<JobDetail>, BeanNameAware, BeanClassLoaderAware, BeanFactoryAware, InitializingBean {
private static Class<?> jobDetailImplClass;
static {
try {
jobDetailImplClass = Class.forName("org.quartz.impl.JobDetailImpl");
}
catch (ClassNotFoundException ex) {
jobDetailImplClass = null;
}
}
private String name;
private String group = Scheduler.DEFAULT_GROUP;
private boolean concurrent = true;
private String targetBeanName;
private String[] jobListenerNames;
private String beanName;
private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
private BeanFactory beanFactory;
private JobDetail jobDetail;
/**
* Set the name of the job.
* <p>Default is the bean name of this FactoryBean.
* @see org.quartz.JobDetail#setName
*/
public void setName(String name) {
this.name = name;
}
/**
* Set the group of the job.
* <p>Default is the default group of the Scheduler.
* @see org.quartz.JobDetail#setGroup
* @see org.quartz.Scheduler#DEFAULT_GROUP
*/
public void setGroup(String group) {
this.group = group;
}
/**
* Specify whether or not multiple jobs should be run in a concurrent
* fashion. The behavior when one does not want concurrent jobs to be
* executed is realized through adding the {@link StatefulJob} interface.
* More information on stateful versus stateless jobs can be found
* <a href="http://www.opensymphony.com/quartz/tutorial.html#jobsMore">here</a>.
* <p>The default setting is to run jobs concurrently.
*/
public void setConcurrent(boolean concurrent) {
this.concurrent = concurrent;
}
/**
* Set the name of the target bean in the Spring BeanFactory.
* <p>This is an alternative to specifying {@link #setTargetObject "targetObject"},
* allowing for non-singleton beans to be invoked. Note that specified
* "targetObject" and {@link #setTargetClass "targetClass"} values will
* override the corresponding effect of this "targetBeanName" setting
* (i.e. statically pre-define the bean type or even the bean object).
*/
public void setTargetBeanName(String targetBeanName) {
this.targetBeanName = targetBeanName;
}
/**
* Set a list of JobListener names for this job, referring to
* non-global JobListeners registered with the Scheduler.
* <p>A JobListener name always refers to the name returned
* by the JobListener implementation.
* @see SchedulerFactoryBean#setJobListeners
* @see org.quartz.JobListener#getName
*/
public void setJobListenerNames(String[] names) {
this.jobListenerNames = names;
}
public void setBeanName(String beanName) {
this.beanName = beanName;
}
public void setBeanClassLoader(ClassLoader classLoader) {
this.beanClassLoader = classLoader;
}
public void setBeanFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
@Override
protected Class resolveClassName(String className) throws ClassNotFoundException {
return ClassUtils.forName(className, this.beanClassLoader);
}
public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodException {
prepare();
// Use specific name if given, else fall back to bean name.
String name = (this.name != null ? this.name : this.beanName);
// Consider the concurrent flag to choose between stateful and stateless job.
Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class);
// Build JobDetail instance.
if (jobDetailImplClass != null) {
// Using Quartz 2.0 JobDetailImpl class...
- Object jobDetail = BeanUtils.instantiate(jobDetailImplClass);
- BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(jobDetail);
+ this.jobDetail = (JobDetail) BeanUtils.instantiate(jobDetailImplClass);
+ BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(this.jobDetail);
bw.setPropertyValue("name", name);
bw.setPropertyValue("group", this.group);
bw.setPropertyValue("jobClass", jobClass);
bw.setPropertyValue("durability", true);
((JobDataMap) bw.getPropertyValue("jobDataMap")).put("methodInvoker", this);
}
else {
// Using Quartz 1.x JobDetail class...
this.jobDetail = new JobDetail(name, this.group, jobClass);
this.jobDetail.setVolatility(true);
this.jobDetail.setDurability(true);
this.jobDetail.getJobDataMap().put("methodInvoker", this);
}
// Register job listener names.
if (this.jobListenerNames != null) {
for (String jobListenerName : this.jobListenerNames) {
if (jobDetailImplClass != null) {
throw new IllegalStateException("Non-global JobListeners not supported on Quartz 2 - " +
"manually register a Matcher against the Quartz ListenerManager instead");
}
this.jobDetail.addJobListener(jobListenerName);
}
}
postProcessJobDetail(this.jobDetail);
}
/**
* Callback for post-processing the JobDetail to be exposed by this FactoryBean.
* <p>The default implementation is empty. Can be overridden in subclasses.
* @param jobDetail the JobDetail prepared by this FactoryBean
*/
protected void postProcessJobDetail(JobDetail jobDetail) {
}
/**
* Overridden to support the {@link #setTargetBeanName "targetBeanName"} feature.
*/
@Override
public Class getTargetClass() {
Class targetClass = super.getTargetClass();
if (targetClass == null && this.targetBeanName != null) {
Assert.state(this.beanFactory != null, "BeanFactory must be set when using 'targetBeanName'");
targetClass = this.beanFactory.getType(this.targetBeanName);
}
return targetClass;
}
/**
* Overridden to support the {@link #setTargetBeanName "targetBeanName"} feature.
*/
@Override
public Object getTargetObject() {
Object targetObject = super.getTargetObject();
if (targetObject == null && this.targetBeanName != null) {
Assert.state(this.beanFactory != null, "BeanFactory must be set when using 'targetBeanName'");
targetObject = this.beanFactory.getBean(this.targetBeanName);
}
return targetObject;
}
public JobDetail getObject() {
return this.jobDetail;
}
public Class<? extends JobDetail> getObjectType() {
return (this.jobDetail != null ? this.jobDetail.getClass() : JobDetail.class);
}
public boolean isSingleton() {
return true;
}
/**
* Quartz Job implementation that invokes a specified method.
* Automatically applied by MethodInvokingJobDetailFactoryBean.
*/
public static class MethodInvokingJob extends QuartzJobBean {
protected static final Log logger = LogFactory.getLog(MethodInvokingJob.class);
private MethodInvoker methodInvoker;
/**
* Set the MethodInvoker to use.
*/
public void setMethodInvoker(MethodInvoker methodInvoker) {
this.methodInvoker = methodInvoker;
}
/**
* Invoke the method via the MethodInvoker.
*/
@Override
protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
try {
context.setResult(this.methodInvoker.invoke());
}
catch (InvocationTargetException ex) {
if (ex.getTargetException() instanceof JobExecutionException) {
// -> JobExecutionException, to be logged at info level by Quartz
throw (JobExecutionException) ex.getTargetException();
}
else {
// -> "unhandled exception", to be logged at error level by Quartz
throw new JobMethodInvocationFailedException(this.methodInvoker, ex.getTargetException());
}
}
catch (Exception ex) {
// -> "unhandled exception", to be logged at error level by Quartz
throw new JobMethodInvocationFailedException(this.methodInvoker, ex);
}
}
}
/**
* Extension of the MethodInvokingJob, implementing the StatefulJob interface.
* Quartz checks whether or not jobs are stateful and if so,
* won't let jobs interfere with each other.
*/
public static class StatefulMethodInvokingJob extends MethodInvokingJob implements StatefulJob {
// No implementation, just an addition of the tag interface StatefulJob
// in order to allow stateful method invoking jobs.
}
}
| true | true | public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodException {
prepare();
// Use specific name if given, else fall back to bean name.
String name = (this.name != null ? this.name : this.beanName);
// Consider the concurrent flag to choose between stateful and stateless job.
Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class);
// Build JobDetail instance.
if (jobDetailImplClass != null) {
// Using Quartz 2.0 JobDetailImpl class...
Object jobDetail = BeanUtils.instantiate(jobDetailImplClass);
BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(jobDetail);
bw.setPropertyValue("name", name);
bw.setPropertyValue("group", this.group);
bw.setPropertyValue("jobClass", jobClass);
bw.setPropertyValue("durability", true);
((JobDataMap) bw.getPropertyValue("jobDataMap")).put("methodInvoker", this);
}
else {
// Using Quartz 1.x JobDetail class...
this.jobDetail = new JobDetail(name, this.group, jobClass);
this.jobDetail.setVolatility(true);
this.jobDetail.setDurability(true);
this.jobDetail.getJobDataMap().put("methodInvoker", this);
}
// Register job listener names.
if (this.jobListenerNames != null) {
for (String jobListenerName : this.jobListenerNames) {
if (jobDetailImplClass != null) {
throw new IllegalStateException("Non-global JobListeners not supported on Quartz 2 - " +
"manually register a Matcher against the Quartz ListenerManager instead");
}
this.jobDetail.addJobListener(jobListenerName);
}
}
postProcessJobDetail(this.jobDetail);
}
| public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodException {
prepare();
// Use specific name if given, else fall back to bean name.
String name = (this.name != null ? this.name : this.beanName);
// Consider the concurrent flag to choose between stateful and stateless job.
Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class);
// Build JobDetail instance.
if (jobDetailImplClass != null) {
// Using Quartz 2.0 JobDetailImpl class...
this.jobDetail = (JobDetail) BeanUtils.instantiate(jobDetailImplClass);
BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(this.jobDetail);
bw.setPropertyValue("name", name);
bw.setPropertyValue("group", this.group);
bw.setPropertyValue("jobClass", jobClass);
bw.setPropertyValue("durability", true);
((JobDataMap) bw.getPropertyValue("jobDataMap")).put("methodInvoker", this);
}
else {
// Using Quartz 1.x JobDetail class...
this.jobDetail = new JobDetail(name, this.group, jobClass);
this.jobDetail.setVolatility(true);
this.jobDetail.setDurability(true);
this.jobDetail.getJobDataMap().put("methodInvoker", this);
}
// Register job listener names.
if (this.jobListenerNames != null) {
for (String jobListenerName : this.jobListenerNames) {
if (jobDetailImplClass != null) {
throw new IllegalStateException("Non-global JobListeners not supported on Quartz 2 - " +
"manually register a Matcher against the Quartz ListenerManager instead");
}
this.jobDetail.addJobListener(jobListenerName);
}
}
postProcessJobDetail(this.jobDetail);
}
|
diff --git a/src/net/slipcor/pvparena/commands/PAG_Arenaclass.java b/src/net/slipcor/pvparena/commands/PAG_Arenaclass.java
index ca5b0c9e..3eb992f0 100644
--- a/src/net/slipcor/pvparena/commands/PAG_Arenaclass.java
+++ b/src/net/slipcor/pvparena/commands/PAG_Arenaclass.java
@@ -1,71 +1,71 @@
package net.slipcor.pvparena.commands;
import net.slipcor.pvparena.arena.Arena;
import net.slipcor.pvparena.arena.ArenaClass;
import net.slipcor.pvparena.arena.ArenaPlayer;
import net.slipcor.pvparena.core.Config.CFG;
import net.slipcor.pvparena.core.Help;
import net.slipcor.pvparena.core.Language;
import net.slipcor.pvparena.core.Help.HELP;
import net.slipcor.pvparena.core.Language.MSG;
import net.slipcor.pvparena.managers.InventoryManager;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
/**
* <pre>PVP Arena JOIN Command class</pre>
*
* A command to join an arena
*
* @author slipcor
*
* @version v0.10.0
*/
public class PAG_Arenaclass extends AbstractArenaCommand {
public PAG_Arenaclass() {
super(new String[] {"pvparena.user"});
}
@Override
public void commit(final Arena arena, final CommandSender sender, final String[] args) {
if (!this.hasPerms(sender, arena) || !arena.getArenaConfig().getBoolean(CFG.USES_INGAMECLASSSWITCH)) {
return;
}
if (!argCountValid(sender, arena, args, new Integer[]{1})) {
return;
}
if (!(sender instanceof Player)) {
Arena.pmsg(sender, Language.parse(MSG.ERROR_ONLY_PLAYERS));
return;
}
final ArenaPlayer aPlayer = ArenaPlayer.parsePlayer(sender.getName());
final ArenaClass aClass = arena.getClass(args[0]);
if (aClass == null) {
sender.sendMessage(Language.parse(MSG.ERROR_CLASS_NOT_FOUND, args[0]));
return;
}
InventoryManager.clearInventory(aPlayer.get());
aPlayer.setArenaClass(aClass);
- aClass.equip(aPlayer.get());
+ ArenaPlayer.givePlayerFightItems(arena, aPlayer.get());
sender.sendMessage(Language.parse(MSG.CLASS_SELECTED, aClass.getName()));
}
@Override
public String getName() {
return this.getClass().getName();
}
@Override
public void displayHelp(final CommandSender sender) {
Arena.pmsg(sender, Help.parse(HELP.ARENACLASS));
}
}
| true | true | public void commit(final Arena arena, final CommandSender sender, final String[] args) {
if (!this.hasPerms(sender, arena) || !arena.getArenaConfig().getBoolean(CFG.USES_INGAMECLASSSWITCH)) {
return;
}
if (!argCountValid(sender, arena, args, new Integer[]{1})) {
return;
}
if (!(sender instanceof Player)) {
Arena.pmsg(sender, Language.parse(MSG.ERROR_ONLY_PLAYERS));
return;
}
final ArenaPlayer aPlayer = ArenaPlayer.parsePlayer(sender.getName());
final ArenaClass aClass = arena.getClass(args[0]);
if (aClass == null) {
sender.sendMessage(Language.parse(MSG.ERROR_CLASS_NOT_FOUND, args[0]));
return;
}
InventoryManager.clearInventory(aPlayer.get());
aPlayer.setArenaClass(aClass);
aClass.equip(aPlayer.get());
sender.sendMessage(Language.parse(MSG.CLASS_SELECTED, aClass.getName()));
}
| public void commit(final Arena arena, final CommandSender sender, final String[] args) {
if (!this.hasPerms(sender, arena) || !arena.getArenaConfig().getBoolean(CFG.USES_INGAMECLASSSWITCH)) {
return;
}
if (!argCountValid(sender, arena, args, new Integer[]{1})) {
return;
}
if (!(sender instanceof Player)) {
Arena.pmsg(sender, Language.parse(MSG.ERROR_ONLY_PLAYERS));
return;
}
final ArenaPlayer aPlayer = ArenaPlayer.parsePlayer(sender.getName());
final ArenaClass aClass = arena.getClass(args[0]);
if (aClass == null) {
sender.sendMessage(Language.parse(MSG.ERROR_CLASS_NOT_FOUND, args[0]));
return;
}
InventoryManager.clearInventory(aPlayer.get());
aPlayer.setArenaClass(aClass);
ArenaPlayer.givePlayerFightItems(arena, aPlayer.get());
sender.sendMessage(Language.parse(MSG.CLASS_SELECTED, aClass.getName()));
}
|
diff --git a/sonar-server/src/test/java/org/sonar/server/startup/JdbcDriverDeployerTest.java b/sonar-server/src/test/java/org/sonar/server/startup/JdbcDriverDeployerTest.java
index eeb5a76ef2..f9d5b64c79 100644
--- a/sonar-server/src/test/java/org/sonar/server/startup/JdbcDriverDeployerTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/startup/JdbcDriverDeployerTest.java
@@ -1,57 +1,57 @@
/*
* Sonar, open source software quality management tool.
* Copyright (C) 2008-2012 SonarSource
* mailto:contact AT sonarsource DOT com
*
* Sonar 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.
*
* Sonar 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 Sonar; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
*/
package org.sonar.server.startup;
import org.apache.commons.io.FileUtils;
import org.junit.Test;
import org.sonar.server.platform.DefaultServerFileSystem;
import org.sonar.test.TestUtils;
import java.io.File;
import static org.fest.assertions.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class JdbcDriverDeployerTest {
@Test
public void test_deploy() throws Exception {
DefaultServerFileSystem fs = mock(DefaultServerFileSystem.class);
File initialDriver = TestUtils.getResource(getClass(), "deploy/my-driver.jar");
when(fs.getJdbcDriver()).thenReturn(initialDriver);
File deployDir = TestUtils.getTestTempDir(getClass(), "deploy", true);
when(fs.getDeployDir()).thenReturn(deployDir);
File deployedIndex = new File(deployDir, "jdbc-driver.txt");
File deployedFile = new File(deployDir, "my-driver.jar");
assertThat(deployedIndex).doesNotExist();
assertThat(deployedFile).doesNotExist();
when(fs.getDeployedJdbcDriverIndex()).thenReturn(deployedIndex);
JdbcDriverDeployer deployer = new JdbcDriverDeployer(fs);
deployer.start();
assertThat(deployedIndex).exists();
assertThat(deployedFile).exists();
assertThat(deployedFile).hasSize(initialDriver.length());
- assertThat(FileUtils.readFileToString(deployedIndex)).isEqualTo("my-driver.jar|02B97F7BC37B2B68FC847FCC3FC1C156");
+ assertThat(FileUtils.readFileToString(deployedIndex)).isEqualTo("my-driver.jar|02b97f7bc37b2b68fc847fcc3fc1c156");
}
}
| true | true | public void test_deploy() throws Exception {
DefaultServerFileSystem fs = mock(DefaultServerFileSystem.class);
File initialDriver = TestUtils.getResource(getClass(), "deploy/my-driver.jar");
when(fs.getJdbcDriver()).thenReturn(initialDriver);
File deployDir = TestUtils.getTestTempDir(getClass(), "deploy", true);
when(fs.getDeployDir()).thenReturn(deployDir);
File deployedIndex = new File(deployDir, "jdbc-driver.txt");
File deployedFile = new File(deployDir, "my-driver.jar");
assertThat(deployedIndex).doesNotExist();
assertThat(deployedFile).doesNotExist();
when(fs.getDeployedJdbcDriverIndex()).thenReturn(deployedIndex);
JdbcDriverDeployer deployer = new JdbcDriverDeployer(fs);
deployer.start();
assertThat(deployedIndex).exists();
assertThat(deployedFile).exists();
assertThat(deployedFile).hasSize(initialDriver.length());
assertThat(FileUtils.readFileToString(deployedIndex)).isEqualTo("my-driver.jar|02B97F7BC37B2B68FC847FCC3FC1C156");
}
| public void test_deploy() throws Exception {
DefaultServerFileSystem fs = mock(DefaultServerFileSystem.class);
File initialDriver = TestUtils.getResource(getClass(), "deploy/my-driver.jar");
when(fs.getJdbcDriver()).thenReturn(initialDriver);
File deployDir = TestUtils.getTestTempDir(getClass(), "deploy", true);
when(fs.getDeployDir()).thenReturn(deployDir);
File deployedIndex = new File(deployDir, "jdbc-driver.txt");
File deployedFile = new File(deployDir, "my-driver.jar");
assertThat(deployedIndex).doesNotExist();
assertThat(deployedFile).doesNotExist();
when(fs.getDeployedJdbcDriverIndex()).thenReturn(deployedIndex);
JdbcDriverDeployer deployer = new JdbcDriverDeployer(fs);
deployer.start();
assertThat(deployedIndex).exists();
assertThat(deployedFile).exists();
assertThat(deployedFile).hasSize(initialDriver.length());
assertThat(FileUtils.readFileToString(deployedIndex)).isEqualTo("my-driver.jar|02b97f7bc37b2b68fc847fcc3fc1c156");
}
|
diff --git a/beam-visat-rcp/src/main/java/org/esa/beam/visat/toolviews/stat/MultipleRoiComputePanel.java b/beam-visat-rcp/src/main/java/org/esa/beam/visat/toolviews/stat/MultipleRoiComputePanel.java
index 1bd18540c..7980205bb 100644
--- a/beam-visat-rcp/src/main/java/org/esa/beam/visat/toolviews/stat/MultipleRoiComputePanel.java
+++ b/beam-visat-rcp/src/main/java/org/esa/beam/visat/toolviews/stat/MultipleRoiComputePanel.java
@@ -1,259 +1,262 @@
/*
* Copyright (C) 2010 Brockmann Consult GmbH ([email protected])
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option)
* any later version.
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, see http://www.gnu.org/licenses/
*/
package org.esa.beam.visat.toolviews.stat;
import com.bc.ceres.swing.TableLayout;
import com.jidesoft.list.QuickListFilterField;
import com.jidesoft.swing.CheckBoxList;
import com.jidesoft.swing.SearchableUtils;
import org.esa.beam.framework.datamodel.Mask;
import org.esa.beam.framework.datamodel.Product;
import org.esa.beam.framework.datamodel.ProductNode;
import org.esa.beam.framework.datamodel.ProductNodeEvent;
import org.esa.beam.framework.datamodel.ProductNodeGroup;
import org.esa.beam.framework.datamodel.ProductNodeListener;
import org.esa.beam.framework.datamodel.RasterDataNode;
import org.esa.beam.framework.ui.UIUtils;
import org.esa.beam.util.Debug;
import javax.swing.DefaultListModel;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.text.Position;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Arrays;
/**
* A panel which performs the 'compute' action.
*
* @author Marco Zuehlke
*/
class MultipleRoiComputePanel extends JPanel {
private final QuickListFilterField maskNameSearchField;
interface ComputeMasks {
void compute(Mask[] selectedMasks);
}
private final ProductNodeListener productNodeListener;
private final JButton computeButton;
private final JCheckBox useRoiCheckBox;
private final CheckBoxList maskNameList;
private RasterDataNode raster;
private Product product;
MultipleRoiComputePanel(final ComputeMasks method, final RasterDataNode rasterDataNode) {
productNodeListener = new PNL();
final Icon icon = UIUtils.loadImageIcon("icons/ViewRefresh16.png");
DefaultListModel maskNameListModel = new DefaultListModel();
maskNameSearchField = new QuickListFilterField(maskNameListModel);
maskNameSearchField.setHintText("Filter masks here");
- //quickSearchPanel.setBorder(new JideTitledBorder(new PartialEtchedBorder(PartialEtchedBorder.LOWERED, PartialSide.NORTH), "QuickListFilterField", JideTitledBorder.LEADING, JideTitledBorder.ABOVE_TOP));
maskNameList = new CheckBoxList(maskNameSearchField.getDisplayListModel()) {
@Override
public int getNextMatch(String prefix, int startIndex, Position.Bias bias) {
return -1;
}
@Override
public boolean isCheckBoxEnabled(int index) {
return true;
}
};
SearchableUtils.installSearchable(maskNameList);
maskNameList.getCheckBoxListSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
maskNameList.getCheckBoxListSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
if (!e.getValueIsAdjusting()) {
int[] indices = maskNameList.getCheckBoxListSelectedIndices();
System.out.println("indices = " + Arrays.toString(indices));
}
}
});
computeButton = new JButton("Compute"); /*I18N*/
computeButton.setMnemonic('C');
computeButton.setEnabled(rasterDataNode != null);
computeButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
boolean useRoi = useRoiCheckBox.isSelected();
Mask[] selectedMasks;
if (useRoi) {
int[] listIndexes = maskNameList.getCheckBoxListSelectedIndices();
- selectedMasks = new Mask[listIndexes.length];
- for (int i = 0; i < listIndexes.length; i++) {
- int listIndex = listIndexes[i];
- String maskName = maskNameList.getModel().getElementAt(listIndex).toString();
- selectedMasks[i] = raster.getProduct().getMaskGroup().get(maskName);
+ if (listIndexes.length > 0) {
+ selectedMasks = new Mask[listIndexes.length];
+ for (int i = 0; i < listIndexes.length; i++) {
+ int listIndex = listIndexes[i];
+ String maskName = maskNameList.getModel().getElementAt(listIndex).toString();
+ selectedMasks[i] = raster.getProduct().getMaskGroup().get(maskName);
+ }
+ } else {
+ selectedMasks = new Mask[]{null};
}
} else {
selectedMasks = new Mask[]{null};
}
method.compute(selectedMasks);
}
});
computeButton.setIcon(icon);
useRoiCheckBox = new JCheckBox("Use ROI mask(s):");
useRoiCheckBox.setMnemonic('R');
useRoiCheckBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
updateEnablement();
}
});
final TableLayout tableLayout = new TableLayout(1);
tableLayout.setTableAnchor(TableLayout.Anchor.SOUTHWEST);
tableLayout.setTableFill(TableLayout.Fill.HORIZONTAL);
tableLayout.setTableWeightX(1.0);
tableLayout.setTablePadding(new Insets(2, 2, 2, 2));
setLayout(tableLayout);
add(computeButton);
add(useRoiCheckBox);
add(maskNameSearchField);
add(new JScrollPane(maskNameList));
setRaster(rasterDataNode);
}
void setRaster(final RasterDataNode newRaster) {
if (this.raster != newRaster) {
this.raster = newRaster;
if (newRaster == null) {
if (product != null) {
product.removeProductNodeListener(productNodeListener);
}
product = null;
updateMaskListState();
} else if (product != newRaster.getProduct()) {
if (product != null) {
product.removeProductNodeListener(productNodeListener);
}
product = newRaster.getProduct();
if (product != null) {
product.addProductNodeListener(productNodeListener);
}
updateMaskListState();
}
}
}
private void updateMaskListState() {
DefaultListModel maskNameListModel = new DefaultListModel();
if (product != null) {
final ProductNodeGroup<Mask> maskGroup = product.getMaskGroup();
Mask[] masks = maskGroup.toArray(new Mask[0]);
for (Mask mask : masks) {
maskNameListModel.addElement(mask.getName());
}
}
try {
maskNameSearchField.setListModel(maskNameListModel);
maskNameList.setModel(maskNameSearchField.getDisplayListModel());
} catch (Throwable e) {
/*
We catch everything here, because there seems to be a bug in the combination of
JIDE QuickListFilterField and FilteredCheckBoxList:
java.lang.IndexOutOfBoundsException: bitIndex < 0: -1
at java.util.BitSet.get(BitSet.java:441)
at javax.swing.DefaultListSelectionModel.clear(DefaultListSelectionModel.java:257)
at javax.swing.DefaultListSelectionModel.setState(DefaultListSelectionModel.java:567)
at javax.swing.DefaultListSelectionModel.removeIndexInterval(DefaultListSelectionModel.java:635)
at com.jidesoft.list.CheckBoxListSelectionModelWithWrapper.removeIndexInterval(Unknown Source)
*/
Debug.trace(e);
}
updateEnablement();
}
private void updateEnablement() {
boolean hasRaster = (raster != null);
boolean hasMasks = (product != null && product.getMaskGroup().getNodeCount() > 0);
boolean canSelectMasks = hasMasks && useRoiCheckBox.isSelected();
computeButton.setEnabled(hasRaster);
useRoiCheckBox.setEnabled(hasMasks);
maskNameSearchField.setEnabled(canSelectMasks);
maskNameList.setEnabled(canSelectMasks);
}
private class PNL implements ProductNodeListener {
@Override
public void nodeAdded(ProductNodeEvent event) {
handleEvent(event);
}
@Override
public void nodeChanged(ProductNodeEvent event) {
handleEvent(event);
}
@Override
public void nodeDataChanged(ProductNodeEvent event) {
handleEvent(event);
}
@Override
public void nodeRemoved(ProductNodeEvent event) {
handleEvent(event);
}
private void handleEvent(ProductNodeEvent event) {
ProductNode sourceNode = event.getSourceNode();
if (sourceNode instanceof Mask) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
updateMaskListState();
}
});
}
}
}
}
| false | true | MultipleRoiComputePanel(final ComputeMasks method, final RasterDataNode rasterDataNode) {
productNodeListener = new PNL();
final Icon icon = UIUtils.loadImageIcon("icons/ViewRefresh16.png");
DefaultListModel maskNameListModel = new DefaultListModel();
maskNameSearchField = new QuickListFilterField(maskNameListModel);
maskNameSearchField.setHintText("Filter masks here");
//quickSearchPanel.setBorder(new JideTitledBorder(new PartialEtchedBorder(PartialEtchedBorder.LOWERED, PartialSide.NORTH), "QuickListFilterField", JideTitledBorder.LEADING, JideTitledBorder.ABOVE_TOP));
maskNameList = new CheckBoxList(maskNameSearchField.getDisplayListModel()) {
@Override
public int getNextMatch(String prefix, int startIndex, Position.Bias bias) {
return -1;
}
@Override
public boolean isCheckBoxEnabled(int index) {
return true;
}
};
SearchableUtils.installSearchable(maskNameList);
maskNameList.getCheckBoxListSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
maskNameList.getCheckBoxListSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
if (!e.getValueIsAdjusting()) {
int[] indices = maskNameList.getCheckBoxListSelectedIndices();
System.out.println("indices = " + Arrays.toString(indices));
}
}
});
computeButton = new JButton("Compute"); /*I18N*/
computeButton.setMnemonic('C');
computeButton.setEnabled(rasterDataNode != null);
computeButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
boolean useRoi = useRoiCheckBox.isSelected();
Mask[] selectedMasks;
if (useRoi) {
int[] listIndexes = maskNameList.getCheckBoxListSelectedIndices();
selectedMasks = new Mask[listIndexes.length];
for (int i = 0; i < listIndexes.length; i++) {
int listIndex = listIndexes[i];
String maskName = maskNameList.getModel().getElementAt(listIndex).toString();
selectedMasks[i] = raster.getProduct().getMaskGroup().get(maskName);
}
} else {
selectedMasks = new Mask[]{null};
}
method.compute(selectedMasks);
}
});
computeButton.setIcon(icon);
useRoiCheckBox = new JCheckBox("Use ROI mask(s):");
useRoiCheckBox.setMnemonic('R');
useRoiCheckBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
updateEnablement();
}
});
final TableLayout tableLayout = new TableLayout(1);
tableLayout.setTableAnchor(TableLayout.Anchor.SOUTHWEST);
tableLayout.setTableFill(TableLayout.Fill.HORIZONTAL);
tableLayout.setTableWeightX(1.0);
tableLayout.setTablePadding(new Insets(2, 2, 2, 2));
setLayout(tableLayout);
add(computeButton);
add(useRoiCheckBox);
add(maskNameSearchField);
add(new JScrollPane(maskNameList));
setRaster(rasterDataNode);
}
| MultipleRoiComputePanel(final ComputeMasks method, final RasterDataNode rasterDataNode) {
productNodeListener = new PNL();
final Icon icon = UIUtils.loadImageIcon("icons/ViewRefresh16.png");
DefaultListModel maskNameListModel = new DefaultListModel();
maskNameSearchField = new QuickListFilterField(maskNameListModel);
maskNameSearchField.setHintText("Filter masks here");
maskNameList = new CheckBoxList(maskNameSearchField.getDisplayListModel()) {
@Override
public int getNextMatch(String prefix, int startIndex, Position.Bias bias) {
return -1;
}
@Override
public boolean isCheckBoxEnabled(int index) {
return true;
}
};
SearchableUtils.installSearchable(maskNameList);
maskNameList.getCheckBoxListSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
maskNameList.getCheckBoxListSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
if (!e.getValueIsAdjusting()) {
int[] indices = maskNameList.getCheckBoxListSelectedIndices();
System.out.println("indices = " + Arrays.toString(indices));
}
}
});
computeButton = new JButton("Compute"); /*I18N*/
computeButton.setMnemonic('C');
computeButton.setEnabled(rasterDataNode != null);
computeButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
boolean useRoi = useRoiCheckBox.isSelected();
Mask[] selectedMasks;
if (useRoi) {
int[] listIndexes = maskNameList.getCheckBoxListSelectedIndices();
if (listIndexes.length > 0) {
selectedMasks = new Mask[listIndexes.length];
for (int i = 0; i < listIndexes.length; i++) {
int listIndex = listIndexes[i];
String maskName = maskNameList.getModel().getElementAt(listIndex).toString();
selectedMasks[i] = raster.getProduct().getMaskGroup().get(maskName);
}
} else {
selectedMasks = new Mask[]{null};
}
} else {
selectedMasks = new Mask[]{null};
}
method.compute(selectedMasks);
}
});
computeButton.setIcon(icon);
useRoiCheckBox = new JCheckBox("Use ROI mask(s):");
useRoiCheckBox.setMnemonic('R');
useRoiCheckBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
updateEnablement();
}
});
final TableLayout tableLayout = new TableLayout(1);
tableLayout.setTableAnchor(TableLayout.Anchor.SOUTHWEST);
tableLayout.setTableFill(TableLayout.Fill.HORIZONTAL);
tableLayout.setTableWeightX(1.0);
tableLayout.setTablePadding(new Insets(2, 2, 2, 2));
setLayout(tableLayout);
add(computeButton);
add(useRoiCheckBox);
add(maskNameSearchField);
add(new JScrollPane(maskNameList));
setRaster(rasterDataNode);
}
|
diff --git a/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java b/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
index 9954dcb3..ff5f445a 100644
--- a/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
+++ b/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
@@ -1,335 +1,337 @@
package org.jboss.tools.ui.bot.ext;
import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses;
import java.util.Iterator;
import org.apache.log4j.Logger;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory;
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
import org.hamcrest.Matcher;
import org.jboss.tools.ui.bot.ext.condition.ShellIsActiveCondition;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.gen.IActionItem;
import org.jboss.tools.ui.bot.ext.gen.IExport;
import org.jboss.tools.ui.bot.ext.gen.IImport;
import org.jboss.tools.ui.bot.ext.gen.INewObject;
import org.jboss.tools.ui.bot.ext.gen.IPerspective;
import org.jboss.tools.ui.bot.ext.gen.IPreference;
import org.jboss.tools.ui.bot.ext.gen.IView;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
/**
* this class represents
*
* @author lzoubek
*
*/
public class SWTOpenExt {
private static final Logger log = Logger.getLogger(SWTOpenExt.class);
private final SWTBotExt bot;
public SWTOpenExt(SWTBotExt bot) {
this.bot = bot;
}
/**
* opens and shows view defined by given argument
*/
public SWTBotView viewOpen(IView view) {
SWTBotView viewObj = null;
try {
viewObj = bot.viewByTitle(view.getName());
viewObj.setFocus();
viewObj.show();
return viewObj;
} catch (WidgetNotFoundException ex) {
}
bot.menu("Window").menu("Show View").menu("Other...").click();
SWTBotShell shell = bot.shell("Show View");
shell.activate();
selectTreeNode(view);
bot.button("OK").click();
viewObj = bot.viewByTitle(view.getName());
viewObj.setFocus();
viewObj.show();
return viewObj;
}
/**
* closes given view
*
* @param view
*/
public void viewClose(IView view) {
try {
bot.viewByTitle(view.getName()).close();
} catch (WidgetNotFoundException ex) {
log.info("Unsuccessfull attempt to close view '" + view.getName()
+ "'");
}
}
/**
* selects given actionItem in bot's tree();
*
* @param item
*/
public void selectTreeNode(IActionItem item) {
selectTreeNode(this.bot,item);
}
public void selectTreeNode(SWTBot bot, String... items) {
selectTreeNode(bot,ActionItem.create(items));
}
/**
* selects given actionItem in bot's tree();
*
* @param item
*/
public void selectTreeNode(SWTBot bot, IActionItem item) {
SWTBotTreeItem ti = null;
try {
Iterator<String> iter = item.getGroupPath().iterator();
if (iter.hasNext()) {
String next = iter.next();
ti = bot.tree().expandNode(next);
try {
while (iter.hasNext()) {
next = iter.next();
// expanding node is failing, so try to collapse and
// expand it again
ti.expand();
ti = ti.expandNode(next);
}
next = item.getName();
ti.expandNode(next).select();
} catch (WidgetNotFoundException ex) {
log
.warn("Tree item '"
+ next
+ "' was not found, trying to collapse and reexpand parent node");
ti.collapse();
ti.expand();
ti.select();
ti = ti.expandNode(next);
ti.select();
}
} else {
bot.tree().select(item.getName());
}
} catch (WidgetNotFoundException ex) {
String exStr = "Item '" + ActionItem.getItemString(item)
+ "' does not exist in tree";
if (ti != null) {
exStr += ", last selected item was '" + ti.getText() + "'";
}
throw new WidgetNotFoundException(exStr, ex);
}
}
/**
* shows Preferences dialog, select given preference in tree
*
* @param pref
* @return
*/
public SWTBot preferenceOpen(IPreference pref) {
if (SWTJBTExt.isRunningOnMacOs()){
bot.shells()[0].pressShortcut(SWT.COMMAND, ',');
}
else{
bot.menu("Window").menu("Preferences").click();
}
bot.waitUntil(new ShellIsActiveCondition("Preferences"),Timing.time5S());
SWTBotShell shell = bot.shell("Preferences");
try{
selectTreeNode(pref);
}catch (WidgetNotFoundException wnfe){
shell.bot().button(IDELabel.Button.CANCEL).click();
throw wnfe;
}
return shell.bot();
}
/**
* switches perspective
*
* @param perspective
*/
public void perspective(IPerspective perspective) {
bot.menu("Window").menu("Open Perspective").menu("Other...").click();
SWTBotShell shell = bot.shell("Open Perspective");
shell.activate();
if(bot.table().containsItem(perspective.getName())) {
bot.table().select(perspective.getName());
} else {
bot.table().select(perspective.getName()+ " (default)");
}
bot.button("OK").click();
log.info("Perspective switched to '" + perspective.getName() + "'");
}
/**
* shows new 'anything' dialog selecting given argument in treeview and
* clicks next button
*
* @param wizard
* @return
*/
public SWTBot newObject(INewObject wizard) {
bot.menu("File").menu("New").menu("Other...").click();
waitForShell("New");
SWTBotShell shell = bot.shell("New");
shell.activate();
selectTreeNode(wizard);
bot.button("Next >").click();
return bot;
}
/**
* Wait for appearance shell of given name
*
* @param shellName
*/
public void waitForShell(String shellName) {
Matcher<Shell> matcher = WidgetMatcherFactory.withText(shellName);
bot.waitUntil(Conditions.waitForShell(matcher));
}
/**
* shows import wizard dialog selecting given argument in treeview and
* clicks next button
*
* @param importWizard
* @return
*/
public SWTBot newImport(IImport importWizard) {
bot.menu("File").menu("Import...").click();
SWTBotShell shell = bot.shell("Import");
shell.activate();
selectTreeNode(importWizard);
bot.button("Next >").click();
return bot;
}
/**
* shows import wizard dialog selecting given argument in treeview and
* clicks next button
*
* @param importWizard
* @return
*/
public SWTBot newExport(IExport export) {
bot.menu("File").menu("Export...").click();
SWTBotShell shell = bot.shell("Export");
shell.activate();
selectTreeNode(export);
bot.button("Next >").click();
return bot;
}
/**
* closes active window clicking 'Cancel'
*
* @param bot
*/
public void closeCancel(SWTBot bot) {
SWTBotButton btn = bot.button("Cancel");
btn.click();
}
/**
* clicks given button on active shell and waits until shell disappears
*
* @param bot
* @param finishButtonText
*/
public void finish(SWTBot bot, String finishButtonText) {
finish(bot, finishButtonText,false);
}
/**
* clicks given button on active shell and waits until shell disappears
*
* @param bot
* @param finishButtonText
* @param autoCloseShells true if you want close all possibly risen shells when closing
*/
public void finish(SWTBot bot, String finishButtonText,
boolean autoCloseShells) {
long timeout = 480 * 1000;
SWTBotShell activeShell = bot.activeShell();
String activeShellStr = bot.activeShell().getText();
bot.button(finishButtonText).click();
SWTEclipseExt.hideWarningIfDisplayed(bot);
long time = System.currentTimeMillis();
- while (true) {
+ boolean isOpened = true;
+ while (isOpened) {
log.info("Waiting until shell '" + activeShellStr + "' closes");
try {
bot.waitUntil(shellCloses(activeShell));
+ isOpened = false;
log.info("OK, shell '" + activeShellStr + "' closed.");
- return;
} catch (TimeoutException ex) {
if (autoCloseShells) {
String currentShellStr = bot.activeShell().getText();
if (!activeShellStr.equals(currentShellStr)) {
log
.error("Unexpected shell '"
+ currentShellStr
+ "': ["
+ SWTUtilExt
.getAllBotWidgetsAsText(bot)
+ "] appeared, when waiting for shell to close");
bot.activeShell().close();
log.info("Shell '" + currentShellStr + "' closed, clicking finish button again.");
bot.button(finishButtonText).click();
}
}
if (System.currentTimeMillis() - time > timeout) {
log
.error("Shell '"
+ activeShellStr
+ "' probably hanged up (480s timeout), returning, forcing to close it, expect errors");
try {
bot.activeShell().close();
activeShell.close();
bot.waitUntil(shellCloses(activeShell));
log.info("Shell '" + activeShellStr
+ "' was forced to close.");
- return;
+ isOpened = false;
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Error when closing shells: " + e);
}
throw new WidgetNotFoundException("Shell '"
+ activeShellStr + "' did not close after timeout",
ex);
}
log.warn("Shell '" + activeShellStr + "' is still opened");
}
}
+ log.info("Method finish() for shell '" + activeShellStr + "' finished successfully");
}
/**
* clicks 'Finish' button on active shell and waits until shell disappears
*
* @param bot
*/
public void finish(SWTBot bot) {
finish(bot, "Finish",false);
}
public void finish(SWTBot bot, boolean autoCloseShells) {
finish(bot, "Finish",autoCloseShells);
}
}
| false | true | public void finish(SWTBot bot, String finishButtonText,
boolean autoCloseShells) {
long timeout = 480 * 1000;
SWTBotShell activeShell = bot.activeShell();
String activeShellStr = bot.activeShell().getText();
bot.button(finishButtonText).click();
SWTEclipseExt.hideWarningIfDisplayed(bot);
long time = System.currentTimeMillis();
while (true) {
log.info("Waiting until shell '" + activeShellStr + "' closes");
try {
bot.waitUntil(shellCloses(activeShell));
log.info("OK, shell '" + activeShellStr + "' closed.");
return;
} catch (TimeoutException ex) {
if (autoCloseShells) {
String currentShellStr = bot.activeShell().getText();
if (!activeShellStr.equals(currentShellStr)) {
log
.error("Unexpected shell '"
+ currentShellStr
+ "': ["
+ SWTUtilExt
.getAllBotWidgetsAsText(bot)
+ "] appeared, when waiting for shell to close");
bot.activeShell().close();
log.info("Shell '" + currentShellStr + "' closed, clicking finish button again.");
bot.button(finishButtonText).click();
}
}
if (System.currentTimeMillis() - time > timeout) {
log
.error("Shell '"
+ activeShellStr
+ "' probably hanged up (480s timeout), returning, forcing to close it, expect errors");
try {
bot.activeShell().close();
activeShell.close();
bot.waitUntil(shellCloses(activeShell));
log.info("Shell '" + activeShellStr
+ "' was forced to close.");
return;
} catch (Exception e) {
e.printStackTrace();
}
throw new WidgetNotFoundException("Shell '"
+ activeShellStr + "' did not close after timeout",
ex);
}
log.warn("Shell '" + activeShellStr + "' is still opened");
}
}
}
| public void finish(SWTBot bot, String finishButtonText,
boolean autoCloseShells) {
long timeout = 480 * 1000;
SWTBotShell activeShell = bot.activeShell();
String activeShellStr = bot.activeShell().getText();
bot.button(finishButtonText).click();
SWTEclipseExt.hideWarningIfDisplayed(bot);
long time = System.currentTimeMillis();
boolean isOpened = true;
while (isOpened) {
log.info("Waiting until shell '" + activeShellStr + "' closes");
try {
bot.waitUntil(shellCloses(activeShell));
isOpened = false;
log.info("OK, shell '" + activeShellStr + "' closed.");
} catch (TimeoutException ex) {
if (autoCloseShells) {
String currentShellStr = bot.activeShell().getText();
if (!activeShellStr.equals(currentShellStr)) {
log
.error("Unexpected shell '"
+ currentShellStr
+ "': ["
+ SWTUtilExt
.getAllBotWidgetsAsText(bot)
+ "] appeared, when waiting for shell to close");
bot.activeShell().close();
log.info("Shell '" + currentShellStr + "' closed, clicking finish button again.");
bot.button(finishButtonText).click();
}
}
if (System.currentTimeMillis() - time > timeout) {
log
.error("Shell '"
+ activeShellStr
+ "' probably hanged up (480s timeout), returning, forcing to close it, expect errors");
try {
bot.activeShell().close();
activeShell.close();
bot.waitUntil(shellCloses(activeShell));
log.info("Shell '" + activeShellStr
+ "' was forced to close.");
isOpened = false;
} catch (Exception e) {
log.error("Error when closing shells: " + e);
}
throw new WidgetNotFoundException("Shell '"
+ activeShellStr + "' did not close after timeout",
ex);
}
log.warn("Shell '" + activeShellStr + "' is still opened");
}
}
log.info("Method finish() for shell '" + activeShellStr + "' finished successfully");
}
|
diff --git a/grisu-commons/src/main/java/org/vpac/grisu/settings/Environment.java b/grisu-commons/src/main/java/org/vpac/grisu/settings/Environment.java
index 1082b52b..6fefa008 100644
--- a/grisu-commons/src/main/java/org/vpac/grisu/settings/Environment.java
+++ b/grisu-commons/src/main/java/org/vpac/grisu/settings/Environment.java
@@ -1,190 +1,191 @@
package org.vpac.grisu.settings;
import java.io.File;
import org.apache.commons.lang.StringUtils;
/**
* This class manages the location/values of some required files/environment
* variables.
*
* @author Markus Binsteiner
*
*/
public final class Environment {
private static final String GRISU_DEFAULT_DIRECTORY = System
.getProperty("user.home")
+ File.separator + ".grisu";
private static final String GRISU_SYSTEM_WIDE_CONFIG_DIR = "/etc/grisu";
private static final String GRISU_SYSTEM_WIDE_VAR_DIR = "/var/lib/grisu/";
private static final String GRISU_CLIENT_DIR = System
.getProperty("user.home")
+ File.separator + ".grisu";
private static String USER_SET_GRISU_DIRECTORY = null;
private static boolean grisuDirectoryAccessed = false;
private static String GLOBUS_HOME;
private static File GRISU_DIRECTORY;
public static String getAvailableTemplatesDirectory() {
return getGrisuDirectory() + File.separator + "templates_available";
}
public static String getAxisClientConfig() {
return getGlobusHome() + File.separator + "client-config.wsdd";
}
public static String getCacheDirName() {
return "cache";
}
public static String getGlobusHome() {
if (StringUtils.isBlank(GLOBUS_HOME)) {
GLOBUS_HOME = getVarGrisuDirectory() + File.separator + "globus";
}
return GLOBUS_HOME;
}
public static File getGrisuClientDirectory() {
if ( getGrisuDirectory().equals(new File(GRISU_SYSTEM_WIDE_CONFIG_DIR)) ) {
File clientDir = new File(GRISU_CLIENT_DIR);
if ( ! clientDir.exists() ) {
if (! clientDir.mkdirs() ) {
throw new RuntimeException("Could not create grisu client settings directory "+clientDir.toString()+". Please adjust permissions.");
}
}
if ( ! clientDir.canWrite() ) {
throw new RuntimeException("Can't write to directory "+clientDir.toString()+". Please adjust permissions.");
}
return clientDir;
} else {
return getGrisuDirectory();
}
}
/**
* This one returns the location where grisu specific config/cache files are
* stored. If it does not exist it gets created.
*
* @return the location of grisu specific config/cache files
*/
public static File getGrisuDirectory() {
grisuDirectoryAccessed = true;
if (GRISU_DIRECTORY == null) {
File grisuDir = null;
if (StringUtils.isNotBlank(USER_SET_GRISU_DIRECTORY)) {
// first, check whether user specified his own directory
grisuDir = new File(USER_SET_GRISU_DIRECTORY);
+ GRISU_DIRECTORY = grisuDir;
} else {
grisuDir = new File(GRISU_SYSTEM_WIDE_CONFIG_DIR);
// now try whether a .grisu directory exists in the users home dir
// if not, check "/etc/grisu"
if ( grisuDir.exists() ) {
GRISU_DIRECTORY = grisuDir;
} else {
grisuDir = new File(GRISU_DEFAULT_DIRECTORY);
if ( grisuDir.exists() ) {
GRISU_DIRECTORY = grisuDir;
} else {
// create the default .grisu dir in users home
grisuDir.mkdirs();
GRISU_DIRECTORY = grisuDir;
}
}
}
}
return GRISU_DIRECTORY;
}
/**
* The location where the remote filesystems are cached locally.
*
* @return the root of the local cache
*/
public static File getGrisuLocalCacheRoot() {
File root = new File(getGrisuClientDirectory(), getCacheDirName());
if (!root.exists()) {
if (!root.mkdirs()) {
if (!root.exists()) {
throw new RuntimeException(
"Could not create local cache root directory: "
+ root.getAbsolutePath()
+ ". Please check the permissions.");
}
}
}
return root;
}
public static File getGrisuPluginDirectory() {
File dir = new File(getGrisuClientDirectory(), "plugins");
if (!dir.exists()) {
dir.mkdirs();
}
return dir;
}
/**
* For some jobs/applications it is useful to cache output files locally so
* they don't have to be transferred over and over again.
*
* @return the location of the local directory where all job output files
* are chached (in subdirectories named after the jobname)
*/
public static File getLocalJobCacheDirectory() {
File dir = new File(getGrisuClientDirectory(), "jobs");
dir.mkdirs();
return dir;
}
public static String getTemplateDirectory() {
return getGrisuClientDirectory() + File.separator + "templates";
}
public static File getVarGrisuDirectory() {
if ( getGrisuDirectory().equals(new File(GRISU_SYSTEM_WIDE_CONFIG_DIR)) ) {
File varDir = new File(GRISU_SYSTEM_WIDE_VAR_DIR);
if ( ! varDir.canWrite() ) {
throw new RuntimeException("Can't write to directory "+varDir.toString()+". Please adjust permissions.");
}
return varDir;
} else {
return getGrisuDirectory();
}
}
public static void setGrisuDirectory(String path) {
if ( grisuDirectoryAccessed ) {
throw new RuntimeException("Can't set grisu directory because it was accessed once already. You need to set it before you do anything else.");
}
if (GRISU_DIRECTORY != null) {
throw new RuntimeException(
"Can't set grisu directory because it was already accessed once after the start of this application...");
}
USER_SET_GRISU_DIRECTORY = path;
}
private Environment() {
}
}
| true | true | public static File getGrisuDirectory() {
grisuDirectoryAccessed = true;
if (GRISU_DIRECTORY == null) {
File grisuDir = null;
if (StringUtils.isNotBlank(USER_SET_GRISU_DIRECTORY)) {
// first, check whether user specified his own directory
grisuDir = new File(USER_SET_GRISU_DIRECTORY);
} else {
grisuDir = new File(GRISU_SYSTEM_WIDE_CONFIG_DIR);
// now try whether a .grisu directory exists in the users home dir
// if not, check "/etc/grisu"
if ( grisuDir.exists() ) {
GRISU_DIRECTORY = grisuDir;
} else {
grisuDir = new File(GRISU_DEFAULT_DIRECTORY);
if ( grisuDir.exists() ) {
GRISU_DIRECTORY = grisuDir;
} else {
// create the default .grisu dir in users home
grisuDir.mkdirs();
GRISU_DIRECTORY = grisuDir;
}
}
}
}
return GRISU_DIRECTORY;
}
| public static File getGrisuDirectory() {
grisuDirectoryAccessed = true;
if (GRISU_DIRECTORY == null) {
File grisuDir = null;
if (StringUtils.isNotBlank(USER_SET_GRISU_DIRECTORY)) {
// first, check whether user specified his own directory
grisuDir = new File(USER_SET_GRISU_DIRECTORY);
GRISU_DIRECTORY = grisuDir;
} else {
grisuDir = new File(GRISU_SYSTEM_WIDE_CONFIG_DIR);
// now try whether a .grisu directory exists in the users home dir
// if not, check "/etc/grisu"
if ( grisuDir.exists() ) {
GRISU_DIRECTORY = grisuDir;
} else {
grisuDir = new File(GRISU_DEFAULT_DIRECTORY);
if ( grisuDir.exists() ) {
GRISU_DIRECTORY = grisuDir;
} else {
// create the default .grisu dir in users home
grisuDir.mkdirs();
GRISU_DIRECTORY = grisuDir;
}
}
}
}
return GRISU_DIRECTORY;
}
|
diff --git a/bundles/org.eclipse.orion.server.authentication.formopenid/src/org/eclipse/orion/server/authentication/formopenid/FormOpenIdAuthenticationService.java b/bundles/org.eclipse.orion.server.authentication.formopenid/src/org/eclipse/orion/server/authentication/formopenid/FormOpenIdAuthenticationService.java
index ada82956..7a0e8f9b 100644
--- a/bundles/org.eclipse.orion.server.authentication.formopenid/src/org/eclipse/orion/server/authentication/formopenid/FormOpenIdAuthenticationService.java
+++ b/bundles/org.eclipse.orion.server.authentication.formopenid/src/org/eclipse/orion/server/authentication/formopenid/FormOpenIdAuthenticationService.java
@@ -1,143 +1,143 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 IBM Corporation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.orion.server.authentication.formopenid;
import java.io.IOException;
import java.util.Properties;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.orion.internal.server.servlets.ProtocolConstants;
import org.eclipse.orion.server.authentication.form.core.FormAuthHelper;
import org.eclipse.orion.server.authentication.formopenid.httpcontext.BundleEntryHttpContext;
import org.eclipse.orion.server.authentication.formopenid.servlets.FormOpenIdLoginServlet;
import org.eclipse.orion.server.authentication.formopenid.servlets.FormOpenIdLogoutServlet;
import org.eclipse.orion.server.authentication.formopenid.servlets.ManageOpenidsServlet;
import org.eclipse.orion.server.core.LogHelper;
import org.eclipse.orion.server.core.authentication.IAuthenticationService;
import org.eclipse.orion.server.openid.core.OpenIdHelper;
import org.json.JSONException;
import org.json.JSONObject;
import org.osgi.framework.Version;
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
import org.osgi.service.http.NamespaceException;
public class FormOpenIdAuthenticationService implements IAuthenticationService {
private HttpService httpService;
private Properties defaultAuthenticationProperties;
public static final String OPENIDS_PROPERTY = "openids"; //$NON-NLS-1$
private boolean registered = false;
public Properties getDefaultAuthenticationProperties() {
return defaultAuthenticationProperties;
}
public String authenticateUser(HttpServletRequest req, HttpServletResponse resp, Properties properties) throws IOException {
String user = getAuthenticatedUser(req, resp, properties);
if (user == null) {
setNotAuthenticated(req, resp, properties);
}
return user;
}
public String getAuthenticatedUser(HttpServletRequest req, HttpServletResponse resp, Properties properties) throws IOException {
String formUser = FormAuthHelper.getAuthenticatedUser(req);
if (formUser != null) {
return formUser;
}
return OpenIdHelper.getAuthenticatedUser(req);
}
public String getAuthType() {
// TODO What shall I return?
return "FORM"; //$NON-NLS-1$
}
public void configure(Properties properties) {
this.defaultAuthenticationProperties = properties;
try {
httpService.registerResources("/authenticationPlugin.html", "/web/authenticationPlugin.html", new BundleEntryHttpContext(Activator.getBundleContext().getBundle()));
} catch (Exception e) {
LogHelper.log(new Status(IStatus.WARNING, Activator.PI_FORMOPENID_SERVLETS, "Reconfiguring FormOpenIdAuthenticationService"));
}
}
private void setNotAuthenticated(HttpServletRequest req, HttpServletResponse resp, Properties properties) throws IOException {
resp.setHeader("WWW-Authenticate", HttpServletRequest.FORM_AUTH); //$NON-NLS-1$
resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
// redirection from FormAuthenticationService.setNotAuthenticated
String versionString = req.getHeader("Orion-Version"); //$NON-NLS-1$
Version version = versionString == null ? null : new Version(versionString);
// TODO: This is a workaround for calls
// that does not include the WebEclipse version header
String xRequestedWith = req.getHeader("X-Requested-With"); //$NON-NLS-1$
if (version == null && !"XMLHttpRequest".equals(xRequestedWith)) { //$NON-NLS-1$
- resp.sendRedirect(req.getContextPath() + "/mixloginstatic/LoginWindow.html?redirect=" + req.getRequestURI());
+ resp.sendRedirect(req.getContextPath() + "/mixloginstatic/LoginWindow.html?redirect=" + req.getRequestURL());
} else {
resp.setContentType(ProtocolConstants.CONTENT_TYPE_JSON);
JSONObject result = new JSONObject();
try {
result.put("SignInLocation", "/mixloginstatic/LoginWindow.html");
result.put("SignInKey", "FORMOpenIdUser");
} catch (JSONException e) {
LogHelper.log(new Status(IStatus.ERROR, Activator.PI_FORMOPENID_SERVLETS, 1, "An error occured during authenitcation", e));
}
resp.getWriter().print(result.toString());
}
}
public void setHttpService(HttpService hs) {
httpService = hs;
HttpContext httpContext = new BundleEntryHttpContext(Activator.getBundleContext().getBundle());
try {
httpService.registerResources("/mixloginstatic", "/web", //$NON-NLS-1$ //$NON-NLS-2$
httpContext);
httpService.registerServlet("/mixlogin/manageopenids", new ManageOpenidsServlet(this), null, httpContext);
httpService.registerServlet("/login", new FormOpenIdLoginServlet(this), null, httpContext); //$NON-NLS-1$
httpService.registerServlet("/logout", new FormOpenIdLogoutServlet(), null, httpContext); //$NON-NLS-1$
} catch (ServletException e) {
LogHelper.log(new Status(IStatus.ERROR, Activator.PI_FORMOPENID_SERVLETS, 1, "An error occured when registering servlets", e));
} catch (NamespaceException e) {
LogHelper.log(new Status(IStatus.ERROR, Activator.PI_FORMOPENID_SERVLETS, 1, "A namespace error occured when registering servlets", e));
}
}
public void unsetHttpService(HttpService hs) {
if (httpService != null) {
httpService.unregister("/mixloginstatic"); //$NON-NLS-1$
httpService.unregister("/mixlogin/manageopenids"); //$NON-NLS-1$
httpService.unregister("/login"); //$NON-NLS-1$
httpService.unregister("/logout"); //$NON-NLS-1$
httpService = null;
}
}
public void setRegistered(boolean registered) {
this.registered = registered;
Activator.getDefault().getResourceDecorator().setDecorate(registered);
}
public boolean getRegistered() {
return registered;
}
}
| true | true | private void setNotAuthenticated(HttpServletRequest req, HttpServletResponse resp, Properties properties) throws IOException {
resp.setHeader("WWW-Authenticate", HttpServletRequest.FORM_AUTH); //$NON-NLS-1$
resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
// redirection from FormAuthenticationService.setNotAuthenticated
String versionString = req.getHeader("Orion-Version"); //$NON-NLS-1$
Version version = versionString == null ? null : new Version(versionString);
// TODO: This is a workaround for calls
// that does not include the WebEclipse version header
String xRequestedWith = req.getHeader("X-Requested-With"); //$NON-NLS-1$
if (version == null && !"XMLHttpRequest".equals(xRequestedWith)) { //$NON-NLS-1$
resp.sendRedirect(req.getContextPath() + "/mixloginstatic/LoginWindow.html?redirect=" + req.getRequestURI());
} else {
resp.setContentType(ProtocolConstants.CONTENT_TYPE_JSON);
JSONObject result = new JSONObject();
try {
result.put("SignInLocation", "/mixloginstatic/LoginWindow.html");
result.put("SignInKey", "FORMOpenIdUser");
} catch (JSONException e) {
LogHelper.log(new Status(IStatus.ERROR, Activator.PI_FORMOPENID_SERVLETS, 1, "An error occured during authenitcation", e));
}
resp.getWriter().print(result.toString());
}
}
| private void setNotAuthenticated(HttpServletRequest req, HttpServletResponse resp, Properties properties) throws IOException {
resp.setHeader("WWW-Authenticate", HttpServletRequest.FORM_AUTH); //$NON-NLS-1$
resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
// redirection from FormAuthenticationService.setNotAuthenticated
String versionString = req.getHeader("Orion-Version"); //$NON-NLS-1$
Version version = versionString == null ? null : new Version(versionString);
// TODO: This is a workaround for calls
// that does not include the WebEclipse version header
String xRequestedWith = req.getHeader("X-Requested-With"); //$NON-NLS-1$
if (version == null && !"XMLHttpRequest".equals(xRequestedWith)) { //$NON-NLS-1$
resp.sendRedirect(req.getContextPath() + "/mixloginstatic/LoginWindow.html?redirect=" + req.getRequestURL());
} else {
resp.setContentType(ProtocolConstants.CONTENT_TYPE_JSON);
JSONObject result = new JSONObject();
try {
result.put("SignInLocation", "/mixloginstatic/LoginWindow.html");
result.put("SignInKey", "FORMOpenIdUser");
} catch (JSONException e) {
LogHelper.log(new Status(IStatus.ERROR, Activator.PI_FORMOPENID_SERVLETS, 1, "An error occured during authenitcation", e));
}
resp.getWriter().print(result.toString());
}
}
|
diff --git a/src/tests/TestingUtils.java b/src/tests/TestingUtils.java
index f9e54b1..a87717a 100644
--- a/src/tests/TestingUtils.java
+++ b/src/tests/TestingUtils.java
@@ -1,76 +1,76 @@
package tests;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import ecologylab.serialization.SIMPLTranslationException;
import ecologylab.serialization.SimplTypesScope;
import ecologylab.serialization.deserializers.parsers.tlv.Utils;
import ecologylab.serialization.formatenums.Format;
import ecologylab.translators.cocoa.CocoaTranslationException;
import ecologylab.translators.cocoa.CocoaTranslator;
public class TestingUtils
{
public static void testSerailization(Object object, DualBufferOutputStream outStream, Format format)
throws SIMPLTranslationException
{
SimplTypesScope.serialize(object, outStream, format);
printOutput(outStream, format);
}
public static void testDeserailization(InputStream inputStream,
SimplTypesScope translationScope, Format format) throws SIMPLTranslationException
{
Object object = translationScope.deserialize(inputStream, format);
DualBufferOutputStream outputStream = new DualBufferOutputStream();
testSerailization(object, outputStream, Format.XML);
}
public static void test(Object object, SimplTypesScope translationScope, Format format)
throws SIMPLTranslationException
{
DualBufferOutputStream outputStream = new DualBufferOutputStream();
testSerailization(object, outputStream, format);
testDeserailization(new ByteArrayInputStream(outputStream.toByte()), translationScope,
format);
System.out.println();
}
public static void generateCocoaClasses(SimplTypesScope typeScope) throws SIMPLTranslationException
{
CocoaTranslator ct = new CocoaTranslator();
try
{
- ct.translateToObjC(new File("/Users/nabeelshahzad/Desktop/TestCases"), typeScope);
+ ct.translateToObjC(new File("/Users/nskhan84/Desktop/TestCases"), typeScope);
}
catch (IOException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
catch (CocoaTranslationException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
}
public static void printOutput(DualBufferOutputStream outputStream, Format format)
{
if(format == Format.TLV)
{
Utils.writeHex(System.out, outputStream.toByte());
}
else
{
System.out.println(outputStream.toString());
}
}
}
| true | true | public static void generateCocoaClasses(SimplTypesScope typeScope) throws SIMPLTranslationException
{
CocoaTranslator ct = new CocoaTranslator();
try
{
ct.translateToObjC(new File("/Users/nabeelshahzad/Desktop/TestCases"), typeScope);
}
catch (IOException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
catch (CocoaTranslationException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
}
| public static void generateCocoaClasses(SimplTypesScope typeScope) throws SIMPLTranslationException
{
CocoaTranslator ct = new CocoaTranslator();
try
{
ct.translateToObjC(new File("/Users/nskhan84/Desktop/TestCases"), typeScope);
}
catch (IOException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
catch (CocoaTranslationException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
}
|
diff --git a/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java b/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java
index 21817321..52411593 100644
--- a/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java
+++ b/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java
@@ -1,101 +1,100 @@
/*******************************************************************************
* Copyright (c) 2008 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is 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:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.ws.creation.ui.widgets;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
import org.jboss.tools.ws.core.utils.StatusUtils;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
import org.jboss.tools.ws.creation.ui.utils.JBossCreationUIUtils;
/**
* @author Grid Qian
*/
@SuppressWarnings("restriction")
public class Java2WSDLCodeGenConfigWidget extends
SimpleWidgetDataContributor {
private ServiceModel model;
private Button btnUpdateWebxml;
private Combo sourceCombo;
private boolean isOK;
private IStatus status = null;
public Java2WSDLCodeGenConfigWidget(ServiceModel model) {
this.model = model;
model.setGenWSDL(false);
}
public WidgetDataEvents addControls(Composite parent,
Listener statusListener) {
Composite configCom = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
configCom.setLayout(layout);
configCom.setLayoutData(new GridData(GridData.FILL_BOTH));
//choose source folder
sourceCombo = JBossCreationUIUtils.createComboItem(configCom, model,JBossWSCreationCoreMessages.Label_SourceFolder_Name ,JBossWSCreationCoreMessages.Tooltip_SourceFolder);
sourceCombo.addListener(SWT.Modify, new Listener(){
- @Override
public void handleEvent(Event arg0) {
String javaSourceFolder = sourceCombo.getText();
model.setJavaSourceFolder(javaSourceFolder);
}
});
isOK = JBossCreationUIUtils.populateSourceFolderCombo(sourceCombo, model.getSrcList());
if(!isOK) {
status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Message_No_SourceFolder);
}
final Button wsdlGen = new Button(configCom, SWT.CHECK | SWT.NONE);
GridData wsdlGenData = new GridData();
wsdlGenData.horizontalSpan = 2;
wsdlGen.setLayoutData(wsdlGenData);
wsdlGen.setText(JBossWSCreationCoreMessages.Label_Generate_WSDL);
wsdlGen.setSelection(false);
wsdlGen.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setGenWSDL(wsdlGen.getSelection());
}
});
btnUpdateWebxml = new Button(configCom, SWT.CHECK);
btnUpdateWebxml.setText(JBossWSCreationCoreMessages.Label_Update_Webxml);
btnUpdateWebxml.setSelection(true);
btnUpdateWebxml.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e) {
model.setUpdateWebxml(btnUpdateWebxml.getSelection());
}
});
return this;
}
public IStatus getStatus() {
return status;
}
}
| true | true | public WidgetDataEvents addControls(Composite parent,
Listener statusListener) {
Composite configCom = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
configCom.setLayout(layout);
configCom.setLayoutData(new GridData(GridData.FILL_BOTH));
//choose source folder
sourceCombo = JBossCreationUIUtils.createComboItem(configCom, model,JBossWSCreationCoreMessages.Label_SourceFolder_Name ,JBossWSCreationCoreMessages.Tooltip_SourceFolder);
sourceCombo.addListener(SWT.Modify, new Listener(){
@Override
public void handleEvent(Event arg0) {
String javaSourceFolder = sourceCombo.getText();
model.setJavaSourceFolder(javaSourceFolder);
}
});
isOK = JBossCreationUIUtils.populateSourceFolderCombo(sourceCombo, model.getSrcList());
if(!isOK) {
status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Message_No_SourceFolder);
}
final Button wsdlGen = new Button(configCom, SWT.CHECK | SWT.NONE);
GridData wsdlGenData = new GridData();
wsdlGenData.horizontalSpan = 2;
wsdlGen.setLayoutData(wsdlGenData);
wsdlGen.setText(JBossWSCreationCoreMessages.Label_Generate_WSDL);
wsdlGen.setSelection(false);
wsdlGen.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setGenWSDL(wsdlGen.getSelection());
}
});
btnUpdateWebxml = new Button(configCom, SWT.CHECK);
btnUpdateWebxml.setText(JBossWSCreationCoreMessages.Label_Update_Webxml);
btnUpdateWebxml.setSelection(true);
btnUpdateWebxml.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e) {
model.setUpdateWebxml(btnUpdateWebxml.getSelection());
}
});
return this;
}
| public WidgetDataEvents addControls(Composite parent,
Listener statusListener) {
Composite configCom = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
configCom.setLayout(layout);
configCom.setLayoutData(new GridData(GridData.FILL_BOTH));
//choose source folder
sourceCombo = JBossCreationUIUtils.createComboItem(configCom, model,JBossWSCreationCoreMessages.Label_SourceFolder_Name ,JBossWSCreationCoreMessages.Tooltip_SourceFolder);
sourceCombo.addListener(SWT.Modify, new Listener(){
public void handleEvent(Event arg0) {
String javaSourceFolder = sourceCombo.getText();
model.setJavaSourceFolder(javaSourceFolder);
}
});
isOK = JBossCreationUIUtils.populateSourceFolderCombo(sourceCombo, model.getSrcList());
if(!isOK) {
status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Message_No_SourceFolder);
}
final Button wsdlGen = new Button(configCom, SWT.CHECK | SWT.NONE);
GridData wsdlGenData = new GridData();
wsdlGenData.horizontalSpan = 2;
wsdlGen.setLayoutData(wsdlGenData);
wsdlGen.setText(JBossWSCreationCoreMessages.Label_Generate_WSDL);
wsdlGen.setSelection(false);
wsdlGen.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setGenWSDL(wsdlGen.getSelection());
}
});
btnUpdateWebxml = new Button(configCom, SWT.CHECK);
btnUpdateWebxml.setText(JBossWSCreationCoreMessages.Label_Update_Webxml);
btnUpdateWebxml.setSelection(true);
btnUpdateWebxml.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e) {
model.setUpdateWebxml(btnUpdateWebxml.getSelection());
}
});
return this;
}
|
diff --git a/Osm2GpsMid/src/de/ueller/osmToGpsMid/CreateGpsMidData.java b/Osm2GpsMid/src/de/ueller/osmToGpsMid/CreateGpsMidData.java
index 02131757..12b23586 100644
--- a/Osm2GpsMid/src/de/ueller/osmToGpsMid/CreateGpsMidData.java
+++ b/Osm2GpsMid/src/de/ueller/osmToGpsMid/CreateGpsMidData.java
@@ -1,1881 +1,1881 @@
/**
* This file is part of OSM2GpsMid
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as published by
* the Free Software Foundation.
*
* Copyright (C) 2007 Harald Mueller
* Copyright (C) 2007, 2008 Kai Krueger
* Copyright (C) 2008 sk750
*
*/
package de.ueller.osmToGpsMid;
import static de.ueller.osmToGpsMid.GetText._;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import java.util.Stack;
import java.util.TreeSet;
import de.ueller.osmToGpsMid.area.Triangle;
import de.ueller.osmToGpsMid.model.Bounds;
import de.ueller.osmToGpsMid.model.ConditionTuple;
import de.ueller.osmToGpsMid.model.Connection;
import de.ueller.osmToGpsMid.model.EntityDescription;
import de.ueller.osmToGpsMid.model.Node;
import de.ueller.osmToGpsMid.model.POIdescription;
import de.ueller.osmToGpsMid.model.WayDescription;
import de.ueller.osmToGpsMid.model.Path;
import de.ueller.osmToGpsMid.model.RouteNode;
import de.ueller.osmToGpsMid.model.Sequence;
import de.ueller.osmToGpsMid.model.Tile;
import de.ueller.osmToGpsMid.model.TravelModes;
import de.ueller.osmToGpsMid.model.Way;
import de.ueller.osmToGpsMid.model.name.Names;
import de.ueller.osmToGpsMid.model.name.WayRedirect;
import de.ueller.osmToGpsMid.model.url.Urls;
import de.ueller.osmToGpsMid.tools.FileTools;
public class CreateGpsMidData implements FilenameFilter {
/**
* This class is used in order to store a tuple on a dedicated stack.
* So that it is not necessary to use the OS stack in recursion.
*/
class TileTuple {
public Tile t;
public Bounds bound;
TileTuple(Tile t, Bounds b) {
this.t = t;
this.bound = b;
}
}
public final static byte LEGEND_FLAG_IMAGE = 0x01;
public final static byte LEGEND_FLAG_SEARCH_IMAGE = 0x02;
public final static byte LEGEND_FLAG_MIN_IMAGE_SCALE = 0x04;
public final static byte LEGEND_FLAG_MIN_ONEWAY_ARROW_SCALE = LEGEND_FLAG_MIN_IMAGE_SCALE;
public final static byte LEGEND_FLAG_TEXT_COLOR = 0x08;
public final static byte LEGEND_FLAG_NON_HIDEABLE = 0x10;
// public final static byte LEGEND_FLAG_NON_ROUTABLE = 0x20; routable flag has been moved to Way
public final static byte LEGEND_FLAG_ALERT = 0x20;
public final static byte LEGEND_FLAG_MIN_DESCRIPTION_SCALE = 0x40;
public final static int LEGEND_FLAG_ADDITIONALFLAG = 0x80;
public final static int LEGEND_MAPFLAG_OUTLINE_AREA_BLOCK = 0x01;
public final static int LEGEND_MAPFLAG_TRIANGLE_AREA_BLOCK = 0x02;
public final static int LEGEND_MAPFLAG_WORDSEARCH = 0x04;
public final static int LEGEND_MAPFLAG_SOURCE_OSM_CC_BY_SA = 0x08;
public final static int LEGEND_MAPFLAG_SOURCE_OSM_ODBL = 0x10;
public final static int LEGEND_MAPFLAG_SOURCE_FI_LANDSURVEY = 0x20;
public final static int LEGEND_MAPFLAG_SOURCE_FI_DIGIROAD = 0x40;
public final static byte LEGEND_FLAG2_CLICKABLE = 0x01;
public final static byte ROUTE_FLAG_MOTORWAY = 0x01;
public final static byte ROUTE_FLAG_MOTORWAY_LINK = 0x02;
public final static byte ROUTE_FLAG_ROUNDABOUT = 0x04;
// public final static int MAX_DICT_DEEP = 5; replaced by Configuration.maxDictDepth
public final static int ROUTEZOOMLEVEL = 4;
/** The parser which parses the OSM data. The nodes, ways and relations are
* retrieved from it for further processing. */
OsmParser parser;
/** This array contains one tile for each zoom level or level of detail and
* the route tile. Each one is actually a tree of tiles because container tiles
* contain two child tiles. */
Tile tile[] = new Tile[ROUTEZOOMLEVEL + 1];
/** Output length of the route connection for statistics */
long outputLengthConns = 0;
private final String path;
Names names1;
Urls urls1;
StringBuffer sbCopiedMedias = new StringBuffer();
short mediaInclusionErrors = 0;
private final static int INODE = 1;
private final static int SEGNODE = 2;
// private Bounds[] bounds = null;
private Configuration configuration;
private int totalWaysWritten = 0;
private int totalSegsWritten = 0;
private int totalNodesWritten = 0;
private int totalPOIsWritten = 0;
private static int dictFilesWritten = 0;
private static int tileFilesWritten = 0;
private RouteData rd;
private static double MAX_RAD_RANGE = (Short.MAX_VALUE - Short.MIN_VALUE - 2000) / MyMath.FIXPT_MULT;
private String[] useLang = null;
WayRedirect wayRedirect = null;
public CreateGpsMidData(OsmParser parser, String path) {
super();
this.parser = parser;
if (Configuration.getConfiguration().sourceIsApk) {
path = path + "/assets";
}
this.path = path;
File dir = new File(path);
wayRedirect = new WayRedirect();
// first of all, delete all data-files from a previous run or files that comes
// from the mid jar file
if (dir.isDirectory()) {
File[] files = dir.listFiles();
for (File f : files) {
if (f.getName().endsWith(".d") || f.getName().endsWith(".dat")) {
if (! f.delete()) {
System.out.println("ERROR: Failed to delete file " + f.getName());
}
}
}
}
}
/** Prepares and writes the complete map data.
*/
public void exportMapToMid() {
names1 = getNames1();
urls1 = getUrls1();
exportLegend(path);
SearchList sl = new SearchList(names1, urls1, wayRedirect);
UrlList ul = new UrlList(urls1);
sl.createNameList(path);
ul.createUrlList(path);
for (int i = 0; i <= 3; i++) {
System.out.println("Exporting tiles for zoomlevel " + i );
System.out.println("===============================");
if (!LegendParser.tileScaleLevelContainsRoutableWays[i]) {
System.out.println("Info: This tile level contains no routable ways");
}
long startTime = System.currentTimeMillis();
long bytesWritten = exportMapToMid(i);
long time = (System.currentTimeMillis() - startTime);
System.out.println(" Zoomlevel " + i + ": " +
Configuration.memoryWithUnit(bytesWritten) + " in " +
tileFilesWritten + " files indexed by " + dictFilesWritten +
" dictionary files");
System.out.println(" Time taken: " + time / 1000 + " seconds");
}
if (Configuration.attrToBoolean(configuration.useRouting) >= 0) {
System.out.println("Exporting route tiles");
System.out.println("=====================");
long startTime = System.currentTimeMillis();
long bytesWritten = exportMapToMid(ROUTEZOOMLEVEL);
long time = (System.currentTimeMillis() - startTime);
System.out.println(" " + Configuration.memoryWithUnit(bytesWritten) +
" for nodes in " + tileFilesWritten + " files, " +
Configuration.memoryWithUnit(outputLengthConns) + " for connections in " +
tileFilesWritten + " files");
System.out.println(" The route tiles have been indexed by " +
dictFilesWritten + " dictionary files");
System.out.println(" Time taken: " + time / 1000 + " seconds");
} else {
System.out.println("No route tiles to export");
}
// for (int x = 1; x < 12; x++) {
// System.out.print("\n" + x + " :");
// tile[ROUTEZOOMLEVEL].printHiLo(1, x);
// }
// System.exit(2);
// create search list for whole items
//sl.createSearchList(path, SearchList.INDEX_NAME);
// create search list for names, including data for housenumber matching, primary since map version 66
sl.createSearchList(path, SearchList.INDEX_BIGNAME);
// create search list for words
if (Configuration.getConfiguration().useWordSearch) {
sl.createSearchList(path, SearchList.INDEX_WORD);
// create search list for whole words / house numbers
sl.createSearchList(path, SearchList.INDEX_WHOLEWORD);
}
if (Configuration.getConfiguration().useHouseNumbers) {
sl.createSearchList(path, SearchList.INDEX_HOUSENUMBER);
}
// Output statistics for travel modes
if (Configuration.attrToBoolean(configuration.useRouting) >= 0) {
for (int i = 0; i < TravelModes.travelModeCount; i++) {
System.out.println(TravelModes.getTravelMode(i).toString());
}
}
System.out.println(" MainStreet_Net Connections: " +
TravelModes.numMotorwayConnections + " motorway " +
TravelModes.numTrunkOrPrimaryConnections + " trunk/primary " +
TravelModes.numMainStreetNetConnections + " total");
System.out.print(" Connections with toll flag:");
for (int i = 0; i < TravelModes.travelModeCount; i++) {
System.out.print(" " + TravelModes.getTravelMode(i).getName() + "(" + TravelModes.getTravelMode(i).numTollRoadConnections + ")" );
}
System.out.println("");
System.out.println("Total ways: "+ totalWaysWritten
+ ", segments: " + totalSegsWritten
+ ", nodes: " + totalNodesWritten
+ ", POI: " + totalPOIsWritten);
}
private Names getNames1() {
Names na = new Names();
for (Way w : parser.getWays()) {
na.addName(w, wayRedirect);
}
for (Node n : parser.getNodes()) {
na.addName(n, wayRedirect);
}
System.out.println("Found " + na.getNames().size() + " names, " +
na.getCanons().size() + " canon");
na.calcNameIndex();
return (na);
}
private Urls getUrls1() {
Urls na = new Urls();
for (Way w : parser.getWays()) {
na.addUrl(w);
na.addPhone(w);
}
for (Node n : parser.getNodes()) {
na.addUrl(n);
na.addPhone(n);
}
System.out.println("found " + na.getUrls().size() + " urls, including phones ");
na.calcUrlIndex();
return (na);
}
private void exportLegend(String path) {
FileOutputStream foi;
String outputMedia;
Configuration.mapFlags = 0L;
// FIXME add .properties & GUI user interface for telling map data source
Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_CC_BY_SA;
// Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_ODBL;
- // Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_FI_LANDSURVEY;
- // Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_FI_DIGIROAD;
+ // Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_FI_LANDSURVEY;
+ // Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_FI_DIGIROAD;
if (Configuration.getConfiguration().getTriangleAreaFormat()) {
Configuration.mapFlags |= LEGEND_MAPFLAG_TRIANGLE_AREA_BLOCK;
}
if (Configuration.getConfiguration().getOutlineAreaFormat()) {
Configuration.mapFlags |= LEGEND_MAPFLAG_OUTLINE_AREA_BLOCK;
}
if (Configuration.getConfiguration().useWordSearch) {
Configuration.mapFlags |= LEGEND_MAPFLAG_WORDSEARCH;
}
try {
FileTools.createPath(new File(path + "/dat"));
foi = new FileOutputStream(path + "/legend.dat");
DataOutputStream dsi = new DataOutputStream(foi);
dsi.writeShort(Configuration.MAP_FORMAT_VERSION);
Configuration config = Configuration.getConfiguration();
/**
* Write application version
*/
dsi.writeUTF(config.getVersion());
/**
* Write bundle date
*/
dsi.writeUTF(config.getBundleDate());
/**
* Note if additional information is included that can enable editing of OSM data
*/
dsi.writeBoolean(config.enableEditingSupport);
/* Note what languages are enabled
*/
useLang = configuration.getUseLang().split("[;,]", 200);
String useLangName[] = configuration.getUseLangName().split("[;,]", 200);
if (useLangName.length != useLang.length) {
System.out.println("");
System.out.println(" Warning: useLang count " + useLang.length +
" different than useLangName count " + useLangName.length +
" - ignoring useLangNames");
System.out.println("");
useLangName = useLang;
}
// make all available languages the same for now
for (int i = 1; i <= 5 ; i++) {
dsi.writeShort(useLang.length);
for (int j = 0 ; j < useLang.length ; j++) {
dsi.writeUTF(useLang[j]);
dsi.writeUTF(useLangName[j]);
}
}
// remove unneeded .loc files
if (!Configuration.getConfiguration().allLang) {
String langs = configuration.getUseLang() + ",en";
removeFilesWithExt(path, "loc", langs.split("[;,]", 200));
}
// remove class files (midlet code) if building just the map
if (!configuration.getMapName().equals("")) {
removeFilesWithExt(path, "class", null);
}
/**
* Note if urls and phones are in the midlet
*/
dsi.writeBoolean(config.useUrlTags);
dsi.writeBoolean(config.usePhoneTags);
/**
* Writing colors
*/
dsi.writeShort((short) Configuration.COLOR_COUNT);
for (int i = 0; i < Configuration.COLOR_COUNT; i++) {
if (Configuration.COLORS_AT_NIGHT[i] != -1) {
dsi.writeInt(0x01000000 | Configuration.COLORS[i]);
dsi.writeInt(Configuration.COLORS_AT_NIGHT[i]);
} else {
dsi.writeInt(Configuration.COLORS[i]);
}
}
/**
* Write Tile Scale Levels
*/
for (int i = 0; i < 4; i++) {
if (LegendParser.tileScaleLevelContainsRoutableWays[i]) {
dsi.writeInt(LegendParser.tileScaleLevel[i]);
} else {
dsi.writeInt( -LegendParser.tileScaleLevel[i] );
}
}
/**
* Write Travel Modes
*/
dsi.writeByte(TravelModes.travelModeCount);
for (int i = 0; i < TravelModes.travelModeCount; i++) {
dsi.writeUTF(_(TravelModes.getTravelMode(i).getName()));
dsi.writeShort(TravelModes.getTravelMode(i).maxPrepareMeters);
dsi.writeShort(TravelModes.getTravelMode(i).maxInMeters);
dsi.writeShort(TravelModes.getTravelMode(i).maxEstimationSpeed);
dsi.writeByte(TravelModes.getTravelMode(i).travelModeFlags);
}
/**
* Writing POI legend data
*/
/**
* // polish.api.bigstyles * Are there more way or poi styles than 126
*/
//System.err.println("Big styles:" + config.bigStyles);
// polish.api.bigstyles
// backwards compatibility - use "0" as a marker that we use a short for # of styles
if (config.bigStyles) {
dsi.writeByte((byte) 0);
dsi.writeShort(config.getPOIDescs().size());
} else {
dsi.writeByte(config.getPOIDescs().size());
}
for (EntityDescription entity : config.getPOIDescs()) {
POIdescription poi = (POIdescription) entity;
byte flags = 0;
byte flags2 = 0;
if (poi.image != null && !poi.image.equals("")) {
flags |= LEGEND_FLAG_IMAGE;
}
if (poi.searchIcon != null) {
flags |= LEGEND_FLAG_SEARCH_IMAGE;
}
if (poi.minEntityScale != poi.minTextScale) {
flags |= LEGEND_FLAG_MIN_IMAGE_SCALE;
}
if (poi.textColor != 0) {
flags |= LEGEND_FLAG_TEXT_COLOR;
}
if (!poi.hideable) {
flags |= LEGEND_FLAG_NON_HIDEABLE;
}
if (poi.alert) {
flags |= LEGEND_FLAG_ALERT;
}
if (poi.clickable) {
flags2 |= LEGEND_FLAG2_CLICKABLE;
}
// polish.api.bigstyles
if (config.bigStyles) {
dsi.writeShort(poi.typeNum);
//System.out.println("poi typenum: " + poi.typeNum);
} else {
dsi.writeByte(poi.typeNum);
}
if (flags2 != 0) {
flags |= LEGEND_FLAG_ADDITIONALFLAG;
}
dsi.writeByte(flags);
if (flags2 != 0) {
dsi.writeByte(flags2);
}
dsi.writeUTF(_(poi.description));
dsi.writeBoolean(poi.imageCenteredOnNode);
dsi.writeInt(poi.minEntityScale);
if ((flags & LEGEND_FLAG_IMAGE) > 0) {
outputMedia = copyMediaToMid(poi.image, path, "png");
dsi.writeUTF(outputMedia);
}
if ((flags & LEGEND_FLAG_SEARCH_IMAGE) > 0) {
outputMedia = copyMediaToMid(poi.searchIcon, path, "png");
dsi.writeUTF(outputMedia);
}
if ((flags & LEGEND_FLAG_MIN_IMAGE_SCALE) > 0) {
dsi.writeInt(poi.minTextScale);
}
if ((flags & LEGEND_FLAG_TEXT_COLOR) > 0) {
dsi.writeInt(poi.textColor);
}
if (config.enableEditingSupport) {
int noKVpairs = 1;
if (poi.specialisation != null) {
for (ConditionTuple ct : poi.specialisation) {
if (!ct.exclude) {
noKVpairs++;
}
}
}
dsi.writeShort(noKVpairs);
dsi.writeUTF(poi.key);
dsi.writeUTF(poi.value);
if (poi.specialisation != null) {
for (ConditionTuple ct : poi.specialisation) {
if (!ct.exclude) {
dsi.writeUTF(ct.key);
dsi.writeUTF(ct.value);
}
}
}
}
// System.out.println(poi);
}
/**
* Writing Way legend data
*/
// polish.api.bigstyles
if (config.bigStyles) {
System.out.println("waydesc size: " + Configuration.getConfiguration().getWayDescs().size());
// backwards compatibility - use "0" as a marker that we use a short for # of styles
dsi.writeByte((byte) 0);
dsi.writeShort(Configuration.getConfiguration().getWayDescs().size());
} else {
dsi.writeByte(Configuration.getConfiguration().getWayDescs().size());
}
for (EntityDescription entity : Configuration.getConfiguration().getWayDescs()) {
WayDescription way = (WayDescription) entity;
byte flags = 0;
byte flags2 = 0;
if (!way.hideable) {
flags |= LEGEND_FLAG_NON_HIDEABLE;
}
if (way.alert) {
flags |= LEGEND_FLAG_ALERT;
}
if (way.clickable) {
flags2 |= LEGEND_FLAG2_CLICKABLE;
}
if (way.image != null && !way.image.equals("")) {
flags |= LEGEND_FLAG_IMAGE;
}
if (way.searchIcon != null) {
flags |= LEGEND_FLAG_SEARCH_IMAGE;
}
if (way.minOnewayArrowScale != 0) {
flags |= LEGEND_FLAG_MIN_ONEWAY_ARROW_SCALE;
}
if (way.minDescriptionScale != 0) {
flags |= LEGEND_FLAG_MIN_DESCRIPTION_SCALE;
}
// polish.api.bigstyles
if (config.bigStyles) {
dsi.writeShort(way.typeNum);
} else {
dsi.writeByte(way.typeNum);
}
if (flags2 != 0) {
flags |= LEGEND_FLAG_ADDITIONALFLAG;
}
dsi.writeByte(flags);
if (flags2 != 0) {
dsi.writeByte(flags2);
}
byte routeFlags = 0;
if (way.value.equalsIgnoreCase("motorway")) {
routeFlags |= ROUTE_FLAG_MOTORWAY;
}
if (way.value.equalsIgnoreCase("motorway_link")) {
routeFlags |= ROUTE_FLAG_MOTORWAY_LINK;
}
dsi.writeByte(routeFlags);
dsi.writeUTF(_(way.description));
dsi.writeInt(way.minEntityScale);
dsi.writeInt(way.minTextScale);
if ((flags & LEGEND_FLAG_IMAGE) > 0) {
outputMedia = copyMediaToMid(way.image, path, "png");
dsi.writeUTF(outputMedia);
}
if ((flags & LEGEND_FLAG_SEARCH_IMAGE) > 0) {
outputMedia = copyMediaToMid(way.searchIcon, path, "png");
dsi.writeUTF(outputMedia);
}
dsi.writeBoolean(way.isArea);
if (way.lineColorAtNight != -1) {
dsi.writeInt(0x01000000 | way.lineColor);
dsi.writeInt(way.lineColorAtNight);
} else {
dsi.writeInt(way.lineColor);
}
if (way.boardedColorAtNight != -1) {
dsi.writeInt(0x01000000 | way.boardedColor);
dsi.writeInt(way.boardedColorAtNight);
} else {
dsi.writeInt(way.boardedColor);
}
dsi.writeByte(way.wayWidth);
dsi.writeInt(way.wayDescFlags);
if ((flags & LEGEND_FLAG_MIN_ONEWAY_ARROW_SCALE) > 0) {
dsi.writeInt(way.minOnewayArrowScale);
}
if ((flags & LEGEND_FLAG_MIN_DESCRIPTION_SCALE) > 0) {
dsi.writeInt(way.minDescriptionScale);
}
if (config.enableEditingSupport) {
int noKVpairs = 1;
if (way.specialisation != null) {
for (ConditionTuple ct : way.specialisation) {
if (!ct.exclude) {
noKVpairs++;
}
}
}
dsi.writeShort(noKVpairs);
dsi.writeUTF(way.key);
dsi.writeUTF(way.value);
if (way.specialisation != null) {
for (ConditionTuple ct : way.specialisation) {
if (!ct.exclude) {
dsi.writeUTF(ct.key);
dsi.writeUTF(ct.value);
}
}
}
}
// System.out.println(way);
}
if (Configuration.attrToBoolean(configuration.useIcons) < 0) {
System.out.println("Icons disabled - removing icon files from midlet.");
removeUnusedIconSizes(path, true);
} else {
// show summary for copied icon files
System.out.println("Icon inclusion summary:");
System.out.println(" " + FileTools.copyDir("icon", path, true, true) +
" internal icons replaced from " + "icon" +
System.getProperty("file.separator") + " containing " +
FileTools.countFiles("icon") + " files");
// if useIcons == small or useIcons == big rename the corresponding icons to normal icons
if ((!Configuration.getConfiguration().sourceIsApk) && Configuration.attrToBoolean(configuration.useIcons) == 0) {
renameAlternativeIconSizeToUsedIconSize(configuration.useIcons + "_");
}
if (!Configuration.getConfiguration().sourceIsApk) {
removeUnusedIconSizes(path, false);
}
}
/**
* Copy sounds for all sound formats to midlet
*/
String soundFormat[] = configuration.getUseSounds().split("[;,]", 10);
// write sound format infos
dsi.write((byte) soundFormat.length);
for (int i = 0; i < soundFormat.length; i++) {
dsi.writeUTF(soundFormat[i].trim());
}
/**
* write all sound files in each sound directory for all sound formats
*/
String soundFileDirectoriesHelp[] = configuration.getSoundFiles().split("[;,]", 10);
String soundDirsFound = "";
for (int i = 0; i < soundFileDirectoriesHelp.length; i++) {
// test existence of dir
InputStream is = null;
try {
is = new FileInputStream(configuration.getStyleFileDirectory() + soundFileDirectoriesHelp[i].trim() + "/syntax.cfg");
} catch (Exception e) {
// try internal syntax.cfg
try {
is = getClass().getResourceAsStream("/media/" + soundFileDirectoriesHelp[i].trim() + "/syntax.cfg");
} catch (Exception e2) {
;
}
}
if (is != null) {
if (soundDirsFound.equals("")) {
soundDirsFound = soundFileDirectoriesHelp[i];
} else {
soundDirsFound = soundDirsFound + ";" + soundFileDirectoriesHelp[i];
}
} else {
System.out.println ("ERROR: syntax.cfg not found in the " + soundFileDirectoriesHelp[i].trim() + " directory");
}
}
String soundFileDirectories[] = soundDirsFound.split("[;,]", 10);
dsi.write((byte) soundFileDirectories.length);
for (int i = 0; i < soundFileDirectories.length; i++) {
String destSoundPath = path + "/" + soundFileDirectories[i].trim();
// System.out.println("create sound directory: " + destSoundPath);
FileTools.createPath(new File(destSoundPath));
dsi.writeUTF(soundFileDirectories[i].trim());
// create soundSyntax for current sound directory
RouteSoundSyntax soundSyn = new RouteSoundSyntax(configuration.getStyleFileDirectory(),
soundFileDirectories[i].trim(), destSoundPath + "/syntax.dat");
String soundFile;
Object soundNames[] = soundSyn.getSoundNames();
for (int j = 0; j < soundNames.length ; j++) {
soundFile = (String) soundNames[j];
soundFile = soundFile.toLowerCase();
for (int k = 0; k < soundFormat.length; k++) {
outputMedia = copyMediaToMid(soundFile + "." +
soundFormat[k].trim(), destSoundPath, soundFileDirectories[i].trim());
}
}
removeUnusedSoundFormats(destSoundPath);
}
// show summary for copied media files
try {
if (sbCopiedMedias.length() != 0) {
System.out.println("External media inclusion summary:");
sbCopiedMedias.append("\r\n");
} else {
System.out.println("No external media included.");
}
sbCopiedMedias.append(" Media Sources for external medias\r\n");
sbCopiedMedias.append(" referenced in " + configuration.getStyleFileName() + " have been:\r\n");
sbCopiedMedias.append(" " +
(configuration.getStyleFileDirectory().length() == 0 ?
"Current directory" : configuration.getStyleFileDirectory()) +
" and its png and " + configuration.getSoundFiles() + " subdirectories");
System.out.println(sbCopiedMedias.toString());
if (mediaInclusionErrors != 0) {
System.out.println("");
System.out.println(" WARNING: " + mediaInclusionErrors +
" media files could NOT be included - see details above");
System.out.println("");
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
dsi.writeFloat((float)Configuration.mapPrecisionInMeters);
dsi.writeLong(Configuration.mapFlags);
dsi.close();
foi.close();
if (Configuration.attrToBoolean(configuration.useRouting) < 0) {
System.out.println("Routing disabled - removing routing sound files from midlet:");
for (int i = 0; i < Configuration.SOUNDNAMES.length; i++) {
if (";CONNECT;DISCONNECT;DEST_REACHED;SPEED_LIMIT;".indexOf(";" + Configuration.SOUNDNAMES[i] + ";") == -1) {
removeSoundFile(Configuration.SOUNDNAMES[i]);
}
}
}
} catch (FileNotFoundException fnfe) {
System.err.println("Unhandled FileNotFoundException: " + fnfe.getMessage());
fnfe.printStackTrace();
} catch (IOException ioe) {
System.err.println("Unhandled IOException: " + ioe.getMessage());
ioe.printStackTrace();
}
}
public void renameAlternativeIconSizeToUsedIconSize(String prefixToRename) {
File dir = new File(path);
File[] iconsToRename = dir.listFiles(this);
if (iconsToRename != null) {
for (File file : iconsToRename) {
if (file.getName().startsWith(prefixToRename)) {
File fileRenamed = new File(path + "/" + file.getName().substring(prefixToRename.length()));
if (fileRenamed.exists()) {
fileRenamed.delete();
}
file.renameTo(fileRenamed);
// System.out.println("Rename " + file.getName() + " to " + fileRenamed.getName());
}
}
}
}
public void removeUnusedIconSizes(String path, boolean deleteAllIcons) {
File dir = new File(path);
File[] iconsToDelete = dir.listFiles(this);
if (iconsToDelete != null) {
for (File file : iconsToDelete) {
if (file.getName().matches("(small|big|large|huge)_(is?|r)_.*\\.png")
|| (deleteAllIcons && file.getName().matches("(is?|r)_.*\\.png") && !file.getName().equalsIgnoreCase("i_bg.png"))
) {
//System.out.println("Delete " + file.getName());
file.delete();
}
}
}
}
public boolean accept(File directory, String filename) {
return filename.endsWith(".png") || filename.endsWith(".amr") || filename.endsWith(".mp3") || filename.endsWith(".wav");
}
public void removeUnusedSoundFormats(String path) {
File dir = new File(path);
File[] sounds = dir.listFiles(this);
String soundFormat[] = configuration.getUseSounds().split("[;,]", 10);
String soundMatch = ";";
for (int i = 0; i < soundFormat.length; i++) {
soundMatch += soundFormat[i].trim() + ";";
}
int deletedFiles = 0;
if (sounds != null) {
for (File file : sounds) {
if (
file.getName().matches(".*\\.amr") && soundMatch.indexOf(";amr;") == -1
||
file.getName().matches(".*\\.mp3") && soundMatch.indexOf(";mp3;") == -1
||
file.getName().matches(".*\\.wav") && soundMatch.indexOf(";wav;") == -1
) {
//System.out.println("Delete " + file.getName());
file.delete();
deletedFiles++;
}
}
}
if (deletedFiles > 0) {
System.out.println(deletedFiles + " files of unused sound formats removed");
}
}
// remove files with a certain extension from dir, except strings with basename list in exceptions
public void removeFilesWithExt(String path, String ext, String exceptions[]) {
//System.out.println ("Removing files from " + path + " with ext " + ext + " exceptions: " + exceptions);
File dir = new File(path);
String[] files = dir.list();
int deletedFiles = 0;
int retainedFiles = 0;
File file = null;
if (files != null) {
for (String name : files) {
boolean remove = false;
file = new File(name);
if (name.matches(".*\\." + ext)) {
remove = true;
if (exceptions != null) {
for (String basename : exceptions) {
//System.out.println ("Testing filename " + file.getName() + " for exception " + basename);
if (file.getName().startsWith(basename)) {
remove = false;
//System.out.println ("Test for string " + file.getName() + " exception " + basename + " matched");
retainedFiles++;
}
}
}
if (remove) {
file = new File(path, name);
file.delete();
deletedFiles++;
}
} else {
//System.out.println ("checking if it's a dir: " + name);
file = new File(path, name);
try {
if (file.isDirectory()) {
//System.out.println ("checking subdir: " + file + " (" + file.getCanonicalPath() + ")");
removeFilesWithExt(file.getCanonicalPath(), ext, exceptions);
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
if (retainedFiles > 0) {
System.out.println("retained " + retainedFiles + " files with extension " + ext);
}
if (deletedFiles > 0) {
System.out.println("deleted " + deletedFiles + " files with extension " + ext);
}
}
private void removeSoundFile(String soundName) {
final String soundFormat[] = { "amr", "wav", "mp3" };
String soundFile;
for (int i = 0; i < soundFormat.length; i++) {
soundFile = soundName.toLowerCase() + "." + soundFormat[i];
File target = new File(path + "/" + soundFile);
if (target.exists()) {
target.delete();
System.out.println(" - removed " + soundFile);
}
}
}
/* Copies the given file in mediaPath to destDir.
* - If you specify a filename only it will look for the file in this order:
* 1. current directory 2. additional source subdirectory 3.internal file
* - For file names only preceded by a single "/", Osm2GpsMid will always assume
* you want to explicitly use the internal media file.
* - Directory path information as part of source media path is allowed,
* however the media file will ALWAYS be copied to destDir root.
* - Remembers copied files in sbCopiedMedias (adds i.e. "(REPLACED)" for replaced files)
*/
private String copyMediaToMid(String mediaPath, String destDir, String additionalSrcPath) {
// output filename is just the name part of the imagePath filename preceded by "/"
int iPos = mediaPath.lastIndexOf("/");
String realMediaPath = configuration.getStyleFileDirectory() + mediaPath;
String outputMediaName;
// System.out.println("Processing: " + configuration.getStyleFileDirectory() +
// additionalSrcPath + "/" + mediaPath);
// if no "/" is contained look for file in current directory and /png
if (iPos == -1) {
outputMediaName = "/" + mediaPath;
// check if file exists in current directory of Osm2GpsMid / the style file
if (! (new File(realMediaPath).exists())) {
// check if file exists in current directory of Osm2GpsMid / the style file + "/png" or "/sound"
realMediaPath = configuration.getStyleFileDirectory() + additionalSrcPath + "/" + mediaPath;
// System.out.println("checking for realMediaPath: " + realMediaPath);
if (! (new File(realMediaPath).exists())) {
// System.out.println("realMediaPath not found: " + realMediaPath);
// if not check if we can use the version included in Osm2GpsMid.jar
if (CreateGpsMidData.class.getResource("/media/" + additionalSrcPath + "/" + mediaPath) == null) {
// if not check if we can use the internal image file
if (!(new File(path + outputMediaName).exists())) {
// append media name if first media or " ," + media name for the following ones
sbCopiedMedias.append( (sbCopiedMedias.length() == 0) ? mediaPath : ", " + mediaPath);
sbCopiedMedias.append("(ERROR: file not found)");
mediaInclusionErrors++;
}
return outputMediaName;
} else {
/**
* Copy the file from Osm2GpsMid.jar to the destination directory
*/
try {
BufferedInputStream bis = new BufferedInputStream(
CreateGpsMidData.class.getResourceAsStream("/media/" +
additionalSrcPath + "/" + mediaPath)
);
BufferedOutputStream bos = new BufferedOutputStream(
new FileOutputStream(destDir + outputMediaName));
byte[] buf = new byte[4096];
while (bis.available() > 0) {
int len = bis.read(buf);
bos.write(buf, 0, len);
}
bos.flush();
bos.close();
bis.close();
} catch (IOException ioe) {
ioe.printStackTrace();
sbCopiedMedias.append((sbCopiedMedias.length() == 0) ? mediaPath
: ", " + mediaPath);
sbCopiedMedias.append("(ERROR: file not found)");
mediaInclusionErrors++;
}
return outputMediaName;
}
}
}
// if the first and only "/" is at the beginning its the explicit syntax for internal images
} else if (iPos == 0) {
if (!(new File(path + mediaPath).exists())) {
// append media name if first media or " ," + media name for the following ones
sbCopiedMedias.append( (sbCopiedMedias.length() == 0) ? mediaPath : ", " + mediaPath);
sbCopiedMedias.append("(ERROR: INTERNAL media file not found)");
mediaInclusionErrors++;
}
return mediaPath;
// else it's an external file with explicit path
} else {
outputMediaName = mediaPath.substring(iPos);
}
// append media name if first media or " ," + media name for the following ones
sbCopiedMedias.append( (sbCopiedMedias.length() == 0) ? mediaPath : ", " + mediaPath);
try {
// System.out.println("Copying " + mediaPath + " as " + outputMediaName + " into the midlet");
FileChannel fromChannel = new FileInputStream(realMediaPath).getChannel();
// Copy Media file
try {
// check if output file already exists
boolean alreadyExists = (new File(destDir + outputMediaName).exists());
FileChannel toChannel = new FileOutputStream(destDir + outputMediaName).getChannel();
fromChannel.transferTo(0, fromChannel.size(), toChannel);
toChannel.close();
if(alreadyExists) {
sbCopiedMedias.append("(REPLACED " + outputMediaName + ")");
}
}
catch (Exception e) {
sbCopiedMedias.append("(ERROR accessing destination file " + destDir + outputMediaName + ")");
mediaInclusionErrors++;
e.printStackTrace();
}
fromChannel.close();
}
catch (Exception e) {
System.err.println("Error accessing source file: " + mediaPath);
sbCopiedMedias.append("(ERROR accessing source file " + mediaPath + ")");
mediaInclusionErrors++;
e.printStackTrace();
}
return outputMediaName;
}
/** Prepares and writes the whole tile data for the specified zoom level to the
* files for dict and tile data.
* The tile tree's root tile is put into the member array 'tile'.
*
* @param zl Zoom level or level of detail
* @return Number of bytes written
*/
private long exportMapToMid(int zl) {
// System.out.println("Total ways : " + parser.ways.size() + " Nodes : " +
// parser.nodes.size());
OsmParser.printMemoryUsage(1);
long outputLength = 0;
try {
FileOutputStream fo = new FileOutputStream(path + "/dat/dict-" + zl + ".dat");
DataOutputStream ds = new DataOutputStream(fo);
// magic number
ds.writeUTF("DictMid");
Bounds allBound = new Bounds();
for (Way w1 : parser.getWays()) {
if (w1.getZoomlevel(configuration) != zl) {
continue;
}
w1.used = false;
allBound.extend(w1.getBounds());
}
if (zl == ROUTEZOOMLEVEL) {
// for RouteNodes
for (Node n : parser.getNodes()) {
n.used = false;
if (n.routeNode == null) {
continue;
}
allBound.extend(n.lat, n.lon);
}
} else {
for (Node n : parser.getNodes()) {
if (n.getZoomlevel(configuration) != zl) {
continue;
}
allBound.extend(n.lat, n.lon);
}
}
tile[zl] = new Tile((byte) zl);
Sequence tileSeq = new Sequence();
tile[zl].ways = parser.getWays();
tile[zl].nodes = parser.getNodes();
// create the tiles and write the content
outputLength += exportTile(tile[zl], tileSeq, allBound);
tileFilesWritten = tileSeq.get();
if (tile[zl].type != Tile.TYPE_ROUTECONTAINER && tile[zl].type != Tile.TYPE_CONTAINER) {
/*
* We must have so little data, that it completely fits within one tile.
* Never the less, the top tile should be a container tile
*/
Tile ct = new Tile((byte)zl);
ct.t1 = tile[zl];
ct.t2 = new Tile((byte)zl);
ct.t2.type = Tile.TYPE_EMPTY;
if (zl == ROUTEZOOMLEVEL) {
ct.type = Tile.TYPE_ROUTECONTAINER;
} else {
ct.type = Tile.TYPE_CONTAINER;
}
tile[zl] = ct;
}
tile[zl].recalcBounds();
if (zl == ROUTEZOOMLEVEL) {
long startTime = System.currentTimeMillis();
for (Node n : parser.getDelayingNodes()) {
if (n != null) {
if (n.isTrafficSignals()) {
tile[zl].markTrafficSignalsRouteNodes(n);
}
} else {
// this should not happen anymore because trafficSignalCount gets decremented now when the node id is duplicate
System.out.println("Warning: Delaying node is NULL");
}
}
parser.freeUpDelayingNodes();
long time = (System.currentTimeMillis() - startTime);
System.out.println(" Applied " + parser.trafficSignalCount +
" traffic signals to " + Tile.numTrafficSignalRouteNodes +
" route nodes, took " + time + " ms");
Sequence rnSeq = new Sequence();
tile[zl].renumberRouteNode(rnSeq);
tile[zl].calcHiLo();
tile[zl].writeConnections(path, parser.getTurnRestrictionHashMap());
tile[zl].type = Tile.TYPE_ROUTECONTAINER;
}
Sequence s = new Sequence();
tile[zl].writeTileDict(ds, 1, s, path);
dictFilesWritten = s.get();
// Magic number
ds.writeUTF("END");
ds.close();
fo.close();
} catch (FileNotFoundException fnfe) {
System.err.println("Unhandled FileNotFoundException: " + fnfe.getMessage());
fnfe.printStackTrace();
} catch (IOException ioe) {
System.err.println("Unhandled IOException: " + ioe.getMessage());
ioe.printStackTrace();
}
tile[zl].dissolveTileReferences();
tile[zl]=null;
return outputLength;
}
/** Prepares and writes the tile's node and way data.
* It splits the tile, creating two sub tiles, if necessary and continues to
* prepare and write their data down the tree.
* For writing, it calls writeRenderTile() or writeRouteTile().
*
* @param t Tile to export
* @param tileSeq
* @param tileBound Bounds to use
* @return Number of bytes written
* @throws IOException if there is
*/
private long exportTile(Tile t, Sequence tileSeq, Bounds tileBound) throws IOException {
Bounds realBound = new Bounds();
ArrayList<Way> ways;
Collection<Node> nodes;
int maxSize;
int maxWays = 0;
boolean unsplittableTile;
boolean tooLarge;
long outputLength = 0;
/*
* Using recursion can cause a stack overflow on large projects,
* so we need an explicit stack that can grow larger.
*/
Stack<TileTuple> expTiles = new Stack<TileTuple>();
byte [] out = new byte[1];
expTiles.push(new TileTuple(t, tileBound));
byte [] connOut = new byte[1];
// System.out.println("Exporting Tiles");
while (!expTiles.isEmpty()) {
TileTuple tt = expTiles.pop();
unsplittableTile = false;
tooLarge = false;
t = tt.t;
tileBound = tt.bound;
// System.out.println("try create tile for " + t.zl + " " + tileBound);
ways = new ArrayList<Way>();
nodes = new ArrayList<Node>();
realBound = new Bounds();
if (t.zl != ROUTEZOOMLEVEL) {
// Reduce the content of 'ways' and 'nodes' to all relevant elements
// in the given bounds and create the binary map representation
maxSize = configuration.getMaxTileSize();
maxWays = configuration.getMaxTileWays(t.zl);
ways = getWaysInBound(t.ways, t.zl, tileBound, realBound);
if (realBound.getFixPtSpan() > 65000
// && (t.nodes.size() == nodes.size()) && (t.ways.size() == ways.size())
&& (tileBound.maxLat - tileBound.minLat < 0.001)) {
System.out.println("ERROR: Tile spacially too large (" +
MAX_RAD_RANGE + "tileBound: " + tileBound);
System.out.println("ERROR:: Could not reduce tile size for tile " + t);
System.out.println(" t.ways=" + t.ways.size() + ", t.nodes=" + t.nodes.size());
System.out.println(" realBound=" + realBound);
System.out.println(" tileBound.maxLat " + tileBound.maxLat
+ " tileBound.minLat: " + tileBound.minLat);
for (Way w : t.ways) {
System.out.println(" Way: " + w);
}
System.out.println("Trying to recover, but at least some map data is lost");
realBound = tileBound;
}
nodes = getNodesInBound(t.nodes, t.zl, tileBound);
// System.out.println("found " + nodes.size() + " node and " +
// ways.size() + " ways maxSize=" + maxSize + " maxWay=" + maxWays);
for (Node n : nodes) {
realBound.extend(n.lat, n.lon);
}
if (ways.size() == 0) {
t.type = Tile.TYPE_EMPTY;
}
int mostlyInBound = ways.size();
addWaysCompleteInBound(ways, t.ways, t.zl, realBound);
//System.out.println("ways.size : " + ways.size() + " mostlyInBound: " + mostlyInBound);
if (ways.size() > 2 * mostlyInBound) {
// System.out.println("ways.size > 2 * mostlyInBound, mostlyInBound: " + mostlyInBound);
realBound = new Bounds();
ways = getWaysInBound(t.ways, t.zl, tileBound, realBound);
// add nodes as well to the bound HMu: 29.3.2010
for (Node n : nodes) {
realBound.extend(n.lat, n.lon);
}
}
if (ways.size() <= maxWays) {
t.bounds = realBound.clone();
if (t.bounds.getFixPtSpan() > 65000) {
// System.out.println("Tile spacially too large (" +
// MAX_RAD_RANGE + ": " + t.bounds);
tooLarge = true;
// TODO: Doesn't this mean that tile data which should be
// processed is dropped? I think createMidContent() is never
// called for it.
} else {
t.centerLat = (t.bounds.maxLat + t.bounds.minLat) / 2;
t.centerLon = (t.bounds.maxLon + t.bounds.minLon) / 2;
// TODO: Isn't this run for tiles which will be split down in
// this method (below comment "Tile is too large, try to split it.")?
out = createMidContent(ways, nodes, t);
}
}
/**
* If the number of nodes and ways in the new tile is the same, and the bound
* has already been shrunk to less than 0.001°, then give up and declare it a
* unsplittable tile and just live with the fact that this tile is too big.
* Otherwise we can get into an endless loop of trying to split up this tile.
*/
if ((t.nodes.size() == nodes.size()) && (t.ways.size() == ways.size())
&& (tileBound.maxLat - tileBound.minLat < 0.001)
&& (tileBound.maxLon - tileBound.minLon < 0.001))
{
System.out.println("WARNING: Could not reduce tile size for tile " + t);
System.out.println(" t.ways=" + t.ways.size() + ", t.nodes=" + t.nodes.size());
System.out.println(" t.bounds=" + t.bounds);
System.out.println(" tileBound.maxLat " + tileBound.maxLat
+ " tileBound.minLat: " + tileBound.minLat);
System.out.println(" tileBound.maxLon " + tileBound.maxLon
+ " tileBound.minLon: " + tileBound.minLon);
for (Way w : t.ways) {
System.out.println(" Way: " + w);
}
unsplittableTile = true;
if (tooLarge) {
out = createMidContent(ways, nodes, t);
}
}
t.nodes = nodes;
t.ways = ways;
//t.generateSeaPolygon();
// TODO: Check if createMidContent() should be here.
} else {
// Route Nodes
maxSize = configuration.getMaxRouteTileSize();
nodes = getRouteNodesInBound(t.nodes, tileBound, realBound);
byte[][] erg = createMidContent(nodes, t);
out = erg[0];
connOut = erg[1];
t.nodes = nodes;
}
if (unsplittableTile && tooLarge) {
System.out.println("ERROR: Tile is unsplittable, but too large. Can't deal with this! Will try to recover, but some map data has not been processed and the map will probably have errors.");
}
// Split tile if more then 255 Ways or binary content > MAX_TILE_FILESIZE but not if only one Way
// System.out.println("out.length=" + out.length + " ways=" + ways.size());
boolean tooManyWays = ways.size() > maxWays;
boolean tooManyBytes = out.length > maxSize;
if ((!unsplittableTile) && ((tooManyWays || (tooManyBytes && ways.size() != 1) || tooLarge))) {
// Tile is too large, try to split it.
// System.out.println("create Subtiles size=" + out.length + " ways=" + ways.size());
t.bounds = realBound.clone();
if (t.zl != ROUTEZOOMLEVEL) {
t.type = Tile.TYPE_CONTAINER;
} else {
t.type = Tile.TYPE_ROUTECONTAINER;
}
t.t1 = new Tile(t.zl, ways, nodes);
t.t2 = new Tile(t.zl, ways, nodes);
t.setRouteNodes(null);
// System.out.println("split tile because it`s too big, tooLarge=" + tooLarge +
// " tooManyWays=" + tooManyWays + " tooManyBytes=" + tooManyBytes);
if ((tileBound.maxLat-tileBound.minLat) > (tileBound.maxLon-tileBound.minLon)) {
// split to half latitude
float splitLat = (tileBound.minLat + tileBound.maxLat) / 2;
Bounds nextTileBound = tileBound.clone();
nextTileBound.maxLat = splitLat;
expTiles.push(new TileTuple(t.t1, nextTileBound));
nextTileBound = tileBound.clone();
nextTileBound.minLat = splitLat;
expTiles.push(new TileTuple(t.t2, nextTileBound));
} else {
// split to half longitude
float splitLon = (tileBound.minLon + tileBound.maxLon) / 2;
Bounds nextTileBound = tileBound.clone();
nextTileBound.maxLon = splitLon;
expTiles.push(new TileTuple(t.t1, nextTileBound));
nextTileBound = tileBound.clone();
nextTileBound.minLon = splitLon;
expTiles.push(new TileTuple(t.t2, nextTileBound));
}
t.ways = null;
t.nodes = null;
// System.gc();
} else {
// Tile has the right size or is not splittable, so it can be written.
// System.out.println("use this tile, will write " + out.length + " bytes");
if (ways.size() > 0 || nodes.size() > 0) {
// Write as dataTile
t.fid = tileSeq.next();
if (t.zl != ROUTEZOOMLEVEL) {
writeRenderTile(t, tileBound, realBound, nodes, out);
outputLength += out.length;
} else {
writeRouteTile(t, tileBound, realBound, nodes, out);
outputLength += out.length;
outputLengthConns += connOut.length;
}
} else {
//Write as empty box
// System.out.println("this is an empty box");
t.type = Tile.TYPE_EMPTY;
}
}
}
return outputLength;
}
/**
* @param t
* @param tileBound
* @param realBound
* @param nodes
* @param out
* @throws FileNotFoundException
* @throws IOException
*/
private void writeRouteTile(Tile t, Bounds tileBound, Bounds realBound,
Collection<Node> nodes, byte[] out) {
//System.out.println("Writing render tile " + t.zl + ":" + t.fid +
// " nodes:" + nodes.size());
t.type = Tile.TYPE_MAP;
t.bounds = tileBound.clone();
t.type = Tile.TYPE_ROUTEDATA;
for (RouteNode n:t.getRouteNodes()) {
n.node.used = true;
}
}
/**
* Writes the byte array to a file for the file t i.e. the name of the file is
* derived from the zoom level and fid of this tile.
* Also marks all ways of t and sets the fid of these ways and of all nodes in 'nodes'.
* Plus it sets the type of t to Tile.TYPE_MAP, sets its bounds to realBound and
* updates totalNodesWritten, totalWaysWritten, totalSegsWritten and totalPOIsWritten.
*
* @param t Tile to work on
* @param tileBound Bounds of tile will be set to this if it's a route tile
* @param realBound Bounds of tile will be set to this
* @param nodes Nodes to update with the fid
* @param out Byte array to write to the file
* @throws FileNotFoundException if file could not be created
* @throws IOException if an IO error occurs while writing the file
*/
private void writeRenderTile(Tile t, Bounds tileBound, Bounds realBound,
Collection<Node> nodes, byte[] out)
throws FileNotFoundException, IOException {
// System.out.println("Writing render tile " + t.zl + ":" + t.fid +
// " ways:" + t.ways.size() + " nodes:" + nodes.size());
totalNodesWritten += nodes.size();
totalWaysWritten += t.ways.size();
//TODO: Is this safe to comment out??
//Hmu: this was used to have a defined order of drawing. Small ways first, highways last.
//Collections.sort(t.ways);
for (Way w: t.ways) {
totalSegsWritten += w.getLineCount();
}
if (t.zl != ROUTEZOOMLEVEL) {
for (Node n : nodes) {
if (n.getType(null) > -1 ) {
totalPOIsWritten++;
}
}
}
t.type = Tile.TYPE_MAP;
// RouteTiles will be written later because of renumbering
if (t.zl != ROUTEZOOMLEVEL) {
t.bounds = realBound.clone();
String lpath = path + "/t" + t.zl ;
FileOutputStream fo = FileTools.createFileOutputStream(lpath + "/" + t.fid + ".d");
DataOutputStream tds = new DataOutputStream(fo);
tds.write(out);
tds.close();
fo.close();
// mark nodes as written to MidStorage
for (Node n : nodes) {
if (n.fid) {
System.out.println("DATA DUPLICATION: This node has been written already! " + n);
}
n.fid = true;
}
// mark ways as written to MidStorage
for (Iterator<Way> wi = t.ways.iterator(); wi.hasNext(); ) {
Way w1 = wi.next();
w1.used = true;
// triangles can be cleared but not set to null because of SearchList.java
if ( w1.triangles != null ) {
w1.triangles.clear();
}
}
} else {
t.bounds = tileBound.clone();
t.type = Tile.TYPE_ROUTEDATA;
for (RouteNode n:t.getRouteNodes()) {
n.node.used = true;
}
}
}
/** Collects all ways from parentWays which
* 1) have a type >= 1 (whatever that means)
* 2) belong to the zoom level zl
* 3) aren't already marked as used and
* 4) are mostly inside the boundaries of targetBounds.
* realBound is extended to cover all these ways.
*
* @param parentWays the collection that will be used for search
* @param zl the level of detail
* @param targetBounds bounds used for the search
* @param realBound bounds to extend to cover all ways found
* @return LinkedList of all ways which meet the described conditions.
*/
private ArrayList<Way> getWaysInBound(Collection<Way> parentWays, int zl,
Bounds targetBounds, Bounds realBound) {
ArrayList<Way> ways = new ArrayList<Way>();
// System.out.println("Searching for ways mostly in " + targetTile + " from " +
// parentWays.size() + " ways");
// Collect all ways that are in this rectangle
for (Way w1 : parentWays) {
// polish.api.bigstyles
short type = w1.getType();
if (type < 1) {
continue;
}
if (w1.getZoomlevel(configuration) != zl) {
continue;
}
if (w1.used) {
continue;
}
Bounds wayBound = w1.getBounds();
if (targetBounds.isMostlyIn(wayBound)) {
realBound.extend(wayBound);
ways.add(w1);
}
}
// System.out.println("getWaysInBound found " + ways.size() + " ways");
return ways;
}
/** Collects all ways from parentWays which
* 1) have a type >= 1 (whatever that means)
* 2) belong to the zoom level zl
* 3) aren't already marked as used
* 4) are completely inside the boundaries of targetTile.
* Ways are only added once to the list.
*
* @param ways Initial list of ways to which to add
* @param parentWays the list that will be used for search
* @param zl the level of detail
* @param targetBounds bounds used for the search
* @return The list 'ways' plus the ways found
*/
private ArrayList<Way> addWaysCompleteInBound(ArrayList<Way> ways,
Collection<Way> parentWays, int zl, Bounds targetBounds) {
// collect all way that are in this rectangle
// System.out.println("Searching for ways total in " + targetBounds +
// " from " + parentWays.size() + " ways");
//This is a bit of a hack. We should probably propagate the TreeSet through out,
//But that needs more effort and time than I currently have. And this way we get
//rid of a O(n^2) bottle neck
TreeSet<Way> waysTS = new TreeSet<Way>(ways);
for (Way w1 : parentWays) {
// polish.api.bigstyles
short type = w1.getType();
if (type < 1) {
continue;
}
if (w1.getZoomlevel(configuration) != zl) {
continue;
}
if (w1.used) {
continue;
}
if (waysTS.contains(w1)) {
continue;
}
Bounds wayBound = w1.getBounds();
if (targetBounds.isCompleteIn(wayBound)) {
waysTS.add(w1);
ways.add(w1);
}
}
// System.out.println("addWaysCompleteInBound found " + ways.size() + " ways");
return ways;
}
/**
* Find all nodes out of the given collection that are within the bounds and in the correct zoom level.
*
* @param parentNodes the collection that will be used for search
* @param zl the level of detail
* @param targetBound the target boundaries
* @return Collection of the nodes found
*/
public Collection<Node> getNodesInBound(Collection<Node> parentNodes, int zl, Bounds targetBound) {
Collection<Node> nodes = new LinkedList<Node>();
for (Node node : parentNodes) {
//Check to see if the node has already been written to MidStorage
//If yes, then ignore the node here, to prevent duplicate nodes
//due to overlapping tiles
if (node.fid) {
continue;
}
if (node.getType(configuration) < 0) {
continue;
}
if (node.getZoomlevel(configuration) != zl) {
continue;
}
if (! targetBound.isIn(node.lat, node.lon)) {
continue;
}
nodes.add(node);
}
// System.out.println("getNodesInBound found " + nodes.size() + " nodes");
return nodes;
}
public Collection<Node> getRouteNodesInBound(Collection<Node> parentNodes,
Bounds targetBound, Bounds realBound) {
Collection<Node> nodes = new LinkedList<Node>();
for (Node node : parentNodes) {
if (node.routeNode == null) {
continue;
}
if (! targetBound.isIn(node.lat, node.lon)) {
continue;
}
// System.out.println(node.used);
if (! node.used) {
realBound.extend(node.lat, node.lon);
nodes.add(node);
// node.used = true;
}
}
return nodes;
}
/**
* Create the data-content for a route-tile, containing a list of nodes and a list
* of connections from each node.
* @param interestNodes list of all Nodes that should be included in this tile
* @param t the tile that holds the meta-data
* @return in array[0][] the file-format for all nodes and in array[1][] the
* file-format for all connections within this tile.
* @throws IOException
*/
public byte[][] createMidContent(Collection<Node> interestNodes, Tile t) throws IOException {
ByteArrayOutputStream nfo = new ByteArrayOutputStream();
DataOutputStream nds = new DataOutputStream(nfo);
ByteArrayOutputStream cfo = new ByteArrayOutputStream();
DataOutputStream cds = new DataOutputStream(cfo);
nds.writeByte(0x54); // magic number
nds.writeShort(interestNodes.size());
for (Node n : interestNodes) {
writeRouteNode(n, nds, cds);
if (n.routeNode != null) {
t.addRouteNode(n.routeNode);
}
}
nds.writeByte(0x56); // magic number
byte [][] ret = new byte[2][];
ret[0] = nfo.toByteArray();
ret[1] = cfo.toByteArray();
nds.close();
cds.close();
nfo.close();
cfo.close();
return ret;
}
/**
* Create the Data-content for a SingleTile in memory. This will later directly
* be written to disk if the byte array is not too big, otherwise this tile will
* be split in smaller tiles.
* @param ways A collection of ways that are chosen to be in this tile.
* @param interestNodes all additional nodes like places, parking and so on
* @param t the tile, holds the metadata for this area.
* @return a byte array that represents a file content. This could be written
* directly to disk.
* @throws IOException
*/
public byte[] createMidContent(Collection<Way> ways, Collection<Node> interestNodes, Tile t) throws IOException {
Map<Long, Node> wayNodes = new HashMap<Long, Node>();
int ren = 0;
// reset all used flags of all Nodes that are part of ways in <code>ways</code>
for (Way way : ways) {
for (Node n : way.getNodes()) {
n.used = false;
}
}
// mark all interestNodes as used
for (Node n1 : interestNodes) {
n1.used = true;
}
// find all nodes that are part of a way but not in interestNodes
for (Way w1 : ways) {
if (w1.isArea()) {
if (Configuration.getConfiguration().getTriangleAreaFormat()) {
if (w1.checkTriangles() != null) {
for (Triangle tri : w1.checkTriangles()) {
for (int lo = 0; lo < 3; lo++) {
addUnusedNode(wayNodes, tri.getVert()[lo].getNode());
}
}
}
}
if (Configuration.getConfiguration().getOutlineAreaFormat()) {
for (Node n : w1.getOutlineNodes()) {
addUnusedNode(wayNodes, n);
}
ArrayList<Path> holes = w1.getHoles();
if (holes != null) {
for (Path hole : holes) {
for (Node n : hole.getNodes()) {
addUnusedNode(wayNodes, n);
}
}
}
}
} else {
for (Node n : w1.getNodes()) {
addUnusedNode(wayNodes, n);
}
}
}
// Create a byte arrayStream which holds the Singletile-Data,
// this is created in memory and written later if file is
// not too big.
ByteArrayOutputStream fo = new ByteArrayOutputStream();
DataOutputStream ds = new DataOutputStream(fo);
ds.writeByte(0x54); // Magic number
ds.writeFloat(MyMath.degToRad(t.centerLat));
ds.writeFloat(MyMath.degToRad(t.centerLon));
ds.writeShort(interestNodes.size() + wayNodes.size());
ds.writeShort(interestNodes.size());
for (Node n : interestNodes) {
n.renumberdId = (short) ren++;
//The exclusion of nodes is not perfect, as there
//is a time between adding nodes to the write buffer
//and before marking them as written, so we might
//still hit the case when a node is written twice.
//Warn about this fact to fix this correctly at a
//later stage
if (n.fid) {
System.out.println("WARNING: Writing interest node twice, " + n);
}
writeNode(n, ds, INODE, t);
}
for (Node n : wayNodes.values()) {
n.renumberdId = (short) ren++;
writeNode(n, ds, SEGNODE, t);
}
ds.writeByte(0x55); // Magic number
if (Configuration.getConfiguration().getTriangleAreaFormat()) {
ds.writeShort(ways.size());
for (Way w : ways) {
w.write(ds, names1, urls1, t, false);
}
ds.writeByte(0x56); // Magic number
}
if (Configuration.getConfiguration().getOutlineAreaFormat()) {
ds.writeShort(ways.size());
for (Way w : ways) {
w.write(ds, names1, urls1, t, true);
}
ds.writeByte(0x57); // Magic number
}
ds.close();
byte[] ret = fo.toByteArray();
fo.close();
return ret;
}
/**
* Adds the node n and its ID to the map wayNodes if it's an unused node and if
* it isn't already in the map.
*
* @param wayNodes
* @param n
*/
private void addUnusedNode(Map<Long, Node> wayNodes, Node n) {
Long id = new Long(n.id);
if ((!wayNodes.containsKey(id)) && !n.used) {
wayNodes.put(id, n);
}
}
/* FIXME: This is not actually the data written to the file system but rather is used to calculate route tile sizes
* The actual route data is written in Tile.writeConnections() and sizes from this data should be used
*/
private void writeRouteNode(Node n, DataOutputStream nds, DataOutputStream cds) throws IOException {
nds.writeByte(4);
nds.writeFloat(MyMath.degToRad(n.lat));
nds.writeFloat(MyMath.degToRad(n.lon));
nds.writeInt(cds.size());
nds.writeByte(n.routeNode.getConnected().length);
for (Connection c : n.routeNode.getConnected()) {
cds.writeInt(c.to.node.renumberdId);
// set or clear flag for additional byte (connTravelModes is transferred from wayTravelMode were this is Connection.CONNTYPE_TOLLROAD, so clear it if not required)
c.connTravelModes |= Connection.CONNTYPE_CONNTRAVELMODES_ADDITIONAL_BYTE;
if (c.connTravelModes2 == 0) {
c.connTravelModes ^= Connection.CONNTYPE_CONNTRAVELMODES_ADDITIONAL_BYTE;
}
// write out wayTravelModes flag
cds.writeByte(c.connTravelModes);
if (c.connTravelModes2 != 0) {
cds.writeByte(c.connTravelModes2);
}
for (int i = 0; i < TravelModes.travelModeCount; i++) {
// only store times for available travel modes of the connection
if ( (c.connTravelModes & (1 << i)) !=0 ) {
/**
* If we can't fit the values into short,
* we write an int. In order for the other
* side to know if we wrote an int or a short,
* we encode the length in the top most (sign) bit
*/
int time = c.times[i];
if (time > Short.MAX_VALUE) {
cds.writeInt(-1 * time);
} else {
cds.writeShort((short) time);
}
}
}
if (c.length > Short.MAX_VALUE) {
cds.writeInt(-1 * c.length);
} else {
cds.writeShort((short) c.length);
}
cds.writeByte(c.startBearing);
cds.writeByte(c.endBearing);
}
}
private void writeNode(Node n, DataOutputStream ds, int type, Tile t) throws IOException {
int flags = 0;
int flags2 = 0;
int nameIdx = -1;
int urlIdx = -1;
int phoneIdx = -1;
Configuration config = Configuration.getConfiguration();
if (type == INODE) {
if (! "".equals(n.getName())) {
flags += Constants.NODE_MASK_NAME;
nameIdx = names1.getNameIdx(n.getName());
if (nameIdx >= Short.MAX_VALUE) {
flags += Constants.NODE_MASK_NAMEHIGH;
}
}
if (config.useUrlTags) {
if (! "".equals(n.getUrl())) {
flags += Constants.NODE_MASK_URL;
urlIdx = urls1.getUrlIdx(n.getUrl());
if (urlIdx >= Short.MAX_VALUE) {
flags += Constants.NODE_MASK_URLHIGH;
}
}
}
if (config.usePhoneTags) {
if (! "".equals(n.getPhone())) {
flags2 += Constants.NODE_MASK2_PHONE;
phoneIdx = urls1.getUrlIdx(n.getPhone());
if (phoneIdx >= Short.MAX_VALUE) {
flags2 += Constants.NODE_MASK2_PHONEHIGH;
}
}
}
if (n.getType(configuration) != -1) {
flags += Constants.NODE_MASK_TYPE;
}
}
if (flags2 != 0) {
flags += Constants.NODE_MASK_ADDITIONALFLAG;
}
ds.writeByte(flags);
if (flags2 != 0) {
ds.writeByte(flags2);
}
/**
* Convert coordinates to relative fixpoint (integer) coordinates
* The reference point is the center of the tile.
* With 16bit shorts, this should allow for tile sizes of
* about 65 km in width and with 1 m accuracy at the equator.
*/
double tmpLat = (MyMath.degToRad(n.lat - t.centerLat)) * MyMath.FIXPT_MULT;
double tmpLon = (MyMath.degToRad(n.lon - t.centerLon)) * MyMath.FIXPT_MULT;
if ((tmpLat > Short.MAX_VALUE) || (tmpLat < Short.MIN_VALUE)) {
// see https://sourceforge.net/tracker/index.php?func=detail&aid=3556775&group_id=192084&atid=939974 for details of how this relates to area outlines
System.err.println("WARNING: Numeric overflow of latitude, " + tmpLat + " for node: " + n.id + ", trying to handle");
if (tmpLat > Short.MAX_VALUE) {
tmpLat = Short.MAX_VALUE - 10;
}
if (tmpLat < Short.MIN_VALUE) {
tmpLat = Short.MIN_VALUE + 10;
}
}
if ((tmpLon > Short.MAX_VALUE) || (tmpLon < Short.MIN_VALUE)) {
System.err.println("WARNING: Numeric overflow of longitude, " + tmpLon + " for node: " + n.id + ", trying to handle");
if (tmpLon > Short.MAX_VALUE) {
tmpLon = Short.MAX_VALUE - 10;
}
if (tmpLon < Short.MIN_VALUE) {
tmpLon = Short.MIN_VALUE + 10;
}
}
ds.writeShort((short)tmpLat);
ds.writeShort((short)tmpLon);
if ((flags & Constants.NODE_MASK_NAME) > 0) {
if ((flags & Constants.NODE_MASK_NAMEHIGH) > 0) {
ds.writeInt(nameIdx);
} else {
ds.writeShort(nameIdx);
}
}
if ((flags & Constants.NODE_MASK_URL) > 0) {
if ((flags & Constants.NODE_MASK_URLHIGH) > 0) {
ds.writeInt(urlIdx);
} else {
ds.writeShort(urlIdx);
}
}
if ((flags2 & Constants.NODE_MASK2_PHONE) > 0) {
if ((flags2 & Constants.NODE_MASK2_PHONEHIGH) > 0) {
ds.writeInt(phoneIdx);
} else {
ds.writeShort(phoneIdx);
}
}
if ((flags & Constants.NODE_MASK_TYPE) > 0) {
// polish.api.bigstyles
if (Configuration.getConfiguration().bigStyles) {
ds.writeShort(n.getType(configuration));
} else {
ds.writeByte(n.getType(configuration));
}
if (configuration.enableEditingSupport) {
if (n.id > Integer.MAX_VALUE) {
// FIXME enable again after Relations.java doesn't use fake ids
//System.err.println("WARNING: Node OSM-ID won't fit in 32 bits for way " + n);
ds.writeInt(-1);
} else {
ds.writeInt((int)n.id);
}
}
}
}
/**
* @param c
*/
public void setConfiguration(Configuration c) {
this.configuration = c;
}
/**
* @param rd
*/
public void setRouteData(RouteData rd) {
this.rd = rd;
}
}
| true | true | private void exportLegend(String path) {
FileOutputStream foi;
String outputMedia;
Configuration.mapFlags = 0L;
// FIXME add .properties & GUI user interface for telling map data source
Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_CC_BY_SA;
// Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_ODBL;
// Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_FI_LANDSURVEY;
// Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_FI_DIGIROAD;
if (Configuration.getConfiguration().getTriangleAreaFormat()) {
Configuration.mapFlags |= LEGEND_MAPFLAG_TRIANGLE_AREA_BLOCK;
}
if (Configuration.getConfiguration().getOutlineAreaFormat()) {
Configuration.mapFlags |= LEGEND_MAPFLAG_OUTLINE_AREA_BLOCK;
}
if (Configuration.getConfiguration().useWordSearch) {
Configuration.mapFlags |= LEGEND_MAPFLAG_WORDSEARCH;
}
try {
FileTools.createPath(new File(path + "/dat"));
foi = new FileOutputStream(path + "/legend.dat");
DataOutputStream dsi = new DataOutputStream(foi);
dsi.writeShort(Configuration.MAP_FORMAT_VERSION);
Configuration config = Configuration.getConfiguration();
/**
* Write application version
*/
dsi.writeUTF(config.getVersion());
/**
* Write bundle date
*/
dsi.writeUTF(config.getBundleDate());
/**
* Note if additional information is included that can enable editing of OSM data
*/
dsi.writeBoolean(config.enableEditingSupport);
/* Note what languages are enabled
*/
useLang = configuration.getUseLang().split("[;,]", 200);
String useLangName[] = configuration.getUseLangName().split("[;,]", 200);
if (useLangName.length != useLang.length) {
System.out.println("");
System.out.println(" Warning: useLang count " + useLang.length +
" different than useLangName count " + useLangName.length +
" - ignoring useLangNames");
System.out.println("");
useLangName = useLang;
}
// make all available languages the same for now
for (int i = 1; i <= 5 ; i++) {
dsi.writeShort(useLang.length);
for (int j = 0 ; j < useLang.length ; j++) {
dsi.writeUTF(useLang[j]);
dsi.writeUTF(useLangName[j]);
}
}
// remove unneeded .loc files
if (!Configuration.getConfiguration().allLang) {
String langs = configuration.getUseLang() + ",en";
removeFilesWithExt(path, "loc", langs.split("[;,]", 200));
}
// remove class files (midlet code) if building just the map
if (!configuration.getMapName().equals("")) {
removeFilesWithExt(path, "class", null);
}
/**
* Note if urls and phones are in the midlet
*/
dsi.writeBoolean(config.useUrlTags);
dsi.writeBoolean(config.usePhoneTags);
/**
* Writing colors
*/
dsi.writeShort((short) Configuration.COLOR_COUNT);
for (int i = 0; i < Configuration.COLOR_COUNT; i++) {
if (Configuration.COLORS_AT_NIGHT[i] != -1) {
dsi.writeInt(0x01000000 | Configuration.COLORS[i]);
dsi.writeInt(Configuration.COLORS_AT_NIGHT[i]);
} else {
dsi.writeInt(Configuration.COLORS[i]);
}
}
/**
* Write Tile Scale Levels
*/
for (int i = 0; i < 4; i++) {
if (LegendParser.tileScaleLevelContainsRoutableWays[i]) {
dsi.writeInt(LegendParser.tileScaleLevel[i]);
} else {
dsi.writeInt( -LegendParser.tileScaleLevel[i] );
}
}
/**
* Write Travel Modes
*/
dsi.writeByte(TravelModes.travelModeCount);
for (int i = 0; i < TravelModes.travelModeCount; i++) {
dsi.writeUTF(_(TravelModes.getTravelMode(i).getName()));
dsi.writeShort(TravelModes.getTravelMode(i).maxPrepareMeters);
dsi.writeShort(TravelModes.getTravelMode(i).maxInMeters);
dsi.writeShort(TravelModes.getTravelMode(i).maxEstimationSpeed);
dsi.writeByte(TravelModes.getTravelMode(i).travelModeFlags);
}
/**
* Writing POI legend data
*/
/**
* // polish.api.bigstyles * Are there more way or poi styles than 126
*/
//System.err.println("Big styles:" + config.bigStyles);
// polish.api.bigstyles
// backwards compatibility - use "0" as a marker that we use a short for # of styles
if (config.bigStyles) {
dsi.writeByte((byte) 0);
dsi.writeShort(config.getPOIDescs().size());
} else {
dsi.writeByte(config.getPOIDescs().size());
}
for (EntityDescription entity : config.getPOIDescs()) {
POIdescription poi = (POIdescription) entity;
byte flags = 0;
byte flags2 = 0;
if (poi.image != null && !poi.image.equals("")) {
flags |= LEGEND_FLAG_IMAGE;
}
if (poi.searchIcon != null) {
flags |= LEGEND_FLAG_SEARCH_IMAGE;
}
if (poi.minEntityScale != poi.minTextScale) {
flags |= LEGEND_FLAG_MIN_IMAGE_SCALE;
}
if (poi.textColor != 0) {
flags |= LEGEND_FLAG_TEXT_COLOR;
}
if (!poi.hideable) {
flags |= LEGEND_FLAG_NON_HIDEABLE;
}
if (poi.alert) {
flags |= LEGEND_FLAG_ALERT;
}
if (poi.clickable) {
flags2 |= LEGEND_FLAG2_CLICKABLE;
}
// polish.api.bigstyles
if (config.bigStyles) {
dsi.writeShort(poi.typeNum);
//System.out.println("poi typenum: " + poi.typeNum);
} else {
dsi.writeByte(poi.typeNum);
}
if (flags2 != 0) {
flags |= LEGEND_FLAG_ADDITIONALFLAG;
}
dsi.writeByte(flags);
if (flags2 != 0) {
dsi.writeByte(flags2);
}
dsi.writeUTF(_(poi.description));
dsi.writeBoolean(poi.imageCenteredOnNode);
dsi.writeInt(poi.minEntityScale);
if ((flags & LEGEND_FLAG_IMAGE) > 0) {
outputMedia = copyMediaToMid(poi.image, path, "png");
dsi.writeUTF(outputMedia);
}
if ((flags & LEGEND_FLAG_SEARCH_IMAGE) > 0) {
outputMedia = copyMediaToMid(poi.searchIcon, path, "png");
dsi.writeUTF(outputMedia);
}
if ((flags & LEGEND_FLAG_MIN_IMAGE_SCALE) > 0) {
dsi.writeInt(poi.minTextScale);
}
if ((flags & LEGEND_FLAG_TEXT_COLOR) > 0) {
dsi.writeInt(poi.textColor);
}
if (config.enableEditingSupport) {
int noKVpairs = 1;
if (poi.specialisation != null) {
for (ConditionTuple ct : poi.specialisation) {
if (!ct.exclude) {
noKVpairs++;
}
}
}
dsi.writeShort(noKVpairs);
dsi.writeUTF(poi.key);
dsi.writeUTF(poi.value);
if (poi.specialisation != null) {
for (ConditionTuple ct : poi.specialisation) {
if (!ct.exclude) {
dsi.writeUTF(ct.key);
dsi.writeUTF(ct.value);
}
}
}
}
// System.out.println(poi);
}
/**
* Writing Way legend data
*/
// polish.api.bigstyles
if (config.bigStyles) {
System.out.println("waydesc size: " + Configuration.getConfiguration().getWayDescs().size());
// backwards compatibility - use "0" as a marker that we use a short for # of styles
dsi.writeByte((byte) 0);
dsi.writeShort(Configuration.getConfiguration().getWayDescs().size());
} else {
dsi.writeByte(Configuration.getConfiguration().getWayDescs().size());
}
for (EntityDescription entity : Configuration.getConfiguration().getWayDescs()) {
WayDescription way = (WayDescription) entity;
byte flags = 0;
byte flags2 = 0;
if (!way.hideable) {
flags |= LEGEND_FLAG_NON_HIDEABLE;
}
if (way.alert) {
flags |= LEGEND_FLAG_ALERT;
}
if (way.clickable) {
flags2 |= LEGEND_FLAG2_CLICKABLE;
}
if (way.image != null && !way.image.equals("")) {
flags |= LEGEND_FLAG_IMAGE;
}
if (way.searchIcon != null) {
flags |= LEGEND_FLAG_SEARCH_IMAGE;
}
if (way.minOnewayArrowScale != 0) {
flags |= LEGEND_FLAG_MIN_ONEWAY_ARROW_SCALE;
}
if (way.minDescriptionScale != 0) {
flags |= LEGEND_FLAG_MIN_DESCRIPTION_SCALE;
}
// polish.api.bigstyles
if (config.bigStyles) {
dsi.writeShort(way.typeNum);
} else {
dsi.writeByte(way.typeNum);
}
if (flags2 != 0) {
flags |= LEGEND_FLAG_ADDITIONALFLAG;
}
dsi.writeByte(flags);
if (flags2 != 0) {
dsi.writeByte(flags2);
}
byte routeFlags = 0;
if (way.value.equalsIgnoreCase("motorway")) {
routeFlags |= ROUTE_FLAG_MOTORWAY;
}
if (way.value.equalsIgnoreCase("motorway_link")) {
routeFlags |= ROUTE_FLAG_MOTORWAY_LINK;
}
dsi.writeByte(routeFlags);
dsi.writeUTF(_(way.description));
dsi.writeInt(way.minEntityScale);
dsi.writeInt(way.minTextScale);
if ((flags & LEGEND_FLAG_IMAGE) > 0) {
outputMedia = copyMediaToMid(way.image, path, "png");
dsi.writeUTF(outputMedia);
}
if ((flags & LEGEND_FLAG_SEARCH_IMAGE) > 0) {
outputMedia = copyMediaToMid(way.searchIcon, path, "png");
dsi.writeUTF(outputMedia);
}
dsi.writeBoolean(way.isArea);
if (way.lineColorAtNight != -1) {
dsi.writeInt(0x01000000 | way.lineColor);
dsi.writeInt(way.lineColorAtNight);
} else {
dsi.writeInt(way.lineColor);
}
if (way.boardedColorAtNight != -1) {
dsi.writeInt(0x01000000 | way.boardedColor);
dsi.writeInt(way.boardedColorAtNight);
} else {
dsi.writeInt(way.boardedColor);
}
dsi.writeByte(way.wayWidth);
dsi.writeInt(way.wayDescFlags);
if ((flags & LEGEND_FLAG_MIN_ONEWAY_ARROW_SCALE) > 0) {
dsi.writeInt(way.minOnewayArrowScale);
}
if ((flags & LEGEND_FLAG_MIN_DESCRIPTION_SCALE) > 0) {
dsi.writeInt(way.minDescriptionScale);
}
if (config.enableEditingSupport) {
int noKVpairs = 1;
if (way.specialisation != null) {
for (ConditionTuple ct : way.specialisation) {
if (!ct.exclude) {
noKVpairs++;
}
}
}
dsi.writeShort(noKVpairs);
dsi.writeUTF(way.key);
dsi.writeUTF(way.value);
if (way.specialisation != null) {
for (ConditionTuple ct : way.specialisation) {
if (!ct.exclude) {
dsi.writeUTF(ct.key);
dsi.writeUTF(ct.value);
}
}
}
}
// System.out.println(way);
}
if (Configuration.attrToBoolean(configuration.useIcons) < 0) {
System.out.println("Icons disabled - removing icon files from midlet.");
removeUnusedIconSizes(path, true);
} else {
// show summary for copied icon files
System.out.println("Icon inclusion summary:");
System.out.println(" " + FileTools.copyDir("icon", path, true, true) +
" internal icons replaced from " + "icon" +
System.getProperty("file.separator") + " containing " +
FileTools.countFiles("icon") + " files");
// if useIcons == small or useIcons == big rename the corresponding icons to normal icons
if ((!Configuration.getConfiguration().sourceIsApk) && Configuration.attrToBoolean(configuration.useIcons) == 0) {
renameAlternativeIconSizeToUsedIconSize(configuration.useIcons + "_");
}
if (!Configuration.getConfiguration().sourceIsApk) {
removeUnusedIconSizes(path, false);
}
}
/**
* Copy sounds for all sound formats to midlet
*/
String soundFormat[] = configuration.getUseSounds().split("[;,]", 10);
// write sound format infos
dsi.write((byte) soundFormat.length);
for (int i = 0; i < soundFormat.length; i++) {
dsi.writeUTF(soundFormat[i].trim());
}
/**
* write all sound files in each sound directory for all sound formats
*/
String soundFileDirectoriesHelp[] = configuration.getSoundFiles().split("[;,]", 10);
String soundDirsFound = "";
for (int i = 0; i < soundFileDirectoriesHelp.length; i++) {
// test existence of dir
InputStream is = null;
try {
is = new FileInputStream(configuration.getStyleFileDirectory() + soundFileDirectoriesHelp[i].trim() + "/syntax.cfg");
} catch (Exception e) {
// try internal syntax.cfg
try {
is = getClass().getResourceAsStream("/media/" + soundFileDirectoriesHelp[i].trim() + "/syntax.cfg");
} catch (Exception e2) {
;
}
}
if (is != null) {
if (soundDirsFound.equals("")) {
soundDirsFound = soundFileDirectoriesHelp[i];
} else {
soundDirsFound = soundDirsFound + ";" + soundFileDirectoriesHelp[i];
}
} else {
System.out.println ("ERROR: syntax.cfg not found in the " + soundFileDirectoriesHelp[i].trim() + " directory");
}
}
String soundFileDirectories[] = soundDirsFound.split("[;,]", 10);
dsi.write((byte) soundFileDirectories.length);
for (int i = 0; i < soundFileDirectories.length; i++) {
String destSoundPath = path + "/" + soundFileDirectories[i].trim();
// System.out.println("create sound directory: " + destSoundPath);
FileTools.createPath(new File(destSoundPath));
dsi.writeUTF(soundFileDirectories[i].trim());
// create soundSyntax for current sound directory
RouteSoundSyntax soundSyn = new RouteSoundSyntax(configuration.getStyleFileDirectory(),
soundFileDirectories[i].trim(), destSoundPath + "/syntax.dat");
String soundFile;
Object soundNames[] = soundSyn.getSoundNames();
for (int j = 0; j < soundNames.length ; j++) {
soundFile = (String) soundNames[j];
soundFile = soundFile.toLowerCase();
for (int k = 0; k < soundFormat.length; k++) {
outputMedia = copyMediaToMid(soundFile + "." +
soundFormat[k].trim(), destSoundPath, soundFileDirectories[i].trim());
}
}
removeUnusedSoundFormats(destSoundPath);
}
// show summary for copied media files
try {
if (sbCopiedMedias.length() != 0) {
System.out.println("External media inclusion summary:");
sbCopiedMedias.append("\r\n");
} else {
System.out.println("No external media included.");
}
sbCopiedMedias.append(" Media Sources for external medias\r\n");
sbCopiedMedias.append(" referenced in " + configuration.getStyleFileName() + " have been:\r\n");
sbCopiedMedias.append(" " +
(configuration.getStyleFileDirectory().length() == 0 ?
"Current directory" : configuration.getStyleFileDirectory()) +
" and its png and " + configuration.getSoundFiles() + " subdirectories");
System.out.println(sbCopiedMedias.toString());
if (mediaInclusionErrors != 0) {
System.out.println("");
System.out.println(" WARNING: " + mediaInclusionErrors +
" media files could NOT be included - see details above");
System.out.println("");
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
dsi.writeFloat((float)Configuration.mapPrecisionInMeters);
dsi.writeLong(Configuration.mapFlags);
dsi.close();
foi.close();
if (Configuration.attrToBoolean(configuration.useRouting) < 0) {
System.out.println("Routing disabled - removing routing sound files from midlet:");
for (int i = 0; i < Configuration.SOUNDNAMES.length; i++) {
if (";CONNECT;DISCONNECT;DEST_REACHED;SPEED_LIMIT;".indexOf(";" + Configuration.SOUNDNAMES[i] + ";") == -1) {
removeSoundFile(Configuration.SOUNDNAMES[i]);
}
}
}
} catch (FileNotFoundException fnfe) {
System.err.println("Unhandled FileNotFoundException: " + fnfe.getMessage());
fnfe.printStackTrace();
} catch (IOException ioe) {
System.err.println("Unhandled IOException: " + ioe.getMessage());
ioe.printStackTrace();
}
}
| private void exportLegend(String path) {
FileOutputStream foi;
String outputMedia;
Configuration.mapFlags = 0L;
// FIXME add .properties & GUI user interface for telling map data source
Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_CC_BY_SA;
// Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_OSM_ODBL;
// Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_FI_LANDSURVEY;
// Configuration.mapFlags |= LEGEND_MAPFLAG_SOURCE_FI_DIGIROAD;
if (Configuration.getConfiguration().getTriangleAreaFormat()) {
Configuration.mapFlags |= LEGEND_MAPFLAG_TRIANGLE_AREA_BLOCK;
}
if (Configuration.getConfiguration().getOutlineAreaFormat()) {
Configuration.mapFlags |= LEGEND_MAPFLAG_OUTLINE_AREA_BLOCK;
}
if (Configuration.getConfiguration().useWordSearch) {
Configuration.mapFlags |= LEGEND_MAPFLAG_WORDSEARCH;
}
try {
FileTools.createPath(new File(path + "/dat"));
foi = new FileOutputStream(path + "/legend.dat");
DataOutputStream dsi = new DataOutputStream(foi);
dsi.writeShort(Configuration.MAP_FORMAT_VERSION);
Configuration config = Configuration.getConfiguration();
/**
* Write application version
*/
dsi.writeUTF(config.getVersion());
/**
* Write bundle date
*/
dsi.writeUTF(config.getBundleDate());
/**
* Note if additional information is included that can enable editing of OSM data
*/
dsi.writeBoolean(config.enableEditingSupport);
/* Note what languages are enabled
*/
useLang = configuration.getUseLang().split("[;,]", 200);
String useLangName[] = configuration.getUseLangName().split("[;,]", 200);
if (useLangName.length != useLang.length) {
System.out.println("");
System.out.println(" Warning: useLang count " + useLang.length +
" different than useLangName count " + useLangName.length +
" - ignoring useLangNames");
System.out.println("");
useLangName = useLang;
}
// make all available languages the same for now
for (int i = 1; i <= 5 ; i++) {
dsi.writeShort(useLang.length);
for (int j = 0 ; j < useLang.length ; j++) {
dsi.writeUTF(useLang[j]);
dsi.writeUTF(useLangName[j]);
}
}
// remove unneeded .loc files
if (!Configuration.getConfiguration().allLang) {
String langs = configuration.getUseLang() + ",en";
removeFilesWithExt(path, "loc", langs.split("[;,]", 200));
}
// remove class files (midlet code) if building just the map
if (!configuration.getMapName().equals("")) {
removeFilesWithExt(path, "class", null);
}
/**
* Note if urls and phones are in the midlet
*/
dsi.writeBoolean(config.useUrlTags);
dsi.writeBoolean(config.usePhoneTags);
/**
* Writing colors
*/
dsi.writeShort((short) Configuration.COLOR_COUNT);
for (int i = 0; i < Configuration.COLOR_COUNT; i++) {
if (Configuration.COLORS_AT_NIGHT[i] != -1) {
dsi.writeInt(0x01000000 | Configuration.COLORS[i]);
dsi.writeInt(Configuration.COLORS_AT_NIGHT[i]);
} else {
dsi.writeInt(Configuration.COLORS[i]);
}
}
/**
* Write Tile Scale Levels
*/
for (int i = 0; i < 4; i++) {
if (LegendParser.tileScaleLevelContainsRoutableWays[i]) {
dsi.writeInt(LegendParser.tileScaleLevel[i]);
} else {
dsi.writeInt( -LegendParser.tileScaleLevel[i] );
}
}
/**
* Write Travel Modes
*/
dsi.writeByte(TravelModes.travelModeCount);
for (int i = 0; i < TravelModes.travelModeCount; i++) {
dsi.writeUTF(_(TravelModes.getTravelMode(i).getName()));
dsi.writeShort(TravelModes.getTravelMode(i).maxPrepareMeters);
dsi.writeShort(TravelModes.getTravelMode(i).maxInMeters);
dsi.writeShort(TravelModes.getTravelMode(i).maxEstimationSpeed);
dsi.writeByte(TravelModes.getTravelMode(i).travelModeFlags);
}
/**
* Writing POI legend data
*/
/**
* // polish.api.bigstyles * Are there more way or poi styles than 126
*/
//System.err.println("Big styles:" + config.bigStyles);
// polish.api.bigstyles
// backwards compatibility - use "0" as a marker that we use a short for # of styles
if (config.bigStyles) {
dsi.writeByte((byte) 0);
dsi.writeShort(config.getPOIDescs().size());
} else {
dsi.writeByte(config.getPOIDescs().size());
}
for (EntityDescription entity : config.getPOIDescs()) {
POIdescription poi = (POIdescription) entity;
byte flags = 0;
byte flags2 = 0;
if (poi.image != null && !poi.image.equals("")) {
flags |= LEGEND_FLAG_IMAGE;
}
if (poi.searchIcon != null) {
flags |= LEGEND_FLAG_SEARCH_IMAGE;
}
if (poi.minEntityScale != poi.minTextScale) {
flags |= LEGEND_FLAG_MIN_IMAGE_SCALE;
}
if (poi.textColor != 0) {
flags |= LEGEND_FLAG_TEXT_COLOR;
}
if (!poi.hideable) {
flags |= LEGEND_FLAG_NON_HIDEABLE;
}
if (poi.alert) {
flags |= LEGEND_FLAG_ALERT;
}
if (poi.clickable) {
flags2 |= LEGEND_FLAG2_CLICKABLE;
}
// polish.api.bigstyles
if (config.bigStyles) {
dsi.writeShort(poi.typeNum);
//System.out.println("poi typenum: " + poi.typeNum);
} else {
dsi.writeByte(poi.typeNum);
}
if (flags2 != 0) {
flags |= LEGEND_FLAG_ADDITIONALFLAG;
}
dsi.writeByte(flags);
if (flags2 != 0) {
dsi.writeByte(flags2);
}
dsi.writeUTF(_(poi.description));
dsi.writeBoolean(poi.imageCenteredOnNode);
dsi.writeInt(poi.minEntityScale);
if ((flags & LEGEND_FLAG_IMAGE) > 0) {
outputMedia = copyMediaToMid(poi.image, path, "png");
dsi.writeUTF(outputMedia);
}
if ((flags & LEGEND_FLAG_SEARCH_IMAGE) > 0) {
outputMedia = copyMediaToMid(poi.searchIcon, path, "png");
dsi.writeUTF(outputMedia);
}
if ((flags & LEGEND_FLAG_MIN_IMAGE_SCALE) > 0) {
dsi.writeInt(poi.minTextScale);
}
if ((flags & LEGEND_FLAG_TEXT_COLOR) > 0) {
dsi.writeInt(poi.textColor);
}
if (config.enableEditingSupport) {
int noKVpairs = 1;
if (poi.specialisation != null) {
for (ConditionTuple ct : poi.specialisation) {
if (!ct.exclude) {
noKVpairs++;
}
}
}
dsi.writeShort(noKVpairs);
dsi.writeUTF(poi.key);
dsi.writeUTF(poi.value);
if (poi.specialisation != null) {
for (ConditionTuple ct : poi.specialisation) {
if (!ct.exclude) {
dsi.writeUTF(ct.key);
dsi.writeUTF(ct.value);
}
}
}
}
// System.out.println(poi);
}
/**
* Writing Way legend data
*/
// polish.api.bigstyles
if (config.bigStyles) {
System.out.println("waydesc size: " + Configuration.getConfiguration().getWayDescs().size());
// backwards compatibility - use "0" as a marker that we use a short for # of styles
dsi.writeByte((byte) 0);
dsi.writeShort(Configuration.getConfiguration().getWayDescs().size());
} else {
dsi.writeByte(Configuration.getConfiguration().getWayDescs().size());
}
for (EntityDescription entity : Configuration.getConfiguration().getWayDescs()) {
WayDescription way = (WayDescription) entity;
byte flags = 0;
byte flags2 = 0;
if (!way.hideable) {
flags |= LEGEND_FLAG_NON_HIDEABLE;
}
if (way.alert) {
flags |= LEGEND_FLAG_ALERT;
}
if (way.clickable) {
flags2 |= LEGEND_FLAG2_CLICKABLE;
}
if (way.image != null && !way.image.equals("")) {
flags |= LEGEND_FLAG_IMAGE;
}
if (way.searchIcon != null) {
flags |= LEGEND_FLAG_SEARCH_IMAGE;
}
if (way.minOnewayArrowScale != 0) {
flags |= LEGEND_FLAG_MIN_ONEWAY_ARROW_SCALE;
}
if (way.minDescriptionScale != 0) {
flags |= LEGEND_FLAG_MIN_DESCRIPTION_SCALE;
}
// polish.api.bigstyles
if (config.bigStyles) {
dsi.writeShort(way.typeNum);
} else {
dsi.writeByte(way.typeNum);
}
if (flags2 != 0) {
flags |= LEGEND_FLAG_ADDITIONALFLAG;
}
dsi.writeByte(flags);
if (flags2 != 0) {
dsi.writeByte(flags2);
}
byte routeFlags = 0;
if (way.value.equalsIgnoreCase("motorway")) {
routeFlags |= ROUTE_FLAG_MOTORWAY;
}
if (way.value.equalsIgnoreCase("motorway_link")) {
routeFlags |= ROUTE_FLAG_MOTORWAY_LINK;
}
dsi.writeByte(routeFlags);
dsi.writeUTF(_(way.description));
dsi.writeInt(way.minEntityScale);
dsi.writeInt(way.minTextScale);
if ((flags & LEGEND_FLAG_IMAGE) > 0) {
outputMedia = copyMediaToMid(way.image, path, "png");
dsi.writeUTF(outputMedia);
}
if ((flags & LEGEND_FLAG_SEARCH_IMAGE) > 0) {
outputMedia = copyMediaToMid(way.searchIcon, path, "png");
dsi.writeUTF(outputMedia);
}
dsi.writeBoolean(way.isArea);
if (way.lineColorAtNight != -1) {
dsi.writeInt(0x01000000 | way.lineColor);
dsi.writeInt(way.lineColorAtNight);
} else {
dsi.writeInt(way.lineColor);
}
if (way.boardedColorAtNight != -1) {
dsi.writeInt(0x01000000 | way.boardedColor);
dsi.writeInt(way.boardedColorAtNight);
} else {
dsi.writeInt(way.boardedColor);
}
dsi.writeByte(way.wayWidth);
dsi.writeInt(way.wayDescFlags);
if ((flags & LEGEND_FLAG_MIN_ONEWAY_ARROW_SCALE) > 0) {
dsi.writeInt(way.minOnewayArrowScale);
}
if ((flags & LEGEND_FLAG_MIN_DESCRIPTION_SCALE) > 0) {
dsi.writeInt(way.minDescriptionScale);
}
if (config.enableEditingSupport) {
int noKVpairs = 1;
if (way.specialisation != null) {
for (ConditionTuple ct : way.specialisation) {
if (!ct.exclude) {
noKVpairs++;
}
}
}
dsi.writeShort(noKVpairs);
dsi.writeUTF(way.key);
dsi.writeUTF(way.value);
if (way.specialisation != null) {
for (ConditionTuple ct : way.specialisation) {
if (!ct.exclude) {
dsi.writeUTF(ct.key);
dsi.writeUTF(ct.value);
}
}
}
}
// System.out.println(way);
}
if (Configuration.attrToBoolean(configuration.useIcons) < 0) {
System.out.println("Icons disabled - removing icon files from midlet.");
removeUnusedIconSizes(path, true);
} else {
// show summary for copied icon files
System.out.println("Icon inclusion summary:");
System.out.println(" " + FileTools.copyDir("icon", path, true, true) +
" internal icons replaced from " + "icon" +
System.getProperty("file.separator") + " containing " +
FileTools.countFiles("icon") + " files");
// if useIcons == small or useIcons == big rename the corresponding icons to normal icons
if ((!Configuration.getConfiguration().sourceIsApk) && Configuration.attrToBoolean(configuration.useIcons) == 0) {
renameAlternativeIconSizeToUsedIconSize(configuration.useIcons + "_");
}
if (!Configuration.getConfiguration().sourceIsApk) {
removeUnusedIconSizes(path, false);
}
}
/**
* Copy sounds for all sound formats to midlet
*/
String soundFormat[] = configuration.getUseSounds().split("[;,]", 10);
// write sound format infos
dsi.write((byte) soundFormat.length);
for (int i = 0; i < soundFormat.length; i++) {
dsi.writeUTF(soundFormat[i].trim());
}
/**
* write all sound files in each sound directory for all sound formats
*/
String soundFileDirectoriesHelp[] = configuration.getSoundFiles().split("[;,]", 10);
String soundDirsFound = "";
for (int i = 0; i < soundFileDirectoriesHelp.length; i++) {
// test existence of dir
InputStream is = null;
try {
is = new FileInputStream(configuration.getStyleFileDirectory() + soundFileDirectoriesHelp[i].trim() + "/syntax.cfg");
} catch (Exception e) {
// try internal syntax.cfg
try {
is = getClass().getResourceAsStream("/media/" + soundFileDirectoriesHelp[i].trim() + "/syntax.cfg");
} catch (Exception e2) {
;
}
}
if (is != null) {
if (soundDirsFound.equals("")) {
soundDirsFound = soundFileDirectoriesHelp[i];
} else {
soundDirsFound = soundDirsFound + ";" + soundFileDirectoriesHelp[i];
}
} else {
System.out.println ("ERROR: syntax.cfg not found in the " + soundFileDirectoriesHelp[i].trim() + " directory");
}
}
String soundFileDirectories[] = soundDirsFound.split("[;,]", 10);
dsi.write((byte) soundFileDirectories.length);
for (int i = 0; i < soundFileDirectories.length; i++) {
String destSoundPath = path + "/" + soundFileDirectories[i].trim();
// System.out.println("create sound directory: " + destSoundPath);
FileTools.createPath(new File(destSoundPath));
dsi.writeUTF(soundFileDirectories[i].trim());
// create soundSyntax for current sound directory
RouteSoundSyntax soundSyn = new RouteSoundSyntax(configuration.getStyleFileDirectory(),
soundFileDirectories[i].trim(), destSoundPath + "/syntax.dat");
String soundFile;
Object soundNames[] = soundSyn.getSoundNames();
for (int j = 0; j < soundNames.length ; j++) {
soundFile = (String) soundNames[j];
soundFile = soundFile.toLowerCase();
for (int k = 0; k < soundFormat.length; k++) {
outputMedia = copyMediaToMid(soundFile + "." +
soundFormat[k].trim(), destSoundPath, soundFileDirectories[i].trim());
}
}
removeUnusedSoundFormats(destSoundPath);
}
// show summary for copied media files
try {
if (sbCopiedMedias.length() != 0) {
System.out.println("External media inclusion summary:");
sbCopiedMedias.append("\r\n");
} else {
System.out.println("No external media included.");
}
sbCopiedMedias.append(" Media Sources for external medias\r\n");
sbCopiedMedias.append(" referenced in " + configuration.getStyleFileName() + " have been:\r\n");
sbCopiedMedias.append(" " +
(configuration.getStyleFileDirectory().length() == 0 ?
"Current directory" : configuration.getStyleFileDirectory()) +
" and its png and " + configuration.getSoundFiles() + " subdirectories");
System.out.println(sbCopiedMedias.toString());
if (mediaInclusionErrors != 0) {
System.out.println("");
System.out.println(" WARNING: " + mediaInclusionErrors +
" media files could NOT be included - see details above");
System.out.println("");
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
dsi.writeFloat((float)Configuration.mapPrecisionInMeters);
dsi.writeLong(Configuration.mapFlags);
dsi.close();
foi.close();
if (Configuration.attrToBoolean(configuration.useRouting) < 0) {
System.out.println("Routing disabled - removing routing sound files from midlet:");
for (int i = 0; i < Configuration.SOUNDNAMES.length; i++) {
if (";CONNECT;DISCONNECT;DEST_REACHED;SPEED_LIMIT;".indexOf(";" + Configuration.SOUNDNAMES[i] + ";") == -1) {
removeSoundFile(Configuration.SOUNDNAMES[i]);
}
}
}
} catch (FileNotFoundException fnfe) {
System.err.println("Unhandled FileNotFoundException: " + fnfe.getMessage());
fnfe.printStackTrace();
} catch (IOException ioe) {
System.err.println("Unhandled IOException: " + ioe.getMessage());
ioe.printStackTrace();
}
}
|
diff --git a/src/main/java/com/epam/adzhiametov/controller/AddAdvertController.java b/src/main/java/com/epam/adzhiametov/controller/AddAdvertController.java
index eb18573..a49fb1c 100644
--- a/src/main/java/com/epam/adzhiametov/controller/AddAdvertController.java
+++ b/src/main/java/com/epam/adzhiametov/controller/AddAdvertController.java
@@ -1,49 +1,50 @@
package com.epam.adzhiametov.controller;
import com.epam.adzhiametov.dao.AdvertDao;
import com.epam.adzhiametov.enumeration.Operation;
import com.epam.adzhiametov.enumeration.Section;
import com.epam.adzhiametov.model.Advert;
import com.epam.adzhiametov.validator.AdvertValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.Calendar;
import java.util.List;
/**
* Created by Arsen Adzhiametov on 7/31/13.
*/
@Controller
public class AddAdvertController {
@Autowired
AdvertDao advertDao;
@Autowired
AdvertValidator advertValidator;
@InitBinder
protected void initBinder(WebDataBinder binder) {
binder.setValidator(advertValidator);
}
@RequestMapping(value = "/addadvert", method = RequestMethod.POST)
public String addAdvert(@Valid @ModelAttribute("advert") Advert advert, BindingResult result, Model model) {
if(result.hasErrors()) {
model.addAttribute("sectionValues", Section.values());
model.addAttribute("operationValues", Operation.values());
return "add_advert";
}
advert.setTime(Calendar.getInstance());
advertDao.create(advert);
- model.addAttribute("adverts", advertDao.findAll());
+ model.addAttribute("adverts", advertDao.findRange(1, RedirectController.ITEMS_ON_PAGE));
+ model.addAttribute("page", 1);
return "advert_list";
}
}
| true | true | public String addAdvert(@Valid @ModelAttribute("advert") Advert advert, BindingResult result, Model model) {
if(result.hasErrors()) {
model.addAttribute("sectionValues", Section.values());
model.addAttribute("operationValues", Operation.values());
return "add_advert";
}
advert.setTime(Calendar.getInstance());
advertDao.create(advert);
model.addAttribute("adverts", advertDao.findAll());
return "advert_list";
}
| public String addAdvert(@Valid @ModelAttribute("advert") Advert advert, BindingResult result, Model model) {
if(result.hasErrors()) {
model.addAttribute("sectionValues", Section.values());
model.addAttribute("operationValues", Operation.values());
return "add_advert";
}
advert.setTime(Calendar.getInstance());
advertDao.create(advert);
model.addAttribute("adverts", advertDao.findRange(1, RedirectController.ITEMS_ON_PAGE));
model.addAttribute("page", 1);
return "advert_list";
}
|
diff --git a/java/src/org/pocketworkstation/pckeyboard/LatinIME.java b/java/src/org/pocketworkstation/pckeyboard/LatinIME.java
index 86d2c7d..ec9d379 100644
--- a/java/src/org/pocketworkstation/pckeyboard/LatinIME.java
+++ b/java/src/org/pocketworkstation/pckeyboard/LatinIME.java
@@ -1,3911 +1,3914 @@
/*
* Copyright (C) 2008 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.pocketworkstation.pckeyboard;
import org.pocketworkstation.pckeyboard.LatinIMEUtil.RingCharBuffer;
import com.android.inputmethod.voice.FieldContext;
import com.android.inputmethod.voice.SettingsUtil;
import com.android.inputmethod.voice.VoiceInput;
import org.xmlpull.v1.XmlPullParserException;
import android.app.AlertDialog;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
import android.inputmethodservice.InputMethodService;
import android.media.AudioManager;
import android.os.Debug;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
import android.os.SystemClock;
import android.os.Vibrator;
import android.preference.PreferenceActivity;
import android.preference.PreferenceManager;
import android.speech.SpeechRecognizer;
import android.text.ClipboardManager;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.PrintWriterPrinter;
import android.util.Printer;
import android.view.HapticFeedbackConstants;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.CompletionInfo;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.ExtractedText;
import android.view.inputmethod.ExtractedTextRequest;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
import android.widget.LinearLayout;
import android.widget.Toast;
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
/**
* Input method implementation for Qwerty'ish keyboard.
*/
public class LatinIME extends InputMethodService implements
ComposeSequencing,
LatinKeyboardBaseView.OnKeyboardActionListener, VoiceInput.UiListener,
SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "PCKeyboardIME";
private static final boolean PERF_DEBUG = false;
static final boolean DEBUG = false;
static final boolean TRACE = false;
static final boolean VOICE_INSTALLED = true;
static final boolean ENABLE_VOICE_BUTTON = true;
static Map<Integer, String> ESC_SEQUENCES;
static Map<Integer, Integer> CTRL_SEQUENCES;
private static final String PREF_VIBRATE_ON = "vibrate_on";
static final String PREF_VIBRATE_LEN = "vibrate_len";
private static final String PREF_SOUND_ON = "sound_on";
private static final String PREF_POPUP_ON = "popup_on";
private static final String PREF_AUTO_CAP = "auto_cap";
private static final String PREF_QUICK_FIXES = "quick_fixes";
private static final String PREF_SHOW_SUGGESTIONS = "show_suggestions";
private static final String PREF_AUTO_COMPLETE = "auto_complete";
// private static final String PREF_BIGRAM_SUGGESTIONS =
// "bigram_suggestion";
private static final String PREF_VOICE_MODE = "voice_mode";
// Whether or not the user has used voice input before (and thus, whether to
// show the
// first-run warning dialog or not).
private static final String PREF_HAS_USED_VOICE_INPUT = "has_used_voice_input";
// Whether or not the user has used voice input from an unsupported locale
// UI before.
// For example, the user has a Chinese UI but activates voice input.
private static final String PREF_HAS_USED_VOICE_INPUT_UNSUPPORTED_LOCALE = "has_used_voice_input_unsupported_locale";
// A list of locales which are supported by default for voice input, unless
// we get a
// different list from Gservices.
public static final String DEFAULT_VOICE_INPUT_SUPPORTED_LOCALES = "en "
+ "en_US " + "en_GB " + "en_AU " + "en_CA " + "en_IE " + "en_IN "
+ "en_NZ " + "en_SG " + "en_ZA ";
// The private IME option used to indicate that no microphone should be
// shown for a
// given text field. For instance this is specified by the search dialog
// when the
// dialog is already showing a voice search button.
private static final String IME_OPTION_NO_MICROPHONE = "nm";
public static final String PREF_SELECTED_LANGUAGES = "selected_languages";
public static final String PREF_INPUT_LANGUAGE = "input_language";
private static final String PREF_RECORRECTION_ENABLED = "recorrection_enabled";
static final String PREF_FULLSCREEN_OVERRIDE = "fullscreen_override";
static final String PREF_FORCE_KEYBOARD_ON = "force_keyboard_on";
static final String PREF_KEYBOARD_NOTIFICATION = "keyboard_notification";
static final String PREF_CONNECTBOT_TAB_HACK = "connectbot_tab_hack";
static final String PREF_FULL_KEYBOARD_IN_PORTRAIT = "full_keyboard_in_portrait";
static final String PREF_SUGGESTIONS_IN_LANDSCAPE = "suggestions_in_landscape";
static final String PREF_HEIGHT_PORTRAIT = "settings_height_portrait";
static final String PREF_HEIGHT_LANDSCAPE = "settings_height_landscape";
static final String PREF_HINT_MODE = "pref_hint_mode";
static final String PREF_LONGPRESS_TIMEOUT = "pref_long_press_duration";
static final String PREF_RENDER_MODE = "pref_render_mode";
static final String PREF_SWIPE_UP = "pref_swipe_up";
static final String PREF_SWIPE_DOWN = "pref_swipe_down";
static final String PREF_SWIPE_LEFT = "pref_swipe_left";
static final String PREF_SWIPE_RIGHT = "pref_swipe_right";
static final String PREF_VOL_UP = "pref_vol_up";
static final String PREF_VOL_DOWN = "pref_vol_down";
private static final int MSG_UPDATE_SUGGESTIONS = 0;
private static final int MSG_START_TUTORIAL = 1;
private static final int MSG_UPDATE_SHIFT_STATE = 2;
private static final int MSG_VOICE_RESULTS = 3;
private static final int MSG_UPDATE_OLD_SUGGESTIONS = 4;
// How many continuous deletes at which to start deleting at a higher speed.
private static final int DELETE_ACCELERATE_AT = 20;
// Key events coming any faster than this are long-presses.
private static final int QUICK_PRESS = 200;
static final int ASCII_ENTER = '\n';
static final int ASCII_SPACE = ' ';
static final int ASCII_PERIOD = '.';
// Contextual menu positions
private static final int POS_METHOD = 0;
private static final int POS_SETTINGS = 1;
// private LatinKeyboardView mInputView;
private LinearLayout mCandidateViewContainer;
private CandidateView mCandidateView;
private Suggest mSuggest;
private CompletionInfo[] mCompletions;
private AlertDialog mOptionsDialog;
private AlertDialog mVoiceWarningDialog;
/* package */KeyboardSwitcher mKeyboardSwitcher;
private UserDictionary mUserDictionary;
private UserBigramDictionary mUserBigramDictionary;
private ContactsDictionary mContactsDictionary;
private AutoDictionary mAutoDictionary;
private Hints mHints;
private Resources mResources;
private String mInputLocale;
private String mSystemLocale;
private LanguageSwitcher mLanguageSwitcher;
private StringBuilder mComposing = new StringBuilder();
private WordComposer mWord = new WordComposer();
private int mCommittedLength;
private boolean mPredicting;
private boolean mRecognizing;
private boolean mAfterVoiceInput;
private boolean mImmediatelyAfterVoiceInput;
private boolean mShowingVoiceSuggestions;
private boolean mVoiceInputHighlighted;
private boolean mEnableVoiceButton;
private CharSequence mBestWord;
private boolean mPredictionOn;
private boolean mPredictionOnForMode;
private boolean mCompletionOn;
private boolean mHasDictionary;
private boolean mAutoSpace;
private boolean mJustAddedAutoSpace;
private boolean mAutoCorrectEnabled;
private boolean mReCorrectionEnabled;
// Bigram Suggestion is disabled in this version.
private final boolean mBigramSuggestionEnabled = false;
private boolean mAutoCorrectOn;
// TODO move this state variable outside LatinIME
private boolean mModCtrl;
private boolean mModAlt;
private boolean mModFn;
// Saved shift state when leaving alphabet mode, or when applying multitouch shift
private int mSavedShiftState;
private boolean mPasswordText;
private boolean mVibrateOn;
private int mVibrateLen;
private boolean mSoundOn;
private boolean mPopupOn;
private boolean mAutoCapPref;
private boolean mAutoCapActive;
private boolean mDeadKeysActive;
private boolean mQuickFixes;
private boolean mHasUsedVoiceInput;
private boolean mHasUsedVoiceInputUnsupportedLocale;
private boolean mLocaleSupportedForVoiceInput;
private boolean mShowSuggestions;
private boolean mIsShowingHint;
private boolean mConnectbotTabHack;
private boolean mFullscreenOverride;
private boolean mForceKeyboardOn;
private boolean mKeyboardNotification;
private boolean mSuggestionsInLandscape;
private boolean mSuggestionForceOn;
private boolean mSuggestionForceOff;
private String mSwipeUpAction;
private String mSwipeDownAction;
private String mSwipeLeftAction;
private String mSwipeRightAction;
private String mVolUpAction;
private String mVolDownAction;
public static final GlobalKeyboardSettings sKeyboardSettings = new GlobalKeyboardSettings();
private int mHeightPortrait;
private int mHeightLandscape;
private int mNumKeyboardModes = 3;
private int mKeyboardModeOverridePortrait;
private int mKeyboardModeOverrideLandscape;
private int mCorrectionMode;
private boolean mEnableVoice = true;
private boolean mVoiceOnPrimary;
private int mOrientation;
private List<CharSequence> mSuggestPuncList;
// Keep track of the last selection range to decide if we need to show word
// alternatives
private int mLastSelectionStart;
private int mLastSelectionEnd;
// Input type is such that we should not auto-correct
private boolean mInputTypeNoAutoCorrect;
// Indicates whether the suggestion strip is to be on in landscape
private boolean mJustAccepted;
private CharSequence mJustRevertedSeparator;
private int mDeleteCount;
private long mLastKeyTime;
// Modifier keys state
private ModifierKeyState mShiftKeyState = new ModifierKeyState();
private ModifierKeyState mSymbolKeyState = new ModifierKeyState();
private ModifierKeyState mCtrlKeyState = new ModifierKeyState();
private ModifierKeyState mAltKeyState = new ModifierKeyState();
private ModifierKeyState mFnKeyState = new ModifierKeyState();
// Compose sequence handling
private boolean mComposeMode = false;
private ComposeBase mComposeBuffer = new ComposeSequence(this);
private ComposeBase mDeadAccentBuffer = new DeadAccentSequence(this);
private Tutorial mTutorial;
private AudioManager mAudioManager;
// Align sound effect volume on music volume
private final float FX_VOLUME = -1.0f;
private boolean mSilentMode;
/* package */String mWordSeparators;
private String mSentenceSeparators;
private VoiceInput mVoiceInput;
private VoiceResults mVoiceResults = new VoiceResults();
private boolean mConfigurationChanging;
// Keeps track of most recently inserted text (multi-character key) for
// reverting
private CharSequence mEnteredText;
private boolean mRefreshKeyboardRequired;
// For each word, a list of potential replacements, usually from voice.
private Map<String, List<CharSequence>> mWordToSuggestions = new HashMap<String, List<CharSequence>>();
private ArrayList<WordAlternatives> mWordHistory = new ArrayList<WordAlternatives>();
private PluginManager mPluginManager;
private NotificationReceiver mNotificationReceiver;
private class VoiceResults {
List<String> candidates;
Map<String, List<CharSequence>> alternatives;
}
public abstract static class WordAlternatives {
protected CharSequence mChosenWord;
public WordAlternatives() {
// Nothing
}
public WordAlternatives(CharSequence chosenWord) {
mChosenWord = chosenWord;
}
@Override
public int hashCode() {
return mChosenWord.hashCode();
}
public abstract CharSequence getOriginalWord();
public CharSequence getChosenWord() {
return mChosenWord;
}
public abstract List<CharSequence> getAlternatives();
}
public class TypedWordAlternatives extends WordAlternatives {
private WordComposer word;
public TypedWordAlternatives() {
// Nothing
}
public TypedWordAlternatives(CharSequence chosenWord,
WordComposer wordComposer) {
super(chosenWord);
word = wordComposer;
}
@Override
public CharSequence getOriginalWord() {
return word.getTypedWord();
}
@Override
public List<CharSequence> getAlternatives() {
return getTypedSuggestions(word);
}
}
/* package */Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
case MSG_UPDATE_SUGGESTIONS:
updateSuggestions();
break;
case MSG_UPDATE_OLD_SUGGESTIONS:
setOldSuggestions();
break;
case MSG_START_TUTORIAL:
if (mTutorial == null) {
if (mKeyboardSwitcher.getInputView().isShown()) {
mTutorial = new Tutorial(LatinIME.this,
mKeyboardSwitcher.getInputView());
mTutorial.start();
} else {
// Try again soon if the view is not yet showing
sendMessageDelayed(obtainMessage(MSG_START_TUTORIAL),
100);
}
}
break;
case MSG_UPDATE_SHIFT_STATE:
updateShiftKeyState(getCurrentInputEditorInfo());
break;
case MSG_VOICE_RESULTS:
handleVoiceResults();
break;
}
}
};
@Override
public void onCreate() {
Log.i("PCKeyboard", "onCreate(), os.version=" + System.getProperty("os.version"));
LatinImeLogger.init(this);
KeyboardSwitcher.init(this);
super.onCreate();
// setStatusIcon(R.drawable.ime_qwerty);
mResources = getResources();
final Configuration conf = mResources.getConfiguration();
mOrientation = conf.orientation;
final SharedPreferences prefs = PreferenceManager
.getDefaultSharedPreferences(this);
mLanguageSwitcher = new LanguageSwitcher(this);
mLanguageSwitcher.loadLocales(prefs);
mKeyboardSwitcher = KeyboardSwitcher.getInstance();
mKeyboardSwitcher.setLanguageSwitcher(mLanguageSwitcher);
mSystemLocale = conf.locale.toString();
mLanguageSwitcher.setSystemLocale(conf.locale);
String inputLanguage = mLanguageSwitcher.getInputLanguage();
if (inputLanguage == null) {
inputLanguage = conf.locale.toString();
}
Resources res = getResources();
mReCorrectionEnabled = prefs.getBoolean(PREF_RECORRECTION_ENABLED,
res.getBoolean(R.bool.default_recorrection_enabled));
mConnectbotTabHack = prefs.getBoolean(PREF_CONNECTBOT_TAB_HACK,
res.getBoolean(R.bool.default_connectbot_tab_hack));
mFullscreenOverride = prefs.getBoolean(PREF_FULLSCREEN_OVERRIDE,
res.getBoolean(R.bool.default_fullscreen_override));
mForceKeyboardOn = prefs.getBoolean(PREF_FORCE_KEYBOARD_ON,
res.getBoolean(R.bool.default_force_keyboard_on));
mKeyboardNotification = prefs.getBoolean(PREF_KEYBOARD_NOTIFICATION,
res.getBoolean(R.bool.default_keyboard_notification));
mSuggestionsInLandscape = prefs.getBoolean(PREF_SUGGESTIONS_IN_LANDSCAPE,
res.getBoolean(R.bool.default_suggestions_in_landscape));
mHeightPortrait = getHeight(prefs, PREF_HEIGHT_PORTRAIT, res.getString(R.string.default_height_portrait));
mHeightLandscape = getHeight(prefs, PREF_HEIGHT_LANDSCAPE, res.getString(R.string.default_height_landscape));
LatinIME.sKeyboardSettings.hintMode = Integer.parseInt(prefs.getString(PREF_HINT_MODE, res.getString(R.string.default_hint_mode)));
LatinIME.sKeyboardSettings.longpressTimeout = getPrefInt(prefs, PREF_LONGPRESS_TIMEOUT, res.getString(R.string.default_long_press_duration));
LatinIME.sKeyboardSettings.renderMode = getPrefInt(prefs, PREF_RENDER_MODE, res.getString(R.string.default_render_mode));
mSwipeUpAction = prefs.getString(PREF_SWIPE_UP, res.getString(R.string.default_swipe_up));
mSwipeDownAction = prefs.getString(PREF_SWIPE_DOWN, res.getString(R.string.default_swipe_down));
mSwipeLeftAction = prefs.getString(PREF_SWIPE_LEFT, res.getString(R.string.default_swipe_left));
mSwipeRightAction = prefs.getString(PREF_SWIPE_RIGHT, res.getString(R.string.default_swipe_right));
mVolUpAction = prefs.getString(PREF_VOL_UP, res.getString(R.string.default_vol_up));
mVolDownAction = prefs.getString(PREF_VOL_DOWN, res.getString(R.string.default_vol_down));
sKeyboardSettings.initPrefs(prefs, res);
updateKeyboardOptions();
PluginManager.getPluginDictionaries(getApplicationContext());
mPluginManager = new PluginManager(this);
final IntentFilter pFilter = new IntentFilter();
pFilter.addDataScheme("package");
pFilter.addAction("android.intent.action.PACKAGE_ADDED");
pFilter.addAction("android.intent.action.PACKAGE_REPLACED");
pFilter.addAction("android.intent.action.PACKAGE_REMOVED");
registerReceiver(mPluginManager, pFilter);
LatinIMEUtil.GCUtils.getInstance().reset();
boolean tryGC = true;
for (int i = 0; i < LatinIMEUtil.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
try {
initSuggest(inputLanguage);
tryGC = false;
} catch (OutOfMemoryError e) {
tryGC = LatinIMEUtil.GCUtils.getInstance().tryGCOrWait(
inputLanguage, e);
}
}
mOrientation = conf.orientation;
initSuggestPuncList();
// register to receive ringer mode changes for silent mode
IntentFilter filter = new IntentFilter(
AudioManager.RINGER_MODE_CHANGED_ACTION);
registerReceiver(mReceiver, filter);
if (VOICE_INSTALLED) {
mVoiceInput = new VoiceInput(this, this);
mHints = new Hints(this, new Hints.Display() {
public void showHint(int viewResource) {
LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View view = inflater.inflate(viewResource, null);
setCandidatesView(view);
setCandidatesViewShown(true);
mIsShowingHint = true;
}
});
}
prefs.registerOnSharedPreferenceChangeListener(this);
setNotification(mKeyboardNotification);
}
private int getKeyboardModeNum(int origMode, int override) {
if (mNumKeyboardModes == 2 && origMode == 2) origMode = 1; // skip "compact". FIXME!
int num = (origMode + override) % mNumKeyboardModes;
if (mNumKeyboardModes == 2 && num == 1) num = 2; // skip "compact". FIXME!
return num;
}
private void updateKeyboardOptions() {
//Log.i(TAG, "setFullKeyboardOptions " + fullInPortrait + " " + heightPercentPortrait + " " + heightPercentLandscape);
boolean isPortrait = isPortrait();
int kbMode;
mNumKeyboardModes = sKeyboardSettings.compactModeEnabled ? 3 : 2; // FIXME!
if (isPortrait) {
kbMode = getKeyboardModeNum(sKeyboardSettings.keyboardModePortrait, mKeyboardModeOverridePortrait);
} else {
kbMode = getKeyboardModeNum(sKeyboardSettings.keyboardModeLandscape, mKeyboardModeOverrideLandscape);
}
// Convert overall keyboard height to per-row percentage
int screenHeightPercent = isPortrait ? mHeightPortrait : mHeightLandscape;
LatinIME.sKeyboardSettings.keyboardMode = kbMode;
LatinIME.sKeyboardSettings.keyboardHeightPercent = (float) screenHeightPercent;
}
private void setNotification(boolean visible) {
final String ACTION = "org.pocketworkstation.pckeyboard.SHOW";
final int ID = 1;
String ns = Context.NOTIFICATION_SERVICE;
NotificationManager mNotificationManager = (NotificationManager) getSystemService(ns);
if (visible && mNotificationReceiver == null) {
int icon = R.drawable.icon;
CharSequence text = "Keyboard notification enabled.";
long when = System.currentTimeMillis();
Notification notification = new Notification(icon, text, when);
// TODO: clean this up?
mNotificationReceiver = new NotificationReceiver(this);
final IntentFilter pFilter = new IntentFilter(ACTION);
registerReceiver(mNotificationReceiver, pFilter);
Intent notificationIntent = new Intent(ACTION);
PendingIntent contentIntent = PendingIntent.getBroadcast(getApplicationContext(), 1, notificationIntent, 0);
//PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
String title = "Show Hacker's Keyboard";
String body = "Select this to open the keyboard. Disable in settings.";
notification.flags |= Notification.FLAG_ONGOING_EVENT | Notification.FLAG_NO_CLEAR;
notification.setLatestEventInfo(getApplicationContext(), title, body, contentIntent);
mNotificationManager.notify(ID, notification);
} else if (mNotificationReceiver != null) {
mNotificationManager.cancel(ID);
unregisterReceiver(mNotificationReceiver);
mNotificationReceiver = null;
}
}
private boolean isPortrait() {
return (mOrientation == Configuration.ORIENTATION_PORTRAIT);
}
private boolean suggestionsDisabled() {
if (mSuggestionForceOff) return true;
if (mSuggestionForceOn) return false;
return !(mSuggestionsInLandscape || isPortrait());
}
/**
* Loads a dictionary or multiple separated dictionary
*
* @return returns array of dictionary resource ids
*/
/* package */static int[] getDictionary(Resources res) {
String packageName = LatinIME.class.getPackage().getName();
XmlResourceParser xrp = res.getXml(R.xml.dictionary);
ArrayList<Integer> dictionaries = new ArrayList<Integer>();
try {
int current = xrp.getEventType();
while (current != XmlResourceParser.END_DOCUMENT) {
if (current == XmlResourceParser.START_TAG) {
String tag = xrp.getName();
if (tag != null) {
if (tag.equals("part")) {
String dictFileName = xrp.getAttributeValue(null,
"name");
dictionaries.add(res.getIdentifier(dictFileName,
"raw", packageName));
}
}
}
xrp.next();
current = xrp.getEventType();
}
} catch (XmlPullParserException e) {
Log.e(TAG, "Dictionary XML parsing failure");
} catch (IOException e) {
Log.e(TAG, "Dictionary XML IOException");
}
int count = dictionaries.size();
int[] dict = new int[count];
for (int i = 0; i < count; i++) {
dict[i] = dictionaries.get(i);
}
return dict;
}
private void initSuggest(String locale) {
mInputLocale = locale;
Resources orig = getResources();
Configuration conf = orig.getConfiguration();
Locale saveLocale = conf.locale;
conf.locale = new Locale(locale);
orig.updateConfiguration(conf, orig.getDisplayMetrics());
if (mSuggest != null) {
mSuggest.close();
}
SharedPreferences sp = PreferenceManager
.getDefaultSharedPreferences(this);
mQuickFixes = sp.getBoolean(PREF_QUICK_FIXES, getResources()
.getBoolean(R.bool.default_quick_fixes));
int[] dictionaries = getDictionary(orig);
mSuggest = new Suggest(this, dictionaries);
updateAutoTextEnabled(saveLocale);
if (mUserDictionary != null)
mUserDictionary.close();
mUserDictionary = new UserDictionary(this, mInputLocale);
if (mContactsDictionary == null) {
mContactsDictionary = new ContactsDictionary(this,
Suggest.DIC_CONTACTS);
}
if (mAutoDictionary != null) {
mAutoDictionary.close();
}
mAutoDictionary = new AutoDictionary(this, this, mInputLocale,
Suggest.DIC_AUTO);
if (mUserBigramDictionary != null) {
mUserBigramDictionary.close();
}
mUserBigramDictionary = new UserBigramDictionary(this, this,
mInputLocale, Suggest.DIC_USER);
mSuggest.setUserBigramDictionary(mUserBigramDictionary);
mSuggest.setUserDictionary(mUserDictionary);
mSuggest.setContactsDictionary(mContactsDictionary);
mSuggest.setAutoDictionary(mAutoDictionary);
updateCorrectionMode();
mWordSeparators = mResources.getString(R.string.word_separators);
mSentenceSeparators = mResources
.getString(R.string.sentence_separators);
conf.locale = saveLocale;
orig.updateConfiguration(conf, orig.getDisplayMetrics());
}
@Override
public void onDestroy() {
if (mUserDictionary != null) {
mUserDictionary.close();
}
if (mContactsDictionary != null) {
mContactsDictionary.close();
}
unregisterReceiver(mReceiver);
unregisterReceiver(mPluginManager);
if (mNotificationReceiver != null) {
unregisterReceiver(mNotificationReceiver);
mNotificationReceiver = null;
}
if (VOICE_INSTALLED && mVoiceInput != null) {
mVoiceInput.destroy();
}
LatinImeLogger.commit();
LatinImeLogger.onDestroy();
super.onDestroy();
}
@Override
public void onConfigurationChanged(Configuration conf) {
Log.i("PCKeyboard", "onConfigurationChanged()");
// If the system locale changes and is different from the saved
// locale (mSystemLocale), then reload the input locale list from the
// latin ime settings (shared prefs) and reset the input locale
// to the first one.
final String systemLocale = conf.locale.toString();
if (!TextUtils.equals(systemLocale, mSystemLocale)) {
mSystemLocale = systemLocale;
if (mLanguageSwitcher != null) {
mLanguageSwitcher.loadLocales(PreferenceManager
.getDefaultSharedPreferences(this));
mLanguageSwitcher.setSystemLocale(conf.locale);
toggleLanguage(true, true);
} else {
reloadKeyboards();
}
}
// If orientation changed while predicting, commit the change
if (conf.orientation != mOrientation) {
InputConnection ic = getCurrentInputConnection();
commitTyped(ic, true);
if (ic != null)
ic.finishComposingText(); // For voice input
mOrientation = conf.orientation;
reloadKeyboards();
removeCandidateViewContainer();
}
mConfigurationChanging = true;
super.onConfigurationChanged(conf);
if (mRecognizing) {
switchToRecognitionStatusView();
}
mConfigurationChanging = false;
}
@Override
public View onCreateInputView() {
setCandidatesViewShown(false); // Workaround for "already has a parent" when reconfiguring
mKeyboardSwitcher.recreateInputView();
mKeyboardSwitcher.makeKeyboards(true);
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_TEXT, 0,
shouldShowVoiceButton(makeFieldContext(),
getCurrentInputEditorInfo()));
return mKeyboardSwitcher.getInputView();
}
@Override
public AbstractInputMethodImpl onCreateInputMethodInterface() {
return new MyInputMethodImpl();
}
IBinder mToken;
public class MyInputMethodImpl extends InputMethodImpl {
@Override
public void attachToken(IBinder token) {
super.attachToken(token);
Log.i(TAG, "attachToken " + token);
if (mToken == null) {
mToken = token;
}
}
}
@Override
public View onCreateCandidatesView() {
//Log.i(TAG, "onCreateCandidatesView(), mCandidateViewContainer=" + mCandidateViewContainer);
//mKeyboardSwitcher.makeKeyboards(true);
if (mCandidateViewContainer == null) {
mCandidateViewContainer = (LinearLayout) getLayoutInflater().inflate(
R.layout.candidates, null);
mCandidateView = (CandidateView) mCandidateViewContainer
.findViewById(R.id.candidates);
mCandidateView.setPadding(0, 0, 0, 0);
mCandidateView.setService(this);
setCandidatesView(mCandidateViewContainer);
}
return mCandidateViewContainer;
}
private void removeCandidateViewContainer() {
//Log.i(TAG, "removeCandidateViewContainer(), mCandidateViewContainer=" + mCandidateViewContainer);
if (mCandidateViewContainer != null) {
mCandidateViewContainer.removeAllViews();
ViewParent parent = mCandidateViewContainer.getParent();
if (parent != null && parent instanceof ViewGroup) {
((ViewGroup) parent).removeView(mCandidateViewContainer);
}
mCandidateViewContainer = null;
mCandidateView = null;
}
resetPrediction();
mPredictionOn = false;
}
private void resetPrediction() {
mComposing.setLength(0);
mPredicting = false;
mDeleteCount = 0;
mJustAddedAutoSpace = false;
}
@Override
public void onStartInputView(EditorInfo attribute, boolean restarting) {
sKeyboardSettings.editorPackageName = attribute.packageName;
sKeyboardSettings.editorFieldName = attribute.fieldName;
sKeyboardSettings.editorFieldId = attribute.fieldId;
sKeyboardSettings.editorInputType = attribute.inputType;
//Log.i("PCKeyboard", "onStartInputView " + attribute + ", inputType= " + Integer.toHexString(attribute.inputType) + ", restarting=" + restarting);
LatinKeyboardView inputView = mKeyboardSwitcher.getInputView();
// In landscape mode, this method gets called without the input view
// being created.
if (inputView == null) {
return;
}
if (mRefreshKeyboardRequired) {
mRefreshKeyboardRequired = false;
toggleLanguage(true, true);
}
mKeyboardSwitcher.makeKeyboards(false);
TextEntryState.newSession(this);
// Most such things we decide below in the switch statement, but we need to know
// now whether this is a password text field, because we need to know now (before
// the switch statement) whether we want to enable the voice button.
mPasswordText = false;
int variation = attribute.inputType & EditorInfo.TYPE_MASK_VARIATION;
if (variation == EditorInfo.TYPE_TEXT_VARIATION_PASSWORD
|| variation == EditorInfo.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
|| variation == 0xe0 /* EditorInfo.TYPE_TEXT_VARIATION_WEB_PASSWORD */
) {
if ((attribute.inputType & EditorInfo.TYPE_MASK_CLASS) == EditorInfo.TYPE_CLASS_TEXT) {
mPasswordText = true;
}
}
mEnableVoiceButton = shouldShowVoiceButton(makeFieldContext(),
attribute);
final boolean enableVoiceButton = mEnableVoiceButton && mEnableVoice;
mAfterVoiceInput = false;
mImmediatelyAfterVoiceInput = false;
mShowingVoiceSuggestions = false;
mVoiceInputHighlighted = false;
mInputTypeNoAutoCorrect = false;
mPredictionOn = false;
mCompletionOn = false;
mCompletions = null;
mModCtrl = false;
mModAlt = false;
mModFn = false;
mEnteredText = null;
mSuggestionForceOn = false;
mSuggestionForceOff = false;
+ mKeyboardModeOverridePortrait = 0;
+ mKeyboardModeOverrideLandscape = 0;
+ sKeyboardSettings.useExtension = false;
switch (attribute.inputType & EditorInfo.TYPE_MASK_CLASS) {
case EditorInfo.TYPE_CLASS_NUMBER:
case EditorInfo.TYPE_CLASS_DATETIME:
// fall through
// NOTE: For now, we use the phone keyboard for NUMBER and DATETIME
// until we get
// a dedicated number entry keypad.
// TODO: Use a dedicated number entry keypad here when we get one.
case EditorInfo.TYPE_CLASS_PHONE:
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_PHONE,
attribute.imeOptions, enableVoiceButton);
break;
case EditorInfo.TYPE_CLASS_TEXT:
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_TEXT,
attribute.imeOptions, enableVoiceButton);
// startPrediction();
mPredictionOn = true;
// Make sure that passwords are not displayed in candidate view
if (mPasswordText) {
mPredictionOn = false;
}
if (variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
|| variation == EditorInfo.TYPE_TEXT_VARIATION_PERSON_NAME) {
mAutoSpace = false;
} else {
mAutoSpace = true;
}
if (variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS) {
mPredictionOn = false;
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_EMAIL,
attribute.imeOptions, enableVoiceButton);
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_URI) {
mPredictionOn = false;
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_URL,
attribute.imeOptions, enableVoiceButton);
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_SHORT_MESSAGE) {
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_IM,
attribute.imeOptions, enableVoiceButton);
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_FILTER) {
mPredictionOn = false;
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) {
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_WEB,
attribute.imeOptions, enableVoiceButton);
// If it's a browser edit field and auto correct is not ON
// explicitly, then
// disable auto correction, but keep suggestions on.
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) == 0) {
mInputTypeNoAutoCorrect = true;
}
}
// If NO_SUGGESTIONS is set, don't do prediction.
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS) != 0) {
mPredictionOn = false;
mInputTypeNoAutoCorrect = true;
}
// If it's not multiline and the autoCorrect flag is not set, then
// don't correct
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) == 0
&& (attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE) == 0) {
mInputTypeNoAutoCorrect = true;
}
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE) != 0) {
mPredictionOn = false;
mCompletionOn = isFullscreenMode();
}
break;
default:
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_TEXT,
attribute.imeOptions, enableVoiceButton);
}
inputView.closing();
resetPrediction();
loadSettings();
updateShiftKeyState(attribute);
mPredictionOnForMode = mPredictionOn;
setCandidatesViewShownInternal(isCandidateStripVisible()
|| mCompletionOn, false /* needsInputViewShown */);
updateSuggestions();
// If the dictionary is not big enough, don't auto correct
mHasDictionary = mSuggest.hasMainDictionary();
updateCorrectionMode();
inputView.setPreviewEnabled(mPopupOn);
inputView.setProximityCorrectionEnabled(true);
mPredictionOn = mPredictionOn
&& (mCorrectionMode > 0 || mShowSuggestions);
if (suggestionsDisabled()) mPredictionOn = false;
// If we just entered a text field, maybe it has some old text that
// requires correction
checkReCorrectionOnStart();
checkTutorial(attribute.privateImeOptions);
if (TRACE)
Debug.startMethodTracing("/data/trace/latinime");
}
private void checkReCorrectionOnStart() {
if (mReCorrectionEnabled && isPredictionOn()) {
// First get the cursor position. This is required by
// setOldSuggestions(), so that
// it can pass the correct range to setComposingRegion(). At this
// point, we don't
// have valid values for mLastSelectionStart/Stop because
// onUpdateSelection() has
// not been called yet.
InputConnection ic = getCurrentInputConnection();
if (ic == null)
return;
ExtractedTextRequest etr = new ExtractedTextRequest();
etr.token = 0; // anything is fine here
ExtractedText et = ic.getExtractedText(etr, 0);
if (et == null)
return;
mLastSelectionStart = et.startOffset + et.selectionStart;
mLastSelectionEnd = et.startOffset + et.selectionEnd;
// Then look for possible corrections in a delayed fashion
if (!TextUtils.isEmpty(et.text) && isCursorTouchingWord()) {
postUpdateOldSuggestions();
}
}
}
@Override
public void onFinishInput() {
super.onFinishInput();
LatinImeLogger.commit();
onAutoCompletionStateChanged(false);
if (VOICE_INSTALLED && !mConfigurationChanging) {
if (mAfterVoiceInput) {
mVoiceInput.flushAllTextModificationCounters();
mVoiceInput.logInputEnded();
}
mVoiceInput.flushLogs();
mVoiceInput.cancel();
}
if (mKeyboardSwitcher.getInputView() != null) {
mKeyboardSwitcher.getInputView().closing();
}
if (mAutoDictionary != null)
mAutoDictionary.flushPendingWrites();
if (mUserBigramDictionary != null)
mUserBigramDictionary.flushPendingWrites();
}
@Override
public void onFinishInputView(boolean finishingInput) {
super.onFinishInputView(finishingInput);
// Remove penging messages related to update suggestions
mHandler.removeMessages(MSG_UPDATE_SUGGESTIONS);
mHandler.removeMessages(MSG_UPDATE_OLD_SUGGESTIONS);
}
@Override
public void onUpdateExtractedText(int token, ExtractedText text) {
super.onUpdateExtractedText(token, text);
InputConnection ic = getCurrentInputConnection();
if (!mImmediatelyAfterVoiceInput && mAfterVoiceInput && ic != null) {
if (mHints.showPunctuationHintIfNecessary(ic)) {
mVoiceInput.logPunctuationHintDisplayed();
}
}
mImmediatelyAfterVoiceInput = false;
}
@Override
public void onUpdateSelection(int oldSelStart, int oldSelEnd,
int newSelStart, int newSelEnd, int candidatesStart,
int candidatesEnd) {
super.onUpdateSelection(oldSelStart, oldSelEnd, newSelStart, newSelEnd,
candidatesStart, candidatesEnd);
if (DEBUG) {
Log.i(TAG, "onUpdateSelection: oss=" + oldSelStart + ", ose="
+ oldSelEnd + ", nss=" + newSelStart + ", nse=" + newSelEnd
+ ", cs=" + candidatesStart + ", ce=" + candidatesEnd);
}
if (mAfterVoiceInput) {
mVoiceInput.setCursorPos(newSelEnd);
mVoiceInput.setSelectionSpan(newSelEnd - newSelStart);
}
// If the current selection in the text view changes, we should
// clear whatever candidate text we have.
if ((((mComposing.length() > 0 && mPredicting) || mVoiceInputHighlighted)
&& (newSelStart != candidatesEnd || newSelEnd != candidatesEnd) && mLastSelectionStart != newSelStart)) {
mComposing.setLength(0);
mPredicting = false;
postUpdateSuggestions();
TextEntryState.reset();
InputConnection ic = getCurrentInputConnection();
if (ic != null) {
ic.finishComposingText();
}
mVoiceInputHighlighted = false;
} else if (!mPredicting && !mJustAccepted) {
switch (TextEntryState.getState()) {
case ACCEPTED_DEFAULT:
TextEntryState.reset();
// fall through
case SPACE_AFTER_PICKED:
mJustAddedAutoSpace = false; // The user moved the cursor.
break;
}
}
mJustAccepted = false;
postUpdateShiftKeyState();
// Make a note of the cursor position
mLastSelectionStart = newSelStart;
mLastSelectionEnd = newSelEnd;
if (mReCorrectionEnabled) {
// Don't look for corrections if the keyboard is not visible
if (mKeyboardSwitcher != null
&& mKeyboardSwitcher.getInputView() != null
&& mKeyboardSwitcher.getInputView().isShown()) {
// Check if we should go in or out of correction mode.
if (isPredictionOn()
&& mJustRevertedSeparator == null
&& (candidatesStart == candidatesEnd
|| newSelStart != oldSelStart || TextEntryState
.isCorrecting())
&& (newSelStart < newSelEnd - 1 || (!mPredicting))
&& !mVoiceInputHighlighted) {
if (isCursorTouchingWord()
|| mLastSelectionStart < mLastSelectionEnd) {
postUpdateOldSuggestions();
} else {
abortCorrection(false);
// Show the punctuation suggestions list if the current
// one is not
// and if not showing "Touch again to save".
if (mCandidateView != null
&& !mSuggestPuncList.equals(mCandidateView
.getSuggestions())
&& !mCandidateView
.isShowingAddToDictionaryHint()) {
setNextSuggestions();
}
}
}
}
}
}
/**
* This is called when the user has clicked on the extracted text view, when
* running in fullscreen mode. The default implementation hides the
* candidates view when this happens, but only if the extracted text editor
* has a vertical scroll bar because its text doesn't fit. Here we override
* the behavior due to the possibility that a re-correction could cause the
* candidate strip to disappear and re-appear.
*/
@Override
public void onExtractedTextClicked() {
if (mReCorrectionEnabled && isPredictionOn())
return;
super.onExtractedTextClicked();
}
/**
* This is called when the user has performed a cursor movement in the
* extracted text view, when it is running in fullscreen mode. The default
* implementation hides the candidates view when a vertical movement
* happens, but only if the extracted text editor has a vertical scroll bar
* because its text doesn't fit. Here we override the behavior due to the
* possibility that a re-correction could cause the candidate strip to
* disappear and re-appear.
*/
@Override
public void onExtractedCursorMovement(int dx, int dy) {
if (mReCorrectionEnabled && isPredictionOn())
return;
super.onExtractedCursorMovement(dx, dy);
}
@Override
public void hideWindow() {
LatinImeLogger.commit();
onAutoCompletionStateChanged(false);
if (TRACE)
Debug.stopMethodTracing();
if (mOptionsDialog != null && mOptionsDialog.isShowing()) {
mOptionsDialog.dismiss();
mOptionsDialog = null;
}
if (!mConfigurationChanging) {
if (mAfterVoiceInput)
mVoiceInput.logInputEnded();
if (mVoiceWarningDialog != null && mVoiceWarningDialog.isShowing()) {
mVoiceInput.logKeyboardWarningDialogDismissed();
mVoiceWarningDialog.dismiss();
mVoiceWarningDialog = null;
}
if (VOICE_INSTALLED & mRecognizing) {
mVoiceInput.cancel();
}
}
mWordToSuggestions.clear();
mWordHistory.clear();
super.hideWindow();
TextEntryState.endSession();
}
@Override
public void onDisplayCompletions(CompletionInfo[] completions) {
if (DEBUG) {
Log.i("foo", "Received completions:");
for (int i = 0; i < (completions != null ? completions.length : 0); i++) {
Log.i("foo", " #" + i + ": " + completions[i]);
}
}
if (mCompletionOn) {
mCompletions = completions;
if (completions == null) {
clearSuggestions();
return;
}
List<CharSequence> stringList = new ArrayList<CharSequence>();
for (int i = 0; i < (completions != null ? completions.length : 0); i++) {
CompletionInfo ci = completions[i];
if (ci != null)
stringList.add(ci.getText());
}
// When in fullscreen mode, show completions generated by the
// application
setSuggestions(stringList, true, true, true);
mBestWord = null;
setCandidatesViewShown(true);
}
}
private void setCandidatesViewShownInternal(boolean shown,
boolean needsInputViewShown) {
// Log.i(TAG, "setCandidatesViewShownInternal(" + shown + ", " + needsInputViewShown +
// " mCompletionOn=" + mCompletionOn +
// " mPredictionOnForMode=" + mPredictionOnForMode +
// " mPredictionOn=" + mPredictionOn +
// " mPredicting=" + mPredicting
// );
// TODO: Remove this if we support candidates with hard keyboard
if (onEvaluateInputViewShown()) {
boolean visible = shown
&& mKeyboardSwitcher.getInputView() != null
&& mPredictionOnForMode
&& (needsInputViewShown
? mKeyboardSwitcher.getInputView().isShown()
: true);
if (visible) {
if (mCandidateViewContainer == null) {
onCreateCandidatesView();
mPredictionOn = mPredictionOnForMode;
setNextSuggestions();
}
} else {
if (mCandidateViewContainer != null) {
removeCandidateViewContainer();
}
}
super.setCandidatesViewShown(visible);
} else {
if (mCandidateViewContainer != null) {
removeCandidateViewContainer();
}
commitTyped(getCurrentInputConnection(), true);
}
}
@Override
public void onFinishCandidatesView(boolean finishingInput) {
//Log.i(TAG, "onFinishCandidatesView(), mCandidateViewContainer=" + mCandidateViewContainer);
super.onFinishCandidatesView(finishingInput);
if (mCandidateViewContainer != null) {
removeCandidateViewContainer();
}
}
@Override
public boolean onEvaluateInputViewShown() {
boolean parent = super.onEvaluateInputViewShown();
boolean wanted = mForceKeyboardOn || parent;
//Log.i(TAG, "OnEvaluateInputViewShown, parent=" + parent + " + " wanted=" + wanted);
return wanted;
}
@Override
public void setCandidatesViewShown(boolean shown) {
setCandidatesViewShownInternal(shown, true /* needsInputViewShown */);
}
@Override
public void onComputeInsets(InputMethodService.Insets outInsets) {
super.onComputeInsets(outInsets);
if (!isFullscreenMode()) {
outInsets.contentTopInsets = outInsets.visibleTopInsets;
}
}
@Override
public boolean onEvaluateFullscreenMode() {
DisplayMetrics dm = getResources().getDisplayMetrics();
float displayHeight = dm.heightPixels;
// If the display is more than X inches high, don't go to fullscreen
// mode
float dimen = getResources().getDimension(
R.dimen.max_height_for_fullscreen);
if (displayHeight > dimen || mFullscreenOverride || isConnectbot()) {
return false;
} else {
return super.onEvaluateFullscreenMode();
}
}
public boolean isKeyboardVisible() {
return (mKeyboardSwitcher != null
&& mKeyboardSwitcher.getInputView() != null
&& mKeyboardSwitcher.getInputView().isShown());
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
switch (keyCode) {
case KeyEvent.KEYCODE_BACK:
if (event.getRepeatCount() == 0
&& mKeyboardSwitcher.getInputView() != null) {
if (mKeyboardSwitcher.getInputView().handleBack()) {
return true;
} else if (mTutorial != null) {
mTutorial.close();
mTutorial = null;
}
}
break;
case KeyEvent.KEYCODE_DPAD_DOWN:
case KeyEvent.KEYCODE_DPAD_UP:
case KeyEvent.KEYCODE_DPAD_LEFT:
case KeyEvent.KEYCODE_DPAD_RIGHT:
// If tutorial is visible, don't allow dpad to work
if (mTutorial != null) {
return true;
}
break;
case KeyEvent.KEYCODE_VOLUME_UP:
if (!mVolUpAction.equals("none") && isKeyboardVisible()) {
return true;
}
break;
case KeyEvent.KEYCODE_VOLUME_DOWN:
if (!mVolDownAction.equals("none") && isKeyboardVisible()) {
return true;
}
break;
}
return super.onKeyDown(keyCode, event);
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
switch (keyCode) {
case KeyEvent.KEYCODE_DPAD_DOWN:
case KeyEvent.KEYCODE_DPAD_UP:
case KeyEvent.KEYCODE_DPAD_LEFT:
case KeyEvent.KEYCODE_DPAD_RIGHT:
// If tutorial is visible, don't allow dpad to work
if (mTutorial != null) {
return true;
}
LatinKeyboardView inputView = mKeyboardSwitcher.getInputView();
// Enable shift key and DPAD to do selections
if (inputView != null && inputView.isShown()
&& inputView.getShiftState() == Keyboard.SHIFT_ON) {
event = new KeyEvent(event.getDownTime(), event.getEventTime(),
event.getAction(), event.getKeyCode(), event
.getRepeatCount(), event.getDeviceId(), event
.getScanCode(), KeyEvent.META_SHIFT_LEFT_ON
| KeyEvent.META_SHIFT_ON);
InputConnection ic = getCurrentInputConnection();
if (ic != null)
ic.sendKeyEvent(event);
return true;
}
break;
case KeyEvent.KEYCODE_VOLUME_UP:
if (!mVolUpAction.equals("none") && isKeyboardVisible()) {
return doSwipeAction(mVolUpAction);
}
break;
case KeyEvent.KEYCODE_VOLUME_DOWN:
if (!mVolDownAction.equals("none") && isKeyboardVisible()) {
return doSwipeAction(mVolDownAction);
}
break;
}
return super.onKeyUp(keyCode, event);
}
private void revertVoiceInput() {
InputConnection ic = getCurrentInputConnection();
if (ic != null)
ic.commitText("", 1);
updateSuggestions();
mVoiceInputHighlighted = false;
}
private void commitVoiceInput() {
InputConnection ic = getCurrentInputConnection();
if (ic != null)
ic.finishComposingText();
updateSuggestions();
mVoiceInputHighlighted = false;
}
private void reloadKeyboards() {
mKeyboardSwitcher.setLanguageSwitcher(mLanguageSwitcher);
if (mKeyboardSwitcher.getInputView() != null
&& mKeyboardSwitcher.getKeyboardMode() != KeyboardSwitcher.MODE_NONE) {
mKeyboardSwitcher.setVoiceMode(mEnableVoice && mEnableVoiceButton,
mVoiceOnPrimary);
}
updateKeyboardOptions();
mKeyboardSwitcher.makeKeyboards(true);
}
private void commitTyped(InputConnection inputConnection, boolean manual) {
if (mPredicting) {
mPredicting = false;
if (mComposing.length() > 0) {
if (inputConnection != null) {
inputConnection.commitText(mComposing, 1);
}
mCommittedLength = mComposing.length();
if (manual) {
TextEntryState.manualTyped(mComposing);
} else {
TextEntryState.acceptedTyped(mComposing);
}
addToDictionaries(mComposing,
AutoDictionary.FREQUENCY_FOR_TYPED);
}
updateSuggestions();
}
}
private void postUpdateShiftKeyState() {
//updateShiftKeyState(getCurrentInputEditorInfo());
// FIXME: why the delay?
mHandler.removeMessages(MSG_UPDATE_SHIFT_STATE);
// TODO: Should remove this 300ms delay?
mHandler.sendMessageDelayed(mHandler
.obtainMessage(MSG_UPDATE_SHIFT_STATE), 300);
}
public void updateShiftKeyState(EditorInfo attr) {
InputConnection ic = getCurrentInputConnection();
if (ic != null && attr != null && mKeyboardSwitcher.isAlphabetMode()) {
int oldState = getShiftState();
boolean isShifted = mShiftKeyState.isMomentary();
boolean isCapsLock = (oldState == Keyboard.SHIFT_CAPS_LOCKED);
boolean isCaps = isCapsLock || getCursorCapsMode(ic, attr) != 0;
//Log.i(TAG, "updateShiftKeyState isShifted=" + isShifted + " isCaps=" + isCaps + " isMomentary=" + mShiftKeyState.isMomentary() + " cursorCaps=" + getCursorCapsMode(ic, attr));
int newState = Keyboard.SHIFT_OFF;
if (isShifted) {
newState = Keyboard.SHIFT_ON;
} else if (isCaps) {
newState = isCapsLock ? Keyboard.SHIFT_CAPS_LOCKED : Keyboard.SHIFT_CAPS;
}
//Log.i(TAG, "updateShiftKeyState " + oldState + " -> " + newState);
mKeyboardSwitcher.setShiftState(newState);
}
if (ic != null) {
// Clear modifiers other than shift, to avoid them getting stuck
int states =
KeyEvent.META_ALT_ON
| KeyEvent.META_ALT_LEFT_ON
| KeyEvent.META_ALT_RIGHT_ON
| 0x8 // KeyEvent.META_FUNCTION_ON;
| 0x7000 // KeyEvent.META_CTRL_MASK
| 0x70000 // KeyEvent.META_META_MASK
| KeyEvent.META_SYM_ON;
ic.clearMetaKeyStates(states);
}
}
private int getShiftState() {
if (mKeyboardSwitcher != null) {
LatinKeyboardView view = mKeyboardSwitcher.getInputView();
if (view != null) {
return view.getShiftState();
}
}
return Keyboard.SHIFT_OFF;
}
private boolean isShiftCapsMode() {
if (mKeyboardSwitcher != null) {
LatinKeyboardView view = mKeyboardSwitcher.getInputView();
if (view != null) {
return view.isShiftCaps();
}
}
return false;
}
private int getCursorCapsMode(InputConnection ic, EditorInfo attr) {
int caps = 0;
EditorInfo ei = getCurrentInputEditorInfo();
if (mAutoCapActive && ei != null && ei.inputType != EditorInfo.TYPE_NULL) {
caps = ic.getCursorCapsMode(attr.inputType);
}
return caps;
}
private void swapPunctuationAndSpace() {
final InputConnection ic = getCurrentInputConnection();
if (ic == null)
return;
CharSequence lastTwo = ic.getTextBeforeCursor(2, 0);
if (lastTwo != null && lastTwo.length() == 2
&& lastTwo.charAt(0) == ASCII_SPACE
&& isSentenceSeparator(lastTwo.charAt(1))) {
ic.beginBatchEdit();
ic.deleteSurroundingText(2, 0);
ic.commitText(lastTwo.charAt(1) + " ", 1);
ic.endBatchEdit();
updateShiftKeyState(getCurrentInputEditorInfo());
mJustAddedAutoSpace = true;
}
}
private void reswapPeriodAndSpace() {
final InputConnection ic = getCurrentInputConnection();
if (ic == null)
return;
CharSequence lastThree = ic.getTextBeforeCursor(3, 0);
if (lastThree != null && lastThree.length() == 3
&& lastThree.charAt(0) == ASCII_PERIOD
&& lastThree.charAt(1) == ASCII_SPACE
&& lastThree.charAt(2) == ASCII_PERIOD) {
ic.beginBatchEdit();
ic.deleteSurroundingText(3, 0);
ic.commitText(" ..", 1);
ic.endBatchEdit();
updateShiftKeyState(getCurrentInputEditorInfo());
}
}
private void doubleSpace() {
// if (!mAutoPunctuate) return;
if (mCorrectionMode == Suggest.CORRECTION_NONE)
return;
final InputConnection ic = getCurrentInputConnection();
if (ic == null)
return;
CharSequence lastThree = ic.getTextBeforeCursor(3, 0);
if (lastThree != null && lastThree.length() == 3
&& Character.isLetterOrDigit(lastThree.charAt(0))
&& lastThree.charAt(1) == ASCII_SPACE
&& lastThree.charAt(2) == ASCII_SPACE) {
ic.beginBatchEdit();
ic.deleteSurroundingText(2, 0);
ic.commitText(". ", 1);
ic.endBatchEdit();
updateShiftKeyState(getCurrentInputEditorInfo());
mJustAddedAutoSpace = true;
}
}
private void maybeRemovePreviousPeriod(CharSequence text) {
final InputConnection ic = getCurrentInputConnection();
if (ic == null || text.length() == 0)
return;
// When the text's first character is '.', remove the previous period
// if there is one.
CharSequence lastOne = ic.getTextBeforeCursor(1, 0);
if (lastOne != null && lastOne.length() == 1
&& lastOne.charAt(0) == ASCII_PERIOD
&& text.charAt(0) == ASCII_PERIOD) {
ic.deleteSurroundingText(1, 0);
}
}
private void removeTrailingSpace() {
final InputConnection ic = getCurrentInputConnection();
if (ic == null)
return;
CharSequence lastOne = ic.getTextBeforeCursor(1, 0);
if (lastOne != null && lastOne.length() == 1
&& lastOne.charAt(0) == ASCII_SPACE) {
ic.deleteSurroundingText(1, 0);
}
}
public boolean addWordToDictionary(String word) {
mUserDictionary.addWord(word, 128);
// Suggestion strip should be updated after the operation of adding word
// to the
// user dictionary
postUpdateSuggestions();
return true;
}
private boolean isAlphabet(int code) {
if (Character.isLetter(code)) {
return true;
} else {
return false;
}
}
private void showInputMethodPicker() {
((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE))
.showInputMethodPicker();
}
private void onOptionKeyPressed() {
if (!isShowingOptionDialog()) {
showOptionsMenu();
}
}
private void onOptionKeyLongPressed() {
if (!isShowingOptionDialog()) {
showInputMethodPicker();
}
}
private boolean isShowingOptionDialog() {
return mOptionsDialog != null && mOptionsDialog.isShowing();
}
private boolean isConnectbot() {
EditorInfo ei = getCurrentInputEditorInfo();
String pkg = ei.packageName;
if (ei == null || pkg == null) return false;
return ((pkg.equalsIgnoreCase("org.connectbot")
|| pkg.equalsIgnoreCase("org.woltage.irssiconnectbot")
|| pkg.equalsIgnoreCase("com.pslib.connectbot")
|| pkg.equalsIgnoreCase("sk.vx.connectbot")
) && ei.inputType == 0); // FIXME
}
private int getMetaState(boolean shifted) {
int meta = 0;
if (shifted) meta |= KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON;
if (mModCtrl) meta |= 0x3000; // KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON;
if (mModAlt) meta |= 0x30000; // KeyEvent.META_ALT_ON | KeyEvent.META_ALT_LEFT_ON;
return meta;
}
private void sendKeyDown(InputConnection ic, int key, int meta) {
long now = System.currentTimeMillis();
if (ic != null) ic.sendKeyEvent(new KeyEvent(
now, now, KeyEvent.ACTION_DOWN, key, 0, meta));
}
private void sendKeyUp(InputConnection ic, int key, int meta) {
long now = System.currentTimeMillis();
if (ic != null) ic.sendKeyEvent(new KeyEvent(
now, now, KeyEvent.ACTION_UP, key, 0, meta));
}
private void sendModifiedKeyDownUp(int key, boolean shifted) {
InputConnection ic = getCurrentInputConnection();
int meta = getMetaState(shifted);
sendModifierKeysDown(shifted);
sendKeyDown(ic, key, meta);
sendKeyUp(ic, key, meta);
sendModifierKeysUp(shifted);
}
private boolean isShiftMod() {
if (mShiftKeyState.isMomentary()) return true;
if (mKeyboardSwitcher != null) {
LatinKeyboardView kb = mKeyboardSwitcher.getInputView();
if (kb != null) return kb.isShiftAll();
}
return false;
}
private boolean delayChordingCtrlModifier() {
return sKeyboardSettings.chordingCtrlKey == 0;
}
private boolean delayChordingAltModifier() {
return sKeyboardSettings.chordingAltKey == 0;
}
private void sendModifiedKeyDownUp(int key) {
sendModifiedKeyDownUp(key, isShiftMod());
}
private void sendShiftKey(InputConnection ic, boolean isDown) {
int key = KeyEvent.KEYCODE_SHIFT_LEFT;
int meta = KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON;
if (isDown) {
sendKeyDown(ic, key, meta);
} else {
sendKeyUp(ic, key, meta);
}
}
private void sendCtrlKey(InputConnection ic, boolean isDown, boolean chording) {
if (chording && delayChordingCtrlModifier()) return;
int key = sKeyboardSettings.chordingCtrlKey;
if (key == 0) key = 113; // KeyEvent.KEYCODE_CTRL_LEFT
int meta = 0x3000; // KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON
if (isDown) {
sendKeyDown(ic, key, meta);
} else {
sendKeyUp(ic, key, meta);
}
}
private void sendAltKey(InputConnection ic, boolean isDown, boolean chording) {
if (chording && delayChordingAltModifier()) return;
int key = sKeyboardSettings.chordingAltKey;
if (key == 0) key = 57; // KeyEvent.KEYCODE_ALT_LEFT
int meta = 0x30000; // KeyEvent.META_ALT_ON | KeyEvent.META_ALT_LEFT_ON
if (isDown) {
sendKeyDown(ic, key, meta);
} else {
sendKeyUp(ic, key, meta);
}
}
private void sendModifierKeysDown(boolean shifted) {
InputConnection ic = getCurrentInputConnection();
if (shifted) {
//Log.i(TAG, "send SHIFT down");
sendShiftKey(ic, true);
}
if (mModCtrl && (!mCtrlKeyState.isMomentary() || delayChordingCtrlModifier())) {
sendCtrlKey(ic, true, false);
}
if (mModAlt && (!mAltKeyState.isMomentary() || delayChordingAltModifier())) {
sendAltKey(ic, true, false);
}
}
private void handleModifierKeysUp(boolean shifted, boolean sendKey) {
InputConnection ic = getCurrentInputConnection();
if (mModAlt && !mAltKeyState.isMomentary()) {
if (sendKey) sendAltKey(ic, false, false);
setModAlt(false);
}
if (mModCtrl && !mCtrlKeyState.isMomentary()) {
if (sendKey) sendCtrlKey(ic, false, false);
setModCtrl(false);
}
if (shifted) {
//Log.i(TAG, "send SHIFT up");
if (sendKey) sendShiftKey(ic, false);
if (!mShiftKeyState.isMomentary()) {
resetShift();
}
}
}
private void sendModifierKeysUp(boolean shifted) {
handleModifierKeysUp(shifted, true);
}
private void sendSpecialKey(int code) {
if (!isConnectbot()) {
commitTyped(getCurrentInputConnection(), true);
sendModifiedKeyDownUp(code);
return;
}
// TODO(klausw): properly support xterm sequences for Ctrl/Alt modifiers?
// See http://slackware.osuosl.org/slackware-12.0/source/l/ncurses/xterm.terminfo
// and the output of "$ infocmp -1L". Support multiple sets, and optional
// true numpad keys?
if (ESC_SEQUENCES == null) {
ESC_SEQUENCES = new HashMap<Integer, String>();
CTRL_SEQUENCES = new HashMap<Integer, Integer>();
// VT escape sequences without leading Escape
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_HOME, "[1~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_END, "[4~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_PAGE_UP, "[5~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_PAGE_DOWN, "[6~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F1, "OP");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F2, "OQ");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F3, "OR");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F4, "OS");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F5, "[15~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F6, "[17~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F7, "[18~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F8, "[19~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F9, "[20~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F10, "[21~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F11, "[23~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F12, "[24~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FORWARD_DEL, "[3~");
ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_INSERT, "[2~");
// Special ConnectBot hack: Ctrl-1 to Ctrl-0 for F1-F10.
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F1, KeyEvent.KEYCODE_1);
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F2, KeyEvent.KEYCODE_2);
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F3, KeyEvent.KEYCODE_3);
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F4, KeyEvent.KEYCODE_4);
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F5, KeyEvent.KEYCODE_5);
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F6, KeyEvent.KEYCODE_6);
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F7, KeyEvent.KEYCODE_7);
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F8, KeyEvent.KEYCODE_8);
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F9, KeyEvent.KEYCODE_9);
CTRL_SEQUENCES.put(-LatinKeyboardView.KEYCODE_FKEY_F10, KeyEvent.KEYCODE_0);
// Natively supported by ConnectBot
// ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_DPAD_UP, "OA");
// ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_DPAD_DOWN, "OB");
// ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_DPAD_LEFT, "OD");
// ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_DPAD_RIGHT, "OC");
// No VT equivalents?
// ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_DPAD_CENTER, "");
// ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_SYSRQ, "");
// ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_BREAK, "");
// ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_NUM_LOCK, "");
// ESC_SEQUENCES.put(-LatinKeyboardView.KEYCODE_SCROLL_LOCK, "");
}
InputConnection ic = getCurrentInputConnection();
Integer ctrlseq = null;
if (mConnectbotTabHack) {
ctrlseq = CTRL_SEQUENCES.get(code);
}
String seq = ESC_SEQUENCES.get(code);
if (ctrlseq != null) {
if (mModAlt) {
// send ESC prefix for "Meta"
ic.commitText(Character.toString((char) 27), 1);
}
ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN,
KeyEvent.KEYCODE_DPAD_CENTER));
ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP,
KeyEvent.KEYCODE_DPAD_CENTER));
ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN,
ctrlseq));
ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP,
ctrlseq));
} else if (seq != null) {
if (mModAlt) {
// send ESC prefix for "Meta"
ic.commitText(Character.toString((char) 27), 1);
}
// send ESC prefix of escape sequence
ic.commitText(Character.toString((char) 27), 1);
ic.commitText(seq, 1);
} else {
// send key code, let connectbot handle it
sendDownUpKeyEvents(code);
}
handleModifierKeysUp(false, false);
}
private final static int asciiToKeyCode[] = new int[127];
private final static int KF_MASK = 0xffff;
private final static int KF_SHIFTABLE = 0x10000;
private final static int KF_UPPER = 0x20000;
{
// Include RETURN in this set even though it's not printable.
// Most other non-printable keys get handled elsewhere.
asciiToKeyCode['\n'] = KeyEvent.KEYCODE_ENTER | KF_SHIFTABLE;
// Non-alphanumeric ASCII codes which have their own keys
// (on some keyboards)
asciiToKeyCode[' '] = KeyEvent.KEYCODE_SPACE | KF_SHIFTABLE;
//asciiToKeyCode['!'] = KeyEvent.KEYCODE_;
//asciiToKeyCode['"'] = KeyEvent.KEYCODE_;
asciiToKeyCode['#'] = KeyEvent.KEYCODE_POUND;
//asciiToKeyCode['$'] = KeyEvent.KEYCODE_;
//asciiToKeyCode['%'] = KeyEvent.KEYCODE_;
//asciiToKeyCode['&'] = KeyEvent.KEYCODE_;
asciiToKeyCode['\''] = KeyEvent.KEYCODE_APOSTROPHE;
//asciiToKeyCode['('] = KeyEvent.KEYCODE_;
//asciiToKeyCode[')'] = KeyEvent.KEYCODE_;
asciiToKeyCode['*'] = KeyEvent.KEYCODE_STAR;
asciiToKeyCode['+'] = KeyEvent.KEYCODE_PLUS;
asciiToKeyCode[','] = KeyEvent.KEYCODE_COMMA;
asciiToKeyCode['-'] = KeyEvent.KEYCODE_MINUS;
asciiToKeyCode['.'] = KeyEvent.KEYCODE_PERIOD;
asciiToKeyCode['/'] = KeyEvent.KEYCODE_SLASH;
//asciiToKeyCode[':'] = KeyEvent.KEYCODE_;
asciiToKeyCode[';'] = KeyEvent.KEYCODE_SEMICOLON;
//asciiToKeyCode['<'] = KeyEvent.KEYCODE_;
asciiToKeyCode['='] = KeyEvent.KEYCODE_EQUALS;
//asciiToKeyCode['>'] = KeyEvent.KEYCODE_;
//asciiToKeyCode['?'] = KeyEvent.KEYCODE_;
asciiToKeyCode['@'] = KeyEvent.KEYCODE_AT;
asciiToKeyCode['['] = KeyEvent.KEYCODE_LEFT_BRACKET;
asciiToKeyCode['\\'] = KeyEvent.KEYCODE_BACKSLASH;
asciiToKeyCode[']'] = KeyEvent.KEYCODE_RIGHT_BRACKET;
//asciiToKeyCode['^'] = KeyEvent.KEYCODE_;
//asciiToKeyCode['_'] = KeyEvent.KEYCODE_;
asciiToKeyCode['`'] = KeyEvent.KEYCODE_GRAVE;
//asciiToKeyCode['{'] = KeyEvent.KEYCODE_;
//asciiToKeyCode['|'] = KeyEvent.KEYCODE_;
//asciiToKeyCode['}'] = KeyEvent.KEYCODE_;
//asciiToKeyCode['~'] = KeyEvent.KEYCODE_;
for (int i = 0; i <= 25; ++i) {
asciiToKeyCode['a' + i] = KeyEvent.KEYCODE_A + i;
asciiToKeyCode['A' + i] = KeyEvent.KEYCODE_A + i | KF_UPPER;
}
for (int i = 0; i <= 9; ++i) {
asciiToKeyCode['0' + i] = KeyEvent.KEYCODE_0 + i;
}
}
public void sendModifiableKeyChar(char ch) {
// Support modified key events
boolean modShift = isShiftMod();
if ((modShift || mModCtrl || mModAlt) && ch > 0 && ch < 127) {
InputConnection ic = getCurrentInputConnection();
if (isConnectbot()) {
if (mModAlt) {
// send ESC prefix
ic.commitText(Character.toString((char) 27), 1);
}
if (mModCtrl) {
int code = ch & 31;
if (code == 9) {
sendTab();
} else {
ic.commitText(Character.toString((char) code), 1);
}
} else {
ic.commitText(Character.toString(ch), 1);
}
handleModifierKeysUp(false, false);
return;
}
// Non-ConnectBot
// Restrict Shift modifier to ENTER and SPACE, supporting Shift-Enter etc.
// Note that most special keys such as DEL or cursor keys aren't handled
// by this charcode-based method.
int combinedCode = asciiToKeyCode[ch];
if (combinedCode > 0) {
int code = combinedCode & KF_MASK;
boolean shiftable = (combinedCode & KF_SHIFTABLE) > 0;
boolean upper = (combinedCode & KF_UPPER) > 0;
boolean shifted = modShift && (upper || shiftable);
sendModifiedKeyDownUp(code, shifted);
return;
}
}
if (ch >= '0' && ch <= '9') {
//WIP
InputConnection ic = getCurrentInputConnection();
ic.clearMetaKeyStates(KeyEvent.META_SHIFT_ON | KeyEvent.META_ALT_ON | KeyEvent.META_SYM_ON);
//EditorInfo ei = getCurrentInputEditorInfo();
//Log.i(TAG, "capsmode=" + ic.getCursorCapsMode(ei.inputType));
//sendModifiedKeyDownUp(KeyEvent.KEYCODE_0 + ch - '0');
//return;
}
// Default handling for anything else, including unmodified ENTER and SPACE.
sendKeyChar(ch);
}
private void sendTab() {
InputConnection ic = getCurrentInputConnection();
boolean tabHack = isConnectbot() && mConnectbotTabHack;
// FIXME: tab and ^I don't work in connectbot, hackish workaround
if (tabHack) {
if (mModAlt) {
// send ESC prefix
ic.commitText(Character.toString((char) 27), 1);
}
ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN,
KeyEvent.KEYCODE_DPAD_CENTER));
ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP,
KeyEvent.KEYCODE_DPAD_CENTER));
ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN,
KeyEvent.KEYCODE_I));
ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP,
KeyEvent.KEYCODE_I));
} else {
sendModifiedKeyDownUp(KeyEvent.KEYCODE_TAB);
}
}
private void sendEscape() {
if (isConnectbot()) {
sendKeyChar((char) 27);
} else {
sendModifiedKeyDownUp(111 /*KeyEvent.KEYCODE_ESCAPE */);
}
}
private boolean processMultiKey(int primaryCode) {
if (mDeadAccentBuffer.composeBuffer.length() > 0) {
//Log.i(TAG, "processMultiKey: pending DeadAccent, length=" + mDeadAccentBuffer.composeBuffer.length());
mDeadAccentBuffer.execute(primaryCode);
mDeadAccentBuffer.clear();
return true;
}
if (mComposeMode) {
mComposeMode = mComposeBuffer.execute(primaryCode);
return true;
}
return false;
}
// Implementation of KeyboardViewListener
public void onKey(int primaryCode, int[] keyCodes, int x, int y) {
long when = SystemClock.uptimeMillis();
if (primaryCode != Keyboard.KEYCODE_DELETE
|| when > mLastKeyTime + QUICK_PRESS) {
mDeleteCount = 0;
}
mLastKeyTime = when;
final boolean distinctMultiTouch = mKeyboardSwitcher
.hasDistinctMultitouch();
switch (primaryCode) {
case Keyboard.KEYCODE_DELETE:
if (processMultiKey(primaryCode)) {
break;
}
handleBackspace();
mDeleteCount++;
LatinImeLogger.logOnDelete();
break;
case Keyboard.KEYCODE_SHIFT:
// Shift key is handled in onPress() when device has distinct
// multi-touch panel.
if (!distinctMultiTouch)
handleShift();
break;
case Keyboard.KEYCODE_MODE_CHANGE:
// Symbol key is handled in onPress() when device has distinct
// multi-touch panel.
if (!distinctMultiTouch)
changeKeyboardMode();
break;
case LatinKeyboardView.KEYCODE_CTRL_LEFT:
// Ctrl key is handled in onPress() when device has distinct
// multi-touch panel.
if (!distinctMultiTouch)
setModCtrl(!mModCtrl);
break;
case LatinKeyboardView.KEYCODE_ALT_LEFT:
// Alt key is handled in onPress() when device has distinct
// multi-touch panel.
if (!distinctMultiTouch)
setModAlt(!mModAlt);
break;
case LatinKeyboardView.KEYCODE_FN:
if (!distinctMultiTouch)
setModFn(!mModFn);
break;
case Keyboard.KEYCODE_CANCEL:
if (!isShowingOptionDialog()) {
handleClose();
}
break;
case LatinKeyboardView.KEYCODE_OPTIONS:
onOptionKeyPressed();
break;
case LatinKeyboardView.KEYCODE_OPTIONS_LONGPRESS:
onOptionKeyLongPressed();
break;
case LatinKeyboardView.KEYCODE_COMPOSE:
mComposeMode = !mComposeMode;
mComposeBuffer.clear();
break;
case LatinKeyboardView.KEYCODE_NEXT_LANGUAGE:
toggleLanguage(false, true);
break;
case LatinKeyboardView.KEYCODE_PREV_LANGUAGE:
toggleLanguage(false, false);
break;
case LatinKeyboardView.KEYCODE_VOICE:
if (VOICE_INSTALLED) {
startListening(false /* was a button press, was not a swipe */);
}
break;
case 9 /* Tab */:
if (processMultiKey(primaryCode)) {
break;
}
sendTab();
break;
case LatinKeyboardView.KEYCODE_ESCAPE:
if (processMultiKey(primaryCode)) {
break;
}
sendEscape();
break;
case LatinKeyboardView.KEYCODE_DPAD_UP:
case LatinKeyboardView.KEYCODE_DPAD_DOWN:
case LatinKeyboardView.KEYCODE_DPAD_LEFT:
case LatinKeyboardView.KEYCODE_DPAD_RIGHT:
case LatinKeyboardView.KEYCODE_DPAD_CENTER:
case LatinKeyboardView.KEYCODE_HOME:
case LatinKeyboardView.KEYCODE_END:
case LatinKeyboardView.KEYCODE_PAGE_UP:
case LatinKeyboardView.KEYCODE_PAGE_DOWN:
case LatinKeyboardView.KEYCODE_FKEY_F1:
case LatinKeyboardView.KEYCODE_FKEY_F2:
case LatinKeyboardView.KEYCODE_FKEY_F3:
case LatinKeyboardView.KEYCODE_FKEY_F4:
case LatinKeyboardView.KEYCODE_FKEY_F5:
case LatinKeyboardView.KEYCODE_FKEY_F6:
case LatinKeyboardView.KEYCODE_FKEY_F7:
case LatinKeyboardView.KEYCODE_FKEY_F8:
case LatinKeyboardView.KEYCODE_FKEY_F9:
case LatinKeyboardView.KEYCODE_FKEY_F10:
case LatinKeyboardView.KEYCODE_FKEY_F11:
case LatinKeyboardView.KEYCODE_FKEY_F12:
case LatinKeyboardView.KEYCODE_FORWARD_DEL:
case LatinKeyboardView.KEYCODE_INSERT:
case LatinKeyboardView.KEYCODE_SYSRQ:
case LatinKeyboardView.KEYCODE_BREAK:
case LatinKeyboardView.KEYCODE_NUM_LOCK:
case LatinKeyboardView.KEYCODE_SCROLL_LOCK:
if (processMultiKey(primaryCode)) {
break;
}
// send as plain keys, or as escape sequence if needed
sendSpecialKey(-primaryCode);
break;
default:
if (!mComposeMode && mDeadKeysActive && Character.getType(primaryCode) == Character.NON_SPACING_MARK) {
//Log.i(TAG, "possible dead character: " + primaryCode);
if (!mDeadAccentBuffer.execute(primaryCode)) {
//Log.i(TAG, "double dead key");
break; // pressing a dead key twice produces spacing equivalent
}
updateShiftKeyState(getCurrentInputEditorInfo());
break;
}
if (processMultiKey(primaryCode)) {
break;
}
if (primaryCode != ASCII_ENTER) {
mJustAddedAutoSpace = false;
}
RingCharBuffer.getInstance().push((char) primaryCode, x, y);
LatinImeLogger.logOnInputChar();
if (isWordSeparator(primaryCode)) {
handleSeparator(primaryCode);
} else {
handleCharacter(primaryCode, keyCodes);
}
// Cancel the just reverted state
mJustRevertedSeparator = null;
}
mKeyboardSwitcher.onKey(primaryCode);
// Reset after any single keystroke
mEnteredText = null;
//mDeadAccentBuffer.clear(); // FIXME
}
public void onText(CharSequence text) {
if (VOICE_INSTALLED && mVoiceInputHighlighted) {
commitVoiceInput();
}
//mDeadAccentBuffer.clear(); // FIXME
InputConnection ic = getCurrentInputConnection();
if (ic == null)
return;
abortCorrection(false);
ic.beginBatchEdit();
if (mPredicting) {
commitTyped(ic, true);
}
maybeRemovePreviousPeriod(text);
ic.commitText(text, 1);
ic.endBatchEdit();
updateShiftKeyState(getCurrentInputEditorInfo());
mKeyboardSwitcher.onKey(0); // dummy key code.
mJustRevertedSeparator = null;
mJustAddedAutoSpace = false;
mEnteredText = text;
}
public void onCancel() {
// User released a finger outside any key
mKeyboardSwitcher.onCancelInput();
}
private void handleBackspace() {
if (VOICE_INSTALLED && mVoiceInputHighlighted) {
mVoiceInput
.incrementTextModificationDeleteCount(mVoiceResults.candidates
.get(0).toString().length());
revertVoiceInput();
return;
}
boolean deleteChar = false;
InputConnection ic = getCurrentInputConnection();
if (ic == null)
return;
ic.beginBatchEdit();
if (mAfterVoiceInput) {
// Don't log delete if the user is pressing delete at
// the beginning of the text box (hence not deleting anything)
if (mVoiceInput.getCursorPos() > 0) {
// If anything was selected before the delete was pressed,
// increment the
// delete count by the length of the selection
int deleteLen = mVoiceInput.getSelectionSpan() > 0 ? mVoiceInput
.getSelectionSpan()
: 1;
mVoiceInput.incrementTextModificationDeleteCount(deleteLen);
}
}
if (mPredicting) {
final int length = mComposing.length();
if (length > 0) {
mComposing.delete(length - 1, length);
mWord.deleteLast();
ic.setComposingText(mComposing, 1);
if (mComposing.length() == 0) {
mPredicting = false;
}
postUpdateSuggestions();
} else {
ic.deleteSurroundingText(1, 0);
}
} else {
deleteChar = true;
}
postUpdateShiftKeyState();
TextEntryState.backspace();
if (TextEntryState.getState() == TextEntryState.State.UNDO_COMMIT) {
revertLastWord(deleteChar);
ic.endBatchEdit();
return;
} else if (mEnteredText != null
&& sameAsTextBeforeCursor(ic, mEnteredText)) {
ic.deleteSurroundingText(mEnteredText.length(), 0);
} else if (deleteChar) {
if (mCandidateView != null
&& mCandidateView.dismissAddToDictionaryHint()) {
// Go back to the suggestion mode if the user canceled the
// "Touch again to save".
// NOTE: In gerenal, we don't revert the word when backspacing
// from a manual suggestion pick. We deliberately chose a
// different behavior only in the case of picking the first
// suggestion (typed word). It's intentional to have made this
// inconsistent with backspacing after selecting other
// suggestions.
revertLastWord(deleteChar);
} else {
sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL);
if (mDeleteCount > DELETE_ACCELERATE_AT) {
sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL);
}
}
}
mJustRevertedSeparator = null;
ic.endBatchEdit();
}
private void setModCtrl(boolean val) {
// Log.i("LatinIME", "setModCtrl "+ mModCtrl + "->" + val + ", momentary=" + mCtrlKeyState.isMomentary());
mKeyboardSwitcher.setCtrlIndicator(val);
mModCtrl = val;
}
private void setModAlt(boolean val) {
// Log.i("LatinIME", "setModAlt "+ mModAlt + "->" + val + ", momentary=" + mAltKeyState.isMomentary());
mKeyboardSwitcher.setAltIndicator(val);
mModAlt = val;
}
private void setModFn(boolean val) {
//Log.i("LatinIME", "setModFn " + mModFn + "->" + val + ", momentary=" + mFnKeyState.isMomentary());
mModFn = val;
mKeyboardSwitcher.setFn(val);
mKeyboardSwitcher.setCtrlIndicator(mModCtrl);
mKeyboardSwitcher.setAltIndicator(mModAlt);
}
private void startMultitouchShift() {
if (mKeyboardSwitcher.isAlphabetMode()) {
mSavedShiftState = getShiftState();
}
handleShiftInternal(true, Keyboard.SHIFT_ON);
}
private void commitMultitouchShift() {
if (mKeyboardSwitcher.isAlphabetMode()) {
int newState = nextShiftState(mSavedShiftState, true);
handleShiftInternal(true, newState);
} else {
// do nothing, keyboard is already flipped
}
}
private void resetMultitouchShift() {
int newState = Keyboard.SHIFT_OFF;
if (mSavedShiftState == Keyboard.SHIFT_CAPS_LOCKED || mSavedShiftState == Keyboard.SHIFT_LOCKED) {
newState = mSavedShiftState;
}
handleShiftInternal(true, newState);
}
private void resetShift() {
handleShiftInternal(true, Keyboard.SHIFT_OFF);
}
private void handleShift() {
handleShiftInternal(false, -1);
}
// Rotate through shift states by successively pressing and releasing the Shift key.
private static int nextShiftState(int prevState, boolean allowCapsLock) {
if (allowCapsLock) {
if (prevState == Keyboard.SHIFT_OFF) {
return Keyboard.SHIFT_ON;
} else if (prevState == Keyboard.SHIFT_ON) {
return Keyboard.SHIFT_CAPS_LOCKED;
} else {
return Keyboard.SHIFT_OFF;
}
} else {
// currently unused, see toggleShift()
if (prevState == Keyboard.SHIFT_OFF) {
return Keyboard.SHIFT_ON;
} else {
return Keyboard.SHIFT_OFF;
}
}
}
private void handleShiftInternal(boolean forceState, int newState) {
//Log.i(TAG, "handleShiftInternal forceNormal=" + forceNormal);
mHandler.removeMessages(MSG_UPDATE_SHIFT_STATE);
KeyboardSwitcher switcher = mKeyboardSwitcher;
if (switcher.isAlphabetMode()) {
if (forceState) {
switcher.setShiftState(newState);
} else {
switcher.setShiftState(nextShiftState(getShiftState(), true));
}
} else {
switcher.toggleShift();
}
}
private void abortCorrection(boolean force) {
if (force || TextEntryState.isCorrecting()) {
getCurrentInputConnection().finishComposingText();
clearSuggestions();
}
}
private void handleCharacter(int primaryCode, int[] keyCodes) {
if (VOICE_INSTALLED && mVoiceInputHighlighted) {
commitVoiceInput();
}
if (mAfterVoiceInput) {
// Assume input length is 1. This assumption fails for smiley face
// insertions.
mVoiceInput.incrementTextModificationInsertCount(1);
}
if (mLastSelectionStart == mLastSelectionEnd
&& TextEntryState.isCorrecting()) {
abortCorrection(false);
}
if (isAlphabet(primaryCode) && isPredictionOn()
&& !mModCtrl && !mModAlt
&& !isCursorTouchingWord()) {
if (!mPredicting) {
mPredicting = true;
mComposing.setLength(0);
saveWordInHistory(mBestWord);
mWord.reset();
}
}
if (mModCtrl || mModAlt) {
commitTyped(getCurrentInputConnection(), true); // sets mPredicting=false
}
if (mPredicting) {
if (isShiftCapsMode()
&& mKeyboardSwitcher.isAlphabetMode()
&& mComposing.length() == 0) {
// Show suggestions with initial caps if starting out shifted,
// could be either auto-caps or manual shift.
mWord.setFirstCharCapitalized(true);
}
mComposing.append((char) primaryCode);
mWord.add(primaryCode, keyCodes);
InputConnection ic = getCurrentInputConnection();
if (ic != null) {
// If it's the first letter, make note of auto-caps state
if (mWord.size() == 1) {
mWord.setAutoCapitalized(getCursorCapsMode(ic,
getCurrentInputEditorInfo()) != 0);
}
ic.setComposingText(mComposing, 1);
}
postUpdateSuggestions();
} else {
sendModifiableKeyChar((char) primaryCode);
}
updateShiftKeyState(getCurrentInputEditorInfo());
if (LatinIME.PERF_DEBUG)
measureCps();
TextEntryState.typedCharacter((char) primaryCode,
isWordSeparator(primaryCode));
}
private void handleSeparator(int primaryCode) {
if (VOICE_INSTALLED && mVoiceInputHighlighted) {
commitVoiceInput();
}
if (mAfterVoiceInput) {
// Assume input length is 1. This assumption fails for smiley face
// insertions.
mVoiceInput.incrementTextModificationInsertPunctuationCount(1);
}
// Should dismiss the "Touch again to save" message when handling
// separator
if (mCandidateView != null
&& mCandidateView.dismissAddToDictionaryHint()) {
postUpdateSuggestions();
}
boolean pickedDefault = false;
// Handle separator
InputConnection ic = getCurrentInputConnection();
if (ic != null) {
ic.beginBatchEdit();
abortCorrection(false);
}
if (mPredicting) {
// In certain languages where single quote is a separator, it's
// better
// not to auto correct, but accept the typed word. For instance,
// in Italian dov' should not be expanded to dove' because the
// elision
// requires the last vowel to be removed.
if (mAutoCorrectOn
&& primaryCode != '\''
&& (mJustRevertedSeparator == null
|| mJustRevertedSeparator.length() == 0
|| mJustRevertedSeparator.charAt(0) != primaryCode)) {
pickedDefault = pickDefaultSuggestion();
// Picked the suggestion by the space key. We consider this
// as "added an auto space" in autocomplete mode, but as manually
// typed space in "quick fixes" mode.
if (primaryCode == ASCII_SPACE) {
if (mAutoCorrectEnabled) {
mJustAddedAutoSpace = true;
} else {
TextEntryState.manualTyped("");
}
}
} else {
commitTyped(ic, true);
}
}
if (mJustAddedAutoSpace && primaryCode == ASCII_ENTER) {
removeTrailingSpace();
mJustAddedAutoSpace = false;
}
sendModifiableKeyChar((char) primaryCode);
// Handle the case of ". ." -> " .." with auto-space if necessary
// before changing the TextEntryState.
if (TextEntryState.getState() == TextEntryState.State.PUNCTUATION_AFTER_ACCEPTED
&& primaryCode == ASCII_PERIOD) {
reswapPeriodAndSpace();
}
TextEntryState.typedCharacter((char) primaryCode, true);
if (TextEntryState.getState() == TextEntryState.State.PUNCTUATION_AFTER_ACCEPTED
&& primaryCode != ASCII_ENTER) {
swapPunctuationAndSpace();
} else if (isPredictionOn() && primaryCode == ASCII_SPACE) {
doubleSpace();
}
if (pickedDefault) {
TextEntryState.backToAcceptedDefault(mWord.getTypedWord());
}
updateShiftKeyState(getCurrentInputEditorInfo());
if (ic != null) {
ic.endBatchEdit();
}
}
private void handleClose() {
commitTyped(getCurrentInputConnection(), true);
if (VOICE_INSTALLED & mRecognizing) {
mVoiceInput.cancel();
}
requestHideSelf(0);
if (mKeyboardSwitcher != null) {
LatinKeyboardView inputView = mKeyboardSwitcher.getInputView();
if (inputView != null) {
inputView.closing();
}
}
TextEntryState.endSession();
}
private void saveWordInHistory(CharSequence result) {
if (mWord.size() <= 1) {
mWord.reset();
return;
}
// Skip if result is null. It happens in some edge case.
if (TextUtils.isEmpty(result)) {
return;
}
// Make a copy of the CharSequence, since it is/could be a mutable
// CharSequence
final String resultCopy = result.toString();
TypedWordAlternatives entry = new TypedWordAlternatives(resultCopy,
new WordComposer(mWord));
mWordHistory.add(entry);
}
private void postUpdateSuggestions() {
mHandler.removeMessages(MSG_UPDATE_SUGGESTIONS);
mHandler.sendMessageDelayed(mHandler
.obtainMessage(MSG_UPDATE_SUGGESTIONS), 100);
}
private void postUpdateOldSuggestions() {
mHandler.removeMessages(MSG_UPDATE_OLD_SUGGESTIONS);
mHandler.sendMessageDelayed(mHandler
.obtainMessage(MSG_UPDATE_OLD_SUGGESTIONS), 300);
}
private boolean isPredictionOn() {
return mPredictionOn;
}
private boolean isCandidateStripVisible() {
return isPredictionOn() && mShowSuggestions && !suggestionsDisabled();
}
public void onCancelVoice() {
if (mRecognizing) {
switchToKeyboardView();
}
}
private void switchToKeyboardView() {
mHandler.post(new Runnable() {
public void run() {
mRecognizing = false;
LatinKeyboardView view = mKeyboardSwitcher.getInputView();
if (view != null) {
ViewParent p = view.getParent();
if (p != null && p instanceof ViewGroup) {
((ViewGroup) p).removeView(view);
}
setInputView(mKeyboardSwitcher.getInputView());
}
setCandidatesViewShown(true);
updateInputViewShown();
postUpdateSuggestions();
}
});
}
private void switchToRecognitionStatusView() {
final boolean configChanged = mConfigurationChanging;
mHandler.post(new Runnable() {
public void run() {
setCandidatesViewShown(false);
mRecognizing = true;
View v = mVoiceInput.getView();
ViewParent p = v.getParent();
if (p != null && p instanceof ViewGroup) {
((ViewGroup) v.getParent()).removeView(v);
}
setInputView(v);
updateInputViewShown();
if (configChanged) {
mVoiceInput.onConfigurationChanged();
}
}
});
}
private void startListening(boolean swipe) {
if (!mHasUsedVoiceInput
|| (!mLocaleSupportedForVoiceInput && !mHasUsedVoiceInputUnsupportedLocale)) {
// Calls reallyStartListening if user clicks OK, does nothing if
// user clicks Cancel.
showVoiceWarningDialog(swipe);
} else {
reallyStartListening(swipe);
}
}
private void reallyStartListening(boolean swipe) {
if (!mHasUsedVoiceInput) {
// The user has started a voice input, so remember that in the
// future (so we don't show the warning dialog after the first run).
SharedPreferences.Editor editor = PreferenceManager
.getDefaultSharedPreferences(this).edit();
editor.putBoolean(PREF_HAS_USED_VOICE_INPUT, true);
SharedPreferencesCompat.apply(editor);
mHasUsedVoiceInput = true;
}
if (!mLocaleSupportedForVoiceInput
&& !mHasUsedVoiceInputUnsupportedLocale) {
// The user has started a voice input from an unsupported locale, so
// remember that
// in the future (so we don't show the warning dialog the next time
// they do this).
SharedPreferences.Editor editor = PreferenceManager
.getDefaultSharedPreferences(this).edit();
editor.putBoolean(PREF_HAS_USED_VOICE_INPUT_UNSUPPORTED_LOCALE,
true);
SharedPreferencesCompat.apply(editor);
mHasUsedVoiceInputUnsupportedLocale = true;
}
// Clear N-best suggestions
clearSuggestions();
FieldContext context = new FieldContext(getCurrentInputConnection(),
getCurrentInputEditorInfo(), mLanguageSwitcher
.getInputLanguage(), mLanguageSwitcher
.getEnabledLanguages());
mVoiceInput.startListening(context, swipe);
switchToRecognitionStatusView();
}
private void showVoiceWarningDialog(final boolean swipe) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setCancelable(true);
builder.setIcon(R.drawable.ic_mic_dialog);
builder.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
mVoiceInput.logKeyboardWarningDialogOk();
reallyStartListening(swipe);
}
});
builder.setNegativeButton(android.R.string.cancel,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
mVoiceInput.logKeyboardWarningDialogCancel();
}
});
if (mLocaleSupportedForVoiceInput) {
String message = getString(R.string.voice_warning_may_not_understand)
+ "\n\n"
+ getString(R.string.voice_warning_how_to_turn_off);
builder.setMessage(message);
} else {
String message = getString(R.string.voice_warning_locale_not_supported)
+ "\n\n"
+ getString(R.string.voice_warning_may_not_understand)
+ "\n\n"
+ getString(R.string.voice_warning_how_to_turn_off);
builder.setMessage(message);
}
builder.setTitle(R.string.voice_warning_title);
mVoiceWarningDialog = builder.create();
Window window = mVoiceWarningDialog.getWindow();
WindowManager.LayoutParams lp = window.getAttributes();
lp.token = mKeyboardSwitcher.getInputView().getWindowToken();
lp.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
window.setAttributes(lp);
window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
mVoiceInput.logKeyboardWarningDialogShown();
mVoiceWarningDialog.show();
}
public void onVoiceResults(List<String> candidates,
Map<String, List<CharSequence>> alternatives) {
if (!mRecognizing) {
return;
}
mVoiceResults.candidates = candidates;
mVoiceResults.alternatives = alternatives;
mHandler.sendMessage(mHandler.obtainMessage(MSG_VOICE_RESULTS));
}
private void handleVoiceResults() {
mAfterVoiceInput = true;
mImmediatelyAfterVoiceInput = true;
InputConnection ic = getCurrentInputConnection();
if (!isFullscreenMode()) {
// Start listening for updates to the text from typing, etc.
if (ic != null) {
ExtractedTextRequest req = new ExtractedTextRequest();
ic.getExtractedText(req,
InputConnection.GET_EXTRACTED_TEXT_MONITOR);
}
}
vibrate();
switchToKeyboardView();
final List<CharSequence> nBest = new ArrayList<CharSequence>();
boolean capitalizeFirstWord = preferCapitalization()
|| (mKeyboardSwitcher.isAlphabetMode()
&& isShiftCapsMode() );
for (String c : mVoiceResults.candidates) {
if (capitalizeFirstWord) {
c = c.substring(0,1).toUpperCase(sKeyboardSettings.inputLocale)
+ c.substring(1, c.length());
}
nBest.add(c);
}
if (nBest.size() == 0) {
return;
}
String bestResult = nBest.get(0).toString();
mVoiceInput.logVoiceInputDelivered(bestResult.length());
mHints.registerVoiceResult(bestResult);
if (ic != null)
ic.beginBatchEdit(); // To avoid extra updates on committing older
// text
commitTyped(ic, false);
EditingUtil.appendText(ic, bestResult);
if (ic != null)
ic.endBatchEdit();
mVoiceInputHighlighted = true;
mWordToSuggestions.putAll(mVoiceResults.alternatives);
}
private void clearSuggestions() {
setSuggestions(null, false, false, false);
}
private void setSuggestions(List<CharSequence> suggestions,
boolean completions, boolean typedWordValid,
boolean haveMinimalSuggestion) {
if (mIsShowingHint) {
setCandidatesViewShown(true);
mIsShowingHint = false;
}
if (mCandidateView != null) {
mCandidateView.setSuggestions(suggestions, completions,
typedWordValid, haveMinimalSuggestion);
}
}
private void updateSuggestions() {
LatinKeyboardView inputView = mKeyboardSwitcher.getInputView();
((LatinKeyboard) inputView.getKeyboard()).setPreferredLetters(null);
// Check if we have a suggestion engine attached.
if ((mSuggest == null || !isPredictionOn()) && !mVoiceInputHighlighted) {
return;
}
if (!mPredicting) {
setNextSuggestions();
return;
}
showSuggestions(mWord);
}
private List<CharSequence> getTypedSuggestions(WordComposer word) {
List<CharSequence> stringList = mSuggest.getSuggestions(
mKeyboardSwitcher.getInputView(), word, false, null);
return stringList;
}
private void showCorrections(WordAlternatives alternatives) {
List<CharSequence> stringList = alternatives.getAlternatives();
((LatinKeyboard) mKeyboardSwitcher.getInputView().getKeyboard())
.setPreferredLetters(null);
showSuggestions(stringList, alternatives.getOriginalWord(), false,
false);
}
private void showSuggestions(WordComposer word) {
// long startTime = System.currentTimeMillis(); // TIME MEASUREMENT!
// TODO Maybe need better way of retrieving previous word
CharSequence prevWord = EditingUtil.getPreviousWord(
getCurrentInputConnection(), mWordSeparators);
List<CharSequence> stringList = mSuggest.getSuggestions(
mKeyboardSwitcher.getInputView(), word, false, prevWord);
// long stopTime = System.currentTimeMillis(); // TIME MEASUREMENT!
// Log.d("LatinIME","Suggest Total Time - " + (stopTime - startTime));
int[] nextLettersFrequencies = mSuggest.getNextLettersFrequencies();
((LatinKeyboard) mKeyboardSwitcher.getInputView().getKeyboard())
.setPreferredLetters(nextLettersFrequencies);
boolean correctionAvailable = !mInputTypeNoAutoCorrect
&& mSuggest.hasMinimalCorrection();
// || mCorrectionMode == mSuggest.CORRECTION_FULL;
CharSequence typedWord = word.getTypedWord();
// If we're in basic correct
boolean typedWordValid = mSuggest.isValidWord(typedWord)
|| (preferCapitalization() && mSuggest.isValidWord(typedWord
.toString().toLowerCase()));
if (mCorrectionMode == Suggest.CORRECTION_FULL
|| mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM) {
correctionAvailable |= typedWordValid;
}
// Don't auto-correct words with multiple capital letter
correctionAvailable &= !word.isMostlyCaps();
correctionAvailable &= !TextEntryState.isCorrecting();
showSuggestions(stringList, typedWord, typedWordValid,
correctionAvailable);
}
private void showSuggestions(List<CharSequence> stringList,
CharSequence typedWord, boolean typedWordValid,
boolean correctionAvailable) {
setSuggestions(stringList, false, typedWordValid, correctionAvailable);
if (stringList.size() > 0) {
if (correctionAvailable && !typedWordValid && stringList.size() > 1) {
mBestWord = stringList.get(1);
} else {
mBestWord = typedWord;
}
} else {
mBestWord = null;
}
setCandidatesViewShown(isCandidateStripVisible() || mCompletionOn);
}
private boolean pickDefaultSuggestion() {
// Complete any pending candidate query first
if (mHandler.hasMessages(MSG_UPDATE_SUGGESTIONS)) {
mHandler.removeMessages(MSG_UPDATE_SUGGESTIONS);
updateSuggestions();
}
if (mBestWord != null && mBestWord.length() > 0) {
TextEntryState.acceptedDefault(mWord.getTypedWord(), mBestWord);
mJustAccepted = true;
pickSuggestion(mBestWord, false);
// Add the word to the auto dictionary if it's not a known word
addToDictionaries(mBestWord, AutoDictionary.FREQUENCY_FOR_TYPED);
return true;
}
return false;
}
public void pickSuggestionManually(int index, CharSequence suggestion) {
List<CharSequence> suggestions = mCandidateView.getSuggestions();
if (mAfterVoiceInput && mShowingVoiceSuggestions) {
mVoiceInput.flushAllTextModificationCounters();
// send this intent AFTER logging any prior aggregated edits.
mVoiceInput.logTextModifiedByChooseSuggestion(
suggestion.toString(), index, mWordSeparators,
getCurrentInputConnection());
}
final boolean correcting = TextEntryState.isCorrecting();
InputConnection ic = getCurrentInputConnection();
if (ic != null) {
ic.beginBatchEdit();
}
if (mCompletionOn && mCompletions != null && index >= 0
&& index < mCompletions.length) {
CompletionInfo ci = mCompletions[index];
if (ic != null) {
ic.commitCompletion(ci);
}
mCommittedLength = suggestion.length();
if (mCandidateView != null) {
mCandidateView.clear();
}
updateShiftKeyState(getCurrentInputEditorInfo());
if (ic != null) {
ic.endBatchEdit();
}
return;
}
// If this is a punctuation, apply it through the normal key press
if (suggestion.length() == 1
&& (isWordSeparator(suggestion.charAt(0)) || isSuggestedPunctuation(suggestion
.charAt(0)))) {
// Word separators are suggested before the user inputs something.
// So, LatinImeLogger logs "" as a user's input.
LatinImeLogger.logOnManualSuggestion("", suggestion.toString(),
index, suggestions);
final char primaryCode = suggestion.charAt(0);
onKey(primaryCode, new int[] { primaryCode },
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE);
if (ic != null) {
ic.endBatchEdit();
}
return;
}
mJustAccepted = true;
pickSuggestion(suggestion, correcting);
// Add the word to the auto dictionary if it's not a known word
if (index == 0) {
addToDictionaries(suggestion, AutoDictionary.FREQUENCY_FOR_PICKED);
} else {
addToBigramDictionary(suggestion, 1);
}
LatinImeLogger.logOnManualSuggestion(mComposing.toString(), suggestion
.toString(), index, suggestions);
TextEntryState.acceptedSuggestion(mComposing.toString(), suggestion);
// Follow it with a space
if (mAutoSpace && !correcting) {
sendSpace();
mJustAddedAutoSpace = true;
}
final boolean showingAddToDictionaryHint = index == 0
&& mCorrectionMode > 0 && !mSuggest.isValidWord(suggestion)
&& !mSuggest.isValidWord(suggestion.toString().toLowerCase());
if (!correcting) {
// Fool the state watcher so that a subsequent backspace will not do
// a revert, unless
// we just did a correction, in which case we need to stay in
// TextEntryState.State.PICKED_SUGGESTION state.
TextEntryState.typedCharacter((char) ASCII_SPACE, true);
setNextSuggestions();
} else if (!showingAddToDictionaryHint) {
// If we're not showing the "Touch again to save", then show
// corrections again.
// In case the cursor position doesn't change, make sure we show the
// suggestions again.
clearSuggestions();
postUpdateOldSuggestions();
}
if (showingAddToDictionaryHint) {
mCandidateView.showAddToDictionaryHint(suggestion);
}
if (ic != null) {
ic.endBatchEdit();
}
}
private void rememberReplacedWord(CharSequence suggestion) {
if (mShowingVoiceSuggestions) {
// Retain the replaced word in the alternatives array.
EditingUtil.Range range = new EditingUtil.Range();
String wordToBeReplaced = EditingUtil.getWordAtCursor(
getCurrentInputConnection(), mWordSeparators, range);
if (!mWordToSuggestions.containsKey(wordToBeReplaced)) {
wordToBeReplaced = wordToBeReplaced.toLowerCase();
}
if (mWordToSuggestions.containsKey(wordToBeReplaced)) {
List<CharSequence> suggestions = mWordToSuggestions
.get(wordToBeReplaced);
if (suggestions.contains(suggestion)) {
suggestions.remove(suggestion);
}
suggestions.add(wordToBeReplaced);
mWordToSuggestions.remove(wordToBeReplaced);
mWordToSuggestions.put(suggestion.toString(), suggestions);
}
}
}
/**
* Commits the chosen word to the text field and saves it for later
* retrieval.
*
* @param suggestion
* the suggestion picked by the user to be committed to the text
* field
* @param correcting
* whether this is due to a correction of an existing word.
*/
private void pickSuggestion(CharSequence suggestion, boolean correcting) {
LatinKeyboardView inputView = mKeyboardSwitcher.getInputView();
int shiftState = getShiftState();
if (shiftState == Keyboard.SHIFT_LOCKED || shiftState == Keyboard.SHIFT_CAPS_LOCKED) {
suggestion = suggestion.toString().toUpperCase(); // all UPPERCASE
}
InputConnection ic = getCurrentInputConnection();
if (ic != null) {
rememberReplacedWord(suggestion);
ic.commitText(suggestion, 1);
}
saveWordInHistory(suggestion);
mPredicting = false;
mCommittedLength = suggestion.length();
((LatinKeyboard) inputView.getKeyboard()).setPreferredLetters(null);
// If we just corrected a word, then don't show punctuations
if (!correcting) {
setNextSuggestions();
}
updateShiftKeyState(getCurrentInputEditorInfo());
}
/**
* Tries to apply any voice alternatives for the word if this was a spoken
* word and there are voice alternatives.
*
* @param touching
* The word that the cursor is touching, with position
* information
* @return true if an alternative was found, false otherwise.
*/
private boolean applyVoiceAlternatives(EditingUtil.SelectedWord touching) {
// Search for result in spoken word alternatives
String selectedWord = touching.word.toString().trim();
if (!mWordToSuggestions.containsKey(selectedWord)) {
selectedWord = selectedWord.toLowerCase();
}
if (mWordToSuggestions.containsKey(selectedWord)) {
mShowingVoiceSuggestions = true;
List<CharSequence> suggestions = mWordToSuggestions
.get(selectedWord);
// If the first letter of touching is capitalized, make all the
// suggestions
// start with a capital letter.
if (Character.isUpperCase(touching.word.charAt(0))) {
for (int i = 0; i < suggestions.size(); i++) {
String origSugg = (String) suggestions.get(i);
String capsSugg = origSugg.toUpperCase().charAt(0)
+ origSugg.subSequence(1, origSugg.length())
.toString();
suggestions.set(i, capsSugg);
}
}
setSuggestions(suggestions, false, true, true);
setCandidatesViewShown(true);
return true;
}
return false;
}
/**
* Tries to apply any typed alternatives for the word if we have any cached
* alternatives, otherwise tries to find new corrections and completions for
* the word.
*
* @param touching
* The word that the cursor is touching, with position
* information
* @return true if an alternative was found, false otherwise.
*/
private boolean applyTypedAlternatives(EditingUtil.SelectedWord touching) {
// If we didn't find a match, search for result in typed word history
WordComposer foundWord = null;
WordAlternatives alternatives = null;
for (WordAlternatives entry : mWordHistory) {
if (TextUtils.equals(entry.getChosenWord(), touching.word)) {
if (entry instanceof TypedWordAlternatives) {
foundWord = ((TypedWordAlternatives) entry).word;
}
alternatives = entry;
break;
}
}
// If we didn't find a match, at least suggest completions
if (foundWord == null
&& (mSuggest.isValidWord(touching.word) || mSuggest
.isValidWord(touching.word.toString().toLowerCase()))) {
foundWord = new WordComposer();
for (int i = 0; i < touching.word.length(); i++) {
foundWord.add(touching.word.charAt(i),
new int[] { touching.word.charAt(i) });
}
foundWord.setFirstCharCapitalized(Character
.isUpperCase(touching.word.charAt(0)));
}
// Found a match, show suggestions
if (foundWord != null || alternatives != null) {
if (alternatives == null) {
alternatives = new TypedWordAlternatives(touching.word,
foundWord);
}
showCorrections(alternatives);
if (foundWord != null) {
mWord = new WordComposer(foundWord);
} else {
mWord.reset();
}
return true;
}
return false;
}
private void setOldSuggestions() {
mShowingVoiceSuggestions = false;
if (mCandidateView != null
&& mCandidateView.isShowingAddToDictionaryHint()) {
return;
}
InputConnection ic = getCurrentInputConnection();
if (ic == null)
return;
if (!mPredicting) {
// Extract the selected or touching text
EditingUtil.SelectedWord touching = EditingUtil
.getWordAtCursorOrSelection(ic, mLastSelectionStart,
mLastSelectionEnd, mWordSeparators);
if (touching != null && touching.word.length() > 1) {
ic.beginBatchEdit();
if (!applyVoiceAlternatives(touching)
&& !applyTypedAlternatives(touching)) {
abortCorrection(true);
} else {
TextEntryState.selectedForCorrection();
EditingUtil.underlineWord(ic, touching);
}
ic.endBatchEdit();
} else {
abortCorrection(true);
setNextSuggestions(); // Show the punctuation suggestions list
}
} else {
abortCorrection(true);
}
}
private void setNextSuggestions() {
setSuggestions(mSuggestPuncList, false, false, false);
}
private void addToDictionaries(CharSequence suggestion, int frequencyDelta) {
checkAddToDictionary(suggestion, frequencyDelta, false);
}
private void addToBigramDictionary(CharSequence suggestion,
int frequencyDelta) {
checkAddToDictionary(suggestion, frequencyDelta, true);
}
/**
* Adds to the UserBigramDictionary and/or AutoDictionary
*
* @param addToBigramDictionary
* true if it should be added to bigram dictionary if possible
*/
private void checkAddToDictionary(CharSequence suggestion,
int frequencyDelta, boolean addToBigramDictionary) {
if (suggestion == null || suggestion.length() < 1)
return;
// Only auto-add to dictionary if auto-correct is ON. Otherwise we'll be
// adding words in situations where the user or application really
// didn't
// want corrections enabled or learned.
if (!(mCorrectionMode == Suggest.CORRECTION_FULL || mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM)) {
return;
}
if (suggestion != null) {
if (!addToBigramDictionary
&& mAutoDictionary.isValidWord(suggestion)
|| (!mSuggest.isValidWord(suggestion.toString()) && !mSuggest
.isValidWord(suggestion.toString().toLowerCase()))) {
mAutoDictionary.addWord(suggestion.toString(), frequencyDelta);
}
if (mUserBigramDictionary != null) {
CharSequence prevWord = EditingUtil.getPreviousWord(
getCurrentInputConnection(), mSentenceSeparators);
if (!TextUtils.isEmpty(prevWord)) {
mUserBigramDictionary.addBigrams(prevWord.toString(),
suggestion.toString());
}
}
}
}
private boolean isCursorTouchingWord() {
InputConnection ic = getCurrentInputConnection();
if (ic == null)
return false;
CharSequence toLeft = ic.getTextBeforeCursor(1, 0);
CharSequence toRight = ic.getTextAfterCursor(1, 0);
if (!TextUtils.isEmpty(toLeft) && !isWordSeparator(toLeft.charAt(0))
&& !isSuggestedPunctuation(toLeft.charAt(0))) {
return true;
}
if (!TextUtils.isEmpty(toRight) && !isWordSeparator(toRight.charAt(0))
&& !isSuggestedPunctuation(toRight.charAt(0))) {
return true;
}
return false;
}
private boolean sameAsTextBeforeCursor(InputConnection ic, CharSequence text) {
CharSequence beforeText = ic.getTextBeforeCursor(text.length(), 0);
return TextUtils.equals(text, beforeText);
}
public void revertLastWord(boolean deleteChar) {
final int length = mComposing.length();
if (!mPredicting && length > 0) {
final InputConnection ic = getCurrentInputConnection();
mPredicting = true;
mJustRevertedSeparator = ic.getTextBeforeCursor(1, 0);
if (deleteChar)
ic.deleteSurroundingText(1, 0);
int toDelete = mCommittedLength;
CharSequence toTheLeft = ic
.getTextBeforeCursor(mCommittedLength, 0);
if (toTheLeft != null && toTheLeft.length() > 0
&& isWordSeparator(toTheLeft.charAt(0))) {
toDelete--;
}
ic.deleteSurroundingText(toDelete, 0);
ic.setComposingText(mComposing, 1);
TextEntryState.backspace();
postUpdateSuggestions();
} else {
sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL);
mJustRevertedSeparator = null;
}
}
protected String getWordSeparators() {
return mWordSeparators;
}
public boolean isWordSeparator(int code) {
String separators = getWordSeparators();
return separators.contains(String.valueOf((char) code));
}
private boolean isSentenceSeparator(int code) {
return mSentenceSeparators.contains(String.valueOf((char) code));
}
private void sendSpace() {
sendModifiableKeyChar((char) ASCII_SPACE);
updateShiftKeyState(getCurrentInputEditorInfo());
// onKey(KEY_SPACE[0], KEY_SPACE);
}
public boolean preferCapitalization() {
return mWord.isFirstCharCapitalized();
}
void toggleLanguage(boolean reset, boolean next) {
if (reset) {
mLanguageSwitcher.reset();
} else {
if (next) {
mLanguageSwitcher.next();
} else {
mLanguageSwitcher.prev();
}
}
int currentKeyboardMode = mKeyboardSwitcher.getKeyboardMode();
reloadKeyboards();
mKeyboardSwitcher.makeKeyboards(true);
mKeyboardSwitcher.setKeyboardMode(currentKeyboardMode, 0,
mEnableVoiceButton && mEnableVoice);
initSuggest(mLanguageSwitcher.getInputLanguage());
mLanguageSwitcher.persist();
mAutoCapActive = mAutoCapPref && mLanguageSwitcher.allowAutoCap();
mDeadKeysActive = mLanguageSwitcher.allowDeadKeys();
updateShiftKeyState(getCurrentInputEditorInfo());
setCandidatesViewShown(mPredictionOnForMode && !suggestionsDisabled());
}
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
String key) {
Log.i("PCKeyboard", "onSharedPreferenceChanged()");
boolean needReload = false;
Resources res = getResources();
// Apply globally handled shared prefs
sKeyboardSettings.sharedPreferenceChanged(sharedPreferences, key);
if (sKeyboardSettings.hasFlag(GlobalKeyboardSettings.FLAG_PREF_NEED_RELOAD)) {
needReload = true;
}
if (sKeyboardSettings.hasFlag(GlobalKeyboardSettings.FLAG_PREF_NEW_PUNC_LIST)) {
initSuggestPuncList();
}
if (sKeyboardSettings.hasFlag(GlobalKeyboardSettings.FLAG_PREF_RECREATE_INPUT_VIEW)) {
mKeyboardSwitcher.recreateInputView();
}
if (sKeyboardSettings.hasFlag(GlobalKeyboardSettings.FLAG_PREF_RESET_MODE_OVERRIDE)) {
mKeyboardModeOverrideLandscape = 0;
mKeyboardModeOverridePortrait = 0;
}
if (sKeyboardSettings.hasFlag(GlobalKeyboardSettings.FLAG_PREF_RESET_KEYBOARDS)) {
toggleLanguage(true, true);
}
int unhandledFlags = sKeyboardSettings.unhandledFlags();
if (unhandledFlags != GlobalKeyboardSettings.FLAG_PREF_NONE) {
Log.w(TAG, "Not all flag settings handled, remaining=" + unhandledFlags);
}
if (PREF_SELECTED_LANGUAGES.equals(key)) {
mLanguageSwitcher.loadLocales(sharedPreferences);
mRefreshKeyboardRequired = true;
} else if (PREF_RECORRECTION_ENABLED.equals(key)) {
mReCorrectionEnabled = sharedPreferences.getBoolean(
PREF_RECORRECTION_ENABLED, res
.getBoolean(R.bool.default_recorrection_enabled));
if (mReCorrectionEnabled) {
// It doesn't work right on pre-Gingerbread phones.
Toast.makeText(getApplicationContext(),
res.getString(R.string.recorrect_warning), Toast.LENGTH_LONG)
.show();
}
} else if (PREF_CONNECTBOT_TAB_HACK.equals(key)) {
mConnectbotTabHack = sharedPreferences.getBoolean(
PREF_CONNECTBOT_TAB_HACK, res
.getBoolean(R.bool.default_connectbot_tab_hack));
} else if (PREF_FULLSCREEN_OVERRIDE.equals(key)) {
mFullscreenOverride = sharedPreferences.getBoolean(
PREF_FULLSCREEN_OVERRIDE, res
.getBoolean(R.bool.default_fullscreen_override));
needReload = true;
} else if (PREF_FORCE_KEYBOARD_ON.equals(key)) {
mForceKeyboardOn = sharedPreferences.getBoolean(
PREF_FORCE_KEYBOARD_ON, res
.getBoolean(R.bool.default_force_keyboard_on));
needReload = true;
} else if (PREF_KEYBOARD_NOTIFICATION.equals(key)) {
mKeyboardNotification = sharedPreferences.getBoolean(
PREF_KEYBOARD_NOTIFICATION, res
.getBoolean(R.bool.default_keyboard_notification));
setNotification(mKeyboardNotification);
} else if (PREF_SUGGESTIONS_IN_LANDSCAPE.equals(key)) {
mSuggestionsInLandscape = sharedPreferences.getBoolean(
PREF_SUGGESTIONS_IN_LANDSCAPE, res
.getBoolean(R.bool.default_suggestions_in_landscape));
// Respect the suggestion settings in legacy Gingerbread mode,
// in portrait mode, or if suggestions in landscape enabled.
setCandidatesViewShown(!suggestionsDisabled());
} else if (PREF_HEIGHT_PORTRAIT.equals(key)) {
mHeightPortrait = getHeight(sharedPreferences,
PREF_HEIGHT_PORTRAIT, res.getString(R.string.default_height_portrait));
needReload = true;
} else if (PREF_HEIGHT_LANDSCAPE.equals(key)) {
mHeightLandscape = getHeight(sharedPreferences,
PREF_HEIGHT_LANDSCAPE, res.getString(R.string.default_height_landscape));
needReload = true;
} else if (PREF_HINT_MODE.equals(key)) {
LatinIME.sKeyboardSettings.hintMode = Integer.parseInt(sharedPreferences.getString(PREF_HINT_MODE,
res.getString(R.string.default_hint_mode)));
needReload = true;
} else if (PREF_LONGPRESS_TIMEOUT.equals(key)) {
LatinIME.sKeyboardSettings.longpressTimeout = getPrefInt(sharedPreferences, PREF_LONGPRESS_TIMEOUT,
res.getString(R.string.default_long_press_duration));
} else if (PREF_RENDER_MODE.equals(key)) {
LatinIME.sKeyboardSettings.renderMode = getPrefInt(sharedPreferences, PREF_RENDER_MODE,
res.getString(R.string.default_render_mode));
needReload = true;
} else if (PREF_SWIPE_UP.equals(key)) {
mSwipeUpAction = sharedPreferences.getString(PREF_SWIPE_UP, res.getString(R.string.default_swipe_up));
} else if (PREF_SWIPE_DOWN.equals(key)) {
mSwipeDownAction = sharedPreferences.getString(PREF_SWIPE_DOWN, res.getString(R.string.default_swipe_down));
} else if (PREF_SWIPE_LEFT.equals(key)) {
mSwipeLeftAction = sharedPreferences.getString(PREF_SWIPE_LEFT, res.getString(R.string.default_swipe_left));
} else if (PREF_SWIPE_RIGHT.equals(key)) {
mSwipeRightAction = sharedPreferences.getString(PREF_SWIPE_RIGHT, res.getString(R.string.default_swipe_right));
} else if (PREF_VOL_UP.equals(key)) {
mVolUpAction = sharedPreferences.getString(PREF_VOL_UP, res.getString(R.string.default_vol_up));
} else if (PREF_VOL_DOWN.equals(key)) {
mVolDownAction = sharedPreferences.getString(PREF_VOL_DOWN, res.getString(R.string.default_vol_down));
} else if (PREF_VIBRATE_LEN.equals(key)) {
mVibrateLen = getPrefInt(sharedPreferences, PREF_VIBRATE_LEN, getResources().getString(R.string.vibrate_duration_ms));
vibrate(); // test setting
}
updateKeyboardOptions();
if (needReload) {
mKeyboardSwitcher.makeKeyboards(true);
}
}
private boolean doSwipeAction(String action) {
//Log.i(TAG, "doSwipeAction + " + action);
if (action == null || action.equals("") || action.equals("none")) {
return false;
} else if (action.equals("close")) {
handleClose();
} else if (action.equals("settings")) {
launchSettings();
} else if (action.equals("suggestions")) {
if (mSuggestionForceOn) {
mSuggestionForceOn = false;
mSuggestionForceOff = true;
} else if (mSuggestionForceOff) {
mSuggestionForceOn = true;
mSuggestionForceOff = false;
} else if (suggestionsDisabled()) {
mSuggestionForceOn = true;
} else {
mSuggestionForceOff = true;
}
setCandidatesViewShown(!suggestionsDisabled());
} else if (action.equals("lang_prev")) {
toggleLanguage(false, false);
} else if (action.equals("lang_next")) {
toggleLanguage(false, true);
} else if (action.equals("debug_auto_play")) {
if (LatinKeyboardView.DEBUG_AUTO_PLAY) {
ClipboardManager cm = ((ClipboardManager) getSystemService(CLIPBOARD_SERVICE));
CharSequence text = cm.getText();
if (!TextUtils.isEmpty(text)) {
mKeyboardSwitcher.getInputView().startPlaying(text.toString());
}
}
} else if (action.equals("voice_input")) {
if (VOICE_INSTALLED) {
startListening(false /* was a button press, was not a swipe */);
} else {
Toast.makeText(getApplicationContext(),
getResources().getString(R.string.voice_not_enabled_warning), Toast.LENGTH_LONG)
.show();
}
} else if (action.equals("full_mode")) {
if (isPortrait()) {
mKeyboardModeOverridePortrait = (mKeyboardModeOverridePortrait + 1) % mNumKeyboardModes;
} else {
mKeyboardModeOverrideLandscape = (mKeyboardModeOverrideLandscape + 1) % mNumKeyboardModes;
}
toggleLanguage(true, true);
} else if (action.equals("extension")) {
sKeyboardSettings.useExtension = !sKeyboardSettings.useExtension;
reloadKeyboards();
} else if (action.equals("height_up")) {
if (isPortrait()) {
mHeightPortrait += 5;
if (mHeightPortrait > 70) mHeightPortrait = 70;
} else {
mHeightLandscape += 5;
if (mHeightLandscape > 70) mHeightLandscape = 70;
}
toggleLanguage(true, true);
} else if (action.equals("height_down")) {
if (isPortrait()) {
mHeightPortrait -= 5;
if (mHeightPortrait < 15) mHeightPortrait = 15;
} else {
mHeightLandscape -= 5;
if (mHeightLandscape < 15) mHeightLandscape = 15;
}
toggleLanguage(true, true);
} else {
Log.i(TAG, "Unsupported swipe action config: " + action);
}
return true;
}
public boolean swipeRight() {
return doSwipeAction(mSwipeRightAction);
}
public boolean swipeLeft() {
return doSwipeAction(mSwipeLeftAction);
}
public boolean swipeDown() {
return doSwipeAction(mSwipeDownAction);
}
public boolean swipeUp() {
return doSwipeAction(mSwipeUpAction);
}
public void onPress(int primaryCode) {
InputConnection ic = getCurrentInputConnection();
if (mKeyboardSwitcher.isVibrateAndSoundFeedbackRequired()) {
vibrate();
playKeyClick(primaryCode);
}
final boolean distinctMultiTouch = mKeyboardSwitcher
.hasDistinctMultitouch();
if (distinctMultiTouch && primaryCode == Keyboard.KEYCODE_SHIFT) {
mShiftKeyState.onPress();
startMultitouchShift();
} else if (distinctMultiTouch
&& primaryCode == Keyboard.KEYCODE_MODE_CHANGE) {
changeKeyboardMode();
mSymbolKeyState.onPress();
mKeyboardSwitcher.setAutoModeSwitchStateMomentary();
} else if (distinctMultiTouch
&& primaryCode == LatinKeyboardView.KEYCODE_CTRL_LEFT) {
setModCtrl(!mModCtrl);
mCtrlKeyState.onPress();
sendCtrlKey(ic, true, true);
} else if (distinctMultiTouch
&& primaryCode == LatinKeyboardView.KEYCODE_ALT_LEFT) {
setModAlt(!mModAlt);
mAltKeyState.onPress();
sendAltKey(ic, true, true);
} else if (distinctMultiTouch
&& primaryCode == LatinKeyboardView.KEYCODE_FN) {
setModFn(!mModFn);
mFnKeyState.onPress();
} else {
mShiftKeyState.onOtherKeyPressed();
mSymbolKeyState.onOtherKeyPressed();
mCtrlKeyState.onOtherKeyPressed();
mAltKeyState.onOtherKeyPressed();
mFnKeyState.onOtherKeyPressed();
}
}
public void onRelease(int primaryCode) {
// Reset any drag flags in the keyboard
((LatinKeyboard) mKeyboardSwitcher.getInputView().getKeyboard())
.keyReleased();
// vibrate();
final boolean distinctMultiTouch = mKeyboardSwitcher
.hasDistinctMultitouch();
InputConnection ic = getCurrentInputConnection();
if (distinctMultiTouch && primaryCode == Keyboard.KEYCODE_SHIFT) {
if (mShiftKeyState.isMomentary()) {
resetMultitouchShift();
} else {
commitMultitouchShift();
}
mShiftKeyState.onRelease();
} else if (distinctMultiTouch
&& primaryCode == Keyboard.KEYCODE_MODE_CHANGE) {
// Snap back to the previous keyboard mode if the user chords the
// mode change key and
// other key, then released the mode change key.
if (mKeyboardSwitcher.isInChordingAutoModeSwitchState())
changeKeyboardMode();
mSymbolKeyState.onRelease();
} else if (distinctMultiTouch
&& primaryCode == LatinKeyboardView.KEYCODE_CTRL_LEFT) {
if (mCtrlKeyState.isMomentary()) {
setModCtrl(false);
}
sendCtrlKey(ic, false, true);
mCtrlKeyState.onRelease();
} else if (distinctMultiTouch
&& primaryCode == LatinKeyboardView.KEYCODE_ALT_LEFT) {
if (mAltKeyState.isMomentary()) {
setModAlt(false);
}
sendAltKey(ic, false, true);
mAltKeyState.onRelease();
} else if (distinctMultiTouch
&& primaryCode == LatinKeyboardView.KEYCODE_FN) {
if (mFnKeyState.isMomentary()) {
setModFn(false);
}
mFnKeyState.onRelease();
}
}
private FieldContext makeFieldContext() {
return new FieldContext(getCurrentInputConnection(),
getCurrentInputEditorInfo(), mLanguageSwitcher
.getInputLanguage(), mLanguageSwitcher
.getEnabledLanguages());
}
private boolean fieldCanDoVoice(FieldContext fieldContext) {
return !mPasswordText && mVoiceInput != null
&& !mVoiceInput.isBlacklistedField(fieldContext);
}
private boolean shouldShowVoiceButton(FieldContext fieldContext,
EditorInfo attribute) {
return ENABLE_VOICE_BUTTON
&& fieldCanDoVoice(fieldContext)
&& !(attribute != null && IME_OPTION_NO_MICROPHONE
.equals(attribute.privateImeOptions))
&& SpeechRecognizer.isRecognitionAvailable(this);
}
// receive ringer mode changes to detect silent mode
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
updateRingerMode();
}
};
// update flags for silent mode
private void updateRingerMode() {
if (mAudioManager == null) {
mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
}
if (mAudioManager != null) {
mSilentMode = (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_NORMAL);
}
}
private void playKeyClick(int primaryCode) {
// if mAudioManager is null, we don't have the ringer state yet
// mAudioManager will be set by updateRingerMode
if (mAudioManager == null) {
if (mKeyboardSwitcher.getInputView() != null) {
updateRingerMode();
}
}
if (mSoundOn && !mSilentMode) {
// FIXME: Volume and enable should come from UI settings
// FIXME: These should be triggered after auto-repeat logic
int sound = AudioManager.FX_KEYPRESS_STANDARD;
switch (primaryCode) {
case Keyboard.KEYCODE_DELETE:
sound = AudioManager.FX_KEYPRESS_DELETE;
break;
case ASCII_ENTER:
sound = AudioManager.FX_KEYPRESS_RETURN;
break;
case ASCII_SPACE:
sound = AudioManager.FX_KEYPRESS_SPACEBAR;
break;
}
mAudioManager.playSoundEffect(sound, FX_VOLUME);
}
}
private void vibrate() {
if (!mVibrateOn) {
return;
}
Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
if (v != null) {
v.vibrate(mVibrateLen);
return;
}
if (mKeyboardSwitcher.getInputView() != null) {
mKeyboardSwitcher.getInputView().performHapticFeedback(
HapticFeedbackConstants.KEYBOARD_TAP,
HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
}
}
private void checkTutorial(String privateImeOptions) {
if (privateImeOptions == null)
return;
if (privateImeOptions.equals("com.android.setupwizard:ShowTutorial")) {
if (mTutorial == null)
startTutorial();
} else if (privateImeOptions
.equals("com.android.setupwizard:HideTutorial")) {
if (mTutorial != null) {
if (mTutorial.close()) {
mTutorial = null;
}
}
}
}
private void startTutorial() {
mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_START_TUTORIAL),
500);
}
/* package */void tutorialDone() {
mTutorial = null;
}
/* package */void promoteToUserDictionary(String word, int frequency) {
if (mUserDictionary.isValidWord(word))
return;
mUserDictionary.addWord(word, frequency);
}
/* package */WordComposer getCurrentWord() {
return mWord;
}
/* package */boolean getPopupOn() {
return mPopupOn;
}
private void updateCorrectionMode() {
mHasDictionary = mSuggest != null ? mSuggest.hasMainDictionary()
: false;
mAutoCorrectOn = (mAutoCorrectEnabled || mQuickFixes)
&& !mInputTypeNoAutoCorrect && mHasDictionary;
mCorrectionMode = (mAutoCorrectOn && mAutoCorrectEnabled) ? Suggest.CORRECTION_FULL
: (mAutoCorrectOn ? Suggest.CORRECTION_BASIC
: Suggest.CORRECTION_NONE);
mCorrectionMode = (mBigramSuggestionEnabled && mAutoCorrectOn && mAutoCorrectEnabled) ? Suggest.CORRECTION_FULL_BIGRAM
: mCorrectionMode;
if (suggestionsDisabled()) {
mAutoCorrectOn = false;
mCorrectionMode = Suggest.CORRECTION_NONE;
}
if (mSuggest != null) {
mSuggest.setCorrectionMode(mCorrectionMode);
}
}
private void updateAutoTextEnabled(Locale systemLocale) {
if (mSuggest == null)
return;
boolean different = !systemLocale.getLanguage().equalsIgnoreCase(
mInputLocale.substring(0, 2));
mSuggest.setAutoTextEnabled(!different && mQuickFixes);
}
protected void launchSettings() {
launchSettings(LatinIMESettings.class);
}
public void launchDebugSettings() {
launchSettings(LatinIMEDebugSettings.class);
}
protected void launchSettings(
Class<? extends PreferenceActivity> settingsClass) {
handleClose();
Intent intent = new Intent();
intent.setClass(LatinIME.this, settingsClass);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}
private void loadSettings() {
// Get the settings preferences
SharedPreferences sp = PreferenceManager
.getDefaultSharedPreferences(this);
mVibrateOn = sp.getBoolean(PREF_VIBRATE_ON, false);
mVibrateLen = getPrefInt(sp, PREF_VIBRATE_LEN, getResources().getString(R.string.vibrate_duration_ms));
mSoundOn = sp.getBoolean(PREF_SOUND_ON, false);
mPopupOn = sp.getBoolean(PREF_POPUP_ON, mResources
.getBoolean(R.bool.default_popup_preview));
mAutoCapPref = sp.getBoolean(PREF_AUTO_CAP, getResources().getBoolean(
R.bool.default_auto_cap));
mQuickFixes = sp.getBoolean(PREF_QUICK_FIXES, true);
mHasUsedVoiceInput = sp.getBoolean(PREF_HAS_USED_VOICE_INPUT, false);
mHasUsedVoiceInputUnsupportedLocale = sp.getBoolean(
PREF_HAS_USED_VOICE_INPUT_UNSUPPORTED_LOCALE, false);
// Get the current list of supported locales and check the current
// locale against that
// list. We cache this value so as not to check it every time the user
// starts a voice
// input. Because this method is called by onStartInputView, this should
// mean that as
// long as the locale doesn't change while the user is keeping the IME
// open, the
// value should never be stale.
String supportedLocalesString = SettingsUtil.getSettingsString(
getContentResolver(),
SettingsUtil.LATIN_IME_VOICE_INPUT_SUPPORTED_LOCALES,
DEFAULT_VOICE_INPUT_SUPPORTED_LOCALES);
ArrayList<String> voiceInputSupportedLocales = newArrayList(supportedLocalesString
.split("\\s+"));
mLocaleSupportedForVoiceInput =
voiceInputSupportedLocales.contains(mInputLocale) ||
voiceInputSupportedLocales.contains(mInputLocale.substring(0, Math.min(2, mInputLocale.length())));
mShowSuggestions = sp.getBoolean(PREF_SHOW_SUGGESTIONS, mResources
.getBoolean(R.bool.default_suggestions));
if (VOICE_INSTALLED) {
final String voiceMode = sp.getString(PREF_VOICE_MODE,
getString(R.string.voice_mode_main));
boolean enableVoice = !voiceMode
.equals(getString(R.string.voice_mode_off))
&& mEnableVoiceButton;
boolean voiceOnPrimary = voiceMode
.equals(getString(R.string.voice_mode_main));
if (mKeyboardSwitcher != null
&& (enableVoice != mEnableVoice || voiceOnPrimary != mVoiceOnPrimary)) {
mKeyboardSwitcher.setVoiceMode(enableVoice, voiceOnPrimary);
}
mEnableVoice = enableVoice;
mVoiceOnPrimary = voiceOnPrimary;
}
mAutoCorrectEnabled = sp.getBoolean(PREF_AUTO_COMPLETE, mResources
.getBoolean(R.bool.enable_autocorrect))
& mShowSuggestions;
// mBigramSuggestionEnabled = sp.getBoolean(
// PREF_BIGRAM_SUGGESTIONS, true) & mShowSuggestions;
updateCorrectionMode();
updateAutoTextEnabled(mResources.getConfiguration().locale);
mLanguageSwitcher.loadLocales(sp);
mAutoCapActive = mAutoCapPref && mLanguageSwitcher.allowAutoCap();
mDeadKeysActive = mLanguageSwitcher.allowDeadKeys();
}
private void initSuggestPuncList() {
mSuggestPuncList = new ArrayList<CharSequence>();
String suggestPuncs = sKeyboardSettings.suggestedPunctuation;
if (suggestPuncs != null) {
for (int i = 0; i < suggestPuncs.length(); i++) {
mSuggestPuncList.add(suggestPuncs.subSequence(i, i + 1));
}
}
}
private boolean isSuggestedPunctuation(int code) {
return sKeyboardSettings.suggestedPunctuation.contains(String.valueOf((char) code));
}
private void showOptionsMenu() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setCancelable(true);
builder.setIcon(R.drawable.ic_dialog_keyboard);
builder.setNegativeButton(android.R.string.cancel, null);
CharSequence itemSettings = getString(R.string.english_ime_settings);
CharSequence itemInputMethod = getString(R.string.selectInputMethod);
builder.setItems(new CharSequence[] { itemInputMethod, itemSettings },
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface di, int position) {
di.dismiss();
switch (position) {
case POS_SETTINGS:
launchSettings();
break;
case POS_METHOD:
((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE))
.showInputMethodPicker();
break;
}
}
});
builder.setTitle(mResources
.getString(R.string.english_ime_input_options));
mOptionsDialog = builder.create();
Window window = mOptionsDialog.getWindow();
WindowManager.LayoutParams lp = window.getAttributes();
lp.token = mKeyboardSwitcher.getInputView().getWindowToken();
lp.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
window.setAttributes(lp);
window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
mOptionsDialog.show();
}
public void changeKeyboardMode() {
KeyboardSwitcher switcher = mKeyboardSwitcher;
if (switcher.isAlphabetMode()) {
mSavedShiftState = getShiftState();
}
switcher.toggleSymbols();
if (switcher.isAlphabetMode()) {
switcher.setShiftState(mSavedShiftState);
}
updateShiftKeyState(getCurrentInputEditorInfo());
}
public static <E> ArrayList<E> newArrayList(E... elements) {
int capacity = (elements.length * 110) / 100 + 5;
ArrayList<E> list = new ArrayList<E>(capacity);
Collections.addAll(list, elements);
return list;
}
@Override
protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {
super.dump(fd, fout, args);
final Printer p = new PrintWriterPrinter(fout);
p.println("LatinIME state :");
p.println(" Keyboard mode = " + mKeyboardSwitcher.getKeyboardMode());
p.println(" mComposing=" + mComposing.toString());
p.println(" mPredictionOn=" + mPredictionOn);
p.println(" mCorrectionMode=" + mCorrectionMode);
p.println(" mPredicting=" + mPredicting);
p.println(" mAutoCorrectOn=" + mAutoCorrectOn);
p.println(" mAutoSpace=" + mAutoSpace);
p.println(" mCompletionOn=" + mCompletionOn);
p.println(" TextEntryState.state=" + TextEntryState.getState());
p.println(" mSoundOn=" + mSoundOn);
p.println(" mVibrateOn=" + mVibrateOn);
p.println(" mPopupOn=" + mPopupOn);
}
// Characters per second measurement
private long mLastCpsTime;
private static final int CPS_BUFFER_SIZE = 16;
private long[] mCpsIntervals = new long[CPS_BUFFER_SIZE];
private int mCpsIndex;
private static Pattern NUMBER_RE = Pattern.compile("(\\d+).*");
private void measureCps() {
long now = System.currentTimeMillis();
if (mLastCpsTime == 0)
mLastCpsTime = now - 100; // Initial
mCpsIntervals[mCpsIndex] = now - mLastCpsTime;
mLastCpsTime = now;
mCpsIndex = (mCpsIndex + 1) % CPS_BUFFER_SIZE;
long total = 0;
for (int i = 0; i < CPS_BUFFER_SIZE; i++)
total += mCpsIntervals[i];
System.out.println("CPS = " + ((CPS_BUFFER_SIZE * 1000f) / total));
}
public void onAutoCompletionStateChanged(boolean isAutoCompletion) {
mKeyboardSwitcher.onAutoCompletionStateChanged(isAutoCompletion);
}
static int getIntFromString(String val, int defVal) {
Matcher num = NUMBER_RE.matcher(val);
if (!num.matches()) return defVal;
return Integer.parseInt(num.group(1));
}
static int getPrefInt(SharedPreferences prefs, String prefName, int defVal) {
String prefVal = prefs.getString(prefName, Integer.toString(defVal));
//Log.i("PCKeyboard", "getPrefInt " + prefName + " = " + prefVal + ", default " + defVal);
return getIntFromString(prefVal, defVal);
}
static int getPrefInt(SharedPreferences prefs, String prefName, String defStr) {
int defVal = getIntFromString(defStr, 0);
return getPrefInt(prefs, prefName, defVal);
}
static int getHeight(SharedPreferences prefs, String prefName, String defVal) {
int val = getPrefInt(prefs, prefName, defVal);
if (val < 15)
val = 15;
if (val > 75)
val = 75;
return val;
}
}
| true | true | public void onStartInputView(EditorInfo attribute, boolean restarting) {
sKeyboardSettings.editorPackageName = attribute.packageName;
sKeyboardSettings.editorFieldName = attribute.fieldName;
sKeyboardSettings.editorFieldId = attribute.fieldId;
sKeyboardSettings.editorInputType = attribute.inputType;
//Log.i("PCKeyboard", "onStartInputView " + attribute + ", inputType= " + Integer.toHexString(attribute.inputType) + ", restarting=" + restarting);
LatinKeyboardView inputView = mKeyboardSwitcher.getInputView();
// In landscape mode, this method gets called without the input view
// being created.
if (inputView == null) {
return;
}
if (mRefreshKeyboardRequired) {
mRefreshKeyboardRequired = false;
toggleLanguage(true, true);
}
mKeyboardSwitcher.makeKeyboards(false);
TextEntryState.newSession(this);
// Most such things we decide below in the switch statement, but we need to know
// now whether this is a password text field, because we need to know now (before
// the switch statement) whether we want to enable the voice button.
mPasswordText = false;
int variation = attribute.inputType & EditorInfo.TYPE_MASK_VARIATION;
if (variation == EditorInfo.TYPE_TEXT_VARIATION_PASSWORD
|| variation == EditorInfo.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
|| variation == 0xe0 /* EditorInfo.TYPE_TEXT_VARIATION_WEB_PASSWORD */
) {
if ((attribute.inputType & EditorInfo.TYPE_MASK_CLASS) == EditorInfo.TYPE_CLASS_TEXT) {
mPasswordText = true;
}
}
mEnableVoiceButton = shouldShowVoiceButton(makeFieldContext(),
attribute);
final boolean enableVoiceButton = mEnableVoiceButton && mEnableVoice;
mAfterVoiceInput = false;
mImmediatelyAfterVoiceInput = false;
mShowingVoiceSuggestions = false;
mVoiceInputHighlighted = false;
mInputTypeNoAutoCorrect = false;
mPredictionOn = false;
mCompletionOn = false;
mCompletions = null;
mModCtrl = false;
mModAlt = false;
mModFn = false;
mEnteredText = null;
mSuggestionForceOn = false;
mSuggestionForceOff = false;
switch (attribute.inputType & EditorInfo.TYPE_MASK_CLASS) {
case EditorInfo.TYPE_CLASS_NUMBER:
case EditorInfo.TYPE_CLASS_DATETIME:
// fall through
// NOTE: For now, we use the phone keyboard for NUMBER and DATETIME
// until we get
// a dedicated number entry keypad.
// TODO: Use a dedicated number entry keypad here when we get one.
case EditorInfo.TYPE_CLASS_PHONE:
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_PHONE,
attribute.imeOptions, enableVoiceButton);
break;
case EditorInfo.TYPE_CLASS_TEXT:
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_TEXT,
attribute.imeOptions, enableVoiceButton);
// startPrediction();
mPredictionOn = true;
// Make sure that passwords are not displayed in candidate view
if (mPasswordText) {
mPredictionOn = false;
}
if (variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
|| variation == EditorInfo.TYPE_TEXT_VARIATION_PERSON_NAME) {
mAutoSpace = false;
} else {
mAutoSpace = true;
}
if (variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS) {
mPredictionOn = false;
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_EMAIL,
attribute.imeOptions, enableVoiceButton);
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_URI) {
mPredictionOn = false;
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_URL,
attribute.imeOptions, enableVoiceButton);
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_SHORT_MESSAGE) {
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_IM,
attribute.imeOptions, enableVoiceButton);
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_FILTER) {
mPredictionOn = false;
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) {
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_WEB,
attribute.imeOptions, enableVoiceButton);
// If it's a browser edit field and auto correct is not ON
// explicitly, then
// disable auto correction, but keep suggestions on.
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) == 0) {
mInputTypeNoAutoCorrect = true;
}
}
// If NO_SUGGESTIONS is set, don't do prediction.
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS) != 0) {
mPredictionOn = false;
mInputTypeNoAutoCorrect = true;
}
// If it's not multiline and the autoCorrect flag is not set, then
// don't correct
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) == 0
&& (attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE) == 0) {
mInputTypeNoAutoCorrect = true;
}
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE) != 0) {
mPredictionOn = false;
mCompletionOn = isFullscreenMode();
}
break;
default:
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_TEXT,
attribute.imeOptions, enableVoiceButton);
}
inputView.closing();
resetPrediction();
loadSettings();
updateShiftKeyState(attribute);
mPredictionOnForMode = mPredictionOn;
setCandidatesViewShownInternal(isCandidateStripVisible()
|| mCompletionOn, false /* needsInputViewShown */);
updateSuggestions();
// If the dictionary is not big enough, don't auto correct
mHasDictionary = mSuggest.hasMainDictionary();
updateCorrectionMode();
inputView.setPreviewEnabled(mPopupOn);
inputView.setProximityCorrectionEnabled(true);
mPredictionOn = mPredictionOn
&& (mCorrectionMode > 0 || mShowSuggestions);
if (suggestionsDisabled()) mPredictionOn = false;
// If we just entered a text field, maybe it has some old text that
// requires correction
checkReCorrectionOnStart();
checkTutorial(attribute.privateImeOptions);
if (TRACE)
Debug.startMethodTracing("/data/trace/latinime");
}
| public void onStartInputView(EditorInfo attribute, boolean restarting) {
sKeyboardSettings.editorPackageName = attribute.packageName;
sKeyboardSettings.editorFieldName = attribute.fieldName;
sKeyboardSettings.editorFieldId = attribute.fieldId;
sKeyboardSettings.editorInputType = attribute.inputType;
//Log.i("PCKeyboard", "onStartInputView " + attribute + ", inputType= " + Integer.toHexString(attribute.inputType) + ", restarting=" + restarting);
LatinKeyboardView inputView = mKeyboardSwitcher.getInputView();
// In landscape mode, this method gets called without the input view
// being created.
if (inputView == null) {
return;
}
if (mRefreshKeyboardRequired) {
mRefreshKeyboardRequired = false;
toggleLanguage(true, true);
}
mKeyboardSwitcher.makeKeyboards(false);
TextEntryState.newSession(this);
// Most such things we decide below in the switch statement, but we need to know
// now whether this is a password text field, because we need to know now (before
// the switch statement) whether we want to enable the voice button.
mPasswordText = false;
int variation = attribute.inputType & EditorInfo.TYPE_MASK_VARIATION;
if (variation == EditorInfo.TYPE_TEXT_VARIATION_PASSWORD
|| variation == EditorInfo.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
|| variation == 0xe0 /* EditorInfo.TYPE_TEXT_VARIATION_WEB_PASSWORD */
) {
if ((attribute.inputType & EditorInfo.TYPE_MASK_CLASS) == EditorInfo.TYPE_CLASS_TEXT) {
mPasswordText = true;
}
}
mEnableVoiceButton = shouldShowVoiceButton(makeFieldContext(),
attribute);
final boolean enableVoiceButton = mEnableVoiceButton && mEnableVoice;
mAfterVoiceInput = false;
mImmediatelyAfterVoiceInput = false;
mShowingVoiceSuggestions = false;
mVoiceInputHighlighted = false;
mInputTypeNoAutoCorrect = false;
mPredictionOn = false;
mCompletionOn = false;
mCompletions = null;
mModCtrl = false;
mModAlt = false;
mModFn = false;
mEnteredText = null;
mSuggestionForceOn = false;
mSuggestionForceOff = false;
mKeyboardModeOverridePortrait = 0;
mKeyboardModeOverrideLandscape = 0;
sKeyboardSettings.useExtension = false;
switch (attribute.inputType & EditorInfo.TYPE_MASK_CLASS) {
case EditorInfo.TYPE_CLASS_NUMBER:
case EditorInfo.TYPE_CLASS_DATETIME:
// fall through
// NOTE: For now, we use the phone keyboard for NUMBER and DATETIME
// until we get
// a dedicated number entry keypad.
// TODO: Use a dedicated number entry keypad here when we get one.
case EditorInfo.TYPE_CLASS_PHONE:
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_PHONE,
attribute.imeOptions, enableVoiceButton);
break;
case EditorInfo.TYPE_CLASS_TEXT:
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_TEXT,
attribute.imeOptions, enableVoiceButton);
// startPrediction();
mPredictionOn = true;
// Make sure that passwords are not displayed in candidate view
if (mPasswordText) {
mPredictionOn = false;
}
if (variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
|| variation == EditorInfo.TYPE_TEXT_VARIATION_PERSON_NAME) {
mAutoSpace = false;
} else {
mAutoSpace = true;
}
if (variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS) {
mPredictionOn = false;
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_EMAIL,
attribute.imeOptions, enableVoiceButton);
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_URI) {
mPredictionOn = false;
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_URL,
attribute.imeOptions, enableVoiceButton);
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_SHORT_MESSAGE) {
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_IM,
attribute.imeOptions, enableVoiceButton);
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_FILTER) {
mPredictionOn = false;
} else if (variation == EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) {
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_WEB,
attribute.imeOptions, enableVoiceButton);
// If it's a browser edit field and auto correct is not ON
// explicitly, then
// disable auto correction, but keep suggestions on.
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) == 0) {
mInputTypeNoAutoCorrect = true;
}
}
// If NO_SUGGESTIONS is set, don't do prediction.
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS) != 0) {
mPredictionOn = false;
mInputTypeNoAutoCorrect = true;
}
// If it's not multiline and the autoCorrect flag is not set, then
// don't correct
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) == 0
&& (attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE) == 0) {
mInputTypeNoAutoCorrect = true;
}
if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE) != 0) {
mPredictionOn = false;
mCompletionOn = isFullscreenMode();
}
break;
default:
mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_TEXT,
attribute.imeOptions, enableVoiceButton);
}
inputView.closing();
resetPrediction();
loadSettings();
updateShiftKeyState(attribute);
mPredictionOnForMode = mPredictionOn;
setCandidatesViewShownInternal(isCandidateStripVisible()
|| mCompletionOn, false /* needsInputViewShown */);
updateSuggestions();
// If the dictionary is not big enough, don't auto correct
mHasDictionary = mSuggest.hasMainDictionary();
updateCorrectionMode();
inputView.setPreviewEnabled(mPopupOn);
inputView.setProximityCorrectionEnabled(true);
mPredictionOn = mPredictionOn
&& (mCorrectionMode > 0 || mShowSuggestions);
if (suggestionsDisabled()) mPredictionOn = false;
// If we just entered a text field, maybe it has some old text that
// requires correction
checkReCorrectionOnStart();
checkTutorial(attribute.privateImeOptions);
if (TRACE)
Debug.startMethodTracing("/data/trace/latinime");
}
|
diff --git a/projects/android/classygames/src/edu/selu/android/classygames/CheckersGameActivity.java b/projects/android/classygames/src/edu/selu/android/classygames/CheckersGameActivity.java
index dc023a5..f17ecef 100644
--- a/projects/android/classygames/src/edu/selu/android/classygames/CheckersGameActivity.java
+++ b/projects/android/classygames/src/edu/selu/android/classygames/CheckersGameActivity.java
@@ -1,435 +1,435 @@
package edu.selu.android.classygames;
import android.graphics.Color;
import android.os.Bundle;
import android.view.Display;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.FrameLayout;
import android.widget.TableLayout;
import android.widget.TableRow;
import com.actionbarsherlock.app.SherlockActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import edu.selu.android.classygames.data.Person;
public class CheckersGameActivity extends SherlockActivity implements OnClickListener
{
TableLayout layout;
MyButton[][] buttons;
MyButton prevButton;
int greenPlayer, orangePlayer;
//AlertDialog.Builder dialog = new AlertDialog.Builder(this, R.style.DialogWindowTitle_Sherlock);
public final static String INTENT_DATA_GAME_ID = "GAME_ID";
public final static String INTENT_DATA_PERSON_CREATOR_ID = "GAME_PERSON_CREATOR_ID";
public final static String INTENT_DATA_PERSON_CREATOR_NAME = "GAME_PERSON_CREATOR_NAME";
public final static String INTENT_DATA_PERSON_CHALLENGED_ID = "GAME_PERSON_CHALLENGED_ID";
public final static String INTENT_DATA_PERSON_CHALLENGED_NAME = "GAME_PERSON_CHALLENGED_NAME";
private String gameId;
private Person personCreator;
private Person personChallenged;
@Override
public void onCreate(final Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
// setContentView(R.layout.checkers_game_activity);
Utilities.styleActionBar(getResources(), getSupportActionBar());
// retrieve data passed to this activity
final Bundle bundle = getIntent().getExtras();
if (bundle == null)
{
activityHasError();
}
else
{
gameId = bundle.getString(INTENT_DATA_GAME_ID);
personCreator = new Person();
personCreator.setId(bundle.getLong(INTENT_DATA_PERSON_CREATOR_ID));
personCreator.setName(bundle.getString(INTENT_DATA_PERSON_CREATOR_NAME));
personChallenged = new Person();
personChallenged.setId(bundle.getLong(INTENT_DATA_PERSON_CHALLENGED_ID));
personChallenged.setName(bundle.getString(INTENT_DATA_PERSON_CHALLENGED_NAME));
if (personCreator.getId() < 0 || personChallenged.getId() < 0 || personChallenged.getName().equals(""))
{
activityHasError();
}
else
{
- getSupportActionBar().setTitle(getSupportActionBar().getTitle() + " " + personChallenged.getName());
+ getSupportActionBar().setTitle(CheckersGameActivity.this.getString(R.string.checkers_game_activity_title) + " " + personChallenged.getName());
}
}
prevButton = null;
greenPlayer = R.drawable.chkgreen;
orangePlayer = R.drawable.chkorange;
//height width
Display display = getWindowManager().getDefaultDisplay();
@SuppressWarnings("deprecation")
int width = display.getWidth();
// int height = display.getHeight();
TableRow[] rows = new TableRow[8];
layout = new TableLayout(this);
FrameLayout.LayoutParams tableLp = new FrameLayout.LayoutParams(width,width,1);
TableLayout.LayoutParams rowLp = new TableLayout.LayoutParams( width,width/8,1);
TableRow.LayoutParams cellLp= new TableRow.LayoutParams( width/8,width/8,1);
for (int i = 0; i < 8; i++)
{
rows[i] = new TableRow(this);
}
buttons = new MyButton[8][8];
//load buttons
for (int i = 0; i < 8; i++)
{
for (int j = 0; j < 8; j++)
{
buttons[i][j] = new MyButton(this,i,j,true,false);
buttons[i][j].setOnClickListener(this);
buttons[i][j].setId(i*10+j);
if ((i+j)%2 == 0)
{
buttons[i][j].setBackgroundColor(Color.WHITE);
if (i >= 5)
{
buttons[i][j].setPlayerGreen(true);//this is Green LOWER IS GREEN
buttons[i][j].setEmpty(false);
buttons[i][j].setImageResource(greenPlayer);
}
if (i <= 2)
{
buttons[i][j].setPlayerGreen(false);//this is Not Green TOP IS ORANGE
buttons[i][j].setEmpty(false);
buttons[i][j].setImageResource(orangePlayer);
}
}
else
{
buttons[i][j].setBackgroundColor(Color.BLACK);
}
rows[i].addView(buttons[i][j],cellLp);
}
}
for (int i = 0; i < 8; i++)
{
layout.addView(rows[i],rowLp);
}
setContentView(layout,tableLp);
}
@Override
public void onClick(View arg0)
{
MyButton clickedButton = (MyButton) findViewById(arg0.getId());
//clickedButton.setBackgroundColor(Color.LTGRAY);
if (prevButton != null)
{
if (clickedButton.isEmpty())
{
if (canMove(clickedButton))
{
Move(clickedButton);
if (isKing(clickedButton)){
makeKing(clickedButton);
}
}
else if (canJump(clickedButton)){
Jump(clickedButton);
if (isKing(clickedButton)){
makeKing(clickedButton);
}
}
else {
prevButton = null;
}
}
else
{
prevButton = null;
}
}
else
{
prevButton = clickedButton;
}
}
//Working on this
private void makeKing(MyButton clickedButton) {
// TODO Auto-generated method stub
if(clickedButton.isPlayerGreen())
{
clickedButton.setImageResource(R.drawable.sharks);
}
else
if (!clickedButton.isPlayerGreen())
{
clickedButton.setImageResource(R.drawable.sharks);
}
}
//Working on this
private boolean isKing(MyButton clickedButton) {
// TODO Auto-generated method stub
if(clickedButton.getId() <= 8)
{
return true;
}
else
return false;
}
private void Jump(MyButton clickedButton) {
int changeImage = orangePlayer;
if (prevButton.isPlayerGreen())
changeImage = greenPlayer;
clickedButton.setImageResource(changeImage);
clickedButton.setEmpty(false);
clickedButton.setPlayerGreen(prevButton.isPlayerGreen());
prevButton.setEmpty(true);
prevButton.setImageResource(0);
prevButton = null;
}
private void Move(MyButton clickedButton) {
//change image and data
prevButton.setImageResource(0);
prevButton.setEmpty(true);
//change new button
int changeImage = orangePlayer;
if (prevButton.isPlayerGreen())
changeImage = greenPlayer;
clickedButton.setImageResource(changeImage);
clickedButton.setEmpty(false);
clickedButton.setPlayerGreen(prevButton.isPlayerGreen());
prevButton = null;
}
private boolean canMove(MyButton button)
{
if (abs(button.getPx()-prevButton.getPx()) == 1 && abs(button.getPy()-prevButton.getPy()) == 1)
return true;
else
return false;
}
private boolean canJump(MyButton cbutton)
{
if (abs(cbutton.getPx()-prevButton.getPx()) == 2 && abs(cbutton.getPy()-prevButton.getPy()) == 2){
int change_In_X = (cbutton.getPx() - prevButton.getPx())/2;
int change_In_Y = (cbutton.getPy() - prevButton.getPy())/2;
MyButton middleButton = (MyButton)findViewById((prevButton.getPx() + change_In_X) *10 + (prevButton.getPy() + change_In_Y));
if (middleButton.isPlayerGreen() != prevButton.isPlayerGreen()){
middleButton.setEmpty(true);
middleButton.setImageResource(0);
return true;
}
else {
return false;
}
}
else {
return false;
}
}
private int abs(int i)
{
return (i < 0)?-1*i:i;
}
@Override
public boolean onCreateOptionsMenu(final Menu menu)
{
MenuInflater inflater = getSupportMenuInflater();
inflater.inflate(R.menu.checkers_game_activity, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(final MenuItem item)
{
switch (item.getItemId())
{
case android.R.id.home:
finish();
return true;
case R.id.checkers_game_activity_actionbar_send_move:
// TODO send this move to the server
Utilities.easyToast(CheckersGameActivity.this, "sent move with gameId \"" + gameId + "\"");
return true;
case R.id.checkers_game_activity_actionbar_undo_move:
// TODO undo the move that the user made on the board
Utilities.easyToast(CheckersGameActivity.this, "undone");
return true;
default:
return super.onOptionsItemSelected(item);
}
}
private void activityHasError()
{
Utilities.easyToastAndLogError(CheckersGameActivity.this, CheckersGameActivity.this.getString(R.string.checkers_game_activity_data_error));
finish();
}
}
/*
//Testing
GridView gridview = (GridView) findViewById(R.id.gridView1);
gridview.setAdapter(new ImageAdapter(this));
gridview.setOnItemClickListener(new OnItemClickListener()
{
@Override
public void onItemClick(AdapterView<?> parent, View v, int position, long id)
{
Toast.makeText(CheckersGameActivity.this,""+ position, Toast.LENGTH_SHORT).show();
}
});
*/
/*
* this stuff is from the board branch
package edu.selu.android.classygames;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import com.actionbarsherlock.app.SherlockActivity;
import com.actionbarsherlock.view.MenuItem;
import edu.selu.android.classygames.views.CheckersBoardSquareView;
public class CheckersGameActivity extends SherlockActivity
{
@Override
public void onCreate(final Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.checkers_game_activity);
Utilities.styleActionBar(getResources(), getSupportActionBar());
}
@Override
public boolean onOptionsItemSelected(final MenuItem item)
{
switch (item.getItemId())
{
case android.R.id.home:
finish();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
private class CheckersGameAdapter extends BaseAdapter
{
private Context context;
@Override
public int getCount()
{
return 0;
}
@Override
public Object getItem(final int item)
{
return null;
}
@Override
public long getItemId(final int item)
{
return 0;
}
@Override
public View getView(final int position, View convertView, final ViewGroup parent)
{
if (convertView == null)
{
convertView = new View(context);
LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = layoutInflater.inflate(R.layout.checkers_game_activity_gridview_item, parent, false);
}
CheckersBoardSquareView checkersBoardSquareView = (CheckersBoardSquareView) convertView.findViewById(R.id.checkers_game_activity_gridview_item_square);
checkersBoardSquareView.setImageResource(R.drawable.bg_subtlegrey);
return convertView;
}
}
}
*/
| true | true | public void onCreate(final Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
// setContentView(R.layout.checkers_game_activity);
Utilities.styleActionBar(getResources(), getSupportActionBar());
// retrieve data passed to this activity
final Bundle bundle = getIntent().getExtras();
if (bundle == null)
{
activityHasError();
}
else
{
gameId = bundle.getString(INTENT_DATA_GAME_ID);
personCreator = new Person();
personCreator.setId(bundle.getLong(INTENT_DATA_PERSON_CREATOR_ID));
personCreator.setName(bundle.getString(INTENT_DATA_PERSON_CREATOR_NAME));
personChallenged = new Person();
personChallenged.setId(bundle.getLong(INTENT_DATA_PERSON_CHALLENGED_ID));
personChallenged.setName(bundle.getString(INTENT_DATA_PERSON_CHALLENGED_NAME));
if (personCreator.getId() < 0 || personChallenged.getId() < 0 || personChallenged.getName().equals(""))
{
activityHasError();
}
else
{
getSupportActionBar().setTitle(getSupportActionBar().getTitle() + " " + personChallenged.getName());
}
}
prevButton = null;
greenPlayer = R.drawable.chkgreen;
orangePlayer = R.drawable.chkorange;
//height width
Display display = getWindowManager().getDefaultDisplay();
@SuppressWarnings("deprecation")
int width = display.getWidth();
// int height = display.getHeight();
TableRow[] rows = new TableRow[8];
layout = new TableLayout(this);
FrameLayout.LayoutParams tableLp = new FrameLayout.LayoutParams(width,width,1);
TableLayout.LayoutParams rowLp = new TableLayout.LayoutParams( width,width/8,1);
TableRow.LayoutParams cellLp= new TableRow.LayoutParams( width/8,width/8,1);
for (int i = 0; i < 8; i++)
{
rows[i] = new TableRow(this);
}
buttons = new MyButton[8][8];
//load buttons
for (int i = 0; i < 8; i++)
{
for (int j = 0; j < 8; j++)
{
buttons[i][j] = new MyButton(this,i,j,true,false);
buttons[i][j].setOnClickListener(this);
buttons[i][j].setId(i*10+j);
if ((i+j)%2 == 0)
{
buttons[i][j].setBackgroundColor(Color.WHITE);
if (i >= 5)
{
buttons[i][j].setPlayerGreen(true);//this is Green LOWER IS GREEN
buttons[i][j].setEmpty(false);
buttons[i][j].setImageResource(greenPlayer);
}
if (i <= 2)
{
buttons[i][j].setPlayerGreen(false);//this is Not Green TOP IS ORANGE
buttons[i][j].setEmpty(false);
buttons[i][j].setImageResource(orangePlayer);
}
}
else
{
buttons[i][j].setBackgroundColor(Color.BLACK);
}
rows[i].addView(buttons[i][j],cellLp);
}
}
for (int i = 0; i < 8; i++)
{
layout.addView(rows[i],rowLp);
}
setContentView(layout,tableLp);
}
| public void onCreate(final Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
// setContentView(R.layout.checkers_game_activity);
Utilities.styleActionBar(getResources(), getSupportActionBar());
// retrieve data passed to this activity
final Bundle bundle = getIntent().getExtras();
if (bundle == null)
{
activityHasError();
}
else
{
gameId = bundle.getString(INTENT_DATA_GAME_ID);
personCreator = new Person();
personCreator.setId(bundle.getLong(INTENT_DATA_PERSON_CREATOR_ID));
personCreator.setName(bundle.getString(INTENT_DATA_PERSON_CREATOR_NAME));
personChallenged = new Person();
personChallenged.setId(bundle.getLong(INTENT_DATA_PERSON_CHALLENGED_ID));
personChallenged.setName(bundle.getString(INTENT_DATA_PERSON_CHALLENGED_NAME));
if (personCreator.getId() < 0 || personChallenged.getId() < 0 || personChallenged.getName().equals(""))
{
activityHasError();
}
else
{
getSupportActionBar().setTitle(CheckersGameActivity.this.getString(R.string.checkers_game_activity_title) + " " + personChallenged.getName());
}
}
prevButton = null;
greenPlayer = R.drawable.chkgreen;
orangePlayer = R.drawable.chkorange;
//height width
Display display = getWindowManager().getDefaultDisplay();
@SuppressWarnings("deprecation")
int width = display.getWidth();
// int height = display.getHeight();
TableRow[] rows = new TableRow[8];
layout = new TableLayout(this);
FrameLayout.LayoutParams tableLp = new FrameLayout.LayoutParams(width,width,1);
TableLayout.LayoutParams rowLp = new TableLayout.LayoutParams( width,width/8,1);
TableRow.LayoutParams cellLp= new TableRow.LayoutParams( width/8,width/8,1);
for (int i = 0; i < 8; i++)
{
rows[i] = new TableRow(this);
}
buttons = new MyButton[8][8];
//load buttons
for (int i = 0; i < 8; i++)
{
for (int j = 0; j < 8; j++)
{
buttons[i][j] = new MyButton(this,i,j,true,false);
buttons[i][j].setOnClickListener(this);
buttons[i][j].setId(i*10+j);
if ((i+j)%2 == 0)
{
buttons[i][j].setBackgroundColor(Color.WHITE);
if (i >= 5)
{
buttons[i][j].setPlayerGreen(true);//this is Green LOWER IS GREEN
buttons[i][j].setEmpty(false);
buttons[i][j].setImageResource(greenPlayer);
}
if (i <= 2)
{
buttons[i][j].setPlayerGreen(false);//this is Not Green TOP IS ORANGE
buttons[i][j].setEmpty(false);
buttons[i][j].setImageResource(orangePlayer);
}
}
else
{
buttons[i][j].setBackgroundColor(Color.BLACK);
}
rows[i].addView(buttons[i][j],cellLp);
}
}
for (int i = 0; i < 8; i++)
{
layout.addView(rows[i],rowLp);
}
setContentView(layout,tableLp);
}
|
diff --git a/src/info/plagiatsjaeger/SourceLoader.java b/src/info/plagiatsjaeger/SourceLoader.java
index 5dc2c3f..9d63af2 100644
--- a/src/info/plagiatsjaeger/SourceLoader.java
+++ b/src/info/plagiatsjaeger/SourceLoader.java
@@ -1,269 +1,269 @@
package info.plagiatsjaeger;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.DataInputStream;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
import org.jsoup.Jsoup;
import org.mozilla.intl.chardet.nsDetector;
import org.mozilla.intl.chardet.nsICharsetDetectionObserver;
/**
* Klasse zum Laden von Daten.
*
* @author Andreas
*/
public class SourceLoader
{
public static final Logger _logger = Logger.getLogger(SourceLoader.class.getName());
private static final String DEFAULT_CONTENTTYPE = ConfigReader.getPropertyString("DEFAULTCONTENTTYPE");
private static final String CONTENTTYPE_PATTERN = ConfigReader.getPropertyString("CONTENTTYPEPATTERN");
private static String _detectedCharset;
/**
* Laed eine Website. (Prueft das verwendete Charset und bereinigt die URL)
*
* @param strUrl
* @return
*/
public static String loadURL(String strUrl)
{
return loadURL(strUrl, true);
}
public static String loadURL(String strUrl, boolean detectCharset)
{
return loadURL(strUrl, true, true);
}
/**
* Laed den Text einer Webseite.
*
* @param strUrl
* @return
*/
public static String loadURL(String strUrl, boolean detectCharset, boolean cleanUrl)
{
String result = "";
try
{
if (cleanUrl)
{
strUrl = cleanUrl(strUrl);
}
URL url = new URL(strUrl);
URLConnection urlConnection = url.openConnection();
// Pattern zum auffinden des contenttypes
String charset = DEFAULT_CONTENTTYPE;
String contentType = urlConnection.getContentType();
if (contentType != null)
{
Pattern pattern = Pattern.compile(CONTENTTYPE_PATTERN);
Matcher matcher = pattern.matcher(urlConnection.getContentType());
// Wenn ein Contenttype gefunden wird, wird dieser verwendet,
// sonst
// der defaul wert
if (matcher.matches())
{
charset = matcher.group(1);
_logger.info("Charset detected: " + charset + "(URL: " + strUrl + ")");
result = Jsoup.parse(url.openStream(), charset, strUrl).text();
}
else
{
_logger.info("No match found " + strUrl);
if (detectCharset)
{
detectCharset(url.openStream());
result = Jsoup.parse(url.openStream(), _detectedCharset, strUrl).text();
}
}
}
else
{
_logger.info("CONTENT_TYPE IS null " + strUrl);
if (detectCharset)
{
detectCharset(url.openStream());
result = Jsoup.parse(url.openStream(), _detectedCharset, strUrl).text();
}
}
}
catch (MalformedURLException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
return "FAIL MalformedURLException";
}
catch (UnsupportedEncodingException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
return "FAIL UnsupportedEncodingException";
}
catch (IOException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
return "FAIL IOException";
}
return result;
}
private static void detectCharset(InputStream stream)
{
nsDetector detector = new nsDetector();
detector.Init(new nsICharsetDetectionObserver()
{
@Override
public void Notify(String charset)
{
_logger.info("Charset detected: " + charset);
_detectedCharset = charset;
}
});
BufferedInputStream bufferedInputStream;
try
{
bufferedInputStream = new BufferedInputStream(stream);
byte[] buffer = new byte[1024];
int length;
boolean done = false;
boolean isAscii = true;
while ((length = bufferedInputStream.read(buffer, 0, buffer.length)) != -1)
{
// Kontrollieren ob der Stream nur Ascii zeichen enthaelt
if (isAscii) isAscii = detector.isAscii(buffer, length);
// DoIt Wenn keine Ascii vorhanden sind und die detection noch
// nicht fertig ist
if (!isAscii && !done) done = detector.DoIt(buffer, length, false);
}
detector.DataEnd();
}
catch (IOException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
}
}
/**
* Laed eine Datei.
*
* @param filePath
* @return
*/
public static String loadFile(String filePath)
{
String result = "";
FileInputStream inputStream = null;
DataInputStream dataInputStream = null;
StringBuilder stringBuilder = new StringBuilder();
String charset = "ISO-8859-1";
try
{
inputStream = new FileInputStream(filePath);
String line = "";
byte[] array = IOUtils.toByteArray(inputStream);
// Detect charset
- if (array != null)
+ if (array != null && array.length >= 2)
{
if (array[0] == -1 && array[1] == -2)
{
// UTF-16 big Endian
charset = "UTF-16BE";
}
else if (array[0] == -2 && array[1] == -1)
{
// UTF-16 little Endian
charset = "UTF-16LE";
}
- else if (array[0] == -17 && array[1] == -69 && array[2] == -65)
+ else if (array.length >= 3 && array[0] == -17 && array[1] == -69 && array[2] == -65)
{
// UTF-8
charset = "UTF-8";
}
}
System.out.println(charset);
inputStream = new FileInputStream(filePath);
dataInputStream = new DataInputStream(inputStream);
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(dataInputStream, charset));
while ((line = bufferedReader.readLine()) != null)
{
if (stringBuilder.length() > 0)
{
stringBuilder.append("\n");
}
stringBuilder.append(line);
}
}
catch (FileNotFoundException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
result = "FAIL FileNotFoundException";
}
catch (IOException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
result = "FAIL IOException";
}
finally
{
if (dataInputStream != null)
{
try
{
dataInputStream.close();
}
catch (IOException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
}
if (charset == "UTF-8") stringBuilder.deleteCharAt(0);
result = stringBuilder.toString();
}
}
return result;
}
/**
* Bereinigt eine Url, sodass sie immer vollstaendig ist
*
* @param dirtyUrl
* @return result
*/
public static String cleanUrl(String dirtyUrl)
{
String result = "";
dirtyUrl = dirtyUrl.replaceAll("www.", "");
dirtyUrl = dirtyUrl.replaceAll("http://", "");
dirtyUrl = dirtyUrl.replaceAll("https://", "");
result = "http://www." + dirtyUrl;
_logger.info("Dirty-URL: " + dirtyUrl);
_logger.info("Clean-URL: " + result);
return result;
}
}
| false | true | public static String loadFile(String filePath)
{
String result = "";
FileInputStream inputStream = null;
DataInputStream dataInputStream = null;
StringBuilder stringBuilder = new StringBuilder();
String charset = "ISO-8859-1";
try
{
inputStream = new FileInputStream(filePath);
String line = "";
byte[] array = IOUtils.toByteArray(inputStream);
// Detect charset
if (array != null)
{
if (array[0] == -1 && array[1] == -2)
{
// UTF-16 big Endian
charset = "UTF-16BE";
}
else if (array[0] == -2 && array[1] == -1)
{
// UTF-16 little Endian
charset = "UTF-16LE";
}
else if (array[0] == -17 && array[1] == -69 && array[2] == -65)
{
// UTF-8
charset = "UTF-8";
}
}
System.out.println(charset);
inputStream = new FileInputStream(filePath);
dataInputStream = new DataInputStream(inputStream);
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(dataInputStream, charset));
while ((line = bufferedReader.readLine()) != null)
{
if (stringBuilder.length() > 0)
{
stringBuilder.append("\n");
}
stringBuilder.append(line);
}
}
catch (FileNotFoundException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
result = "FAIL FileNotFoundException";
}
catch (IOException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
result = "FAIL IOException";
}
finally
{
if (dataInputStream != null)
{
try
{
dataInputStream.close();
}
catch (IOException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
}
if (charset == "UTF-8") stringBuilder.deleteCharAt(0);
result = stringBuilder.toString();
}
}
return result;
}
| public static String loadFile(String filePath)
{
String result = "";
FileInputStream inputStream = null;
DataInputStream dataInputStream = null;
StringBuilder stringBuilder = new StringBuilder();
String charset = "ISO-8859-1";
try
{
inputStream = new FileInputStream(filePath);
String line = "";
byte[] array = IOUtils.toByteArray(inputStream);
// Detect charset
if (array != null && array.length >= 2)
{
if (array[0] == -1 && array[1] == -2)
{
// UTF-16 big Endian
charset = "UTF-16BE";
}
else if (array[0] == -2 && array[1] == -1)
{
// UTF-16 little Endian
charset = "UTF-16LE";
}
else if (array.length >= 3 && array[0] == -17 && array[1] == -69 && array[2] == -65)
{
// UTF-8
charset = "UTF-8";
}
}
System.out.println(charset);
inputStream = new FileInputStream(filePath);
dataInputStream = new DataInputStream(inputStream);
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(dataInputStream, charset));
while ((line = bufferedReader.readLine()) != null)
{
if (stringBuilder.length() > 0)
{
stringBuilder.append("\n");
}
stringBuilder.append(line);
}
}
catch (FileNotFoundException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
result = "FAIL FileNotFoundException";
}
catch (IOException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
result = "FAIL IOException";
}
finally
{
if (dataInputStream != null)
{
try
{
dataInputStream.close();
}
catch (IOException e)
{
_logger.fatal(e.getMessage(), e);
e.printStackTrace();
}
if (charset == "UTF-8") stringBuilder.deleteCharAt(0);
result = stringBuilder.toString();
}
}
return result;
}
|
diff --git a/src/main/java/org/jskat/gui/swing/table/SkatTablePanel.java b/src/main/java/org/jskat/gui/swing/table/SkatTablePanel.java
index 2141cc2..c1f3b95 100644
--- a/src/main/java/org/jskat/gui/swing/table/SkatTablePanel.java
+++ b/src/main/java/org/jskat/gui/swing/table/SkatTablePanel.java
@@ -1,1147 +1,1135 @@
/**
* JSkat - A skat program written in Java
* by Jan Schäfer, Markus J. Luzius and Daniel Loreck
*
* Version 0.11.0
* Copyright (C) 2012-08-28
*
* 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
* 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.jskat.gui.swing.table;
import java.awt.CardLayout;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Point;
import java.awt.Rectangle;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.swing.ActionMap;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTable;
import javax.swing.ScrollPaneConstants;
import org.jskat.data.GameAnnouncement;
import org.jskat.data.GameSummary;
import org.jskat.data.SkatGameData.GameState;
import org.jskat.data.SkatSeriesData.SeriesState;
import org.jskat.data.Trick;
import org.jskat.gui.JSkatView;
import org.jskat.gui.action.JSkatAction;
import org.jskat.gui.action.main.StartSkatSeriesAction;
import org.jskat.gui.swing.AbstractTabPanel;
import org.jskat.gui.swing.LayoutFactory;
import org.jskat.util.Card;
import org.jskat.util.CardList;
import org.jskat.util.GameType;
import org.jskat.util.Player;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Panel for a skat table
*/
public class SkatTablePanel extends AbstractTabPanel {
private static final long serialVersionUID = 1L;
private static Logger log = LoggerFactory.getLogger(SkatTablePanel.class);
protected Map<String, Player> playerNamesAndPositions;
// FIXME (jan 14.11.2010) looks wrong to me, was made static to avoid
// NullPointerException during ISS table creation
protected static Map<Player, Boolean> playerPassed = new HashMap<Player, Boolean>();
// declarer player on the table
protected Player declarer;
protected AbstractHandPanel foreHand;
protected AbstractHandPanel middleHand;
protected AbstractHandPanel rearHand;
protected OpponentPanel leftOpponentPanel;
protected OpponentPanel rightOpponentPanel;
protected JSkatUserPanel userPanel;
protected GameInformationPanel gameInfoPanel;
protected JPanel gameContextPanel;
protected Map<ContextPanelType, JPanel> contextPanels;
protected TrickPanel trickPanel;
protected TrickPanel lastTrickPanel;
protected GameOverPanel gameOverPanel;
/**
* Table model for skat list
*/
protected SkatListTableModel skatListTableModel;
protected JTable scoreListTable;
protected JScrollPane scoreListScrollPane;
protected BiddingContextPanel biddingPanel;
protected DeclaringContextPanel declaringPanel;
protected SchieberamschContextPanel schieberamschPanel;
protected boolean ramsch = false;
/**
* {@inheritDoc}
*/
public SkatTablePanel(final JSkatView view, final String newTableName,
final ActionMap actions) {
super(view, newTableName, actions);
log.debug("SkatTablePanel: name: " + newTableName); //$NON-NLS-1$
final TrickPanel trickPanel = new TrickPanel(false);
trickPanel.setUserPosition(Player.FOREHAND);
trickPanel.addCard(Player.FOREHAND, Card.CJ);
trickPanel.addCard(Player.MIDDLEHAND, Card.SJ);
trickPanel.addCard(Player.REARHAND, Card.HJ);
}
/**
* Returns the actions for the game over context
*
* @return List of actions for the game over context
*/
protected List<JSkatAction> getGameOverActions() {
return Arrays.asList(JSkatAction.CONTINUE_LOCAL_SERIES);
}
/**
* {@inheritDoc}
*/
@Override
protected void initPanel() {
setLayout(LayoutFactory.getMigLayout("fill,insets 0", "fill", "fill")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
playerNamesAndPositions = new HashMap<String, Player>();
contextPanels = new HashMap<ContextPanelType, JPanel>();
getActionMap().get(JSkatAction.INVITE_ISS_PLAYER).setEnabled(true);
final JSplitPane splitPane = new JSplitPane(
JSplitPane.HORIZONTAL_SPLIT, getScoreListPanel(),
getPlayGroundPanel());
add(splitPane, "grow"); //$NON-NLS-1$
}
private JPanel getScoreListPanel() {
final JPanel panel = new JPanel(LayoutFactory.getMigLayout(
"fill", "fill", "[shrink][grow]")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
final JLabel skatListLabel = new JLabel(
strings.getString("score_sheet")); //$NON-NLS-1$
skatListLabel.setFont(new Font(Font.DIALOG, Font.BOLD, 16));
panel.add(skatListLabel, "wrap, growx, shrinky"); //$NON-NLS-1$
skatListTableModel = new SkatListTableModel();
scoreListTable = new JTable(skatListTableModel);
for (int i = 0; i < scoreListTable.getColumnModel().getColumnCount(); i++) {
if (i == 3) {
// game colum is bigger
scoreListTable.getColumnModel().getColumn(i)
.setPreferredWidth(40);
} else {
scoreListTable.getColumnModel().getColumn(i)
.setPreferredWidth(20);
}
}
scoreListTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
scoreListScrollPane = new JScrollPane(scoreListTable);
scoreListScrollPane.setMinimumSize(new Dimension(150, 100));
scoreListScrollPane.setPreferredSize(new Dimension(300, 100));
scoreListScrollPane
.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
panel.add(scoreListScrollPane, "growy"); //$NON-NLS-1$
return panel;
}
/**
* Builds the play ground panel
*
* @return Play ground panel
*/
protected JPanel getPlayGroundPanel() {
gameInfoPanel = getGameInfoPanel();
leftOpponentPanel = getOpponentPanel();
rightOpponentPanel = getOpponentPanel();
userPanel = createPlayerPanel();
createGameContextPanel();
return new PlayGroundPanel(gameInfoPanel, leftOpponentPanel,
rightOpponentPanel, gameContextPanel, userPanel);
}
private GameInformationPanel getGameInfoPanel() {
return new GameInformationPanel();
}
protected OpponentPanel getOpponentPanel() {
return new OpponentPanel(getActionMap(), 12, false);
}
protected JSkatUserPanel createPlayerPanel() {
return new JSkatUserPanel(getActionMap(), 12, false);
}
protected void addContextPanel(final ContextPanelType panelType,
final JPanel panel) {
if (contextPanels.containsKey(panelType)) {
// remove existing panel first
gameContextPanel.remove(contextPanels.get(panelType));
contextPanels.remove(panelType);
}
contextPanels.put(panelType, panel);
gameContextPanel.add(panel, panelType.toString());
}
private void createGameContextPanel() {
gameContextPanel = new JPanel();
gameContextPanel.setOpaque(false);
gameContextPanel.setLayout(new CardLayout());
addContextPanel(ContextPanelType.START,
new StartContextPanel((StartSkatSeriesAction) getActionMap()
.get(JSkatAction.START_LOCAL_SERIES)));
biddingPanel = new BiddingContextPanel(view, getActionMap(), bitmaps,
userPanel);
addContextPanel(ContextPanelType.BIDDING, biddingPanel);
declaringPanel = new DeclaringContextPanel(view, getActionMap(),
bitmaps, userPanel, 4);
addContextPanel(ContextPanelType.DECLARING, declaringPanel);
schieberamschPanel = new SchieberamschContextPanel(getActionMap(),
userPanel, 4);
addContextPanel(ContextPanelType.SCHIEBERAMSCH, schieberamschPanel);
final JPanel trickHoldingPanel = new JPanel(LayoutFactory.getMigLayout(
"fill", "[shrink][grow][shrink]", //$NON-NLS-1$ //$NON-NLS-2$
"fill")); //$NON-NLS-1$
lastTrickPanel = new TrickPanel(0.6, false);
trickHoldingPanel.add(lastTrickPanel, "width 25%"); //$NON-NLS-1$
trickPanel = new TrickPanel(0.8, true);
trickHoldingPanel.add(trickPanel, "grow"); //$NON-NLS-1$
trickHoldingPanel.add(getRightPanelForTrickPanel(), "width 25%"); //$NON-NLS-1$
trickHoldingPanel.setOpaque(false);
addContextPanel(ContextPanelType.TRICK_PLAYING, trickHoldingPanel);
gameOverPanel = new GameOverPanel(getActionMap(), getGameOverActions());
addContextPanel(ContextPanelType.GAME_OVER, gameOverPanel);
}
private AbstractHandPanel getPlayerPanel(final Player player) {
final AbstractHandPanel result = getHandPanel(player);
return result;
}
protected JPanel getRightPanelForTrickPanel() {
final JPanel blankPanel = new JPanel();
blankPanel.setOpaque(false);
return blankPanel;
}
/**
* Sets player positions
*
* @param leftPosition
* Upper left position
* @param rightPosition
* Upper right position
* @param playerPosition
* Player position
*/
public void setPositions(final Player leftPosition,
final Player rightPosition, final Player playerPosition) {
leftOpponentPanel.setPosition(leftPosition);
rightOpponentPanel.setPosition(rightPosition);
userPanel.setPosition(playerPosition);
biddingPanel.setUserPosition(playerPosition);
trickPanel.setUserPosition(playerPosition);
lastTrickPanel.setUserPosition(playerPosition);
gameOverPanel.setUserPosition(playerPosition);
// FIXME (jansch 09.11.2010) code duplication with
// BiddingPanel.setPlayerPositions()
switch (playerPosition) {
case FOREHAND:
foreHand = userPanel;
middleHand = leftOpponentPanel;
rearHand = rightOpponentPanel;
break;
case MIDDLEHAND:
foreHand = rightOpponentPanel;
middleHand = userPanel;
rearHand = leftOpponentPanel;
break;
case REARHAND:
foreHand = leftOpponentPanel;
middleHand = rightOpponentPanel;
rearHand = userPanel;
break;
}
}
/**
* Adds a card to a player
*
* @param player
* Player
* @param card
* Card
*/
public void addCard(final Player player, final Card card) {
getPlayerPanel(player).addCard(card);
}
/**
* Adds cards to a player
*
* @param player
* Player
* @param cards
* Cards
*/
public void addCards(final Player player, final CardList cards) {
getPlayerPanel(player).addCards(cards);
}
/**
* Sets a card played in a trick
*
* @param player
* Player position
* @param card
* Card
*/
public void setTrickCard(final Player player, final Card card) {
trickPanel.addCard(player, card);
}
/**
* Clears trick cards
*/
public void clearTrickCards() {
trickPanel.clearCards();
}
/**
* Clears last trick cards
*/
void clearLastTrickCards() {
lastTrickPanel.clearCards();
}
/**
* Removes a card from a player
*
* @param player
* Player
* @param card
* Card
*/
public void removeCard(final Player player, final Card card) {
switch (player) {
case FOREHAND:
foreHand.removeCard(card);
break;
case MIDDLEHAND:
middleHand.removeCard(card);
break;
case REARHAND:
rearHand.removeCard(card);
break;
}
}
/**
* Removes all cards from a player
*
* @param player
* Player
*/
public void removeAllCards(final Player player) {
switch (player) {
case FOREHAND:
foreHand.removeAllCards();
break;
case MIDDLEHAND:
middleHand.removeAllCards();
break;
case REARHAND:
rearHand.removeAllCards();
break;
}
}
/**
* Clears the hand of a player
*
* @param player
* Player
*/
public void clearHand(final Player player) {
getPlayerPanel(player).clearHandPanel();
}
/**
* Sets the game announcement
*
* @param player
* Player
* @param gameAnnouncement
* Game announcement
*/
public void setGameAnnouncement(final Player player,
final GameAnnouncement gameAnnouncement) {
if (gameAnnouncement.getGameType() == GameType.RAMSCH) {
ramsch = true;
}
gameInfoPanel.setGameAnnouncement(gameAnnouncement);
leftOpponentPanel.setSortGameType(gameAnnouncement.getGameType());
rightOpponentPanel.setSortGameType(gameAnnouncement.getGameType());
userPanel.setSortGameType(gameAnnouncement.getGameType());
if (gameAnnouncement.getGameType() != GameType.PASSED_IN
&& gameAnnouncement.getGameType() != GameType.RAMSCH) {
getPlayerPanel(player).setDeclarer(true);
}
if (gameAnnouncement.isOuvert()) {
getPlayerPanel(player).showCards();
}
}
/**
* Sets the game state
*
* @param state
* Game state
*/
public void setGameState(final GameState state) {
log.debug(".setGameState(" + state + ")"); //$NON-NLS-1$ //$NON-NLS-2$
gameInfoPanel.setGameState(state);
switch (state) {
case GAME_START:
setContextPanel(ContextPanelType.START);
resetGameData();
break;
case DEALING:
setContextPanel(ContextPanelType.START);
break;
case BIDDING:
setContextPanel(ContextPanelType.BIDDING);
- getActionMap().get(JSkatAction.ANNOUNCE_GAME).setEnabled(false);
break;
case RAMSCH_GRAND_HAND_ANNOUNCING:
setContextPanel(ContextPanelType.SCHIEBERAMSCH);
userPanel.setGameState(state);
- getActionMap().get(JSkatAction.PLAY_GRAND_HAND).setEnabled(true);
- getActionMap().get(JSkatAction.PLAY_SCHIEBERAMSCH).setEnabled(true);
- getActionMap().get(JSkatAction.SCHIEBEN).setEnabled(false);
- getActionMap().get(JSkatAction.PICK_UP_SKAT).setEnabled(false);
break;
case SCHIEBERAMSCH:
setContextPanel(ContextPanelType.SCHIEBERAMSCH);
userPanel.setGameState(state);
- getActionMap().get(JSkatAction.PLAY_GRAND_HAND).setEnabled(false);
- getActionMap().get(JSkatAction.PLAY_SCHIEBERAMSCH)
- .setEnabled(false);
- getActionMap().get(JSkatAction.SCHIEBEN).setEnabled(true);
- getActionMap().get(JSkatAction.PICK_UP_SKAT).setEnabled(true);
break;
case PICKING_UP_SKAT:
if (userPanel.getPosition().equals(declarer)) {
setContextPanel(ContextPanelType.DECLARING);
userPanel.setGameState(state);
- getActionMap().get(JSkatAction.PICK_UP_SKAT).setEnabled(true);
- getActionMap().get(JSkatAction.ANNOUNCE_GAME).setEnabled(true);
}
break;
case DISCARDING:
if (userPanel.getPosition().equals(declarer)) {
userPanel.setGameState(state);
}
break;
case DECLARING:
if (userPanel.getPosition().equals(declarer)) {
setContextPanel(ContextPanelType.DECLARING);
}
break;
case TRICK_PLAYING:
setContextPanel(ContextPanelType.TRICK_PLAYING);
userPanel.setGameState(state);
break;
case CALCULATING_GAME_VALUE:
case PRELIMINARY_GAME_END:
case GAME_OVER:
setContextPanel(ContextPanelType.GAME_OVER);
foreHand.setActivePlayer(false);
middleHand.setActivePlayer(false);
rearHand.setActivePlayer(false);
break;
}
validate();
}
private void resetGameData() {
playerPassed.put(Player.FOREHAND, Boolean.FALSE);
playerPassed.put(Player.MIDDLEHAND, Boolean.FALSE);
playerPassed.put(Player.REARHAND, Boolean.FALSE);
ramsch = false;
declarer = null;
}
/**
* Sets the context panel
*
* @param panelType
* Panel type
*/
void setContextPanel(final ContextPanelType panelType) {
((CardLayout) gameContextPanel.getLayout()).show(gameContextPanel,
panelType.toString());
gameContextPanel.validate();
}
/**
* Adds a new game result
*
* @param gameData
* Game data
*/
public void addGameResult(final GameSummary summary) {
gameOverPanel.setGameSummary(summary);
skatListTableModel.addResult(leftOpponentPanel.getPosition(),
rightOpponentPanel.getPosition(), userPanel.getPosition(),
summary.getDeclarer(), summary);
scrollSkatListToTheEnd();
gameInfoPanel.setGameSummary(summary);
}
private void scrollSkatListToTheEnd() {
// scroll skat list if the new result is out of scope
final Rectangle bounds = scoreListTable.getCellRect(
skatListTableModel.getRowCount() - 1, 0, true);
final Point loc = bounds.getLocation();
loc.move(loc.x, loc.y + bounds.height);
scoreListScrollPane.getViewport().setViewPosition(loc);
}
Player getHumanPosition() {
return userPanel.getPosition();
}
/**
* Clears the skat table
*/
public void clearTable() {
gameInfoPanel.clear();
biddingPanel.resetPanel();
declaringPanel.resetPanel();
gameOverPanel.resetPanel();
schieberamschPanel.resetPanel();
clearHand(Player.FOREHAND);
clearHand(Player.MIDDLEHAND);
clearHand(Player.REARHAND);
clearTrickCards();
clearLastTrickCards();
// default sorting is grand sorting
leftOpponentPanel.setSortGameType(GameType.GRAND);
rightOpponentPanel.setSortGameType(GameType.GRAND);
userPanel.setSortGameType(GameType.GRAND);
resetGameData();
}
/**
* Sets the fore hand player for the trick
*
* @param trickForeHand
* Fore hand player for the trick
*/
public void setTrickForeHand(final Player trickForeHand) {
setActivePlayer(trickForeHand);
}
/**
* Sets the bid value for a player
*
* @param player
* Player
* @param bidValue
* Bid value
* @param madeBid
* TRUE, if the player made the bid<br>
* FALSE, if the player hold the bid
*/
public void setBid(final Player player, final int bidValue,
final boolean madeBid) {
log.debug(player + " " + (madeBid ? "bids" : "holds") + ": " + bidValue); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
biddingPanel.setBid(player, bidValue);
getPlayerPanel(player).setBidValue(bidValue);
switch (player) {
case FOREHAND:
if (playerPassed.get(Player.MIDDLEHAND).booleanValue()) {
setActivePlayer(Player.REARHAND);
} else {
setActivePlayer(Player.MIDDLEHAND);
}
break;
case MIDDLEHAND:
if (madeBid) {
setActivePlayer(Player.FOREHAND);
} else {
setActivePlayer(Player.REARHAND);
}
break;
case REARHAND:
if (playerPassed.get(Player.FOREHAND).booleanValue()) {
setActivePlayer(Player.MIDDLEHAND);
} else {
setActivePlayer(Player.FOREHAND);
}
break;
}
}
/**
* Starts a game
*/
public void startGame() {
clearTable();
}
/**
* Sets the skat
*
* @param skat
* Skat
*/
public void setSkat(final CardList skat) {
if (ramsch) {
schieberamschPanel.setSkat(skat);
} else {
declaringPanel.setSkat(skat);
}
}
/**
* Takes a card from skat to user panel
*
* @param card
* Card
*/
public void takeCardFromSkat(final Card card) {
takeCardFromSkat(userPanel, card);
}
/**
* Takes a card from skat
*
* @param player
* Player
* @param card
* Card
*/
public void takeCardFromSkat(final Player player, final Card card) {
takeCardFromSkat(getPlayerPanel(player), card);
}
private void takeCardFromSkat(final AbstractHandPanel panel, final Card card) {
if (!panel.isHandFull()) {
declaringPanel.removeCard(card);
schieberamschPanel.removeCard(card);
panel.addCard(card);
} else {
log.debug("Player panel full!!!"); //$NON-NLS-1$
}
}
/**
* Puts a card from the user panel to the skat
*
* @param card
* Card
*/
public void putCardIntoSkat(final Card card) {
putCardIntoSkat(userPanel, card);
}
/**
* Puts a card into the skat
*
* @param player
* Player
* @param card
* Card
*/
public void putCardIntoSkat(final Player player, final Card card) {
putCardIntoSkat(getPlayerPanel(player), card);
}
private void putCardIntoSkat(final AbstractHandPanel panel, final Card card) {
if (!declaringPanel.isHandFull()) {
panel.removeCard(card);
declaringPanel.addCard(card);
schieberamschPanel.addCard(card);
} else {
log.debug("Discard panel full!!!"); //$NON-NLS-1$
}
}
/**
* Clears the skat list
*/
public void clearSkatList() {
skatListTableModel.clearList();
}
/**
* Sets maximum number of players
*
* @param maxPlayers
* Maximum number of players
*/
protected void setMaxPlayers(final int maxPlayers) {
skatListTableModel.setPlayerCount(maxPlayers);
}
/**
* Sets player name
*
* @param player
* Player position
* @param name
* Player name
*/
public void setPlayerName(final Player player, final String name) {
playerNamesAndPositions.put(name, player);
final AbstractHandPanel panel = getHandPanel(player);
if (panel != null) {
if (name != null) {
panel.setPlayerName(name);
}
}
}
/**
* Sets player time
*
* @param player
* Player position
* @param time
* Player time
*/
public void setPlayerTime(final Player player, final double time) {
final AbstractHandPanel panel = getHandPanel(player);
if (panel != null) {
panel.setPlayerTime(time);
}
}
/**
* Sets player flag for chat enabled yes/no
*
* @param playerName
* Player name
* @param isChatEnabled
* Flag for chat enabled yes/no
*/
public void setPlayerChatEnabled(final String playerName,
final boolean isChatEnabled) {
final AbstractHandPanel panel = getHandPanel(playerName);
if (panel != null) {
panel.setChatEnabled(isChatEnabled);
}
}
/**
* Sets player flag for ready to play yes/no
*
* @param playerName
* Player name
* @param isReadyToPlay
* Flag for ready to play yes/no
*/
public void setPlayerReadyToPlay(final String playerName,
final boolean isReadyToPlay) {
final AbstractHandPanel panel = getHandPanel(playerName);
if (panel != null) {
panel.setReadyToPlay(isReadyToPlay);
}
}
/**
* Sets player flag for resign
*
* @param player
* Player
*/
public void setResign(final Player player) {
final AbstractHandPanel panel = getHandPanel(player);
if (panel != null) {
panel.setResign(true);
}
}
private AbstractHandPanel getHandPanel(final String playerName) {
AbstractHandPanel panel = null;
if (playerName.equals(userPanel.getPlayerName())) {
panel = userPanel;
} else if (playerName.equals(leftOpponentPanel.getPlayerName())) {
panel = leftOpponentPanel;
} else if (playerName.equals(rightOpponentPanel.getPlayerName())) {
panel = rightOpponentPanel;
}
return panel;
}
private AbstractHandPanel getHandPanel(final Player player) {
AbstractHandPanel panel = null;
switch (player) {
case FOREHAND:
panel = foreHand;
break;
case MIDDLEHAND:
panel = middleHand;
break;
case REARHAND:
panel = rearHand;
break;
}
return panel;
}
/**
* Sets the last trick
*
* @param trickForeHand
* @param foreHandCard
* @param middleHandCard
* @param rearHandCard
*/
public void setLastTrick(final Trick trick) {
lastTrickPanel.clearCards();
final Player trickForeHand = trick.getForeHand();
lastTrickPanel.addCard(trickForeHand, trick.getFirstCard());
lastTrickPanel.addCard(trickForeHand.getLeftNeighbor(),
trick.getSecondCard());
lastTrickPanel.addCard(trickForeHand.getRightNeighbor(),
trick.getThirdCard());
}
/**
* Sets the active player
*
* @param player
* Active player
*/
public void setActivePlayer(final Player player) {
switch (player) {
case FOREHAND:
foreHand.setActivePlayer(true);
middleHand.setActivePlayer(false);
rearHand.setActivePlayer(false);
break;
case MIDDLEHAND:
foreHand.setActivePlayer(false);
middleHand.setActivePlayer(true);
rearHand.setActivePlayer(false);
break;
case REARHAND:
foreHand.setActivePlayer(false);
middleHand.setActivePlayer(false);
rearHand.setActivePlayer(true);
break;
}
}
/**
* Sets passing of a player
*
* @param player
* Player
*/
public void setPass(final Player player) {
log.debug(player + " passes"); //$NON-NLS-1$
playerPassed.put(player, Boolean.TRUE);
getPlayerPanel(player).setPass(true);
biddingPanel.setPass(player);
switch (player) {
case FOREHAND:
case MIDDLEHAND:
setActivePlayer(Player.REARHAND);
break;
case REARHAND:
if (playerPassed.get(Player.FOREHAND).booleanValue()) {
setActivePlayer(Player.MIDDLEHAND);
} else {
setActivePlayer(Player.FOREHAND);
}
break;
}
}
/**
* Sets the series state
*
* @param state
* Series state
*/
public void setSeriesState(final SeriesState state) {
if (SeriesState.SERIES_FINISHED.equals(state)) {
setContextPanel(ContextPanelType.START);
}
}
/**
* Sets the bid value to make
*
* @param bidValue
* Bid value
*/
public void setBidValueToMake(final int bidValue) {
biddingPanel.setBidValueToMake(bidValue);
}
/**
* Sets the bid value to hold
*
* @param bidValue
* Bid value
*/
public void setBidValueToHold(final int bidValue) {
biddingPanel.setBidValueToHold(bidValue);
}
@Override
protected void setFocus() {
// FIXME (jan 20.11.2010) set active/inactive actions
}
/**
* Sets the trick number
*
* @param trickNumber
* Trick number
*/
public void setTrickNumber(final int trickNumber) {
gameInfoPanel.setTrickNumber(trickNumber);
}
/**
* Sets the game number
*
* @param gameNumber
* Game number
*/
public void setGameNumber(final int gameNumber) {
gameInfoPanel.setGameNumber(gameNumber);
}
/**
* Sets the player names
*
* @param upperLeftPlayerName
* @param upperRightPlayerName
* @param lowerPlayerName
*/
public void setPlayerNames(final String upperLeftPlayerName,
final String upperRightPlayerName, final String lowerPlayerName) {
// FIXME (jan 26.01.2011) possible code duplication with
// setPlayerInformation()
leftOpponentPanel.setPlayerName(upperLeftPlayerName);
rightOpponentPanel.setPlayerName(upperRightPlayerName);
userPanel.setPlayerName(lowerPlayerName);
skatListTableModel.setPlayerNames(upperLeftPlayerName,
upperRightPlayerName, lowerPlayerName);
}
/**
* Gets the declarer player for the table
*
* @return Declarer player
*/
public Player getDeclarer() {
return declarer;
}
/**
* Sets the declarer player for the table
*
* @param declarer
* Declarer player
*/
public void setDeclarer(final Player declarer) {
this.declarer = declarer;
}
/**
* Shows the cards of a player
*
* @param player
* Player
*/
public void showCards(final Player player) {
getPlayerPanel(player).showCards();
}
/**
* Hides the cards of a player
*
* @param player
* Player
*/
public void hideCards(final Player player) {
getPlayerPanel(player).hideCards();
}
/**
* Sets the schieben of a player
*
* @param player
* Player position
*/
public void setGeschoben(final Player player) {
getPlayerPanel(player).setGeschoben();
}
/**
* Sets the discarded skat
*
* @param player
* Player
* @param skatBefore
* Skat before discarding
* @param discardedSkat
* Skat after discarding
*/
public void setDiscardedSkat(final Player player,
final CardList skatBefore, final CardList discardedSkat) {
getPlayerPanel(player);
for (int i = 0; i < 2; i++) {
final Card skatCard = skatBefore.get(i);
takeCardFromSkat(player, skatCard);
}
for (int i = 0; i < 2; i++) {
final Card skatCard = discardedSkat.get(i);
putCardIntoSkat(player, skatCard);
}
}
/**
* Shows cards of all players
*/
public void showCards(final Map<Player, CardList> cards) {
for (final Player player : cards.keySet()) {
removeAllCards(player);
showCards(player);
addCards(player, cards.get(player));
}
}
}
| false | true | public void setGameState(final GameState state) {
log.debug(".setGameState(" + state + ")"); //$NON-NLS-1$ //$NON-NLS-2$
gameInfoPanel.setGameState(state);
switch (state) {
case GAME_START:
setContextPanel(ContextPanelType.START);
resetGameData();
break;
case DEALING:
setContextPanel(ContextPanelType.START);
break;
case BIDDING:
setContextPanel(ContextPanelType.BIDDING);
getActionMap().get(JSkatAction.ANNOUNCE_GAME).setEnabled(false);
break;
case RAMSCH_GRAND_HAND_ANNOUNCING:
setContextPanel(ContextPanelType.SCHIEBERAMSCH);
userPanel.setGameState(state);
getActionMap().get(JSkatAction.PLAY_GRAND_HAND).setEnabled(true);
getActionMap().get(JSkatAction.PLAY_SCHIEBERAMSCH).setEnabled(true);
getActionMap().get(JSkatAction.SCHIEBEN).setEnabled(false);
getActionMap().get(JSkatAction.PICK_UP_SKAT).setEnabled(false);
break;
case SCHIEBERAMSCH:
setContextPanel(ContextPanelType.SCHIEBERAMSCH);
userPanel.setGameState(state);
getActionMap().get(JSkatAction.PLAY_GRAND_HAND).setEnabled(false);
getActionMap().get(JSkatAction.PLAY_SCHIEBERAMSCH)
.setEnabled(false);
getActionMap().get(JSkatAction.SCHIEBEN).setEnabled(true);
getActionMap().get(JSkatAction.PICK_UP_SKAT).setEnabled(true);
break;
case PICKING_UP_SKAT:
if (userPanel.getPosition().equals(declarer)) {
setContextPanel(ContextPanelType.DECLARING);
userPanel.setGameState(state);
getActionMap().get(JSkatAction.PICK_UP_SKAT).setEnabled(true);
getActionMap().get(JSkatAction.ANNOUNCE_GAME).setEnabled(true);
}
break;
case DISCARDING:
if (userPanel.getPosition().equals(declarer)) {
userPanel.setGameState(state);
}
break;
case DECLARING:
if (userPanel.getPosition().equals(declarer)) {
setContextPanel(ContextPanelType.DECLARING);
}
break;
case TRICK_PLAYING:
setContextPanel(ContextPanelType.TRICK_PLAYING);
userPanel.setGameState(state);
break;
case CALCULATING_GAME_VALUE:
case PRELIMINARY_GAME_END:
case GAME_OVER:
setContextPanel(ContextPanelType.GAME_OVER);
foreHand.setActivePlayer(false);
middleHand.setActivePlayer(false);
rearHand.setActivePlayer(false);
break;
}
validate();
}
| public void setGameState(final GameState state) {
log.debug(".setGameState(" + state + ")"); //$NON-NLS-1$ //$NON-NLS-2$
gameInfoPanel.setGameState(state);
switch (state) {
case GAME_START:
setContextPanel(ContextPanelType.START);
resetGameData();
break;
case DEALING:
setContextPanel(ContextPanelType.START);
break;
case BIDDING:
setContextPanel(ContextPanelType.BIDDING);
break;
case RAMSCH_GRAND_HAND_ANNOUNCING:
setContextPanel(ContextPanelType.SCHIEBERAMSCH);
userPanel.setGameState(state);
break;
case SCHIEBERAMSCH:
setContextPanel(ContextPanelType.SCHIEBERAMSCH);
userPanel.setGameState(state);
break;
case PICKING_UP_SKAT:
if (userPanel.getPosition().equals(declarer)) {
setContextPanel(ContextPanelType.DECLARING);
userPanel.setGameState(state);
}
break;
case DISCARDING:
if (userPanel.getPosition().equals(declarer)) {
userPanel.setGameState(state);
}
break;
case DECLARING:
if (userPanel.getPosition().equals(declarer)) {
setContextPanel(ContextPanelType.DECLARING);
}
break;
case TRICK_PLAYING:
setContextPanel(ContextPanelType.TRICK_PLAYING);
userPanel.setGameState(state);
break;
case CALCULATING_GAME_VALUE:
case PRELIMINARY_GAME_END:
case GAME_OVER:
setContextPanel(ContextPanelType.GAME_OVER);
foreHand.setActivePlayer(false);
middleHand.setActivePlayer(false);
rearHand.setActivePlayer(false);
break;
}
validate();
}
|
diff --git a/src/com/ichi2/themes/Themes.java b/src/com/ichi2/themes/Themes.java
index 2c1c81e7..60fcd436 100644
--- a/src/com/ichi2/themes/Themes.java
+++ b/src/com/ichi2/themes/Themes.java
@@ -1,884 +1,884 @@
/***************************************************************************************
* Copyright (c) 2011 Norbert Nagold <[email protected]> *
* *
* This program is free software; you can redistribute it and/or modify it under *
* the terms of the GNU General Public License as published by the Free Software *
* Foundation; either version 3 of the License, or (at your option) any later *
* version. *
* *
* This program is distributed in the hope that it will be useful, but WITHOUT ANY *
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A *
* PARTICULAR PURPOSE. See the GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License along with *
* this program. If not, see <http://www.gnu.org/licenses/>. *
****************************************************************************************/
package com.ichi2.themes;
import com.ichi2.anki.AnkiDroidApp;
import com.ichi2.anki.R;
import com.tomgibara.android.veecheck.util.PrefSettings;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams;
import android.webkit.WebView;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
public class Themes {
public final static int THEME_ANDROID_DARK = 0;
public final static int THEME_ANDROID_LIGHT = 1;
public final static int THEME_BLUE = 2;
public final static int THEME_WHITE = 3;
public final static int THEME_FLAT = 4;
public final static int THEME_NO_THEME = 100;
public final static int CALLER_STUDYOPTIONS = 1;
public final static int CALLER_DECKPICKER_DECK = 3;
public final static int CALLER_REVIEWER= 4;
public final static int CALLER_FEEDBACK= 5;
public final static int CALLER_DOWNLOAD_DECK= 6;
public final static int CALLER_DECKPICKER = 7;
public final static int CALLER_CARDBROWSER = 8;
public final static int CALLER_CARDEDITOR_INTENTDIALOG = 9;
public final static int CALLER_CARD_EDITOR = 10;
private static int mCurrentTheme = -1;
private static int mProgressbarsBackgroundColor;
private static int mProgressbarsFrameColor;
private static int mProgressbarsMatureColor;
private static int mProgressbarsYoungColor;
private static int mProgressbarsDeckpickerYoungColor;
private static int mReviewerBackground = 0;
private static int mReviewerProgressbar = 0;
private static int mFlashcardBorder = 0;
private static int mDeckpickerItemBorder = 0;
private static int mTitleStyle = 0;
private static int mTitleTextColor;
private static int mTextViewStyle= 0;
private static int mWallpaper = 0;
private static int mBackgroundColor;
private static int mBackgroundDarkColor = 0;
private static int mDialogBackgroundColor = 0;
private static int mToastBackground = 0;
private static int[] mCardbrowserItemBorder;
private static int[] mChartColors;
private static int mPopupTopDark;
private static int mPopupTopMedium;
private static int mPopupTopBright;
private static int mPopupCenterDark;
private static int mPopupCenterBright;
private static int mPopupCenterMedium;
private static int mPopupBottomDark;
private static int mPopupBottomBright;
private static int mPopupBottomMedium;
private static int mPopupFullDark;
private static int mPopupFullMedium;
private static int mPopupFullBright;
private static int mDividerHorizontalBright;
private static Typeface mLightFont;
private static Typeface mRegularFont;
private static Typeface mBoldFont;
private static int mProgressDialogFontColor;
private static int mNightModeButton;
private static Context mContext;
public static void applyTheme(Context context) {
applyTheme(context, -1);
}
public static void applyTheme(Context context, int theme) {
mContext = context;
if (mCurrentTheme == -1) {
loadTheme();
}
switch (theme == -1 ? mCurrentTheme : theme) {
case THEME_ANDROID_DARK:
context.setTheme(R.style.Theme_Black);
Log.i(AnkiDroidApp.TAG, "Set theme: dark");
break;
case THEME_ANDROID_LIGHT:
context.setTheme(R.style.Theme_Light);
Log.i(AnkiDroidApp.TAG, "Set theme: light");
break;
case THEME_BLUE:
context.setTheme(R.style.Theme_Blue);
Log.i(AnkiDroidApp.TAG, "Set theme: blue");
break;
case THEME_FLAT:
context.setTheme(R.style.Theme_Flat);
Log.i(AnkiDroidApp.TAG, "Set theme: flat");
break;
case THEME_WHITE:
context.setTheme(R.style.Theme_White);
Log.i(AnkiDroidApp.TAG, "Set theme: white");
break;
case -1:
break;
}
}
public static void setContentStyle(View view, int caller) {
setFont(view);
switch (caller) {
case CALLER_STUDYOPTIONS:
((View) view.findViewById(R.id.studyoptions_progressbar1_border)).setBackgroundResource(mProgressbarsFrameColor);
((View) view.findViewById(R.id.studyoptions_progressbar2_border)).setBackgroundResource(mProgressbarsFrameColor);
((View) view.findViewById(R.id.studyoptions_global_limit_bars)).setBackgroundResource(mProgressbarsFrameColor);
((View) view.findViewById(R.id.studyoptions_progressbar4_border)).setBackgroundResource(mProgressbarsFrameColor);
((View) view.findViewById(R.id.studyoptions_bars_max)).setBackgroundResource(mProgressbarsBackgroundColor);
((View) view.findViewById(R.id.studyoptions_progressbar2_content)).setBackgroundResource(mProgressbarsBackgroundColor);
((View) view.findViewById(R.id.studyoptions_global_limit_bars_content)).setBackgroundResource(mProgressbarsBackgroundColor);
((View) view.findViewById(R.id.studyoptions_progressbar4_content)).setBackgroundResource(mProgressbarsBackgroundColor);
((View) view.findViewById(R.id.studyoptions_global_mat_limit_bar)).setBackgroundResource(mProgressbarsMatureColor);
((View) view.findViewById(R.id.studyoptions_global_mat_bar)).setBackgroundResource(mProgressbarsMatureColor);
((View) view.findViewById(R.id.studyoptions_global_limit_bar)).setBackgroundResource(mProgressbarsYoungColor);
((View) view.findViewById(R.id.studyoptions_global_bar)).setBackgroundResource(mProgressbarsYoungColor);
if (mCurrentTheme == THEME_WHITE) {
setMargins(view.findViewById(R.id.studyoptions_deck_name), LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 0, 6f, 0, 2f);
setMargins(view.findViewById(R.id.studyoptions_statistic_field), LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 0, 2f, 0, 12f);
setMargins(view.findViewById(R.id.studyoptions_bottom), LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 0, 0, 0, 8f);
((View) view.findViewById(R.id.studyoptions_deckinformation)).setBackgroundResource(R.drawable.white_textview);
((View) view.findViewById(R.id.studyoptions_statistic_field)).setBackgroundResource(R.color.transparent);
((View) view.findViewById(R.id.studyoptions_deckinformation)).setBackgroundResource(mTextViewStyle);
((View) view.findViewById(R.id.studyoptions_bottom)).setBackgroundResource(mTextViewStyle);
((View) view.findViewById(R.id.studyoptions_main)).setBackgroundResource(R.drawable.white_wallpaper_so);
} else {
((View) view.findViewById(R.id.studyoptions_statistic_field)).setBackgroundResource(mTextViewStyle);
((View) view.findViewById(R.id.studyoptions_main)).setBackgroundResource(mWallpaper);
}
break;
case CALLER_DECKPICKER:
ListView lv = (ListView) view.findViewById(R.id.files);
switch (mCurrentTheme) {
case THEME_BLUE:
lv.setSelector(R.drawable.blue_deckpicker_list_selector);
lv.setDividerHeight(0);
break;
case THEME_FLAT:
lv.setSelector(R.drawable.blue_deckpicker_list_selector);
lv.setDividerHeight(0);
break;
case THEME_WHITE:
lv.setBackgroundResource(R.drawable.white_textview);
lv.setSelector(R.drawable.white_deckpicker_list_selector);
lv.setDivider(mContext.getResources().getDrawable(R.drawable.white_listdivider));
setMargins(view, LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 4f, 4f, 4f, 4f);
break;
default:
break;
}
break;
case CALLER_CARDBROWSER:
ListView lv2 = (ListView) view.findViewById(R.id.card_browser_list);
switch (mCurrentTheme) {
case THEME_BLUE:
lv2.setSelector(R.drawable.blue_cardbrowser_list_selector);
lv2.setDividerHeight(0);
break;
case THEME_FLAT:
lv2.setSelector(R.drawable.blue_cardbrowser_list_selector);
lv2.setDividerHeight(0);
break;
case THEME_WHITE:
lv2.setBackgroundResource(R.drawable.white_textview);
lv2.setSelector(R.drawable.white_deckpicker_list_selector);
lv2.setDivider(mContext.getResources().getDrawable(R.drawable.white_listdivider));
// setFont(view);
setMargins(view, LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 4f, 4f, 4f, 4f);
break;
default:
break;
}
break;
case CALLER_CARDEDITOR_INTENTDIALOG:
ListView lv3 = (ListView) view;
switch (mCurrentTheme) {
case THEME_BLUE:
lv3.setSelector(R.drawable.blue_cardbrowser_list_selector);
lv3.setDividerHeight(0);
break;
case THEME_FLAT:
lv3.setSelector(R.drawable.blue_cardbrowser_list_selector);
lv3.setDividerHeight(0);
break;
case THEME_WHITE:
lv3.setSelector(R.drawable.blue_cardbrowser_list_selector);
lv3.setDividerHeight(0);
break;
default:
break;
}
break;
case CALLER_DECKPICKER_DECK:
if (view.getId() == R.id.DeckPickerCompletionMat) {
view.setBackgroundResource(mProgressbarsFrameColor);
} else if (view.getId() == R.id.DeckPickerCompletionAll) {
view.setBackgroundResource(mProgressbarsDeckpickerYoungColor);
} else if (view.getId() == R.id.deckpicker_deck) {
view.setBackgroundResource(mDeckpickerItemBorder);
}
break;
case CALLER_REVIEWER:
((View)view.findViewById(R.id.main_layout)).setBackgroundResource(mReviewerBackground);
((View)view.findViewById(R.id.flashcard_border)).setBackgroundResource(mFlashcardBorder);
switch (mCurrentTheme) {
case THEME_ANDROID_DARK:
case THEME_ANDROID_LIGHT:
((View)view.findViewById(R.id.flashcard_frame)).setBackgroundResource(PrefSettings.getSharedPrefs(mContext).getBoolean("invertedColors", false) ? R.color.black : R.color.white);
break;
case THEME_BLUE:
((View)view.findViewById(R.id.flashcard_frame)).setBackgroundResource(PrefSettings.getSharedPrefs(mContext).getBoolean("invertedColors", false) ? R.color.reviewer_night_card_background : R.color.white);
break;
case THEME_FLAT:
((View)view.findViewById(R.id.flashcard_frame)).setBackgroundResource(PrefSettings.getSharedPrefs(mContext).getBoolean("invertedColors", false) ? R.color.reviewer_night_card_background : R.color.white);
break;
case THEME_WHITE:
((View)view.findViewById(R.id.flashcard_frame)).setBackgroundResource(PrefSettings.getSharedPrefs(mContext).getBoolean("invertedColors", false) ? R.color.black : R.color.white);
setMargins(view.findViewById(R.id.main_layout), LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 4f, 0, 4f, 4f);
// ((View)view.findViewById(R.id.nextTime1)).setBackgroundResource(R.drawable.white_next_time_separator);
// ((View)view.findViewById(R.id.nextTime2)).setBackgroundResource(R.drawable.white_next_time_separator);
// ((View)view.findViewById(R.id.nextTime3)).setBackgroundResource(R.drawable.white_next_time_separator);
// ((View)view.findViewById(R.id.nextTime4)).setBackgroundResource(R.drawable.white_next_time_separator);
break;
}
((View)view.findViewById(R.id.session_progress)).setBackgroundResource(mReviewerProgressbar);
break;
case CALLER_FEEDBACK:
((TextView)view).setTextColor(mProgressbarsFrameColor);
break;
case CALLER_CARD_EDITOR:
view.findViewById(R.id.CardEditorEditFieldsLayout).setBackgroundResource(mTextViewStyle);
// int padding = (int) (4 * mContext.getResources().getDisplayMetrics().density);
// view.findViewById(R.id.CardEditorScroll).setPadding(padding, padding, padding, padding);
break;
case CALLER_DOWNLOAD_DECK:
view.setBackgroundResource(mDeckpickerItemBorder);
break;
}
}
public static void loadTheme(){
SharedPreferences preferences = PrefSettings.getSharedPrefs(mContext);
mCurrentTheme = Integer.parseInt(preferences.getString("theme", "2"));
switch (mCurrentTheme) {
case THEME_ANDROID_DARK:
mDialogBackgroundColor = R.color.card_browser_background;
- mProgressbarsBackgroundColor = 0;
- mProgressbarsFrameColor = 0;
- mProgressbarsMatureColor = 0;
- mProgressbarsYoungColor = 0;
- mProgressbarsDeckpickerYoungColor = 0;
+ mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_default;
+ mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_default;
+ mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_default;
+ mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_default;
+ mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_dark;
mReviewerBackground = 0;
mFlashcardBorder = 0;
mDeckpickerItemBorder = 0;
mTitleStyle = 0;
mTitleTextColor = mContext.getResources().getColor(R.color.white);
mTextViewStyle = 0;
mWallpaper = 0;
mToastBackground = 0;
mBackgroundDarkColor = 0;
mReviewerProgressbar = 0;
mCardbrowserItemBorder = new int[] {0, R.color.card_browser_marked, R.color.card_browser_suspended, R.color.card_browser_marked};
mChartColors = new int[] {Color.WHITE, Color.BLACK};
mPopupTopBright = R.drawable.popup_top_bright;
mPopupTopMedium = R.drawable.popup_top_bright;
mPopupTopDark = R.drawable.popup_top_dark;
mPopupCenterDark = R.drawable.popup_center_dark;
mPopupCenterBright = R.drawable.popup_center_bright;
mPopupCenterMedium = R.drawable.popup_center_medium;
mPopupBottomDark = R.drawable.popup_bottom_dark;
mPopupBottomBright = R.drawable.popup_bottom_bright;
mPopupBottomMedium = R.drawable.popup_bottom_medium;
mPopupFullBright = R.drawable.popup_full_bright;
mPopupFullDark = R.drawable.popup_full_dark;
mPopupFullMedium = R.drawable.popup_full_bright;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mBackgroundColor = R.color.white;
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.btn_keyboard_key_fulltrans_normal;
break;
case THEME_ANDROID_LIGHT:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_light;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_light;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = 0;
mFlashcardBorder = 0;
mDeckpickerItemBorder = 0;
mTitleStyle = 0;
mTitleTextColor = mContext.getResources().getColor(R.color.black);
mTextViewStyle = 0;
mWallpaper = 0;
mToastBackground = 0;
mBackgroundDarkColor = 0;
mDialogBackgroundColor = R.color.card_browser_background;
mCardbrowserItemBorder = new int[] {0, R.color.card_browser_marked, R.color.card_browser_suspended, R.color.card_browser_marked};
mReviewerProgressbar = mProgressbarsYoungColor;
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopDark = R.drawable.popup_top_dark;
mPopupTopBright = R.drawable.popup_top_bright;
mPopupTopMedium = R.drawable.popup_top_bright;
mPopupCenterDark = R.drawable.popup_center_dark;
mPopupCenterBright = R.drawable.popup_center_bright;
mPopupCenterMedium = R.drawable.popup_center_medium;
mPopupBottomDark = R.drawable.popup_bottom_dark;
mPopupBottomBright = R.drawable.popup_bottom_bright;
mPopupBottomMedium = R.drawable.popup_bottom_medium;
mPopupFullBright = R.drawable.popup_full_bright;
mPopupFullMedium = R.drawable.popup_full_bright;
mPopupFullDark = R.drawable.popup_full_dark;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mBackgroundColor = R.color.white;
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.btn_keyboard_key_fulltrans_normal;
break;
case THEME_BLUE:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_blue;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_blue;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = R.color.reviewer_background;
mFlashcardBorder = R.drawable.blue_bg_webview;
mDeckpickerItemBorder = R.drawable.blue_bg_deckpicker;
mTitleStyle = R.drawable.blue_title;
mTitleTextColor = mContext.getResources().getColor(R.color.black);
mTextViewStyle = R.drawable.blue_textview;
mWallpaper = R.drawable.blue_background;
mBackgroundColor = R.color.background_blue;
mToastBackground = R.drawable.blue_toast_frame;
mDialogBackgroundColor = R.color.background_dialog_blue;
mBackgroundDarkColor = R.color.background_dark_blue;
mReviewerProgressbar = R.color.reviewer_progressbar_session_blue;
mCardbrowserItemBorder = new int[] {R.drawable.blue_bg_cardbrowser, R.drawable.blue_bg_cardbrowser_marked, R.drawable.blue_bg_cardbrowser_suspended, R.drawable.blue_bg_cardbrowser_marked_suspended};
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopDark = R.drawable.blue_popup_top_dark;
mPopupTopBright = R.drawable.blue_popup_top_bright;
mPopupTopMedium = R.drawable.blue_popup_top_medium;
mPopupCenterDark = R.drawable.blue_popup_center_dark;
mPopupCenterBright = R.drawable.blue_popup_center_bright;
mPopupCenterMedium = R.drawable.blue_popup_center_medium;
mPopupBottomDark = R.drawable.blue_popup_bottom_dark;
mPopupBottomBright = R.drawable.blue_popup_bottom_bright;
mPopupBottomMedium = R.drawable.blue_popup_bottom_medium;
mPopupFullBright = R.drawable.blue_popup_full_bright;
mPopupFullMedium = R.drawable.blue_popup_full_medium;
mPopupFullDark = R.drawable.blue_popup_full_dark;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.blue_btn_night;
break;
case THEME_FLAT:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_blue;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_blue;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = R.color.reviewer_background;
mFlashcardBorder = R.drawable.blue_bg_webview;
mDeckpickerItemBorder = R.drawable.blue_bg_deckpicker;
mTitleStyle = R.drawable.flat_title;
mTitleTextColor = mContext.getResources().getColor(R.color.flat_title_color);
mTextViewStyle = R.drawable.flat_textview;
mWallpaper = R.drawable.flat_background;
mBackgroundColor = R.color.background_blue;
mToastBackground = R.drawable.blue_toast_frame;
mDialogBackgroundColor = R.color.background_dialog_blue;
mBackgroundDarkColor = R.color.background_dark_blue;
mReviewerProgressbar = R.color.reviewer_progressbar_session_blue;
mCardbrowserItemBorder = new int[] {R.drawable.blue_bg_cardbrowser, R.drawable.blue_bg_cardbrowser_marked, R.drawable.blue_bg_cardbrowser_suspended, R.drawable.blue_bg_cardbrowser_marked_suspended};
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopDark = R.drawable.blue_popup_top_dark;
mPopupTopBright = R.drawable.blue_popup_top_bright;
mPopupTopMedium = R.drawable.blue_popup_top_medium;
mPopupCenterDark = R.drawable.blue_popup_center_dark;
mPopupCenterBright = R.drawable.blue_popup_center_bright;
mPopupCenterMedium = R.drawable.blue_popup_center_medium;
mPopupBottomDark = R.drawable.blue_popup_bottom_dark;
mPopupBottomBright = R.drawable.blue_popup_bottom_bright;
mPopupBottomMedium = R.drawable.blue_popup_bottom_medium;
mPopupFullBright = R.drawable.blue_popup_full_bright;
mPopupFullMedium = R.drawable.blue_popup_full_medium;
mPopupFullDark = R.drawable.blue_popup_full_dark;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mLightFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Light.ttf");
mRegularFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Regular.ttf");
mBoldFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Bold.ttf");
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.blue_btn_night;
break;
case THEME_WHITE:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_blue;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_blue;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = R.color.white_background;
mFlashcardBorder = R.drawable.white_bg_webview;
mDeckpickerItemBorder = R.drawable.white_bg_deckpicker;
mTitleStyle = R.drawable.flat_title;
mTitleTextColor = mContext.getResources().getColor(R.color.black);
mTextViewStyle = R.drawable.white_textview_padding;
mWallpaper = R.drawable.white_wallpaper;
mBackgroundColor = R.color.white_background;
mToastBackground = R.drawable.white_toast_frame;
mDialogBackgroundColor = mBackgroundColor;
mBackgroundDarkColor = R.color.background_dark_blue;
mReviewerProgressbar = R.color.reviewer_progressbar_session_blue;
mCardbrowserItemBorder = new int[] {R.drawable.white_bg_cardbrowser, R.drawable.white_bg_cardbrowser_marked, R.drawable.white_bg_cardbrowser_suspended, R.drawable.white_bg_cardbrowser_marked_suspended};
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopBright = R.drawable.white_popup_top_bright;
mPopupTopMedium = R.drawable.white_popup_top_medium;
mPopupTopDark = mPopupTopMedium;
mPopupCenterDark = R.drawable.white_popup_center_bright;
mPopupCenterBright = R.drawable.white_popup_center_bright;
mPopupCenterMedium = R.drawable.white_popup_center_medium;
mPopupBottomBright = R.drawable.white_popup_bottom_bright;
mPopupBottomDark = mPopupBottomBright;
mPopupBottomMedium = R.drawable.white_popup_bottom_medium;
mPopupFullBright = R.drawable.white_popup_full_bright;
mPopupFullMedium = R.drawable.white_popup_full_medium;
mPopupFullDark = mPopupFullBright;
mDividerHorizontalBright = R.drawable.white_dialog_divider;
mLightFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Light.ttf");
mRegularFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Regular.ttf");
mBoldFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Bold.ttf");
mProgressDialogFontColor = mContext.getResources().getColor(R.color.black);
mNightModeButton = R.drawable.white_btn_night;
break;
}
}
public static void setLightFont(TextView view) {
if (mLightFont != null) {
view.setTypeface(mLightFont);
}
}
public static void setRegularFont(TextView view) {
if (mRegularFont != null) {
view.setTypeface(mRegularFont);
}
}
public static void setBoldFont(TextView view) {
if (mBoldFont != null) {
view.setTypeface(mBoldFont);
}
}
public static void setFont(View view) {
if (view instanceof ViewGroup) {
ViewGroup vg = (ViewGroup) view;
for (int i = 0; i < vg.getChildCount(); i++) {
View child = vg.getChildAt(i);
if (child instanceof TextView) {
TextView tv = (TextView) child;
if (tv.getTypeface() != null && tv.getTypeface().getStyle() == Typeface.BOLD) {
setBoldFont((TextView) child);
} else {
setRegularFont((TextView) child);
}
}
setFont(child);
}
}
}
public static void setTextColor(View view, int color) {
if (view instanceof ViewGroup) {
ViewGroup vg = (ViewGroup) view;
for (int i = 0; i < vg.getChildCount(); i++) {
View child = vg.getChildAt(i);
if (child instanceof TextView) {
TextView tv = (TextView) child;
tv.setTextColor(color);
}
setTextColor(child, color);
}
}
}
public static void setWallpaper(View view) {
setWallpaper(view, false);
}
public static void setWallpaper(View view, boolean solid) {
if (solid) {
view.setBackgroundResource(mBackgroundDarkColor);
} else {
try {
view.setBackgroundResource(mWallpaper);
} catch (OutOfMemoryError e) {
mWallpaper = mBackgroundColor;
view.setBackgroundResource(mWallpaper);
Log.e(AnkiDroidApp.TAG, "Themes: setWallpaper: OutOfMemoryError = " + e);
}
}
}
public static void setTextViewStyle(View view) {
view.setBackgroundResource(mTextViewStyle);
}
public static void setTitleStyle(View view) {
view.setBackgroundResource(mTitleStyle);
if (view instanceof TextView) {
TextView tv = (TextView) view;
tv.setTextColor(mTitleTextColor);
if (mCurrentTheme == THEME_FLAT) {
tv.setMinLines(1);
tv.setMaxLines(2);
int height = (int) (tv.getLineHeight() / 2);
LinearLayout.LayoutParams llp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
MarginLayoutParams mlp = (MarginLayoutParams) tv.getLayoutParams();
height += mlp.bottomMargin;
llp.setMargins(0, height, 0, height);
tv.setLayoutParams(llp);
setBoldFont(tv);
}
}
}
public static void setMargins(View view, int width, int height, float dipLeft, float dipTop, float dipRight, float dipBottom) {
View parent = (View) view.getParent();
parent.setBackgroundResource(mBackgroundColor);
Class c = view.getParent().getClass();
float factor = mContext.getResources().getDisplayMetrics().density;
if (c == LinearLayout.class) {
LinearLayout.LayoutParams llp = new LinearLayout.LayoutParams(width, height);
llp.setMargins((int)(dipLeft * factor), (int)(dipTop * factor), (int)(dipRight * factor), (int)(dipBottom * factor));
view.setLayoutParams(llp);
} else if (c == FrameLayout.class) {
FrameLayout.LayoutParams llp = new FrameLayout.LayoutParams(width, height);
llp.setMargins((int)(dipLeft * factor), (int)(dipTop * factor), (int)(dipRight * factor), (int)(dipBottom * factor));
view.setLayoutParams(llp);
} else if (c == RelativeLayout.class) {
RelativeLayout.LayoutParams llp = new RelativeLayout.LayoutParams(width, height);
llp.setMargins((int)(dipLeft * factor), (int)(dipTop * factor), (int)(dipRight * factor), (int)(dipBottom * factor));
view.setLayoutParams(llp);
}
}
public static int getForegroundColor() {
return mProgressbarsFrameColor;
}
public static int getBackgroundColor() {
return mBackgroundColor;
}
public static int getDialogBackgroundColor() {
return mDialogBackgroundColor;
}
public static int getTheme() {
return mCurrentTheme;
}
public static int[] getCardBrowserBackground() {
return mCardbrowserItemBorder;
}
public static void showThemedToast(Context context, String text, boolean shortLength) {
Toast result = Toast.makeText(context, text, shortLength ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG);
try {
if (mCurrentTheme >= THEME_BLUE) {
TextView tv = new TextView(context);
tv.setBackgroundResource(mToastBackground);
tv.setTextColor(mProgressDialogFontColor);
tv.setText(text);
result.setView(tv);
}
result.show();
} catch (OutOfMemoryError e) {
Log.e(AnkiDroidApp.TAG, "showThemedToast - OutOfMemoryError occured: " + e);
result.getView().setBackgroundResource(R.color.black);
result.show();
}
}
public static StyledDialog htmlOkDialog(Context context, String title, String text) {
return htmlOkDialog(context, title, text, null, null);
}
public static StyledDialog htmlOkDialog(Context context, String title, String text, OnClickListener okListener, OnCancelListener cancelListener) {
return htmlOkDialog(context, title, text, null, null, false);
}
public static StyledDialog htmlOkDialog(Context context, String title, String text, OnClickListener okListener, OnCancelListener cancelListener, boolean includeBody) {
StyledDialog.Builder builder = new StyledDialog.Builder(context);
builder.setTitle(title);
WebView view = new WebView(context);
view.setBackgroundColor(context.getResources().getColor(mDialogBackgroundColor));
if (includeBody) {
text = "<html><body text=\"#FFFFFF\" link=\"#E37068\" alink=\"#E37068\" vlink=\"#E37068\">" + text + "</body></html>";
}
view.loadDataWithBaseURL("", text, "text/html", "UTF-8", "");
builder.setView(view, true);
builder.setPositiveButton(context.getResources().getString(R.string.ok), okListener);
builder.setCancelable(true);
builder.setOnCancelListener(cancelListener);
return builder.create();
}
public static void setStyledProgressDialogDialogBackgrounds(View main) {
View topPanel = ((View) main.findViewById(R.id.topPanel));
View contentPanel = ((View) main.findViewById(R.id.contentPanel));
if (topPanel.getVisibility() == View.VISIBLE) {
try {
topPanel.setBackgroundResource(mPopupTopDark);
((View) main.findViewById(R.id.titleDivider)).setBackgroundResource(mDividerHorizontalBright);
contentPanel.setBackgroundResource(mPopupBottomMedium);
} catch (OutOfMemoryError e) {
Log.e(AnkiDroidApp.TAG, "setStyledDialogBackgrounds - OutOfMemoryError occured: " + e);
topPanel.setBackgroundResource(R.color.black);
contentPanel.setBackgroundResource(R.color.white);
}
} else {
try {
contentPanel.setBackgroundResource(mPopupFullMedium);
} catch (OutOfMemoryError e) {
Log.e(AnkiDroidApp.TAG, "setStyledDialogBackgrounds - OutOfMemoryError occured: " + e);
contentPanel.setBackgroundResource(R.color.white);
}
}
((TextView) main.findViewById(R.id.alertTitle)).setTextColor(mProgressDialogFontColor);
((TextView) main.findViewById(R.id.message)).setTextColor(mProgressDialogFontColor);
}
public static void setStyledDialogBackgrounds(View main, int buttonNumbers) {
setStyledDialogBackgrounds(main, buttonNumbers, false);
}
public static void setStyledDialogBackgrounds(View main, int buttonNumbers, boolean brightCustomPanelBackground) {
setFont(main);
if (mCurrentTheme == THEME_WHITE) {
setTextColor(main, mContext.getResources().getColor(R.color.black));
}
// order of styled dialog elements:
// 1. top panel (title)
// 2. content panel
// 3. listview panel
// 4. custom view panel
// 5. button panel
View topPanel = ((View) main.findViewById(R.id.topPanel));
boolean[] visibility = new boolean[5];
if (topPanel.getVisibility() == View.VISIBLE) {
try {
topPanel.setBackgroundResource(mPopupTopDark);
((View) main.findViewById(R.id.titleDivider)).setBackgroundResource(mDividerHorizontalBright);
} catch (OutOfMemoryError e) {
Log.e(AnkiDroidApp.TAG, "setStyledDialogBackgrounds - OutOfMemoryError occured: " + e);
topPanel.setBackgroundResource(R.color.black);
}
visibility[0] = true;
}
View contentPanel = ((View) main.findViewById(R.id.contentPanel));
if (contentPanel.getVisibility() == View.VISIBLE) {
visibility[1] = true;
}
View listViewPanel = ((View) main.findViewById(R.id.listViewPanel));
if (listViewPanel.getVisibility() == View.VISIBLE) {
visibility[2] = true;
}
View customPanel = ((View) main.findViewById(R.id.customPanel));
if (customPanel.getVisibility() == View.VISIBLE) {
visibility[3] = true;
}
if (buttonNumbers > 0) {
LinearLayout buttonPanel = (LinearLayout) main.findViewById(R.id.buttonPanel);
try {
buttonPanel.setBackgroundResource(mPopupBottomMedium);
} catch (OutOfMemoryError e) {
Log.e(AnkiDroidApp.TAG, "setStyledDialogBackgrounds - OutOfMemoryError occured: " + e);
buttonPanel.setBackgroundResource(R.color.white);
}
if (buttonNumbers > 1) {
main.findViewById(R.id.rightSpacer).setVisibility(View.GONE);
main.findViewById(R.id.leftSpacer).setVisibility(View.GONE);
}
visibility[4] = true;
}
int first = -1;
int last = -1;
for (int i = 0; i < 5; i++) {
if (first == -1 && visibility[i]) {
first = i;
}
if (visibility[i]) {
last = i;
}
}
int res = mPopupCenterDark;
if (first == 1) {
res = mPopupTopDark;
}
if (last == 1) {
res = mPopupBottomDark;
if (first == 1) {
res = mPopupFullDark;
}
}
try {
contentPanel.setBackgroundResource(res);
} catch (OutOfMemoryError e) {
Log.e(AnkiDroidApp.TAG, "setStyledDialogBackgrounds - OutOfMemoryError occured: " + e);
contentPanel.setBackgroundResource(R.color.black);
}
res = mPopupCenterBright;
if (first == 2) {
res = mPopupTopBright;
}
if (last == 2) {
res = mPopupBottomBright;
if (first == 2) {
res = mPopupFullBright;
}
}
try {
listViewPanel.setBackgroundResource(res);
} catch (OutOfMemoryError e) {
Log.e(AnkiDroidApp.TAG, "setStyledDialogBackgrounds - OutOfMemoryError occured: " + e);
listViewPanel.setBackgroundResource(R.color.white);
}
res = brightCustomPanelBackground ? mPopupCenterMedium : mPopupCenterDark;
if (first == 3) {
res = brightCustomPanelBackground ? mPopupTopMedium : mPopupTopDark;;
}
if (last == 3) {
res = brightCustomPanelBackground ? mPopupBottomMedium : mPopupBottomDark;;
if (first == 3) {
res = brightCustomPanelBackground ? mPopupFullMedium : mPopupFullDark;;
}
}
try {
customPanel.setBackgroundResource(res);
} catch (OutOfMemoryError e) {
Log.e(AnkiDroidApp.TAG, "setStyledDialogBackgrounds - OutOfMemoryError occured: " + e);
customPanel.setBackgroundResource(brightCustomPanelBackground ? R.color.white : R.color.black);
}
}
public static int[] getChartColors() {
return mChartColors;
}
public static int getNightModeCardBackground(Context context) {
switch (mCurrentTheme) {
case THEME_BLUE:
return context.getResources().getColor(R.color.reviewer_night_card_background);
case THEME_FLAT:
return context.getResources().getColor(R.color.reviewer_night_card_background);
case THEME_WHITE:
default:
return context.getResources().getColor(R.color.black);
}
}
public static int[] setNightMode(Context context, View view, boolean nightMode) {
Resources res = context.getResources();
View flipCard = view.findViewById(R.id.flashcard_layout_flip);
View ease1 = view.findViewById(R.id.flashcard_layout_ease1);
View ease2 = view.findViewById(R.id.flashcard_layout_ease2);
View ease3 = view.findViewById(R.id.flashcard_layout_ease3);
View ease4 = view.findViewById(R.id.flashcard_layout_ease4);
View border = view.findViewById(R.id.flashcard_border);
final Drawable[] defaultButtons = new Drawable[]{flipCard.getBackground(), ease1.getBackground(), ease2.getBackground(), ease3.getBackground(), ease4.getBackground()};
int foregroundColor;
int nextTimeRecommendedColor;
if (nightMode) {
flipCard.setBackgroundResource(mNightModeButton);
ease1.setBackgroundResource(mNightModeButton);
ease2.setBackgroundResource(mNightModeButton);
ease3.setBackgroundResource(mNightModeButton);
ease4.setBackgroundResource(mNightModeButton);
foregroundColor = Color.WHITE;
nextTimeRecommendedColor = res.getColor(R.color.next_time_recommended_color_inv);
switch (mCurrentTheme) {
case THEME_BLUE:
border.setBackgroundResource(R.drawable.blue_bg_webview_night);
view.setBackgroundColor(res.getColor(R.color.background_dark_blue));
break;
case THEME_WHITE:
border.setBackgroundResource(R.drawable.white_bg_webview_night);
view.setBackgroundColor(res.getColor(R.color.white_background_night));
((View)view.getParent()).setBackgroundColor(res.getColor(R.color.white_background_night));
break;
case THEME_FLAT:
default:
view.setBackgroundColor(res.getColor(R.color.black));
break;
}
} else {
foregroundColor = Color.BLACK;
nextTimeRecommendedColor = res.getColor(R.color.next_time_recommended_color);
flipCard.setBackgroundDrawable(defaultButtons[0]);
ease1.setBackgroundDrawable(defaultButtons[1]);
ease2.setBackgroundDrawable(defaultButtons[2]);
ease3.setBackgroundDrawable(defaultButtons[3]);
ease4.setBackgroundDrawable(defaultButtons[4]);
border.setBackgroundResource(mFlashcardBorder);
}
return new int[]{foregroundColor, nextTimeRecommendedColor};
}
}
| true | true | public static void loadTheme(){
SharedPreferences preferences = PrefSettings.getSharedPrefs(mContext);
mCurrentTheme = Integer.parseInt(preferences.getString("theme", "2"));
switch (mCurrentTheme) {
case THEME_ANDROID_DARK:
mDialogBackgroundColor = R.color.card_browser_background;
mProgressbarsBackgroundColor = 0;
mProgressbarsFrameColor = 0;
mProgressbarsMatureColor = 0;
mProgressbarsYoungColor = 0;
mProgressbarsDeckpickerYoungColor = 0;
mReviewerBackground = 0;
mFlashcardBorder = 0;
mDeckpickerItemBorder = 0;
mTitleStyle = 0;
mTitleTextColor = mContext.getResources().getColor(R.color.white);
mTextViewStyle = 0;
mWallpaper = 0;
mToastBackground = 0;
mBackgroundDarkColor = 0;
mReviewerProgressbar = 0;
mCardbrowserItemBorder = new int[] {0, R.color.card_browser_marked, R.color.card_browser_suspended, R.color.card_browser_marked};
mChartColors = new int[] {Color.WHITE, Color.BLACK};
mPopupTopBright = R.drawable.popup_top_bright;
mPopupTopMedium = R.drawable.popup_top_bright;
mPopupTopDark = R.drawable.popup_top_dark;
mPopupCenterDark = R.drawable.popup_center_dark;
mPopupCenterBright = R.drawable.popup_center_bright;
mPopupCenterMedium = R.drawable.popup_center_medium;
mPopupBottomDark = R.drawable.popup_bottom_dark;
mPopupBottomBright = R.drawable.popup_bottom_bright;
mPopupBottomMedium = R.drawable.popup_bottom_medium;
mPopupFullBright = R.drawable.popup_full_bright;
mPopupFullDark = R.drawable.popup_full_dark;
mPopupFullMedium = R.drawable.popup_full_bright;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mBackgroundColor = R.color.white;
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.btn_keyboard_key_fulltrans_normal;
break;
case THEME_ANDROID_LIGHT:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_light;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_light;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = 0;
mFlashcardBorder = 0;
mDeckpickerItemBorder = 0;
mTitleStyle = 0;
mTitleTextColor = mContext.getResources().getColor(R.color.black);
mTextViewStyle = 0;
mWallpaper = 0;
mToastBackground = 0;
mBackgroundDarkColor = 0;
mDialogBackgroundColor = R.color.card_browser_background;
mCardbrowserItemBorder = new int[] {0, R.color.card_browser_marked, R.color.card_browser_suspended, R.color.card_browser_marked};
mReviewerProgressbar = mProgressbarsYoungColor;
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopDark = R.drawable.popup_top_dark;
mPopupTopBright = R.drawable.popup_top_bright;
mPopupTopMedium = R.drawable.popup_top_bright;
mPopupCenterDark = R.drawable.popup_center_dark;
mPopupCenterBright = R.drawable.popup_center_bright;
mPopupCenterMedium = R.drawable.popup_center_medium;
mPopupBottomDark = R.drawable.popup_bottom_dark;
mPopupBottomBright = R.drawable.popup_bottom_bright;
mPopupBottomMedium = R.drawable.popup_bottom_medium;
mPopupFullBright = R.drawable.popup_full_bright;
mPopupFullMedium = R.drawable.popup_full_bright;
mPopupFullDark = R.drawable.popup_full_dark;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mBackgroundColor = R.color.white;
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.btn_keyboard_key_fulltrans_normal;
break;
case THEME_BLUE:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_blue;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_blue;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = R.color.reviewer_background;
mFlashcardBorder = R.drawable.blue_bg_webview;
mDeckpickerItemBorder = R.drawable.blue_bg_deckpicker;
mTitleStyle = R.drawable.blue_title;
mTitleTextColor = mContext.getResources().getColor(R.color.black);
mTextViewStyle = R.drawable.blue_textview;
mWallpaper = R.drawable.blue_background;
mBackgroundColor = R.color.background_blue;
mToastBackground = R.drawable.blue_toast_frame;
mDialogBackgroundColor = R.color.background_dialog_blue;
mBackgroundDarkColor = R.color.background_dark_blue;
mReviewerProgressbar = R.color.reviewer_progressbar_session_blue;
mCardbrowserItemBorder = new int[] {R.drawable.blue_bg_cardbrowser, R.drawable.blue_bg_cardbrowser_marked, R.drawable.blue_bg_cardbrowser_suspended, R.drawable.blue_bg_cardbrowser_marked_suspended};
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopDark = R.drawable.blue_popup_top_dark;
mPopupTopBright = R.drawable.blue_popup_top_bright;
mPopupTopMedium = R.drawable.blue_popup_top_medium;
mPopupCenterDark = R.drawable.blue_popup_center_dark;
mPopupCenterBright = R.drawable.blue_popup_center_bright;
mPopupCenterMedium = R.drawable.blue_popup_center_medium;
mPopupBottomDark = R.drawable.blue_popup_bottom_dark;
mPopupBottomBright = R.drawable.blue_popup_bottom_bright;
mPopupBottomMedium = R.drawable.blue_popup_bottom_medium;
mPopupFullBright = R.drawable.blue_popup_full_bright;
mPopupFullMedium = R.drawable.blue_popup_full_medium;
mPopupFullDark = R.drawable.blue_popup_full_dark;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.blue_btn_night;
break;
case THEME_FLAT:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_blue;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_blue;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = R.color.reviewer_background;
mFlashcardBorder = R.drawable.blue_bg_webview;
mDeckpickerItemBorder = R.drawable.blue_bg_deckpicker;
mTitleStyle = R.drawable.flat_title;
mTitleTextColor = mContext.getResources().getColor(R.color.flat_title_color);
mTextViewStyle = R.drawable.flat_textview;
mWallpaper = R.drawable.flat_background;
mBackgroundColor = R.color.background_blue;
mToastBackground = R.drawable.blue_toast_frame;
mDialogBackgroundColor = R.color.background_dialog_blue;
mBackgroundDarkColor = R.color.background_dark_blue;
mReviewerProgressbar = R.color.reviewer_progressbar_session_blue;
mCardbrowserItemBorder = new int[] {R.drawable.blue_bg_cardbrowser, R.drawable.blue_bg_cardbrowser_marked, R.drawable.blue_bg_cardbrowser_suspended, R.drawable.blue_bg_cardbrowser_marked_suspended};
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopDark = R.drawable.blue_popup_top_dark;
mPopupTopBright = R.drawable.blue_popup_top_bright;
mPopupTopMedium = R.drawable.blue_popup_top_medium;
mPopupCenterDark = R.drawable.blue_popup_center_dark;
mPopupCenterBright = R.drawable.blue_popup_center_bright;
mPopupCenterMedium = R.drawable.blue_popup_center_medium;
mPopupBottomDark = R.drawable.blue_popup_bottom_dark;
mPopupBottomBright = R.drawable.blue_popup_bottom_bright;
mPopupBottomMedium = R.drawable.blue_popup_bottom_medium;
mPopupFullBright = R.drawable.blue_popup_full_bright;
mPopupFullMedium = R.drawable.blue_popup_full_medium;
mPopupFullDark = R.drawable.blue_popup_full_dark;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mLightFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Light.ttf");
mRegularFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Regular.ttf");
mBoldFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Bold.ttf");
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.blue_btn_night;
break;
case THEME_WHITE:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_blue;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_blue;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = R.color.white_background;
mFlashcardBorder = R.drawable.white_bg_webview;
mDeckpickerItemBorder = R.drawable.white_bg_deckpicker;
mTitleStyle = R.drawable.flat_title;
mTitleTextColor = mContext.getResources().getColor(R.color.black);
mTextViewStyle = R.drawable.white_textview_padding;
mWallpaper = R.drawable.white_wallpaper;
mBackgroundColor = R.color.white_background;
mToastBackground = R.drawable.white_toast_frame;
mDialogBackgroundColor = mBackgroundColor;
mBackgroundDarkColor = R.color.background_dark_blue;
mReviewerProgressbar = R.color.reviewer_progressbar_session_blue;
mCardbrowserItemBorder = new int[] {R.drawable.white_bg_cardbrowser, R.drawable.white_bg_cardbrowser_marked, R.drawable.white_bg_cardbrowser_suspended, R.drawable.white_bg_cardbrowser_marked_suspended};
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopBright = R.drawable.white_popup_top_bright;
mPopupTopMedium = R.drawable.white_popup_top_medium;
mPopupTopDark = mPopupTopMedium;
mPopupCenterDark = R.drawable.white_popup_center_bright;
mPopupCenterBright = R.drawable.white_popup_center_bright;
mPopupCenterMedium = R.drawable.white_popup_center_medium;
mPopupBottomBright = R.drawable.white_popup_bottom_bright;
mPopupBottomDark = mPopupBottomBright;
mPopupBottomMedium = R.drawable.white_popup_bottom_medium;
mPopupFullBright = R.drawable.white_popup_full_bright;
mPopupFullMedium = R.drawable.white_popup_full_medium;
mPopupFullDark = mPopupFullBright;
mDividerHorizontalBright = R.drawable.white_dialog_divider;
mLightFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Light.ttf");
mRegularFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Regular.ttf");
mBoldFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Bold.ttf");
mProgressDialogFontColor = mContext.getResources().getColor(R.color.black);
mNightModeButton = R.drawable.white_btn_night;
break;
}
}
| public static void loadTheme(){
SharedPreferences preferences = PrefSettings.getSharedPrefs(mContext);
mCurrentTheme = Integer.parseInt(preferences.getString("theme", "2"));
switch (mCurrentTheme) {
case THEME_ANDROID_DARK:
mDialogBackgroundColor = R.color.card_browser_background;
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_default;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_default;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_default;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_default;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_dark;
mReviewerBackground = 0;
mFlashcardBorder = 0;
mDeckpickerItemBorder = 0;
mTitleStyle = 0;
mTitleTextColor = mContext.getResources().getColor(R.color.white);
mTextViewStyle = 0;
mWallpaper = 0;
mToastBackground = 0;
mBackgroundDarkColor = 0;
mReviewerProgressbar = 0;
mCardbrowserItemBorder = new int[] {0, R.color.card_browser_marked, R.color.card_browser_suspended, R.color.card_browser_marked};
mChartColors = new int[] {Color.WHITE, Color.BLACK};
mPopupTopBright = R.drawable.popup_top_bright;
mPopupTopMedium = R.drawable.popup_top_bright;
mPopupTopDark = R.drawable.popup_top_dark;
mPopupCenterDark = R.drawable.popup_center_dark;
mPopupCenterBright = R.drawable.popup_center_bright;
mPopupCenterMedium = R.drawable.popup_center_medium;
mPopupBottomDark = R.drawable.popup_bottom_dark;
mPopupBottomBright = R.drawable.popup_bottom_bright;
mPopupBottomMedium = R.drawable.popup_bottom_medium;
mPopupFullBright = R.drawable.popup_full_bright;
mPopupFullDark = R.drawable.popup_full_dark;
mPopupFullMedium = R.drawable.popup_full_bright;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mBackgroundColor = R.color.white;
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.btn_keyboard_key_fulltrans_normal;
break;
case THEME_ANDROID_LIGHT:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_light;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_light;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = 0;
mFlashcardBorder = 0;
mDeckpickerItemBorder = 0;
mTitleStyle = 0;
mTitleTextColor = mContext.getResources().getColor(R.color.black);
mTextViewStyle = 0;
mWallpaper = 0;
mToastBackground = 0;
mBackgroundDarkColor = 0;
mDialogBackgroundColor = R.color.card_browser_background;
mCardbrowserItemBorder = new int[] {0, R.color.card_browser_marked, R.color.card_browser_suspended, R.color.card_browser_marked};
mReviewerProgressbar = mProgressbarsYoungColor;
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopDark = R.drawable.popup_top_dark;
mPopupTopBright = R.drawable.popup_top_bright;
mPopupTopMedium = R.drawable.popup_top_bright;
mPopupCenterDark = R.drawable.popup_center_dark;
mPopupCenterBright = R.drawable.popup_center_bright;
mPopupCenterMedium = R.drawable.popup_center_medium;
mPopupBottomDark = R.drawable.popup_bottom_dark;
mPopupBottomBright = R.drawable.popup_bottom_bright;
mPopupBottomMedium = R.drawable.popup_bottom_medium;
mPopupFullBright = R.drawable.popup_full_bright;
mPopupFullMedium = R.drawable.popup_full_bright;
mPopupFullDark = R.drawable.popup_full_dark;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mBackgroundColor = R.color.white;
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.btn_keyboard_key_fulltrans_normal;
break;
case THEME_BLUE:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_blue;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_blue;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = R.color.reviewer_background;
mFlashcardBorder = R.drawable.blue_bg_webview;
mDeckpickerItemBorder = R.drawable.blue_bg_deckpicker;
mTitleStyle = R.drawable.blue_title;
mTitleTextColor = mContext.getResources().getColor(R.color.black);
mTextViewStyle = R.drawable.blue_textview;
mWallpaper = R.drawable.blue_background;
mBackgroundColor = R.color.background_blue;
mToastBackground = R.drawable.blue_toast_frame;
mDialogBackgroundColor = R.color.background_dialog_blue;
mBackgroundDarkColor = R.color.background_dark_blue;
mReviewerProgressbar = R.color.reviewer_progressbar_session_blue;
mCardbrowserItemBorder = new int[] {R.drawable.blue_bg_cardbrowser, R.drawable.blue_bg_cardbrowser_marked, R.drawable.blue_bg_cardbrowser_suspended, R.drawable.blue_bg_cardbrowser_marked_suspended};
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopDark = R.drawable.blue_popup_top_dark;
mPopupTopBright = R.drawable.blue_popup_top_bright;
mPopupTopMedium = R.drawable.blue_popup_top_medium;
mPopupCenterDark = R.drawable.blue_popup_center_dark;
mPopupCenterBright = R.drawable.blue_popup_center_bright;
mPopupCenterMedium = R.drawable.blue_popup_center_medium;
mPopupBottomDark = R.drawable.blue_popup_bottom_dark;
mPopupBottomBright = R.drawable.blue_popup_bottom_bright;
mPopupBottomMedium = R.drawable.blue_popup_bottom_medium;
mPopupFullBright = R.drawable.blue_popup_full_bright;
mPopupFullMedium = R.drawable.blue_popup_full_medium;
mPopupFullDark = R.drawable.blue_popup_full_dark;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.blue_btn_night;
break;
case THEME_FLAT:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_blue;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_blue;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = R.color.reviewer_background;
mFlashcardBorder = R.drawable.blue_bg_webview;
mDeckpickerItemBorder = R.drawable.blue_bg_deckpicker;
mTitleStyle = R.drawable.flat_title;
mTitleTextColor = mContext.getResources().getColor(R.color.flat_title_color);
mTextViewStyle = R.drawable.flat_textview;
mWallpaper = R.drawable.flat_background;
mBackgroundColor = R.color.background_blue;
mToastBackground = R.drawable.blue_toast_frame;
mDialogBackgroundColor = R.color.background_dialog_blue;
mBackgroundDarkColor = R.color.background_dark_blue;
mReviewerProgressbar = R.color.reviewer_progressbar_session_blue;
mCardbrowserItemBorder = new int[] {R.drawable.blue_bg_cardbrowser, R.drawable.blue_bg_cardbrowser_marked, R.drawable.blue_bg_cardbrowser_suspended, R.drawable.blue_bg_cardbrowser_marked_suspended};
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopDark = R.drawable.blue_popup_top_dark;
mPopupTopBright = R.drawable.blue_popup_top_bright;
mPopupTopMedium = R.drawable.blue_popup_top_medium;
mPopupCenterDark = R.drawable.blue_popup_center_dark;
mPopupCenterBright = R.drawable.blue_popup_center_bright;
mPopupCenterMedium = R.drawable.blue_popup_center_medium;
mPopupBottomDark = R.drawable.blue_popup_bottom_dark;
mPopupBottomBright = R.drawable.blue_popup_bottom_bright;
mPopupBottomMedium = R.drawable.blue_popup_bottom_medium;
mPopupFullBright = R.drawable.blue_popup_full_bright;
mPopupFullMedium = R.drawable.blue_popup_full_medium;
mPopupFullDark = R.drawable.blue_popup_full_dark;
mDividerHorizontalBright = R.drawable.blue_divider_horizontal_bright;
mLightFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Light.ttf");
mRegularFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Regular.ttf");
mBoldFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Bold.ttf");
mProgressDialogFontColor = mContext.getResources().getColor(R.color.white);
mNightModeButton = R.drawable.blue_btn_night;
break;
case THEME_WHITE:
mProgressbarsBackgroundColor = R.color.studyoptions_progressbar_background_blue;
mProgressbarsFrameColor = R.color.studyoptions_progressbar_frame_light;
mProgressbarsMatureColor = R.color.studyoptions_progressbar_mature_light;
mProgressbarsYoungColor = R.color.studyoptions_progressbar_young_blue;
mProgressbarsDeckpickerYoungColor = R.color.deckpicker_progressbar_young_light;
mReviewerBackground = R.color.white_background;
mFlashcardBorder = R.drawable.white_bg_webview;
mDeckpickerItemBorder = R.drawable.white_bg_deckpicker;
mTitleStyle = R.drawable.flat_title;
mTitleTextColor = mContext.getResources().getColor(R.color.black);
mTextViewStyle = R.drawable.white_textview_padding;
mWallpaper = R.drawable.white_wallpaper;
mBackgroundColor = R.color.white_background;
mToastBackground = R.drawable.white_toast_frame;
mDialogBackgroundColor = mBackgroundColor;
mBackgroundDarkColor = R.color.background_dark_blue;
mReviewerProgressbar = R.color.reviewer_progressbar_session_blue;
mCardbrowserItemBorder = new int[] {R.drawable.white_bg_cardbrowser, R.drawable.white_bg_cardbrowser_marked, R.drawable.white_bg_cardbrowser_suspended, R.drawable.white_bg_cardbrowser_marked_suspended};
mChartColors = new int[] {Color.BLACK, Color.WHITE};
mPopupTopBright = R.drawable.white_popup_top_bright;
mPopupTopMedium = R.drawable.white_popup_top_medium;
mPopupTopDark = mPopupTopMedium;
mPopupCenterDark = R.drawable.white_popup_center_bright;
mPopupCenterBright = R.drawable.white_popup_center_bright;
mPopupCenterMedium = R.drawable.white_popup_center_medium;
mPopupBottomBright = R.drawable.white_popup_bottom_bright;
mPopupBottomDark = mPopupBottomBright;
mPopupBottomMedium = R.drawable.white_popup_bottom_medium;
mPopupFullBright = R.drawable.white_popup_full_bright;
mPopupFullMedium = R.drawable.white_popup_full_medium;
mPopupFullDark = mPopupFullBright;
mDividerHorizontalBright = R.drawable.white_dialog_divider;
mLightFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Light.ttf");
mRegularFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Regular.ttf");
mBoldFont = Typeface.createFromAsset(mContext.getAssets(), "fonts/OpenSans-Bold.ttf");
mProgressDialogFontColor = mContext.getResources().getColor(R.color.black);
mNightModeButton = R.drawable.white_btn_night;
break;
}
}
|
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java b/src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java
index 2dd7ff5f..9d4d44d7 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java
@@ -1,141 +1,141 @@
/**
* $Revision: $
* $Date: $
*
* Copyright (C) 2006 Jive Software. All rights reserved.
*
* This software is published under the terms of the GNU Lesser Public License (LGPL),
* a copy of which is included in this distribution.
*/
package org.jivesoftware.sparkimpl.plugin.chat;
import org.jivesoftware.resource.Res;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.packet.Presence.Type;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.spark.ChatManager;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.plugin.ContextMenuListener;
import org.jivesoftware.spark.plugin.Plugin;
import org.jivesoftware.spark.ui.ChatRoom;
import org.jivesoftware.spark.ui.ContactItem;
import org.jivesoftware.spark.ui.ContactList;
import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.JPopupMenu;
public class PresenceChangePlugin implements Plugin {
private final Set contacts = new HashSet();
public void initialize() {
// Listen for right-clicks on ContactItem
final ContactList contactList = SparkManager.getWorkspace().getContactList();
final Action listenAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) {
ContactItem item = (ContactItem)contactList.getSelectedUsers().iterator().next();
contacts.add(item);
}
};
listenAction.putValue(Action.NAME, Res.getString("menuitem.alert.when.online"));
listenAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_ALARM_CLOCK));
final Action removeAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) {
ContactItem item = (ContactItem)contactList.getSelectedUsers().iterator().next();
contacts.remove(item);
}
};
removeAction.putValue(Action.NAME, Res.getString("menuitem.remove.alert.when.online"));
removeAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_DELETE));
contactList.addContextMenuListener(new ContextMenuListener() {
public void poppingUp(Object object, JPopupMenu popup) {
if (object instanceof ContactItem) {
ContactItem item = (ContactItem)object;
- if (item.getPresence() == null || (item.getPresence().getMode() != Presence.Mode.available && item.getPresence().getMode() != Presence.Mode.chat)) {
+ if (!item.isAvailable() || (item.getPresence().getMode() != Presence.Mode.available && item.getPresence().getMode() != Presence.Mode.chat)) {
if (contacts.contains(item)) {
popup.add(removeAction);
}
else {
popup.add(listenAction);
}
}
}
}
public void poppingDown(JPopupMenu popup) {
}
public boolean handleDefaultAction(MouseEvent e) {
return false;
}
});
// Check presence changes
SparkManager.getConnection().addPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
Presence presence = (Presence)packet;
if (!presence.isAvailable()) {
return;
}
String from = presence.getFrom();
final Iterator contactItems = new ArrayList(contacts).iterator();
while (contactItems.hasNext()) {
ContactItem item = (ContactItem)contactItems.next();
if (item.getFullJID().equals(StringUtils.parseBareAddress(from))) {
contacts.remove(item);
ChatManager chatManager = SparkManager.getChatManager();
ChatRoom chatRoom = chatManager.createChatRoom(item.getFullJID(), item.getNickname(), item.getNickname());
String time = SparkManager.DATE_SECOND_FORMATTER.format(new Date());
String infoText = Res.getString("message.user.now.available.to.chat", item.getNickname(), time);
chatRoom.getTranscriptWindow().insertNotificationMessage(infoText, ChatManager.NOTIFICATION_COLOR);
Message message = new Message();
message.setFrom(item.getFullJID());
message.setBody(infoText);
chatManager.getChatContainer().messageReceived(chatRoom, message);
}
}
}
}, new PacketTypeFilter(Presence.class));
}
public void shutdown() {
}
public boolean canShutDown() {
return true;
}
public void uninstall() {
// Do nothing.
}
}
| true | true | public void initialize() {
// Listen for right-clicks on ContactItem
final ContactList contactList = SparkManager.getWorkspace().getContactList();
final Action listenAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) {
ContactItem item = (ContactItem)contactList.getSelectedUsers().iterator().next();
contacts.add(item);
}
};
listenAction.putValue(Action.NAME, Res.getString("menuitem.alert.when.online"));
listenAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_ALARM_CLOCK));
final Action removeAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) {
ContactItem item = (ContactItem)contactList.getSelectedUsers().iterator().next();
contacts.remove(item);
}
};
removeAction.putValue(Action.NAME, Res.getString("menuitem.remove.alert.when.online"));
removeAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_DELETE));
contactList.addContextMenuListener(new ContextMenuListener() {
public void poppingUp(Object object, JPopupMenu popup) {
if (object instanceof ContactItem) {
ContactItem item = (ContactItem)object;
if (item.getPresence() == null || (item.getPresence().getMode() != Presence.Mode.available && item.getPresence().getMode() != Presence.Mode.chat)) {
if (contacts.contains(item)) {
popup.add(removeAction);
}
else {
popup.add(listenAction);
}
}
}
}
public void poppingDown(JPopupMenu popup) {
}
public boolean handleDefaultAction(MouseEvent e) {
return false;
}
});
// Check presence changes
SparkManager.getConnection().addPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
Presence presence = (Presence)packet;
if (!presence.isAvailable()) {
return;
}
String from = presence.getFrom();
final Iterator contactItems = new ArrayList(contacts).iterator();
while (contactItems.hasNext()) {
ContactItem item = (ContactItem)contactItems.next();
if (item.getFullJID().equals(StringUtils.parseBareAddress(from))) {
contacts.remove(item);
ChatManager chatManager = SparkManager.getChatManager();
ChatRoom chatRoom = chatManager.createChatRoom(item.getFullJID(), item.getNickname(), item.getNickname());
String time = SparkManager.DATE_SECOND_FORMATTER.format(new Date());
String infoText = Res.getString("message.user.now.available.to.chat", item.getNickname(), time);
chatRoom.getTranscriptWindow().insertNotificationMessage(infoText, ChatManager.NOTIFICATION_COLOR);
Message message = new Message();
message.setFrom(item.getFullJID());
message.setBody(infoText);
chatManager.getChatContainer().messageReceived(chatRoom, message);
}
}
}
}, new PacketTypeFilter(Presence.class));
}
| public void initialize() {
// Listen for right-clicks on ContactItem
final ContactList contactList = SparkManager.getWorkspace().getContactList();
final Action listenAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) {
ContactItem item = (ContactItem)contactList.getSelectedUsers().iterator().next();
contacts.add(item);
}
};
listenAction.putValue(Action.NAME, Res.getString("menuitem.alert.when.online"));
listenAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_ALARM_CLOCK));
final Action removeAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) {
ContactItem item = (ContactItem)contactList.getSelectedUsers().iterator().next();
contacts.remove(item);
}
};
removeAction.putValue(Action.NAME, Res.getString("menuitem.remove.alert.when.online"));
removeAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_DELETE));
contactList.addContextMenuListener(new ContextMenuListener() {
public void poppingUp(Object object, JPopupMenu popup) {
if (object instanceof ContactItem) {
ContactItem item = (ContactItem)object;
if (!item.isAvailable() || (item.getPresence().getMode() != Presence.Mode.available && item.getPresence().getMode() != Presence.Mode.chat)) {
if (contacts.contains(item)) {
popup.add(removeAction);
}
else {
popup.add(listenAction);
}
}
}
}
public void poppingDown(JPopupMenu popup) {
}
public boolean handleDefaultAction(MouseEvent e) {
return false;
}
});
// Check presence changes
SparkManager.getConnection().addPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
Presence presence = (Presence)packet;
if (!presence.isAvailable()) {
return;
}
String from = presence.getFrom();
final Iterator contactItems = new ArrayList(contacts).iterator();
while (contactItems.hasNext()) {
ContactItem item = (ContactItem)contactItems.next();
if (item.getFullJID().equals(StringUtils.parseBareAddress(from))) {
contacts.remove(item);
ChatManager chatManager = SparkManager.getChatManager();
ChatRoom chatRoom = chatManager.createChatRoom(item.getFullJID(), item.getNickname(), item.getNickname());
String time = SparkManager.DATE_SECOND_FORMATTER.format(new Date());
String infoText = Res.getString("message.user.now.available.to.chat", item.getNickname(), time);
chatRoom.getTranscriptWindow().insertNotificationMessage(infoText, ChatManager.NOTIFICATION_COLOR);
Message message = new Message();
message.setFrom(item.getFullJID());
message.setBody(infoText);
chatManager.getChatContainer().messageReceived(chatRoom, message);
}
}
}
}, new PacketTypeFilter(Presence.class));
}
|
diff --git a/src/main/java/com/cathive/fx/guice/FxApplicationThreadMethodInterceptor.java b/src/main/java/com/cathive/fx/guice/FxApplicationThreadMethodInterceptor.java
index 6675fa9..6256304 100755
--- a/src/main/java/com/cathive/fx/guice/FxApplicationThreadMethodInterceptor.java
+++ b/src/main/java/com/cathive/fx/guice/FxApplicationThreadMethodInterceptor.java
@@ -1,93 +1,93 @@
/*
* Copyright (C) 2012 The Cat Hive Developers.
*
* 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.cathive.fx.guice;
import javafx.application.Platform;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
/**
* This class can be used as an AOP interceptor in conjunction with the
* {@link FxApplicationThread} annotation. It enforces method calls on the
* JavaFX Application Thread.
* <p>Basically, this class offers some wrapper functionality around
* the {@link Platform#runLater(Runnable) runLater()-Method} provided by
* the JavaFX Platform class.</p>
*
* @see FxApplicationThread
* @see Platform#runLater(Runnable)
*
* @author Benjamin P. Jung
*/
public class FxApplicationThreadMethodInterceptor implements MethodInterceptor {
@Override
public Object invoke(MethodInvocation invocation) throws Throwable {
final FxApplicationThread annotation = invocation.getMethod().getAnnotation(FxApplicationThread.class);
final FxTask fxTask = new FxTask(invocation);
if (annotation == null) {
throw new IllegalStateException("Method is not annotated with '@FxApplicationThread'!");
}
if (!invocation.getMethod().getReturnType().equals(Void.class)) {
throw new RuntimeException(String.format("[%s#%s] Only methods with return type 'void' can be annotated with @FXApplicationThread!", invocation.getThis().getClass().getName(), invocation.getMethod().getName()));
}
if (invocation.getMethod().getExceptionTypes().length > 0) {
- throw new RuntimeException("Only methods that don't declare exception types can be annotated with @RunOnFxApplicationThread!");
+ throw new RuntimeException("Only methods that don't declare exception types can be annotated with @FXApplicationThread!");
}
final Object retval;
if (Platform.isFxApplicationThread()) {
retval = invocation.proceed();
} else {
Platform.runLater(fxTask);
retval = null;
}
return retval;
}
/**
*
* @author Benjamin P. Jung
*/
private static class FxTask implements Runnable {
private final MethodInvocation methodInvocation;
private Object returnValue;
private FxTask(MethodInvocation methodInvocation) {
super();
this.methodInvocation = methodInvocation;
}
@Override
public void run() {
try {
this.returnValue = methodInvocation.proceed();
} catch (Throwable t) {
throw new RuntimeException(t);
}
}
}
}
| true | true | public Object invoke(MethodInvocation invocation) throws Throwable {
final FxApplicationThread annotation = invocation.getMethod().getAnnotation(FxApplicationThread.class);
final FxTask fxTask = new FxTask(invocation);
if (annotation == null) {
throw new IllegalStateException("Method is not annotated with '@FxApplicationThread'!");
}
if (!invocation.getMethod().getReturnType().equals(Void.class)) {
throw new RuntimeException(String.format("[%s#%s] Only methods with return type 'void' can be annotated with @FXApplicationThread!", invocation.getThis().getClass().getName(), invocation.getMethod().getName()));
}
if (invocation.getMethod().getExceptionTypes().length > 0) {
throw new RuntimeException("Only methods that don't declare exception types can be annotated with @RunOnFxApplicationThread!");
}
final Object retval;
if (Platform.isFxApplicationThread()) {
retval = invocation.proceed();
} else {
Platform.runLater(fxTask);
retval = null;
}
return retval;
}
| public Object invoke(MethodInvocation invocation) throws Throwable {
final FxApplicationThread annotation = invocation.getMethod().getAnnotation(FxApplicationThread.class);
final FxTask fxTask = new FxTask(invocation);
if (annotation == null) {
throw new IllegalStateException("Method is not annotated with '@FxApplicationThread'!");
}
if (!invocation.getMethod().getReturnType().equals(Void.class)) {
throw new RuntimeException(String.format("[%s#%s] Only methods with return type 'void' can be annotated with @FXApplicationThread!", invocation.getThis().getClass().getName(), invocation.getMethod().getName()));
}
if (invocation.getMethod().getExceptionTypes().length > 0) {
throw new RuntimeException("Only methods that don't declare exception types can be annotated with @FXApplicationThread!");
}
final Object retval;
if (Platform.isFxApplicationThread()) {
retval = invocation.proceed();
} else {
Platform.runLater(fxTask);
retval = null;
}
return retval;
}
|
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index d6ebb0a5..c7d85830 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -1,718 +1,718 @@
/*
* 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.camera;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.admin.DevicePolicyManager;
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.RectF;
import android.hardware.Camera;
import android.hardware.Camera.CameraInfo;
import android.hardware.Camera.Parameters;
import android.hardware.Camera.Size;
import android.location.Location;
import android.net.Uri;
import android.os.Build;
import android.os.ParcelFileDescriptor;
import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Display;
import android.view.OrientationEventListener;
import android.view.Surface;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.StringTokenizer;
/**
* Collection of utility functions used in this package.
*/
public class Util {
private static final String TAG = "Util";
private static final int DIRECTION_LEFT = 0;
private static final int DIRECTION_RIGHT = 1;
private static final int DIRECTION_UP = 2;
private static final int DIRECTION_DOWN = 3;
// The brightness setting used when it is set to automatic in the system.
// The reason why it is set to 0.7 is just because 1.0 is too bright.
// Use the same setting among the Camera, VideoCamera and Panorama modes.
private static final float DEFAULT_CAMERA_BRIGHTNESS = 0.7f;
// Orientation hysteresis amount used in rounding, in degrees
public static final int ORIENTATION_HYSTERESIS = 5;
public static final String REVIEW_ACTION = "com.android.camera.action.REVIEW";
// Private intent extras. Test only.
private static final String EXTRAS_CAMERA_FACING =
"android.intent.extras.CAMERA_FACING";
private static boolean sIsTabletUI;
private static float sPixelDensity = 1;
private static ImageFileNamer sImageFileNamer;
private Util() {
}
public static void initialize(Context context) {
sIsTabletUI = (context.getResources().getConfiguration().smallestScreenWidthDp >= 600);
DisplayMetrics metrics = new DisplayMetrics();
WindowManager wm = (WindowManager)
context.getSystemService(Context.WINDOW_SERVICE);
wm.getDefaultDisplay().getMetrics(metrics);
sPixelDensity = metrics.density;
sImageFileNamer = new ImageFileNamer(
context.getString(R.string.image_file_name_format));
}
public static boolean isTabletUI() {
return sIsTabletUI;
}
public static int dpToPixel(int dp) {
return Math.round(sPixelDensity * dp);
}
// Rotates the bitmap by the specified degree.
// If a new bitmap is created, the original bitmap is recycled.
public static Bitmap rotate(Bitmap b, int degrees) {
return rotateAndMirror(b, degrees, false);
}
// Rotates and/or mirrors the bitmap. If a new bitmap is created, the
// original bitmap is recycled.
public static Bitmap rotateAndMirror(Bitmap b, int degrees, boolean mirror) {
if ((degrees != 0 || mirror) && b != null) {
Matrix m = new Matrix();
// Mirror first.
// horizontal flip + rotation = -rotation + horizontal flip
if (mirror) {
m.postScale(-1, 1);
degrees = (degrees + 360) % 360;
if (degrees == 0 || degrees == 180) {
m.postTranslate((float) b.getWidth(), 0);
} else if (degrees == 90 || degrees == 270) {
m.postTranslate((float) b.getHeight(), 0);
} else {
throw new IllegalArgumentException("Invalid degrees=" + degrees);
}
}
if (degrees != 0) {
// clockwise
m.postRotate(degrees,
(float) b.getWidth() / 2, (float) b.getHeight() / 2);
}
try {
Bitmap b2 = Bitmap.createBitmap(
b, 0, 0, b.getWidth(), b.getHeight(), m, true);
if (b != b2) {
b.recycle();
b = b2;
}
} catch (OutOfMemoryError ex) {
// We have no memory to rotate. Return the original bitmap.
}
}
return b;
}
/*
* Compute the sample size as a function of minSideLength
* and maxNumOfPixels.
* minSideLength is used to specify that minimal width or height of a
* bitmap.
* maxNumOfPixels is used to specify the maximal size in pixels that is
* tolerable in terms of memory usage.
*
* The function returns a sample size based on the constraints.
* Both size and minSideLength can be passed in as -1
* which indicates no care of the corresponding constraint.
* The functions prefers returning a sample size that
* generates a smaller bitmap, unless minSideLength = -1.
*
* Also, the function rounds up the sample size to a power of 2 or multiple
* of 8 because BitmapFactory only honors sample size this way.
* For example, BitmapFactory downsamples an image by 2 even though the
* request is 3. So we round up the sample size to avoid OOM.
*/
public static int computeSampleSize(BitmapFactory.Options options,
int minSideLength, int maxNumOfPixels) {
int initialSize = computeInitialSampleSize(options, minSideLength,
maxNumOfPixels);
int roundedSize;
if (initialSize <= 8) {
roundedSize = 1;
while (roundedSize < initialSize) {
roundedSize <<= 1;
}
} else {
roundedSize = (initialSize + 7) / 8 * 8;
}
return roundedSize;
}
private static int computeInitialSampleSize(BitmapFactory.Options options,
int minSideLength, int maxNumOfPixels) {
double w = options.outWidth;
double h = options.outHeight;
int lowerBound = (maxNumOfPixels < 0) ? 1 :
(int) Math.ceil(Math.sqrt(w * h / maxNumOfPixels));
int upperBound = (minSideLength < 0) ? 128 :
(int) Math.min(Math.floor(w / minSideLength),
Math.floor(h / minSideLength));
if (upperBound < lowerBound) {
// return the larger one when there is no overlapping zone.
return lowerBound;
}
if (maxNumOfPixels < 0 && minSideLength < 0) {
return 1;
} else if (minSideLength < 0) {
return lowerBound;
} else {
return upperBound;
}
}
public static Bitmap makeBitmap(byte[] jpegData, int maxNumOfPixels) {
try {
BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length,
options);
if (options.mCancel || options.outWidth == -1
|| options.outHeight == -1) {
return null;
}
options.inSampleSize = computeSampleSize(
options, -1, maxNumOfPixels);
options.inJustDecodeBounds = false;
options.inDither = false;
options.inPreferredConfig = Bitmap.Config.ARGB_8888;
return BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length,
options);
} catch (OutOfMemoryError ex) {
Log.e(TAG, "Got oom exception ", ex);
return null;
}
}
public static void closeSilently(Closeable c) {
if (c == null) return;
try {
c.close();
} catch (Throwable t) {
// do nothing
}
}
public static void Assert(boolean cond) {
if (!cond) {
throw new AssertionError();
}
}
public static android.hardware.Camera openCamera(Activity activity, int cameraId)
throws CameraHardwareException, CameraDisabledException {
// Check if device policy has disabled the camera.
DevicePolicyManager dpm = (DevicePolicyManager) activity.getSystemService(
Context.DEVICE_POLICY_SERVICE);
if (dpm.getCameraDisabled(null)) {
throw new CameraDisabledException();
}
try {
return CameraHolder.instance().open(cameraId);
} catch (CameraHardwareException e) {
// In eng build, we throw the exception so that test tool
// can detect it and report it
if ("eng".equals(Build.TYPE)) {
throw new RuntimeException("openCamera failed", e);
} else {
throw e;
}
}
}
public static void showErrorAndFinish(final Activity activity, int msgId) {
DialogInterface.OnClickListener buttonListener =
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
activity.finish();
}
};
new AlertDialog.Builder(activity)
.setCancelable(false)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.camera_error_title)
.setMessage(msgId)
.setNeutralButton(R.string.dialog_ok, buttonListener)
.show();
}
public static <T> T checkNotNull(T object) {
if (object == null) throw new NullPointerException();
return object;
}
public static boolean equals(Object a, Object b) {
return (a == b) || (a == null ? false : a.equals(b));
}
public static int nextPowerOf2(int n) {
n -= 1;
n |= n >>> 16;
n |= n >>> 8;
n |= n >>> 4;
n |= n >>> 2;
n |= n >>> 1;
return n + 1;
}
public static float distance(float x, float y, float sx, float sy) {
float dx = x - sx;
float dy = y - sy;
return (float) Math.sqrt(dx * dx + dy * dy);
}
public static int clamp(int x, int min, int max) {
if (x > max) return max;
if (x < min) return min;
return x;
}
public static int getDisplayRotation(Activity activity) {
int rotation = activity.getWindowManager().getDefaultDisplay()
.getRotation();
switch (rotation) {
case Surface.ROTATION_0: return 0;
case Surface.ROTATION_90: return 90;
case Surface.ROTATION_180: return 180;
case Surface.ROTATION_270: return 270;
}
return 0;
}
public static int getDisplayOrientation(int degrees, int cameraId) {
// See android.hardware.Camera.setDisplayOrientation for
// documentation.
Camera.CameraInfo info = new Camera.CameraInfo();
Camera.getCameraInfo(cameraId, info);
int result;
if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
result = (info.orientation + degrees) % 360;
result = (360 - result) % 360; // compensate the mirror
} else { // back-facing
result = (info.orientation - degrees + 360) % 360;
}
return result;
}
public static int getCameraOrientation(int cameraId) {
Camera.CameraInfo info = new Camera.CameraInfo();
Camera.getCameraInfo(cameraId, info);
return info.orientation;
}
public static int roundOrientation(int orientation, int orientationHistory) {
boolean changeOrientation = false;
if (orientationHistory == OrientationEventListener.ORIENTATION_UNKNOWN) {
changeOrientation = true;
} else {
int dist = Math.abs(orientation - orientationHistory);
dist = Math.min( dist, 360 - dist );
changeOrientation = ( dist >= 45 + ORIENTATION_HYSTERESIS );
}
if (changeOrientation) {
return ((orientation + 45) / 90 * 90) % 360;
}
return orientationHistory;
}
public static Size getOptimalPreviewSize(Activity currentActivity,
List<Size> sizes, double targetRatio) {
- // Use a very small tolerance because we want an exact match.
- final double ASPECT_TOLERANCE = 0.001;
+ // Not too small tolerance, some camera use 848, 854 or 864 for 480p
+ final double ASPECT_TOLERANCE = 0.05;
if (sizes == null) return null;
Size optimalSize = null;
double minDiff = Double.MAX_VALUE;
// Because of bugs of overlay and layout, we sometimes will try to
// layout the viewfinder in the portrait orientation and thus get the
// wrong size of mSurfaceView. When we change the preview size, the
// new overlay will be created before the old one closed, which causes
// an exception. For now, just get the screen size
Display display = currentActivity.getWindowManager().getDefaultDisplay();
int targetHeight = Math.min(display.getHeight(), display.getWidth());
if (targetHeight <= 0) {
// We don't know the size of SurfaceView, use screen height
targetHeight = display.getHeight();
}
// Try to find an size match aspect ratio and size
for (Size size : sizes) {
double ratio = (double) size.width / size.height;
if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
if (Math.abs(size.height - targetHeight) < minDiff) {
optimalSize = size;
minDiff = Math.abs(size.height - targetHeight);
}
}
// Cannot find the one match the aspect ratio. This should not happen.
// Ignore the requirement.
if (optimalSize == null) {
Log.w(TAG, "No preview size match the aspect ratio");
minDiff = Double.MAX_VALUE;
for (Size size : sizes) {
if (Math.abs(size.height - targetHeight) < minDiff) {
optimalSize = size;
minDiff = Math.abs(size.height - targetHeight);
}
}
}
return optimalSize;
}
// Returns the largest picture size which matches the given aspect ratio.
public static Size getOptimalVideoSnapshotPictureSize(
List<Size> sizes, double targetRatio) {
// Use a very small tolerance because we want an exact match.
final double ASPECT_TOLERANCE = 0.001;
if (sizes == null) return null;
Size optimalSize = null;
// Try to find a size matches aspect ratio and has the largest width
for (Size size : sizes) {
double ratio = (double) size.width / size.height;
if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
if (optimalSize == null || size.width > optimalSize.width) {
optimalSize = size;
}
}
// Cannot find one that matches the aspect ratio. This should not happen.
// Ignore the requirement.
if (optimalSize == null) {
Log.w(TAG, "No picture size match the aspect ratio");
for (Size size : sizes) {
if (optimalSize == null || size.width > optimalSize.width) {
optimalSize = size;
}
}
}
return optimalSize;
}
public static void dumpParameters(Parameters parameters) {
String flattened = parameters.flatten();
StringTokenizer tokenizer = new StringTokenizer(flattened, ";");
Log.d(TAG, "Dump all camera parameters:");
while (tokenizer.hasMoreElements()) {
Log.d(TAG, tokenizer.nextToken());
}
}
/**
* Returns whether the device is voice-capable (meaning, it can do MMS).
*/
public static boolean isMmsCapable(Context context) {
TelephonyManager telephonyManager = (TelephonyManager)
context.getSystemService(Context.TELEPHONY_SERVICE);
if (telephonyManager == null) {
return false;
}
try {
Class partypes[] = new Class[0];
Method sIsVoiceCapable = TelephonyManager.class.getMethod(
"isVoiceCapable", partypes);
Object arglist[] = new Object[0];
Object retobj = sIsVoiceCapable.invoke(telephonyManager, arglist);
return (Boolean) retobj;
} catch (java.lang.reflect.InvocationTargetException ite) {
// Failure, must be another device.
// Assume that it is voice capable.
} catch (IllegalAccessException iae) {
// Failure, must be an other device.
// Assume that it is voice capable.
} catch (NoSuchMethodException nsme) {
}
return true;
}
// This is for test only. Allow the camera to launch the specific camera.
public static int getCameraFacingIntentExtras(Activity currentActivity) {
int cameraId = -1;
int intentCameraId =
currentActivity.getIntent().getIntExtra(Util.EXTRAS_CAMERA_FACING, -1);
if (isFrontCameraIntent(intentCameraId)) {
// Check if the front camera exist
int frontCameraId = CameraHolder.instance().getFrontCameraId();
if (frontCameraId != -1) {
cameraId = frontCameraId;
}
} else if (isBackCameraIntent(intentCameraId)) {
// Check if the back camera exist
int backCameraId = CameraHolder.instance().getBackCameraId();
if (backCameraId != -1) {
cameraId = backCameraId;
}
}
return cameraId;
}
private static boolean isFrontCameraIntent(int intentCameraId) {
return (intentCameraId == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT);
}
private static boolean isBackCameraIntent(int intentCameraId) {
return (intentCameraId == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK);
}
private static int mLocation[] = new int[2];
// This method is not thread-safe.
public static boolean pointInView(float x, float y, View v) {
v.getLocationInWindow(mLocation);
return x >= mLocation[0] && x < (mLocation[0] + v.getWidth())
&& y >= mLocation[1] && y < (mLocation[1] + v.getHeight());
}
public static boolean isUriValid(Uri uri, ContentResolver resolver) {
if (uri == null) return false;
try {
ParcelFileDescriptor pfd = resolver.openFileDescriptor(uri, "r");
if (pfd == null) {
Log.e(TAG, "Fail to open URI. URI=" + uri);
return false;
}
pfd.close();
} catch (IOException ex) {
return false;
}
return true;
}
public static void viewUri(Uri uri, Context context) {
if (!isUriValid(uri, context.getContentResolver())) {
Log.e(TAG, "Uri invalid. uri=" + uri);
return;
}
try {
context.startActivity(new Intent(Util.REVIEW_ACTION, uri));
} catch (ActivityNotFoundException ex) {
try {
context.startActivity(new Intent(Intent.ACTION_VIEW, uri));
} catch (ActivityNotFoundException e) {
Log.e(TAG, "review image fail. uri=" + uri, e);
}
}
}
public static void dumpRect(RectF rect, String msg) {
Log.v(TAG, msg + "=(" + rect.left + "," + rect.top
+ "," + rect.right + "," + rect.bottom + ")");
}
public static void rectFToRect(RectF rectF, Rect rect) {
rect.left = Math.round(rectF.left);
rect.top = Math.round(rectF.top);
rect.right = Math.round(rectF.right);
rect.bottom = Math.round(rectF.bottom);
}
public static void prepareMatrix(Matrix matrix, boolean mirror, int displayOrientation,
int viewWidth, int viewHeight) {
// Need mirror for front camera.
matrix.setScale(mirror ? -1 : 1, 1);
// This is the value for android.hardware.Camera.setDisplayOrientation.
matrix.postRotate(displayOrientation);
// Camera driver coordinates range from (-1000, -1000) to (1000, 1000).
// UI coordinates range from (0, 0) to (width, height).
matrix.postScale(viewWidth / 2000f, viewHeight / 2000f);
matrix.postTranslate(viewWidth / 2f, viewHeight / 2f);
}
public static String createJpegName(long dateTaken) {
synchronized (sImageFileNamer) {
return sImageFileNamer.generateName(dateTaken);
}
}
public static void broadcastNewPicture(Context context, Uri uri) {
context.sendBroadcast(new Intent(android.hardware.Camera.ACTION_NEW_PICTURE, uri));
// Keep compatibility
context.sendBroadcast(new Intent("com.android.camera.NEW_PICTURE", uri));
}
public static void fadeIn(View view) {
if (view.getVisibility() == View.VISIBLE) return;
view.setVisibility(View.VISIBLE);
Animation animation = new AlphaAnimation(0F, 1F);
animation.setDuration(400);
view.startAnimation(animation);
}
public static void fadeOut(View view) {
if (view.getVisibility() != View.VISIBLE) return;
Animation animation = new AlphaAnimation(1F, 0F);
animation.setDuration(400);
view.startAnimation(animation);
view.setVisibility(View.GONE);
}
public static void setRotationParameter(Parameters parameters, int cameraId, int orientation) {
// See android.hardware.Camera.Parameters.setRotation for
// documentation.
int rotation = 0;
if (orientation != OrientationEventListener.ORIENTATION_UNKNOWN) {
CameraInfo info = CameraHolder.instance().getCameraInfo()[cameraId];
if (info.facing == CameraInfo.CAMERA_FACING_FRONT) {
rotation = (info.orientation - orientation + 360) % 360;
} else { // back-facing camera
rotation = (info.orientation + orientation) % 360;
}
}
parameters.setRotation(rotation);
}
public static void setGpsParameters(Parameters parameters, Location loc) {
// Clear previous GPS location from the parameters.
parameters.removeGpsData();
// We always encode GpsTimeStamp
parameters.setGpsTimestamp(System.currentTimeMillis() / 1000);
// Set GPS location.
if (loc != null) {
double lat = loc.getLatitude();
double lon = loc.getLongitude();
boolean hasLatLon = (lat != 0.0d) || (lon != 0.0d);
if (hasLatLon) {
Log.d(TAG, "Set gps location");
parameters.setGpsLatitude(lat);
parameters.setGpsLongitude(lon);
parameters.setGpsProcessingMethod(loc.getProvider().toUpperCase());
if (loc.hasAltitude()) {
parameters.setGpsAltitude(loc.getAltitude());
} else {
// for NETWORK_PROVIDER location provider, we may have
// no altitude information, but the driver needs it, so
// we fake one.
parameters.setGpsAltitude(0);
}
if (loc.getTime() != 0) {
// Location.getTime() is UTC in milliseconds.
// gps-timestamp is UTC in seconds.
long utcTimeSeconds = loc.getTime() / 1000;
parameters.setGpsTimestamp(utcTimeSeconds);
}
} else {
loc = null;
}
}
}
public static void enterLightsOutMode(Window window) {
WindowManager.LayoutParams params = window.getAttributes();
params.systemUiVisibility = View.SYSTEM_UI_FLAG_LOW_PROFILE;
window.setAttributes(params);
}
public static void initializeScreenBrightness(Window win, ContentResolver resolver) {
// Overright the brightness settings if it is automatic
int mode = Settings.System.getInt(resolver, Settings.System.SCREEN_BRIGHTNESS_MODE,
Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
WindowManager.LayoutParams winParams = win.getAttributes();
winParams.screenBrightness = DEFAULT_CAMERA_BRIGHTNESS;
win.setAttributes(winParams);
}
}
private static class ImageFileNamer {
private SimpleDateFormat mFormat;
// The date (in milliseconds) used to generate the last name.
private long mLastDate;
// Number of names generated for the same second.
private int mSameSecondCount;
public ImageFileNamer(String format) {
mFormat = new SimpleDateFormat(format);
}
public String generateName(long dateTaken) {
Date date = new Date(dateTaken);
String result = mFormat.format(date);
// If the last name was generated for the same second,
// we append _1, _2, etc to the name.
if (dateTaken / 1000 == mLastDate / 1000) {
mSameSecondCount++;
result += "_" + mSameSecondCount;
} else {
mLastDate = dateTaken;
mSameSecondCount = 0;
}
return result;
}
}
}
| true | true | public static Size getOptimalPreviewSize(Activity currentActivity,
List<Size> sizes, double targetRatio) {
// Use a very small tolerance because we want an exact match.
final double ASPECT_TOLERANCE = 0.001;
if (sizes == null) return null;
Size optimalSize = null;
double minDiff = Double.MAX_VALUE;
// Because of bugs of overlay and layout, we sometimes will try to
// layout the viewfinder in the portrait orientation and thus get the
// wrong size of mSurfaceView. When we change the preview size, the
// new overlay will be created before the old one closed, which causes
// an exception. For now, just get the screen size
Display display = currentActivity.getWindowManager().getDefaultDisplay();
int targetHeight = Math.min(display.getHeight(), display.getWidth());
if (targetHeight <= 0) {
// We don't know the size of SurfaceView, use screen height
targetHeight = display.getHeight();
}
// Try to find an size match aspect ratio and size
for (Size size : sizes) {
double ratio = (double) size.width / size.height;
if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
if (Math.abs(size.height - targetHeight) < minDiff) {
optimalSize = size;
minDiff = Math.abs(size.height - targetHeight);
}
}
// Cannot find the one match the aspect ratio. This should not happen.
// Ignore the requirement.
if (optimalSize == null) {
Log.w(TAG, "No preview size match the aspect ratio");
minDiff = Double.MAX_VALUE;
for (Size size : sizes) {
if (Math.abs(size.height - targetHeight) < minDiff) {
optimalSize = size;
minDiff = Math.abs(size.height - targetHeight);
}
}
}
return optimalSize;
}
| public static Size getOptimalPreviewSize(Activity currentActivity,
List<Size> sizes, double targetRatio) {
// Not too small tolerance, some camera use 848, 854 or 864 for 480p
final double ASPECT_TOLERANCE = 0.05;
if (sizes == null) return null;
Size optimalSize = null;
double minDiff = Double.MAX_VALUE;
// Because of bugs of overlay and layout, we sometimes will try to
// layout the viewfinder in the portrait orientation and thus get the
// wrong size of mSurfaceView. When we change the preview size, the
// new overlay will be created before the old one closed, which causes
// an exception. For now, just get the screen size
Display display = currentActivity.getWindowManager().getDefaultDisplay();
int targetHeight = Math.min(display.getHeight(), display.getWidth());
if (targetHeight <= 0) {
// We don't know the size of SurfaceView, use screen height
targetHeight = display.getHeight();
}
// Try to find an size match aspect ratio and size
for (Size size : sizes) {
double ratio = (double) size.width / size.height;
if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
if (Math.abs(size.height - targetHeight) < minDiff) {
optimalSize = size;
minDiff = Math.abs(size.height - targetHeight);
}
}
// Cannot find the one match the aspect ratio. This should not happen.
// Ignore the requirement.
if (optimalSize == null) {
Log.w(TAG, "No preview size match the aspect ratio");
minDiff = Double.MAX_VALUE;
for (Size size : sizes) {
if (Math.abs(size.height - targetHeight) < minDiff) {
optimalSize = size;
minDiff = Math.abs(size.height - targetHeight);
}
}
}
return optimalSize;
}
|
diff --git a/src/ch/rollis/emma/RequestHandler.java b/src/ch/rollis/emma/RequestHandler.java
index 12001e4..01cd66c 100644
--- a/src/ch/rollis/emma/RequestHandler.java
+++ b/src/ch/rollis/emma/RequestHandler.java
@@ -1,246 +1,247 @@
/**
* Copyright (c) 2012 Michael Rolli - github.com/mrolli/emma
* All rights reserved.
*
* This work is licensed under the Creative Commons
* Attribution-NonCommercial-ShareAlike 3.0 Switzerland
* License. To view a copy of this license, visit
* http://creativecommons.org/licenses/by-nc-sa/3.0/ch/
* or send a letter to Creative Commons, 444 Castro Street,
* Suite 900, Mountain View, California, 94041, USA.
*/
package ch.rollis.emma;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.Socket;
import java.net.SocketException;
import java.util.Date;
import java.util.logging.Level;
import java.util.logging.Logger;
import ch.rollis.emma.contenthandler.ContentHandler;
import ch.rollis.emma.contenthandler.ContentHandlerFactory;
import ch.rollis.emma.context.ServerContext;
import ch.rollis.emma.context.ServerContextManager;
import ch.rollis.emma.request.HttpProtocolException;
import ch.rollis.emma.request.HttpProtocolParser;
import ch.rollis.emma.request.Request;
import ch.rollis.emma.response.Response;
import ch.rollis.emma.response.ResponseFactory;
import ch.rollis.emma.response.ResponseStatus;
import ch.rollis.emma.util.DateConverter;
import ch.rollis.emma.util.DateConverterException;
/**
* The request handler has the responsibility to handle a client request and
* dispatch the request to an appropriate content handler.
* <p>
* The request handler reads in the client's request data, transforms this data
* to request by using the HttpProtocolParser and then dispatches the request to
* an appropriate content handler. Finally after the content handler returns the
* response the request handler writes the response to the output stream and
* therefore back to client.
*
* @author mrolli
*/
public class RequestHandler implements Runnable {
/**
* Communication socket this request originates from.
*/
private final Socket comSocket;
/**
* Flag denotes if connection is SSL secured.
*/
private final boolean sslSecured;
/**
* Manager to get ServerContexts for the given request from.
*/
private final ServerContextManager scm;
/**
* Logger instance this handler shall log its messages to.
*/
private final Logger logger;
/**
* Request timeout in milliseconds.
*/
private final int requestTimeout = 15000;
/**
* Class constructor that generates a request handler that handles a HTTP
* request initiated by a client.
*
* @param socket
* The socket the connection has been established
* @param sslFlag
* Flag that denotes if connection is SSL secured
* @param loggerInstance
* Global logger to log exception to
* @param contextManager
* SeverContextManager to get the server context of for the
* request
*/
public RequestHandler(final Socket socket, final boolean sslFlag, final Logger loggerInstance,
final ServerContextManager contextManager) {
comSocket = socket;
sslSecured = sslFlag;
scm = contextManager;
logger = loggerInstance;
}
@Override
public void run() {
logger.log(Level.INFO, Thread.currentThread().getName() + " started.");
InetAddress client = comSocket.getInetAddress();
try {
InputStream input = comSocket.getInputStream();
OutputStream output = comSocket.getOutputStream();
while (!Thread.currentThread().isInterrupted()) {
HttpProtocolParser parser = new HttpProtocolParser(input);
try {
Request request;
// setup request timer to handle situations where the client
// does not send anything
- Thread timer = new Thread(new RequestHandlerTimeout(comSocket, requestTimeout, logger));
+ Thread timer = new Thread(new RequestHandlerTimeout(comSocket, requestTimeout,
+ logger));
timer.start();
try {
request = parser.parse();
} catch (SocketException e) {
throw new RequestTimeoutException(e);
}
timer.interrupt();
request.setPort(comSocket.getLocalPort());
request.setIsSslSecured(sslSecured);
ServerContext context = scm.getContext(request);
ContentHandler handler = new ContentHandlerFactory().getHandler(request);
Response response = handler.process(request, context);
boolean closeConnection = handleConnectionState(request, response);
response.send(output);
context.log(Level.INFO, getLogMessage(client, request, response));
if (closeConnection) {
break;
}
} catch (HttpProtocolException e) {
logger.log(Level.WARNING, "HTTP protocol violation", e);
Response response = new ResponseFactory()
.getResponse(ResponseStatus.BAD_REQUEST);
response.send(output);
break;
}
}
} catch (RequestTimeoutException e) {
logger.log(Level.INFO, "Request handler thread got timeout");
} catch (Exception e) {
logger.log(Level.SEVERE, "Error in RequestHandler", e);
// try to gracefully inform the client
if (!comSocket.isOutputShutdown()) {
Response response = new ResponseFactory()
.getResponse(ResponseStatus.INTERNAL_SERVER_ERROR);
try {
response.send(comSocket.getOutputStream());
} catch (IOException ioe) {
// do nothing
}
}
} finally {
if (comSocket != null && !comSocket.isClosed()) {
try {
comSocket.close();
} catch (IOException e) {
logger.log(Level.SEVERE, "Error while closing com socket");
}
}
}
logger.log(Level.INFO, Thread.currentThread().getName() + " ended.");
}
/**
* Returns a string representation of a request by a client and its response
* that then can be i.e. logged.
*
* @param client
* InetAddres representing the client of the request
* @param request
* The request received
* @param response
* The response to the request received
* @return The string representation
*/
private String getLogMessage(final InetAddress client, final Request request,
final Response response) {
String date = DateConverter.formatLog(new Date());
String requestDate = response.getHeader("Date");
String referer = "";
if (request.getHeader("Referer") != null) {
referer = request.getHeader("Referer");
}
String userAgent = "";
if (request.getHeader("User-Agent") != null) {
userAgent = request.getHeader("User-Agent");
}
try {
if (requestDate != null) {
date = DateConverter.formatLog(DateConverter.dateFromString(requestDate));
}
} catch (DateConverterException e) {
// do nothing
logger.log(Level.WARNING, "Invalid date encountered: " + requestDate.toString());
}
String logformat = "%s [%s] \"%s %s %s\" %s %s \"%s\" \"%s\"";
return String.format(logformat, client.getHostAddress(), date, request.getMethod(), request
.getRequestURI().toString(), request.getProtocol(), response.getStatus().getCode(),
response.getHeader("Content-Length"), referer, userAgent);
}
/**
* Returns if the connection has to be closed or not depending on the
* client's request.
* <p>
* The response object gets modified to send correct header information to
* the client!
*
* @param req
* The current request
* @param res
* The response to be sent
* @return True if connection shall be closed after sending reponse
*/
private boolean handleConnectionState(final Request req, final Response res) {
boolean closeConnection = true;
if (req.getProtocol().equals("HTTP/1.1")) {
// default in HTTP/1.1 is not to close the connection
closeConnection = false;
String conHeader = req.getHeader("Connection");
if (Thread.currentThread().isInterrupted()
|| (conHeader != null && conHeader.toLowerCase().equals("close"))) {
res.setHeader("Connection", "close");
closeConnection = true;
} else if (conHeader != null && conHeader.toLowerCase().equals("keep-alive")) {
res.setHeader("Connection", "keep-alive");
res.setHeader("Keep-Alive", "timeout=" + (requestTimeout / 1000) + ", max=100");
}
}
return closeConnection;
}
}
| true | true | public void run() {
logger.log(Level.INFO, Thread.currentThread().getName() + " started.");
InetAddress client = comSocket.getInetAddress();
try {
InputStream input = comSocket.getInputStream();
OutputStream output = comSocket.getOutputStream();
while (!Thread.currentThread().isInterrupted()) {
HttpProtocolParser parser = new HttpProtocolParser(input);
try {
Request request;
// setup request timer to handle situations where the client
// does not send anything
Thread timer = new Thread(new RequestHandlerTimeout(comSocket, requestTimeout, logger));
timer.start();
try {
request = parser.parse();
} catch (SocketException e) {
throw new RequestTimeoutException(e);
}
timer.interrupt();
request.setPort(comSocket.getLocalPort());
request.setIsSslSecured(sslSecured);
ServerContext context = scm.getContext(request);
ContentHandler handler = new ContentHandlerFactory().getHandler(request);
Response response = handler.process(request, context);
boolean closeConnection = handleConnectionState(request, response);
response.send(output);
context.log(Level.INFO, getLogMessage(client, request, response));
if (closeConnection) {
break;
}
} catch (HttpProtocolException e) {
logger.log(Level.WARNING, "HTTP protocol violation", e);
Response response = new ResponseFactory()
.getResponse(ResponseStatus.BAD_REQUEST);
response.send(output);
break;
}
}
} catch (RequestTimeoutException e) {
logger.log(Level.INFO, "Request handler thread got timeout");
} catch (Exception e) {
logger.log(Level.SEVERE, "Error in RequestHandler", e);
// try to gracefully inform the client
if (!comSocket.isOutputShutdown()) {
Response response = new ResponseFactory()
.getResponse(ResponseStatus.INTERNAL_SERVER_ERROR);
try {
response.send(comSocket.getOutputStream());
} catch (IOException ioe) {
// do nothing
}
}
} finally {
if (comSocket != null && !comSocket.isClosed()) {
try {
comSocket.close();
} catch (IOException e) {
logger.log(Level.SEVERE, "Error while closing com socket");
}
}
}
logger.log(Level.INFO, Thread.currentThread().getName() + " ended.");
}
| public void run() {
logger.log(Level.INFO, Thread.currentThread().getName() + " started.");
InetAddress client = comSocket.getInetAddress();
try {
InputStream input = comSocket.getInputStream();
OutputStream output = comSocket.getOutputStream();
while (!Thread.currentThread().isInterrupted()) {
HttpProtocolParser parser = new HttpProtocolParser(input);
try {
Request request;
// setup request timer to handle situations where the client
// does not send anything
Thread timer = new Thread(new RequestHandlerTimeout(comSocket, requestTimeout,
logger));
timer.start();
try {
request = parser.parse();
} catch (SocketException e) {
throw new RequestTimeoutException(e);
}
timer.interrupt();
request.setPort(comSocket.getLocalPort());
request.setIsSslSecured(sslSecured);
ServerContext context = scm.getContext(request);
ContentHandler handler = new ContentHandlerFactory().getHandler(request);
Response response = handler.process(request, context);
boolean closeConnection = handleConnectionState(request, response);
response.send(output);
context.log(Level.INFO, getLogMessage(client, request, response));
if (closeConnection) {
break;
}
} catch (HttpProtocolException e) {
logger.log(Level.WARNING, "HTTP protocol violation", e);
Response response = new ResponseFactory()
.getResponse(ResponseStatus.BAD_REQUEST);
response.send(output);
break;
}
}
} catch (RequestTimeoutException e) {
logger.log(Level.INFO, "Request handler thread got timeout");
} catch (Exception e) {
logger.log(Level.SEVERE, "Error in RequestHandler", e);
// try to gracefully inform the client
if (!comSocket.isOutputShutdown()) {
Response response = new ResponseFactory()
.getResponse(ResponseStatus.INTERNAL_SERVER_ERROR);
try {
response.send(comSocket.getOutputStream());
} catch (IOException ioe) {
// do nothing
}
}
} finally {
if (comSocket != null && !comSocket.isClosed()) {
try {
comSocket.close();
} catch (IOException e) {
logger.log(Level.SEVERE, "Error while closing com socket");
}
}
}
logger.log(Level.INFO, Thread.currentThread().getName() + " ended.");
}
|
diff --git a/ide/src/wombat/gui/actions/Connect.java b/ide/src/wombat/gui/actions/Connect.java
index a2b44b0..a20ac51 100644
--- a/ide/src/wombat/gui/actions/Connect.java
+++ b/ide/src/wombat/gui/actions/Connect.java
@@ -1,126 +1,126 @@
/*
* License: source-license.txt
* If this code is used independently, copy the license here.
*/
package wombat.gui.actions;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.net.InetAddress;
import javax.swing.*;
import wombat.gui.frames.*;
import wombat.gui.icons.*;
import wombat.gui.text.sta.SharedTextArea;
import wombat.util.files.DocumentManager;
/**
* Connect and share a document. Can be used either for hosting or joining a previously hosted document.
*/
public class Connect extends AbstractAction {
private static final long serialVersionUID = 3786293931035177076L;
/**
* Create a connect object.
*/
public Connect() {
super("Connect", IconManager.icon("Connect.png"));
putValue(Action.SHORT_DESCRIPTION, getValue(Action.NAME));
}
/**
* Display the ConnectDialog to arrange sharing.
* @param event Action parameters (ignored)
* @see ConnectDialog, ActionEvent
*/
public void actionPerformed(ActionEvent event) {
// Are they going to host or join?
final JDialog hostOptions = new JDialog(MainFrame.Singleton(), "Sharing...");
hostOptions.setLayout(new GridLayout(4, 1));
hostOptions.setModal(true);
hostOptions.setLocationByPlatform(true);
- final JButton host = new JButton("Create a new document");
- final JButton join = new JButton("Join an existing document");
+ final JButton host = new JButton("Create a new shared document");
+ final JButton join = new JButton("Join an existing shared document");
final JButton disconnect = new JButton("Disconnect");
final JButton cancel = new JButton("Cancel");
disconnect.setEnabled(DocumentManager.isActiveShared());
ActionListener al = new ActionListener() {
@Override public void actionPerformed(ActionEvent e) {
hostOptions.setVisible(false);
if (e.getSource() == host) {
try {
DocumentManager.HostShared();
} catch (Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(MainFrame.Singleton(), "Cannot host server");
}
} else if (e.getSource() == join) {
// Display a dialog asking for a name.
String name = (String) JOptionPane.showInputDialog(
MainFrame.Singleton(),
"Enter the name of the server to connect to:",
"Server",
JOptionPane.QUESTION_MESSAGE);
// If they didn't choose a name, just bail out.
if (name == null)
return;
// They gave us an IP and port
if (name.contains(":")) {
try {
String[] parts = name.split(":");
DocumentManager.JoinShared(InetAddress.getByName(parts[0]), Integer.parseInt(parts[1]));
} catch(Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(MainFrame.Singleton(), "Cannot connect to server");
}
}
// Or they gave us an encoded string
else {
try {
DocumentManager.JoinShared(SharedTextArea.decodeAddressHost(name), SharedTextArea.decodeAddressPort(name));
} catch(Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(MainFrame.Singleton(), "Cannot connect to server");
}
}
} else if (e.getSource() == cancel) {
// already hidden, just do nothing
} else if (e.getSource() == disconnect) {
DocumentManager.DisconnectShared();
}
}
};
host.addActionListener(al);
join.addActionListener(al);
disconnect.addActionListener(al);
cancel.addActionListener(al);
hostOptions.add(host);
hostOptions.add(join);
hostOptions.add(disconnect);
hostOptions.add(cancel);
hostOptions.pack();
hostOptions.setVisible(true);
}
}
| true | true | public void actionPerformed(ActionEvent event) {
// Are they going to host or join?
final JDialog hostOptions = new JDialog(MainFrame.Singleton(), "Sharing...");
hostOptions.setLayout(new GridLayout(4, 1));
hostOptions.setModal(true);
hostOptions.setLocationByPlatform(true);
final JButton host = new JButton("Create a new document");
final JButton join = new JButton("Join an existing document");
final JButton disconnect = new JButton("Disconnect");
final JButton cancel = new JButton("Cancel");
disconnect.setEnabled(DocumentManager.isActiveShared());
ActionListener al = new ActionListener() {
@Override public void actionPerformed(ActionEvent e) {
hostOptions.setVisible(false);
if (e.getSource() == host) {
try {
DocumentManager.HostShared();
} catch (Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(MainFrame.Singleton(), "Cannot host server");
}
} else if (e.getSource() == join) {
// Display a dialog asking for a name.
String name = (String) JOptionPane.showInputDialog(
MainFrame.Singleton(),
"Enter the name of the server to connect to:",
"Server",
JOptionPane.QUESTION_MESSAGE);
// If they didn't choose a name, just bail out.
if (name == null)
return;
// They gave us an IP and port
if (name.contains(":")) {
try {
String[] parts = name.split(":");
DocumentManager.JoinShared(InetAddress.getByName(parts[0]), Integer.parseInt(parts[1]));
} catch(Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(MainFrame.Singleton(), "Cannot connect to server");
}
}
// Or they gave us an encoded string
else {
try {
DocumentManager.JoinShared(SharedTextArea.decodeAddressHost(name), SharedTextArea.decodeAddressPort(name));
} catch(Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(MainFrame.Singleton(), "Cannot connect to server");
}
}
} else if (e.getSource() == cancel) {
// already hidden, just do nothing
} else if (e.getSource() == disconnect) {
DocumentManager.DisconnectShared();
}
}
};
host.addActionListener(al);
join.addActionListener(al);
disconnect.addActionListener(al);
cancel.addActionListener(al);
hostOptions.add(host);
hostOptions.add(join);
hostOptions.add(disconnect);
hostOptions.add(cancel);
hostOptions.pack();
hostOptions.setVisible(true);
}
| public void actionPerformed(ActionEvent event) {
// Are they going to host or join?
final JDialog hostOptions = new JDialog(MainFrame.Singleton(), "Sharing...");
hostOptions.setLayout(new GridLayout(4, 1));
hostOptions.setModal(true);
hostOptions.setLocationByPlatform(true);
final JButton host = new JButton("Create a new shared document");
final JButton join = new JButton("Join an existing shared document");
final JButton disconnect = new JButton("Disconnect");
final JButton cancel = new JButton("Cancel");
disconnect.setEnabled(DocumentManager.isActiveShared());
ActionListener al = new ActionListener() {
@Override public void actionPerformed(ActionEvent e) {
hostOptions.setVisible(false);
if (e.getSource() == host) {
try {
DocumentManager.HostShared();
} catch (Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(MainFrame.Singleton(), "Cannot host server");
}
} else if (e.getSource() == join) {
// Display a dialog asking for a name.
String name = (String) JOptionPane.showInputDialog(
MainFrame.Singleton(),
"Enter the name of the server to connect to:",
"Server",
JOptionPane.QUESTION_MESSAGE);
// If they didn't choose a name, just bail out.
if (name == null)
return;
// They gave us an IP and port
if (name.contains(":")) {
try {
String[] parts = name.split(":");
DocumentManager.JoinShared(InetAddress.getByName(parts[0]), Integer.parseInt(parts[1]));
} catch(Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(MainFrame.Singleton(), "Cannot connect to server");
}
}
// Or they gave us an encoded string
else {
try {
DocumentManager.JoinShared(SharedTextArea.decodeAddressHost(name), SharedTextArea.decodeAddressPort(name));
} catch(Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(MainFrame.Singleton(), "Cannot connect to server");
}
}
} else if (e.getSource() == cancel) {
// already hidden, just do nothing
} else if (e.getSource() == disconnect) {
DocumentManager.DisconnectShared();
}
}
};
host.addActionListener(al);
join.addActionListener(al);
disconnect.addActionListener(al);
cancel.addActionListener(al);
hostOptions.add(host);
hostOptions.add(join);
hostOptions.add(disconnect);
hostOptions.add(cancel);
hostOptions.pack();
hostOptions.setVisible(true);
}
|
Subsets and Splits