From 12d81ab157df05d5f13d52a8651a89360aafc1cd Mon Sep 17 00:00:00 2001
From: iMoHax <monah357@mail.ru>
Date: Thu, 17 Jul 2014 19:47:23 +0400
Subject: [PATCH] reformat

---
 client/src/main/resources/view/itemDesc.fxml |   8 +-
 client/src/main/resources/view/items.fxml    |  48 +++------
 client/src/main/resources/view/offers.fxml   | 100 +++++--------------
 client/src/main/resources/view/orders.fxml   |  59 +++--------
 client/src/main/resources/view/vEditor.fxml  |  12 +--
 5 files changed, 58 insertions(+), 169 deletions(-)

diff --git a/client/src/main/resources/view/itemDesc.fxml b/client/src/main/resources/view/itemDesc.fxml
index 26fd402..d5550ee 100644
--- a/client/src/main/resources/view/itemDesc.fxml
+++ b/client/src/main/resources/view/itemDesc.fxml
@@ -8,14 +8,10 @@
       fx:controller="ru.trader.controllers.ItemDescController">
     <Label text="Продавцы:"/>
     <ListView fx:id="seller" maxHeight="200.0">
-        <cellFactory>
-            <OfferListCell/>
-        </cellFactory>
+        <cellFactory><OfferListCell/></cellFactory>
     </ListView>
     <Label text="Покупатели:"/>
     <ListView fx:id="buyer" maxHeight="200.0">
-        <cellFactory>
-            <OfferListCell/>
-        </cellFactory>
+        <cellFactory><OfferListCell/></cellFactory>
     </ListView>
 </VBox>
diff --git a/client/src/main/resources/view/items.fxml b/client/src/main/resources/view/items.fxml
index d3f23aa..cb0a730 100644
--- a/client/src/main/resources/view/items.fxml
+++ b/client/src/main/resources/view/items.fxml
@@ -13,70 +13,46 @@
     <TableView fx:id="tblItems" editable="true" VBox.vgrow="ALWAYS">
         <columns>
             <TableColumn editable="true" minWidth="200.0" prefWidth="200.0" text="Товар">
-                <cellValueFactory>
-                    <PropertyValueFactory property="name"/>
-                </cellValueFactory>
+                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
             </TableColumn>
             <TableColumn editable="true" resizable="false" text="Покупка">
                 <columns>
                     <TableColumn minWidth="120.0" prefWidth="120.0" text="Мин.">
-                        <cellValueFactory>
-                            <OfferCellValueImpl property="minSell"/>
-                        </cellValueFactory>
+                        <cellValueFactory><OfferCellValueImpl property="minSell"/></cellValueFactory>
                     </TableColumn>
                     <TableColumn minWidth="80.0" prefWidth="80.0" text="Ср.">
-                        <cellFactory>
-                            <DoubleCell/>
-                        </cellFactory>
-                        <cellValueFactory>
-                            <PropertyValueFactory property="avgSell"/>
-                        </cellValueFactory>
+                        <cellFactory><DoubleCell/></cellFactory>
+                        <cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory>
                     </TableColumn>
                     <TableColumn minWidth="120.0" prefWidth="120.0" text="Макс.">
-                        <cellValueFactory>
-                            <OfferCellValueImpl property="maxSell"/>
-                        </cellValueFactory>
+                        <cellValueFactory><OfferCellValueImpl property="maxSell"/></cellValueFactory>
                     </TableColumn>
                 </columns>
             </TableColumn>
             <TableColumn editable="true" resizable="false" text="Продажа">
                 <columns>
                     <TableColumn minWidth="120.0" prefWidth="120.0" text="Мин.">
-                        <cellValueFactory>
-                            <OfferCellValueImpl property="minBuy"/>
-                        </cellValueFactory>
+                        <cellValueFactory><OfferCellValueImpl property="minBuy"/></cellValueFactory>
                     </TableColumn>
                     <TableColumn minWidth="80.0" prefWidth="80.0" text="Ср.">
-                        <cellFactory>
-                            <DoubleCell/>
-                        </cellFactory>
-                        <cellValueFactory>
-                            <PropertyValueFactory property="avgBuy"/>
-                        </cellValueFactory>
+                        <cellFactory><DoubleCell/></cellFactory>
+                        <cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory>
                     </TableColumn>
                     <TableColumn minWidth="120.0" prefWidth="120.0" text="Макс.">
-                        <cellValueFactory>
-                            <OfferCellValueImpl property="maxBuy"/>
-                        </cellValueFactory>
+                        <cellValueFactory><OfferCellValueImpl property="maxBuy"/></cellValueFactory>
                     </TableColumn>
                 </columns>
             </TableColumn>
             <TableColumn editable="true" resizable="false" text="Прибыль">
                 <columns>
                     <TableColumn fx:id="minProfit" minWidth="80.0" prefWidth="80.0" text="Мин.">
-                        <cellFactory>
-                            <DoubleCell/>
-                        </cellFactory>
+                        <cellFactory><DoubleCell/></cellFactory>
                     </TableColumn>
                     <TableColumn fx:id="avgProfit" minWidth="80.0" prefWidth="80.0" text="Ср.">
-                        <cellFactory>
-                            <DoubleCell/>
-                        </cellFactory>
+                        <cellFactory><DoubleCell/></cellFactory>
                     </TableColumn>
                     <TableColumn fx:id="maxProfit" minWidth="80.0" prefWidth="80.0" text="Макс." sortType="DESCENDING">
-                        <cellFactory>
-                            <DoubleCell/>
-                        </cellFactory>
+                        <cellFactory><DoubleCell/></cellFactory>
                     </TableColumn>
                 </columns>
             </TableColumn>
diff --git a/client/src/main/resources/view/offers.fxml b/client/src/main/resources/view/offers.fxml
index 19bbdd2..32e24d1 100644
--- a/client/src/main/resources/view/offers.fxml
+++ b/client/src/main/resources/view/offers.fxml
@@ -31,53 +31,29 @@
               <TableView fx:id="tblSell" editable="true">
                   <columns>
                       <TableColumn minWidth="200.0" prefWidth="200.0" text="Товар">
-                          <cellValueFactory>
-                              <PropertyValueFactory property="name"/>
-                          </cellValueFactory>
+                          <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
                       </TableColumn>
-                      <TableColumn minWidth="100.0" prefWidth="100.0" resizable="false" text="Цена"
-                                   onEditCommit="#editPrice">
-                          <cellFactory>
-                              <PriceCellImpl/>
-                          </cellFactory>
-                          <cellValueFactory>
-                              <PropertyValueFactory property="price"/>
-                          </cellValueFactory>
+                      <TableColumn minWidth="100.0" prefWidth="100.0" resizable="false" text="Цена" onEditCommit="#editPrice">
+                          <cellFactory><PriceCellImpl/></cellFactory>
+                          <cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
                       </TableColumn>
-                      <TableColumn fx:id="sortSell" minWidth="80.0" prefWidth="80.0" resizable="false"
-                                   text="Прибыль" sortType="DESCENDING">
-                          <cellFactory>
-                              <DoubleCell/>
-                          </cellFactory>
-                          <cellValueFactory>
-                              <PropertyValueFactory property="profit"/>
-                          </cellValueFactory>
+                      <TableColumn fx:id="sortSell" minWidth="80.0" prefWidth="80.0" resizable="false" text="Прибыль" sortType="DESCENDING">
+                          <cellFactory><DoubleCell/></cellFactory>
+                          <cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
                       </TableColumn>
                       <TableColumn minWidth="80.0" prefWidth="80.0" resizable="false" text="AVG SELL">
-                          <cellFactory>
-                              <DoubleCell/>
-                          </cellFactory>
-                          <cellValueFactory>
-                              <PropertyValueFactory property="avgSell"/>
-                          </cellValueFactory>
+                          <cellFactory><DoubleCell/></cellFactory>
+                          <cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory>
                       </TableColumn>
                       <TableColumn minWidth="80.0" prefWidth="80.0" resizable="false" text="AVG BUY">
-                          <cellFactory>
-                              <DoubleCell/>
-                          </cellFactory>
-                          <cellValueFactory>
-                              <PropertyValueFactory property="avgBuy"/>
-                          </cellValueFactory>
+                          <cellFactory><DoubleCell/></cellFactory>
+                          <cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory>
                       </TableColumn>
                       <TableColumn minWidth="120.0" prefWidth="120.0" text="BEST SELL">
-                          <cellValueFactory>
-                              <OfferCellValueImpl property="bestSell"/>
-                          </cellValueFactory>
+                          <cellValueFactory><OfferCellValueImpl property="bestSell"/></cellValueFactory>
                       </TableColumn>
                       <TableColumn minWidth="120.0" prefWidth="120.0" text="BEST BUY">
-                          <cellValueFactory>
-                              <OfferCellValueImpl property="bestBuy"/>
-                          </cellValueFactory>
+                          <cellValueFactory><OfferCellValueImpl property="bestBuy"/></cellValueFactory>
                       </TableColumn>
                   </columns>
                   <columnResizePolicy>
@@ -93,53 +69,29 @@
                   <TableView fx:id="tblBuy" editable="true">
                       <columns>
                           <TableColumn minWidth="200.0" prefWidth="200.0" text="Товар">
-                              <cellValueFactory>
-                                  <PropertyValueFactory property="name"/>
-                              </cellValueFactory>
+                              <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
                           </TableColumn>
-                          <TableColumn minWidth="100.0" prefWidth="100.0" resizable="false" text="Цена"
-                                       editable="true" onEditCommit="#editPrice">
-                              <cellFactory>
-                                  <PriceCellImpl/>
-                              </cellFactory>
-                              <cellValueFactory>
-                                  <PropertyValueFactory property="price"/>
-                              </cellValueFactory>
+                          <TableColumn minWidth="100.0" prefWidth="100.0" resizable="false" text="Цена" editable="true" onEditCommit="#editPrice">
+                              <cellFactory><PriceCellImpl/></cellFactory>
+                              <cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
                           </TableColumn>
-                          <TableColumn fx:id="sortBuy" minWidth="80.0" prefWidth="80.0" resizable="false"
-                                       text="Прибыль" sortType="DESCENDING">
-                              <cellFactory>
-                                  <DoubleCell/>
-                              </cellFactory>
-                              <cellValueFactory>
-                                  <PropertyValueFactory property="profit"/>
-                              </cellValueFactory>
+                          <TableColumn fx:id="sortBuy" minWidth="80.0" prefWidth="80.0" resizable="false" text="Прибыль" sortType="DESCENDING">
+                              <cellFactory><DoubleCell/></cellFactory>
+                              <cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
                           </TableColumn>
                           <TableColumn minWidth="80.0" prefWidth="80.0" resizable="false" text="AVG SELL">
-                              <cellFactory>
-                                  <DoubleCell/>
-                              </cellFactory>
-                              <cellValueFactory>
-                                  <PropertyValueFactory property="avgSell"/>
-                              </cellValueFactory>
+                              <cellFactory><DoubleCell/></cellFactory>
+                              <cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory>
                           </TableColumn>
                           <TableColumn minWidth="80.0" prefWidth="80.0" resizable="false" text="AVG BUY">
-                              <cellFactory>
-                                  <DoubleCell/>
-                              </cellFactory>
-                              <cellValueFactory>
-                                  <PropertyValueFactory property="avgBuy"/>
-                              </cellValueFactory>
+                              <cellFactory><DoubleCell/></cellFactory>
+                              <cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory>
                           </TableColumn>
                           <TableColumn minWidth="120.0" prefWidth="120.0" text="BEST SELL">
-                              <cellValueFactory>
-                                  <OfferCellValueImpl property="bestSell"/>
-                              </cellValueFactory>
+                              <cellValueFactory><OfferCellValueImpl property="bestSell"/></cellValueFactory>
                           </TableColumn>
                           <TableColumn minWidth="120.0" prefWidth="120.0" text="BEST BUY">
-                              <cellValueFactory>
-                                  <OfferCellValueImpl property="bestBuy"/>
-                              </cellValueFactory>
+                              <cellValueFactory><OfferCellValueImpl property="bestBuy"/></cellValueFactory>
                           </TableColumn>
                       </columns>
                       <columnResizePolicy>
diff --git a/client/src/main/resources/view/orders.fxml b/client/src/main/resources/view/orders.fxml
index 5df6c47..b84b4aa 100644
--- a/client/src/main/resources/view/orders.fxml
+++ b/client/src/main/resources/view/orders.fxml
@@ -14,52 +14,31 @@
     <TableView fx:id="tblOrders" editable="true">
         <columns>
             <TableColumn minWidth="200.0" prefWidth="200.0" text="Товар">
-                <cellValueFactory>
-                    <PropertyValueFactory property="name"/>
-                </cellValueFactory>
+                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
             </TableColumn>
             <TableColumn minWidth="80.0" prefWidth="80.0" text="Цена">
-                <cellFactory>
-                    <DoubleCell/>
-                </cellFactory>
-                <cellValueFactory>
-                    <PropertyValueFactory property="price"/>
-                </cellValueFactory>
+                <cellFactory><DoubleCell/></cellFactory>
+                <cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
             </TableColumn>
             <TableColumn fx:id="count" minWidth="80.0" prefWidth="80.0" text="Кол-во">
-                <cellValueFactory>
-                    <PropertyValueFactory property="count"/>
-                </cellValueFactory>
+                <cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
             </TableColumn>
             <TableColumn minWidth="120.0" prefWidth="120.0" text="Покупатель">
-                <cellValueFactory>
-                    <OfferCellValueImpl property="buyer"/>
-                </cellValueFactory>
+                <cellValueFactory><OfferCellValueImpl property="buyer"/></cellValueFactory>
             </TableColumn>
             <TableColumn minWidth="80.0" prefWidth="80.0" text="Прибыль">
-                <cellFactory>
-                    <DoubleCell/>
-                </cellFactory>
-                <cellValueFactory>
-                    <PropertyValueFactory property="profit"/>
-                </cellValueFactory>
+                <cellFactory><DoubleCell/></cellFactory>
+                <cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
             </TableColumn>
 
             <TableColumn resizable="false" text="Максимум">
                 <columns>
                     <TableColumn fx:id="maxCount" minWidth="80.0" prefWidth="80.0" text="Кол-во">
-                        <cellValueFactory>
-                            <PropertyValueFactory property="max"/>
-                        </cellValueFactory>
+                        <cellValueFactory><PropertyValueFactory property="max"/></cellValueFactory>
                     </TableColumn>
-                    <TableColumn fx:id="bestProfit" minWidth="80.0" prefWidth="80.0" text="Прибыль"
-                                 sortType="DESCENDING">
-                        <cellFactory>
-                            <DoubleCell/>
-                        </cellFactory>
-                        <cellValueFactory>
-                            <PropertyValueFactory property="bestProfit"/>
-                        </cellValueFactory>
+                    <TableColumn fx:id="bestProfit" minWidth="80.0" prefWidth="80.0" text="Прибыль" sortType="DESCENDING">
+                        <cellFactory><DoubleCell/></cellFactory>
+                        <cellValueFactory><PropertyValueFactory property="bestProfit"/></cellValueFactory>
                     </TableColumn>
                 </columns>
             </TableColumn>
@@ -74,20 +53,12 @@
     <TableView fx:id="tblBuyers">
         <columns>
             <TableColumn minWidth="120.0" prefWidth="120.0" text="Покупатель">
-                <cellFactory>
-                    <OfferTableCell/>
-                </cellFactory>
-                <cellValueFactory>
-                    <PropertyValueFactory property="price"/>
-                </cellValueFactory>
+                <cellFactory><OfferTableCell/></cellFactory>
+                <cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
             </TableColumn>
             <TableColumn fx:id="curProfit" minWidth="80.0" prefWidth="80.0" text="Прибыль" sortType="DESCENDING">
-                <cellFactory>
-                    <DoubleCell/>
-                </cellFactory>
-                <cellValueFactory>
-                    <PropertyValueFactory property="profit"/>
-                </cellValueFactory>
+                <cellFactory><DoubleCell/></cellFactory>
+                <cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
             </TableColumn>
         </columns>
         <columnResizePolicy>
diff --git a/client/src/main/resources/view/vEditor.fxml b/client/src/main/resources/view/vEditor.fxml
index 4e84266..43882cd 100644
--- a/client/src/main/resources/view/vEditor.fxml
+++ b/client/src/main/resources/view/vEditor.fxml
@@ -13,19 +13,13 @@
     <TableView fx:id="items" editable="true" prefWidth="400.0">
         <columns>
             <TableColumn minWidth="200.0" prefWidth="200.0" text="Товар" editable="false">
-                <cellValueFactory>
-                    <PropertyValueFactory property="name"/>
-                </cellValueFactory>
+                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
             </TableColumn>
             <TableColumn fx:id="buy" minWidth="80.0" prefWidth="80.0" maxWidth="80.0" text="Продажа">
-                <cellValueFactory>
-                    <PropertyValueFactory property="bprice"/>
-                </cellValueFactory>
+                <cellValueFactory><PropertyValueFactory property="bprice"/></cellValueFactory>
             </TableColumn>
             <TableColumn fx:id="sell" minWidth="80.0" prefWidth="80.0" maxWidth="80.0" text="Покупка">
-                <cellValueFactory>
-                    <PropertyValueFactory property="sprice"/>
-                </cellValueFactory>
+                <cellValueFactory><PropertyValueFactory property="sprice"/></cellValueFactory>
             </TableColumn>
         </columns>
     </TableView>