You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/03/23 15:58:44 UTC
svn commit: r1304399 - in /karaf/trunk/shell/console/src:
main/java/org/apache/karaf/shell/console/table/
main/java/org/apache/karaf/shell/console/table2/
test/java/org/apache/karaf/shell/console/tabletest/
Author: cschneider
Date: Fri Mar 23 14:58:43 2012
New Revision: 1304399
URL: http://svn.apache.org/viewvc?rev=1304399&view=rev
Log:
KARAF-1281 Replacing old table impl
Added:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Cell.java
- copied, changed from r1304314, karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Cell.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Col.java
- copied, changed from r1304314, karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Col.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java
- copied, changed from r1304314, karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Row.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/ShellTable.java
- copied, changed from r1304314, karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/ShellTable.java
Removed:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Column.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/DataTable.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Style.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/StyleCalculator.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/TableElement.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/
Modified:
karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/tabletest/ShellTableTest.java
Copied: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Cell.java (from r1304314, karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Cell.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Cell.java?p2=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Cell.java&p1=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Cell.java&r1=1304314&r2=1304399&rev=1304399&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Cell.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Cell.java Fri Mar 23 14:58:43 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.console.table2;
+package org.apache.karaf.shell.console.table;
import java.io.PrintStream;
Copied: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Col.java (from r1304314, karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Col.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Col.java?p2=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Col.java&p1=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Col.java&r1=1304314&r2=1304399&rev=1304399&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Col.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Col.java Fri Mar 23 14:58:43 2012
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.console.table2;
+package org.apache.karaf.shell.console.table;
import java.text.Format;
-import org.apache.karaf.shell.console.table.HAlign;
/**
* Column definition.
Copied: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java (from r1304314, karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Row.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java?p2=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java&p1=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Row.java&r1=1304314&r2=1304399&rev=1304399&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Row.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java Fri Mar 23 14:58:43 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.console.table2;
+package org.apache.karaf.shell.console.table;
import java.util.ArrayList;
import java.util.Arrays;
@@ -54,7 +54,7 @@ public class Row {
if (cols.size() != content.size()) {
throw new RuntimeException("Number of columns and number of content elements do not match");
}
- st.append("| ");
+ //st.append("| ");
for (Col col : cols) {
st.append(col.getContent(content.get(c)));
if (c + 1 < cols.size()) {
@@ -62,7 +62,7 @@ public class Row {
}
c++;
}
- st.append(" |");
+ //st.append(" |");
return st.toString();
}
Copied: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/ShellTable.java (from r1304314, karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/ShellTable.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/ShellTable.java?p2=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/ShellTable.java&p1=karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/ShellTable.java&r1=1304314&r2=1304399&rev=1304399&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/ShellTable.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/ShellTable.java Fri Mar 23 14:58:43 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.console.table2;
+package org.apache.karaf.shell.console.table;
import java.io.PrintStream;
import java.util.ArrayList;
Modified: karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/tabletest/ShellTableTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/tabletest/ShellTableTest.java?rev=1304399&r1=1304398&r2=1304399&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/tabletest/ShellTableTest.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/tabletest/ShellTableTest.java Fri Mar 23 14:58:43 2012
@@ -15,9 +15,9 @@
*/
package org.apache.karaf.shell.console.tabletest;
-import org.apache.karaf.shell.console.table2.Col;
-import org.apache.karaf.shell.console.table2.Row;
-import org.apache.karaf.shell.console.table2.ShellTable;
+import org.apache.karaf.shell.console.table.Col;
+import org.apache.karaf.shell.console.table.Row;
+import org.apache.karaf.shell.console.table.ShellTable;
import org.junit.Test;
public class ShellTableTest {
Re: svn commit: r1304399 - in /karaf/trunk/shell/console/src: main/java/org/apache/karaf/shell/console/table/
main/java/org/apache/karaf/shell/console/table2/ test/java/org/apache/karaf/shell/console/tabletest/
Posted by Christian Schneider <ch...@die-schneider.net>.
Hi Andreas,
no problem with that. The reason is that I wanted to show how the tables
look with outer lines and without and
ask what we would like to keep. After trying both I prefer the current
version without outer lines.
Any other preferences?
If no other comments are on this thread I will remove the commented code.
I also thought about making it a configurable property but I dont think
it is worth it.
Christian
Am 26.03.2012 06:07, schrieb Andreas Pieber:
> Hey,
>
> On Fri, Mar 23, 2012 at 15:58,<cs...@apache.org> wrote:
>> Author: cschneider
>> Date: Fri Mar 23 14:58:43 2012
>> New Revision: 1304399
>>
>> URL: http://svn.apache.org/viewvc?rev=1304399&view=rev
>> Log:
>> KARAF-1281 Replacing old table impl
>>
>> </ SKIP>
>>
>> ==============================================================================
>> --- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Row.java (original)
>> +++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java Fri Mar 23 14:58:43 2012
>> @@ -13,7 +13,7 @@
>> * See the License for the specific language governing permissions and
>> * limitations under the License.
>> */
>> -package org.apache.karaf.shell.console.table2;
>> +package org.apache.karaf.shell.console.table;
>>
>> import java.util.ArrayList;
>> import java.util.Arrays;
>> @@ -54,7 +54,7 @@ public class Row {
>> if (cols.size() != content.size()) {
>> throw new RuntimeException("Number of columns and number of content elements do not match");
>> }
>> - st.append("| ");
>> + //st.append("| ");
>> for (Col col : cols) {
>> st.append(col.getContent(content.get(c)));
>> if (c + 1< cols.size()) {
>> @@ -62,7 +62,7 @@ public class Row {
>> }
>> c++;
>> }
>> - st.append(" |");
>> + //st.append(" |");
>> return st.toString();
>> }
> Have I ever said that I don't like commented code? :-) Pls remove it
> completely (we have a SCM for the history) or add a comment why it is
> required to keep the code here in commented form...
>
> Kind regards,
> Andreas
--
Christian Schneider
http://www.liquid-reality.de
Open Source Architect
Talend Application Integration Division http://www.talend.com
Re: svn commit: r1304399 - in /karaf/trunk/shell/console/src:
main/java/org/apache/karaf/shell/console/table/ main/java/org/apache/karaf/shell/console/table2/
test/java/org/apache/karaf/shell/console/tabletest/
Posted by Andreas Pieber <an...@gmail.com>.
Hey,
On Fri, Mar 23, 2012 at 15:58, <cs...@apache.org> wrote:
> Author: cschneider
> Date: Fri Mar 23 14:58:43 2012
> New Revision: 1304399
>
> URL: http://svn.apache.org/viewvc?rev=1304399&view=rev
> Log:
> KARAF-1281 Replacing old table impl
>
> </ SKIP>
>
> ==============================================================================
> --- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Row.java (original)
> +++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java Fri Mar 23 14:58:43 2012
> @@ -13,7 +13,7 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -package org.apache.karaf.shell.console.table2;
> +package org.apache.karaf.shell.console.table;
>
> import java.util.ArrayList;
> import java.util.Arrays;
> @@ -54,7 +54,7 @@ public class Row {
> if (cols.size() != content.size()) {
> throw new RuntimeException("Number of columns and number of content elements do not match");
> }
> - st.append("| ");
> + //st.append("| ");
> for (Col col : cols) {
> st.append(col.getContent(content.get(c)));
> if (c + 1 < cols.size()) {
> @@ -62,7 +62,7 @@ public class Row {
> }
> c++;
> }
> - st.append(" |");
> + //st.append(" |");
> return st.toString();
> }
Have I ever said that I don't like commented code? :-) Pls remove it
completely (we have a SCM for the history) or add a comment why it is
required to keep the code here in commented form...
Kind regards,
Andreas