PageRenderTime 63ms CodeModel.GetById 8ms RepoModel.GetById 1ms app.codeStats 0ms

/patches/pending_history/history.diff

https://github.com/zet/bombus
diff | 919 lines | 885 code | 34 blank | 0 comment | 0 complexity | 5a839aaab4a71c9eb36e52c7210f8c3e MD5 | raw file
    

  1. Index: trunk/src/Client/Config.java

    2. 

  2. ===================================================================

    3. 

  3. --- trunk/src/Client/Config.java	(revision 1209)

    4. 

  4. +++ trunk/src/Client/Config.java	(working copy)

    5. 

  5. @@ -66,7 +66,7 @@

    6. 

  6.      public boolean ghostMotor=getBooleanProperty("moto_e398",false);
    7. 

  7.      public boolean blFlash=!ghostMotor; //true;
    8. 

  8.      
    9. 

  9. -    public boolean msgLog=getBooleanProperty("msg_log",false);
    10. 

  10. +    //public boolean msgLog=getBooleanProperty("msg_log",false);
    11. 

  11.      
    12. 

  12.      public boolean muc119=getBooleanProperty("muc_119",true);	// before muc 1.19 use muc#owner instead of muc#admin
    13. 

  13.      
    14. 

  14. @@ -147,6 +147,14 @@

    15. 

  15.      
    16. 

  16.      public int messageCollapsedLength=512;
    17. 

  17.      
    18. 

  18. +    public String msgPath="";
    19. 

  19. +    public boolean msgLog=false;
    20. 

  20. +    public boolean msgLogPresence=false;
    21. 

  21. +    public boolean msgLogConf=false;
    22. 

  22. +    public boolean msgLogConfPresence=false;
    23. 

  23. +    public boolean cp1251=true;
    24. 

  24. +    public boolean transliterateFilenames=false;
    25. 

  25. +    
    26. 

  26.      // runtime values
    27. 

  27.      public boolean allowMinimize=false;
    28. 

  28.      public int profile=0;
    29. 

  29. @@ -154,6 +162,7 @@

    30. 

  30.      
    31. 

  31.      public boolean istreamWaiting;
    32. 

  32.      
    33. 

  33. +    
    34. 

  34.  
    35. 

  35.      // Singleton
    36. 

  36.      private static Config instance;
    37. 

  37. @@ -287,6 +296,14 @@

    38. 

  38.              eventDelivery=inputStream.readBoolean();
    39. 

  39.              
    40. 

  40.              messageCollapsedLength=inputStream.readInt();
    41. 

  41. +            
    42. 

  42. +            msgPath=inputStream.readUTF();
    43. 

  43. +            msgLog=inputStream.readBoolean();
    44. 

  44. +            msgLogPresence=inputStream.readBoolean();
    45. 

  45. +            msgLogConfPresence=inputStream.readBoolean();
    46. 

  46. +            msgLogConf=inputStream.readBoolean();
    47. 

  47. +            cp1251=inputStream.readBoolean();
    48. 

  48. +            transliterateFilenames=inputStream.readBoolean();
    49. 

  49.  	    
    50. 

  50.  	    inputStream.close();
    51. 

  51.  	} catch (Exception e) {
    52. 

  52. @@ -382,6 +399,14 @@

    53. 

  53.              outputStream.writeBoolean(eventDelivery);
    54. 

  54.              
    55. 

  55.              outputStream.writeInt(messageCollapsedLength);
    56. 

  56. +            
    57. 

  57. +            outputStream.writeUTF(msgPath);
    58. 

  58. +            outputStream.writeBoolean(msgLog);
    59. 

  59. +            outputStream.writeBoolean(msgLogPresence);
    60. 

  60. +            outputStream.writeBoolean(msgLogConfPresence);
    61. 

  61. +            outputStream.writeBoolean(msgLogConf);
    62. 

  62. +            outputStream.writeBoolean(cp1251);
    63. 

  63. +            outputStream.writeBoolean(transliterateFilenames);
    64. 

  64.  	    
    65. 

  65.  	} catch (Exception e) { e.printStackTrace(); }
    66. 

  66.  	
    67. 

  67. Index: trunk/src/Client/Contact.java

    68. 

  68. ===================================================================

    69. 

  69. --- trunk/src/Client/Contact.java	(revision 1209)

    70. 

  70. +++ trunk/src/Client/Contact.java	(working copy)

    71. 

  71. @@ -26,6 +26,10 @@

    72. 

  72.   */
    73. 

  73.  
    74. 

  74.  package Client;
    75. 

  75. +//#if FILE_IO && HISTORY
    76. 

  76. +//# import Client.HistoryAppend;
    77. 

  77. +//# import Conference.MucContact;
    78. 

  78. +//#endif
    79. 

  79.  import com.alsutton.jabber.JabberDataBlock;
    80. 

  80.  import images.RosterIcons;
    81. 

  81.  import ui.Colors;
    82. 

  82. @@ -212,13 +216,13 @@

    83. 

  83.          if (m.isPresence()) 
    84. 

  84.              if (msgs.size()==1) 
    85. 

  85.                  if ( ((Msg)msgs.firstElement()).isPresence())
    86. 

  86. -                    if (origin!=ORIGIN_GROUPCHAT) first_replace=true;
    87. 

  87. -//#if USE_SIEMENS_FILES
    88. 

  88. +                    if (origin!=ORIGIN_GROUPCHAT) first_replace=true;       
    89. 

  89. +//#if FILE_IO && HISTORY
    90. 

  90.  //#         Config cf=Config.getInstance();
    91. 

  91. -//# 
    92. 

  92. -//#         if (cf.msgLog && group.index!=Groups.TYPE_TRANSP && group.index!=Groups.TYPE_SEARCH_RESULT)
    93. 

  93. +//#         if (cf.msgLog && cf.msgPath==null) {
    94. 

  94. +//#         } else 
    95. 

  95. +//#             if (cf.msgLog && group.index!=Groups.TYPE_TRANSP && group.index!=Groups.TYPE_SEARCH_RESULT)
    96. 

  96.  //#         {
    97. 

  97. -//#             String histRecord=(nick==null)?getBareJid():nick;
    98. 

  98.  //#             String fromName=StaticData.getInstance().account.getUserName();
    99. 

  99.  //#             if (m.messageType!=Msg.MESSAGE_TYPE_OUT) fromName=toString();
    100. 

  100.  //#             boolean allowLog=false;
    101. 

  101. @@ -231,8 +235,9 @@

    102. 

  102.  //#                     if (origin>=ORIGIN_GROUPCHAT && cf.msgLogConf) allowLog=true;
    103. 

  103.  //#                     if (origin<ORIGIN_GROUPCHAT) allowLog=true;
    104. 

  104.  //#             }
    105. 

  105. +//#             if (origin!=ORIGIN_GROUPCHAT && this instanceof MucContact)
    106. 

  106. +//#                  allowLog=false;
    107. 

  107.  //#             if (allowLog)
    108. 

  108. -//#                 //if (!first_replace || !m.)
    109. 

  109.  //#             {
    110. 

  110.  //#                 StringBuffer body=new StringBuffer(m.getDayTime());
    111. 

  111.  //#                 body.append(" <");
    112. 

  112. @@ -244,9 +249,12 @@

    113. 

  113.  //#                 }
    114. 

  114.  //#                 body.append(m.getBody());
    115. 

  115.  //#                 body.append("\r\n");
    116. 

  116. -//#                 io.NvStorage.appendFile("Log_"+histRecord, body.toString());
    117. 

  117. +//#                 
    118. 

  118. +//#                 String histRecord=(nick==null)?getBareJid():nick;
    119. 

  119. +//#                 
    120. 

  120. +//#                 new HistoryAppend(body, histRecord);
    121. 

  121.  //#             }
    122. 

  122. -//#         }
    123. 

  123. +//#        }
    124. 

  124.  //#endif
    125. 

  125.          if (first_replace) {
    126. 

  126.              msgs.setElementAt(m,0);
    127. 

  127. Index: trunk/src/Client/HistoryAppend.java

    128. 

  128. ===================================================================

    129. 

  129. --- trunk/src/Client/HistoryAppend.java	(revision 0)

    130. 

  130. +++ trunk/src/Client/HistoryAppend.java	(revision 0)

    131. 

  131. @@ -0,0 +1,82 @@

    132. 

  132. +/*

    133. 

  133. + * HistoryAppend.java

    134. 

  134. + *

    135. 

  135. + * Created on 19.06.2007, 9:24

    136. 

  136. + * Copyright (c) 2006-2007, Daniel Apatin (ad), http://apatin.net.ru

    137. 

  137. + * This program is free software; you can redistribute it and/or

    138. 

  138. + * modify it under the terms of the GNU General Public License

    139. 

  139. + * as published by the Free Software Foundation; either version 2

    140. 

  140. + * of the License, or (at your option) any later version.

    141. 

  141. + *

    142. 

  142. + * You can also redistribute and/or modify this program under the

    143. 

  143. + * terms of the Psi License, specified in the accompanied COPYING

    144. 

  144. + * file, as published by the Psi Project; either dated January 1st,

    145. 

  145. + * 2005, or (at your option) any later version.

    146. 

  146. + *

    147. 

  147. + * This program is distributed in the hope that it will be useful,

    148. 

  148. + * but WITHOUT ANY WARRANTY; without even the implied warranty of

    149. 

  149. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    150. 

  150. + * GNU General Public License for more details.

    151. 

  151. + *

    152. 

  152. + * You should have received a copy of the GNU General Public License

    153. 

  153. + * along with this library; if not, write to the Free Software

    154. 

  154. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    155. 

  155. + *

    156. 

  156. + */

    157. 

  157. +

    158. 

  158. +package Client;

    159. 

  159. +

    160. 

  160. +import Client.Config;

    161. 

  161. +import io.file.FileIO;

    162. 

  162. +import java.io.IOException;

    163. 

  163. +import java.io.OutputStream;

    164. 

  164. +//#ifdef TRANSLIT

    165. 

  165. +//# import util.Translit;

    166. 

  166. +//#endif

    167. 

  167. +import util.strconv;

    168. 

  168. +

    169. 

  169. +public class HistoryAppend {

    170. 

  170. +    

    171. 

  171. +    private Config cf=Config.getInstance();

    172. 

  172. +    

    173. 

  173. +    

    174. 

  174. +//#if FILE_IO    

    175. 

  175. +    private int filePos;

    176. 

  176. +    private FileIO file;

    177. 

  177. +    private OutputStream os;

    178. 

  178. +//#endif

    179. 

  179. +    

    180. 

  180. +    public HistoryAppend(StringBuffer body, String histRecord) {

    181. 

  181. +                

    182. 

  182. +       byte[] bodyMessage;

    183. 

  183. +

    184. 

  184. +       if (cf.cp1251) {

    185. 

  185. +            bodyMessage=strconv.convUnicodeToCp1251(body.toString()).getBytes();

    186. 

  186. +       } else {

    187. 

  187. +            bodyMessage=body.toString().getBytes();

    188. 

  188. +       }

    189. 

  189. +//#ifdef TRANSLIT

    190. 

  190. +//#        String filename=cf.msgPath+((cf.transliterateFilenames)?Translit.translit(histRecord):histRecord)+".txt";

    191. 

  191. +//#else

    192. 

  192. +       String filename=cf.msgPath+histRecord+".txt";

    193. 

  193. +//#endif

    194. 

  194. +       file=FileIO.createConnection(filename);

    195. 

  195. +        try {

    196. 

  196. +            os = file.openOutputStream(0);

    197. 

  197. +            try {

    198. 

  198. +                os.write(bodyMessage);

    199. 

  199. +                filePos+=bodyMessage.length;

    200. 

  200. +            } catch (IOException ex) { }

    201. 

  201. +            os.close();

    202. 

  202. +            os.flush();

    203. 

  203. +            file.close();

    204. 

  204. +        } catch (IOException ex) {

    205. 

  205. +            try {

    206. 

  206. +                file.close();

    207. 

  207. +            } catch (IOException ex2) { }

    208. 

  208. +        }

    209. 

  209. +        filename=null;

    210. 

  210. +        body=null;

    211. 

  211. +        bodyMessage=null;

    212. 

  212. +    }

    213. 

  213. +}

    214. 

  214. \ No newline at end of file

    215. 

  215. Index: trunk/src/Client/HistoryConfig.java

    216. 

  216. ===================================================================

    217. 

  217. --- trunk/src/Client/HistoryConfig.java	(revision 0)

    218. 

  218. +++ trunk/src/Client/HistoryConfig.java	(revision 0)

    219. 

  219. @@ -0,0 +1,155 @@

    220. 

  220. +/*

    221. 

  221. + * HistoryConfig.java

    222. 

  222. + *

    223. 

  223. + * Created on 18.06.2007., 15:35

    224. 

  224. + * Copyright (c) 2006-2007, Daniel Apatin (ad), http://apatin.net.ru

    225. 

  225. + * This program is free software; you can redistribute it and/or

    226. 

  226. + * modify it under the terms of the GNU General Public License

    227. 

  227. + * as published by the Free Software Foundation; either version 2

    228. 

  228. + * of the License, or (at your option) any later version.

    229. 

  229. + *

    230. 

  230. + * You can also redistribute and/or modify this program under the

    231. 

  231. + * terms of the Psi License, specified in the accompanied COPYING

    232. 

  232. + * file, as published by the Psi Project; either dated January 1st,

    233. 

  233. + * 2005, or (at your option) any later version.

    234. 

  234. + *

    235. 

  235. + * This program is distributed in the hope that it will be useful,

    236. 

  236. + * but WITHOUT ANY WARRANTY; without even the implied warranty of

    237. 

  237. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    238. 

  238. + * GNU General Public License for more details.

    239. 

  239. + *

    240. 

  240. + * You should have received a copy of the GNU General Public License

    241. 

  241. + * along with this library; if not, write to the Free Software

    242. 

  242. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    243. 

  243. + *

    244. 

  244. + */

    245. 

  245. +

    246. 

  246. +package Client;

    247. 

  247. +

    248. 

  248. +import Client.Config;

    249. 

  249. +import Client.StaticData;

    250. 

  250. +//#if FILE_IO

    251. 

  251. +import io.file.browse.Browser;

    252. 

  252. +import io.file.browse.BrowserListener;

    253. 

  253. +//#endif

    254. 

  254. +import javax.microedition.lcdui.*;

    255. 

  255. +import locale.SR;

    256. 

  256. +import ui.controls.TextFieldCombo;

    257. 

  257. +

    258. 

  258. +public class HistoryConfig implements

    259. 

  259. +	CommandListener 

    260. 

  260. +//#if FILE_IO

    261. 

  261. +	,ItemCommandListener

    262. 

  262. +        , BrowserListener

    263. 

  263. +//#endif

    264. 

  264. +{

    265. 

  265. +    private Display display;

    266. 

  266. +    private Displayable parentView;

    267. 

  267. +

    268. 

  268. +    Form f;

    269. 

  269. +//#if FILE_IO

    270. 

  270. +    ChoiceGroup history;

    271. 

  271. +    TextField historyFolder;

    272. 

  272. +

    273. 

  273. +    Command cmdSetHistFolder=new Command(SR.MS_SELECT_PATH, Command.ITEM,11);

    274. 

  274. +//#endif

    275. 

  275. +    

    276. 

  276. +    Command cmdOk=new Command(SR.MS_OK,Command.OK,1);    

    277. 

  277. +    Command cmdCancel=new Command(SR.MS_CANCEL, Command.BACK,99);

    278. 

  278. +    

    279. 

  279. +    Config cf;

    280. 

  280. +    boolean his[];

    281. 

  281. +    

    282. 

  282. +    /** Creates a new instance of ConfigForm */

    283. 

  283. +    public HistoryConfig(Display display) {

    284. 

  284. +        this.display=display;

    285. 

  285. +        parentView=display.getCurrent();

    286. 

  286. +        

    287. 

  287. +        cf=Config.getInstance();

    288. 

  288. +        

    289. 

  289. +        f=new Form(SR.MS_HISTORY_SETTINGS);

    290. 

  290. +        

    291. 

  291. +//#if FILE_IO

    292. 

  292. +        history=new ChoiceGroup(SR.MS_HISTORY, Choice.MULTIPLE); //locale

    293. 

  293. +        history.append(SR.MS_SAVE_HISTORY, null); //locale

    294. 

  294. +        history.append(SR.MS_SAVE_PRESENCES,null);    //locale     

    295. 

  295. +        history.append(SR.MS_SAVE_HISTORY_CONF, null); //locale

    296. 

  296. +        history.append(SR.MS_SAVE_PRESENCES_CONF, null); //locale

    297. 

  297. +        history.append(SR.MS_1251_CORRECTION, null); //locale

    298. 

  298. +//#ifdef TRANSLIT

    299. 

  299. +//#         history.append(SR.MS_1251_TRANSLITERATE_FILENAMES, null); //locale

    300. 

  300. +//#endif

    301. 

  301. +        

    302. 

  302. +        boolean his[]={

    303. 

  303. +            cf.msgLog,

    304. 

  304. +            cf.msgLogPresence,

    305. 

  305. +            cf.msgLogConf,

    306. 

  306. +            cf.msgLogConfPresence,

    307. 

  307. +            cf.cp1251

    308. 

  308. +//#ifdef TRANSLIT

    309. 

  309. +//#             , cf.transliterateFilenames

    310. 

  310. +//#endif

    311. 

  311. +        };

    312. 

  312. +        this.his=his;

    313. 

  313. +        

    314. 

  314. +        history.setSelectedFlags(his);

    315. 

  315. +        f.append(history);

    316. 

  316. +        

    317. 

  317. +        historyFolder=new TextFieldCombo(SR.MS_HISTORY_PATH, null, 128, 0, "history_path", display);

    318. 

  318. +        historyFolder.setString(cf.msgPath);

    319. 

  319. +        historyFolder.addCommand(cmdSetHistFolder);

    320. 

  320. +        f.append(historyFolder);

    321. 

  321. +        historyFolder.setItemCommandListener(this);

    322. 

  322. +//#endif

    323. 

  323. +

    324. 

  324. +        f.addCommand(cmdOk);

    325. 

  325. +        f.addCommand(cmdCancel);

    326. 

  326. +        

    327. 

  327. +        f.setCommandListener(this);

    328. 

  328. +       

    329. 

  329. +        display.setCurrent(f);

    330. 

  330. +    }

    331. 

  331. +    

    332. 

  332. +    public void commandAction(Command c, Displayable d) {

    333. 

  333. +        if (c==cmdOk) {

    334. 

  334. +//#if FILE_IO

    335. 

  335. +            history.getSelectedFlags(his);

    336. 

  336. +            cf.msgLog=his[0];

    337. 

  337. +            cf.msgLogPresence=his[1];

    338. 

  338. +            cf.msgLogConf=his[2];

    339. 

  339. +            cf.msgLogConfPresence=his[3];

    340. 

  340. +            cf.cp1251=his[4];

    341. 

  341. +//#ifdef TRANSLIT

    342. 

  342. +//#             cf.transliterateFilenames=his[5];

    343. 

  343. +//#endif

    344. 

  344. +            cf.msgPath=historyFolder.getString();

    345. 

  345. +//#endif             

    346. 

  346. +            

    347. 

  347. +            cf.saveToStorage();

    348. 

  348. +            

    349. 

  349. +            StaticData.getInstance().roster.reEnumRoster();

    350. 

  350. +            destroyView();

    351. 

  351. +        }

    352. 

  352. +        if (c==cmdCancel) destroyView();

    353. 

  353. +    }

    354. 

  354. +    

    355. 

  355. +//#if FILE_IO

    356. 

  356. +    public void commandAction(Command command, Item item) {

    357. 

  357. +

    358. 

  358. +        if (command==cmdSetHistFolder) {

    359. 

  359. +            new Browser(null, display, this, true);

    360. 

  360. +        }

    361. 

  361. +    }

    362. 

  362. +//#endif

    363. 

  363. +    

    364. 

  364. +    public void destroyView(){

    365. 

  365. +        if (display!=null)

    366. 

  366. +            display.setCurrent(parentView);

    367. 

  367. +    }

    368. 

  368. +

    369. 

  369. +//#if FILE_IO

    370. 

  370. +    public void BrowserFilePathNotify(String pathSelected) {

    371. 

  371. +        historyFolder.setString(pathSelected);

    372. 

  372. +    }

    373. 

  373. +//#endif

    374. 

  374. +}

    375. 

  375. \ No newline at end of file

    376. 

  376. Index: trunk/src/Client/RosterToolsMenu.java

    377. 

  377. ===================================================================

    378. 

  378. --- trunk/src/Client/RosterToolsMenu.java	(revision 1209)

    379. 

  379. +++ trunk/src/Client/RosterToolsMenu.java	(working copy)

    380. 

  380. @@ -56,8 +56,10 @@

    381. 

  381.          addItem(SR.MS_ROOT, 4);
    382. 

  382.          addItem(SR.MS_FILE_TRANSFERS, 5);
    383. 

  383.  //#endif
    384. 

  384. +//#if (FILE_IO && HISTORY)
    385. 

  385. +//#         addItem(SR.MS_HISTORY_SETTINGS, 6);
    386. 

  386. +//#endif
    387. 

  387.          
    388. 

  388. -        
    389. 

  389.          /*addItem("Break connection", 10);*/
    390. 

  390.          
    391. 

  391.          
    392. 

  392. @@ -97,6 +99,11 @@

    393. 

  393.                  new io.file.transfer.TransferManager(display);
    394. 

  394.                  return;
    395. 

  395.  //#endif
    396. 

  396. +//#if (FILE_IO && HISTORY)
    397. 

  397. +//#             case 6: //history
    398. 

  398. +//#                 new HistoryConfig(display);
    399. 

  399. +//#                 return;
    400. 

  400. +//#endif 
    401. 

  401.              
    402. 

  402.              //case 10:
    403. 

  403.              //    StaticData.getInstance().roster.connectionTerminated(new Exception("Simulated break"));
    404. 

  404. Index: trunk/src/io/file/FileComMotorolaIo.java

    405. 

  405. ===================================================================

    406. 

  406. --- trunk/src/io/file/FileComMotorolaIo.java	(revision 1209)

    407. 

  407. +++ trunk/src/io/file/FileComMotorolaIo.java	(working copy)

    408. 

  408. @@ -61,6 +61,12 @@

    409. 

  409.          }
    410. 

  410.          return fileConnection.openOutputStream();
    411. 

  411.      }
    412. 

  412. +    
    413. 

  413. +    public OutputStream openOutputStream(long pos_eof) throws IOException {
    414. 

  414. +        if (fileConnection==null) openFile();
    415. 

  415. +        if (!fileConnection.exists()) fileConnection.create();
    416. 

  416. +        return fileConnection.openOutputStream();
    417. 

  417. +    }
    418. 

  418.  
    419. 

  419.      public InputStream openInputStream() throws IOException {
    420. 

  420.          if (fileConnection==null) openFile();
    421. 

  421. @@ -91,10 +97,14 @@

    422. 

  422.          
    423. 

  423.          Vector rd=new Vector(list.length + 1);
    424. 

  424.          for (int i = 0; i < list.length; i++) {
    425. 

  425. -            if (directoriesOnly & !list[i].endsWith("/")) continue;
    426. 

  426. -           int st=(list[i].startsWith("/")) ? 1 : 0;
    427. 

  427. +			if (directoriesOnly & !list[i].endsWith("/")) continue;
    428. 

  428. +            int st=(list[i].startsWith("/")) ? 1 : 0;
    429. 

  429.              rd.addElement(list[i].substring(st+fileName.length()));
    430. 

  430.          }
    431. 

  431.          return rd;
    432. 

  432.      }
    433. 

  433. +
    434. 

  434. +    public void delete() throws IOException{
    435. 

  435. +        fileConnection.delete();
    436. 

  436. +    }
    437. 

  437.  }
    438. 

  438. Index: trunk/src/io/file/FileIO.java

    439. 

  439. ===================================================================

    440. 

  440. --- trunk/src/io/file/FileIO.java	(revision 1209)

    441. 

  441. +++ trunk/src/io/file/FileIO.java	(working copy)

    442. 

  442. @@ -90,8 +90,13 @@

    443. 

  443.      
    444. 

  444.      public abstract void close() throws IOException;
    445. 

  445.      
    446. 

  446. +    public abstract void delete() throws IOException;
    447. 

  447. +    
    448. 

  448.      public abstract long fileSize() throws IOException;
    449. 

  449.  
    450. 

  450.      protected abstract Vector rootDirs();
    451. 

  451. +    
    452. 

  452.      protected abstract Vector dirs(boolean directoriesOnly) throws IOException;
    453. 

  453. +
    454. 

  454. +    public abstract OutputStream openOutputStream(long pos_eof) throws IOException;
    455. 

  455.  }
    456. 

  456. Index: trunk/src/io/file/FileJSR75.java

    457. 

  457. ===================================================================

    458. 

  458. --- trunk/src/io/file/FileJSR75.java	(revision 1209)

    459. 

  459. +++ trunk/src/io/file/FileJSR75.java	(working copy)

    460. 

  460. @@ -60,7 +60,19 @@

    461. 

  461.          }
    462. 

  462.          return fileConnection.openOutputStream();
    463. 

  463.      }
    464. 

  464. +    
    465. 

  465. +    public void delete() throws IOException{
    466. 

  466. +        if (fileConnection==null) openFile();
    467. 

  467. +        fileConnection.delete();
    468. 

  468. +    }
    469. 

  469.  
    470. 

  470. +    public OutputStream openOutputStream(long pos_eof) throws IOException {
    471. 

  471. +        if (fileConnection==null) openFile();
    472. 

  472. +        if (!fileConnection.exists()) fileConnection.create();
    473. 

  473. +        pos_eof=fileConnection.fileSize();
    474. 

  474. +        return fileConnection.openOutputStream(pos_eof);
    475. 

  475. +    }
    476. 

  476. +
    477. 

  477.      public InputStream openInputStream() throws IOException{
    478. 

  478.          if (fileConnection==null) openFile();
    479. 

  479.          return fileConnection.openInputStream(); 
    480. 

  480. Index: trunk/src/io/file/FileSiemens.java

    481. 

  481. ===================================================================

    482. 

  482. --- trunk/src/io/file/FileSiemens.java	(revision 1209)

    483. 

  483. +++ trunk/src/io/file/FileSiemens.java	(working copy)

    484. 

  484. @@ -34,14 +34,12 @@

    485. 

  485.  import java.io.OutputStream;
    486. 

  486.  import java.util.Vector;
    487. 

  487.  
    488. 

  488. -public class FileSiemens extends FileIO{
    489. 

  489. +public class FileSiemens extends FileIO {
    490. 

  490.      
    491. 

  491.      private File f;
    492. 

  492.      private int fd;
    493. 

  493.  
    494. 

  494.      public FileSiemens(String fileName) {
    495. 

  495. -        //System.out.println("Siemens fs accessor for "+fileName);
    496. 

  496. -        // Siemens requires backslashes
    497. 

  497.          this.fileName=fileName=fileName.replace('/', '\\');//.substring(1);
    498. 

  498.      }
    499. 

  499.      
    500. 

  500. @@ -63,9 +61,6 @@

    501. 

  501.          //System.out.println("Siemens root");
    502. 

  502.          Vector rd = new Vector();
    503. 

  503.          rd.addElement("0:/");
    504. 

  504. -        rd.addElement("1:/");
    505. 

  505. -        rd.addElement("2:/");
    506. 

  506. -        rd.addElement("3:/");
    507. 

  507.          rd.addElement("4:/");
    508. 

  508.          return rd;
    509. 

  509.      }
    510. 

  510. @@ -89,13 +84,22 @@

    511. 

  511.  
    512. 

  512.      public OutputStream openOutputStream() throws IOException {
    513. 

  513.          openFile();
    514. 

  514. -        return new FileSiemensOutputStream(f, fd);
    515. 

  515. +        return new FileSiemensOutputStream(f, fd, 0);
    516. 

  516.      }
    517. 

  517.  
    518. 

  518.      public InputStream openInputStream() throws IOException {
    519. 

  519.          openFile();
    520. 

  520.          return new FileSiemensInputStream(f, fd);
    521. 

  521. -    }  
    522. 

  522. +    }
    523. 

  523. +    
    524. 

  524. +    public OutputStream openOutputStream(long pos_eof) throws IOException {
    525. 

  525. +        openFile();
    526. 

  526. +        return new FileSiemensOutputStream(f, fd, pos_eof);
    527. 

  527. +    }
    528. 

  528. +    
    529. 

  529. +    public void delete() throws IOException{
    530. 

  530. +        f.delete(fileName);
    531. 

  531. +    }
    532. 

  532.  }
    533. 

  533.  
    534. 

  534.  class FileSiemensInputStream extends InputStream {
    535. 

  535. @@ -121,8 +125,14 @@

    536. 

  536.      private int fileDescriptor;
    537. 

  537.      private File f;
    538. 

  538.  
    539. 

  539. -    public FileSiemensOutputStream(File f, int fd) {
    540. 

  540. -        this.f=f; this.fileDescriptor=fd;
    541. 

  541. +    public FileSiemensOutputStream(File f, int fd, long Seek) {
    542. 

  542. +        this.f=f;
    543. 

  543. +        this.fileDescriptor=fd;
    544. 

  544. +        try {
    545. 

  545. +            this.f.seek(fd, f.length(fd));
    546. 

  546. +        } catch (IOException ex) {
    547. 

  547. +            ex.printStackTrace();
    548. 

  548. +        }
    549. 

  549.      }
    550. 

  550.      
    551. 

  551.      public void write(int i) throws IOException {
    552. 

  552. Index: trunk/src/locale/SR.java

    553. 

  553. ===================================================================

    554. 

  554. --- trunk/src/locale/SR.java	(revision 1209)

    555. 

  555. +++ trunk/src/locale/SR.java	(working copy)

    556. 

  556. @@ -124,7 +124,7 @@

    557. 

  557.      public   static String MS_HEAP_MONITOR = loadString( "heap monitor" );
    558. 

  558.      public   static String MS_MESSAGE = loadString( "Message" );
    559. 

  559.      public   static String MS_OTHER = loadString( "<Other>" );
    560. 

  560. -    public   static String MS_HISTORY = loadString( "history -" );
    561. 

  561. +    public   static String MS_HISTORY = loadString( "History" );
    562. 

  562.      public   static String MS_APPEND = loadString( "Append" );
    563. 

  563.      public   static String MS_ACTIVE_CONTACTS = loadString( "Active Contacts" );
    564. 

  564.      public   static String MS_SELECT_NICKNAME = loadString( "Select nickname" );
    565. 

  565. @@ -341,6 +341,17 @@

    566. 

  566.      public static String MS_SAVE_TO = loadString( "Save to" );
    567. 

  567.      public static String MS_SENDER = loadString( "Sender:" );
    568. 

  568.      public static String MS_FILE_SIZE = loadString( "size:" );
    569. 

  569. +
    570. 

  570. +    public static String MS_HISTORY_SETTINGS = loadString( "History settings" );
    571. 

  571. +    public static String MS_HISTORY_PATH = loadString( "History path" );
    572. 

  572. +    public static String MS_1251_CORRECTION = loadString( "1251 correction" );
    573. 

  573. +    public static String MS_SAVE_PRESENCES_CONF = loadString( "save conf presences" );
    574. 

  574. +    public static String MS_SAVE_HISTORY_CONF = loadString( "save conf history" );
    575. 

  575. +    public static String MS_SAVE_PRESENCES = loadString( "save presences" );
    576. 

  576. +    public static String MS_SAVE_HISTORY = loadString( "save history" );
    577. 

  577. +    public static String MS_SELECT_PATH = loadString( "Select path" );
    578. 

  578. +    public static String MS_1251_TRANSLITERATE_FILENAMES = loadString( "transliterate filenames" );
    579. 

  579. +    
    580. 

  580.      public static String MS_XMLLANG;
    581. 

  581.      public static String MS_IFACELANG;
    582. 

  582.  
    583. 

  583. Index: trunk/src/util/Translit.java

    584. 

  584. ===================================================================

    585. 

  585. --- trunk/src/util/Translit.java	(revision 0)

    586. 

  586. +++ trunk/src/util/Translit.java	(revision 0)

    587. 

  587. @@ -0,0 +1,332 @@

    588. 

  588. +/*

    589. 

  589. + * Translit.java

    590. 

  590. + *

    591. 

  591. + * Created on 25.04.2007, 10:30

    592. 

  592. + *

    593. 

  593. + * Copyright (c) 2006-2007, Daniel Apatin (ad), http://apatin.net.ru

    594. 

  594. + *

    595. 

  595. + * This program is free software; you can redistribute it and/or

    596. 

  596. + * modify it under the terms of the GNU General Public License

    597. 

  597. + * as published by the Free Software Foundation; either version 2

    598. 

  598. + * of the License, or (at your option) any later version.

    599. 

  599. + *

    600. 

  600. + * You can also redistribute and/or modify this program under the

    601. 

  601. + * terms of the Psi License, specified in the accompanied COPYING

    602. 

  602. + * file, as published by the Psi Project; either dated January 1st,

    603. 

  603. + * 2005, or (at your option) any later version.

    604. 

  604. + *

    605. 

  605. + * This program is distributed in the hope that it will be useful,

    606. 

  606. + * but WITHOUT ANY WARRANTY; without even the implied warranty of

    607. 

  607. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    608. 

  608. + * GNU General Public License for more details.

    609. 

  609. + *

    610. 

  610. + * You should have received a copy of the GNU General Public License

    611. 

  611. + * along with this library; if not, write to the Free Software

    612. 

  612. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    613. 

  613. + */

    614. 

  614. +

    615. 

  615. +package util;

    616. 

  616. +

    617. 

  617. +public class Translit {

    618. 

  618. +

    619. 

  619. +    static char Translit_chars[][] = new char[106][6];

    620. 

  620. +    static int Translit_count[] = new int[106];

    621. 

  621. +    static boolean full=false;

    622. 

  622. +    

    623. 

  623. +    static void fillarrays()

    624. 

  624. +    {

    625. 

  625. +        int i = 40;

    626. 

  626. +        int j = 0;

    627. 

  627. +        Translit_chars[i] = "A".toCharArray();

    628. 

  628. +        Translit_count[i] = 1;

    629. 

  629. +        j++;

    630. 

  630. +        i++;

    631. 

  631. +        Translit_chars[i] = "B".toCharArray();

    632. 

  632. +        Translit_count[i] = 1;

    633. 

  633. +        j++;

    634. 

  634. +        i++;

    635. 

  635. +        Translit_chars[i] = "V".toCharArray();

    636. 

  636. +        Translit_count[i] = 1;

    637. 

  637. +        j++;

    638. 

  638. +        i++;

    639. 

  639. +        Translit_chars[i] = "G".toCharArray();

    640. 

  640. +        Translit_count[i] = 1;

    641. 

  641. +        j++;

    642. 

  642. +        i++;

    643. 

  643. +        Translit_chars[i] = "D".toCharArray();

    644. 

  644. +        Translit_count[i] = 1;

    645. 

  645. +        j++;

    646. 

  646. +        i++;

    647. 

  647. +        Translit_chars[i] = "E".toCharArray();

    648. 

  648. +        Translit_count[i] = 1;

    649. 

  649. +        j++;

    650. 

  650. +        i++;

    651. 

  651. +        Translit_chars[25] = "Yo".toCharArray();

    652. 

  652. +        Translit_count[25] = 2;

    653. 

  653. +        j++;

    654. 

  654. +        Translit_chars[i] = "Zh".toCharArray();

    655. 

  655. +        Translit_count[i] = 2;

    656. 

  656. +        j++;

    657. 

  657. +        i++;

    658. 

  658. +        Translit_chars[i] = "Z".toCharArray();

    659. 

  659. +        Translit_count[i] = 1;

    660. 

  660. +        j++;

    661. 

  661. +        i++;

    662. 

  662. +        Translit_chars[i] = "I".toCharArray();

    663. 

  663. +        Translit_count[i] = 1;

    664. 

  664. +        j++;

    665. 

  665. +        i++;

    666. 

  666. +        Translit_chars[i] = "J".toCharArray();

    667. 

  667. +        Translit_count[i] = 1;

    668. 

  668. +        j++;

    669. 

  669. +        i++;

    670. 

  670. +        Translit_chars[i] = "K".toCharArray();

    671. 

  671. +        Translit_count[i] = 1;

    672. 

  672. +        j++;

    673. 

  673. +        i++;

    674. 

  674. +        Translit_chars[i] = "L".toCharArray();

    675. 

  675. +        Translit_count[i] = 1;

    676. 

  676. +        j++;

    677. 

  677. +        i++;

    678. 

  678. +        Translit_chars[i] = "M".toCharArray();

    679. 

  679. +        Translit_count[i] = 1;

    680. 

  680. +        j++;

    681. 

  681. +        i++;

    682. 

  682. +        Translit_chars[i] = "N".toCharArray();

    683. 

  683. +        Translit_count[i] = 1;

    684. 

  684. +        j++;

    685. 

  685. +        i++;

    686. 

  686. +        Translit_chars[i] = "O".toCharArray();

    687. 

  687. +        Translit_count[i] = 1;

    688. 

  688. +        j++;

    689. 

  689. +        i++;

    690. 

  690. +        Translit_chars[i] = "P".toCharArray();

    691. 

  691. +        Translit_count[i] = 1;

    692. 

  692. +        j++;

    693. 

  693. +        i++;

    694. 

  694. +        Translit_chars[i] = "R".toCharArray();

    695. 

  695. +        Translit_count[i] = 1;

    696. 

  696. +        j++;

    697. 

  697. +        i++;

    698. 

  698. +        Translit_chars[i] = "S".toCharArray();

    699. 

  699. +        Translit_count[i] = 1;

    700. 

  700. +        j++;

    701. 

  701. +        i++;

    702. 

  702. +        Translit_chars[i] = "T".toCharArray();

    703. 

  703. +        Translit_count[i] = 1;

    704. 

  704. +        j++;

    705. 

  705. +        i++;

    706. 

  706. +        Translit_chars[i] = "U".toCharArray();

    707. 

  707. +        Translit_count[i] = 1;

    708. 

  708. +        j++;

    709. 

  709. +        i++;

    710. 

  710. +        Translit_chars[i] = "F".toCharArray();

    711. 

  711. +        Translit_count[i] = 1;

    712. 

  712. +        j++;

    713. 

  713. +        i++;

    714. 

  714. +        Translit_chars[i] = "H".toCharArray();

    715. 

  715. +        Translit_count[i] = 1;

    716. 

  716. +        j++;

    717. 

  717. +        i++;

    718. 

  718. +        Translit_chars[i] = "C".toCharArray();

    719. 

  719. +        Translit_count[i] = 1;

    720. 

  720. +        j++;

    721. 

  721. +        i++;

    722. 

  722. +        Translit_chars[i] = "Ch".toCharArray();

    723. 

  723. +        Translit_count[i] = 2;

    724. 

  724. +        j++;

    725. 

  725. +        i++;

    726. 

  726. +        Translit_chars[i] = "Sh".toCharArray();

    727. 

  727. +        Translit_count[i] = 2;

    728. 

  728. +        j++;

    729. 

  729. +        i++;

    730. 

  730. +        Translit_chars[i] = "Sch".toCharArray();

    731. 

  731. +        Translit_count[i] = 3;

    732. 

  732. +        j++;

    733. 

  733. +        i++;

    734. 

  734. +        Translit_chars[i] = "\"".toCharArray();

    735. 

  735. +        Translit_count[i] = 1;

    736. 

  736. +        j++;

    737. 

  737. +        i++;

    738. 

  738. +        Translit_chars[i] = "Y".toCharArray();

    739. 

  739. +        Translit_count[i] = 1;

    740. 

  740. +        j++;

    741. 

  741. +        i++;

    742. 

  742. +        Translit_chars[i] = "'".toCharArray();

    743. 

  743. +        Translit_count[i] = 1;

    744. 

  744. +        j++;

    745. 

  745. +        i++;

    746. 

  746. +        Translit_chars[i] = "E".toCharArray();

    747. 

  747. +        Translit_count[i] = 1;

    748. 

  748. +        j++;

    749. 

  749. +        i++;

    750. 

  750. +        Translit_chars[i] = "Yu".toCharArray();

    751. 

  751. +        Translit_count[i] = 2;

    752. 

  752. +        j++;

    753. 

  753. +        i++;

    754. 

  754. +        Translit_chars[i] = "Ya".toCharArray();

    755. 

  755. +        Translit_count[i] = 2;

    756. 

  756. +        j++;

    757. 

  757. +        i++;

    758. 

  758. +        Translit_chars[i] = "a".toCharArray();

    759. 

  759. +        Translit_count[i] = 1;

    760. 

  760. +        j++;

    761. 

  761. +        i++;

    762. 

  762. +        Translit_chars[i] = "b".toCharArray();

    763. 

  763. +        Translit_count[i] = 1;

    764. 

  764. +        j++;

    765. 

  765. +        i++;

    766. 

  766. +        Translit_chars[i] = "v".toCharArray();

    767. 

  767. +        Translit_count[i] = 1;

    768. 

  768. +        j++;

    769. 

  769. +        i++;

    770. 

  770. +        Translit_chars[i] = "g".toCharArray();

    771. 

  771. +        Translit_count[i] = 1;

    772. 

  772. +        j++;

    773. 

  773. +        i++;

    774. 

  774. +        Translit_chars[i] = "d".toCharArray();

    775. 

  775. +        Translit_count[i] = 1;

    776. 

  776. +        j++;

    777. 

  777. +        i++;

    778. 

  778. +        Translit_chars[i] = "e".toCharArray();

    779. 

  779. +        Translit_count[i] = 1;

    780. 

  780. +        j++;

    781. 

  781. +        i++;

    782. 

  782. +        Translit_chars[105] = "yo".toCharArray();

    783. 

  783. +        Translit_count[105] = 2;

    784. 

  784. +        j++;

    785. 

  785. +        Translit_chars[i] = "zh".toCharArray();

    786. 

  786. +        Translit_count[i] = 2;

    787. 

  787. +        j++;

    788. 

  788. +        i++;

    789. 

  789. +        Translit_chars[i] = "z".toCharArray();

    790. 

  790. +        Translit_count[i] = 1;

    791. 

  791. +        j++;

    792. 

  792. +        i++;

    793. 

  793. +        Translit_chars[i] = "i".toCharArray();

    794. 

  794. +        Translit_count[i] = 1;

    795. 

  795. +        j++;

    796. 

  796. +        i++;

    797. 

  797. +        Translit_chars[i] = "j".toCharArray();

    798. 

  798. +        Translit_count[i] = 1;

    799. 

  799. +        j++;

    800. 

  800. +        i++;

    801. 

  801. +        Translit_chars[i] = "k".toCharArray();

    802. 

  802. +        Translit_count[i] = 1;

    803. 

  803. +        j++;

    804. 

  804. +        i++;

    805. 

  805. +        Translit_chars[i] = "l".toCharArray();

    806. 

  806. +        Translit_count[i] = 1;

    807. 

  807. +        j++;

    808. 

  808. +        i++;

    809. 

  809. +        Translit_chars[i] = "m".toCharArray();

    810. 

  810. +        Translit_count[i] = 1;

    811. 

  811. +        j++;

    812. 

  812. +        i++;

    813. 

  813. +        Translit_chars[i] = "n".toCharArray();

    814. 

  814. +        Translit_count[i] = 1;

    815. 

  815. +        j++;

    816. 

  816. +        i++;

    817. 

  817. +        Translit_chars[i] = "o".toCharArray();

    818. 

  818. +        Translit_count[i] = 1;

    819. 

  819. +        j++;

    820. 

  820. +        i++;

    821. 

  821. +        Translit_chars[i] = "p".toCharArray();

    822. 

  822. +        Translit_count[i] = 1;

    823. 

  823. +        j++;

    824. 

  824. +        i++;

    825. 

  825. +        Translit_chars[i] = "r".toCharArray();

    826. 

  826. +        Translit_count[i] = 1;

    827. 

  827. +        j++;

    828. 

  828. +        i++;

    829. 

  829. +        Translit_chars[i] = "s".toCharArray();

    830. 

  830. +        Translit_count[i] = 1;

    831. 

  831. +        j++;

    832. 

  832. +        i++;

    833. 

  833. +        Translit_chars[i] = "t".toCharArray();

    834. 

  834. +        Translit_count[i] = 1;

    835. 

  835. +        j++;

    836. 

  836. +        i++;

    837. 

  837. +        Translit_chars[i] = "u".toCharArray();

    838. 

  838. +        Translit_count[i] = 1;

    839. 

  839. +        j++;

    840. 

  840. +        i++;

    841. 

  841. +        Translit_chars[i] = "f".toCharArray();

    842. 

  842. +        Translit_count[i] = 1;

    843. 

  843. +        j++;

    844. 

  844. +        i++;

    845. 

  845. +        Translit_chars[i] = "h".toCharArray();

    846. 

  846. +        Translit_count[i] = 1;

    847. 

  847. +        j++;

    848. 

  848. +        i++;

    849. 

  849. +        Translit_chars[i] = "c".toCharArray();

    850. 

  850. +        Translit_count[i] = 1;

    851. 

  851. +        j++;

    852. 

  852. +        i++;

    853. 

  853. +        Translit_chars[i] = "ch".toCharArray();

    854. 

  854. +        Translit_count[i] = 2;

    855. 

  855. +        j++;

    856. 

  856. +        i++;

    857. 

  857. +        Translit_chars[i] = "sh".toCharArray();

    858. 

  858. +        Translit_count[i] = 2;

    859. 

  859. +        j++;

    860. 

  860. +        i++;

    861. 

  861. +        Translit_chars[i] = "sch".toCharArray();

    862. 

  862. +        Translit_count[i] = 3;

    863. 

  863. +        j++;

    864. 

  864. +        i++;

    865. 

  865. +        Translit_chars[i] = "\"".toCharArray();

    866. 

  866. +        Translit_count[i] = 1;

    867. 

  867. +        j++;

    868. 

  868. +        i++;

    869. 

  869. +        Translit_chars[i] = "y".toCharArray();

    870. 

  870. +        Translit_count[i] = 1;

    871. 

  871. +        j++;

    872. 

  872. +        i++;

    873. 

  873. +        Translit_chars[i] = "'".toCharArray();

    874. 

  874. +        Translit_count[i] = 1;

    875. 

  875. +        j++;

    876. 

  876. +        i++;

    877. 

  877. +        Translit_chars[i] = "e".toCharArray();

    878. 

  878. +        Translit_count[i] = 1;

    879. 

  879. +        j++;

    880. 

  880. +        i++;

    881. 

  881. +        Translit_chars[i] = "yu".toCharArray();

    882. 

  882. +        Translit_count[i] = 2;

    883. 

  883. +        j++;

    884. 

  884. +        i++;

    885. 

  885. +        Translit_chars[i] = "ya".toCharArray();

    886. 

  886. +        Translit_count[i] = 2;

    887. 

  887. +        j++;

    888. 

  888. +        i++;

    889. 

  889. +    }

    890. 

  890. +    

    891. 

  891. +    public static String translit(String s)

    892. 

  892. +    {

    893. 

  893. +        if (!full) fillarrays();

    894. 

  894. +        char ac[] = new char[s.length() * 3];

    895. 

  895. +        char ac1[] = s.toCharArray();

    896. 

  896. +        int l = -1;

    897. 

  897. +        for(int i = 0; i <= s.length() - 1; i++)

    898. 

  898. +        {

    899. 

  899. +            char c = ac1[i];

    900. 

  900. +            if((c >= '\u0410') & (c <= '\u044F') || (c == '\u0401' || c == '\u0451'))

    901. 

  901. +            {

    902. 

  902. +                int k = c - 1000;

    903. 

  903. +                for(int j = 0; j < Translit_count[k]; j++)

    904. 

  904. +                {

    905. 

  905. +                    l++;

    906. 

  906. +                    ac[l] = Translit_chars[c - 1000][j];

    907. 

  907. +                }

    908. 

  908. +

    909. 

  909. +            } else

    910. 

  910. +            {

    911. 

  911. +                l++;

    912. 

  912. +                ac[l] = ac1[i];

    913. 

  913. +            }

    914. 

  914. +        }

    915. 

  915. +

    916. 

  916. +        return new String(ac, 0, l + 1);

    917. 

  917. +    }

    918. 

  918. +    

    919. 

  919. +}

    920. 

  920.