diff options
author | Kenny Root <kenny@the-b.org> | 2010-02-10 04:13:14 +0000 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2010-02-10 04:13:14 +0000 |
commit | 204eb8d288c3774da5ef27b1a6a565199d0ce84f (patch) | |
tree | c8132a3b668a4c15681ed8e679d5cf7564858feb /src | |
parent | 8d2a23b326c0a85cc4aad77a06ba03ed3d4b744d (diff) | |
download | connectbot-204eb8d288c3774da5ef27b1a6a565199d0ce84f.tar.gz connectbot-204eb8d288c3774da5ef27b1a6a565199d0ce84f.tar.bz2 connectbot-204eb8d288c3774da5ef27b1a6a565199d0ce84f.zip |
Updated license on test suite and stragglers
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@475 df292f66-193f-0410-a5fc-6d59da041ff2
Diffstat (limited to 'src')
-rw-r--r-- | src/de/mud/terminal/Precomposer.java | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/de/mud/terminal/Precomposer.java b/src/de/mud/terminal/Precomposer.java index dce2000..edad64c 100644 --- a/src/de/mud/terminal/Precomposer.java +++ b/src/de/mud/terminal/Precomposer.java @@ -1,25 +1,25 @@ /* - ConnectBot: simple, powerful, open-source SSH client for Android - Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey - - 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/>. -*/ + * ConnectBot: simple, powerful, open-source SSH client for Android + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * 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 de.mud.terminal; /** * @author Kenny Root - * This was taken from xterm's precompose.c + * This data was taken from xterm's precompose.c */ public class Precomposer { public final static char precompositions[][] = { @@ -1024,17 +1024,17 @@ public class Precomposer { { 0xFB2C, 0xFB49, 0x05C1}, { 0xFB2D, 0xFB49, 0x05C2}, }; - + private static final int UNICODE_SHIFT = 21; - + public static char precompose(char base, char comb) { int min = 0; int max = precompositions.length - 1; int mid; - + long sought = base << UNICODE_SHIFT | comb; long that; - + while (max >= min) { mid = (min + max) / 2; that = precompositions[mid][1] << UNICODE_SHIFT | precompositions[mid][2]; @@ -1045,8 +1045,8 @@ public class Precomposer { else return precompositions[mid][0]; } - + // No match; return character without combiner - return base; + return base; } } |