Skip to content

Дмитрий Корытько / hware

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 1ca3c925 1ca3c925280f944a930db933d726dea55991085b by root
Options

save

1 parent 541a1351
Inline Side-by-side
Showing 6 changed files with 90 additions and 37 deletions
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
30 <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> 30 <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
31 <attributes> 31 <attributes>
32 <attribute name="maven.pomderived" value="true"/> 32 <attribute name="maven.pomderived" value="true"/>
33 <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
33 </attributes> 34 </attributes>
34 </classpathentry> 35 </classpathentry>
35 <classpathentry kind="output" path="target/classes"/> 36 <classpathentry kind="output" path="target/classes"/>
......
...@@ -42,25 +42,25 @@ ...@@ -42,25 +42,25 @@
42 <logger name="org.springframework.core"> 42 <logger name="org.springframework.core">
43 <level value="info" /> 43 <level value="info" />
44 <appender-ref ref="console" /> 44 <appender-ref ref="console" />
45 <appender-ref ref="file" /> 45
46 </logger> 46 </logger>
47 47
48 <logger name="org.springframework.beans"> 48 <logger name="org.springframework.beans">
49 <level value="info" /> 49 <level value="info" />
50 <appender-ref ref="console" /> 50 <appender-ref ref="console" />
51 <appender-ref ref="file" /> 51
52 </logger> 52 </logger>
53 53
54 <logger name="org.springframework.context"> 54 <logger name="org.springframework.context">
55 <level value="info" /> 55 <level value="info" />
56 <appender-ref ref="console" /> 56 <appender-ref ref="console" />
57 <appender-ref ref="file" /> 57
58 </logger> 58 </logger>
59 59
60 <logger name="org.springframework.web"> 60 <logger name="org.springframework.web">
61 <level value="info" /> 61 <level value="info" />
62 <appender-ref ref="console" /> 62 <appender-ref ref="console" />
63 <appender-ref ref="file" /> 63
64 </logger> 64 </logger>
65 65
66 <!-- Root Logger --> 66 <!-- Root Logger -->
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
16 16
17 <style> 17 <style>
18 18
19 textarea { overflow: auto; }
20
19 .new { 21 .new {
20 background-image:url(resources/img/new.png) !important; 22 background-image:url(resources/img/new.png) !important;
21 } 23 }
......
...@@ -233,6 +233,7 @@ Ext.application({ ...@@ -233,6 +233,7 @@ Ext.application({
233 items: [{ 233 items: [{
234 xtype : 'mvvm-LogView', 234 xtype : 'mvvm-LogView',
235 id:'formlog' 235 id:'formlog'
236
236 237
237 } 238 }
238 ] 239 ]
......
1 1
2
3 Ext.define('App.view.Log', { 2 Ext.define('App.view.Log', {
4 extend : 'Ext.form.Panel', 3 extend : 'Ext.form.Panel',
5 xtype : 'mvvm-LogView', 4 xtype : 'mvvm-LogView',
6 5 alias: 'widget.showPreview',
7 6 // renderTo: document.body,
8 width : 400, 7 /*
9 height:300, 8 layout: {
10 bodyPadding: 10, 9 type: 'vbox',
11 bbar: { 10 align: 'stretch'
12
13 items: [
14 {
15 xtype: 'button',
16 iconCls:'load',
17 itemId: 'LoadLogButton',
18 text: 'Обновить',
19 action: 'loadLog',
20 disabled:false
21 }
22 ]
23
24
25 }, 11 },
12 */
26 13
27 14 layout: 'fit',
28 15
16 height: 400,
17 // width : 600,
18
19 // title : 'MyPanel',
29 20
30 items: [{ 21 initComponent: function() {
31 xtype : 'textareafield', 22 Ext.apply(this, {
32 grow : true, 23
33 id:'logResult', 24 bbar: {
34 readOnly : true, 25
35 allowBlank: false, 26 items: [
36 style:'overflow-y: scroll', 27 {
37 height: 100, 28 xtype: 'button',
38 anchor: '95%' 29 iconCls:'load',
39 } 30 itemId: 'LoadLogButton',
40 ] 31 text: 'Обновить',
32 action: 'loadLog',
33 disabled:false
34 }
35 ]
36
37
38 },
39
40
41 items: [
42
43 {
44 xtype : 'textareafield',
45 //grow : true,
46 id:'logResult',
47 readOnly : true,
48 // height: 300,
49 // anchor: '100%'
50
51 }
52
53
54 // {
55 // xtype: 'textareafield',
56 // itemId: 'txtFld',
57 // border: false,
58 //height: 660,
59 //width: 370,
60 //autoScroll: true,
61 // margin: '0 10 10 10',
62 //hidden: true
63 // }
64
65 ],
66
67
68
69 });
70 this.callParent(arguments);
71 }
72 });
41 73
74 /*
75 Ext.application({
76 name: 'Fiddle',
42 77
43 78 launch: function() {
79
80 var textarea,
81 ipsum = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum";
82
83 var preview = Ext.create('Test.view.ShowPreview', {
84 renderTo: Ext.getBody()
85 });
86
87 textarea = preview.down('#txtFld');
88 textarea.setValue(ipsum+ipsum);
89 }
44 }); 90 });
45 91
46 92
93 */
94
47 95
48 96
49 97
......
...@@ -10,6 +10,7 @@ import java.util.logging.Logger; ...@@ -10,6 +10,7 @@ import java.util.logging.Logger;
10 import java.util.Vector; 10 import java.util.Vector;
11 11
12 import org.emercit.utilstools.config.Paths; 12 import org.emercit.utilstools.config.Paths;
13
13 public class Reader { 14 public class Reader {
14 15
15 public Vector<String> read() { 16 public Vector<String> read() {
......